Add the ability to overlay custom views instead of having a percentag…

…e indicator Signed-off-by: Phil Zet (Zakharchenko) <[email protected]>
philptr · Nov 13, 2021 · 1ccbec9 · 1ccbec9
1 parent c0a1d3d
commit 1ccbec9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/Sources/PZCircularControl/Indicator.swift b/Sources/PZCircularControl/Indicator.swift
@@ -17,6 +17,7 @@ internal struct Indicator<InnerBackgoundType: ShapeStyle, OuterBackgroundType: S
     var glowDistance: CGFloat
     var font: Font
     var textFormatter: ((CGFloat) -> String)
+    var overlayView: AnyView?
 
     var body: some View {
 
@@ -44,7 +45,8 @@ internal struct Indicator<InnerBackgoundType: ShapeStyle, OuterBackgroundType: S
                             barWidth: self.barWidth,
                             glowDistance: self.glowDistance,
                             font: self.font,
-                            textFormatter: self.textFormatter
+                            textFormatter: self.textFormatter,
+                            overlayView: overlayView
                         )
                     )
             }

diff --git a/Sources/PZCircularControl/PZCircularControl.swift b/Sources/PZCircularControl/PZCircularControl.swift
@@ -39,7 +39,8 @@ public struct PZCircularControl<InnerBackgoundType: ShapeStyle, OuterBackgroundT
                 barWidth: self.params.barWidth,
                 glowDistance: self.params.glowDistance,
                 font: self.params.font,
-                textFormatter: self.params.textFormatter
+                textFormatter: self.params.textFormatter,
+                overlayView: self.params.overlayView
             )
         )
     }

diff --git a/Sources/PZCircularControl/PZCircularControlParams.swift b/Sources/PZCircularControl/PZCircularControlParams.swift
@@ -8,7 +8,9 @@
 import SwiftUI
 import Combine
 
-open class PZCircularControlParams<InnerBackgoundType: ShapeStyle, OuterBackgroundType: ShapeStyle, TintType: ShapeStyle>: ObservableObject {
+open class PZCircularControlParams<InnerBackgoundType: ShapeStyle,
+                                   OuterBackgroundType: ShapeStyle,
+                                   TintType: ShapeStyle>: ObservableObject {
 
     @Published public var progress: CGFloat = 0
     @Published public var innerBackgroundColor: InnerBackgoundType
@@ -19,6 +21,7 @@ open class PZCircularControlParams<InnerBackgoundType: ShapeStyle, OuterBackgrou
     @Published public var glowDistance: CGFloat
     @Published public var font: Font
     @Published public var textFormatter: ((CGFloat) -> String)
+    @Published public var overlayView: AnyView?
 
     public init(
         innerBackgroundColor: InnerBackgoundType = Color.clear as! InnerBackgoundType,
@@ -35,7 +38,8 @@ open class PZCircularControlParams<InnerBackgoundType: ShapeStyle, OuterBackgrou
         initialValue: CGFloat = 0.0,
         textFormatter: @escaping ((CGFloat) -> String) = { progress in
             "\(Int(progress * 100))%"
-        }
+        },
+        overlayView: AnyView? = nil
     ) {
         self.innerBackgroundColor = innerBackgroundColor
         self.outerBackgroundColor = outerBackgroundColor
@@ -46,6 +50,7 @@ open class PZCircularControlParams<InnerBackgoundType: ShapeStyle, OuterBackgrou
         self.font = font
         self.progress = initialValue
         self.textFormatter = textFormatter
+        self.overlayView = overlayView
     }
 
 }

diff --git a/Sources/PZCircularControl/PercentageIndicator.swift b/Sources/PZCircularControl/PercentageIndicator.swift
@@ -16,6 +16,7 @@ internal struct PercentageIndicator<S: ShapeStyle>: AnimatableModifier {
     var glowDistance: CGFloat
     var font: Font
     var textFormatter: ((CGFloat) -> String)
+    var overlayView: AnyView?
 
     var animatableData: CGFloat {
         get { pct }
@@ -38,7 +39,16 @@ internal struct PercentageIndicator<S: ShapeStyle>: AnimatableModifier {
                         .fill(self.tintColor)
 
             )
-            .overlay(!self.isBackground ? LabelView(pct: pct, textColor: self.textColor, font: self.font, textFormatter: self.textFormatter) : nil)
+            .overlay(!isBackground ?
+                     (overlayView ??
+                      AnyView(LabelView(
+                        pct: pct,
+                        textColor: textColor,
+                        font: self.font,
+                        textFormatter: textFormatter
+                      ))
+                     )
+                     : nil)
     }
 
 

diff --git a/Tests/PZCircularControlTests/PZCircularControlTests.swift b/Tests/PZCircularControlTests/PZCircularControlTests.swift
@@ -6,7 +6,7 @@ final class PZCircularControlTests: XCTestCase {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct
         // results.
-        XCTAssertEqual(PZCircularControl().text, "Hello, World!")
+        XCTAssertEqual("Hello, World!", "Hello, World!")
     }
 
     static var allTests = [