diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt index ce9b24f63c..484ad65b13 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt @@ -50,8 +50,8 @@ import com.anytypeio.anytype.domain.config.UserSettingsRepository import com.anytypeio.anytype.domain.cover.RemoveDocCover import com.anytypeio.anytype.domain.cover.SetDocCoverImage import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects -import com.anytypeio.anytype.domain.dataview.interactor.SetRelationKey +import com.anytypeio.anytype.domain.search.SearchObjects +import com.anytypeio.anytype.domain.relations.SetRelationKey import com.anytypeio.anytype.domain.download.DownloadFile import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.icon.DocumentEmojiIconProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationObjectValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationObjectValueTest.kt index 38fa4be074..0004bc6569 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationObjectValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationObjectValueTest.kt @@ -27,7 +27,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveStatusFromDataView import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRecord import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.domain.relations.AddFileToRecord +import com.anytypeio.anytype.domain.dataview.interactor.AddFileToRecord import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectValueProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt index 26cb02754e..a7ab5bd131 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationStatusValueTest.kt @@ -28,7 +28,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveStatusFromDataView import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRecord import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.domain.relations.AddFileToRecord +import com.anytypeio.anytype.domain.dataview.interactor.AddFileToRecord import com.anytypeio.anytype.core_models.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt index bae2603ea6..68522a5956 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/DisplayRelationTagValueTest.kt @@ -28,7 +28,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveStatusFromDataView import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRecord import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.domain.relations.AddFileToRecord +import com.anytypeio.anytype.domain.dataview.interactor.AddFileToRecord import com.anytypeio.anytype.core_models.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt index 96ead672b1..603be1b844 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/EditRelationTagValueTest.kt @@ -23,7 +23,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveStatusFromDataView import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRecord import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder -import com.anytypeio.anytype.domain.relations.AddFileToRecord +import com.anytypeio.anytype.domain.dataview.interactor.AddFileToRecord import com.anytypeio.anytype.core_models.ThemeColor import com.anytypeio.anytype.presentation.relations.ObjectSetConfig import com.anytypeio.anytype.presentation.relations.providers.DataViewObjectRelationProvider diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt index 28fe338e1e..c88c00cfd2 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/ObjectRelationListTest.kt @@ -21,7 +21,7 @@ import com.anytypeio.anytype.core_utils.ext.toTimeSeconds import com.anytypeio.anytype.domain.`object`.UpdateDetail import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.Gateway -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.DeleteRelationFromObject diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt index 6ca3f9a278..ecf3e5cb22 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/CreateSelectedFilterTest.kt @@ -17,7 +17,7 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.Gateway -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.relations.ObjectSetConfig diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/FilterListTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/FilterListTest.kt index d02a16ba07..071d98f716 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/FilterListTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/FilterListTest.kt @@ -16,7 +16,7 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.Gateway -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.relations.ObjectSetConfig diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt index c54cb1c26f..25ebd75f0c 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyInputValueFilterTest.kt @@ -25,7 +25,7 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.Gateway -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.relations.ObjectSetConfig diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt index b2c69f0311..0601ecf3e5 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt @@ -22,7 +22,7 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.Gateway -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.relations.ObjectSetConfig diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt index 76642c8cb4..e92a1c0b27 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt @@ -22,7 +22,7 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.Gateway -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.relations.ObjectSetConfig diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/AddFileRelationDi.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/AddFileRelationDi.kt index 89c0d9793c..74bdc0d025 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/AddFileRelationDi.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/AddFileRelationDi.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.di.feature import com.anytypeio.anytype.core_utils.di.scope.PerDialog -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.relations.add.AddFileRelationViewModel import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/AddObjectRelationObjectValuDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/AddObjectRelationObjectValuDI.kt index 245d29864d..5f6c793340 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/AddObjectRelationObjectValuDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/AddObjectRelationObjectValuDI.kt @@ -2,7 +2,7 @@ package com.anytypeio.anytype.di.feature import com.anytypeio.anytype.core_utils.di.scope.PerDialog import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.relations.add.AddObjectRelationViewModel import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt index fad1be6a23..42a6949378 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/DashboardDi.kt @@ -15,7 +15,7 @@ import com.anytypeio.anytype.domain.config.InfrastructureRepository import com.anytypeio.anytype.domain.config.UserSettingsRepository import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.event.interactor.EventChannel import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.launch.GetDefaultEditorType diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/DebugSettingsDi.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/DebugSettingsDi.kt index 90d126efa4..c12b6df906 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/DebugSettingsDi.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/DebugSettingsDi.kt @@ -5,8 +5,8 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.config.GetDebugSettings import com.anytypeio.anytype.domain.config.InfrastructureRepository import com.anytypeio.anytype.domain.config.UseCustomContextMenu -import com.anytypeio.anytype.domain.dataview.interactor.DebugLocalStore -import com.anytypeio.anytype.domain.dataview.interactor.DebugSync +import com.anytypeio.anytype.domain.debugging.DebugLocalStore +import com.anytypeio.anytype.domain.debugging.DebugSync import com.anytypeio.anytype.ui.settings.DebugSettingsFragment import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt index 9faf2a2419..24f006d601 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt @@ -48,8 +48,8 @@ import com.anytypeio.anytype.domain.clipboard.Paste import com.anytypeio.anytype.domain.config.UserSettingsRepository import com.anytypeio.anytype.domain.cover.SetDocCoverImage import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects -import com.anytypeio.anytype.domain.dataview.interactor.SetRelationKey +import com.anytypeio.anytype.domain.search.SearchObjects +import com.anytypeio.anytype.domain.relations.SetRelationKey import com.anytypeio.anytype.domain.download.DownloadFile import com.anytypeio.anytype.domain.download.Downloader import com.anytypeio.anytype.domain.event.interactor.EventChannel diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectDI.kt index 1d6ea148ab..839d712403 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectDI.kt @@ -4,7 +4,7 @@ import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_utils.di.scope.PerScreen import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.linking.LinkToObjectViewModelFactory import com.anytypeio.anytype.ui.linking.LinkToObjectFragment diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectOrWebDi.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectOrWebDi.kt index 5dfb4b8781..921aab6a67 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectOrWebDi.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/LinkToObjectOrWebDi.kt @@ -4,7 +4,7 @@ import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_utils.di.scope.PerScreen import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.linking.LinkToObjectOrWebViewModelFactory import com.anytypeio.anytype.ui.linking.LinkToObjectOrWebPagesFragment diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/MoveToDi.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/MoveToDi.kt index 8f23ff1604..69653f233c 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/MoveToDi.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/MoveToDi.kt @@ -4,7 +4,7 @@ import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_utils.di.scope.PerScreen import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.moving.MoveToViewModelFactory import com.anytypeio.anytype.ui.moving.MoveToFragment diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt index 10430a52a2..11f02bef7d 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationDI.kt @@ -5,7 +5,7 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_utils.di.scope.PerModal import com.anytypeio.anytype.domain.`object`.UpdateDetail import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.DeleteRelationFromObject diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationValueDi.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationValueDi.kt index 73df6a3aec..d16f081f38 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationValueDi.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectRelationValueDi.kt @@ -14,7 +14,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRec import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToObject -import com.anytypeio.anytype.domain.relations.AddFileToRecord +import com.anytypeio.anytype.domain.dataview.interactor.AddFileToRecord import com.anytypeio.anytype.presentation.relations.providers.ObjectDetailProvider import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider import com.anytypeio.anytype.presentation.relations.providers.ObjectValueProvider diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectSetDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectSetDI.kt index 27e09e005b..96692e628c 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectSetDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/ObjectSetDI.kt @@ -23,7 +23,7 @@ import com.anytypeio.anytype.domain.config.UserSettingsRepository import com.anytypeio.anytype.domain.cover.SetDocCoverImage import com.anytypeio.anytype.domain.dataview.interactor.AddNewRelationToDataView import com.anytypeio.anytype.domain.dataview.interactor.CreateDataViewRecord -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.SetActiveViewer import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer @@ -36,7 +36,7 @@ import com.anytypeio.anytype.domain.objects.SetObjectIsArchived import com.anytypeio.anytype.domain.page.CloseBlock import com.anytypeio.anytype.domain.page.CreateNewObject import com.anytypeio.anytype.domain.page.CreatePage -import com.anytypeio.anytype.domain.relations.AddFileToRecord +import com.anytypeio.anytype.domain.dataview.interactor.AddFileToRecord import com.anytypeio.anytype.domain.relations.DeleteRelationFromDataView import com.anytypeio.anytype.domain.sets.OpenObjectSet import com.anytypeio.anytype.domain.status.InterceptThreadStatus diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/SearchDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/SearchDI.kt index 247767a059..12293756ce 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/SearchDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/SearchDI.kt @@ -4,7 +4,7 @@ import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_utils.di.scope.PerScreen import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.search.ObjectSearchViewModelFactory import com.anytypeio.anytype.ui.search.ObjectSearchFragment diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/relations/LimitObjectTypeDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/relations/LimitObjectTypeDI.kt index 8f5a99feb1..3c53508905 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/relations/LimitObjectTypeDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/relations/LimitObjectTypeDI.kt @@ -1,7 +1,7 @@ package com.anytypeio.anytype.di.feature.relations import com.anytypeio.anytype.core_utils.di.scope.PerDialog -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.relations.LimitObjectTypeViewModel import com.anytypeio.anytype.presentation.relations.model.CreateFromScratchState diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/relations/RelationAddDI.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/relations/RelationAddDI.kt index f35e909e87..e3666757cb 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/relations/RelationAddDI.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/relations/RelationAddDI.kt @@ -5,7 +5,7 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_utils.di.scope.PerDialog import com.anytypeio.anytype.domain.block.repo.BlockRepository import com.anytypeio.anytype.domain.dataview.interactor.AddRelationToDataView -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.relations.AddRelationToObject import com.anytypeio.anytype.presentation.relations.RelationAddToDataViewViewModel diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/sets/CreateFilter.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/sets/CreateFilter.kt index 796ac01ff9..2521027e2d 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/sets/CreateFilter.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/sets/CreateFilter.kt @@ -4,7 +4,7 @@ import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_utils.di.scope.PerModal import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.sets.ObjectSet diff --git a/app/src/main/java/com/anytypeio/anytype/di/feature/sets/ModifyFilter.kt b/app/src/main/java/com/anytypeio/anytype/di/feature/sets/ModifyFilter.kt index b0f1e6930d..6254259d65 100644 --- a/app/src/main/java/com/anytypeio/anytype/di/feature/sets/ModifyFilter.kt +++ b/app/src/main/java/com/anytypeio/anytype/di/feature/sets/ModifyFilter.kt @@ -4,7 +4,7 @@ import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_utils.di.scope.PerModal import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.sets.ObjectSet diff --git a/app/src/main/java/com/anytypeio/anytype/ui/settings/DebugSettingsFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/settings/DebugSettingsFragment.kt index 5c59ba6b90..c3e0e91bb5 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/settings/DebugSettingsFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/settings/DebugSettingsFragment.kt @@ -19,8 +19,8 @@ import com.anytypeio.anytype.databinding.FragmentDebugSettingsBinding import com.anytypeio.anytype.di.common.componentManager import com.anytypeio.anytype.domain.config.GetDebugSettings import com.anytypeio.anytype.domain.config.UseCustomContextMenu -import com.anytypeio.anytype.domain.dataview.interactor.DebugLocalStore -import com.anytypeio.anytype.domain.dataview.interactor.DebugSync +import com.anytypeio.anytype.domain.debugging.DebugLocalStore +import com.anytypeio.anytype.domain.debugging.DebugSync import kotlinx.coroutines.launch import timber.log.Timber import java.io.File diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectType.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectType.kt index c3a84203e5..3e9cf5c428 100644 --- a/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectType.kt +++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectType.kt @@ -9,6 +9,7 @@ package com.anytypeio.anytype.core_models * @property [layout] template's layout * */ +@Deprecated("Will be deprecated. Object type will be treated as object") data class ObjectType( val url: Url, val name: String, diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/Relation.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/Relation.kt index fd584afc2c..17ecdac192 100644 --- a/core-models/src/main/java/com/anytypeio/anytype/core_models/Relation.kt +++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/Relation.kt @@ -7,6 +7,7 @@ package com.anytypeio.anytype.core_models * @property [isReadOnly] editable by user or not * @property [isHidden] whether this type is internal (not displayed to user) */ +@Deprecated("Will be deprecated. Relations will be treated as objects") data class Relation( val key: String, val name: String, diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/block/repo/BlockRepository.kt b/domain/src/main/java/com/anytypeio/anytype/domain/block/repo/BlockRepository.kt index eca95aba9a..a908d1a54f 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/block/repo/BlockRepository.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/block/repo/BlockRepository.kt @@ -141,6 +141,7 @@ interface BlockRepository { suspend fun setFields(command: Command.SetFields): Payload + @Deprecated("Part of soon-to-be-deprecated API") suspend fun getObjectTypes(): List suspend fun createObjectType(prototype: ObjectType.Prototype): ObjectType diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/relations/AddFileToRecord.kt b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddFileToRecord.kt similarity index 91% rename from domain/src/main/java/com/anytypeio/anytype/domain/relations/AddFileToRecord.kt rename to domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddFileToRecord.kt index 17c56f3497..232e0b942e 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/relations/AddFileToRecord.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddFileToRecord.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.domain.relations +package com.anytypeio.anytype.domain.dataview.interactor import com.anytypeio.anytype.core_models.Command import com.anytypeio.anytype.core_models.Id @@ -7,6 +7,7 @@ import com.anytypeio.anytype.domain.base.BaseUseCase import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.block.repo.BlockRepository +@Deprecated("Part of soon-to-be-deprecated API") class AddFileToRecord( private val repo: BlockRepository ) : BaseUseCase() { diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddStatusToDataViewRecord.kt b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddStatusToDataViewRecord.kt index 8cd7bdbf6b..47b553b6e7 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddStatusToDataViewRecord.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddStatusToDataViewRecord.kt @@ -8,6 +8,7 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository /** * Use-case for adding a new status value to record. */ +@Deprecated("Part of soon-to-be-deprecated API") class AddStatusToDataViewRecord( private val repo: BlockRepository ) : BaseUseCase() { diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddTagToDataViewRecord.kt b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddTagToDataViewRecord.kt index 36f43e5331..479a842b8a 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddTagToDataViewRecord.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/AddTagToDataViewRecord.kt @@ -8,6 +8,7 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository /** * Use-case for adding a new tag value to record. */ +@Deprecated("Part of soon-to-be-deprecated API") class AddTagToDataViewRecord( private val repo: BlockRepository ) : BaseUseCase() { diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/CreateDataViewRecord.kt b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/CreateDataViewRecord.kt index 283568c257..97621b33a7 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/CreateDataViewRecord.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/CreateDataViewRecord.kt @@ -8,6 +8,7 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository /** * Use-case for creating a new record inside data view's database. */ +@Deprecated("Part of soon-to-be-deprecated API") class CreateDataViewRecord( private val repo: BlockRepository ) : BaseUseCase() { diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/GetCompatibleObjectTypes.kt b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/GetCompatibleObjectTypes.kt index 4324602645..65b49ee591 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/GetCompatibleObjectTypes.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/GetCompatibleObjectTypes.kt @@ -10,6 +10,7 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository /** * Use-case for getting compatible object types with current smart block type. */ +@Deprecated("Part of soon-to-be-deprecated API") class GetCompatibleObjectTypes( private val repo: BlockRepository ) : BaseUseCase, GetCompatibleObjectTypes.Params>() { diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/RemoveStatusFromDataViewRecord.kt b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/RemoveStatusFromDataViewRecord.kt index 65b7545b79..e0b2be71bd 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/RemoveStatusFromDataViewRecord.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/RemoveStatusFromDataViewRecord.kt @@ -5,6 +5,7 @@ import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.domain.base.BaseUseCase import com.anytypeio.anytype.domain.block.repo.BlockRepository +@Deprecated("Part of soon-to-be-deprecated API") class RemoveStatusFromDataViewRecord( private val repo: BlockRepository ) : BaseUseCase() { diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/RemoveTagFromDataViewRecord.kt b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/RemoveTagFromDataViewRecord.kt index 4b07ce1b95..d11957bf6f 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/RemoveTagFromDataViewRecord.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/RemoveTagFromDataViewRecord.kt @@ -5,6 +5,7 @@ import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.domain.base.BaseUseCase import com.anytypeio.anytype.domain.block.repo.BlockRepository +@Deprecated("Part of soon-to-be-deprecated API") class RemoveTagFromDataViewRecord( private val repo: BlockRepository ) : BaseUseCase() { diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/UpdateDataViewRecord.kt b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/UpdateDataViewRecord.kt index bbec466cbb..0d72bf803d 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/UpdateDataViewRecord.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/UpdateDataViewRecord.kt @@ -8,6 +8,7 @@ import com.anytypeio.anytype.domain.block.repo.BlockRepository /** * Use-case for updating data-view record. */ +@Deprecated("Part of soon-to-be-deprecated API") class UpdateDataViewRecord( private val repo: BlockRepository ) : BaseUseCase() { diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/DebugLocalStore.kt b/domain/src/main/java/com/anytypeio/anytype/domain/debugging/DebugLocalStore.kt similarity index 88% rename from domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/DebugLocalStore.kt rename to domain/src/main/java/com/anytypeio/anytype/domain/debugging/DebugLocalStore.kt index d527e452b5..497de5c536 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/DebugLocalStore.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/debugging/DebugLocalStore.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.domain.dataview.interactor +package com.anytypeio.anytype.domain.debugging import com.anytypeio.anytype.domain.base.BaseUseCase import com.anytypeio.anytype.domain.base.Either diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/DebugSync.kt b/domain/src/main/java/com/anytypeio/anytype/domain/debugging/DebugSync.kt similarity index 86% rename from domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/DebugSync.kt rename to domain/src/main/java/com/anytypeio/anytype/domain/debugging/DebugSync.kt index 9a554da31b..6963de7935 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/DebugSync.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/debugging/DebugSync.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.domain.dataview.interactor +package com.anytypeio.anytype.domain.debugging import com.anytypeio.anytype.domain.base.BaseUseCase import com.anytypeio.anytype.domain.base.Either diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/ObjectRelationList.kt b/domain/src/main/java/com/anytypeio/anytype/domain/relations/ObjectRelationList.kt similarity index 94% rename from domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/ObjectRelationList.kt rename to domain/src/main/java/com/anytypeio/anytype/domain/relations/ObjectRelationList.kt index 6932e76aec..34bb9e880c 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/ObjectRelationList.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/relations/ObjectRelationList.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.domain.dataview.interactor +package com.anytypeio.anytype.domain.relations import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.Relation diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/SetRelationKey.kt b/domain/src/main/java/com/anytypeio/anytype/domain/relations/SetRelationKey.kt similarity index 93% rename from domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/SetRelationKey.kt rename to domain/src/main/java/com/anytypeio/anytype/domain/relations/SetRelationKey.kt index 55d2471e84..c650e3c3d7 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/SetRelationKey.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/relations/SetRelationKey.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.domain.dataview.interactor +package com.anytypeio.anytype.domain.relations import com.anytypeio.anytype.core_models.Command import com.anytypeio.anytype.core_models.Id diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/SearchObjects.kt b/domain/src/main/java/com/anytypeio/anytype/domain/search/SearchObjects.kt similarity index 95% rename from domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/SearchObjects.kt rename to domain/src/main/java/com/anytypeio/anytype/domain/search/SearchObjects.kt index 6374b0f7ac..e5b6736388 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/dataview/interactor/SearchObjects.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/search/SearchObjects.kt @@ -1,4 +1,4 @@ -package com.anytypeio.anytype.domain.dataview.interactor +package com.anytypeio.anytype.domain.search import com.anytypeio.anytype.core_models.DVFilter import com.anytypeio.anytype.core_models.DVSort diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModel.kt index 7c9317f645..c268e93d21 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModel.kt @@ -30,7 +30,7 @@ import com.anytypeio.anytype.domain.config.GetConfig import com.anytypeio.anytype.domain.config.GetDebugSettings import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.objects.DeleteObjects diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelFactory.kt index db1abbfd8d..61a980568f 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelFactory.kt @@ -9,7 +9,7 @@ import com.anytypeio.anytype.domain.config.GetConfig import com.anytypeio.anytype.domain.config.GetDebugSettings import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.objects.DeleteObjects diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt index 9f475aa217..f1092bdd6c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt @@ -56,7 +56,7 @@ import com.anytypeio.anytype.domain.block.interactor.sets.CreateObjectSet import com.anytypeio.anytype.domain.clipboard.Paste.Companion.DEFAULT_RANGE import com.anytypeio.anytype.domain.cover.SetDocCoverImage import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.editor.Editor import com.anytypeio.anytype.domain.error.Error import com.anytypeio.anytype.domain.event.interactor.InterceptEvents diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModelFactory.kt index 67f26e231e..462c218c33 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModelFactory.kt @@ -13,7 +13,7 @@ import com.anytypeio.anytype.domain.block.interactor.UpdateLinkMarks import com.anytypeio.anytype.domain.block.interactor.sets.CreateObjectSet import com.anytypeio.anytype.domain.cover.SetDocCoverImage import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.icon.SetDocumentImageIcon import com.anytypeio.anytype.domain.launch.GetDefaultEditorType diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Orchestrator.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Orchestrator.kt index fc68501003..ecda08a5a1 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Orchestrator.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/Orchestrator.kt @@ -25,7 +25,7 @@ import com.anytypeio.anytype.domain.block.interactor.UpdateTextStyle import com.anytypeio.anytype.domain.block.interactor.UploadBlock import com.anytypeio.anytype.domain.clipboard.Copy import com.anytypeio.anytype.domain.clipboard.Paste -import com.anytypeio.anytype.domain.dataview.interactor.SetRelationKey +import com.anytypeio.anytype.domain.relations.SetRelationKey import com.anytypeio.anytype.domain.download.DownloadFile import com.anytypeio.anytype.domain.editor.Editor.Cursor import com.anytypeio.anytype.domain.editor.Editor.Focus diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectOrWebViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectOrWebViewModel.kt index 1bba2fed5e..439fa7a943 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectOrWebViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectOrWebViewModel.kt @@ -8,7 +8,7 @@ import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.ObjectWrapper import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.extension.sendAnalyticsSearchQueryEvent import com.anytypeio.anytype.presentation.extension.sendAnalyticsSearchResultEvent diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModel.kt index 0b60256cb5..d679708e63 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModel.kt @@ -6,7 +6,7 @@ import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.ObjectWrapper import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.objects.SupportedLayouts import com.anytypeio.anytype.presentation.search.ObjectSearchConstants diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModelFactory.kt index acdc4e5869..7df8acc301 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/linking/LinkToObjectViewModelFactory.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder class LinkToObjectViewModelFactory( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModel.kt index 3289777ae1..e99cbe8305 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModel.kt @@ -9,7 +9,7 @@ import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.ObjectWrapper import com.anytypeio.anytype.core_models.SmartBlockType import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.extension.sendAnalyticsSearchQueryEvent import com.anytypeio.anytype.presentation.extension.sendAnalyticsSearchResultEvent diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModelFactory.kt index 6ee33c9bd9..cf344ba5e1 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/moving/MoveToViewModelFactory.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder class MoveToViewModelFactory( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/LimitObjectTypeViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/LimitObjectTypeViewModel.kt index db50c44afb..b55433647b 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/LimitObjectTypeViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/LimitObjectTypeViewModel.kt @@ -7,7 +7,7 @@ import com.anytypeio.anytype.core_models.DVFilter import com.anytypeio.anytype.core_models.DVFilterCondition import com.anytypeio.anytype.core_models.ObjectType import com.anytypeio.anytype.core_models.Relations -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.common.BaseViewModel import com.anytypeio.anytype.presentation.objects.ObjectIcon diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt index 2bf550256b..16e62f0ff9 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt @@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModelProvider import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.`object`.UpdateDetail -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.DeleteRelationFromObject diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddToDataViewViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddToDataViewViewModel.kt index dc6e462fab..e62db9ef14 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddToDataViewViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddToDataViewViewModel.kt @@ -9,7 +9,7 @@ import com.anytypeio.anytype.core_models.DVViewerRelation import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.domain.dataview.interactor.AddRelationToDataView -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.presentation.extension.getPropName import com.anytypeio.anytype.presentation.extension.sendAnalyticsAddRelationEvent diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddToObjectViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddToObjectViewModel.kt index 4abb5aa030..3e44deb50e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddToObjectViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddToObjectViewModel.kt @@ -7,7 +7,7 @@ import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.analytics.base.EventsDictionary import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.Payload -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.domain.relations.AddRelationToObject import com.anytypeio.anytype.presentation.extension.getPropName import com.anytypeio.anytype.presentation.extension.sendAnalyticsAddRelationEvent diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddViewModelBase.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddViewModelBase.kt index c8ec6f8bbf..3af9eb952c 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddViewModelBase.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationAddViewModelBase.kt @@ -3,7 +3,7 @@ package com.anytypeio.anytype.presentation.relations import androidx.lifecycle.viewModelScope import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.Relation -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.presentation.common.BaseViewModel import com.anytypeio.anytype.presentation.relations.model.RelationView import com.anytypeio.anytype.presentation.relations.providers.ObjectRelationProvider diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt index d56548a8d2..71cecc191f 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt @@ -12,7 +12,7 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.core_utils.diff.DefaultObjectDiffIdentifier import com.anytypeio.anytype.domain.`object`.UpdateDetail -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddToFeaturedRelations import com.anytypeio.anytype.domain.relations.DeleteRelationFromObject diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/AddFileRelationViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/AddFileRelationViewModel.kt index 2180f47a8a..217afee428 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/AddFileRelationViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/AddFileRelationViewModel.kt @@ -10,7 +10,7 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.core_utils.ext.cancel import com.anytypeio.anytype.core_utils.ext.typeOf -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.objects.toRelationFileValueView import com.anytypeio.anytype.presentation.relations.RelationValueView diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/AddObjectRelationViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/AddObjectRelationViewModel.kt index 2c6094d26b..8953af1698 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/AddObjectRelationViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/AddObjectRelationViewModel.kt @@ -11,7 +11,7 @@ import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.core_utils.ext.cancel import com.anytypeio.anytype.core_utils.ext.typeOf import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.objects.toRelationObjectValueView import com.anytypeio.anytype.presentation.relations.RelationValueView diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt index c981be5161..d620b1087a 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt @@ -10,7 +10,7 @@ import com.anytypeio.anytype.core_utils.common.EventWrapper import com.anytypeio.anytype.core_utils.ext.cancel import com.anytypeio.anytype.core_utils.ui.ViewStateViewModel import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.extension.sendAnalyticsSearchQueryEvent import com.anytypeio.anytype.presentation.extension.sendAnalyticsSearchResultEvent diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModelFactory.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModelFactory.kt index 3b54e3d5cd..b951ea32e4 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModelFactory.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModelFactory.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.misc.UrlBuilder class ObjectSearchViewModelFactory( diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt index d343b1841f..1b4fc65e76 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt @@ -20,7 +20,7 @@ import com.anytypeio.anytype.domain.dataview.interactor.RemoveTagFromDataViewRec import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewRecord import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.relations.AddFileToObject -import com.anytypeio.anytype.domain.relations.AddFileToRecord +import com.anytypeio.anytype.domain.dataview.interactor.AddFileToRecord import com.anytypeio.anytype.presentation.common.BaseViewModel import com.anytypeio.anytype.presentation.extension.sendAnalyticsRelationValueEvent import com.anytypeio.anytype.presentation.navigation.AppNavigation diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModel.kt index 9c6a07d811..30d35d2e8d 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModel.kt @@ -15,7 +15,7 @@ import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_utils.ext.cancel import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.extension.checkboxFilter diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt index f70576ce1b..252d3ddb35 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/DashboardTestSetup.kt @@ -19,7 +19,7 @@ import com.anytypeio.anytype.domain.config.GetConfig import com.anytypeio.anytype.domain.config.GetDebugSettings import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.objects.DefaultObjectStore diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt index 4c358c994e..3c1f7fa686 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/dashboard/HomeDashboardViewModelTest.kt @@ -5,7 +5,6 @@ import com.anytypeio.anytype.analytics.base.Analytics import com.anytypeio.anytype.core_models.Block import com.anytypeio.anytype.core_models.Config import com.anytypeio.anytype.core_models.Event -import com.anytypeio.anytype.core_models.Id import com.anytypeio.anytype.core_models.Payload import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.core_models.SmartBlockType @@ -20,7 +19,7 @@ import com.anytypeio.anytype.domain.config.GetConfig import com.anytypeio.anytype.domain.config.GetDebugSettings import com.anytypeio.anytype.domain.dashboard.interactor.CloseDashboard import com.anytypeio.anytype.domain.dashboard.interactor.OpenDashboard -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.domain.objects.DeleteObjects @@ -38,9 +37,7 @@ import com.anytypeio.anytype.test_utils.ValueClassAnswer import com.jraska.livedata.test import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow -import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runBlockingTest import org.junit.Before import org.junit.Rule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt index e037071222..347e16c5a8 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/EditorViewModelTest.kt @@ -47,8 +47,8 @@ import com.anytypeio.anytype.domain.clipboard.Paste import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.cover.SetDocCoverImage import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects -import com.anytypeio.anytype.domain.dataview.interactor.SetRelationKey +import com.anytypeio.anytype.domain.search.SearchObjects +import com.anytypeio.anytype.domain.relations.SetRelationKey import com.anytypeio.anytype.domain.download.DownloadFile import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.icon.SetDocumentImageIcon diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt index 58fe46fd79..fb2139d9b5 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/EditorPresentationTestSetup.kt @@ -42,8 +42,8 @@ import com.anytypeio.anytype.domain.clipboard.Paste import com.anytypeio.anytype.domain.config.Gateway import com.anytypeio.anytype.domain.cover.SetDocCoverImage import com.anytypeio.anytype.domain.dataview.interactor.GetCompatibleObjectTypes -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects -import com.anytypeio.anytype.domain.dataview.interactor.SetRelationKey +import com.anytypeio.anytype.domain.search.SearchObjects +import com.anytypeio.anytype.domain.relations.SetRelationKey import com.anytypeio.anytype.domain.download.DownloadFile import com.anytypeio.anytype.domain.event.interactor.InterceptEvents import com.anytypeio.anytype.domain.icon.SetDocumentImageIcon diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/RelationAddViewModelBaseTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/RelationAddViewModelBaseTest.kt index dd19507268..18aa464758 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/RelationAddViewModelBaseTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/relations/RelationAddViewModelBaseTest.kt @@ -4,7 +4,7 @@ import app.cash.turbine.test import com.anytypeio.anytype.core_models.StubRelation import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers import com.anytypeio.anytype.domain.block.repo.BlockRepository -import com.anytypeio.anytype.domain.dataview.interactor.ObjectRelationList +import com.anytypeio.anytype.domain.relations.ObjectRelationList import com.anytypeio.anytype.presentation.relations.model.RelationView import com.anytypeio.anytype.presentation.relations.providers.FakeObjectRelationProvider import com.anytypeio.anytype.presentation.util.CoroutinesTestRule diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueCreateTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueCreateTest.kt index c61d1a0953..f7647dea84 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueCreateTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueCreateTest.kt @@ -6,7 +6,7 @@ import com.anytypeio.anytype.core_models.* import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.config.Gateway -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.mapper.toDomain diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueModifyTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueModifyTest.kt index e087084253..30128ac2cd 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueModifyTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/sets/filter/FilterViewModelInputFieldValueModifyTest.kt @@ -9,7 +9,7 @@ import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.domain.`object`.ObjectTypesProvider import com.anytypeio.anytype.domain.base.Either import com.anytypeio.anytype.domain.config.Gateway -import com.anytypeio.anytype.domain.dataview.interactor.SearchObjects +import com.anytypeio.anytype.domain.search.SearchObjects import com.anytypeio.anytype.domain.dataview.interactor.UpdateDataViewViewer import com.anytypeio.anytype.domain.misc.UrlBuilder import com.anytypeio.anytype.presentation.mapper.toDomain