Skip to content

Commit

Permalink
IOS-2589 Migrate
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgolovko
mgolovko committed Apr 3, 2024
1 parent 32263b3 commit fa747ff
Show file tree
Hide file tree
Showing 21 changed files with 113 additions and 156 deletions.
22 changes: 17 additions & 5 deletions Anytype.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,8 @@
2A35A6AE2BBD809C00CCE4F4 /* WidgetTypeCreateObjectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A35A6AD2BBD809C00CCE4F4 /* WidgetTypeCreateObjectView.swift */; };
2A35A6B12BBD834F00CCE4F4 /* WidgetTypeRowViewModel+Init.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A35A6B02BBD834F00CCE4F4 /* WidgetTypeRowViewModel+Init.swift */; };
2A35A6B42BBD845B00CCE4F4 /* WidgetTypeChangeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A35A6B32BBD845B00CCE4F4 /* WidgetTypeChangeView.swift */; };
2A35A6BA2BBD9B9100CCE4F4 /* WidgetSourceSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A35A6B92BBD9B9100CCE4F4 /* WidgetSourceSearchView.swift */; };
2A35A6BC2BBD9C4D00CCE4F4 /* WidgetChangeSourceSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A35A6BB2BBD9C4D00CCE4F4 /* WidgetChangeSourceSearchView.swift */; };
2A35FF8E2AAF202E00D6006D /* CodeLanguageListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A35FF8D2AAF202E00D6006D /* CodeLanguageListView.swift */; };
2A35FF902AAF203C00D6006D /* CodeLanguageListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A35FF8F2AAF203C00D6006D /* CodeLanguageListViewModel.swift */; };
2A35FF922AAF20FD00D6006D /* CodeLanguageRowModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A35FF912AAF20FD00D6006D /* CodeLanguageRowModel.swift */; };
Expand Down Expand Up @@ -855,7 +857,6 @@
2AF4261F29AF86CD00753B17 /* DashboardAlertsAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF4261E29AF86CD00753B17 /* DashboardAlertsAssembly.swift */; };
2AF4C3DE295D82A700FD7153 /* WidgetsSubmoduleDI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF4C3DD295D82A700FD7153 /* WidgetsSubmoduleDI.swift */; };
2AF4C3E0295D837C00FD7153 /* ObjectTreeWidgetModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF4C3DF295D837C00FD7153 /* ObjectTreeWidgetModuleAssembly.swift */; };
2AF4C3E5295DE3CB00FD7153 /* CreateWidgetCoordinatorAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF4C3E4295DE3CB00FD7153 /* CreateWidgetCoordinatorAssembly.swift */; };
2AF605A128F417210078213D /* EditorBottomNavigationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF605A028F417210078213D /* EditorBottomNavigationManager.swift */; };
2AFA110A296C44BF0055422F /* HomeBottomPanelModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFA1109296C44BF0055422F /* HomeBottomPanelModuleAssembly.swift */; };
2AFA110E296C672A0055422F /* HomeBottomPanelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFA110D296C672A0055422F /* HomeBottomPanelProvider.swift */; };
Expand Down Expand Up @@ -2191,6 +2192,8 @@
2A35A6AD2BBD809C00CCE4F4 /* WidgetTypeCreateObjectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetTypeCreateObjectView.swift; sourceTree = "<group>"; };
2A35A6B02BBD834F00CCE4F4 /* WidgetTypeRowViewModel+Init.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WidgetTypeRowViewModel+Init.swift"; sourceTree = "<group>"; };
2A35A6B32BBD845B00CCE4F4 /* WidgetTypeChangeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetTypeChangeView.swift; sourceTree = "<group>"; };
2A35A6B92BBD9B9100CCE4F4 /* WidgetSourceSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetSourceSearchView.swift; sourceTree = "<group>"; };
2A35A6BB2BBD9C4D00CCE4F4 /* WidgetChangeSourceSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetChangeSourceSearchView.swift; sourceTree = "<group>"; };
2A35FF8D2AAF202E00D6006D /* CodeLanguageListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeLanguageListView.swift; sourceTree = "<group>"; };
2A35FF8F2AAF203C00D6006D /* CodeLanguageListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeLanguageListViewModel.swift; sourceTree = "<group>"; };
2A35FF912AAF20FD00D6006D /* CodeLanguageRowModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeLanguageRowModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2648,7 +2651,6 @@
2AF4261E29AF86CD00753B17 /* DashboardAlertsAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardAlertsAssembly.swift; sourceTree = "<group>"; };
2AF4C3DD295D82A700FD7153 /* WidgetsSubmoduleDI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetsSubmoduleDI.swift; sourceTree = "<group>"; };
2AF4C3DF295D837C00FD7153 /* ObjectTreeWidgetModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectTreeWidgetModuleAssembly.swift; sourceTree = "<group>"; };
2AF4C3E4295DE3CB00FD7153 /* CreateWidgetCoordinatorAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateWidgetCoordinatorAssembly.swift; sourceTree = "<group>"; };
2AF605A028F417210078213D /* EditorBottomNavigationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorBottomNavigationManager.swift; sourceTree = "<group>"; };
2AFA1109296C44BF0055422F /* HomeBottomPanelModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeBottomPanelModuleAssembly.swift; sourceTree = "<group>"; };
2AFA110D296C672A0055422F /* HomeBottomPanelProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeBottomPanelProvider.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4385,6 +4387,7 @@
1244790F27D8A35800581174 /* Search screen */ = {
isa = PBXGroup;
children = (
2A35A6B82BBD9B7000CCE4F4 /* WidgetSourceSearch */,
1244793527DC61D600581174 /* Assembly */,
1244793927DC61E400581174 /* View */,
1256841B27E34309003A8251 /* ViewModel */,
Expand Down Expand Up @@ -4510,7 +4513,6 @@
isa = PBXGroup;
children = (
8685724F2AE6A4BC00F0A747 /* SpaceSearchViewModel */,
2AE5C71B29B7294F00A92C12 /* WidgetSourceSearchViewModel */,
1244793C27DC626B00581174 /* NewInternalSearchViewModelProtocol.swift */,
125683D827DF1BEE003A8251 /* ObjectsSearchViewModel */,
1247BC7627FDD6CC005F2DB4 /* Legacy_ObjectTypeSearchViewModel */,
Expand Down Expand Up @@ -5633,6 +5635,16 @@
path = Change;
sourceTree = "<group>";
};
2A35A6B82BBD9B7000CCE4F4 /* WidgetSourceSearch */ = {
isa = PBXGroup;
children = (
2AE5C71B29B7294F00A92C12 /* WidgetSourceSearchViewModel */,
2A35A6B92BBD9B9100CCE4F4 /* WidgetSourceSearchView.swift */,
2A35A6BB2BBD9C4D00CCE4F4 /* WidgetChangeSourceSearchView.swift */,
);
path = WidgetSourceSearch;
sourceTree = "<group>";
};
2A376F582B85F2F700CF444A /* Subviews */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -7086,7 +7098,6 @@
2AF4C3E1295DE1AB00FD7153 /* CreateWidgetFlow */ = {
isa = PBXGroup;
children = (
2AF4C3E4295DE3CB00FD7153 /* CreateWidgetCoordinatorAssembly.swift */,
2A2B331B2A7AA633004BD906 /* CreateWidgetCoordinatorModel.swift */,
2A2B331D2A7AA7A6004BD906 /* CreateWidgetCoordinatorView.swift */,
2A2B331F2A7AA7AF004BD906 /* CreateWidgetCoordinatorViewModel.swift */,
Expand Down Expand Up @@ -11422,12 +11433,14 @@
03A90DF423A04FFE000E3EFE /* LocalRepoService.swift in Sources */,
EAADB16F26776DDD004B0AF2 /* MentionAttachment.swift in Sources */,
8638777A2A5808620024F814 /* SetObjectCreationSettingsView.swift in Sources */,
2A35A6BC2BBD9C4D00CCE4F4 /* WidgetChangeSourceSearchView.swift in Sources */,
2ECF1DBD2BBADA8F007C68E2 /* SetFilterConditions.swift in Sources */,
3DB6E247268B5F8900C303E5 /* BlockViewModelProtocol.swift in Sources */,
120EB4E326E8F618003A0C2B /* ObjectHeaderIconView.swift in Sources */,
86C4B3702B21DC61003B8C51 /* SharingTipView.swift in Sources */,
3DB1C9CA2726A6E7000D2779 /* BlockLinkState+Text.swift in Sources */,
2E04201E2BA899C500F36637 /* SelectRelationListData.swift in Sources */,
2A35A6BA2BBD9B9100CCE4F4 /* WidgetSourceSearchView.swift in Sources */,
C99A53AE28A1411B00B3E5F4 /* ObjectHeaderEmptyData.swift in Sources */,
3DCC549226D3B568002517AC /* BlockBookmarkOnlyUrlConfiguration.swift in Sources */,
2ACA29A52B712F73009CD054 /* GalleryNotificationViewModel.swift in Sources */,
Expand Down Expand Up @@ -12028,7 +12041,6 @@
C973E1A8285B3A5C00978BC4 /* EmptyRowViewViewModel.swift in Sources */,
3D929B2B263302160063F1BE /* TypographyExample.swift in Sources */,
2E31C9662B73C8C8006DB3E2 /* ObjectRelationOption.swift in Sources */,
2AF4C3E5295DE3CB00FD7153 /* CreateWidgetCoordinatorAssembly.swift in Sources */,
2A9486542950A3E7007A5586 /* HomeWidgetsModuleAssembly.swift in Sources */,
129C54D427FC83C000C390C7 /* SupportedRelationFormat.swift in Sources */,
2ADF00952AD00B04000D01F8 /* LinkToObjectCoordinatorOutput.swift in Sources */,
Expand Down
8 changes: 0 additions & 8 deletions Anytype/Sources/PresentationLayer/Assemblies/CoordinatorsDI.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@ final class CoordinatorsDI: CoordinatorsDIProtocol {
uiHelpersDI: uiHelpersDI
)
}

func createWidget() -> CreateWidgetCoordinatorAssemblyProtocol {
return CreateWidgetCoordinatorAssembly(
modulesDI: modulesDI,
serviceLocator: serviceLocator,
uiHelpersDI: uiHelpersDI
)
}

func application() -> ApplicationCoordinatorAssemblyProtocol {
return ApplicationCoordinatorAssembly(serviceLocator: serviceLocator, coordinatorsDI: self, uiHelpersDI: uiHelpersDI, modulesDI: modulesDI)
Expand Down
1 change: 0 additions & 1 deletion Anytype/Sources/PresentationLayer/Assemblies/CoordinatorsDIProtocol.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ protocol CoordinatorsDIProtocol: AnyObject {
func objectSettings() -> ObjectSettingsCoordinatorAssemblyProtocol
func addNewRelation() -> AddNewRelationCoordinatorAssemblyProtocol
func home() -> HomeCoordinatorAssemblyProtocol
func createWidget() -> CreateWidgetCoordinatorAssemblyProtocol
func application() -> ApplicationCoordinatorAssemblyProtocol
func settings() -> SettingsCoordinatorAssemblyProtocol
func authorization() -> AuthCoordinatorAssemblyProtocol
Expand Down
37 changes: 0 additions & 37 deletions ...pe/Sources/PresentationLayer/Flows/CreateWidgetFlow/CreateWidgetCoordinatorAssembly.swift
View file

This file was deleted.

12 changes: 9 additions & 3 deletions Anytype/Sources/PresentationLayer/Flows/CreateWidgetFlow/CreateWidgetCoordinatorView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@ import SwiftUI

struct CreateWidgetCoordinatorView: View {

@StateObject var model: CreateWidgetCoordinatorViewModel
@Environment(\.presentationMode) @Binding var presentationMode
@StateObject private var model: CreateWidgetCoordinatorViewModel
@Environment(\.presentationMode) @Binding private var presentationMode

init(data: CreateWidgetCoordinatorModel) {
self._model = StateObject(wrappedValue: CreateWidgetCoordinatorViewModel(data: data))
}

var body: some View {
model.makeWidgetSourceModule()
WidgetSourceSearchView(data: model.widgetSourceSearchData) {
model.onSelectSource(source: $0)
}
.sheet(item: $model.showWidgetTypeData) {
WidgetTypeCreateObjectView(data: $0)
}
Expand Down
36 changes: 12 additions & 24 deletions ...e/Sources/PresentationLayer/Flows/CreateWidgetFlow/CreateWidgetCoordinatorViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,28 @@ final class CreateWidgetCoordinatorViewModel: ObservableObject {

// MARK: - DI

@Injected(\.activeWorkspaceStorage)
private var activeWorkspaceStorage: ActiveWorkpaceStorageProtocol

private let data: CreateWidgetCoordinatorModel
private let newSearchModuleAssembly: NewSearchModuleAssemblyProtocol
private let activeWorkspaceStorage: ActiveWorkpaceStorageProtocol

// MARK: - State

lazy var widgetSourceSearchData = {
WidgetSourceSearchModuleModel(
spaceId: activeWorkspaceStorage.workspaceInfo.accountSpaceId,
context: data.context
)
}()

@Published var showWidgetTypeData: WidgetTypeCreateData?
@Published var dismiss: Bool = false

init(
data: CreateWidgetCoordinatorModel,
newSearchModuleAssembly: NewSearchModuleAssemblyProtocol,
activeWorkspaceStorage: ActiveWorkpaceStorageProtocol
) {
init(data: CreateWidgetCoordinatorModel) {
self.data = data
self.newSearchModuleAssembly = newSearchModuleAssembly
self.activeWorkspaceStorage = activeWorkspaceStorage
}

func makeWidgetSourceModule() -> AnyView {
return newSearchModuleAssembly.widgetSourceSearchModule(
data: WidgetSourceSearchModuleModel(
spaceId: activeWorkspaceStorage.workspaceInfo.accountSpaceId,
context: data.context,
onSelect: { [weak self] source in
self?.showSelectWidgetType(source: source)
}
)
)
}

// MARK: - Private

private func showSelectWidgetType(source: WidgetSource) {
func onSelectSource(source: WidgetSource) {
showWidgetTypeData = WidgetTypeCreateData(
widgetObjectId: data.widgetObjectId,
source: source,
Expand Down
2 changes: 0 additions & 2 deletions Anytype/Sources/PresentationLayer/Flows/HomeFlow/HomeCoordinatorAssembly.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ final class HomeCoordinatorAssembly: HomeCoordinatorAssemblyProtocol {
HomeCoordinatorViewModel(
homeWidgetsModuleAssembly: modulesDI.homeWidgets(),
activeWorkspaceStorage: serviceLocator.activeWorkspaceStorage(),
createWidgetCoordinatorAssembly: coordinatorsID.createWidget(),
searchModuleAssembly: modulesDI.search(),
newSearchModuleAssembly: modulesDI.newSearch(),
objectActionsService: serviceLocator.objectActionsService(),
defaultObjectService: serviceLocator.defaultObjectCreationService(),
blockService: serviceLocator.blockService(),
Expand Down
8 changes: 4 additions & 4 deletions Anytype/Sources/PresentationLayer/Flows/HomeFlow/HomeCoordinatorView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ struct HomeCoordinatorView: View {
keyboardDismiss()
}
.snackbar(toastBarData: $model.toastBarData)
.sheet(item: $model.showChangeSourceData) { data in
model.changeSourceModule(data: data)
.sheet(item: $model.showChangeSourceData) {
WidgetChangeSourceSearchView(data: $0)
}
.sheet(item: $model.showChangeTypeData) {
WidgetTypeChangeView(data: $0)
}
.sheet(item: $model.showSearchData) { data in
model.searchModule(data: data)
}
.sheet(item: $model.showCreateWidgetData) { data in
model.createWidgetModule(data: data)
.sheet(item: $model.showCreateWidgetData) {
CreateWidgetCoordinatorView(data: $0)
}
.sheet(isPresented: $model.showSpaceSwitch) {
model.createSpaceSwitchModule()
Expand Down
14 changes: 0 additions & 14 deletions Anytype/Sources/PresentationLayer/Flows/HomeFlow/HomeCoordinatorViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ final class HomeCoordinatorViewModel: ObservableObject,

private let homeWidgetsModuleAssembly: HomeWidgetsModuleAssemblyProtocol
private let activeWorkspaceStorage: ActiveWorkpaceStorageProtocol
private let createWidgetCoordinatorAssembly: CreateWidgetCoordinatorAssemblyProtocol
private let searchModuleAssembly: SearchModuleAssemblyProtocol
private let newSearchModuleAssembly: NewSearchModuleAssemblyProtocol
private let objectActionsService: ObjectActionsServiceProtocol
private let defaultObjectService: DefaultObjectCreationServiceProtocol
private let blockService: BlockServiceProtocol
Expand Down Expand Up @@ -79,9 +77,7 @@ final class HomeCoordinatorViewModel: ObservableObject,
init(
homeWidgetsModuleAssembly: HomeWidgetsModuleAssemblyProtocol,
activeWorkspaceStorage: ActiveWorkpaceStorageProtocol,
createWidgetCoordinatorAssembly: CreateWidgetCoordinatorAssemblyProtocol,
searchModuleAssembly: SearchModuleAssemblyProtocol,
newSearchModuleAssembly: NewSearchModuleAssemblyProtocol,
objectActionsService: ObjectActionsServiceProtocol,
defaultObjectService: DefaultObjectCreationServiceProtocol,
blockService: BlockServiceProtocol,
Expand All @@ -102,9 +98,7 @@ final class HomeCoordinatorViewModel: ObservableObject,
) {
self.homeWidgetsModuleAssembly = homeWidgetsModuleAssembly
self.activeWorkspaceStorage = activeWorkspaceStorage
self.createWidgetCoordinatorAssembly = createWidgetCoordinatorAssembly
self.searchModuleAssembly = searchModuleAssembly
self.newSearchModuleAssembly = newSearchModuleAssembly
self.objectActionsService = objectActionsService
self.defaultObjectService = defaultObjectService
self.blockService = blockService
Expand Down Expand Up @@ -159,19 +153,11 @@ final class HomeCoordinatorViewModel: ObservableObject,
func homeBottomNavigationPanelModule() -> AnyView {
return homeBottomNavigationPanelModuleAssembly.make(homePath: editorPath, output: self)
}

func changeSourceModule(data: WidgetChangeSourceSearchModuleModel) -> AnyView {
return newSearchModuleAssembly.widgetChangeSourceSearchModule(data: data)
}

func searchModule(data: SearchModuleModel) -> AnyView {
return searchModuleAssembly.makeObjectSearch(data: data)
}

func createWidgetModule(data: CreateWidgetCoordinatorModel) -> AnyView {
return createWidgetCoordinatorAssembly.make(data: data)
}

func createSpaceSwitchModule() -> AnyView {
return spaceSwitchCoordinatorAssembly.make()
}
Expand Down
44 changes: 0 additions & 44 deletions Anytype/Sources/PresentationLayer/Search screen/Assembly/NewSearchModuleAssembly.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,48 +298,4 @@ final class NewSearchModuleAssembly: NewSearchModuleAssemblyProtocol {

return NewSearchView(viewModel: viewModel)
}

func widgetSourceSearchModule(data: WidgetSourceSearchModuleModel) -> AnyView {
return widgetSourceSearchModule(
spaceId: data.spaceId,
model: WidgetSourceSearchSelectInternalViewModel(context: data.context, onSelect: data.onSelect)
)
}

func widgetChangeSourceSearchModule(data: WidgetChangeSourceSearchModuleModel) -> AnyView {
return widgetSourceSearchModule(
spaceId: data.spaceId,
model: WidgetSourceSearchChangeInternalViewModel(
widgetObjectId: data.widgetObjectId,
widgetId: data.widgetId,
documentService: self.serviceLocator.documentService(),
blockWidgetService: self.serviceLocator.blockWidgetService(),
context: data.context,
onFinish: data.onFinish
)
)
}

// MARK: - Private

private func widgetSourceSearchModule(
spaceId: String,
model: @autoclosure @escaping () -> WidgetSourceSearchInternalViewModelProtocol
) -> AnyView {
return NewSearchView(
viewModel: NewSearchViewModel(
title: Loc.Widgets.sourceSearch,
searchPlaceholder: Loc.search,
style: .default,
itemCreationMode: .unavailable,
internalViewModel: WidgetSourceSearchViewModel(
interactor: WidgetSourceSearchInteractor(
spaceId: spaceId,
searchService: self.serviceLocator.searchService()
),
internalModel: model()
)
)
).eraseToAnyView()
}
}
Loading

0 comments on commit fa747ff

Please sign in to comment.