remove Stop button from change running record screen

Razeeman · Dec 8, 2024 · 4a2b21d · 4a2b21d
1 parent 83f829c
commit 4a2b21d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 36 deletions.
diff --git a/...in/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt b/...in/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt
@@ -164,7 +164,6 @@ class ChangeRecordCore(
         containerChangeRecordTimeStartedAdjust.listener = viewModel::onAdjustTimeStartedItemClick
         containerChangeRecordTimeEndedAdjust.listener = viewModel::onAdjustTimeEndedItemClick
         btnChangeRecordSave.setOnClick(viewModel::onSaveClick)
-        btnChangeRecordStop.setOnClick(viewModel::onStopClick)
         fragment.addOnBackPressedListener(action = viewModel::onBackPressed)
     }
 
@@ -191,10 +190,6 @@ class ChangeRecordCore(
                 owner = viewLifecycleOwner,
                 observer = { setTimeEndedVisibility(it, binding) },
             )
-            stopButtonVisibility.observeOnce(
-                owner = viewLifecycleOwner,
-                observer = btnChangeRecordStop::visible::set,
-            )
             types.observe(typesAdapter::replace)
             categories.observe { updateCategories(it, binding) }
             saveButtonEnabled.observe { enableModifyingButtons(it, binding) }
@@ -290,7 +285,6 @@ class ChangeRecordCore(
         binding: ChangeRecordCoreLayoutBinding,
     ) = with(binding) {
         btnChangeRecordSave.isEnabled = isEnabled
-        btnChangeRecordStop.isEnabled = isEnabled
     }
 
     private fun setActionsViewData(data: List<ViewHolderType>) {

diff --git a/...ample/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt b/...ample/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
@@ -102,7 +102,6 @@ abstract class ChangeRecordBaseViewModel(
     val timeEndedVisibility: LiveData<Boolean> by lazy { MutableLiveData(isTimeEndedAvailable) }
     val deleteIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(isDeleteButtonVisible) }
     val statsIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(isStatisticsButtonVisible) }
-    val stopButtonVisibility: LiveData<Boolean> by lazy { MutableLiveData(isStopButtonVisible) }
 
     protected var newTypeId: Long = 0
     protected var newTimeEnded: Long = 0
@@ -122,7 +121,6 @@ abstract class ChangeRecordBaseViewModel(
     protected abstract suspend fun updatePreview()
     protected abstract fun getChangeCategoryParams(data: ChangeTagData): ChangeRecordTagFromScreen
     protected abstract suspend fun onSaveClickDelegate(doAfter: suspend () -> Unit = {})
-    protected open suspend fun onStopClickDelegate() {}
     protected open suspend fun sendPreviewUpdate(fullUpdate: Boolean) {}
     protected abstract val forceSecondsInDurationDialog: Boolean
     protected abstract val mergeAvailable: Boolean
@@ -134,7 +132,6 @@ abstract class ChangeRecordBaseViewModel(
     protected abstract val adjustNextRecordAvailable: Boolean
     protected abstract val isTimeEndedAvailable: Boolean
     protected abstract val isAdditionalActionsAvailable: Boolean
-    protected abstract val isStopButtonVisible: Boolean
     protected abstract val isDeleteButtonVisible: Boolean
     protected abstract val isStatisticsButtonVisible: Boolean
 
@@ -269,12 +266,6 @@ abstract class ChangeRecordBaseViewModel(
         )
     }
 
-    fun onStopClick() {
-        onRecordChangeButtonClick(
-            onProceed = ::onStopClickDelegate,
-        )
-    }
-
     fun onItemButtonClick(viewData: ChangeRecordButtonViewData) {
         changeRecordActionsDelegate.onItemButtonClick(viewData)
     }

diff --git a/...m/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt b/...m/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt
@@ -73,7 +73,6 @@ class ChangeRecordViewModel @Inject constructor(
     override val adjustNextRecordAvailable: Boolean get() = true
     override val isTimeEndedAvailable: Boolean get() = true
     override val isAdditionalActionsAvailable: Boolean get() = true
-    override val isStopButtonVisible: Boolean get() = false
     override val isDeleteButtonVisible: Boolean get() = recordId.orZero() != 0L
     override val isStatisticsButtonVisible: Boolean
         get() = extra is ChangeRecordParams.Tracked ||

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
@@ -579,19 +579,7 @@
         android:layout_marginTop="8dp"
         android:text="@string/change_record_save"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/btnChangeRecordStop"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnChangeRecordStop"
-        style="@style/AppButtonActive"
-        android:layout_width="wrap_content"
-        android:layout_marginHorizontal="@dimen/edit_screen_margin_horizontal"
-        android:layout_marginTop="8dp"
-        android:text="@string/notification_record_type_stop"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        tools:visibility="visible" />
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/...simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt b/...simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt
@@ -87,7 +87,6 @@ class ChangeRunningRecordViewModel @Inject constructor(
     override val showTimeEndedOnAdjustPreview: Boolean get() = false
     override val isTimeEndedAvailable: Boolean get() = false
     override val isAdditionalActionsAvailable: Boolean get() = false
-    override val isStopButtonVisible: Boolean get() = true
     override val isDeleteButtonVisible: Boolean get() = true
     override val isStatisticsButtonVisible: Boolean get() = true
 
@@ -148,12 +147,6 @@ class ChangeRunningRecordViewModel @Inject constructor(
         router.back()
     }
 
-    override suspend fun onStopClickDelegate() {
-        runningRecordInteractor.get(extra.id)
-            ?.let { removeRunningRecordMediator.removeWithRecordAdd(it) }
-        router.back()
-    }
-
     override suspend fun sendPreviewUpdate(fullUpdate: Boolean) {
         val recordPreview = record.value?.recordPreview ?: return
         val update = changeRunningRecordMapper.map(