iOS-2530 DI | Move SetFiltersSelectionHeaderView / SetFiltersDateView / SetFiltersDateCoordinatorView to the new DI

Anytype.xcodeproj/project.pbxproj

@@ -1112,9 +1112,6 @@
 		2ECB340F2A97A90800E0F9BB /* SetTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB340E2A97A90800E0F9BB /* SetTextView.swift */; };
 		2ECB34162A97B44800E0F9BB /* SetFiltersDateCoordinatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB34152A97B44800E0F9BB /* SetFiltersDateCoordinatorView.swift */; };
 		2ECB34182A97B45B00E0F9BB /* SetFiltersDateCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB34172A97B45B00E0F9BB /* SetFiltersDateCoordinatorViewModel.swift */; };
-		2ECB341A2A97B4C400E0F9BB /* SetFiltersDateCoordinatorAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB34192A97B4C400E0F9BB /* SetFiltersDateCoordinatorAssembly.swift */; };
-		2ECB341C2A97B80F00E0F9BB /* SetFiltersDateViewModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB341B2A97B80F00E0F9BB /* SetFiltersDateViewModuleAssembly.swift */; };
-		2ECB342B2A97C95600E0F9BB /* SetFiltersSelectionHeaderModuleAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB342A2A97C95600E0F9BB /* SetFiltersSelectionHeaderModuleAssembly.swift */; };
 		2ECB342D2A97CFF800E0F9BB /* SetFiltersSelectionCoordinatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB342C2A97CFF800E0F9BB /* SetFiltersSelectionCoordinatorView.swift */; };
 		2ECB342F2A97D00500E0F9BB /* SetFiltersSelectionCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB342E2A97D00500E0F9BB /* SetFiltersSelectionCoordinatorViewModel.swift */; };
 		2ECB34312A97D01B00E0F9BB /* SetFiltersSelectionCoordinatorAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECB34302A97D01B00E0F9BB /* SetFiltersSelectionCoordinatorAssembly.swift */; };
@@ -1127,6 +1124,7 @@
 		2ECD123028AFE6A900BD464A /* TitleWithIconStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECD122F28AFE6A900BD464A /* TitleWithIconStyle.swift */; };
 		2ECF1DBD2BBADA8F007C68E2 /* SetFilterConditions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECF1DBC2BBADA8F007C68E2 /* SetFilterConditions.swift */; };
 		2ECF1DBF2BBADCBA007C68E2 /* SetFiltersSelectionData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECF1DBE2BBADCBA007C68E2 /* SetFiltersSelectionData.swift */; };
+		2ECF1DC12BBC113C007C68E2 /* SetFiltersSelectionHeaderData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ECF1DC02BBC113C007C68E2 /* SetFiltersSelectionHeaderData.swift */; };
 		2ED9F4392A8E8F0900BE0A6B /* SetViewSettingsList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED9F4382A8E8F0900BE0A6B /* SetViewSettingsList.swift */; };
 		2ED9F43B2A8E902A00BE0A6B /* SetViewSettingsListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED9F43A2A8E902A00BE0A6B /* SetViewSettingsListModel.swift */; };
 		2ED9F43D2A8E90A800BE0A6B /* SetViewSettingsCoordinatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED9F43C2A8E90A800BE0A6B /* SetViewSettingsCoordinatorView.swift */; };
@@ -2911,9 +2909,6 @@
 		2ECB340E2A97A90800E0F9BB /* SetTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetTextView.swift; sourceTree = "<group>"; };
 		2ECB34152A97B44800E0F9BB /* SetFiltersDateCoordinatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersDateCoordinatorView.swift; sourceTree = "<group>"; };
 		2ECB34172A97B45B00E0F9BB /* SetFiltersDateCoordinatorViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersDateCoordinatorViewModel.swift; sourceTree = "<group>"; };
-		2ECB34192A97B4C400E0F9BB /* SetFiltersDateCoordinatorAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersDateCoordinatorAssembly.swift; sourceTree = "<group>"; };
-		2ECB341B2A97B80F00E0F9BB /* SetFiltersDateViewModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersDateViewModuleAssembly.swift; sourceTree = "<group>"; };
-		2ECB342A2A97C95600E0F9BB /* SetFiltersSelectionHeaderModuleAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersSelectionHeaderModuleAssembly.swift; sourceTree = "<group>"; };
 		2ECB342C2A97CFF800E0F9BB /* SetFiltersSelectionCoordinatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersSelectionCoordinatorView.swift; sourceTree = "<group>"; };
 		2ECB342E2A97D00500E0F9BB /* SetFiltersSelectionCoordinatorViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersSelectionCoordinatorViewModel.swift; sourceTree = "<group>"; };
 		2ECB34302A97D01B00E0F9BB /* SetFiltersSelectionCoordinatorAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersSelectionCoordinatorAssembly.swift; sourceTree = "<group>"; };
@@ -2926,6 +2921,7 @@
 		2ECD122F28AFE6A900BD464A /* TitleWithIconStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleWithIconStyle.swift; sourceTree = "<group>"; };
 		2ECF1DBC2BBADA8F007C68E2 /* SetFilterConditions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFilterConditions.swift; sourceTree = "<group>"; };
 		2ECF1DBE2BBADCBA007C68E2 /* SetFiltersSelectionData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersSelectionData.swift; sourceTree = "<group>"; };
+		2ECF1DC02BBC113C007C68E2 /* SetFiltersSelectionHeaderData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetFiltersSelectionHeaderData.swift; sourceTree = "<group>"; };
 		2ED9F4382A8E8F0900BE0A6B /* SetViewSettingsList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetViewSettingsList.swift; sourceTree = "<group>"; };
 		2ED9F43A2A8E902A00BE0A6B /* SetViewSettingsListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetViewSettingsListModel.swift; sourceTree = "<group>"; };
 		2ED9F43C2A8E90A800BE0A6B /* SetViewSettingsCoordinatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetViewSettingsCoordinatorView.swift; sourceTree = "<group>"; };
@@ -7348,7 +7344,7 @@
 				2E2D255A28880C8D00E3DFD1 /* SetFiltersSelectionHeaderConfiguration.swift */,
 				2E2D255B28880C8D00E3DFD1 /* SetFiltersSelectionHeaderView.swift */,
 				2E2D255C28880C8D00E3DFD1 /* SetFiltersSelectionHeaderViewModel.swift */,
-				2ECB342A2A97C95600E0F9BB /* SetFiltersSelectionHeaderModuleAssembly.swift */,
+				2ECF1DC02BBC113C007C68E2 /* SetFiltersSelectionHeaderData.swift */,
 			);
 			path = Header;
 			sourceTree = "<group>";
@@ -7510,7 +7506,6 @@
 				2E7C44662892CFCA0062287C /* SetFiltersDateRowView.swift */,
 				2E7C44682892D73C0062287C /* SetFiltersDateType.swift */,
 				2E7C446A2892E66D0062287C /* SetFiltersDate.swift */,
-				2ECB341B2A97B80F00E0F9BB /* SetFiltersDateViewModuleAssembly.swift */,
 			);
 			path = Date;
 			sourceTree = "<group>";
@@ -7779,7 +7774,6 @@
 			children = (
 				2ECB34152A97B44800E0F9BB /* SetFiltersDateCoordinatorView.swift */,
 				2ECB34172A97B45B00E0F9BB /* SetFiltersDateCoordinatorViewModel.swift */,
-				2ECB34192A97B4C400E0F9BB /* SetFiltersDateCoordinatorAssembly.swift */,
 			);
 			path = Coordinator;
 			sourceTree = "<group>";
@@ -10904,7 +10898,6 @@
 				3D1CEC2D27F48301000D36BA /* SettingsButton.swift in Sources */,
 				3D43FDB026B18BF80094D4C0 /* Array+SafeCall.swift in Sources */,
 				2AF605A128F417210078213D /* EditorBottomNavigationManager.swift in Sources */,
-				2ECB341C2A97B80F00E0F9BB /* SetFiltersDateViewModuleAssembly.swift in Sources */,
 				EAADB1A52678CD6E004B0AF2 /* MentionTextDetector.swift in Sources */,
 				2A2C330928928C02008BC326 /* UrlOpener.swift in Sources */,
 				3D88217C26F3722600A41E75 /* BlockText+AnytypeText.swift in Sources */,
@@ -11371,7 +11364,6 @@
 				2AE5C71D29B7299F00A92C12 /* WidgetSourceSearchViewModel.swift in Sources */,
 				EA45749725F8D2EB007D6C83 /* TextBlockContentView.swift in Sources */,
 				12EB9AF62771F0E900BA732F /* RelationOptionsListView.swift in Sources */,
-				2ECB342B2A97C95600E0F9BB /* SetFiltersSelectionHeaderModuleAssembly.swift in Sources */,
 				3DDD3D0E26AEB55700B5673A /* BlockFileView.swift in Sources */,
 				2AD5EFC62B17492500FAA908 /* BottomAlertButtonView.swift in Sources */,
 				53FF7C6D26F8F8E400A5A592 /* iCloudBackupConfigurator.swift in Sources */,
@@ -11527,6 +11519,7 @@
 				2E3E0DDC29F1C2C9009F68D8 /* KeyboardToolbarView.swift in Sources */,
 				53D4088627EC9D0A00495335 /* ObjectPreviewViewModel.swift in Sources */,
 				EA0261152624AC4100AE6D86 /* ApplicationWindowInsetsProvider.swift in Sources */,
+				2ECF1DC12BBC113C007C68E2 /* SetFiltersSelectionHeaderData.swift in Sources */,
 				2ABF214629B204F800E872D9 /* DashboardLogoutAlertModel.swift in Sources */,
 				53F64294284E4CDF005D4E50 /* ObjectPreviewDescriptionMenuViewModel.swift in Sources */,
 				2ADF008F2ACD5DAC000D01F8 /* StatusBarStyleModifier.swift in Sources */,
@@ -11645,7 +11638,6 @@
 				12A52E2C26CAA1A2000F0333 /* ViewAnimator+Scale.swift in Sources */,
 				2E101CBB2B98EFDD00D03821 /* TextRelationEditingModuleAssembly.swift in Sources */,
 				3D1B5F78274CF567007D97AE /* SetTableViewHeader.swift in Sources */,
-				2ECB341A2A97B4C400E0F9BB /* SetFiltersDateCoordinatorAssembly.swift in Sources */,
 				1226857928D4C5E60013A28E /* AppMetricsTracker.swift in Sources */,
 				2E31C9622B7281CD006DB3E2 /* RelationListSelectionView.swift in Sources */,
 				2A00A74229D33B25007BE598 /* EdgeInsets+Helpers.swift in Sources */,

Anytype/Sources/PresentationLayer/Assemblies/CoordinatorsDI.swift

@@ -109,10 +109,6 @@ final class CoordinatorsDI: CoordinatorsDIProtocol {
         return SetSortsListCoordinatorAssembly(modulesDI: modulesDI)
     }
 
-    func setFiltersDate() -> SetFiltersDateCoordinatorAssemblyProtocol {
-        SetFiltersDateCoordinatorAssembly(modulesDI: modulesDI)
-    }
-
     func setFiltersSelection() -> SetFiltersSelectionCoordinatorAssemblyProtocol {
         SetFiltersSelectionCoordinatorAssembly(modulesDI: modulesDI, coordinatorsDI: self)
     }

Anytype/Sources/PresentationLayer/Assemblies/CoordinatorsDIProtocol.swift

@@ -18,7 +18,6 @@ protocol CoordinatorsDIProtocol: AnyObject {
     func spaceSettings() -> SpaceSettingsCoordinatorAssemblyProtocol
     func setViewSettings() -> SetViewSettingsCoordinatorAssemblyProtocol
     func setSortsList() -> SetSortsListCoordinatorAssemblyProtocol
-    func setFiltersDate() -> SetFiltersDateCoordinatorAssemblyProtocol
     func setFiltersSelection() -> SetFiltersSelectionCoordinatorAssemblyProtocol
     func setFiltersList() -> SetFiltersListCoordinatorAssemblyProtocol
     func setLayoutSettings() -> SetLayoutSettingsCoordinatorAssemblyProtocol

Anytype/Sources/PresentationLayer/Assemblies/ModulesDI.swift

@@ -134,14 +134,6 @@ final class ModulesDI: ModulesDIProtocol {
         return SetViewSettingsListModuleAssembly(serviceLocator: serviceLocator)
     }
 
-    func setFiltersDateView() -> SetFiltersDateViewModuleAssemblyProtocol {
-        SetFiltersDateViewModuleAssembly()
-    }
-
-    func setFiltersSelectionHeader() -> SetFiltersSelectionHeaderModuleAssemblyProtocol {
-        SetFiltersSelectionHeaderModuleAssembly()
-    }
-
     func setFiltersListModule() -> SetFiltersListModuleAssemblyProtocol {
         SetFiltersListModuleAssembly(serviceLocator: serviceLocator)
     }

Anytype/Sources/PresentationLayer/Assemblies/ModulesDIProtocol.swift

@@ -30,8 +30,6 @@ protocol ModulesDIProtocol: AnyObject {
     func authCreatingSoul() -> CreatingSoulViewModuleAssemblyProtocol
     func setObjectCreationSettings() -> SetObjectCreationSettingsModuleAssemblyProtocol
     func setViewSettingsList() -> SetViewSettingsListModuleAssemblyProtocol
-    func setFiltersDateView() -> SetFiltersDateViewModuleAssemblyProtocol
-    func setFiltersSelectionHeader() -> SetFiltersSelectionHeaderModuleAssemblyProtocol
     func setFiltersListModule() -> SetFiltersListModuleAssemblyProtocol
     func setViewSettingsImagePreview() -> SetViewSettingsImagePreviewModuleAssemblyProtocol
     func setLayoutSettingsView() -> SetLayoutSettingsViewAssemblyProtocol

Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/Filters/Date/Coordinator/SetFiltersDateCoordinatorView.swift

@@ -1,12 +1,19 @@
 import SwiftUI
 
 struct SetFiltersDateCoordinatorView: View {
-    @StateObject var model: SetFiltersDateCoordinatorViewModel
+    @StateObject private var model: SetFiltersDateCoordinatorViewModel
+
+    init(data: SetFiltersDateViewData, setSelectionModel: SetFiltersSelectionViewModel?) {
+        _model = StateObject(wrappedValue: SetFiltersDateCoordinatorViewModel(data: data, setSelectionModel: setSelectionModel))
+    }
 
     var body: some View {
-        model.list()
-            .sheet(item: $model.filtersDaysData) { data in
-                SetTextView(data: data)
-            }
+        SetFiltersDateView(
+            data: model.data,
+            setSelectionModel: model.setSelectionModel
+        )
+        .sheet(item: $model.filtersDaysData) { data in
+            SetTextView(data: data)
+        }
     }
 }

Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/Filters/Date/Coordinator/SetFiltersDateCoordinatorViewModel.swift

@@ -9,32 +9,17 @@ protocol SetFiltersDateCoordinatorOutput: AnyObject {
 final class SetFiltersDateCoordinatorViewModel: ObservableObject, SetFiltersDateCoordinatorOutput {
     @Published var filtersDaysData: SetTextViewData?
 
-    private let filter: SetFilter
+    let data: SetFiltersDateViewData
 
     // TODO: Needs refactoring
-    private weak var setSelectionModel: SetFiltersSelectionViewModel?
-
-    private let setFiltersDateViewModuleAssembly: SetFiltersDateViewModuleAssemblyProtocol
-    private let completion: (SetFiltersDate) -> Void
+    weak var setSelectionModel: SetFiltersSelectionViewModel?
 
     init(
-        filter: SetFilter,
-        setSelectionModel: SetFiltersSelectionViewModel?,
-        setFiltersDateViewModuleAssembly: SetFiltersDateViewModuleAssemblyProtocol,
-        completion: @escaping (SetFiltersDate) -> Void
+        data: SetFiltersDateViewData,
+        setSelectionModel: SetFiltersSelectionViewModel?
     ) {
-        self.filter = filter
+        self.data = data
         self.setSelectionModel = setSelectionModel
-        self.setFiltersDateViewModuleAssembly = setFiltersDateViewModuleAssembly
-        self.completion = completion
-    }
-
-    func list() -> AnyView {
-        setFiltersDateViewModuleAssembly.make(
-            filter: filter,
-            selectionModel: setSelectionModel,
-            onApplyDate: completion
-        )
     }
 
     // MARK: - SetViewSettingsNavigationOutput

Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/Filters/Date/SetFiltersDateView.swift

@@ -1,7 +1,16 @@
 import SwiftUI
 
+struct SetFiltersDateViewData {
+    let filter: SetFilter
+    let onApplyDate: (SetFiltersDate) -> Void
+}
+
 struct SetFiltersDateView: View {
-    @StateObject var viewModel: SetFiltersDateViewModel
+    @StateObject private var viewModel: SetFiltersDateViewModel
+
+    init(data: SetFiltersDateViewData, setSelectionModel: SetFiltersSelectionViewModel?) {
+        _viewModel = StateObject(wrappedValue: SetFiltersDateViewModel(data: data, setSelectionModel: setSelectionModel))
+    }
 
     var body: some View {
         VStack(spacing: 0) {

Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/Filters/Date/SetFiltersDateViewModel.swift

@@ -31,11 +31,10 @@ final class SetFiltersDateViewModel: ObservableObject {
     }
 
     init(
-        filter: SetFilter,
-        setSelectionModel: SetFiltersSelectionViewModel?,
-        onApplyDate: @escaping (SetFiltersDate) -> Void)
-    {
-        self.filter = filter
+        data: SetFiltersDateViewData,
+        setSelectionModel: SetFiltersSelectionViewModel?
+    ){
+        self.filter = data.filter
         self.quickOption = filter.filter.quickOption
         self.setSelectionModel = setSelectionModel
         self.condition = setSelectionModel?.condition ?? DataviewFilter.Condition.equal
@@ -54,7 +53,7 @@ final class SetFiltersDateViewModel: ObservableObject {
             self.numberOfDays = filter.filter.value.safeIntValue ?? 0
         }
 
-        self.onApplyDate = onApplyDate
+        self.onApplyDate = data.onApplyDate
         self.setup()
     }
 

Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/Filters/Selection/Coordinator/SetFiltersSelectionCoordinatorAssembly.swift

@@ -24,8 +24,6 @@ final class SetFiltersSelectionCoordinatorAssembly: SetFiltersSelectionCoordinat
             model: SetFiltersSelectionCoordinatorViewModel(
                 spaceId: spaceId,
                 filter: filter,
-                setFiltersSelectionHeaderModuleAssembly: self.modulesDI.setFiltersSelectionHeader(),
-                setFiltersDateCoordinatorAssembly: self.coordinatorsDI.setFiltersDate(),
                 newSearchModuleAssembly: self.modulesDI.newSearch(),
                 completion: completion
             )

Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/Filters/Selection/Coordinator/SetFiltersSelectionCoordinatorViewModel.swift

@@ -16,17 +16,13 @@ final class SetFiltersSelectionCoordinatorViewModel: ObservableObject, SetFilter
     init(
         spaceId: String,
         filter: SetFilter,
-        setFiltersSelectionHeaderModuleAssembly: SetFiltersSelectionHeaderModuleAssemblyProtocol,
-        setFiltersDateCoordinatorAssembly: SetFiltersDateCoordinatorAssemblyProtocol,
         newSearchModuleAssembly: NewSearchModuleAssemblyProtocol,
         completion: @escaping (SetFilter) -> Void
     ) {
         self.data = SetFiltersSelectionData(filter: filter, onApply: completion)
         self.contentViewBuilder = SetFiltersContentViewBuilder(
             spaceId: spaceId,
             filter: filter,
-            setFiltersSelectionHeaderModuleAssembly: setFiltersSelectionHeaderModuleAssembly,
-            setFiltersDateCoordinatorAssembly: setFiltersDateCoordinatorAssembly,
             newSearchModuleAssembly: newSearchModuleAssembly
         )
     }

Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/Filters/Selection/Header/SetFiltersSelectionHeaderData.swift

@@ -0,0 +1,6 @@
+import Services
+
+struct SetFiltersSelectionHeaderData {
+    let filter: SetFilter
+    let onConditionChanged: (DataviewFilter.Condition) -> Void
+}