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 index c5043848f..503f42e8f 100644 --- 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.color.mapper.AppColorMapper +import com.example.util.simpletimetracker.domain.daysOfWeek.interactor.GetCurrentDayInteractor +import com.example.util.simpletimetracker.domain.record.interactor.GetUntrackedRecordsInteractor import com.example.util.simpletimetracker.domain.darkMode.interactor.IsSystemInDarkModeInteractor -import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor import com.example.util.simpletimetracker.provider.ApplicationDataProviderImpl import dagger.Binds import dagger.Module diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/ChartFilterViewDataInteractor.kt b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/ChartFilterViewDataInteractor.kt index f4f9ce871..30ee77e43 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/ChartFilterViewDataInteractor.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/ChartFilterViewDataInteractor.kt @@ -5,7 +5,7 @@ import com.example.util.simpletimetracker.core.mapper.ChartFilterViewDataMapper import com.example.util.simpletimetracker.core.mapper.RecordTypeViewDataMapper import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag import com.example.util.simpletimetracker.domain.recordType.model.RecordType diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetCurrentDayInteractorImpl.kt b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetCurrentDayInteractorImpl.kt index 70e887583..51e10068b 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetCurrentDayInteractorImpl.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetCurrentDayInteractorImpl.kt @@ -1,7 +1,7 @@ package com.example.util.simpletimetracker.core.interactor import com.example.util.simpletimetracker.core.mapper.TimeMapper -import com.example.util.simpletimetracker.domain.interactor.GetCurrentDayInteractor +import com.example.util.simpletimetracker.domain.daysOfWeek.interactor.GetCurrentDayInteractor import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek import java.util.Calendar diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetUntrackedRecordsInteractorImpl.kt b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetUntrackedRecordsInteractorImpl.kt index c2e58b6dc..e9da6bb3a 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetUntrackedRecordsInteractorImpl.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetUntrackedRecordsInteractorImpl.kt @@ -4,7 +4,7 @@ import com.example.util.simpletimetracker.core.mapper.TimeMapper import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID import com.example.util.simpletimetracker.domain.extension.dropMillis import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor -import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor +import com.example.util.simpletimetracker.domain.record.interactor.GetUntrackedRecordsInteractor import com.example.util.simpletimetracker.domain.record.interactor.RecordInteractor import com.example.util.simpletimetracker.domain.record.mapper.UntrackedRecordMapper import com.example.util.simpletimetracker.domain.record.model.Range diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt index bdc231eeb..916508a68 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt @@ -29,7 +29,7 @@ import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTyp import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor import com.example.util.simpletimetracker.domain.record.mapper.RangeMapper import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek -import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor +import com.example.util.simpletimetracker.domain.record.interactor.GetUntrackedRecordsInteractor import com.example.util.simpletimetracker.domain.record.model.Range import com.example.util.simpletimetracker.domain.statistics.model.RangeLength import com.example.util.simpletimetracker.domain.record.model.Record diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/AppColorMapperImpl.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/AppColorMapperImpl.kt index 3d4b56e62..d78a17342 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/AppColorMapperImpl.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/AppColorMapperImpl.kt @@ -4,7 +4,7 @@ import android.graphics.Color import androidx.annotation.ColorInt import com.example.util.simpletimetracker.core.R import com.example.util.simpletimetracker.core.repo.ResourceRepo -import com.example.util.simpletimetracker.domain.mapper.AppColorMapper +import com.example.util.simpletimetracker.domain.color.mapper.AppColorMapper import com.example.util.simpletimetracker.domain.color.model.AppColor import javax.inject.Inject diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt index e9ef3dc5d..26d901254 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt @@ -5,7 +5,7 @@ import com.example.util.simpletimetracker.core.repo.ResourceRepo import com.example.util.simpletimetracker.domain.base.MULTITASK_ITEM_ID import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.color.model.AppColor import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag import com.example.util.simpletimetracker.domain.recordType.model.RecordType diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt index db378212e..6112bdf8b 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt @@ -4,7 +4,7 @@ import android.graphics.Color import androidx.annotation.ColorInt import com.example.util.simpletimetracker.core.R import com.example.util.simpletimetracker.core.repo.ResourceRepo -import com.example.util.simpletimetracker.domain.mapper.AppColorMapper +import com.example.util.simpletimetracker.domain.color.mapper.AppColorMapper import com.example.util.simpletimetracker.domain.color.model.AppColor import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon import javax.inject.Inject diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt b/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt index f0345b4a7..eb173c341 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt @@ -20,7 +20,7 @@ import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordType import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTypeToTagInteractor import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.color.model.AppColor import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPartialRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPartialRepoImpl.kt index 38bcb7158..3959c6fab 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPartialRepoImpl.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPartialRepoImpl.kt @@ -36,9 +36,9 @@ import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeGoalR import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeRepo import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToDefaultTagRepo import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToTagRepo -import com.example.util.simpletimetracker.domain.resolver.BackupPartialRepo +import com.example.util.simpletimetracker.domain.backup.repo.BackupPartialRepo import com.example.util.simpletimetracker.domain.backup.model.ResultCode -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import javax.inject.Inject diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupRepoImpl.kt index ac1ea82af..3e34c89fb 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupRepoImpl.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupRepoImpl.kt @@ -42,7 +42,7 @@ import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToDefa import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToTagRepo import com.example.util.simpletimetracker.domain.backup.repo.BackupRepo import com.example.util.simpletimetracker.domain.backup.model.ResultCode -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryDataLocalMapper.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryDataLocalMapper.kt index f2be4221f..8fa7317b5 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryDataLocalMapper.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryDataLocalMapper.kt @@ -1,6 +1,6 @@ package com.example.util.simpletimetracker.data_local.category -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.color.model.AppColor import javax.inject.Inject diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryRepoImpl.kt index 79a86d5c6..be18e78de 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryRepoImpl.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/category/CategoryRepoImpl.kt @@ -2,7 +2,7 @@ package com.example.util.simpletimetracker.data_local.category import com.example.util.simpletimetracker.data_local.base.withLockedCache import com.example.util.simpletimetracker.data_local.base.removeIf -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.category.repo.CategoryRepo import kotlinx.coroutines.sync.Mutex import javax.inject.Inject diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/di/DataLocalModuleBinds.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/di/DataLocalModuleBinds.kt index c83150298..4ae4b9190 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/di/DataLocalModuleBinds.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/di/DataLocalModuleBinds.kt @@ -39,10 +39,10 @@ import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToDefa import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToTagRepo import com.example.util.simpletimetracker.domain.record.repo.RunningRecordRepo import com.example.util.simpletimetracker.domain.recordTag.repo.RunningRecordToRecordTagRepo -import com.example.util.simpletimetracker.domain.resolver.BackupPartialRepo +import com.example.util.simpletimetracker.domain.backup.repo.BackupPartialRepo import com.example.util.simpletimetracker.domain.backup.repo.BackupRepo -import com.example.util.simpletimetracker.domain.resolver.CsvRepo -import com.example.util.simpletimetracker.domain.resolver.IcsRepo +import com.example.util.simpletimetracker.domain.backup.repo.CsvRepo +import com.example.util.simpletimetracker.domain.backup.repo.IcsRepo import com.example.util.simpletimetracker.domain.sharing.SharingRepo import dagger.Binds import dagger.Module diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/CsvRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/CsvRepoImpl.kt index c385e7493..79413d9ae 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/CsvRepoImpl.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/CsvRepoImpl.kt @@ -16,9 +16,9 @@ import com.example.util.simpletimetracker.domain.record.repo.RecordRepo import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTagRepo import com.example.util.simpletimetracker.domain.category.repo.RecordTypeCategoryRepo import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeRepo -import com.example.util.simpletimetracker.domain.resolver.CsvRepo +import com.example.util.simpletimetracker.domain.backup.repo.CsvRepo import com.example.util.simpletimetracker.domain.backup.model.ResultCode -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import java.io.BufferedReader import java.io.FileOutputStream import java.io.IOException diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/IcsRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/IcsRepoImpl.kt index 137f1f03c..011957563 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/IcsRepoImpl.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/IcsRepoImpl.kt @@ -15,8 +15,8 @@ import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTagRepo import com.example.util.simpletimetracker.domain.category.repo.RecordTypeCategoryRepo import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeRepo import com.example.util.simpletimetracker.domain.backup.model.ResultCode -import com.example.util.simpletimetracker.domain.resolver.IcsRepo -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.backup.repo.IcsRepo +import com.example.util.simpletimetracker.domain.category.model.Category import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt index cad14bf00..4d5c6bd04 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt @@ -3,10 +3,10 @@ package com.example.util.simpletimetracker.data_local.prefs import android.content.SharedPreferences import com.example.util.simpletimetracker.data_local.base.delegate import com.example.util.simpletimetracker.data_local.base.logPrefsDataAccess +import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType import com.example.util.simpletimetracker.domain.statistics.model.RangeLength -import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData import com.example.util.simpletimetracker.domain.prefs.repo.PrefsRepo import java.util.Calendar import javax.inject.Inject diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/BackupInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/BackupInteractor.kt index f56ac7fc3..54bbce27d 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/BackupInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/BackupInteractor.kt @@ -3,7 +3,7 @@ package com.example.util.simpletimetracker.domain.backup.interactor import com.example.util.simpletimetracker.domain.backup.model.BackupOptionsData import com.example.util.simpletimetracker.domain.backup.model.PartialBackupRestoreData import com.example.util.simpletimetracker.domain.backup.model.ResultCode -import com.example.util.simpletimetracker.domain.resolver.BackupPartialRepo +import com.example.util.simpletimetracker.domain.backup.repo.BackupPartialRepo import com.example.util.simpletimetracker.domain.backup.repo.BackupRepo import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor import javax.inject.Inject diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/CsvExportInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/CsvExportInteractor.kt index 4488242c3..60416d7c3 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/CsvExportInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/CsvExportInteractor.kt @@ -1,7 +1,7 @@ package com.example.util.simpletimetracker.domain.backup.interactor import com.example.util.simpletimetracker.domain.backup.model.ResultCode -import com.example.util.simpletimetracker.domain.resolver.CsvRepo +import com.example.util.simpletimetracker.domain.backup.repo.CsvRepo import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor import com.example.util.simpletimetracker.domain.record.model.Range import javax.inject.Inject diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/IcsExportInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/IcsExportInteractor.kt similarity index 75% rename from domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/IcsExportInteractor.kt rename to domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/IcsExportInteractor.kt index 26627b933..57f6719af 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/IcsExportInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/interactor/IcsExportInteractor.kt @@ -1,7 +1,7 @@ -package com.example.util.simpletimetracker.domain.interactor +package com.example.util.simpletimetracker.domain.backup.interactor import com.example.util.simpletimetracker.domain.backup.model.ResultCode -import com.example.util.simpletimetracker.domain.resolver.IcsRepo +import com.example.util.simpletimetracker.domain.backup.repo.IcsRepo import com.example.util.simpletimetracker.domain.record.model.Range import javax.inject.Inject diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/model/PartialBackupRestoreData.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/model/PartialBackupRestoreData.kt index 51d45b6c1..29810f1c5 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/model/PartialBackupRestoreData.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/model/PartialBackupRestoreData.kt @@ -1,7 +1,7 @@ package com.example.util.simpletimetracker.domain.backup.model import com.example.util.simpletimetracker.domain.activityFilter.model.ActivityFilter -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.category.model.RecordTypeCategory import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule import com.example.util.simpletimetracker.domain.favourite.model.FavouriteColor diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/BackupPartialRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/BackupPartialRepo.kt similarity index 88% rename from domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/BackupPartialRepo.kt rename to domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/BackupPartialRepo.kt index 551b31e16..bd67189b5 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/BackupPartialRepo.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/BackupPartialRepo.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.resolver +package com.example.util.simpletimetracker.domain.backup.repo import com.example.util.simpletimetracker.domain.backup.model.BackupOptionsData import com.example.util.simpletimetracker.domain.backup.model.PartialBackupRestoreData diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/CsvRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/CsvRepo.kt similarity index 84% rename from domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/CsvRepo.kt rename to domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/CsvRepo.kt index df4dbe9a4..6451ed84f 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/CsvRepo.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/CsvRepo.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.resolver +package com.example.util.simpletimetracker.domain.backup.repo import com.example.util.simpletimetracker.domain.backup.model.ResultCode import com.example.util.simpletimetracker.domain.record.model.Range diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/IcsRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/IcsRepo.kt similarity index 80% rename from domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/IcsRepo.kt rename to domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/IcsRepo.kt index a537e17a2..4a78ad279 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/resolver/IcsRepo.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/backup/repo/IcsRepo.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.resolver +package com.example.util.simpletimetracker.domain.backup.repo import com.example.util.simpletimetracker.domain.backup.model.ResultCode import com.example.util.simpletimetracker.domain.record.model.Range diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/category/interactor/CategoryInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/category/interactor/CategoryInteractor.kt index a35e04f43..86e88cf21 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/category/interactor/CategoryInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/category/interactor/CategoryInteractor.kt @@ -1,11 +1,11 @@ package com.example.util.simpletimetracker.domain.category.interactor -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.category.repo.CategoryRepo import com.example.util.simpletimetracker.domain.category.repo.RecordTypeCategoryRepo +import com.example.util.simpletimetracker.domain.recordType.model.CardOrder import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.SortCardsInteractor -import com.example.util.simpletimetracker.domain.recordType.model.CardOrder import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeGoalRepo import javax.inject.Inject diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/model/Category.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/category/model/Category.kt similarity index 74% rename from domain/src/main/java/com/example/util/simpletimetracker/domain/model/Category.kt rename to domain/src/main/java/com/example/util/simpletimetracker/domain/category/model/Category.kt index 28b5f8b88..eaecbdedd 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/model/Category.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/category/model/Category.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.model +package com.example.util.simpletimetracker.domain.category.model import com.example.util.simpletimetracker.domain.color.model.AppColor diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/category/repo/CategoryRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/category/repo/CategoryRepo.kt index d34ca3173..95592b42d 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/category/repo/CategoryRepo.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/category/repo/CategoryRepo.kt @@ -1,6 +1,6 @@ package com.example.util.simpletimetracker.domain.category.repo -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category interface CategoryRepo { diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/mapper/AppColorMapper.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/color/mapper/AppColorMapper.kt similarity index 75% rename from domain/src/main/java/com/example/util/simpletimetracker/domain/mapper/AppColorMapper.kt rename to domain/src/main/java/com/example/util/simpletimetracker/domain/color/mapper/AppColorMapper.kt index 279a418c5..4413fa8bb 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/mapper/AppColorMapper.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/color/mapper/AppColorMapper.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.mapper +package com.example.util.simpletimetracker.domain.color.mapper import com.example.util.simpletimetracker.domain.color.model.AppColor diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/complexRule/interactor/ComplexRuleProcessActionInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/complexRule/interactor/ComplexRuleProcessActionInteractor.kt index 5fdad31f5..f6ccf7d3c 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/complexRule/interactor/ComplexRuleProcessActionInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/complexRule/interactor/ComplexRuleProcessActionInteractor.kt @@ -1,6 +1,6 @@ package com.example.util.simpletimetracker.domain.complexRule.interactor -import com.example.util.simpletimetracker.domain.interactor.GetCurrentDayInteractor +import com.example.util.simpletimetracker.domain.daysOfWeek.interactor.GetCurrentDayInteractor import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek import com.example.util.simpletimetracker.domain.base.ResultContainer import com.example.util.simpletimetracker.domain.complexRule.model.ComplexRule diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/darkMode/interactor/IsSystemInDarkModeInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/darkMode/interactor/IsSystemInDarkModeInteractor.kt index 3b2905957..7b431371d 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/darkMode/interactor/IsSystemInDarkModeInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/darkMode/interactor/IsSystemInDarkModeInteractor.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.interactor +package com.example.util.simpletimetracker.domain.darkMode.interactor interface IsSystemInDarkModeInteractor { diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/GetCurrentDayInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/daysOfWeek/interactor/GetCurrentDayInteractor.kt similarity index 70% rename from domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/GetCurrentDayInteractor.kt rename to domain/src/main/java/com/example/util/simpletimetracker/domain/daysOfWeek/interactor/GetCurrentDayInteractor.kt index b21574f48..e61e80adf 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/GetCurrentDayInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/daysOfWeek/interactor/GetCurrentDayInteractor.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.interactor +package com.example.util.simpletimetracker.domain.daysOfWeek.interactor import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/icon/IconType.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/icon/IconType.kt index 57ffb14fe..f61adad9d 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/icon/IconType.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/icon/IconType.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.model +package com.example.util.simpletimetracker.domain.icon enum class IconType { IMAGE, diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/notifications/interactor/UpdateExternalViewsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/notifications/interactor/UpdateExternalViewsInteractor.kt index 95a4ea2e0..55f48c2fa 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/notifications/interactor/UpdateExternalViewsInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/notifications/interactor/UpdateExternalViewsInteractor.kt @@ -1,11 +1,11 @@ package com.example.util.simpletimetracker.domain.notifications.interactor +import com.example.util.simpletimetracker.domain.wear.WearInteractor import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal import com.example.util.simpletimetracker.domain.record.model.RunningRecord import com.example.util.simpletimetracker.domain.widget.model.WidgetType import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor -import com.example.util.simpletimetracker.domain.wear.WearInteractor import com.example.util.simpletimetracker.domain.widget.interactor.WidgetInteractor import javax.inject.Inject diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt index b648528d3..4d4fbecb3 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt @@ -2,18 +2,18 @@ package com.example.util.simpletimetracker.domain.prefs.interactor import com.example.util.simpletimetracker.domain.extension.orZero import com.example.util.simpletimetracker.domain.darkMode.model.DarkMode -import com.example.util.simpletimetracker.domain.darkMode.interactor.IsSystemInDarkModeInteractor import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek import com.example.util.simpletimetracker.domain.daysOfWeek.model.DaysInCalendar +import com.example.util.simpletimetracker.domain.darkMode.interactor.IsSystemInDarkModeInteractor +import com.example.util.simpletimetracker.domain.recordType.model.CardOrder +import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData import com.example.util.simpletimetracker.domain.prefs.repo.PrefsRepo import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType import com.example.util.simpletimetracker.domain.record.model.Range import com.example.util.simpletimetracker.domain.statistics.model.RangeLength import com.example.util.simpletimetracker.domain.record.model.RepeatButtonType -import com.example.util.simpletimetracker.domain.recordType.model.CardOrder -import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import javax.inject.Inject diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt index 9f5067122..e9d682109 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt @@ -1,7 +1,7 @@ package com.example.util.simpletimetracker.domain.prefs.repo -import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData +import com.example.util.simpletimetracker.domain.widget.model.QuickSettingsWidgetType interface PrefsRepo { diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/GetUntrackedRecordsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/GetUntrackedRecordsInteractor.kt similarity index 80% rename from domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/GetUntrackedRecordsInteractor.kt rename to domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/GetUntrackedRecordsInteractor.kt index 777f4596b..aabf757dc 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/GetUntrackedRecordsInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/GetUntrackedRecordsInteractor.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.interactor +package com.example.util.simpletimetracker.domain.record.interactor import com.example.util.simpletimetracker.domain.record.model.Range import com.example.util.simpletimetracker.domain.record.model.Record diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/interactor/RecordTypeInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/interactor/RecordTypeInteractor.kt index 560440ead..170988c61 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/interactor/RecordTypeInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/interactor/RecordTypeInteractor.kt @@ -6,11 +6,11 @@ import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTagRepo import com.example.util.simpletimetracker.domain.recordTag.repo.RecordToRecordTagRepo import com.example.util.simpletimetracker.domain.category.repo.RecordTypeCategoryRepo import com.example.util.simpletimetracker.domain.complexRule.interactor.ComplexRuleInteractor +import com.example.util.simpletimetracker.domain.recordType.model.CardOrder import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToDefaultTagRepo import com.example.util.simpletimetracker.domain.recordTag.repo.RecordTypeToTagRepo import com.example.util.simpletimetracker.domain.record.repo.RunningRecordRepo -import com.example.util.simpletimetracker.domain.recordType.model.CardOrder import com.example.util.simpletimetracker.domain.recordType.model.RecordType import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeGoalRepo import com.example.util.simpletimetracker.domain.recordType.repo.RecordTypeRepo diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/interactor/SortCardsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/interactor/SortCardsInteractor.kt index fd0f2b240..c65eaea66 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/interactor/SortCardsInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/interactor/SortCardsInteractor.kt @@ -1,10 +1,10 @@ package com.example.util.simpletimetracker.domain.recordType.interactor -import com.example.util.simpletimetracker.domain.mapper.AppColorMapper +import com.example.util.simpletimetracker.domain.color.mapper.AppColorMapper import com.example.util.simpletimetracker.domain.extension.orZero import com.example.util.simpletimetracker.domain.color.model.AppColor -import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder import com.example.util.simpletimetracker.domain.recordType.model.CardOrder +import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder import java.util.Locale import javax.inject.Inject import kotlin.math.roundToInt diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/model/CardOrder.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/model/CardOrder.kt index 6ed3a143e..fee49e177 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/model/CardOrder.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/recordType/model/CardOrder.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.model +package com.example.util.simpletimetracker.domain.recordType.model enum class CardOrder { NAME, diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/interactor/StatisticsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/interactor/StatisticsInteractor.kt index 698c18fb6..a7dd3634a 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/interactor/StatisticsInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/interactor/StatisticsInteractor.kt @@ -3,7 +3,7 @@ package com.example.util.simpletimetracker.domain.statistics.interactor import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID import com.example.util.simpletimetracker.domain.extension.orZero import com.example.util.simpletimetracker.domain.extension.toRange -import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor +import com.example.util.simpletimetracker.domain.record.interactor.GetUntrackedRecordsInteractor import com.example.util.simpletimetracker.domain.record.mapper.RangeMapper import com.example.util.simpletimetracker.domain.record.model.Range import com.example.util.simpletimetracker.domain.record.model.RecordBase diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/StatisticsWidgetData.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/StatisticsWidgetData.kt index 0d72200dc..802508a95 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/StatisticsWidgetData.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/StatisticsWidgetData.kt @@ -1,7 +1,4 @@ -package com.example.util.simpletimetracker.domain.model - -import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType -import com.example.util.simpletimetracker.domain.statistics.model.RangeLength +package com.example.util.simpletimetracker.domain.statistics.model data class StatisticsWidgetData( val chartFilterType: ChartFilterType, diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/WidgetTransparencyPercent.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/WidgetTransparencyPercent.kt index 82075ccdd..103c80076 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/WidgetTransparencyPercent.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/WidgetTransparencyPercent.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.model +package com.example.util.simpletimetracker.domain.statistics.model data class WidgetTransparencyPercent( val value: Long, diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/wear/WearInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/wear/WearInteractor.kt index a39ff2aff..b2f304b50 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/wear/WearInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/wear/WearInteractor.kt @@ -1,4 +1,4 @@ -package com.example.util.simpletimetracker.domain.interactor +package com.example.util.simpletimetracker.domain.wear interface WearInteractor { diff --git a/features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt b/features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt index 605ddfc94..fa7c540a8 100644 --- a/features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt +++ b/features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/viewModel/ChangeCategoryViewModel.kt @@ -17,7 +17,7 @@ import com.example.util.simpletimetracker.domain.extension.orZero import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.category.interactor.RecordTypeCategoryInteractor -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal diff --git a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt index ddbb26443..8bc1140d6 100644 --- a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt +++ b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt @@ -27,8 +27,8 @@ import com.example.util.simpletimetracker.domain.recordType.interactor.RemoveRec import com.example.util.simpletimetracker.domain.record.interactor.RemoveRunningRecordMediator import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor -import com.example.util.simpletimetracker.domain.wear.WearInteractor import com.example.util.simpletimetracker.domain.color.model.AppColor +import com.example.util.simpletimetracker.domain.wear.WearInteractor import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType import com.example.util.simpletimetracker.domain.recordType.model.RecordType import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal diff --git a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/cardOrder/viewModel/CardOrderViewModel.kt b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/cardOrder/viewModel/CardOrderViewModel.kt index 32bbd5eb7..26fee6dd4 100644 --- a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/cardOrder/viewModel/CardOrderViewModel.kt +++ b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/cardOrder/viewModel/CardOrderViewModel.kt @@ -7,11 +7,11 @@ import androidx.lifecycle.viewModelScope import com.example.util.simpletimetracker.core.mapper.CategoryViewDataMapper import com.example.util.simpletimetracker.core.mapper.RecordTypeViewDataMapper import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor +import com.example.util.simpletimetracker.domain.recordType.model.CardOrder import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder -import com.example.util.simpletimetracker.domain.recordType.model.CardOrder import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType import com.example.util.simpletimetracker.feature_base_adapter.category.CategoryViewData import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData diff --git a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/chartFilter/viewModel/ChartFilterViewModel.kt b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/chartFilter/viewModel/ChartFilterViewModel.kt index e955cae5a..19bccb5c7 100644 --- a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/chartFilter/viewModel/ChartFilterViewModel.kt +++ b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/chartFilter/viewModel/ChartFilterViewModel.kt @@ -13,7 +13,7 @@ import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID import com.example.util.simpletimetracker.domain.extension.addOrRemove import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType diff --git a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/defaultTypesSelection/viewModel/DefaultTypesSelectionViewModel.kt b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/defaultTypesSelection/viewModel/DefaultTypesSelectionViewModel.kt index 23050da68..eec78bcd8 100644 --- a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/defaultTypesSelection/viewModel/DefaultTypesSelectionViewModel.kt +++ b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/defaultTypesSelection/viewModel/DefaultTypesSelectionViewModel.kt @@ -8,10 +8,10 @@ import com.example.util.simpletimetracker.domain.extension.addOrRemove import com.example.util.simpletimetracker.core.extension.set import com.example.util.simpletimetracker.core.mapper.RecordTypeViewDataMapper import com.example.util.simpletimetracker.core.repo.ResourceRepo +import com.example.util.simpletimetracker.domain.recordType.model.CardOrder import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor -import com.example.util.simpletimetracker.domain.recordType.model.CardOrder import com.example.util.simpletimetracker.domain.recordType.model.RecordType import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType import com.example.util.simpletimetracker.feature_base_adapter.divider.DividerViewData diff --git a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/interactor/RecordsViewDataInteractor.kt b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/interactor/RecordsViewDataInteractor.kt index 7e931e1be..4e6793e51 100644 --- a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/interactor/RecordsViewDataInteractor.kt +++ b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/interactor/RecordsViewDataInteractor.kt @@ -23,7 +23,7 @@ import com.example.util.simpletimetracker.domain.recordType.model.RecordType import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal import com.example.util.simpletimetracker.domain.record.model.RunningRecord import com.example.util.simpletimetracker.domain.daysOfWeek.model.count -import com.example.util.simpletimetracker.domain.interactor.GetUntrackedRecordsInteractor +import com.example.util.simpletimetracker.domain.record.interactor.GetUntrackedRecordsInteractor import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType import com.example.util.simpletimetracker.feature_base_adapter.record.RecordViewData import com.example.util.simpletimetracker.feature_base_adapter.runningRecord.RunningRecordViewData diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterUpdateInteractor.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterUpdateInteractor.kt index c03580161..2c4311748 100644 --- a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterUpdateInteractor.kt +++ b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterUpdateInteractor.kt @@ -1,7 +1,7 @@ package com.example.util.simpletimetracker.feature_records_filter.interactor import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.extension.addOrRemove import com.example.util.simpletimetracker.domain.record.extension.getAllTypeIds import com.example.util.simpletimetracker.domain.record.extension.getCategoryItems diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt index e6de927a6..d2304905e 100644 --- a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt +++ b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt @@ -13,7 +13,7 @@ import com.example.util.simpletimetracker.core.mapper.RecordViewDataMapper import com.example.util.simpletimetracker.core.mapper.TimeMapper import com.example.util.simpletimetracker.core.repo.ResourceRepo import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.record.extension.getAllTypeIds import com.example.util.simpletimetracker.domain.record.extension.getCategoryIds import com.example.util.simpletimetracker.domain.record.extension.getCategoryItems diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/viewModel/RecordsFilterViewModel.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/viewModel/RecordsFilterViewModel.kt index b1455780c..77216f703 100644 --- a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/viewModel/RecordsFilterViewModel.kt +++ b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/viewModel/RecordsFilterViewModel.kt @@ -18,7 +18,7 @@ import com.example.util.simpletimetracker.domain.category.interactor.CategoryInt import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor import com.example.util.simpletimetracker.domain.category.interactor.RecordTypeCategoryInteractor -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeGoalInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTypeToTagInteractor diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt index 477f9061c..d7377ff08 100644 --- a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt +++ b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt @@ -1,8 +1,8 @@ package com.example.util.simpletimetracker.feature_settings.interactor import com.example.util.simpletimetracker.core.repo.ResourceRepo -import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.statistics.model.WidgetTransparencyPercent +import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType import com.example.util.simpletimetracker.feature_settings.R import com.example.util.simpletimetracker.feature_settings.api.SettingsBlock diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/mapper/SettingsMapper.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/mapper/SettingsMapper.kt index e5316af30..7ab6599f5 100644 --- a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/mapper/SettingsMapper.kt +++ b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/mapper/SettingsMapper.kt @@ -10,9 +10,9 @@ import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek import com.example.util.simpletimetracker.domain.daysOfWeek.model.DaysInCalendar import com.example.util.simpletimetracker.domain.record.model.RepeatButtonType -import com.example.util.simpletimetracker.domain.statistics.model.WidgetTransparencyPercent import com.example.util.simpletimetracker.domain.daysOfWeek.model.count import com.example.util.simpletimetracker.domain.recordType.model.CardOrder +import com.example.util.simpletimetracker.domain.statistics.model.WidgetTransparencyPercent import com.example.util.simpletimetracker.feature_settings.R import com.example.util.simpletimetracker.feature_settings.viewData.CardOrderViewData import com.example.util.simpletimetracker.feature_settings.viewData.DarkModeViewData diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt index c5f07a0b1..9868794cf 100644 --- a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt +++ b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt @@ -3,13 +3,13 @@ package com.example.util.simpletimetracker.feature_settings.viewModel.delegate import com.example.util.simpletimetracker.core.base.ViewModelDelegate import com.example.util.simpletimetracker.core.repo.ResourceRepo import com.example.util.simpletimetracker.domain.extension.flip +import com.example.util.simpletimetracker.domain.recordType.model.CardOrder +import com.example.util.simpletimetracker.domain.statistics.model.WidgetTransparencyPercent import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroStopInteractor import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.record.interactor.RecordsContainerUpdateInteractor import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder -import com.example.util.simpletimetracker.domain.recordType.model.CardOrder -import com.example.util.simpletimetracker.domain.statistics.model.WidgetTransparencyPercent import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType import com.example.util.simpletimetracker.feature_settings.R import com.example.util.simpletimetracker.feature_settings.api.SettingsBlock diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsFileWorkDelegate.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsFileWorkDelegate.kt index 1d0f799c5..0ce8a979f 100644 --- a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsFileWorkDelegate.kt +++ b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsFileWorkDelegate.kt @@ -15,7 +15,7 @@ import com.example.util.simpletimetracker.domain.backup.interactor.AutomaticBack import com.example.util.simpletimetracker.domain.backup.interactor.AutomaticExportInteractor import com.example.util.simpletimetracker.domain.backup.interactor.BackupInteractor import com.example.util.simpletimetracker.domain.backup.interactor.CsvExportInteractor -import com.example.util.simpletimetracker.domain.interactor.IcsExportInteractor +import com.example.util.simpletimetracker.domain.backup.interactor.IcsExportInteractor import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.statistics.interactor.SettingsDataUpdateInteractor import com.example.util.simpletimetracker.domain.backup.model.BackupOptionsData diff --git a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsDetailTotalNavigator.kt b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsDetailTotalNavigator.kt index 2c6639cc2..c0515b70e 100644 --- a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsDetailTotalNavigator.kt +++ b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsDetailTotalNavigator.kt @@ -3,7 +3,7 @@ package com.example.util.simpletimetracker.feature_statistics.interactor import com.example.util.simpletimetracker.core.extension.toParams import com.example.util.simpletimetracker.core.interactor.GetStatisticsDetailRangeInteractor import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailDailyCalendarViewDataInteractor.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailDailyCalendarViewDataInteractor.kt index 91d3b8515..4bbf10261 100644 --- a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailDailyCalendarViewDataInteractor.kt +++ b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailDailyCalendarViewDataInteractor.kt @@ -11,7 +11,7 @@ import com.example.util.simpletimetracker.domain.record.extension.hasUncategoriz import com.example.util.simpletimetracker.domain.record.extension.hasUntaggedItem import com.example.util.simpletimetracker.domain.extension.orZero import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt index bc01c548c..736f1ce55 100644 --- a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt +++ b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt @@ -10,7 +10,7 @@ import com.example.util.simpletimetracker.domain.record.extension.hasMultitaskFi import com.example.util.simpletimetracker.domain.record.extension.hasSelectedTagsFilter import com.example.util.simpletimetracker.domain.record.extension.hasUntrackedFilter import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailViewDataMapper.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailViewDataMapper.kt index 3c749eb1d..32c34cf44 100644 --- a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailViewDataMapper.kt +++ b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailViewDataMapper.kt @@ -15,7 +15,7 @@ import com.example.util.simpletimetracker.domain.recordType.extension.value import com.example.util.simpletimetracker.domain.record.mapper.RangeMapper import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek import com.example.util.simpletimetracker.domain.base.OneShotValue -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.record.model.Range import com.example.util.simpletimetracker.domain.statistics.model.RangeLength import com.example.util.simpletimetracker.domain.record.model.RecordBase diff --git a/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataLocalMapper.kt b/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataLocalMapper.kt index 3925f62ad..112395ec3 100644 --- a/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataLocalMapper.kt +++ b/features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataLocalMapper.kt @@ -7,7 +7,7 @@ package com.example.util.simpletimetracker.feature_wear import com.example.util.simpletimetracker.core.interactor.RecordRepeatInteractor import com.example.util.simpletimetracker.core.mapper.RecordTagViewDataMapper -import com.example.util.simpletimetracker.domain.mapper.AppColorMapper +import com.example.util.simpletimetracker.domain.color.mapper.AppColorMapper import com.example.util.simpletimetracker.domain.color.model.AppColor import com.example.util.simpletimetracker.domain.record.model.Record import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/settings/WidgetStatisticsSettingsViewModel.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/settings/WidgetStatisticsSettingsViewModel.kt index ab3650622..5092b5b3a 100644 --- a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/settings/WidgetStatisticsSettingsViewModel.kt +++ b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/statistics/settings/WidgetStatisticsSettingsViewModel.kt @@ -17,8 +17,9 @@ import com.example.util.simpletimetracker.core.viewData.SelectLastDaysViewData import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor -import com.example.util.simpletimetracker.domain.model.Category +import com.example.util.simpletimetracker.domain.category.model.Category import com.example.util.simpletimetracker.domain.daysOfWeek.interactor.GetProcessedLastDaysCountInteractor +import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor @@ -27,7 +28,6 @@ import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterTyp import com.example.util.simpletimetracker.domain.statistics.model.RangeLength import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag import com.example.util.simpletimetracker.domain.recordType.model.RecordType -import com.example.util.simpletimetracker.domain.statistics.model.StatisticsWidgetData import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType import com.example.util.simpletimetracker.feature_base_adapter.category.CategoryViewData import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData diff --git a/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/CardOrderDialogParams.kt b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/CardOrderDialogParams.kt index 3650ce836..8e17e6280 100644 --- a/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/CardOrderDialogParams.kt +++ b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/CardOrderDialogParams.kt @@ -1,8 +1,8 @@ package com.example.util.simpletimetracker.navigation.params.screen import android.os.Parcelable -import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder import com.example.util.simpletimetracker.domain.recordType.model.CardOrder +import com.example.util.simpletimetracker.domain.recordTag.model.CardTagOrder import kotlinx.parcelize.Parcelize @Parcelize