IOS-2634 HomeWidgets | hide bin for read-only

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Container/HomeWidgetsView.swift

@@ -12,28 +12,25 @@ struct HomeWidgetsView: View {
                 HomeTopShadow()
             } content: {
                 VStack(spacing: 12) {
-                    SpaceWidgetView {
-                        model.onSpaceSelected()
-                    }
-                    if #available(iOS 17.0, *) {
-                        WidgetSwipeTipView()
-                    }
-                    ForEach(model.models) { rowModel in
-                        rowModel.provider.view
-                    }
-                    BinLinkWidgetView(spaceId: model.spaceId, homeState: $model.homeState, output: model.submoduleOutput())
                     if model.dataLoaded {
-                        HomeEditButton(text: Loc.Widgets.Actions.editWidgets) {
+                        SpaceWidgetView {
+                            model.onSpaceSelected()
+                        }
+                        if #available(iOS 17.0, *) {
+                            WidgetSwipeTipView()
+                        }
+                        ForEach(model.models) { rowModel in
+                            rowModel.provider.view
+                        }
+                        BinLinkWidgetView(spaceId: model.spaceId, homeState: $model.homeState, output: model.submoduleOutput())
+                        HomeEditButton(text: Loc.Widgets.Actions.editWidgets, homeState: model.homeState) {
                             model.onEditButtonTap()
                         }
-                        .opacity(model.homeState.isReadWrite ? 1 : 0)
-                        .animation(.default, value: model.homeState)
                     }
                     AnytypeNavigationSpacer()
                 }
                 .padding(.horizontal, 20)
                 .padding(.top, 12)
-                .opacity(model.dataLoaded ? 1 : 0)
                 .fitIPadToReadableContentGuide()
             }
             .animation(.default, value: model.models.count)
@@ -42,6 +39,9 @@ struct HomeWidgetsView: View {
                 model.onCreateWidgetSelected()
             }
         }
+        .task {
+            await model.startWidgetObjectTask()
+        }
         .task {
             await model.startParticipantTask()
         }

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Container/HomeWidgetsViewModel.swift

@@ -2,6 +2,7 @@ import Foundation
 import AnytypeCore
 import Services
 import Combine
+import SwiftUI
 
 @MainActor
 final class HomeWidgetsViewModel: ObservableObject {
@@ -28,7 +29,6 @@ final class HomeWidgetsViewModel: ObservableObject {
     @Published var wallpaper: BackgroundType = .default
 
     var spaceId: String { info.accountSpaceId }
-    private var objectSubscriptions = [AnyCancellable]()
 
     init(
         info: AccountInfo,
@@ -57,6 +57,19 @@ final class HomeWidgetsViewModel: ObservableObject {
         setupInitialState()
     }
 
+    func startWidgetObjectTask() async {
+        for await _ in widgetObject.syncPublisher.values {
+            let blocks = widgetObject.children.filter(\.isWidget)
+            recentStateManagerProtocol.setupRecentStateIfNeeded(blocks: blocks, widgetObject: widgetObject)
+            let providers = registry.providers(blocks: blocks, widgetObject: widgetObject)
+
+            guard providers != models else { continue }
+
+            models = providers
+            dataLoaded = true
+        }
+    }
+
     func startParticipantTask() async {
         for await canEdit in accountParticipantStorage.canEditPublisher(spaceId: info.accountSpaceId).values {
             stateManager.setHomeState(canEdit ? .readwrite : .readonly)
@@ -108,21 +121,6 @@ final class HomeWidgetsViewModel: ObservableObject {
     // MARK: - Private
 
     private func setupInitialState() {
-        widgetObject.syncPublisher
-            .map { [weak self] _ -> [HomeWidgetSubmoduleModel] in
-                guard let self else { return [] }
-                let blocks = self.widgetObject.children.filter(\.isWidget)
-                recentStateManagerProtocol.setupRecentStateIfNeeded(blocks: blocks, widgetObject: self.widgetObject)
-                return registry.providers(blocks: blocks, widgetObject: widgetObject)
-            }
-            .removeDuplicates()
-            .receiveOnMain()
-            .sink { [weak self] models in
-                self?.models = models
-                self?.dataLoaded = true
-            }
-            .store(in: &objectSubscriptions)
-
         stateManager.homeStatePublisher
             .receiveOnMain()
             .assign(to: &$homeState)

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Container/Views/HomeEditButtonStyle.swift

@@ -4,6 +4,7 @@ import SwiftUI
 struct HomeEditButton: View {
 
     let text: String
+    let homeState: HomeWidgetsState
     let action: () -> Void
 
     var body: some View {
@@ -17,5 +18,7 @@ struct HomeEditButton: View {
         )
         .background(.thinMaterial)
         .cornerRadius(8, style: .continuous)
+        .opacity(homeState.isReadWrite ? 1 : 0)
+        .animation(.default, value: homeState)
     }
 }

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Widgets/BinLink/BinLinkWidgetView.swift

@@ -28,6 +28,12 @@ private struct BinLinkWidgetViewInternal: View {
     }
 
     var body: some View {
+        if homeState.isReadWrite || homeState.isEditWidgets {
+            content
+        }
+    }
+
+    var content: some View {
         WidgetContainerViewNew(
             title: Loc.bin,
             icon: .Widget.bin,