split domain module by feature

Razeeman · Dec 29, 2024 · fb38f2b · fb38f2b
1 parent e23385f
commit fb38f2b
Show file tree

Hide file tree

Showing 489 changed files with 1,890 additions and 1,791 deletions.
diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/ActivityFilterTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/ActivityFilterTest.kt
@@ -12,7 +12,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withParent
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.util.simpletimetracker.core.mapper.ColorMapper
-import com.example.util.simpletimetracker.domain.model.ActivityFilter
+import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils
 import com.example.util.simpletimetracker.utils.checkViewDoesNotExist

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRunningRecordTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRunningRecordTest.kt
@@ -15,7 +15,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withSubstring
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.util.simpletimetracker.core.extension.setToStartOfDay
-import com.example.util.simpletimetracker.domain.model.RecordTypeGoal
+import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.feature_dialogs.dateTime.CustomDatePicker
 import com.example.util.simpletimetracker.feature_dialogs.dateTime.CustomTimePicker
 import com.example.util.simpletimetracker.utils.BaseUiTest

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/ComplexRulesTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/ComplexRulesTest.kt
@@ -7,8 +7,8 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withSubstring
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.util.simpletimetracker.domain.model.ComplexRule
-import com.example.util.simpletimetracker.domain.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils
 import com.example.util.simpletimetracker.utils.checkViewDoesNotExist

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/ComplexRulesTestUtils.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/ComplexRulesTestUtils.kt
@@ -6,7 +6,7 @@ import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
-import com.example.util.simpletimetracker.domain.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.utils.checkViewIsDisplayed
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.Matcher

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsDaysOfWeek.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsDaysOfWeek.kt
@@ -16,7 +16,7 @@ import com.example.util.simpletimetracker.GoalsTestUtils.checkRunningGoal
 import com.example.util.simpletimetracker.GoalsTestUtils.checkStatisticsGoal
 import com.example.util.simpletimetracker.GoalsTestUtils.checkTypeMark
 import com.example.util.simpletimetracker.core.R
-import com.example.util.simpletimetracker.data_local.utils.removeIf
+import com.example.util.simpletimetracker.data_local.base.removeIf
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils
 import com.example.util.simpletimetracker.utils.checkViewDoesNotExist

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTabTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTabTest.kt
@@ -21,8 +21,8 @@ import com.example.util.simpletimetracker.GoalsTestUtils.getMonthlyDurationGoal
 import com.example.util.simpletimetracker.GoalsTestUtils.getSessionDurationGoal
 import com.example.util.simpletimetracker.GoalsTestUtils.getWeeklyCountGoal
 import com.example.util.simpletimetracker.GoalsTestUtils.getWeeklyDurationGoal
-import com.example.util.simpletimetracker.domain.extension.value
-import com.example.util.simpletimetracker.domain.model.RecordTypeGoal
+import com.example.util.simpletimetracker.domain.recordType.extension.value
+import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.feature_change_record.R
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTestUtils.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTestUtils.kt
@@ -9,8 +9,8 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withSubstring
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.example.util.simpletimetracker.core.utils.TestUtils
-import com.example.util.simpletimetracker.domain.model.DayOfWeek
-import com.example.util.simpletimetracker.domain.model.RecordTypeGoal
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.feature_change_record.R
 import com.example.util.simpletimetracker.utils.checkViewDoesNotExist
 import com.example.util.simpletimetracker.utils.checkViewIsDisplayed

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt
@@ -7,8 +7,8 @@ import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.util.simpletimetracker.domain.model.IconEmojiType
-import com.example.util.simpletimetracker.domain.model.IconImageType
+import com.example.util.simpletimetracker.domain.icon.IconEmojiType
+import com.example.util.simpletimetracker.domain.icon.IconImageType
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils
 import com.example.util.simpletimetracker.utils.checkViewDoesNotExist

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/RecordRepeatTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/RecordRepeatTest.kt
@@ -4,7 +4,7 @@ import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.util.simpletimetracker.domain.model.RepeatButtonType
+import com.example.util.simpletimetracker.domain.record.model.RepeatButtonType
 import com.example.util.simpletimetracker.feature_base_adapter.R
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.checkViewIsDisplayed

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/SettingsBackupTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/SettingsBackupTest.kt
@@ -21,9 +21,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withSubstring
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.util.simpletimetracker.core.mapper.ColorMapper
-import com.example.util.simpletimetracker.domain.model.ActivityFilter
-import com.example.util.simpletimetracker.domain.model.ComplexRule
-import com.example.util.simpletimetracker.domain.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter
+import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.feature_dialogs.dateTime.CustomDatePicker
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/SettingsTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/SettingsTest.kt
@@ -18,9 +18,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.util.simpletimetracker.core.extension.setToStartOfDay
 import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
 import com.example.util.simpletimetracker.core.interactor.LanguageInteractor
-import com.example.util.simpletimetracker.domain.interactor.AppLanguage
-import com.example.util.simpletimetracker.domain.model.ActivityFilter
-import com.example.util.simpletimetracker.domain.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.language.AppLanguage
+import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.feature_dialogs.dateTime.CustomDatePicker
 import com.example.util.simpletimetracker.feature_dialogs.dateTime.CustomTimePicker
 import com.example.util.simpletimetracker.utils.BaseUiTest

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/StartRecordTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/StartRecordTest.kt
@@ -7,7 +7,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withSubstring
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.util.simpletimetracker.domain.model.RecordTypeGoal
+import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils
 import com.example.util.simpletimetracker.utils.checkViewDoesNotExist

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt
@@ -11,7 +11,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withSubstring
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.util.simpletimetracker.core.extension.setWeekToFirstDay
-import com.example.util.simpletimetracker.domain.model.DayOfWeek
+import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
 import com.example.util.simpletimetracker.feature_dialogs.dateTime.CustomDatePicker
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.NavUtils

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/WidgetUniversal.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/WidgetUniversal.kt
@@ -5,7 +5,7 @@ import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.util.simpletimetracker.domain.model.ActivityFilter
+import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter
 import com.example.util.simpletimetracker.feature_widget.universal.activity.view.WidgetUniversalActivity
 import com.example.util.simpletimetracker.utils.BaseUiTest
 import com.example.util.simpletimetracker.utils.Widget

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt
@@ -16,9 +16,9 @@ import com.example.util.simpletimetracker.core.mapper.IconImageMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.core.utils.CountingIdlingResourceProvider
 import com.example.util.simpletimetracker.core.utils.TestUtils
-import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
-import com.example.util.simpletimetracker.domain.repo.ComplexRuleRepo
-import com.example.util.simpletimetracker.domain.resolver.BackupRepo
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.complexRule.repo.ComplexRuleRepo
+import com.example.util.simpletimetracker.domain.backup.repo.BackupRepo
 import com.example.util.simpletimetracker.feature_records.view.RecordsContainerFragment
 import com.example.util.simpletimetracker.feature_settings.viewModel.delegate.SettingsFileWorkDelegate
 import com.example.util.simpletimetracker.feature_statistics.view.StatisticsContainerFragment

diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/NavUtils.kt
@@ -14,7 +14,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.example.util.simpletimetracker.R
 import com.example.util.simpletimetracker.clickOnSettingsRecyclerText
 import com.example.util.simpletimetracker.domain.extension.padDuration
-import com.example.util.simpletimetracker.domain.model.RecordTypeGoal
+import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
 import com.example.util.simpletimetracker.feature_dialogs.dateTime.CustomDatePicker
 import com.example.util.simpletimetracker.feature_dialogs.dateTime.CustomTimePicker
 import com.example.util.simpletimetracker.scrollSettingsRecyclerToText

diff --git a/app/src/main/java/com/example/util/simpletimetracker/di/AppModuleBinds.kt b/app/src/main/java/com/example/util/simpletimetracker/di/AppModuleBinds.kt
@@ -5,10 +5,10 @@ import com.example.util.simpletimetracker.core.interactor.IsSystemInDarkModeInte
 import com.example.util.simpletimetracker.core.interactor.GetUntrackedRecordsInteractorImpl
 import com.example.util.simpletimetracker.core.mapper.AppColorMapperImpl
 import com.example.util.simpletimetracker.core.provider.ApplicationDataProvider
+import com.example.util.simpletimetracker.domain.mapper.AppColorMapper
 import com.example.util.simpletimetracker.domain.interactor.GetCurrentDayInteractor
-import com.example.util.simpletimetracker.domain.interactor.IsSystemInDarkModeInteractor
+import com.example.util.simpletimetracker.domain.darkMode.interactor.IsSystemInDarkModeInteractor
 import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor
-import com.example.util.simpletimetracker.domain.mapper.AppColorMapper
 import com.example.util.simpletimetracker.provider.ApplicationDataProviderImpl
 import dagger.Binds
 import dagger.Module

diff --git a/app/src/play/java/com/example/util/simpletimetracker/WearModule.kt b/app/src/play/java/com/example/util/simpletimetracker/WearModule.kt
@@ -1,6 +1,6 @@
 package com.example.util.simpletimetracker
 
-import com.example.util.simpletimetracker.domain.interactor.WearInteractor
+import com.example.util.simpletimetracker.domain.wear.WearInteractor
 import com.example.util.simpletimetracker.feature_wear.WearInteractorImpl
 import dagger.Binds
 import dagger.Module

diff --git a/...e/util/simpletimetracker/core/delegates/colorSelection/ColorSelectionViewModelDelegate.kt b/...e/util/simpletimetracker/core/delegates/colorSelection/ColorSelectionViewModelDelegate.kt
@@ -7,9 +7,9 @@ import com.example.util.simpletimetracker.core.extension.set
 import com.example.util.simpletimetracker.core.interactor.ColorViewDataInteractor
 import com.example.util.simpletimetracker.core.mapper.ColorMapper
 import com.example.util.simpletimetracker.domain.extension.orFalse
-import com.example.util.simpletimetracker.domain.interactor.FavouriteColorInteractor
-import com.example.util.simpletimetracker.domain.model.AppColor
-import com.example.util.simpletimetracker.domain.model.FavouriteColor
+import com.example.util.simpletimetracker.domain.favourite.interactor.FavouriteColorInteractor
+import com.example.util.simpletimetracker.domain.color.model.AppColor
+import com.example.util.simpletimetracker.domain.favourite.model.FavouriteColor
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.color.ColorViewData
 import com.example.util.simpletimetracker.navigation.Router

diff --git a/...racker/core/delegates/iconSelection/interactor/IconSelectionDelegateViewDataInteractor.kt b/...racker/core/delegates/iconSelection/interactor/IconSelectionDelegateViewDataInteractor.kt
@@ -2,11 +2,11 @@ package com.example.util.simpletimetracker.core.delegates.iconSelection.interact
 
 import com.example.util.simpletimetracker.core.delegates.iconSelection.mapper.IconSelectionMapper
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionStateViewData
-import com.example.util.simpletimetracker.domain.interactor.FavouriteIconInteractor
-import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
-import com.example.util.simpletimetracker.domain.model.AppColor
-import com.example.util.simpletimetracker.domain.model.IconImageState
-import com.example.util.simpletimetracker.domain.model.IconType
+import com.example.util.simpletimetracker.domain.favourite.interactor.FavouriteIconInteractor
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.color.model.AppColor
+import com.example.util.simpletimetracker.domain.icon.IconImageState
+import com.example.util.simpletimetracker.domain.icon.IconType
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

diff --git a/...example/util/simpletimetracker/core/delegates/iconSelection/mapper/IconSelectionMapper.kt b/...example/util/simpletimetracker/core/delegates/iconSelection/mapper/IconSelectionMapper.kt
@@ -13,14 +13,14 @@ import com.example.util.simpletimetracker.core.mapper.IconEmojiMapper
 import com.example.util.simpletimetracker.core.mapper.IconImageMapper
 import com.example.util.simpletimetracker.core.mapper.IconMapper
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
-import com.example.util.simpletimetracker.domain.model.AppColor
-import com.example.util.simpletimetracker.domain.model.FavouriteIcon
-import com.example.util.simpletimetracker.domain.model.IconEmoji
-import com.example.util.simpletimetracker.domain.model.IconEmojiType
-import com.example.util.simpletimetracker.domain.model.IconImage
-import com.example.util.simpletimetracker.domain.model.IconImageState
-import com.example.util.simpletimetracker.domain.model.IconImageType
-import com.example.util.simpletimetracker.domain.model.IconType
+import com.example.util.simpletimetracker.domain.color.model.AppColor
+import com.example.util.simpletimetracker.domain.favourite.model.FavouriteIcon
+import com.example.util.simpletimetracker.domain.icon.IconEmoji
+import com.example.util.simpletimetracker.domain.icon.IconEmojiType
+import com.example.util.simpletimetracker.domain.icon.IconImage
+import com.example.util.simpletimetracker.domain.icon.IconImageState
+import com.example.util.simpletimetracker.domain.icon.IconImageType
+import com.example.util.simpletimetracker.domain.icon.IconType
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.emoji.EmojiViewData
 import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon

diff --git a/...letimetracker/core/delegates/iconSelection/viewData/IconSelectionSelectorStateViewData.kt b/...letimetracker/core/delegates/iconSelection/viewData/IconSelectionSelectorStateViewData.kt
@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.core.delegates.iconSelection.viewData
 
 import androidx.annotation.ColorInt
-import com.example.util.simpletimetracker.domain.model.IconImageState
+import com.example.util.simpletimetracker.domain.icon.IconImageState
 
 sealed interface IconSelectionSelectorStateViewData {
 

diff --git a/...il/simpletimetracker/core/delegates/iconSelection/viewData/IconSelectionSwitchViewData.kt b/...il/simpletimetracker/core/delegates/iconSelection/viewData/IconSelectionSwitchViewData.kt
@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.core.delegates.iconSelection.viewData
 
 import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
-import com.example.util.simpletimetracker.domain.model.IconType
+import com.example.util.simpletimetracker.domain.icon.IconType
 
 data class IconSelectionSwitchViewData(
     val iconType: IconType,

diff --git a/...util/simpletimetracker/core/delegates/iconSelection/viewData/IconSelectionTypeViewData.kt b/...util/simpletimetracker/core/delegates/iconSelection/viewData/IconSelectionTypeViewData.kt
@@ -1,7 +1,7 @@
 package com.example.util.simpletimetracker.core.delegates.iconSelection.viewData
 
-import com.example.util.simpletimetracker.domain.model.IconEmojiType
-import com.example.util.simpletimetracker.domain.model.IconImageType
+import com.example.util.simpletimetracker.domain.icon.IconEmojiType
+import com.example.util.simpletimetracker.domain.icon.IconImageType
 
 sealed class IconSelectionTypeViewData {
     abstract val id: Long

diff --git a/.../simpletimetracker/core/delegates/iconSelection/viewDelegate/IconSelectionViewDelegate.kt b/.../simpletimetracker/core/delegates/iconSelection/viewDelegate/IconSelectionViewDelegate.kt
@@ -20,9 +20,9 @@ import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegate
 import com.example.util.simpletimetracker.core.repo.DeviceRepo
 import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
-import com.example.util.simpletimetracker.domain.model.IconEmojiType
-import com.example.util.simpletimetracker.domain.model.IconImageState
-import com.example.util.simpletimetracker.domain.model.IconType
+import com.example.util.simpletimetracker.domain.icon.IconEmojiType
+import com.example.util.simpletimetracker.domain.icon.IconImageState
+import com.example.util.simpletimetracker.domain.icon.IconType
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData

diff --git a/...etracker/core/delegates/iconSelection/viewModelDelegate/IconSelectionViewModelDelegate.kt b/...etracker/core/delegates/iconSelection/viewModelDelegate/IconSelectionViewModelDelegate.kt
@@ -16,12 +16,12 @@ import com.example.util.simpletimetracker.core.extension.set
 import com.example.util.simpletimetracker.core.mapper.IconEmojiMapper
 import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
 import com.example.util.simpletimetracker.domain.extension.orZero
-import com.example.util.simpletimetracker.domain.interactor.FavouriteIconInteractor
-import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
-import com.example.util.simpletimetracker.domain.model.AppColor
-import com.example.util.simpletimetracker.domain.model.FavouriteIcon
-import com.example.util.simpletimetracker.domain.model.IconImageState
-import com.example.util.simpletimetracker.domain.model.IconType
+import com.example.util.simpletimetracker.domain.favourite.interactor.FavouriteIconInteractor
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.color.model.AppColor
+import com.example.util.simpletimetracker.domain.favourite.model.FavouriteIcon
+import com.example.util.simpletimetracker.domain.icon.IconImageState
+import com.example.util.simpletimetracker.domain.icon.IconType
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.emoji.EmojiViewData
 import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData