diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordViewDataMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordViewDataMapper.kt index fbd9bd5f..2956d058 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordViewDataMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordViewDataMapper.kt @@ -125,12 +125,4 @@ class RecordViewDataMapper @Inject constructor( closeIconVisible = false, ) } - - fun mapToUntrackedTimeHint(): ViewHolderType { - return HintBigViewData( - text = resourceRepo.getString(R.string.change_record_untracked_time_hint), - infoIconVisible = false, - closeIconVisible = true, - ) - } } \ No newline at end of file diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml index a786158b..2cc0978a 100644 --- a/core/src/main/res/values-ar/strings.xml +++ b/core/src/main/res/values-ar/strings.xml @@ -116,7 +116,7 @@ تغيير تغيير وقت التتبع السابق أيضا تغيير وقت التتبع المحاذي أيضا - الوقت غير المُتعقب هو الوقت الذي لم يتم فيه تعقب أي نشاط. يمكن تعطيله في الإعدادات + الوقت غير المُتعقب هو الوقت الذي لم يتم فيه تعقب أي نشاط. تم أرشفة النشاط diff --git a/core/src/main/res/values-ca/strings.xml b/core/src/main/res/values-ca/strings.xml index 45ff2f20..65bb3ed7 100644 --- a/core/src/main/res/values-ca/strings.xml +++ b/core/src/main/res/values-ca/strings.xml @@ -116,7 +116,7 @@ Canvi També canvia el temps de l\'enregistrament anterior També canvia el temps dels enregistraments adjacents - El temps sense seguiment és el temps en què no s\'ha fet el seguiment de cap activitat. Es pot desactivar a la configuració + El temps sense seguiment és el temps en què no s\'ha fet el seguiment de cap activitat. Activitat arxivada diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml index f1ac0e56..9a95e9ea 100644 --- a/core/src/main/res/values-de/strings.xml +++ b/core/src/main/res/values-de/strings.xml @@ -116,7 +116,7 @@ Ändern Ändern Sie auch die Zeit des vorherigen Datensatzes Ändern Sie auch die Zeit benachbarter Datensätze - Die nicht erfasste Zeit ist die Zeit, in der keine Aktivität erfasst wurde. Es kann in den Einstellungen deaktiviert werden + Die nicht erfasste Zeit ist die Zeit, in der keine Aktivität erfasst wurde. Aktivität archiviert diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml index fff44803..be6c6cc2 100644 --- a/core/src/main/res/values-es/strings.xml +++ b/core/src/main/res/values-es/strings.xml @@ -116,7 +116,7 @@ Cambio También cambia el tiempo del registro anterior También cambia la hora de los registros adyacentes - El tiempo sin seguimiento es el momento en el que no se realizó un seguimiento de ninguna actividad. Se puede desactivar en la configuración. + El tiempo sin seguimiento es el momento en el que no se realizó un seguimiento de ninguna actividad. Actividad archivada diff --git a/core/src/main/res/values-fa/strings.xml b/core/src/main/res/values-fa/strings.xml index 23458fd7..819a2e84 100644 --- a/core/src/main/res/values-fa/strings.xml +++ b/core/src/main/res/values-fa/strings.xml @@ -116,7 +116,7 @@ تغییر همچنین زمان تاریخچه قبلی را تغییر دهید همچنین زمان تاریخچه های مجاور را تغییر دهید - زمان ردیابی نشده زمانی است که هیچ فعالیتی ردیابی نشده است. در تنظیمات می توان آن را غیرفعال کرد + زمان ردیابی نشده زمانی است که هیچ فعالیتی ردیابی نشده است. فعالیت بایگانی شد diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml index 2939d914..ab63a5c3 100644 --- a/core/src/main/res/values-fr/strings.xml +++ b/core/src/main/res/values-fr/strings.xml @@ -116,7 +116,7 @@ Changement Modifier également l\'heure de l\'enregistrement précédent Modifier également l\'heure des enregistrements adjacents - Le temps non suivi est le temps pendant lequel aucune activité n\'a été suivie. Il peut être désactivé dans les paramètres + Le temps non suivi est le temps pendant lequel aucune activité n\'a été suivie. Activité archivée diff --git a/core/src/main/res/values-hi/strings.xml b/core/src/main/res/values-hi/strings.xml index 0934b44c..7324af03 100644 --- a/core/src/main/res/values-hi/strings.xml +++ b/core/src/main/res/values-hi/strings.xml @@ -116,7 +116,7 @@ बदलना पिछले रिकॉर्ड का समय भी बदलें पास के रिकॉर्ड का समय भी बदलें - अनट्रैक्ड टाइम वह समय है जब किसी भी गतिविधि को ट्रैक नहीं किया गया था। इसे सेटिंग्स में अक्षम किया जा सकता है + अनट्रैक्ड टाइम वह समय है जब किसी भी गतिविधि को ट्रैक नहीं किया गया था। संग्रहीत गतिविधि diff --git a/core/src/main/res/values-in/strings.xml b/core/src/main/res/values-in/strings.xml index 1dd8cdf6..4335c9ca 100644 --- a/core/src/main/res/values-in/strings.xml +++ b/core/src/main/res/values-in/strings.xml @@ -116,7 +116,7 @@ Mengubah Juga ubah waktu rekaman sebelumnya Juga ubah waktu catatan yang berdekatan - Waktu yang tidak terlacak adalah waktu ketika tidak ada aktivitas yang terlacak. Itu dapat dinonaktifkan di pengaturan + Waktu yang tidak terlacak adalah waktu ketika tidak ada aktivitas yang terlacak. Kegiatan dihapuskan diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml index 0724e88f..f715771e 100644 --- a/core/src/main/res/values-it/strings.xml +++ b/core/src/main/res/values-it/strings.xml @@ -116,7 +116,7 @@ Modificare Cambia anche l\'ora della registrazione precedente Cambia anche l\'ora dei record adiacenti - Il tempo non tracciato è il tempo in cui non è stata tracciata alcuna attività. Può essere disabilitato nelle impostazioni + Il tempo non tracciato è il tempo in cui non è stata tracciata alcuna attività. Attività archiviata diff --git a/core/src/main/res/values-ja/strings.xml b/core/src/main/res/values-ja/strings.xml index 6c7e7c2e..5d97e5a0 100644 --- a/core/src/main/res/values-ja/strings.xml +++ b/core/src/main/res/values-ja/strings.xml @@ -116,7 +116,7 @@ 変更する 前のレコードの時刻も変更 隣接レコードの時刻も変更 - 未追跡時間とは、アクティビティが追跡されなかった時間です。設定で無効にすることができます + 未追跡時間とは、アクティビティが追跡されなかった時間です。 アクティビティをアーカイブ diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml index 3da1852e..912cc3c3 100644 --- a/core/src/main/res/values-ko/strings.xml +++ b/core/src/main/res/values-ko/strings.xml @@ -116,7 +116,7 @@ 변경 이전 기록도 함께 변경 관련 기록의 시간도 함께 변경 - 추적되지 않은 시간은 활동이 추적되지 않은 시간입니다. 설정에서 비활성화할 수 있습니다 + 추적되지 않은 시간은 활동이 추적되지 않은 시간입니다. 활동 보관됨 diff --git a/core/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml index 73dcc478..8369f1a2 100644 --- a/core/src/main/res/values-nl/strings.xml +++ b/core/src/main/res/values-nl/strings.xml @@ -116,7 +116,7 @@ Verandering Wijzig ook de tijd van het vorige record Wijzig ook de tijd van aangrenzende records - Niet-bijgehouden tijd is de tijd waarin geen activiteit is bijgehouden. Het kan worden uitgeschakeld in de instellingen + Niet-bijgehouden tijd is de tijd waarin geen activiteit is bijgehouden. Activiteit gearchiveerd diff --git a/core/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml index c0fea9de..468ac921 100644 --- a/core/src/main/res/values-pt/strings.xml +++ b/core/src/main/res/values-pt/strings.xml @@ -116,7 +116,7 @@ Mudar Mude também a hora do registro anterior Também altere a hora dos registros adjacentes - O tempo não rastreado é o tempo em que nenhuma atividade foi rastreada. Pode ser desativado nas configurações + O tempo não rastreado é o tempo em que nenhuma atividade foi rastreada. Atividade arquivada diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml index 8de185bd..54b197ac 100644 --- a/core/src/main/res/values-ru/strings.xml +++ b/core/src/main/res/values-ru/strings.xml @@ -116,7 +116,7 @@ Изменить Также изменить время предыдущей записи Также изменить время соседних записей - Неотслеживаемое время - это время, когда никакая активность не отслеживалась. Его можно отключить в настройках + Неотслеживаемое время - это время, когда никакая активность не отслеживалась. Активность перемещена в архив diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml index 5a4e3f26..e1c8ffb5 100644 --- a/core/src/main/res/values-sv/strings.xml +++ b/core/src/main/res/values-sv/strings.xml @@ -116,7 +116,7 @@ Förändra Ändra även tid för tidigare händelse Ändra också tiden för de intilliggande händelserna - Ospårad tid är tid då ingen aktivitet spårades. Det kan inaktiveras i inställningarna + Ospårad tid är tid då ingen aktivitet spårades. Aktivitet arkiverad diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml index b28868bd..a7cef9d3 100644 --- a/core/src/main/res/values-tr/strings.xml +++ b/core/src/main/res/values-tr/strings.xml @@ -116,7 +116,7 @@ Değiştirmek Ayrıca önceki kaydın zamanını değiştir Bitişik kayıtların zamanını da değiştir - Takip edilmeyen zaman, hiçbir aktivitenin takip edilmediği zamandır. Ayarlardan devre dışı bırakılabilir + Takip edilmeyen zaman, hiçbir aktivitenin takip edilmediği zamandır. Aktivite arşivlendi diff --git a/core/src/main/res/values-uk/strings.xml b/core/src/main/res/values-uk/strings.xml index 5a2c3683..c9dba42a 100644 --- a/core/src/main/res/values-uk/strings.xml +++ b/core/src/main/res/values-uk/strings.xml @@ -116,7 +116,7 @@ Зміна Також змінити час попереднього запису Також змінити час суміжних записів - Невідстежуваний час – це час, коли жодна діяльність не відстежувалася. Його можна вимкнути в налаштуваннях + Невідстежуваний час – це час, коли жодна діяльність не відстежувалася. Активність переміщено до архіву diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index 5b5281e2..3c5649fe 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -116,7 +116,7 @@ 改變 也會改變前筆紀錄的時間 也會改變鄰近紀錄的時間 - 未追蹤時間是指沒有追蹤任何活動的時間。可以在設定中停用它 + 未追蹤時間是指沒有追蹤任何活動的時間。 已備存活動 diff --git a/core/src/main/res/values-zh/strings.xml b/core/src/main/res/values-zh/strings.xml index 7bf9a870..a8196f45 100644 --- a/core/src/main/res/values-zh/strings.xml +++ b/core/src/main/res/values-zh/strings.xml @@ -116,7 +116,7 @@ 改变 同时更改上一个记录的时间 同时更改相邻记录的时间 - 未跟踪时间是指没有跟踪任何活动的时间。可以在设置中禁用它 +` 未跟踪时间是指没有跟踪任何活动的时间。可以在设置中禁用它 活动已存档 diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index c873e107..2add901f 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -116,7 +116,7 @@ Change Also change time of previous record Also change time of adjacent records - Untracked time is time when no activity was tracked. It can be disabled in settings + Untracked time is time when no activity was tracked. Activity archived diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt index b8733018..85919b49 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt @@ -241,10 +241,6 @@ class PrefsRepoImpl @Inject constructor( KEY_REPEAT_BUTTON_TYPE, 0 ) - override var untrackedTimeHintWasHidden: Boolean by prefs.delegate( - KEY_UNTRACKED_TIME_HINT_WAS_HIDDEN, false - ) - override fun setWidget(widgetId: Int, recordType: Long) { prefs.edit().putLong(KEY_WIDGET + widgetId, recordType).apply() } @@ -438,7 +434,6 @@ class PrefsRepoImpl @Inject constructor( private const val KEY_AUTOMATIC_EXPORT_ERROR = "automaticExportError" private const val KEY_AUTOMATIC_EXPORT_LAST_SAVE_TIME = "automaticExportLastSaveTime" private const val KEY_REPEAT_BUTTON_TYPE = "repeatButtonType" - private const val KEY_UNTRACKED_TIME_HINT_WAS_HIDDEN = "untrackedTimeHintWasHidden" private const val KEY_WIDGET = "widget_" private const val KEY_STATISTICS_WIDGET_FILTERED_TYPES = "statistics_widget_filtered_types_" private const val KEY_STATISTICS_WIDGET_FILTERED_CATEGORIES = "statistics_widget_filtered_categories_" diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt index 9768abd4..65563bbb 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt @@ -559,14 +559,6 @@ class PrefsInteractor @Inject constructor( } } - suspend fun getUntrackedTimeHintWasHidden(): Boolean = withContext(Dispatchers.IO) { - prefsRepo.untrackedTimeHintWasHidden - } - - suspend fun setUntrackedTimeHintWasHidden(wasHidden: Boolean) = withContext(Dispatchers.IO) { - prefsRepo.untrackedTimeHintWasHidden = wasHidden - } - suspend fun clear() = withContext(Dispatchers.IO) { prefsRepo.clear() } diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt index 16e4e565..b3ee3239 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt @@ -111,8 +111,6 @@ interface PrefsRepo { var repeatButtonType: Int - var untrackedTimeHintWasHidden: Boolean - fun setWidget(widgetId: Int, recordType: Long) fun getWidget(widgetId: Int): Long diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt index 76f8fd6b..89e9cdf1 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt @@ -152,7 +152,6 @@ class ChangeRecordCore( btnChangeRecordContinue.setOnClick(viewModel::onContinueClick) btnChangeRecordDuplicate.setOnClick(viewModel::onDuplicateClick) btnChangeRecordMerge.setOnClick(viewModel::onMergeClick) - containerChangeRecordUntrackedHint.setOnCloseClick(viewModel::onUntrackedHintCloseClick) } fun initViewModel( @@ -193,7 +192,6 @@ class ChangeRecordCore( mergePreview.observe { setMergePreview(it, binding) } splitPreview.observe { setSplitPreview(it, binding) } adjustPreview.observe { setAdjustPreview(it, binding) } - untrackedTimeHintVisibility.observe(containerChangeRecordUntrackedHint::visible::set) } } diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt index 31a7dc4d..7b03b34d 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt @@ -98,14 +98,6 @@ abstract class ChangeRecordBaseViewModel( initial } } - val untrackedTimeHintVisibility: LiveData by lazy { - return@lazy MutableLiveData().let { initial -> - viewModelScope.launch { - initial.value = loadUntrackedTimeHintVisibility() - } - initial - } - } val timeAdjustmentState: LiveData = MutableLiveData(TimeAdjustmentState.TIME_STARTED) val saveButtonEnabled: LiveData = MutableLiveData(true) val keyboardVisibility: LiveData = MutableLiveData(false) @@ -131,7 +123,6 @@ abstract class ChangeRecordBaseViewModel( protected abstract val splitPreviewTimeEnded: Long protected abstract val showTimeEndedOnSplitPreview: Boolean protected abstract val adjustNextRecordAvailable: Boolean - protected abstract val untrackedHintAvailable: Boolean private var prevRecord: Record? = null private var nextRecord: Record? = null @@ -454,13 +445,6 @@ abstract class ChangeRecordBaseViewModel( } } - fun onUntrackedHintCloseClick() { - viewModelScope.launch { - prefsInteractor.setUntrackedTimeHintWasHidden(wasHidden = true) - updateUntrackedTimeHintVisibility() - } - } - private suspend fun updateMergeData() { changeRecordMergeDelegate.updateMergePreviewViewData( mergeAvailable = mergeAvailable, @@ -680,16 +664,6 @@ abstract class ChangeRecordBaseViewModel( ) } - private suspend fun updateUntrackedTimeHintVisibility() { - untrackedTimeHintVisibility.set(loadUntrackedTimeHintVisibility()) - } - - private suspend fun loadUntrackedTimeHintVisibility(): Boolean { - val wasHidden = prefsInteractor.getUntrackedTimeHintWasHidden() - val isCalendarView = prefsInteractor.getShowRecordsCalendar() - return untrackedHintAvailable && isCalendarView && !wasHidden - } - companion object { const val TIME_STARTED_TAG = "time_started_tag" const val TIME_ENDED_TAG = "time_ended_tag" diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt index 6f521b64..9611d505 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt @@ -75,7 +75,6 @@ class ChangeRecordViewModel @Inject constructor( override val splitPreviewTimeEnded: Long get() = newTimeEnded override val showTimeEndedOnSplitPreview: Boolean get() = true override val adjustNextRecordAvailable: Boolean get() = true - override val untrackedHintAvailable: Boolean get() = extra is ChangeRecordParams.Untracked val record: LiveData by lazy { return@lazy MutableLiveData().let { initial -> diff --git a/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml b/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml index 2168b56a..7c236642 100644 --- a/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml +++ b/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml @@ -6,23 +6,11 @@ android:layout_height="match_parent" android:animateLayoutChanges="true"> - - + app:layout_constraintTop_toTopOf="parent"> by lazy { return@lazy MutableLiveData().let { initial -> 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 c6a8593b..33d5fe7b 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 @@ -165,8 +165,6 @@ class RecordsViewDataInteractor @Inject constructor( // Try to find if any record exists. else -> recordInteractor.isEmpty() && runningRecordInteractor.isEmpty() } - val showUntrackedTimeHint = !prefsInteractor.getUntrackedTimeHintWasHidden() && - records.any { it.data.value is RecordViewData.Untracked } return records .sortedByDescending { it.timeStartedTimestamp } @@ -178,13 +176,6 @@ class RecordsViewDataInteractor @Inject constructor( else -> it + recordsViewDataMapper.mapToHint() } } - .let { - if (showUntrackedTimeHint) { - listOf(recordViewDataMapper.mapToUntrackedTimeHint()) + it - } else { - it - } - } .let(RecordsState::RecordsData) } diff --git a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt index f9a1ca40..1f93d17b 100644 --- a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt +++ b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt @@ -56,7 +56,7 @@ class RecordsFragment : BaseFragment() { createEmptyAdapterDelegate(), createLoaderAdapterDelegate(), createHintAdapterDelegate(), - createHintBigAdapterDelegate(viewModel::onUntrackedHintCloseClick), + createHintBigAdapterDelegate(), ) } diff --git a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsViewModel.kt b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsViewModel.kt index b15b068c..7e6d8b9f 100644 --- a/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsViewModel.kt +++ b/features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsViewModel.kt @@ -137,14 +137,7 @@ class RecordsViewModel @Inject constructor( } } - fun onUntrackedHintCloseClick() { - viewModelScope.launch { - prefsInteractor.setUntrackedTimeHintWasHidden(wasHidden = true) - updateRecords() - } - } - - private fun updateRecords() = viewModelScope.launch { + private fun updateRecords() = viewModelScope.launch() { isCalendarView.set(prefsInteractor.getShowRecordsCalendar()) when (val state = loadRecordsViewData()) { diff --git a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsViewDataInteractor.kt b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsViewDataInteractor.kt index 9a38e858..ae675307 100644 --- a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsViewDataInteractor.kt +++ b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsViewDataInteractor.kt @@ -5,7 +5,6 @@ import com.example.util.simpletimetracker.core.interactor.StatisticsMediator import com.example.util.simpletimetracker.core.mapper.ColorMapper import com.example.util.simpletimetracker.core.mapper.GoalViewDataMapper import com.example.util.simpletimetracker.core.mapper.RangeViewDataMapper -import com.example.util.simpletimetracker.core.mapper.RecordViewDataMapper import com.example.util.simpletimetracker.domain.UNCATEGORIZED_ITEM_ID import com.example.util.simpletimetracker.domain.UNTRACKED_ITEM_ID import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor @@ -39,7 +38,6 @@ class StatisticsViewDataInteractor @Inject constructor( private val goalViewDataMapper: GoalViewDataMapper, private val recordInteractor: RecordInteractor, private val runningRecordInteractor: RunningRecordInteractor, - private val recordViewDataMapper: RecordViewDataMapper, ) { fun mapFilter( @@ -182,8 +180,6 @@ class StatisticsViewDataInteractor @Inject constructor( // Try to find if any record exists. else -> recordInteractor.isEmpty() && runningRecordInteractor.isEmpty() } - val showUntrackedTimeHint = !prefsInteractor.getUntrackedTimeHintWasHidden() && - list.any { it.id == UNTRACKED_ITEM_ID } // Assemble data. val result: MutableList = mutableListOf() @@ -195,7 +191,6 @@ class StatisticsViewDataInteractor @Inject constructor( } else { if (forSharing) getSharingTitle(rangeLength, shift).let(result::addAll) chart.let(result::add) - if (showUntrackedTimeHint) recordViewDataMapper.mapToUntrackedTimeHint().let(result::add) list.let(result::addAll) totalTracked.let(result::add) // If has any activity or tag other than untracked diff --git a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt index c96c1587..9d23aaed 100644 --- a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt +++ b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt @@ -151,7 +151,7 @@ class StatisticsFragment : createStatisticsGoalAdapterDelegate(), createStatisticsTitleAdapterDelegate(), createHintAdapterDelegate(), - createHintBigAdapterDelegate(viewModel::onUntrackedHintCloseClick), + createHintBigAdapterDelegate(), createLoaderAdapterDelegate(), createDividerAdapterDelegate(), ) diff --git a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsViewModel.kt b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsViewModel.kt index 9c215c30..27bfdd99 100644 --- a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsViewModel.kt +++ b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsViewModel.kt @@ -151,13 +151,6 @@ class StatisticsViewModel @Inject constructor( } } - fun onUntrackedHintCloseClick() { - viewModelScope.launch { - prefsInteractor.setUntrackedTimeHintWasHidden(wasHidden = true) - updateStatistics() - } - } - private fun updateAnimateChartParticles() { val shouldAnimate = isVisible && isChartAttached && !isTabScrolling && !isChartFilterOpened animateChartParticles.set(shouldAnimate)