From 0fb57e69b6130b4beb8ba49eaafe13563f2f6bd6 Mon Sep 17 00:00:00 2001
From: AlisaMylnikova <alisa.mylnikova@exyte.com>
Date: Mon, 18 Apr 2022 19:13:32 +0700
Subject: [PATCH] Add parameters to some indicators

---
 ActivityIndicatorView.podspec                 |  2 +-
 .../xcshareddata/IDEWorkspaceChecks.plist     |  8 +++
 Example/Example/ContentView.swift             | 20 +++----
 Example/Podfile.lock                          |  4 +-
 README.md                                     | 59 ++++++++++++++-----
 Source/ActivityIndicatorView.swift            | 56 +++++++++---------
 Source/Indicators/ArcsIndicatorView.swift     | 19 +++---
 Source/Indicators/DefaultIndicatorView.swift  | 13 ++--
 .../Indicators/EqualizerIndicatorView.swift   | 13 ++--
 .../FlickeringDotsIndicatorView.swift         | 17 +++---
 Source/Indicators/GradientIndicatorView.swift |  6 +-
 .../Indicators/GrowingArcIndicatorView.swift  |  8 ++-
 .../GrowingCircleIndicatorView.swift          |  8 +--
 .../Indicators/OpacityDotsIndicatorView.swift | 19 +++---
 .../RotatingDotsIndicatorView.swift           | 15 ++---
 .../Indicators/ScalingDotsIndicatorView.swift | 12 ++--
 16 files changed, 162 insertions(+), 117 deletions(-)
 create mode 100644 Example/Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/ActivityIndicatorView.podspec b/ActivityIndicatorView.podspec
index 6eee66e..7db2b99 100644
--- a/ActivityIndicatorView.podspec
+++ b/ActivityIndicatorView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "ActivityIndicatorView"
-  s.version          = "1.0.1"
+  s.version          = "1.1.0"
   s.summary          = "A number of preset loading indicators created with SwiftUI."
 
   s.homepage         = 'https://github.com/exyte/ActivityIndicatorView.git'
diff --git a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Example/Example/ContentView.swift b/Example/Example/ContentView.swift
index fab462b..f71b189 100644
--- a/Example/Example/ContentView.swift
+++ b/Example/Example/ContentView.swift
@@ -23,19 +23,19 @@ struct ContentView: View {
                     Spacer()
                     VStack(spacing: spacing) {
                         Spacer()
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .default)
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .default())
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .arcs)
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .arcs())
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .rotatingDots)
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .rotatingDots())
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .equalizer)
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .equalizer())
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .growingArc())
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .growingArc(.red))
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
                         Spacer()
@@ -45,18 +45,18 @@ struct ContentView: View {
 
                     VStack(spacing: spacing) {
                         Spacer()
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .opacityDots)
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .opacityDots())
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .scalingDots)
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .scalingDots())
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .gradient([Color.white, Color.red]))
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .gradient([Color.white, Color.red]))
                             .frame(width: size, height: size)
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .growingCircle)
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .growingCircle)
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
-                        ActivityIndicatorView(isVisible: self.$showLoadingIndicator, type: .flickeringDots)
+                        ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .flickeringDots())
                             .frame(width: size, height: size)
                             .foregroundColor(.red)
                         Spacer()
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index 724cb03..69ec5a1 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - ActivityIndicatorView (1.0.0)
+  - ActivityIndicatorView (1.0.1)
 
 DEPENDENCIES:
   - ActivityIndicatorView (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ActivityIndicatorView: a9f6fc491aa8a7b351ea899fab0570b8288ba5b4
+  ActivityIndicatorView: 425e6db935766a4a87d65cd2ce021a023bfa0603
 
 PODFILE CHECKSUM: 54898b444f2a064d09ec9574815fb481a733ffec
 
diff --git a/README.md b/README.md
index bb9947a..9636b40 100644
--- a/README.md
+++ b/README.md
@@ -38,26 +38,53 @@ You may alter it with standard SwiftUI means like this:
         .frame(width: 50.0, height: 50.0)
         .foregroundColor(.red)
    ```
+Or specify another indicator type:
 
-### Indicator types
-`default` - iOS UIActivityIndicator style  
-`arcs`  
-`rotatingDots`  
-`flickeringDots`  
-`scalingDots`  
-`opacityDots`  
-`equalizer`  
-`growingArc` - add custom color for growing Arc, the default value is `Color.red`
    ```swift
-   ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .growingArc(.red))
+   ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .growingArc(.red, lineWidth: 4))
        .frame(width: 50.0, height: 50.0)
    ```
-`growingCircle`  
-`gradient` - circle with angular gradient border stroke, pass colors ilke this:
-   ```swift
-   ActivityIndicatorView(isVisible: $showLoadingIndicator, type: .gradient([.white, .red]))
-       .frame(width: 50.0, height: 50.0)
-   ```  
+
+### Indicator types
+Each indicator type has a number of parameters that have reasonable defaults. You can change them as you see fit, but it is advised to not set them too high or too low.
+
+`default` - iOS UIActivityIndicator style  
+```swift
+.default(count: 8)
+```
+`arcs`    
+```swift
+.arcs(count: 3, lineWidth: 2)
+```
+`rotatingDots`    
+```swift
+.rotatingDots(count: 5)
+```
+`flickeringDots`    
+```swift
+.flickeringDots(count: 8)
+```
+`scalingDots`     
+```swift
+.scalingDots(count: 3, inset: 2)
+``` 
+`opacityDots`  
+```swift
+.opacityDots(count: 3, inset: 4)
+``` 
+`equalizer`  
+```swift
+.equalizer(count: 5)
+```
+`growingArc` - add custom color for growing Arc, the default value is `Color.black`      
+```swift
+.growingArc(.red, lineWidth: 4))
+```
+`growingCircle` no parameters   
+`gradient` - circle with angular gradient border stroke, pass colors ilke this:    
+```swift
+.gradient([.white, .red], lineWidth: 4)
+```  
 
 ## Examples
 
diff --git a/Source/ActivityIndicatorView.swift b/Source/ActivityIndicatorView.swift
index 6c2e30b..c0aedb5 100644
--- a/Source/ActivityIndicatorView.swift
+++ b/Source/ActivityIndicatorView.swift
@@ -11,23 +11,23 @@ import SwiftUI
 public struct ActivityIndicatorView: View {
 
     public enum IndicatorType {
-        case `default`
-        case arcs
-        case rotatingDots
-        case flickeringDots
-        case scalingDots
-        case opacityDots
-        case equalizer
-        case growingArc(Color = .red)
+        case `default`(count: Int = 8)
+        case arcs(count: Int = 3, lineWidth: CGFloat = 2)
+        case rotatingDots(count: Int = 5)
+        case flickeringDots(count: Int = 8)
+        case scalingDots(count: Int = 3, inset: Int = 2)
+        case opacityDots(count: Int = 3, inset: Int = 4)
+        case equalizer(count: Int = 5)
+        case growingArc(Color = .black, lineWidth: CGFloat = 4)
         case growingCircle
-        case gradient([Color], CGLineCap = .butt)
+        case gradient([Color], CGLineCap = .butt, lineWidth: CGFloat = 4)
     }
 
     @Binding var isVisible: Bool
     var type: IndicatorType
 
     public init(isVisible: Binding<Bool>, type: IndicatorType) {
-        self._isVisible = isVisible
+        _isVisible = isVisible
         self.type = type
     }
 
@@ -44,26 +44,26 @@ public struct ActivityIndicatorView: View {
     private var indicator: some View {
         ZStack {
             switch type {
-            case .default:
-                DefaultIndicatorView()
-            case .arcs:
-                ArcsIndicatorView()
-            case .rotatingDots:
-                RotatingDotsIndicatorView()
-            case .flickeringDots:
-                FlickeringDotsIndicatorView()
-            case .scalingDots:
-                ScalingDotsIndicatorView()
-            case .opacityDots:
-                OpacityDotsIndicatorView()
-            case .equalizer:
-                EqualizerIndicatorView()
-            case .growingArc(let color):
-                GrowingArcIndicatorView(color: color)
+            case .default(let count):
+                DefaultIndicatorView(count: count)
+            case .arcs(let count, let lineWidth):
+                ArcsIndicatorView(count: count, lineWidth: lineWidth)
+            case .rotatingDots(let count):
+                RotatingDotsIndicatorView(count: count)
+            case .flickeringDots(let count):
+                FlickeringDotsIndicatorView(count: count)
+            case .scalingDots(let count, let inset):
+                ScalingDotsIndicatorView(count: count, inset: inset)
+            case .opacityDots(let count, let inset):
+                OpacityDotsIndicatorView(count: count, inset: inset)
+            case .equalizer(let count):
+                EqualizerIndicatorView(count: count)
+            case .growingArc(let color, let lineWidth):
+                GrowingArcIndicatorView(color: color, lineWidth: lineWidth)
             case .growingCircle:
                 GrowingCircleIndicatorView()
-            case .gradient(let colors, let lineCap):
-                GradientIndicatorView(colors: colors, lineCap: lineCap)
+            case .gradient(let colors, let lineCap, let lineWidth):
+                GradientIndicatorView(colors: colors, lineCap: lineCap, lineWidth: lineWidth)
             }
         }
     }
diff --git a/Source/Indicators/ArcsIndicatorView.swift b/Source/Indicators/ArcsIndicatorView.swift
index 26fd779..699952c 100644
--- a/Source/Indicators/ArcsIndicatorView.swift
+++ b/Source/Indicators/ArcsIndicatorView.swift
@@ -10,19 +10,22 @@ import SwiftUI
 
 struct ArcsIndicatorView: View {
 
-    private let count: Int = 3
+    let count: Int
+    let lineWidth: CGFloat
 
     var body: some View {
         GeometryReader { geometry in
-            ForEach(0..<self.count) { index in
-                ArcsIndicatorItemView(index: index, count: self.count, size: geometry.size)
+            ForEach(0..<count, id: \.self) { index in
+                ArcsIndicatorItemView(lineWidth: lineWidth, index: index, count: count, size: geometry.size)
             }
+            .frame(width: geometry.size.width, height: geometry.size.height)
         }
     }
 }
 
 struct ArcsIndicatorItemView: View {
 
+    let lineWidth: CGFloat
     let index: Int
     let count: Int
     let size: CGSize
@@ -36,20 +39,20 @@ struct ArcsIndicatorItemView: View {
 
         return Group { () -> Path in
             var p = Path()
-            p.addArc(center: CGPoint(x: self.size.width / 2, y: self.size.height / 2),
-                     radius: self.size.width / 2 - CGFloat(self.index) * CGFloat(self.count),
+            p.addArc(center: CGPoint(x: size.width / 2, y: size.height / 2),
+                     radius: size.width / 2 - CGFloat(index) * CGFloat(count),
                      startAngle: .degrees(0),
                      endAngle: .degrees(Double(Int.random(in: 120...300))),
                      clockwise: true)
-            return p.strokedPath(.init(lineWidth: 2))
+            return p.strokedPath(.init(lineWidth: lineWidth))
         }
         .frame(width: size.width, height: size.height)
         .rotationEffect(.degrees(rotation))
         .onAppear {
-            self.rotation = 0
+            rotation = 0
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
                 withAnimation(animation) {
-                    self.rotation = 360
+                    rotation = 360
                 }
             }
         }
diff --git a/Source/Indicators/DefaultIndicatorView.swift b/Source/Indicators/DefaultIndicatorView.swift
index d50a82f..78437b2 100644
--- a/Source/Indicators/DefaultIndicatorView.swift
+++ b/Source/Indicators/DefaultIndicatorView.swift
@@ -10,13 +10,14 @@ import SwiftUI
 
 struct DefaultIndicatorView: View {
 
-    private let count: Int = 8
+    let count: Int
 
     public var body: some View {
         GeometryReader { geometry in
-            ForEach(0..<self.count) { index in
-                DefaultIndicatorItemView(index: index, count: self.count, size: geometry.size)
-            }.frame(width: geometry.size.width, height: geometry.size.height)
+            ForEach(0..<count, id: \.self) { index in
+                DefaultIndicatorItemView(index: index, count: count, size: geometry.size)
+            }
+            .frame(width: geometry.size.width, height: geometry.size.height)
         }
     }
 }
@@ -46,9 +47,9 @@ struct DefaultIndicatorItemView: View {
             .offset(x: x, y: y)
             .opacity(opacity)
             .onAppear {
-                self.opacity = 1
+                opacity = 1
                 withAnimation(animation) {
-                    self.opacity = 0.3
+                    opacity = 0.3
                 }
             }
     }
diff --git a/Source/Indicators/EqualizerIndicatorView.swift b/Source/Indicators/EqualizerIndicatorView.swift
index 406275b..47750cb 100644
--- a/Source/Indicators/EqualizerIndicatorView.swift
+++ b/Source/Indicators/EqualizerIndicatorView.swift
@@ -10,13 +10,14 @@ import SwiftUI
 
 struct EqualizerIndicatorView: View {
 
-    private let count: Int = 5
+    let count: Int
 
     var body: some View {
         GeometryReader { geometry in
-            ForEach(0..<self.count) { index in
-                EqualizerIndicatorItemView(index: index, count: self.count, size: geometry.size)
-            }.frame(width: geometry.size.width, height: geometry.size.height)
+            ForEach(0..<count, id: \.self) { index in
+                EqualizerIndicatorItemView(index: index, count: count, size: geometry.size)
+            }
+            .frame(width: geometry.size.width, height: geometry.size.height)
         }
     }
 }
@@ -40,9 +41,9 @@ struct EqualizerIndicatorItemView: View {
             .frame(width: itemSize, height: size.height)
             .scaleEffect(x: 1, y: scale, anchor: .center)
             .onAppear {
-                self.scale = 1
+                scale = 1
                 withAnimation(animation) {
-                    self.scale = 0.4
+                    scale = 0.4
                 }
             }
             .offset(x: 2 * itemSize * CGFloat(index) - size.width / 2 + itemSize / 2)
diff --git a/Source/Indicators/FlickeringDotsIndicatorView.swift b/Source/Indicators/FlickeringDotsIndicatorView.swift
index a593009..9fbba07 100644
--- a/Source/Indicators/FlickeringDotsIndicatorView.swift
+++ b/Source/Indicators/FlickeringDotsIndicatorView.swift
@@ -10,13 +10,14 @@ import SwiftUI
 
 struct FlickeringDotsIndicatorView: View {
 
-    private let count: Int = 8
+    let count: Int
 
     var body: some View {
         GeometryReader { geometry in
-            ForEach(0..<self.count) { index in
-                FlickeringDotsIndicatorItemView(index: index, count: self.count, size: geometry.size)
-            }.frame(width: geometry.size.width, height: geometry.size.height)
+            ForEach(0..<count, id: \.self) { index in
+                FlickeringDotsIndicatorItemView(index: index, count: count, size: geometry.size)
+            }
+            .frame(width: geometry.size.width, height: geometry.size.height)
         }
     }
 }
@@ -46,11 +47,11 @@ struct FlickeringDotsIndicatorItemView: View {
             .scaleEffect(scale)
             .opacity(opacity)
             .onAppear {
-                self.scale = 1
-                self.opacity = 1
+                scale = 1
+                opacity = 1
                 withAnimation(animation) {
-                    self.scale = 0.5
-                    self.opacity = 0.3
+                    scale = 0.5
+                    opacity = 0.3
                 }
             }
             .offset(x: x, y: y)
diff --git a/Source/Indicators/GradientIndicatorView.swift b/Source/Indicators/GradientIndicatorView.swift
index 91524b0..bf9147e 100644
--- a/Source/Indicators/GradientIndicatorView.swift
+++ b/Source/Indicators/GradientIndicatorView.swift
@@ -12,13 +12,13 @@ struct GradientIndicatorView: View {
 
     let colors: [Color]
     let lineCap: CGLineCap
+    let lineWidth: CGFloat
 
     @State private var rotation: Double = 0
 
     var body: some View {
         let gradientColors = Gradient(colors: colors)
         let conic = AngularGradient(gradient: gradientColors, center: .center, startAngle: .zero, endAngle: .degrees(360))
-        let lineWidth: CGFloat = 4
 
         let animation = Animation
             .linear(duration: 1.5)
@@ -33,10 +33,10 @@ struct GradientIndicatorView: View {
                 .stroke(conic, style: StrokeStyle(lineWidth: lineWidth, lineCap: lineCap))
                 .rotationEffect(.degrees(rotation))
                 .onAppear {
-                    self.rotation = 0
+                    rotation = 0
                     DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
                         withAnimation(animation) {
-                            self.rotation = 360
+                            rotation = 360
                         }
                     }
                 }
diff --git a/Source/Indicators/GrowingArcIndicatorView.swift b/Source/Indicators/GrowingArcIndicatorView.swift
index 112ee25..2aa5094 100644
--- a/Source/Indicators/GrowingArcIndicatorView.swift
+++ b/Source/Indicators/GrowingArcIndicatorView.swift
@@ -11,6 +11,8 @@ import SwiftUI
 struct GrowingArcIndicatorView: View {
 
     let color: Color
+    let lineWidth: CGFloat
+    
     @State private var animatableParameter: Double = 0
 
     public var body: some View {
@@ -19,12 +21,12 @@ struct GrowingArcIndicatorView: View {
             .repeatForever(autoreverses: false)
         
         return GrowingArc(p: animatableParameter)
-            .stroke(color, lineWidth: 4)
+            .stroke(color, lineWidth: lineWidth)
             .onAppear {
-                self.animatableParameter = 0
+                animatableParameter = 0
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
                     withAnimation(animation) {
-                        self.animatableParameter = 1
+                        animatableParameter = 1
                     }
                 }
             }
diff --git a/Source/Indicators/GrowingCircleIndicatorView.swift b/Source/Indicators/GrowingCircleIndicatorView.swift
index 86e7f14..a5ca168 100644
--- a/Source/Indicators/GrowingCircleIndicatorView.swift
+++ b/Source/Indicators/GrowingCircleIndicatorView.swift
@@ -22,12 +22,12 @@ struct GrowingCircleIndicatorView: View {
             .scaleEffect(scale)
             .opacity(opacity)
             .onAppear {
-                self.scale = 0
-                self.opacity = 1
+                scale = 0
+                opacity = 1
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
                     withAnimation(animation) {
-                        self.scale = 1
-                        self.opacity = 0
+                        scale = 1
+                        opacity = 0
                     }
                 }
             }
diff --git a/Source/Indicators/OpacityDotsIndicatorView.swift b/Source/Indicators/OpacityDotsIndicatorView.swift
index 322a5d8..cb4a302 100644
--- a/Source/Indicators/OpacityDotsIndicatorView.swift
+++ b/Source/Indicators/OpacityDotsIndicatorView.swift
@@ -10,14 +10,15 @@ import SwiftUI
 
 struct OpacityDotsIndicatorView: View {
 
-    private let count: Int = 3
-    private let inset: Int = 4
+    let count: Int
+    let inset: Int
 
     var body: some View {
         GeometryReader { geometry in
-            ForEach(0..<self.count) { index in
-                OpacityDotsIndicatorItemView(index: index, count: self.count, inset: self.inset, size: geometry.size)
-            }.frame(width: geometry.size.width, height: geometry.size.height)
+            ForEach(0..<count, id: \.self) { index in
+                OpacityDotsIndicatorItemView(index: index, count: count, inset: inset, size: geometry.size)
+            }
+            .frame(width: geometry.size.width, height: geometry.size.height)
         }
     }
 }
@@ -44,11 +45,11 @@ struct OpacityDotsIndicatorItemView: View {
             .scaleEffect(scale)
             .opacity(opacity)
             .onAppear {
-                self.scale = 1
-                self.opacity = 1
+                scale = 1
+                opacity = 1
                 withAnimation(animation) {
-                    self.scale = 0.9
-                    self.opacity = 0.3
+                    scale = 0.9
+                    opacity = 0.3
                 }
             }
             .offset(x: (itemSize + CGFloat(inset)) * CGFloat(index) - size.width / 2 + itemSize / 2)
diff --git a/Source/Indicators/RotatingDotsIndicatorView.swift b/Source/Indicators/RotatingDotsIndicatorView.swift
index b1f85ed..5a9f900 100644
--- a/Source/Indicators/RotatingDotsIndicatorView.swift
+++ b/Source/Indicators/RotatingDotsIndicatorView.swift
@@ -10,13 +10,14 @@ import SwiftUI
 
 struct RotatingDotsIndicatorView: View {
 
-    private let count: Int = 5
+    let count: Int
 
     var body: some View {
         GeometryReader { geometry in
-            ForEach(0..<self.count) { index in
+            ForEach(0..<count, id: \.self) { index in
                 RotatingDotsIndicatorItemView(index: index, size: geometry.size)
-            }.frame(width: geometry.size.width, height: geometry.size.height)
+            }
+            .frame(width: geometry.size.width, height: geometry.size.height)
         }
     }
 }
@@ -40,11 +41,11 @@ struct RotatingDotsIndicatorItemView: View {
             .offset(y: size.width / 10 - size.height / 2)
             .rotationEffect(.degrees(rotation))
             .onAppear {
-                self.rotation = 0
-                self.scale = (5 - CGFloat(self.index)) / 5
+                rotation = 0
+                scale = (5 - CGFloat(index)) / 5
                 withAnimation(animation) {
-                    self.rotation = 360
-                    self.scale = (1 + CGFloat(self.index)) / 5
+                    rotation = 360
+                    scale = (1 + CGFloat(index)) / 5
                 }
             }
     }
diff --git a/Source/Indicators/ScalingDotsIndicatorView.swift b/Source/Indicators/ScalingDotsIndicatorView.swift
index 01bad97..447a84b 100644
--- a/Source/Indicators/ScalingDotsIndicatorView.swift
+++ b/Source/Indicators/ScalingDotsIndicatorView.swift
@@ -10,13 +10,13 @@ import SwiftUI
 
 struct ScalingDotsIndicatorView: View {
 
-    private let count: Int = 3
-    private let inset: Int = 2
+    let count: Int
+    let inset: Int
 
     var body: some View {
         GeometryReader { geometry in
-            ForEach(0..<self.count) { index in
-                ScalingDotsIndicatorItemView(index: index, count: self.count, inset: self.inset, size: geometry.size)
+            ForEach(0..<count, id: \.self) { index in
+                ScalingDotsIndicatorItemView(index: index, count: count, inset: inset, size: geometry.size)
             }.frame(width: geometry.size.width, height: geometry.size.height)
         }
     }
@@ -42,9 +42,9 @@ struct ScalingDotsIndicatorItemView: View {
             .frame(width: itemSize, height: itemSize)
             .scaleEffect(scale)
             .onAppear {
-                self.scale = 1
+                scale = 1
                 withAnimation(animation) {
-                    self.scale = 0.3
+                    scale = 0.3
                 }
             }
             .offset(x: (itemSize + CGFloat(inset)) * CGFloat(index) - size.width / 2 + itemSize / 2)