Merge pull request #18 from Econa77/cleanup-codes

Typo fixes and code style unification
gh123man · Oct 17, 2023 · 2ddcc6e · 2ddcc6e
2 parents 68468cd + 21d485e
commit 2ddcc6e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 60 deletions.
diff --git a/Examples/RefresherTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/RefresherTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "swiftui-introspect",
-        "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git",
-        "state": {
-          "branch": null,
-          "revision": "1136c9a348329887844de9353107c787becc675b",
-          "version": "0.11.0"
-        }
+  "pins" : [
+    {
+      "identity" : "swiftui-introspect",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
+      "state" : {
+        "revision" : "3ced72fccb284235c266c1e8a32f1bf93129fc74",
+        "version" : "1.1.0"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
diff --git a/Sources/Refresher/BlurView.swift b/Sources/Refresher/BlurView.swift
@@ -1,4 +1,3 @@
-
 #if canImport(UIKit)
 import Foundation
 import SwiftUI
@@ -21,5 +20,4 @@ struct BlurView: UIViewRepresentable {
         uiView.effect = UIBlurEffect(style: self.style)
     }
 }
-
 #endif
diff --git a/Sources/Refresher/DefaultRefreshView.swift b/Sources/Refresher/DefaultRefreshView.swift
@@ -2,7 +2,6 @@ import Foundation
 import SwiftUI
 
 struct UIActivityView: UIViewRepresentable {
-
     var style: UIActivityIndicatorView.Style = .medium
     @Binding var isAnimating: Bool
 
@@ -22,9 +21,7 @@ struct UIActivityView: UIViewRepresentable {
     }
 }
 
-
 public struct DefaultRefreshView: View {
-
     @Binding var state: RefresherState
     @State var isAnimating = false
 
@@ -58,4 +55,3 @@ public struct DefaultRefreshView: View {
         }
     }
 }
-
diff --git a/Sources/Refresher/Math.swift b/Sources/Refresher/Math.swift
@@ -1,9 +1,3 @@
-//
-//  File.swift
-//  
-//
-//  Created by Brian Floersch on 4/19/22.
-//
 #if canImport(UIKit)
 import Foundation
 import UIKit

diff --git a/Sources/Refresher/OffsetReader.swift b/Sources/Refresher/OffsetReader.swift
@@ -2,9 +2,9 @@ import Foundation
 import SwiftUI
 
 struct OffsetReader: View {
-
     var onChange: (CGFloat) -> ()
     @State private var frame = CGRect()
+
     public var body: some View {
         GeometryReader { geometry in
             Spacer(minLength: 0)

diff --git a/Sources/Refresher/Refresher.swift b/Sources/Refresher/Refresher.swift
@@ -58,7 +58,6 @@ public struct Config {
 }
 
 public enum Style {
-
     /// Spinner pulls down and centers on a padding view above the scrollview
     case `default`
 
@@ -77,7 +76,6 @@ public enum RefreshMode {
 }
 
 public struct RefresherState {
-
     /// Updated without animation - NOTE: Both modes are always updated in sequence (this one is first)
     public var mode: RefreshMode = .notRefreshing
 
@@ -161,7 +159,7 @@ public struct RefreshableScrollView<Content: View, RefreshView: View>: View {
     }
 
     @ViewBuilder
-    private var refershSpinner: some View {
+    private var refreshSpinner: some View {
         if style == .default || style == .overlay {
             RefreshSpinnerView(offScreenPoint: config.defaultSpinnerOffScreenPoint,
                                 pullClipPoint: config.defaultSpinnerPullClipPoint,
@@ -176,7 +174,7 @@ public struct RefreshableScrollView<Content: View, RefreshView: View>: View {
     }
 
     @ViewBuilder
-    private var systemStylerefreshSpinner: some View {
+    private var systemStyleRefreshSpinner: some View {
         if style == .system {
             SystemStyleRefreshSpinner(opacityClipPoint: config.systemSpinnerOpacityClipPoint,
                                       state: state,
@@ -188,7 +186,7 @@ public struct RefreshableScrollView<Content: View, RefreshView: View>: View {
     }
 
     @ViewBuilder
-    private var system2StylerefreshSpinner: some View {
+    private var system2StyleRefreshSpinner: some View {
         if style == .system2 {
             System2StyleRefreshSpinner(opacityClipPoint: config.systemSpinnerOpacityClipPoint,
                                        state: state,
@@ -207,9 +205,8 @@ public struct RefreshableScrollView<Content: View, RefreshView: View>: View {
                     OffsetReader { val in
                         offsetChanged(val)
                     }
-                    systemStylerefreshSpinner
-                    system2StylerefreshSpinner
-
+                    systemStyleRefreshSpinner
+                    system2StyleRefreshSpinner
 
                     // Content wrapper with refresh banner
                     VStack(spacing: 0) {
@@ -219,7 +216,7 @@ public struct RefreshableScrollView<Content: View, RefreshView: View>: View {
                         .offset(y: refreshHeaderOffset)
                     }
                     // renders over content
-                    refershSpinner
+                    refreshSpinner
                 }
             }
             .introspect(.scrollView, on: .iOS(.v14, .v15, .v16, .v17)) { scrollView in
@@ -243,7 +240,6 @@ public struct RefreshableScrollView<Content: View, RefreshView: View>: View {
         distance = val - headerInset
         state.dragPosition = normalize(from: 0, to: config.refreshAt, by: distance)
 
-
         // If the refresh state has settled, we are not touching the screen, and the offset has settled, we can signal the view to update itself.
         if canRefresh, !isFingerDown, distance <= 0 {
             renderLock = false

diff --git a/Sources/Refresher/RenderControl.swift b/Sources/Refresher/RenderControl.swift
@@ -1,30 +1,6 @@
 import Foundation
 import SwiftUI
 
-struct DeferedRenderView<Content: View>: View {
-    struct DeferableView: View, Equatable {
-        @Binding var signal: Bool
-        @ViewBuilder var content: Content
-
-        static func == (lhs: DeferableView, rhs: DeferableView) -> Bool {
-            lhs.signal == rhs.signal
-        }
-
-        var body: some View {
-            content
-        }
-    }
-
-    @Binding var signal: Bool
-    @ViewBuilder var content: Content
-
-    public var body: some View {
-        return DeferableView(signal: $signal) {
-            content
-        }.equatable()
-    }
-}
-
 struct LockedRenderView<Content: View>: View {
     struct LockedView: View, Equatable {
         @Binding var lock: Bool