Added navigation controller. Moved mimicrated tool bar to native navigation.

ivanvorobei · ivanvorobei · commit f98cbff53bdf · 2021-09-08T17:37:35.000+03:00
diff --git a/Example App/NativeUIKit.xcodeproj/project.xcworkspace/xcuserdata/ivanvorobei.xcuserdatad/UserInterfaceState.xcuserstate b/Example App/NativeUIKit.xcodeproj/project.xcworkspace/xcuserdata/ivanvorobei.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example App/NativeUIKit.xcodeproj/xcshareddata/xcschemes/watchOS Example.xcscheme b/Example App/NativeUIKit.xcodeproj/xcshareddata/xcschemes/watchOS Example.xcscheme
@@ -54,33 +54,46 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/(null)">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F4C33E2F26C932C8001A28B1"
             BuildableName = "watchOS Example.app"
             BlueprintName = "watchOS Example"
             ReferencedContainer = "container:NativeUIKit.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/(null)">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F4C33E2F26C932C8001A28B1"
             BuildableName = "watchOS Example.app"
             BlueprintName = "watchOS Example"
             ReferencedContainer = "container:NativeUIKit.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F4C33E2F26C932C8001A28B1"
+            BuildableName = "watchOS Example.app"
+            BlueprintName = "watchOS Example"
+            ReferencedContainer = "container:NativeUIKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Example App/iOS Example/App/AppDelegate.swift b/Example App/iOS Example/App/AppDelegate.swift
@@ -21,13 +21,16 @@
 
 import UIKit
 import SparrowKit
+import NativeUIKit
 
 @UIApplicationMain
 class AppDelegate: SPAppWindowDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        let rootController = RootController().wrapToNavigationController(prefersLargeTitles: false)
-        makeKeyAndVisible(viewController: rootController, tint: .systemBlue)
+        let rootController = RootController()
+        let navigationController = NativeNavigationController(rootViewController: rootController)
+        makeKeyAndVisible(viewController: navigationController, tint: .systemBlue)
         return true
     }
 }
+
diff --git a/Example App/iOS Example/Scenes/RootController.swift b/Example App/iOS Example/Scenes/RootController.swift
@@ -25,13 +25,18 @@ import NativeUIKit
 
 class RootController: NativeScrollController {
     
-    let authToolBarView = NativeAppleAuthToolBarView().do {
+    let actionToolBarView = NativeLargeActionToolBarView().do {
+        $0.actionButton.setTitle("Action Button")
         $0.footerLabel.text = "Here footer text and it provided my developer and maybe some lines even."
     }
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.toolBarView = authToolBarView
         
+        if let navigationController = self.navigationController as? NativeNavigationController {
+            navigationController.mimicrateToolBarView = actionToolBarView
+        }
+        
+        scrollView.contentSize = .init(width: view.frame.width, height: 1000)
     }
 }
diff --git a/NativeUIKit.podspec b/NativeUIKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = 'NativeUIKit'
-  s.version = '1.0.7'
+  s.version = '1.0.8'
   s.summary = 'Mimicrated views and controls to native Apple appearance.'
   s.homepage = 'https://github.com/ivanvorobei/NativeUIKit'
   s.source = { :git => 'https://github.com/ivanvorobei/NativeUIKit.git', :tag => s.version }
diff --git a/Sources/NativeUIKit/Controllers/NativeNavigationController.swift b/Sources/NativeUIKit/Controllers/NativeNavigationController.swift
@@ -0,0 +1,58 @@
+// The MIT License (MIT)
+// Copyright © 2021 Ivan Vorobei (hello@ivanvorobei.by)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#if canImport(UIKit) && (os(iOS))
+import UIKit
+import SparrowKit
+
+open class NativeNavigationController: SPNavigationController {
+    
+    // MARK: - Views
+    
+    open var mimicrateToolBarView: NativeMimicrateToolBarView? = nil {
+        willSet {
+            if let toolBarView = mimicrateToolBarView {
+                toolBarView.removeFromSuperview()
+            }
+        }
+        didSet {
+            if let toolBarView = mimicrateToolBarView {
+                view.addSubview(toolBarView)
+            }
+        }
+    }
+    
+    // MARK: - Layout
+    
+    open override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        if let toolBarView = mimicrateToolBarView {
+            toolBarView.layoutMargins.bottom = systemSafeAreaInsets.bottom + 16
+            toolBarView.setWidthAndFit(width: view.frame.width)
+            toolBarView.frame.setMaxY(view.frame.height)
+            let toolBarFrameFitHeight = toolBarView.frame.height - systemSafeAreaInsets.bottom
+            if additionalSafeAreaInsets.bottom != toolBarFrameFitHeight {
+                additionalSafeAreaInsets.bottom = toolBarFrameFitHeight
+            }
+        }
+    }
+}
+#endif
diff --git a/Sources/NativeUIKit/Controllers/NativeScrollController.swift b/Sources/NativeUIKit/Controllers/NativeScrollController.swift
@@ -46,21 +46,6 @@ open class NativeScrollController: SPScrollController {
         }
     }
     
-    // MARK: - Views
-    
-    open var toolBarView: NativeMimicrateToolBarView? = nil {
-        willSet {
-            if let toolBarView = toolBarView {
-                toolBarView.removeFromSuperview()
-            }
-        }
-        didSet {
-            if let toolBarView = toolBarView {
-                view.addSubview(toolBarView)
-            }
-        }
-    }
-
     // MARK: - Init
     
     public override init() {
@@ -88,29 +73,6 @@ open class NativeScrollController: SPScrollController {
         }
     }
     
-    // MARK: - Lifecycle
-    
-    open override func viewDidLoad() {
-        super.viewDidLoad()
-        
-    }
-    
-    // MARK: - Layout
-    
-    open override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        if let toolBarView = toolBarView {
-            toolBarView.layoutMargins.bottom = systemSafeAreaInsets.bottom + 16
-            toolBarView.setWidthAndFit(width: view.frame.width)
-            toolBarView.frame.setMaxY(view.frame.height)
-            let toolBarFrameFitHeight = toolBarView.frame.height - systemSafeAreaInsets.bottom
-            if additionalSafeAreaInsets.bottom != toolBarFrameFitHeight {
-                additionalSafeAreaInsets.bottom = toolBarFrameFitHeight
-            }
-        }
-        
-    }
-    
     // MARK: - Models
     
     public enum NavigationScrollBehavior {

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,18 @@ import NativeUIKit`
`25`	`25`
`26`	`26`	`class RootController: NativeScrollController {`
`27`	`27`
`28`		`- let authToolBarView = NativeAppleAuthToolBarView().do {`
	`28`	`+ let actionToolBarView = NativeLargeActionToolBarView().do {`
	`29`	`+ $0.actionButton.setTitle("Action Button")`
`29`	`30`	`$0.footerLabel.text = "Here footer text and it provided my developer and maybe some lines even."`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`override func viewDidLoad() {`
`33`	`34`	`super.viewDidLoad()`
`34`		`- self.toolBarView = authToolBarView`
`35`	`35`
	`36`	`+ if let navigationController = self.navigationController as? NativeNavigationController {`
	`37`	`+ navigationController.mimicrateToolBarView = actionToolBarView`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ scrollView.contentSize = .init(width: view.frame.width, height: 1000)`
`36`	`41`	`}`
`37`	`42`	`}`