A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
remove untracked hint
+25
-118
+1
-1
core/src/main/res/values-ar/strings.xml
+1
-1
core/src/main/res/values-ar/strings.xml
···
116
116
<string name="change_record_adjust">تغيير</string>
117
117
<string name="change_record_change_prev_record">تغيير وقت التتبع السابق أيضا</string>
118
118
<string name="change_record_change_adjacent_records">تغيير وقت التتبع المحاذي أيضا</string>
119
-
<string name="change_record_untracked_time_hint">الوقت غير المُتعقب هو الوقت الذي لم يتم فيه تعقب أي نشاط. يمكن تعطيله في الإعدادات</string>
119
+
<string name="change_record_untracked_time_hint">الوقت غير المُتعقب هو الوقت الذي لم يتم فيه تعقب أي نشاط.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">تم أرشفة النشاط</string>
+1
-1
core/src/main/res/values-ca/strings.xml
+1
-1
core/src/main/res/values-ca/strings.xml
···
116
116
<string name="change_record_adjust">Canvi</string>
117
117
<string name="change_record_change_prev_record">També canvia el temps de l\'enregistrament anterior</string>
118
118
<string name="change_record_change_adjacent_records">També canvia el temps dels enregistraments adjacents</string>
119
-
<string name="change_record_untracked_time_hint">El temps sense seguiment és el temps en què no s\'ha fet el seguiment de cap activitat. Es pot desactivar a la configuració</string>
119
+
<string name="change_record_untracked_time_hint">El temps sense seguiment és el temps en què no s\'ha fet el seguiment de cap activitat.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Activitat arxivada</string>
+1
-1
core/src/main/res/values-de/strings.xml
+1
-1
core/src/main/res/values-de/strings.xml
···
116
116
<string name="change_record_adjust">Ändern</string>
117
117
<string name="change_record_change_prev_record">Ändern Sie auch die Zeit des vorherigen Datensatzes</string>
118
118
<string name="change_record_change_adjacent_records">Ändern Sie auch die Zeit benachbarter Datensätze</string>
119
-
<string name="change_record_untracked_time_hint">Die nicht erfasste Zeit ist die Zeit, in der keine Aktivität erfasst wurde. Es kann in den Einstellungen deaktiviert werden</string>
119
+
<string name="change_record_untracked_time_hint">Die nicht erfasste Zeit ist die Zeit, in der keine Aktivität erfasst wurde.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Aktivität archiviert</string>
+1
-1
core/src/main/res/values-es/strings.xml
+1
-1
core/src/main/res/values-es/strings.xml
···
116
116
<string name="change_record_adjust">Cambio</string>
117
117
<string name="change_record_change_prev_record">También cambia el tiempo del registro anterior</string>
118
118
<string name="change_record_change_adjacent_records">También cambia la hora de los registros adyacentes</string>
119
-
<string name="change_record_untracked_time_hint">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.</string>
119
+
<string name="change_record_untracked_time_hint">El tiempo sin seguimiento es el momento en el que no se realizó un seguimiento de ninguna actividad.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Actividad archivada</string>
+1
-1
core/src/main/res/values-fa/strings.xml
+1
-1
core/src/main/res/values-fa/strings.xml
···
116
116
<string name="change_record_adjust">تغییر</string>
117
117
<string name="change_record_change_prev_record">همچنین زمان تاریخچه قبلی را تغییر دهید</string>
118
118
<string name="change_record_change_adjacent_records">همچنین زمان تاریخچه های مجاور را تغییر دهید</string>
119
-
<string name="change_record_untracked_time_hint">زمان ردیابی نشده زمانی است که هیچ فعالیتی ردیابی نشده است. در تنظیمات می توان آن را غیرفعال کرد</string>
119
+
<string name="change_record_untracked_time_hint">زمان ردیابی نشده زمانی است که هیچ فعالیتی ردیابی نشده است.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">فعالیت بایگانی شد</string>
+1
-1
core/src/main/res/values-fr/strings.xml
+1
-1
core/src/main/res/values-fr/strings.xml
···
116
116
<string name="change_record_adjust">Changement</string>
117
117
<string name="change_record_change_prev_record">Modifier également l\'heure de l\'enregistrement précédent</string>
118
118
<string name="change_record_change_adjacent_records">Modifier également l\'heure des enregistrements adjacents</string>
119
-
<string name="change_record_untracked_time_hint">Le temps non suivi est le temps pendant lequel aucune activité n\'a été suivie. Il peut être désactivé dans les paramètres</string>
119
+
<string name="change_record_untracked_time_hint">Le temps non suivi est le temps pendant lequel aucune activité n\'a été suivie.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Activité archivée</string>
+1
-1
core/src/main/res/values-hi/strings.xml
+1
-1
core/src/main/res/values-hi/strings.xml
···
116
116
<string name="change_record_adjust">बदलना</string>
117
117
<string name="change_record_change_prev_record">पिछले रिकॉर्ड का समय भी बदलें</string>
118
118
<string name="change_record_change_adjacent_records">पास के रिकॉर्ड का समय भी बदलें</string>
119
-
<string name="change_record_untracked_time_hint">अनट्रैक्ड टाइम वह समय है जब किसी भी गतिविधि को ट्रैक नहीं किया गया था। इसे सेटिंग्स में अक्षम किया जा सकता है</string>
119
+
<string name="change_record_untracked_time_hint">अनट्रैक्ड टाइम वह समय है जब किसी भी गतिविधि को ट्रैक नहीं किया गया था।</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">संग्रहीत गतिविधि</string>
+1
-1
core/src/main/res/values-in/strings.xml
+1
-1
core/src/main/res/values-in/strings.xml
···
116
116
<string name="change_record_adjust">Mengubah</string>
117
117
<string name="change_record_change_prev_record">Juga ubah waktu rekaman sebelumnya</string>
118
118
<string name="change_record_change_adjacent_records">Juga ubah waktu catatan yang berdekatan</string>
119
-
<string name="change_record_untracked_time_hint">Waktu yang tidak terlacak adalah waktu ketika tidak ada aktivitas yang terlacak. Itu dapat dinonaktifkan di pengaturan</string>
119
+
<string name="change_record_untracked_time_hint">Waktu yang tidak terlacak adalah waktu ketika tidak ada aktivitas yang terlacak.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Kegiatan dihapuskan</string>
+1
-1
core/src/main/res/values-it/strings.xml
+1
-1
core/src/main/res/values-it/strings.xml
···
116
116
<string name="change_record_adjust">Modificare</string>
117
117
<string name="change_record_change_prev_record">Cambia anche l\'ora della registrazione precedente</string>
118
118
<string name="change_record_change_adjacent_records">Cambia anche l\'ora dei record adiacenti</string>
119
-
<string name="change_record_untracked_time_hint">Il tempo non tracciato è il tempo in cui non è stata tracciata alcuna attività. Può essere disabilitato nelle impostazioni</string>
119
+
<string name="change_record_untracked_time_hint">Il tempo non tracciato è il tempo in cui non è stata tracciata alcuna attività.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Attività archiviata</string>
+1
-1
core/src/main/res/values-ja/strings.xml
+1
-1
core/src/main/res/values-ja/strings.xml
···
116
116
<string name="change_record_adjust">変更する</string>
117
117
<string name="change_record_change_prev_record">前のレコードの時刻も変更</string>
118
118
<string name="change_record_change_adjacent_records">隣接レコードの時刻も変更</string>
119
-
<string name="change_record_untracked_time_hint">未追跡時間とは、アクティビティが追跡されなかった時間です。設定で無効にすることができます</string>
119
+
<string name="change_record_untracked_time_hint">未追跡時間とは、アクティビティが追跡されなかった時間です。</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">アクティビティをアーカイブ</string>
+1
-1
core/src/main/res/values-ko/strings.xml
+1
-1
core/src/main/res/values-ko/strings.xml
···
116
116
<string name="change_record_adjust">변경</string>
117
117
<string name="change_record_change_prev_record">이전 기록도 함께 변경</string>
118
118
<string name="change_record_change_adjacent_records">관련 기록의 시간도 함께 변경</string>
119
-
<string name="change_record_untracked_time_hint">추적되지 않은 시간은 활동이 추적되지 않은 시간입니다. 설정에서 비활성화할 수 있습니다</string>
119
+
<string name="change_record_untracked_time_hint">추적되지 않은 시간은 활동이 추적되지 않은 시간입니다.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">활동 보관됨</string>
+1
-1
core/src/main/res/values-nl/strings.xml
+1
-1
core/src/main/res/values-nl/strings.xml
···
116
116
<string name="change_record_adjust">Verandering</string>
117
117
<string name="change_record_change_prev_record">Wijzig ook de tijd van het vorige record</string>
118
118
<string name="change_record_change_adjacent_records">Wijzig ook de tijd van aangrenzende records</string>
119
-
<string name="change_record_untracked_time_hint">Niet-bijgehouden tijd is de tijd waarin geen activiteit is bijgehouden. Het kan worden uitgeschakeld in de instellingen</string>
119
+
<string name="change_record_untracked_time_hint">Niet-bijgehouden tijd is de tijd waarin geen activiteit is bijgehouden.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Activiteit gearchiveerd</string>
+1
-1
core/src/main/res/values-pt/strings.xml
+1
-1
core/src/main/res/values-pt/strings.xml
···
116
116
<string name="change_record_adjust">Mudar</string>
117
117
<string name="change_record_change_prev_record">Mude também a hora do registro anterior</string>
118
118
<string name="change_record_change_adjacent_records">Também altere a hora dos registros adjacentes</string>
119
-
<string name="change_record_untracked_time_hint">O tempo não rastreado é o tempo em que nenhuma atividade foi rastreada. Pode ser desativado nas configurações</string>
119
+
<string name="change_record_untracked_time_hint">O tempo não rastreado é o tempo em que nenhuma atividade foi rastreada.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Atividade arquivada</string>
+1
-1
core/src/main/res/values-ru/strings.xml
+1
-1
core/src/main/res/values-ru/strings.xml
···
116
116
<string name="change_record_adjust">Изменить</string>
117
117
<string name="change_record_change_prev_record">Также изменить время предыдущей записи</string>
118
118
<string name="change_record_change_adjacent_records">Также изменить время соседних записей</string>
119
-
<string name="change_record_untracked_time_hint">Неотслеживаемое время - это время, когда никакая активность не отслеживалась. Его можно отключить в настройках</string>
119
+
<string name="change_record_untracked_time_hint">Неотслеживаемое время - это время, когда никакая активность не отслеживалась.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Активность перемещена в архив</string>
+1
-1
core/src/main/res/values-sv/strings.xml
+1
-1
core/src/main/res/values-sv/strings.xml
···
116
116
<string name="change_record_adjust">Förändra</string>
117
117
<string name="change_record_change_prev_record">Ändra även tid för tidigare händelse</string>
118
118
<string name="change_record_change_adjacent_records">Ändra också tiden för de intilliggande händelserna</string>
119
-
<string name="change_record_untracked_time_hint">Ospårad tid är tid då ingen aktivitet spårades. Det kan inaktiveras i inställningarna</string>
119
+
<string name="change_record_untracked_time_hint">Ospårad tid är tid då ingen aktivitet spårades.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Aktivitet arkiverad</string>
+1
-1
core/src/main/res/values-tr/strings.xml
+1
-1
core/src/main/res/values-tr/strings.xml
···
116
116
<string name="change_record_adjust">Değiştirmek</string>
117
117
<string name="change_record_change_prev_record">Ayrıca önceki kaydın zamanını değiştir</string>
118
118
<string name="change_record_change_adjacent_records">Bitişik kayıtların zamanını da değiştir</string>
119
-
<string name="change_record_untracked_time_hint">Takip edilmeyen zaman, hiçbir aktivitenin takip edilmediği zamandır. Ayarlardan devre dışı bırakılabilir</string>
119
+
<string name="change_record_untracked_time_hint">Takip edilmeyen zaman, hiçbir aktivitenin takip edilmediği zamandır.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Aktivite arşivlendi</string>
+1
-1
core/src/main/res/values-uk/strings.xml
+1
-1
core/src/main/res/values-uk/strings.xml
···
116
116
<string name="change_record_adjust">Зміна</string>
117
117
<string name="change_record_change_prev_record">Також змінити час попереднього запису</string>
118
118
<string name="change_record_change_adjacent_records">Також змінити час суміжних записів</string>
119
-
<string name="change_record_untracked_time_hint">Невідстежуваний час – це час, коли жодна діяльність не відстежувалася. Його можна вимкнути в налаштуваннях</string>
119
+
<string name="change_record_untracked_time_hint">Невідстежуваний час – це час, коли жодна діяльність не відстежувалася.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Активність переміщено до архіву</string>
+1
-1
core/src/main/res/values-zh-rTW/strings.xml
+1
-1
core/src/main/res/values-zh-rTW/strings.xml
···
116
116
<string name="change_record_adjust">改變</string>
117
117
<string name="change_record_change_prev_record">也會改變前筆紀錄的時間</string>
118
118
<string name="change_record_change_adjacent_records">也會改變鄰近紀錄的時間</string>
119
-
<string name="change_record_untracked_time_hint">未追蹤時間是指沒有追蹤任何活動的時間。可以在設定中停用它</string>
119
+
<string name="change_record_untracked_time_hint">未追蹤時間是指沒有追蹤任何活動的時間。</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">已備存活動</string>
+1
-1
core/src/main/res/values-zh/strings.xml
+1
-1
core/src/main/res/values-zh/strings.xml
···
116
116
<string name="change_record_adjust">改变</string>
117
117
<string name="change_record_change_prev_record">同时更改上一个记录的时间</string>
118
118
<string name="change_record_change_adjacent_records">同时更改相邻记录的时间</string>
119
-
<string name="change_record_untracked_time_hint">未跟踪时间是指没有跟踪任何活动的时间。可以在设置中禁用它</string>
119
+
` <string name="change_record_untracked_time_hint">未跟踪时间是指没有跟踪任何活动的时间。可以在设置中禁用它</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">活动已存档</string>
+1
-1
core/src/main/res/values/strings.xml
+1
-1
core/src/main/res/values/strings.xml
···
116
116
<string name="change_record_adjust">Change</string>
117
117
<string name="change_record_change_prev_record">Also change time of previous record</string>
118
118
<string name="change_record_change_adjacent_records">Also change time of adjacent records</string>
119
-
<string name="change_record_untracked_time_hint">Untracked time is time when no activity was tracked. It can be disabled in settings</string>
119
+
<string name="change_record_untracked_time_hint">Untracked time is time when no activity was tracked.</string>
120
120
121
121
<!-- Change record type -->
122
122
<string name="change_record_type_archived">Activity archived</string>
+2
-14
features/feature_change_record/src/main/res/layout/change_record_core_layout.xml
+2
-14
features/feature_change_record/src/main/res/layout/change_record_core_layout.xml
···
6
6
android:layout_height="match_parent"
7
7
android:animateLayoutChanges="true">
8
8
9
-
<com.example.util.simpletimetracker.feature_views.HintBigView
10
-
android:id="@+id/containerChangeRecordUntrackedHint"
11
-
android:layout_width="match_parent"
12
-
android:layout_height="wrap_content"
13
-
android:layout_marginHorizontal="20dp"
14
-
android:layout_marginTop="4dp"
15
-
android:visibility="gone"
16
-
app:itemCloseIconVisible="true"
17
-
app:itemHintText="@string/change_record_untracked_time_hint"
18
-
app:layout_constraintTop_toTopOf="parent"
19
-
tools:visibility="visible" />
20
-
21
9
<androidx.constraintlayout.widget.ConstraintLayout
22
10
android:id="@+id/containerChangeRecordTimes"
23
11
android:layout_width="match_parent"
24
12
android:layout_height="wrap_content"
25
-
app:layout_constraintTop_toBottomOf="@id/containerChangeRecordUntrackedHint">
13
+
app:layout_constraintTop_toTopOf="parent">
26
14
27
15
<androidx.cardview.widget.CardView
28
16
android:id="@+id/fieldChangeRecordTimeStarted"
···
436
424
android:id="@+id/rvChangeRecordSearchComments"
437
425
android:layout_width="match_parent"
438
426
android:layout_height="match_parent"
439
-
android:layout_marginHorizontal="18dp"
440
427
android:scrollbars="vertical"
428
+
android:layout_marginHorizontal="18dp"
441
429
android:visibility="gone"
442
430
tools:itemCount="1"
443
431
tools:listitem="@layout/change_record_comment_field_item"
-8
core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordViewDataMapper.kt
-8
core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordViewDataMapper.kt
···
125
125
closeIconVisible = false,
126
126
)
127
127
}
128
-
129
-
fun mapToUntrackedTimeHint(): ViewHolderType {
130
-
return HintBigViewData(
131
-
text = resourceRepo.getString(R.string.change_record_untracked_time_hint),
132
-
infoIconVisible = false,
133
-
closeIconVisible = true,
134
-
)
135
-
}
136
128
}
-5
data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt
-5
data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt
···
241
241
KEY_REPEAT_BUTTON_TYPE, 0
242
242
)
243
243
244
-
override var untrackedTimeHintWasHidden: Boolean by prefs.delegate(
245
-
KEY_UNTRACKED_TIME_HINT_WAS_HIDDEN, false
246
-
)
247
-
248
244
override fun setWidget(widgetId: Int, recordType: Long) {
249
245
prefs.edit().putLong(KEY_WIDGET + widgetId, recordType).apply()
250
246
}
···
438
434
private const val KEY_AUTOMATIC_EXPORT_ERROR = "automaticExportError"
439
435
private const val KEY_AUTOMATIC_EXPORT_LAST_SAVE_TIME = "automaticExportLastSaveTime"
440
436
private const val KEY_REPEAT_BUTTON_TYPE = "repeatButtonType"
441
-
private const val KEY_UNTRACKED_TIME_HINT_WAS_HIDDEN = "untrackedTimeHintWasHidden"
442
437
private const val KEY_WIDGET = "widget_"
443
438
private const val KEY_STATISTICS_WIDGET_FILTERED_TYPES = "statistics_widget_filtered_types_"
444
439
private const val KEY_STATISTICS_WIDGET_FILTERED_CATEGORIES = "statistics_widget_filtered_categories_"
-8
domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt
-8
domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt
···
559
559
}
560
560
}
561
561
562
-
suspend fun getUntrackedTimeHintWasHidden(): Boolean = withContext(Dispatchers.IO) {
563
-
prefsRepo.untrackedTimeHintWasHidden
564
-
}
565
-
566
-
suspend fun setUntrackedTimeHintWasHidden(wasHidden: Boolean) = withContext(Dispatchers.IO) {
567
-
prefsRepo.untrackedTimeHintWasHidden = wasHidden
568
-
}
569
-
570
562
suspend fun clear() = withContext(Dispatchers.IO) {
571
563
prefsRepo.clear()
572
564
}
-2
domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt
-2
domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt
-2
features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt
-2
features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt
···
152
152
btnChangeRecordContinue.setOnClick(viewModel::onContinueClick)
153
153
btnChangeRecordDuplicate.setOnClick(viewModel::onDuplicateClick)
154
154
btnChangeRecordMerge.setOnClick(viewModel::onMergeClick)
155
-
containerChangeRecordUntrackedHint.setOnCloseClick(viewModel::onUntrackedHintCloseClick)
156
155
}
157
156
158
157
fun <T : ViewBinding> initViewModel(
···
193
192
mergePreview.observe { setMergePreview(it, binding) }
194
193
splitPreview.observe { setSplitPreview(it, binding) }
195
194
adjustPreview.observe { setAdjustPreview(it, binding) }
196
-
untrackedTimeHintVisibility.observe(containerChangeRecordUntrackedHint::visible::set)
197
195
}
198
196
}
199
197
-26
features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
-26
features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
···
98
98
initial
99
99
}
100
100
}
101
-
val untrackedTimeHintVisibility: LiveData<Boolean> by lazy {
102
-
return@lazy MutableLiveData<Boolean>().let { initial ->
103
-
viewModelScope.launch {
104
-
initial.value = loadUntrackedTimeHintVisibility()
105
-
}
106
-
initial
107
-
}
108
-
}
109
101
val timeAdjustmentState: LiveData<TimeAdjustmentState> = MutableLiveData(TimeAdjustmentState.TIME_STARTED)
110
102
val saveButtonEnabled: LiveData<Boolean> = MutableLiveData(true)
111
103
val keyboardVisibility: LiveData<Boolean> = MutableLiveData(false)
···
131
123
protected abstract val splitPreviewTimeEnded: Long
132
124
protected abstract val showTimeEndedOnSplitPreview: Boolean
133
125
protected abstract val adjustNextRecordAvailable: Boolean
134
-
protected abstract val untrackedHintAvailable: Boolean
135
126
136
127
private var prevRecord: Record? = null
137
128
private var nextRecord: Record? = null
···
454
445
}
455
446
}
456
447
457
-
fun onUntrackedHintCloseClick() {
458
-
viewModelScope.launch {
459
-
prefsInteractor.setUntrackedTimeHintWasHidden(wasHidden = true)
460
-
updateUntrackedTimeHintVisibility()
461
-
}
462
-
}
463
-
464
448
private suspend fun updateMergeData() {
465
449
changeRecordMergeDelegate.updateMergePreviewViewData(
466
450
mergeAvailable = mergeAvailable,
···
678
662
isLoading = isLoading,
679
663
search = searchComment,
680
664
)
681
-
}
682
-
683
-
private suspend fun updateUntrackedTimeHintVisibility() {
684
-
untrackedTimeHintVisibility.set(loadUntrackedTimeHintVisibility())
685
-
}
686
-
687
-
private suspend fun loadUntrackedTimeHintVisibility(): Boolean {
688
-
val wasHidden = prefsInteractor.getUntrackedTimeHintWasHidden()
689
-
val isCalendarView = prefsInteractor.getShowRecordsCalendar()
690
-
return untrackedHintAvailable && isCalendarView && !wasHidden
691
665
}
692
666
693
667
companion object {
-1
features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt
-1
features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt
···
75
75
override val splitPreviewTimeEnded: Long get() = newTimeEnded
76
76
override val showTimeEndedOnSplitPreview: Boolean get() = true
77
77
override val adjustNextRecordAvailable: Boolean get() = true
78
-
override val untrackedHintAvailable: Boolean get() = extra is ChangeRecordParams.Untracked
79
78
80
79
val record: LiveData<ChangeRecordViewData> by lazy {
81
80
return@lazy MutableLiveData<ChangeRecordViewData>().let { initial ->
-1
features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt
-1
features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt
···
78
78
override val splitPreviewTimeEnded: Long get() = System.currentTimeMillis()
79
79
override val showTimeEndedOnSplitPreview: Boolean get() = false
80
80
override val adjustNextRecordAvailable: Boolean get() = false
81
-
override val untrackedHintAvailable: Boolean get() = false
82
81
83
82
val record: LiveData<ChangeRunningRecordViewData> by lazy {
84
83
return@lazy MutableLiveData<ChangeRunningRecordViewData>().let { initial ->
-9
features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/interactor/RecordsViewDataInteractor.kt
-9
features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/interactor/RecordsViewDataInteractor.kt
···
165
165
// Try to find if any record exists.
166
166
else -> recordInteractor.isEmpty() && runningRecordInteractor.isEmpty()
167
167
}
168
-
val showUntrackedTimeHint = !prefsInteractor.getUntrackedTimeHintWasHidden() &&
169
-
records.any { it.data.value is RecordViewData.Untracked }
170
168
171
169
return records
172
170
.sortedByDescending { it.timeStartedTimestamp }
···
176
174
showFirstEnterHint -> listOf(recordViewDataMapper.mapToNoRecords())
177
175
it.isEmpty() -> listOf(recordViewDataMapper.mapToEmpty())
178
176
else -> it + recordsViewDataMapper.mapToHint()
179
-
}
180
-
}
181
-
.let {
182
-
if (showUntrackedTimeHint) {
183
-
listOf(recordViewDataMapper.mapToUntrackedTimeHint()) + it
184
-
} else {
185
-
it
186
177
}
187
178
}
188
179
.let(RecordsState::RecordsData)
+1
-1
features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt
+1
-1
features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsFragment.kt
+1
-8
features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsViewModel.kt
+1
-8
features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsViewModel.kt
···
137
137
}
138
138
}
139
139
140
-
fun onUntrackedHintCloseClick() {
141
-
viewModelScope.launch {
142
-
prefsInteractor.setUntrackedTimeHintWasHidden(wasHidden = true)
143
-
updateRecords()
144
-
}
145
-
}
146
-
147
-
private fun updateRecords() = viewModelScope.launch {
140
+
private fun updateRecords() = viewModelScope.launch() {
148
141
isCalendarView.set(prefsInteractor.getShowRecordsCalendar())
149
142
150
143
when (val state = loadRecordsViewData()) {
-5
features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsViewDataInteractor.kt
-5
features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsViewDataInteractor.kt
···
5
5
import com.example.util.simpletimetracker.core.mapper.ColorMapper
6
6
import com.example.util.simpletimetracker.core.mapper.GoalViewDataMapper
7
7
import com.example.util.simpletimetracker.core.mapper.RangeViewDataMapper
8
-
import com.example.util.simpletimetracker.core.mapper.RecordViewDataMapper
9
8
import com.example.util.simpletimetracker.domain.UNCATEGORIZED_ITEM_ID
10
9
import com.example.util.simpletimetracker.domain.UNTRACKED_ITEM_ID
11
10
import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
···
39
38
private val goalViewDataMapper: GoalViewDataMapper,
40
39
private val recordInteractor: RecordInteractor,
41
40
private val runningRecordInteractor: RunningRecordInteractor,
42
-
private val recordViewDataMapper: RecordViewDataMapper,
43
41
) {
44
42
45
43
fun mapFilter(
···
182
180
// Try to find if any record exists.
183
181
else -> recordInteractor.isEmpty() && runningRecordInteractor.isEmpty()
184
182
}
185
-
val showUntrackedTimeHint = !prefsInteractor.getUntrackedTimeHintWasHidden() &&
186
-
list.any { it.id == UNTRACKED_ITEM_ID }
187
183
188
184
// Assemble data.
189
185
val result: MutableList<ViewHolderType> = mutableListOf()
···
195
191
} else {
196
192
if (forSharing) getSharingTitle(rangeLength, shift).let(result::addAll)
197
193
chart.let(result::add)
198
-
if (showUntrackedTimeHint) recordViewDataMapper.mapToUntrackedTimeHint().let(result::add)
199
194
list.let(result::addAll)
200
195
totalTracked.let(result::add)
201
196
// If has any activity or tag other than untracked
+1
-1
features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt
+1
-1
features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsFragment.kt
···
151
151
createStatisticsGoalAdapterDelegate(),
152
152
createStatisticsTitleAdapterDelegate(),
153
153
createHintAdapterDelegate(),
154
-
createHintBigAdapterDelegate(viewModel::onUntrackedHintCloseClick),
154
+
createHintBigAdapterDelegate(),
155
155
createLoaderAdapterDelegate(),
156
156
createDividerAdapterDelegate(),
157
157
)
-7
features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsViewModel.kt
-7
features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsViewModel.kt
···
151
151
}
152
152
}
153
153
154
-
fun onUntrackedHintCloseClick() {
155
-
viewModelScope.launch {
156
-
prefsInteractor.setUntrackedTimeHintWasHidden(wasHidden = true)
157
-
updateStatistics()
158
-
}
159
-
}
160
-
161
154
private fun updateAnimateChartParticles() {
162
155
val shouldAnimate = isVisible && isChartAttached && !isTabScrolling && !isChartFilterOpened
163
156
animateChartParticles.set(shouldAnimate)