Test flight main views navigation changes

com.stakwork.sphinx.desktop/Generated/StoryboardScenes.swift

@@ -47,6 +47,8 @@ internal enum StoryboardScene {
 
         internal static let dashboardViewController = SceneType<DashboardViewController>(storyboard: Dashboard.self, identifier: "DashboardViewController")
 
+        internal static let dashboardPresenterViewController = SceneType<DashboardPresenterViewController>(storyboard: Dashboard.self, identifier: "DashboardPresenterViewController")
+
         internal static let chatListViewController = SceneType<ChatListViewController>(storyboard: Dashboard.self, identifier: "ChatListViewController")
 
         @available(macOS 10.15.1, *)

com.stakwork.sphinx.desktop/Managers/Windows/WindowsManager.swift

@@ -19,7 +19,7 @@ class WindowsManager {
 
     func saveWindowState() {
         if let keyWindow = NSApplication.shared.keyWindow {
-//            let menuCollapsed = (keyWindow.contentViewController as? DashboardViewController)?.isLeftMenuCollapsed() ?? false
+            //            let menuCollapsed = (keyWindow.contentViewController as? DashboardViewController)?.isLeftMenuCollapsed() ?? false
             let menuCollapsed = false
             let windowState = WindowState(frame: keyWindow.frame, minSize: keyWindow.minSize, menuCollapsed: menuCollapsed)
 
@@ -65,7 +65,7 @@ class WindowsManager {
         let initialFrame = CGRect(x: centerPoint.x, y: centerPoint.y, width: size.width, height: size.height)
         return WindowState(frame: initialFrame, minSize: size, menuCollapsed: false)
     }
-
+    
     func showNewWindow(
         with title: String,
         size: CGSize,
@@ -112,6 +112,52 @@ class WindowsManager {
         }
     }
 
+    func dismissViewFromCurrentWindow()  {
+        if let keyWindow = NSApplication.shared.keyWindow {
+            if let dashboardVC = keyWindow.contentViewController as? DashboardViewController {
+                dashboardVC.presenterContainerBGView.isHidden = true
+                dashboardVC.presenter?.dismissVC()
+                dashboardVC.presenter?.contentVC = nil
+            }
+        }
+    }
+
+    func showOnCurrentWindow(
+        with title: String,
+        identifier: String? = nil,
+        contentVC: NSViewController,
+        hideDivider: Bool = true,
+        replaceVC: Bool = true,
+        hideBackButton: Bool = true,
+        height: CGFloat = 629
+    ) {
+        if let keyWindow = NSApplication.shared.keyWindow {
+            if let dashboardVC = keyWindow.contentViewController as? DashboardViewController {
+                dashboardVC.presenterContainerBGView.isHidden = false
+                dashboardVC.presenterBGView.layer?.cornerRadius = 12
+                dashboardVC.presenterContainerMainView.layer?.cornerRadius = 12
+                dashboardVC.presenterBackButton.isHidden = hideBackButton
+                dashboardVC.presenterViewHeightConstraint.constant = height
+                DispatchQueue.main.async {
+                    dashboardVC.presenterBGView.layoutSubtreeIfNeeded()
+                }
+                if dashboardVC.presenterIdentifier != identifier {
+                    if replaceVC {
+                        dashboardVC.presenter?.dismissVC()
+                        dashboardVC.presenter?.contentVC = nil
+                    } else {
+                        dashboardVC.presenter?.setParentVC()
+                        dashboardVC.presenter?.dismissVC()
+                    }
+                    dashboardVC.presenter?.configurePresenterVC(contentVC)
+                    dashboardVC.presenterTitleLabel.stringValue = title
+                    dashboardVC.presenterIdentifier = identifier
+                    dashboardVC.presenterHeaderDivider.isHidden = hideDivider
+                }
+            }
+        }
+    }
+
     func showPubKeyWindow(vc: NSViewController, window: NSWindow?) {
         showNewWindow(with: "pubkey".localized,
                       size: CGSize(width: 400, height: 600),
@@ -145,28 +191,24 @@ class WindowsManager {
     }
 
     func showProfileWindow(vc: NSViewController, window: NSWindow?) {
-        showNewWindow(with: "profile".localized,
-                      size: CGSize(width: 400, height: 850),
-                      centeredIn: window,
-                      identifier: "profile-window",
-                      contentVC: vc)
+        showOnCurrentWindow(with: "profile".localized, 
+                            identifier: "profile-custom-window",
+                            contentVC: vc,
+                            hideDivider: false)
     }
 
     func showTransationsListWindow(vc: NSViewController, window: NSWindow?) {
-        showNewWindow(with: "transactions".localized,
-                      size: CGSize(width: 450, height: 750),
-                      centeredIn: window,
-                      identifier: "transactions-window",
-                      contentVC: vc)
+        showOnCurrentWindow(with: "transactions".localized, 
+                            identifier: "transactions-custom-window",
+                            contentVC: vc,
+                            hideDivider: false)
     }
 
     func showContactWindow(vc: NSViewController, window: NSWindow?, title: String, identifier: String, size: CGSize) {
-        showNewWindow(with: title,
-                      size: size,
-                      centeredIn: window,
-                      identifier: identifier,
-                      contentVC: vc,
-                      shouldClose: true)
+        showOnCurrentWindow(with: title.localized,
+                            identifier: "contact-custom-window",
+                            contentVC: vc,
+                            height: size.height)
     }
 
     func showInviteCodeWindow(vc: NSViewController, window: NSWindow?) {
@@ -191,12 +233,10 @@ class WindowsManager {
         vc: NSViewController,
         window: NSWindow?
     ) {
-        showNewWindow(with: title,
-                      size: CGSize(width: 400, height: 700),
-                      centeredIn: window,
-                      identifier: "create-tribe-window",
-                      styleMask: [.closable, .titled],
-                      contentVC: vc)
+        showOnCurrentWindow(with: "Create Tribe".localized, 
+                            identifier: "create-tribe-custom-window",
+                            contentVC: vc,
+                            hideDivider: false)
     }
 
     func showWebAppWindow(chat: Chat?, view: NSView, isAppURL: Bool = true) {
@@ -206,7 +246,7 @@ class WindowsManager {
             let appTitle = chat.name ?? ""
             let screen = NSApplication.shared.keyWindow
             let frame : CGRect = screen?.frame ?? view.frame
-
+            
             let position = (screen?.frame.origin) ?? CGPoint(x: 0.0, y: 0.0)
 
             showNewWindow(with: appTitle,
@@ -228,7 +268,7 @@ class WindowsManager {
 
             let screen = NSApplication.shared.keyWindow
             let frame : CGRect = screen?.frame ?? CGRect(x: 0, y: 0, width: 400, height: 400)
-
+            
             let position = (screen?.frame.origin) ?? CGPoint(x: 0.0, y: 0.0)
 
             showNewWindow(with: appTitle,

com.stakwork.sphinx.desktop/Scenes/Contacts/View Controllers/AddFriendViewController.swift

@@ -11,12 +11,15 @@ import Cocoa
 class AddFriendViewController: NSViewController {
 
     weak var delegate: NewContactChatDelegate?
+    weak var dismissDelegate: NewContactDismissDelegate?
 
     static func instantiate(
-        delegate: NewContactChatDelegate? = nil
+        delegate: NewContactChatDelegate? = nil,
+        dismissDelegate: NewContactDismissDelegate? = nil
     ) -> AddFriendViewController {
         let viewController = StoryboardScene.Contacts.addFriendViewController.instantiate()
         viewController.delegate = delegate
+        viewController.dismissDelegate = dismissDelegate
         return viewController
     }
 
@@ -25,20 +28,30 @@ class AddFriendViewController: NSViewController {
     }
 
     @IBAction func newToSphinxButtonClicked(_ sender: Any) {
-        let inviteVC = NewInviteViewController.instantiate(delegate: self.delegate)
+        let inviteVC = NewInviteViewController.instantiate(delegate: self.delegate,
+                                                           dismissDelegate: self.dismissDelegate)
         advanceTo(vc: inviteVC)
     }
 
     @IBAction func alreadyOnSphinxButtonClicked(_ sender: Any) {
-        let contactVC = NewContactViewController.instantiate(delegate: self.delegate)
+        let contactVC = NewContactViewController.instantiate(delegate: self.delegate,
+                                                             dismissDelegate: self.dismissDelegate)
         advanceTo(vc: contactVC)
     }
 
     func advanceTo(vc: NSViewController) {
         AnimationHelper.animateViewWith(duration: 0.3, animationsBlock: {
             self.view.alphaValue = 0.0
         }, completion: {
-            self.view.window?.replaceContentBy(vc: vc)
+            WindowsManager
+                .sharedInstance
+                .showOnCurrentWindow(with: "Contact".localized, 
+                                     identifier: "new-contact-window",
+                                     contentVC: vc,
+                                     hideDivider: true,
+                                     replaceVC: false,
+                                     hideBackButton: false,
+                                     height: 629)
         })
     }
 }

com.stakwork.sphinx.desktop/Scenes/Contacts/View Controllers/NewContactViewController.swift

@@ -12,9 +12,14 @@ protocol NewContactChatDelegate: AnyObject {
     func shouldReloadContacts()
 }
 
+protocol NewContactDismissDelegate: AnyObject {
+    func shouldDismissView()
+}
+
 class NewContactViewController: NSViewController {
 
     weak var delegate: NewContactChatDelegate?
+    weak var dismissDelegate: NewContactDismissDelegate?
 
     @IBOutlet weak var contactAvatarView: ChatAvatarView!
     @IBOutlet weak var fieldsTop: NSLayoutConstraint!
@@ -51,13 +56,15 @@ class NewContactViewController: NSViewController {
 
     static func instantiate(
         delegate: NewContactChatDelegate? = nil,
+        dismissDelegate: NewContactDismissDelegate? = nil,
         contact: UserContact? = nil,
         pubkey: String? = nil
     ) -> NewContactViewController {
 
         let viewController = StoryboardScene.Contacts.newContactViewController.instantiate()
         viewController.contact = contact
         viewController.delegate = delegate
+        viewController.dismissDelegate = dismissDelegate
         viewController.pubkey = pubkey
 
         return viewController
@@ -136,7 +143,6 @@ class NewContactViewController: NSViewController {
 
     @IBAction func saveButtonClicked(_ sender: Any) {
         loading = true
-
         if let _ = contact {
             updateProfile()
         } else {
@@ -201,7 +207,7 @@ class NewContactViewController: NSViewController {
 
     func closeWindow() {
         CoreDataManager.sharedManager.saveContext()
-        self.view.window?.close()
+        self.dismissDelegate?.shouldDismissView()
     }
 
     func showErrorAlert(message: String) {

com.stakwork.sphinx.desktop/Scenes/Contacts/View Controllers/NewInviteViewController.swift

@@ -11,6 +11,7 @@ import Cocoa
 class NewInviteViewController: NSViewController {
 
     weak var delegate: NewContactChatDelegate?
+    weak var dismissDelegate: NewContactDismissDelegate?
 
     @IBOutlet weak var nicknameField: NSTextField!
     @IBOutlet var messageTextView: PlaceHolderTextView!
@@ -23,11 +24,13 @@ class NewInviteViewController: NSViewController {
     let walletBalanceService = WalletBalanceService()
 
     static func instantiate(
-        delegate: NewContactChatDelegate? = nil
+        delegate: NewContactChatDelegate? = nil,
+        dismissDelegate: NewContactDismissDelegate? = nil
     ) -> NewInviteViewController {
 
         let viewController = StoryboardScene.Contacts.newInviteViewController.instantiate()
         viewController.delegate = delegate
+        viewController.dismissDelegate = dismissDelegate
 
         return viewController
     }
@@ -110,7 +113,7 @@ class NewInviteViewController: NSViewController {
 
                 if let invite = contact["invite"].dictionary, let inviteString = invite["invite_string"]?.string, !inviteString.isEmpty {
                     self.delegate?.shouldReloadContacts()
-                    self.view.window?.close()
+                    self.dismissDelegate?.shouldDismissView()
                 }
             }, errorCallback: {
                 self.loading = false