Merge pull request #10 from nssina/main

Sina Rabiei · web-flow · commit 84efe24735ba · 2022-04-26T15:26:54.000+02:00
Changed package name to ShortcutUI
diff --git a/Package.swift b/Package.swift
@@ -1,10 +1,10 @@
-// swift-tools-version:5.5
+// swift-tools-version: 5.6
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
-    name: "ShortcutSwiftUI",
+    name: "ShortcutUI",
     platforms: [
         .iOS(.v13),
         .macOS(.v11),
@@ -13,8 +13,8 @@ let package = Package(
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
-            name: "ShortcutSwiftUI",
-            targets: ["ShortcutSwiftUI"]),
+            name: "ShortcutUI",
+            targets: ["ShortcutUI"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -24,10 +24,10 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
-            name: "ShortcutSwiftUI",
+            name: "ShortcutUI",
             dependencies: []),
         .testTarget(
-            name: "ShortcutSwiftUI-Tests",
-            dependencies: ["ShortcutSwiftUI"]),
+            name: "ShortcutUITests",
+            dependencies: ["ShortcutUI"]),
     ]
 )
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Shortcut SwiftUI
+# ShortcutUI
 
 Contains common utility functions and extensions.
 
@@ -45,11 +45,11 @@ let package = Package(
     .package(url: "git@github.com:shortcut/shortcut-swiftui-ios.git", from: "0.0.1")
   ],
   targets: [
-    .target(name: "YourTestProject", dependencies: ["ShortcutSwiftUI"])
+    .target(name: "YourTestProject", dependencies: ["ShortcutUI"])
   ]
 )
 ```
-And then import wherever needed: ```import ShortcutSwiftUI ```
+And then import wherever needed: ```import ShortcutUI ```
 
 #### Adding it to an existent iOS Project via Swift Package Manager
 
@@ -63,13 +63,13 @@ If you have doubts, please, check the following links:
 
 [Creating Swift Packages](https://developer.apple.com/videos/play/wwdc2019/410/)
 
-After successfully retrieved the package and added it to your project, just import `ShortcutSwiftUI` and you can get the full benefits of it.
+After successfully retrieved the package and added it to your project, just import `ShortcutUI` and you can get the full benefits of it.
 
 
 ## Usage example
 
 ```swift
-import ShortcutSwiftUI
+import ShortcutUI
 
 ...
 ```
@@ -82,3 +82,4 @@ import ShortcutSwiftUI
 4. Perform your changes, debug, run the unit tests
 5. Make sure that all the tests pass and there are no Xcode warnings or lint issues
 6. Open a pull request
+
diff --git a/Sources/ShortcutUI/Extensions/Color+Extension.swift b/Sources/ShortcutUI/Extensions/Color+Extension.swift
@@ -2,7 +2,7 @@
 
 //
 //  Color+Extension.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Gabriel Sabadin on 2022-08-16.
 //  Copyright © 2021 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/Extensions/String+Extension.swift b/Sources/ShortcutUI/Extensions/String+Extension.swift
@@ -1,6 +1,6 @@
 //
 //  String+Extension.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Sheikh Bayazid on 2022-03-16.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/Extensions/UIDevice+Extension.swift b/Sources/ShortcutUI/Extensions/UIDevice+Extension.swift
@@ -1,6 +1,6 @@
 //
 //  UIDevice+Extension.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Sina Rabiei on 2022-03-30.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/Extensions/View+Extension.swift b/Sources/ShortcutUI/Extensions/View+Extension.swift
@@ -1,6 +1,6 @@
 //
 //  View+Extension.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Darya Gurinovich on 2022-01-07.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
@@ -68,15 +68,11 @@ public extension View {
         AnyView(self)
     }
 
-    #if !os(macOS)
+#if !os(macOS)
     func cornerRadius(_ radius: CGFloat, corners: UIRectCorner) -> some View {
         clipShape(RoundedCorner(radius: radius, corners: corners))
     }
-    
-    func hideKeyboard() {
-        UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
-    }
-    #endif
+#endif
 }
 
 #if !os(macOS)
diff --git a/Sources/ShortcutUI/SwiftUI/AlertPresenter/ActionSheet+Extension.swift b/Sources/ShortcutUI/SwiftUI/AlertPresenter/ActionSheet+Extension.swift
@@ -1,6 +1,6 @@
 //
 //  ActionSheet+Extension.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Sheikh Bayazid on 2022-02-14.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/AlertPresenter/Alert+Extension.swift b/Sources/ShortcutUI/SwiftUI/AlertPresenter/Alert+Extension.swift
@@ -1,6 +1,6 @@
 //
 //  Alert+Extension.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Sheikh Bayazid on 2022-02-14.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/AlertPresenter/AlertPresenter.swift b/Sources/ShortcutUI/SwiftUI/AlertPresenter/AlertPresenter.swift
@@ -1,6 +1,6 @@
 //
 //  AlertPresenter.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Sheikh Bayazid on 2022-02-11.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/AlertPresenter/AlertViewModel.swift b/Sources/ShortcutUI/SwiftUI/AlertPresenter/AlertViewModel.swift
@@ -2,7 +2,7 @@
 // swiftlint:disable nesting
 //
 //  Alert+Extension.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Sheikh Bayazid on 2022-02-14.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/BottomSheet/BottomSheet.swift b/Sources/ShortcutUI/SwiftUI/BottomSheet/BottomSheet.swift
@@ -1,6 +1,6 @@
 //
 //  BottomSheet.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Darya Gurinovich on 2022-01-07.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/BottomSheet/BottomSheetView.swift b/Sources/ShortcutUI/SwiftUI/BottomSheet/BottomSheetView.swift
@@ -1,6 +1,6 @@
 //
 //  BottomSheetView.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Darya Gurinovich on 2022-01-07.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/BottomSheet/BottomSheetViewModifier.swift b/Sources/ShortcutUI/SwiftUI/BottomSheet/BottomSheetViewModifier.swift
@@ -1,6 +1,6 @@
 //
 //  BottomSheetViewModifier.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Darya Gurinovich on 2022-01-07.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/ModalView/ModalPresenter.swift b/Sources/ShortcutUI/SwiftUI/ModalView/ModalPresenter.swift
@@ -51,7 +51,7 @@ protocol ModalPresenter {
     func closeModal()
 }
 
-open class ModalViewRouter<PresentationState: ModalPresentationState>: ObservableObject, ModalPresenter {
+public class ModalViewRouter<PresentationState: ModalPresentationState>: ObservableObject, ModalPresenter {
     @Published var customSheetPresentationState: PresentationState? {
         didSet {
             handlePresentationStateChange(oldValue: oldValue, newValue: customSheetPresentationState)
diff --git a/Sources/ShortcutUI/SwiftUI/ModalView/ModalViewPresenterViewModifier.swift b/Sources/ShortcutUI/SwiftUI/ModalView/ModalViewPresenterViewModifier.swift
@@ -12,14 +12,10 @@ import SwiftUI
 struct ModalViewPresenterViewModifier<PresentationState: ModalPresentationState>: ViewModifier {
     @EnvironmentObject var modalViewRouter: ModalViewRouter<PresentationState>
 
-    @Binding private var options: [BottomSheet.Options]
+    private let options: [BottomSheet.Options]
 
     init(options: [BottomSheet.Options] = []) {
-        self._options = .constant(options)
-    }
-    
-    init(options: Binding<[BottomSheet.Options]>) {
-        self._options = options
+        self.options = options
     }
 
     public func body(content: Content) -> some View {
@@ -48,26 +44,8 @@ public extension View {
     /// Works with the implementation of the `ModalPresentationState` protocol that represents all modals that can be shown with this presenter.
     /// Need to set an environmentObject of `ModalViewRouter<S: ModalPresentationState>` before using this modifier otherwise an error will occur.
     ///
-    ///  - parameters:
-    ///     - presentationStateType: A type that represent possible states to show
-    ///     - options: Modal view options to customise it
-    ///
-    func modalViewPresenter<PresentationState: ModalPresentationState>(presentationStateType: PresentationState.Type,
-                                                                       options: [BottomSheet.Options] = []) -> some View {
-        self.modifier(ModalViewPresenterViewModifier<PresentationState>(options: options))
-    }
-    
-    /// A view modifier to present modal views from any view.
-    ///
-    /// Works with the implementation of the `ModalPresentationState` protocol that represents all modals that can be shown with this presenter.
-    /// Need to set an environmentObject of `ModalViewRouter<S: ModalPresentationState>` before using this modifier otherwise an error will occur.
-    ///
-    ///  - parameters:
-    ///     - presentationStateType: A type that represent possible states to show
-    ///     - options: A options binding to allow to change the modal options
-    ///
     func modalViewPresenter<PresentationState: ModalPresentationState>(presentationStateType: PresentationState.Type,
-                                                                       options: Binding<[BottomSheet.Options]>) -> some View {
+                                                                       options: [BottomSheet.Options]) -> some View {
         self.modifier(ModalViewPresenterViewModifier<PresentationState>(options: options))
     }
 }
@@ -83,7 +61,6 @@ struct ModalViewPresenterViewModifier_Previews: PreviewProvider {
         @StateObject private var testModalViewRouter = TestModalViewRouter()
         
         @State var color: Color = .red
-        @State var options: [BottomSheet.Options] = [.disableSwipeToDismiss, .tapToDismiss]
         
         var body: some View {
             ZStack {
@@ -93,13 +70,12 @@ struct ModalViewPresenterViewModifier_Previews: PreviewProvider {
                     testModalViewRouter.setModal(state: .text("Hello World!"),
                                                  type: .customSheet) {
                         color = [Color.red, .purple, .blue, .yellow, .green].randomElement() ?? .orange
-                        
-                        options = [.tapToDismiss]
                     }
                 }
             }
                 .modalViewPresenter(presentationStateType: TestModalPresentationState.self,
-                                    options: $options)
+                                    options: [.tapToDismiss,
+                                              .maxHeight(500)])
                 .environmentObject(testModalViewRouter)
         }
     }
diff --git a/Sources/ShortcutUI/SwiftUI/NavigationLink+Extension.swift b/Sources/ShortcutUI/SwiftUI/NavigationLink+Extension.swift
@@ -1,6 +1,6 @@
 //
 //  NavigationLink+Extension.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Karl Söderberg on 2022-01-17.
 //  Copyright © 2022 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/View+Fullscreen.swift b/Sources/ShortcutUI/SwiftUI/View+Fullscreen.swift
@@ -1,6 +1,6 @@
 //
 //  View+Fullscreen.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Karl Söderberg on 2022-08-25.
 //  Copyright © 2021 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Sources/ShortcutUI/SwiftUI/WKWebViewRepresentable.swift b/Sources/ShortcutUI/SwiftUI/WKWebViewRepresentable.swift
@@ -1,6 +1,6 @@
 //
 //  WKWebViewRepresentable.swift
-//  ShortcutSwiftUI
+//  ShortcutUI
 //
 //  Created by Karl Söderberg on 2022-01-04.
 //  Copyright © 2021 Shortcut Scandinavia Apps AB. All rights reserved.
diff --git a/Tests/ShortcutUITests/ShortcutUITests.swift b/Tests/ShortcutUITests/ShortcutUITests.swift
@@ -1,11 +1,10 @@
 import XCTest
-@testable import ShortcutSwiftUI
+@testable import ShortcutUI
 
-final class ShortcutSwiftUITests: XCTestCase {
+final class ShortcutUITests: XCTestCase {
     func testExample() throws {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct
         // results.
-        
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protocol ModalPresenter {`
`51`	`51`	`func closeModal()`
`52`	`52`	`}`
`53`	`53`
`54`		`-open class ModalViewRouter<PresentationState: ModalPresentationState>: ObservableObject, ModalPresenter {`
	`54`	`+public class ModalViewRouter<PresentationState: ModalPresentationState>: ObservableObject, ModalPresenter {`
`55`	`55`	`@Published var customSheetPresentationState: PresentationState? {`
`56`	`56`	`didSet {`
`57`	`57`	`handlePresentationStateChange(oldValue: oldValue, newValue: customSheetPresentationState)`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`import XCTest`
`2`		`-@testable import ShortcutSwiftUI`
	`2`	`+@testable import ShortcutUI`
`3`	`3`
`4`		`-final class ShortcutSwiftUITests: XCTestCase {`
	`4`	`+final class ShortcutUITests: XCTestCase {`
`5`	`5`	`func testExample() throws {`
`6`	`6`	`// This is an example of a functional test case.`
`7`	`7`	`// Use XCTAssert and related functions to verify your tests produce the correct`
`8`	`8`	`// results.`
`9`		`-`
`10`	`9`	`}`
`11`	`10`	`}`