Merge pull request #114 from acaliaro/main

feat: add activity indicator scale

Author: Cheesebaron

BTProgressHUD.sln

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29209.62
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35327.3
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BTProgressHUD", "BTProgressHUD\BTProgressHUD.csproj", "{8ECDFDC5-42D0-4540-9691-830EEB2ED874}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTProgressHUD", "BTProgressHUD\BTProgressHUD.csproj", "{8ECDFDC5-42D0-4540-9691-830EEB2ED874}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{519BA8F9-8A37-4096-BCCB-A66EE0DAA697}"
 	ProjectSection(SolutionItems) = preProject
@@ -13,12 +13,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{CCCB766D-95A7-4FCE-81BE-F9A8F1B3589B}"
 	ProjectSection(SolutionItems) = preProject
+		build.cake = build.cake
 		.github\workflows\build.yml = .github\workflows\build.yml
 		.github\workflows\release-nuget.yml = .github\workflows\release-nuget.yml
-		build.cake = build.cake
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BTProgressHUDDemo", "BTProgressHUDDemo\BTProgressHUDDemo.csproj", "{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTProgressHUDDemo", "BTProgressHUDDemo\BTProgressHUDDemo.csproj", "{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -56,6 +56,7 @@ Global
 		{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}.Debug|iPhone.Deploy.0 = Debug|Any CPU
 		{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{E8BFFAAB-E4E7-4FD2-9B48-AC708EA2F38B}.Release|iPhone.ActiveCfg = Release|Any CPU
@@ -66,10 +67,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FF80CC4C-1CE6-457A-BA02-04A7F403B8A3}
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{CCCB766D-95A7-4FCE-81BE-F9A8F1B3589B} = {519BA8F9-8A37-4096-BCCB-A66EE0DAA697}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FF80CC4C-1CE6-457A-BA02-04A7F403B8A3}
+	EndGlobalSection
 EndGlobal

BTProgressHUD/ProgressHUD.cs

@@ -58,7 +58,7 @@ public sealed class ProgressHUD : UIView
         private CAShapeLayer? _ringLayer;
         private List<NSObject>? _eventListeners;
         private bool _displayContinuousImage;
-        
+
         private ToastPosition _toastPosition = ToastPosition.Center;
 
         public static void Initialize()
@@ -162,7 +162,7 @@ public UIImage InfoOutlineFullImage
 
         public bool IsVisible => Alpha == 1;
 
-        static Dictionary<NativeHandle, ProgressHUD> windowHuds = new ();
+        static Dictionary<NativeHandle, ProgressHUD> windowHuds = new();
 
         public static ProgressHUD? For(UIWindow? window)
         {
@@ -205,7 +205,7 @@ public UIImage InfoOutlineFullImage
 
             return For(window);
         }
-        
+
         CAShapeLayer RingLayer
         {
             get
@@ -270,13 +270,13 @@ UIView HudView
                         Translucent = true,
                         BarTintColor = ProgressHUDAppearance.HudBackgroundColor,
                         BackgroundColor = ProgressHUDAppearance.HudBackgroundColor
-                    };    
+                    };
                 }
 
                 hudView.AutoresizingMask =
                     UIViewAutoresizing.FlexibleBottomMargin | UIViewAutoresizing.FlexibleTopMargin |
                     UIViewAutoresizing.FlexibleRightMargin | UIViewAutoresizing.FlexibleLeftMargin;
-                
+
                 hudView.Layer.CornerRadius = ProgressHUDAppearance.HudCornerRadius;
                 hudView.Layer.MasksToBounds = true;
 
@@ -302,7 +302,7 @@ UILabel StringLabel
                     Font = ProgressHUDAppearance.HudFont,
                     Lines = 0
                 };
-                
+
                 // ReSharper disable once ConditionIsAlwaysTrueOrFalse
                 if (_stringLabel.Superview == null)
                 {
@@ -327,7 +327,7 @@ UIButton CancelHudButton
                     _cancelHud.SetTitleColor(ProgressHUDAppearance.HudButtonTextColor, UIControlState.Normal);
                     UserInteractionEnabled = true;
                 }
-                
+
                 // ReSharper disable once ConditionIsAlwaysTrueOrFalse
                 if (_cancelHud.Superview == null)
                 {
@@ -371,10 +371,12 @@ UIActivityIndicatorView SpinnerView
                         UIActivityIndicatorViewStyle.WhiteLarge)
                 {
                     HidesWhenStopped = true,
-                    Bounds = new CGRect(0, 0, 37, 37),
+                    Bounds = new CGRect(0, 0, 37, 37 ),
                     Color = ProgressHUDAppearance.RingColor
                 };
 
+                _spinnerView.Transform = CGAffineTransform.MakeScale(ProgressHUDAppearance.ActivityIndicatorScale, ProgressHUDAppearance.ActivityIndicatorScale);
+
                 // ReSharper disable once ConditionIsAlwaysTrueOrFalse
                 if (_spinnerView.Superview == null)
                     HudView.AddSubview(_spinnerView);
@@ -583,7 +585,7 @@ private void ShowProgressWorker(
             OverlayView.Hidden = false;
             _toastPosition = toastPosition;
             PositionHUD(null);
-            
+
             if (Alpha != 1)
             {
                 RegisterNotifications();
@@ -833,8 +835,8 @@ private void PositionHUD(NSNotification? notification)
             var orientationFrame = activeWindowBounds.Value;
 
             var activeHeight = GetActiveHeight(ignoreOrientation, orientation, orientationFrame, keyboardHeight);
-            
-            float posY = MathF.Floor(activeHeight * 0.45f); 
+
+            float posY = MathF.Floor(activeHeight * 0.45f);
             float posX = (float)orientationFrame.Size.Width / 2f;
             float textHeight = (float)StringLabel.Frame.Height / 2f + 40;
 
@@ -844,7 +846,7 @@ private void PositionHUD(NSNotification? notification)
                 ToastPosition.Top => textHeight,
                 _ => posY
             };
-            
+
             CGPoint newCenter;
             float rotateAngle;
 
@@ -1073,7 +1075,7 @@ private float AdjustSizesForText(string? text, float hudHeight, bool imageUsed,
         {
             if (string.IsNullOrEmpty(text))
                 return hudHeight;
-            
+
             var lineCount = Math.Min(10, text!.Split('\n').Length + 1);
 
             var stringSize = new NSString(text).GetBoundingRect(new CGSize(200, 30 * lineCount),

BTProgressHUD/ProgressHUDAppearance.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UIKit;
 
 namespace BigTed;
@@ -30,7 +30,8 @@ public static class ProgressHUDAppearance
     public const float DefaultRingThickness = 1f;
     public const float DefaultHudCornerRadius = 10f;
     public const double DefaultProgressUpdateInterval = 300;
-    
+    public const float DefaultActivityIndicatorScale = 1f;
+
     /// <summary>
     /// Get or set definite progress indicator ring radius to control its size
     /// </summary>
@@ -45,7 +46,12 @@ public static class ProgressHUDAppearance
     /// Get or set update interval for definite progress indicator ring animation
     /// </summary>
     public static double RingProgressUpdateInterval { get; set; } = DefaultProgressUpdateInterval;
-    
+
+    /// <summary>
+    /// Get or set definite activity indicator scale to control its size
+    /// </summary>
+    public static float ActivityIndicatorScale { get; set; } = DefaultActivityIndicatorScale;
+
     /// <summary>
     /// Get or set definite progress indicator ring foreground color
     /// </summary>

BTProgressHUDDemo/MainViewModel.cs

@@ -19,7 +19,8 @@ public MainViewModel()
                 {
                     BTProgressHUD.Dismiss();
                 }, false),
-                Create("Show", () => BTProgressHUD.Show(), true),
+                Create("Show", () => { ProgressHUDAppearance.ActivityIndicatorScale = ProgressHUDAppearance.DefaultActivityIndicatorScale; BTProgressHUD.Show(); }, true),
+                Create("Show with scaled activity indicator", () => { ProgressHUDAppearance.ActivityIndicatorScale = 2f; BTProgressHUD.Show(); }, true),
                 Create("Cancel problem 3", () => BTProgressHUD.Show("Cancel", () => KillAfter(), "Cancel and text"), false),
                 Create("Cancel problem 2", () => BTProgressHUD.Show("Cancel", () => KillAfter()), false),
                 Create("Cancel problem", () => BTProgressHUD.Show("Cancel", () => KillAfter(), "This is a multilinetext\nSome more text\n more text\n and again more text"), false),