Rearrange CameraButtonUI parameters, update readme.

erikdrobne · Dec 13, 2022 · e3aa5f2 · e3aa5f2
1 parent a206e93
commit e3aa5f2
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 10 deletions.
diff --git a/CameraButtonExample/CameraButtonExample/PhotoView.swift b/CameraButtonExample/CameraButtonExample/PhotoView.swift
@@ -11,14 +11,15 @@ import CameraButton
 struct PhotoView: View {
 
     @State var isRecording: Bool = false
-    @State var didFinishProgress: Bool = false
 
     var body: some View {
         CameraButtonUI(
             size: 72,
+            borderColor: .red,
+            fillColor: (.purple, .orange),
+            progressColor: .green,
             progressDuration: 5,
-            isRecording: self.$isRecording,
-            didFinishProgress: self.$didFinishProgress
+            isRecording: self.$isRecording
         )
         .simultaneousGesture(
             TapGesture()

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ A simple camera button that can be used for photo and video capturing. It's a su
 
 ## Requirements
 
-**iOS 10.0** or higher
+**iOS 14.0** or higher
 
 ## Instalation
 
@@ -27,6 +27,8 @@ dependencies: [
 import CameraButton
 ```
 
+### UIKit
+
 ### Initialize
 
 ```Swift
@@ -70,3 +72,42 @@ The `CameraButtonDelegate` requires you to implement the following methods:
 func didTap(_ button: CameraButton)
 func didFinishProgress()
 ```
+
+### SwiftUI
+
+```Swift
+struct PhotoView: View {
+
+    @State var isRecording: Bool = false
+    @State var didFinishProgress: Bool = false
+
+    var body: some View {
+        CameraButtonUI(
+            size: 72,
+            borderColor: .red,
+            fillColor: (.purple, .orange),
+            progressColor: .green,
+            progressDuration: 5,
+            isRecording: self.$isRecording
+        )
+        // Handle tap gesture
+        .simultaneousGesture(
+            TapGesture()
+                .onEnded { _ in
+                    print("tap")
+                }
+        )
+        // Start recording on Long-press gesture
+        .gesture(
+            LongPressGesture(minimumDuration: 1)
+                .onChanged { val in
+                    isRecording = true
+                }
+        )
+        // Observe state changes
+        .onChange(of: isRecording, perform: { [isRecording] newValue in
+            print("isRecording", isRecording, newValue)
+        })
+    }
+}
+```
diff --git a/Sources/CameraButtonUI/CameraButtonUI.swift b/Sources/CameraButtonUI/CameraButtonUI.swift
@@ -31,12 +31,11 @@ public struct CameraButtonUI: View {
 
     public init(
         size: CGFloat = 72,
-        fillColor: (`default`: Color, record: Color) = (.white, .white),
         borderColor: Color = .white,
+        fillColor: (`default`: Color, record: Color) = (.white, .white),
         progressColor: Color = .red,
         progressDuration: TimeInterval,
-        isRecording: Binding<Bool>,
-        didFinishProgress: Binding<Bool>
+        isRecording: Binding<Bool>
     ) {
         self.size = size
         self.borderColor = borderColor
@@ -50,7 +49,7 @@ public struct CameraButtonUI: View {
         ZStack {
             if isRecording {
                 Circle()
-                    .fill(progressColor)
+                    .fill(borderColor)
                     .frame(width: size, height: size)
             } else {
                 Circle()
@@ -71,7 +70,7 @@ public struct CameraButtonUI: View {
             Circle()
                 .trim(from: 0, to: percentage)
                 .stroke(
-                    fillColor.record,
+                    progressColor,
                     style: StrokeStyle(lineWidth: size * 0.08, lineCap: .round)
                 )
                 .rotationEffect(-.radians(.pi)/2)
@@ -125,6 +124,6 @@ public struct CameraButtonUI: View {
 
 struct SwiftUIView_Previews: PreviewProvider {
     static var previews: some View {
-        CameraButtonUI(progressDuration: 5, isRecording: .constant(false), didFinishProgress: .constant(false))
+        CameraButtonUI(progressDuration: 5, isRecording: .constant(false))
     }
 }