Skip to content

Commit 94b602e

Browse files
committed
fix default duration not disabling
1 parent dd86890 commit 94b602e

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/view/ChangeCategoryFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class ChangeCategoryFragment :
185185
}
186186

187187
override fun onDisable(tag: String?) {
188-
viewModel.onDurationDisabled(tag)
188+
viewModel.onGoalDurationDisabled(tag)
189189
}
190190

191191
private fun updateUi(item: CategoryViewData) = with(binding) {

features/feature_change_goals/api/src/main/java/com/example/util/simpletimetracker/feature_change_goals/api/GoalsViewModelDelegate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ interface GoalsViewModelDelegate {
1212
fun onGoalsVisible()
1313
fun onNotificationsHintClick()
1414
fun onGoalDurationSet(tag: String?, duration: Long, anchor: Any)
15-
fun onDurationDisabled(tag: String?)
15+
fun onGoalDurationDisabled(tag: String?)
1616
fun onGoalTypeSelected(range: RecordTypeGoal.Range, position: Int)
1717
fun onGoalCountChange(range: RecordTypeGoal.Range, count: String)
1818
fun onGoalTimeClick(range: RecordTypeGoal.Range)

features/feature_change_goals/src/main/java/com/example/util/simpletimetracker/feature_change_goals/delegate/GoalsViewModelDelegateImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class GoalsViewModelDelegateImpl @Inject constructor(
5555
checkExactAlarmPermissionInteractor.execute(anchor)
5656
}
5757

58-
override fun onDurationDisabled(tag: String?) {
58+
override fun onGoalDurationDisabled(tag: String?) {
5959
if (tag !in tags) return
6060
onNewGoalDuration(tag, 0)
6161
}

features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ class ChangeRecordTypeViewModel @Inject constructor(
331331
DurationDialogParams(
332332
tag = DEFAULT_DURATION_DIALOG_TAG,
333333
value = DurationDialogParams.Value.DurationSeconds(newDefaultDuration),
334-
hideDisableButton = true,
335334
).let(router::navigate)
336335
}
337336

@@ -343,12 +342,17 @@ class ChangeRecordTypeViewModel @Inject constructor(
343342

344343
fun onDurationSet(tag: String?, duration: Long, anchor: Any) {
345344
goalsViewModelDelegate.onGoalDurationSet(tag, duration, anchor)
346-
onInstantDurationSet(tag, duration)
345+
onDefaultDurationSet(tag, duration)
347346
}
348347

349-
private fun onInstantDurationSet(tag: String?, duration: Long) {
348+
fun onDurationDisabled(tag: String?) {
349+
goalsViewModelDelegate.onGoalDurationDisabled(tag)
350+
onDefaultDurationSet(tag, 0)
351+
}
352+
353+
private fun onDefaultDurationSet(tag: String?, duration: Long) {
350354
if (tag != DEFAULT_DURATION_DIALOG_TAG) return
351-
newDefaultDuration = duration.coerceAtLeast(1)
355+
newDefaultDuration = duration
352356
updateAdditionalState()
353357
}
354358

0 commit comments

Comments
 (0)