Merge pull request #2708 from anyproto/ios-4048-change-buttons

iOS-4048 Home | change buttons
anyproto · Jan 29, 2025 · d73f89d · d73f89d
2 parents b354b6f + 23d2396
commit d73f89d
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 42 deletions.
diff --git a/...onLayer/Modules/HomeNavigationContainer/Panel/HomeBottomNavigationPanelModuleOutput.swift b/...onLayer/Modules/HomeNavigationContainer/Panel/HomeBottomNavigationPanelModuleOutput.swift
@@ -9,5 +9,6 @@ protocol HomeBottomNavigationPanelModuleOutput: AnyObject {
     func onPickTypeForNewObjectSelected()
     func onMembersSelected()
     func onShareSelected()
+    func popToFirstInSpace()
     func onAddAttachmentToSpaceLevelChat(attachment: ChatLinkObject)
 }
diff --git a/...esentationLayer/Modules/HomeNavigationContainer/Panel/HomeBottomNavigationPanelView.swift b/...esentationLayer/Modules/HomeNavigationContainer/Panel/HomeBottomNavigationPanelView.swift
@@ -83,13 +83,6 @@ private struct HomeBottomNavigationPanelViewInternal: View {
 
         leftButton
 
-        Button {
-            model.onTapSearch()
-        } label: {
-            Image(asset: .X32.Island.search)
-                .navPanelDynamicForegroundStyle()
-        }
-
         Image(asset: .X32.Island.addObject)
             .onTapGesture {
                 model.onTapNewObject()
@@ -102,6 +95,13 @@ private struct HomeBottomNavigationPanelViewInternal: View {
                     }
             )
             .disabled(!model.canCreateObject)
+
+        Button {
+            model.onTapSearch()
+        } label: {
+            Image(asset: .X32.Island.search)
+                .navPanelDynamicForegroundStyle()
+        }
     }
 
     @ViewBuilder
@@ -143,6 +143,13 @@ private struct HomeBottomNavigationPanelViewInternal: View {
                     .navPanelDynamicForegroundStyle()
             }
             .disabled(!enable)
+        case .home:
+            Button {
+                model.onTapHome()
+            } label: {
+                Image(asset: .X32.Island.vault)
+                    .navPanelDynamicForegroundStyle()
+            }
         case .none:
             EmptyView()
         }

diff --git a/...ationLayer/Modules/HomeNavigationContainer/Panel/HomeBottomNavigationPanelViewModel.swift b/...ationLayer/Modules/HomeNavigationContainer/Panel/HomeBottomNavigationPanelViewModel.swift
@@ -12,6 +12,7 @@ final class HomeBottomNavigationPanelViewModel: ObservableObject {
         case member
         case owner(_ enable: Bool)
         case chat(_ enable: Bool)
+        case home
     }
 
     // MARK: - Private properties
@@ -32,7 +33,8 @@ final class HomeBottomNavigationPanelViewModel: ObservableObject {
     private var activeProcess: Process?
     private var subscriptions: [AnyCancellable] = []
     private var chatLinkData: ChatLinkObject?
-    private var prticipantSpaceView: ParticipantSpaceViewData?
+    private var isWidgetsScreen: Bool = false
+    private var participantSpaceView: ParticipantSpaceViewData?
 
     // MARK: - Public properties
 
@@ -73,13 +75,14 @@ final class HomeBottomNavigationPanelViewModel: ObservableObject {
 
     func onAppear() async {
         for await data in participantSpacesStorage.participantSpaceViewPublisher(spaceId: info.accountSpaceId).values {
-            prticipantSpaceView = data
+            participantSpaceView = data
             updateState()
         }
     }
 
     func updateVisibleScreen(data: AnyHashable) {
         chatLinkData = (data as? EditorScreenData)?.chatLinkFromPanel
+        isWidgetsScreen = (data as? HomeWidgetData) != nil
         updateState()
     }
 
@@ -96,25 +99,33 @@ final class HomeBottomNavigationPanelViewModel: ObservableObject {
         output?.onAddAttachmentToSpaceLevelChat(attachment: chatLinkData)
     }
 
+    func onTapHome() {
+        output?.popToFirstInSpace()
+    }
+
     // MARK: - Private
 
     private func updateState() {
-        guard let prticipantSpaceView else { return }
+        guard let participantSpaceView else { return }
 
-        let canLinkToChat = chatLinkData.isNotNil && prticipantSpaceView.spaceView.showChat
+        let canLinkToChat = chatLinkData.isNotNil && participantSpaceView.spaceView.showChat
 
         if canLinkToChat {
-            leftButtonMode = .chat(prticipantSpaceView.permissions.canEdit)
-        } else if prticipantSpaceView.isOwner {
-            let limitAllowSharing = participantSpacesStorage.spaceSharingInfo?.limitsAllowSharing ?? false
-            let canBeShared = prticipantSpaceView.permissions.canBeShared
-            let isShared = prticipantSpaceView.spaceView.isShared
-            leftButtonMode = .owner(isShared || (limitAllowSharing && canBeShared))
+            leftButtonMode = .chat(participantSpaceView.permissions.canEdit)
+        } else if isWidgetsScreen {
+            if participantSpaceView.isOwner {
+                let limitAllowSharing = participantSpacesStorage.spaceSharingInfo?.limitsAllowSharing ?? false
+                let canBeShared = participantSpaceView.permissions.canBeShared
+                let isShared = participantSpaceView.spaceView.isShared
+                leftButtonMode = .owner(isShared || (limitAllowSharing && canBeShared))
+            } else {
+                leftButtonMode = .member
+            }
         } else {
-            leftButtonMode = .member
+            leftButtonMode = .home
         }
 
-        canCreateObject = prticipantSpaceView.permissions.canEdit
+        canCreateObject = participantSpaceView.permissions.canEdit
     }
 
     private func setupDataSubscription() {

diff --git a/Anytype/Sources/PresentationLayer/TextEditor/EditorPage/EditorPageController.swift b/Anytype/Sources/PresentationLayer/TextEditor/EditorPage/EditorPageController.swift
@@ -71,9 +71,6 @@ final class EditorPageController: UIViewController {
         onSyncStatusTap: { [weak viewModel] in
             UISelectionFeedbackGenerator().selectionChanged()
             viewModel?.showSyncStatusInfo()
-        },
-        onBackTap: { [weak viewModel] in
-            viewModel?.popToBack()
         }
     )
 

diff --git a/Anytype/Sources/PresentationLayer/TextEditor/EditorPage/EditorPageViewModel.swift b/Anytype/Sources/PresentationLayer/TextEditor/EditorPage/EditorPageViewModel.swift
@@ -275,10 +275,6 @@ extension EditorPageViewModel {
         bottomPanelHidden = hidden
         bottomPanelHiddenAnimated = animated
     }
-
-    func popToBack() {
-        output?.closeEditor()
-    }
 }
 
 // MARK: - Selection Handling

diff --git a/Anytype/Sources/PresentationLayer/TextEditor/EditorPage/EditorPageViewModelProtocol.swift b/Anytype/Sources/PresentationLayer/TextEditor/EditorPage/EditorPageViewModelProtocol.swift
@@ -34,6 +34,4 @@ protocol EditorPageViewModelProtocol: AnyObject {
     func tapOnEmptyPlace()
 
     func showSyncStatusInfo()
-
-    func popToBack()
 }
diff --git a/...yer/TextEditor/EditorPage/Utils/EditorNavigationBarHelper/EditorNavigationBarHelper.swift b/...yer/TextEditor/EditorPage/Utils/EditorNavigationBarHelper/EditorNavigationBarHelper.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import Services
+import SwiftUI
 
 @MainActor
 final class EditorNavigationBarHelper {
@@ -17,7 +18,7 @@ final class EditorNavigationBarHelper {
     private let settingsItem: UIEditorBarButtonItem
     private let syncStatusItem: EditorSyncStatusItem
     private let rightContanerForEditing: UIView
-    private let backButton: UIButton
+    private let backButton: UIView
 
     private var contentOffsetObservation: NSKeyValueObservation?
 
@@ -40,8 +41,7 @@ final class EditorNavigationBarHelper {
         onSelectAllBarButtonItemTap: @escaping (Bool) -> Void,
         onDoneBarButtonItemTap: @escaping () -> Void,
         onTemplatesButtonTap: @escaping () -> Void,
-        onSyncStatusTap: @escaping () -> Void,
-        onBackTap: @escaping () -> Void
+        onSyncStatusTap: @escaping () -> Void
     ) {
         self.navigationBarView = navigationBarView
         self.navigationBarBackgroundView = navigationBarBackgroundView
@@ -73,17 +73,8 @@ final class EditorNavigationBarHelper {
 
         self.rightContanerForEditing = UIView()
 
-        var backButtonConfig = UIButton.Configuration.plain()
-        backButtonConfig.image = UIImage(asset: .X24.back)
-        backButtonConfig.contentInsets = NSDirectionalEdgeInsets(top: 10, leading: 0, bottom: 10, trailing: 20)
-        backButtonConfig.baseForegroundColor = .Control.transparentActive
-        self.backButton = UIButton(configuration: backButtonConfig)
-        self.backButton.addAction(
-            UIAction(handler: { _ in
-                onBackTap()
-            }),
-            for: .touchUpInside
-        )
+        self.backButton = UIHostingController(rootView: PageNavigationBackButton()).view
+        self.backButton.backgroundColor = .clear
 
         // Select all button
         var selectAllConfig = UIButton.Configuration.plain()