fix(ui): compatibility with navigation controller

rownd · Aug 5, 2022 · 1dfecb6 · 1dfecb6
1 parent f63c890
commit 1dfecb6
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/RowndFramework.xcodeproj/project.pbxproj b/RowndFramework.xcodeproj/project.pbxproj
@@ -653,7 +653,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 34CNMPW6U9;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -667,7 +667,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.rownd.framework;
 				PRODUCT_NAME = Rownd;
 				SKIP_INSTALL = YES;
@@ -683,7 +683,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 34CNMPW6U9;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -697,7 +697,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.rownd.framework;
 				PRODUCT_NAME = Rownd;
 				SKIP_INSTALL = YES;

diff --git a/RowndFramework.xcodeproj/xcuserdata/mhamann.xcuserdatad/xcschemes/xcschememanagement.plist b/RowndFramework.xcodeproj/xcuserdata/mhamann.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>RowndFrameworkTestApp.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>44</integer>
+			<integer>5</integer>
 		</dict>
 		<key>RowndSDK.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>43</integer>
+			<integer>4</integer>
 		</dict>
 		<key>RowndTests.xcscheme_^#shared#^_</key>
 		<dict>

diff --git a/Sources/Rownd/Rownd.swift b/Sources/Rownd/Rownd.swift
@@ -157,9 +157,8 @@ public class Rownd: NSObject {
         // But, we can't replace it yet (2022) since there are too many devices running iOS 14.
         let bottomSheetController = BottomSheetController()
         bottomSheetController.controller = viewController
-
-        rootViewController?.addChild(bottomSheetController)
-        rootViewController?.view.addSubview(bottomSheetController.view)
+        bottomSheetController.modalPresentationStyle = .overFullScreen
+        rootViewController?.present(bottomSheetController, animated: true, completion: nil)
     }
 
 }

diff --git a/Sources/Rownd/Views/BottomSheetController.swift b/Sources/Rownd/Views/BottomSheetController.swift
@@ -14,9 +14,14 @@ class BottomSheetController: UIViewController {
     var sheetController: LBBottomSheet.BottomSheetController?
 
     override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         guard let controller = controller else {
             return
         }
+
+        if var hubViewController = controller as? HubViewProtocol {
+            hubViewController.hostController = self
+        }
 
         var behavior: LBBottomSheet.BottomSheetController.Behavior = .init(swipeMode: .full)
         behavior.heightMode = .specific(values: [.screenRatio(value: 0.5), .screenRatio(value: 0.9)], heightLimit: .statusBar)
@@ -25,6 +30,7 @@ class BottomSheetController: UIViewController {
         theme.grabber?.topMargin = CGFloat(10.0)
 
         sheetController = presentAsBottomSheet(controller, theme: theme, behavior: behavior)
+
     }
 
     override func viewDidLoad() {

diff --git a/Sources/Rownd/Views/HubViewController.swift b/Sources/Rownd/Views/HubViewController.swift
@@ -11,6 +11,8 @@ import UIKit
 
 protocol HubViewProtocol {
     var targetPage: HubPageSelector { get set }
+    var hostController: UIViewController? { get set }
+
     func setLoading(_ isLoading: Bool)
     func show()
     func hide()
@@ -21,6 +23,7 @@ public class HubViewController: UIViewController, HubViewProtocol {
     var activityIndicator = UIActivityIndicatorView(style: .large)
     var hubWebController = HubWebViewController()
     var targetPage = HubPageSelector.unknown
+    var hostController: UIViewController?
 
     public override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
@@ -66,6 +69,14 @@ public class HubViewController: UIViewController, HubViewProtocol {
             self.overrideUserInterfaceStyle = .dark
         }
     }
+
+    public override func viewWillDisappear(_ animated: Bool) {
+        guard let hostController = hostController else {
+            return
+        }
+
+        hostController.dismiss(animated: true)
+    }
 
     func setLoading(_ isLoading: Bool) {
         if (isLoading) {