add start and stop timers by long click

Author: Razeeman

data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPrefsRepo.kt

@@ -88,6 +88,7 @@ import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Compani
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_DURATION_PRESENTATION_FORMAT
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_ENABLE_SEARCH_ON_MAIN
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_HIDDEN_COMMENT_FILTERS
+import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_START_TIMER_BY_LONG_CLICK
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_POMODORO_SHOW_MORE_CONTROLS
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_TYPE_ADDITIONAL_FIELDS_SHOWN
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_UNTRACKED_RANGE_ENABLED
@@ -223,6 +224,7 @@ class BackupPrefsRepo @Inject constructor(
             PrefsProcessor(KEY_DURATION_PRESENTATION_FORMAT, ::durationFormat),
             PrefsProcessor(KEY_SHOW_SECONDS, ::showSeconds),
             PrefsProcessor(KEY_KEEP_SCREEN_ON, ::keepScreenOn),
+            PrefsProcessor(KEY_START_TIMER_BY_LONG_CLICK, ::startTimerByLongClick),
             PrefsProcessor(KEY_SHOW_RECORD_TAG_SELECTION, ::showRecordTagSelection),
             PrefsProcessor(KEY_RECORD_TAG_SELECTION_CLOSE_AFTER_ONE, ::recordTagSelectionCloseAfterOne),
             PrefsProcessor(KEY_SHOW_RECORD_TAG_SELECTION_EXCLUDE_ACTIVITIES, ::recordTagSelectionExcludeActivities),

data_local/src/main/java/com/example/util/simpletimetracker/data_local/prefs/PrefsRepoImpl.kt

@@ -341,6 +341,10 @@ class PrefsRepoImpl @Inject constructor(
         KEY_KEEP_SCREEN_ON, false,
     )
 
+    override var startTimerByLongClick: Boolean by prefs.delegate(
+        KEY_START_TIMER_BY_LONG_CLICK, false,
+    )
+
     override var showRecordTagSelection: Boolean by prefs.delegate(
         KEY_SHOW_RECORD_TAG_SELECTION, false,
     )
@@ -708,6 +712,7 @@ class PrefsRepoImpl @Inject constructor(
         const val KEY_DURATION_PRESENTATION_FORMAT = "durationPresentationFormat"
         const val KEY_SHOW_SECONDS = "showSeconds"
         const val KEY_KEEP_SCREEN_ON = "keepScreenOn"
+        const val KEY_START_TIMER_BY_LONG_CLICK = "startTimerByLongClick"
         const val KEY_SHOW_RECORD_TAG_SELECTION = "showRecordTagSelection"
         const val KEY_SHOW_RECORD_TAG_SELECTION_EXCLUDE_ACTIVITIES = "showRecordTagSelectionExcludeActivities"
         const val KEY_SHOW_COMMENT_INPUT = "showCommentInput"

domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt

@@ -715,6 +715,14 @@ class PrefsInteractor @Inject constructor(
         prefsRepo.keepScreenOn = keep
     }
 
+    suspend fun getStartTimerByLongClick(): Boolean = withContext(Dispatchers.IO) {
+        prefsRepo.startTimerByLongClick
+    }
+
+    suspend fun setStartTimerByLongClick(enabled: Boolean) = withContext(Dispatchers.IO) {
+        prefsRepo.startTimerByLongClick = enabled
+    }
+
     suspend fun getShowRecordTagSelection(): Boolean = withContext(Dispatchers.IO) {
         prefsRepo.showRecordTagSelection
     }

domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/repo/PrefsRepo.kt

@@ -144,6 +144,8 @@ interface PrefsRepo {
 
     var keepScreenOn: Boolean
 
+    var startTimerByLongClick: Boolean
+
     var showRecordTagSelection: Boolean
 
     var recordTagSelectionCloseAfterOne: Boolean

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/recordType/RecordTypeAdapterDelegate.kt

@@ -4,13 +4,15 @@ import androidx.core.view.ViewCompat
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
 import com.example.util.simpletimetracker.feature_views.TransitionNames
 import com.example.util.simpletimetracker.feature_views.extension.dpToPx
+import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import com.example.util.simpletimetracker.feature_views.extension.setOnClickWith
 import com.example.util.simpletimetracker.feature_views.extension.setOnLongClick
 import com.example.util.simpletimetracker.feature_base_adapter.databinding.ItemRecordTypeLayoutBinding as Binding
 import com.example.util.simpletimetracker.feature_base_adapter.recordType.RecordTypeViewData as ViewData
 
 fun createRecordTypeAdapterDelegate(
     onItemClick: ((ViewData) -> Unit)? = null,
+    onItemClickWithData: ((ViewData, Pair<Any, String>) -> Unit)? = null,
     onItemLongClick: ((ViewData, Pair<Any, String>) -> Unit)? = null,
     withTransition: Boolean = false,
     transitionNamePrefix: String = TransitionNames.RECORD_TYPE,
@@ -38,6 +40,7 @@ fun createRecordTypeAdapterDelegate(
         itemIsComplete = item.isComplete
         getCheckmarkOutline().itemIsFiltered = item.itemIsFiltered
         onItemClick?.let { setOnClickWith(item, it) }
+        onItemClickWithData?.let { setOnClick { it(item, this to transitionName) } }
         onItemLongClick?.let { setOnLongClick { it(item, this to transitionName) } }
         if (withTransition) ViewCompat.setTransitionName(this, transitionName)
     }

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/recordTypeSuggestion/RecordTypeSuggestionAdapterDelegate.kt

@@ -16,11 +16,13 @@ import com.example.util.simpletimetracker.feature_base_adapter.recordTypeSuggest
 fun createRecordTypeSuggestionAdapterDelegate(
     type: ViewData.Type,
     onItemClick: ((BaseViewData) -> Unit)? = null,
+    onItemClickWithData: ((BaseViewData, Pair<Any, String>) -> Unit)? = null,
     onItemLongClick: ((BaseViewData, Pair<Any, String>) -> Unit)? = null,
     withTransition: Boolean = true,
 ): RecyclerAdapterDelegate {
     val baseAdapter = createRecordTypeAdapterDelegate(
         onItemClick = onItemClick,
+        onItemClickWithData = onItemClickWithData,
         onItemLongClick = onItemLongClick,
         withTransition = withTransition,
         transitionNamePrefix = TransitionNames.RECORD_TYPE_SUGGESTION,

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/recordWithHint/RecordWithHintAdapterDelegate.kt

@@ -2,12 +2,14 @@ package com.example.util.simpletimetracker.feature_base_adapter.recordWithHint
 
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.record.bindState
+import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import com.example.util.simpletimetracker.feature_views.extension.setOnLongClick
 import com.example.util.simpletimetracker.feature_base_adapter.databinding.ItemRecordWithHintLayoutBinding as Binding
 import com.example.util.simpletimetracker.feature_base_adapter.recordWithHint.RecordWithHintViewData as ViewData
 
 fun createRecordWithHintAdapterDelegate(
-    onItemLongClick: ((ViewData) -> Unit) = { _ -> },
+    onItemClick: (ViewData) -> Unit,
+    onItemLongClick: (ViewData) -> Unit,
 ) = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
     Binding::inflate,
 ) { binding, item, _ ->
@@ -16,6 +18,7 @@ fun createRecordWithHintAdapterDelegate(
         item as ViewData
 
         bindState(item.record)
+        setOnClick { onItemClick(item) }
         setOnLongClick { onItemLongClick(item) }
     }
 }

features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/interactor/RunningRecordsViewDataInteractor.kt

@@ -72,6 +72,7 @@ class RunningRecordsViewDataInteractor @Inject constructor(
         val isFiltersCollapsed = prefsInteractor.getIsActivityFiltersCollapsed()
         val isNavBarAtTheBottom = prefsInteractor.getIsNavBarAtTheBottom()
         val enableSearchOnMain = prefsInteractor.getEnableSearchOnMain()
+        val startTimersByLongClick = prefsInteractor.getStartTimerByLongClick()
         val goals = filterGoalsByDayOfWeekInteractor
             .execute(recordTypeGoalInteractor.getAllTypeGoals())
             .groupBy { it.idData.value }
@@ -102,10 +103,13 @@ class RunningRecordsViewDataInteractor @Inject constructor(
                     durationFormat = durationFormat,
                     useMilitaryTime = useMilitaryTime,
                     showSeconds = showSeconds,
+                    startTimersByLongClick = startTimersByLongClick,
                 )
             }
             runningRecords.isEmpty() -> {
-                listOf(mapper.mapToEmpty())
+                mapper.mapToEmpty(
+                    startTimersByLongClick = startTimersByLongClick,
+                ).let(::listOf)
             }
             else -> {
                 runningRecords
@@ -126,7 +130,9 @@ class RunningRecordsViewDataInteractor @Inject constructor(
                         )
                     }
                     .plus(
-                        mapper.mapToHasRunningRecords(),
+                        mapper.mapToHasRunningRecords(
+                            startTimersByLongLick = startTimersByLongClick,
+                        ),
                     )
             }
         }

features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/mapper/RunningRecordsViewDataMapper.kt

@@ -39,16 +39,35 @@ class RunningRecordsViewDataMapper @Inject constructor(
         )
     }
 
-    fun mapToEmpty(): ViewHolderType {
+    fun mapToEmpty(
+        startTimersByLongClick: Boolean,
+    ): ViewHolderType {
+        val titleResId = if (!startTimersByLongClick) {
+            R.string.running_records_empty
+        } else {
+            R.string.running_records_empty_inverted
+        }
+        val hintResId = if (!startTimersByLongClick) {
+            R.string.running_records_empty_hint
+        } else {
+            R.string.running_records_empty_hint_inverted
+        }
         return EmptyViewData(
-            message = R.string.running_records_empty.let(resourceRepo::getString),
-            hint = R.string.running_records_empty_hint.let(resourceRepo::getString),
+            message = resourceRepo.getString(titleResId),
+            hint = resourceRepo.getString(hintResId),
         )
     }
 
-    fun mapToHasRunningRecords(): ViewHolderType {
+    fun mapToHasRunningRecords(
+        startTimersByLongLick: Boolean,
+    ): ViewHolderType {
+        val resId = if (!startTimersByLongLick) {
+            R.string.running_records_has_timers
+        } else {
+            R.string.running_records_has_timers_inverted
+        }
         return HintViewData(
-            text = R.string.running_records_has_timers.let(resourceRepo::getString),
+            text = resourceRepo.getString(resId),
             paddingTop = 0,
             paddingBottom = 0,
         )
@@ -63,13 +82,19 @@ class RunningRecordsViewDataMapper @Inject constructor(
         durationFormat: DurationFormat,
         useMilitaryTime: Boolean,
         showSeconds: Boolean,
+        startTimersByLongClick: Boolean,
     ): List<ViewHolderType> {
         val result = mutableListOf<ViewHolderType>()
 
         if (prevRecords.isEmpty()) {
+            val hintResId = if (!startTimersByLongClick) {
+                R.string.running_records_empty_hint
+            } else {
+                R.string.running_records_empty_hint_inverted
+            }
             result += EmptyViewData(
                 message = resourceRepo.getString(R.string.retroactive_tracking_mode_hint),
-                hint = R.string.running_records_empty_hint.let(resourceRepo::getString),
+                hint = resourceRepo.getString(hintResId),
             )
         }
 

features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/view/RunningRecordsFragment.kt

@@ -78,16 +78,17 @@ class RunningRecordsFragment :
                 onItemLongClick = viewModel::onRunningRecordLongClick,
             ),
             createRecordTypeAdapterDelegate(
-                onItemClick = viewModel::onRecordTypeClick,
+                onItemClickWithData = viewModel::onRecordTypeClick,
                 onItemLongClick = viewModel::onRecordTypeLongClick,
                 withTransition = true,
             ),
             createRecordTypeSuggestionAdapterDelegate(
                 type = RecordTypeSuggestionType,
-                onItemClick = viewModel::onRecordTypeClick,
+                onItemClickWithData = viewModel::onRecordTypeClick,
                 onItemLongClick = viewModel::onRecordTypeLongClick,
             ),
             createRecordWithHintAdapterDelegate(
+                onItemClick = throttle(viewModel::onRecordClick),
                 onItemLongClick = throttle(viewModel::onRecordLongClick),
             ),
             createRecordShortcutAdapterDelegate(