Skip to content

Commit 7cb2499

Browse files
authored
Merge pull request #4207 from anyproto/ios-5339-remove-chat-widget-before-pin-section-for-data-space
IOS-5339 Remove chat widget before pin section
2 parents c647847 + ea89de4 commit 7cb2499

File tree

6 files changed

+3
-125
lines changed

6 files changed

+3
-125
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ private struct HomeWidgetsInternalView: View {
5656
private var widgets: some View {
5757
ScrollView {
5858
VStack(spacing: 0) {
59-
topWidgets
6059
blockWidgets
6160
objectTypeWidgets
6261
AnytypeNavigationSpacer()
@@ -66,13 +65,6 @@ private struct HomeWidgetsInternalView: View {
6665
}
6766
}
6867

69-
@ViewBuilder
70-
private var topWidgets: some View {
71-
if let data = model.chatWidgetData {
72-
SpaceChatWidgetView(data: data)
73-
}
74-
}
75-
7668
@ViewBuilder
7769
private var blockWidgets: some View {
7870
if model.widgetBlocks.isNotEmpty {

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ final class HomeWidgetsViewModel {
5151
var pinnedSectionIsExpanded: Bool = false
5252
var objectTypeSectionIsExpanded: Bool = false
5353
var canCreateObjectType: Bool = false
54-
var chatWidgetData: SpaceChatWidgetData?
5554

5655
var spaceId: String { info.accountSpaceId }
5756

@@ -70,9 +69,8 @@ final class HomeWidgetsViewModel {
7069
async let widgetObjectSub: () = startWidgetObjectTask()
7170
async let participantTask: () = startParticipantTask()
7271
async let objectTypesTask: () = startObjectTypesTask()
73-
async let spaceViewTask: () = startSpaceViewTask()
74-
75-
_ = await (widgetObjectSub, participantTask, objectTypesTask, spaceViewTask)
72+
73+
_ = await (widgetObjectSub, participantTask, objectTypesTask)
7674
}
7775

7876
func onAppear() {
@@ -175,10 +173,4 @@ final class HomeWidgetsViewModel {
175173
objectTypeWidgets = objectTypes
176174
}
177175
}
178-
179-
private func startSpaceViewTask() async {
180-
for await showChat in workspaceStorage.spaceViewPublisher(spaceId: spaceId).map(\.canShowChatWidget).removeDuplicates().values {
181-
chatWidgetData = showChat ? SpaceChatWidgetData(spaceId: spaceId, output: output) : nil
182-
}
183-
}
184176
}

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Widgets/SpaceChat/SpaceChatWidgetData.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Widgets/SpaceChat/SpaceChatWidgetView.swift

Lines changed: 0 additions & 44 deletions
This file was deleted.

Anytype/Sources/PresentationLayer/Modules/HomeWidgets/Widgets/SpaceChat/SpaceChatWidgetViewModel.swift

Lines changed: 0 additions & 50 deletions
This file was deleted.

Anytype/Sources/ServiceLayer/SpaceStorage/Models/SpaceView.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,7 @@ extension SpaceView {
103103
var canAddChatWidget: Bool {
104104
!initialScreenIsChat && isShared && hasChat
105105
}
106-
107-
var canShowChatWidget: Bool {
108-
!initialScreenIsChat && hasChat
109-
}
110-
106+
111107
var hasChat: Bool {
112108
chatId.isNotEmpty
113109
}

0 commit comments

Comments
 (0)