add more shortcut settings

Razeeman · Razeeman · commit 0097e118a199 · 2026-04-04T19:30:23.000+03:00
diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/ShortcutsTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/ShortcutsTest.kt
@@ -159,24 +159,67 @@ class ShortcutsTest : BaseUiTest() {
     @Test
     fun changeSetting() {
         val name = "name"
-        val settingShortcutName = getString(coreR.string.settings_retroactive_tracking_mode)
+        val multitaskingShortcutName = getString(coreR.string.settings_allow_multitasking)
+        val retroactiveSettingShortcutName = getString(coreR.string.settings_retroactive_tracking_mode)
+        val categoriesShortcutName = getString(coreR.string.categories_title)
+        val archiveShortcutName = getString(coreR.string.settings_archive)
+        val dataEditShortcutName = getString(coreR.string.settings_data_edit)
 
         // Add data
+        runBlocking {
+            prefsInteractor.setAllowMultitasking(false)
+            prefsInteractor.setRetroactiveMultitaskingHintWasHidden(true)
+        }
         testUtils.addActivity(name)
+        testUtils.addSettingShortcut(RecordShortcut.SettingAction.Multitasking)
         testUtils.addSettingShortcut(RecordShortcut.SettingAction.RetroactiveMode)
+        testUtils.addSettingShortcut(RecordShortcut.SettingAction.Categories)
+        testUtils.addSettingShortcut(RecordShortcut.SettingAction.Archive)
+        testUtils.addSettingShortcut(RecordShortcut.SettingAction.DataEdit)
         Thread.sleep(1000)
 
         // Check shortcuts
         tryAction {
-            checkSettingShortcut(name = settingShortcutName, isEnabled = false)
+            checkSettingShortcut(name = multitaskingShortcutName, isEnabled = false)
+            checkSettingShortcut(name = retroactiveSettingShortcutName, isEnabled = false)
+            checkSettingShortcut(name = categoriesShortcutName, isEnabled = false)
+            checkSettingShortcut(name = archiveShortcutName, isEnabled = false)
+            checkSettingShortcut(name = dataEditShortcutName, isEnabled = false)
         }
 
-        // Start
-        clickOnViewWithText(settingShortcutName)
-        checkSettingShortcut(name = settingShortcutName, isEnabled = true)
+        // Multitasking
+        clickOnView(allOf(withText(multitaskingShortcutName), isCompletelyDisplayed()))
+        Thread.sleep(500) // Because of throttling
+        checkSettingShortcut(name = multitaskingShortcutName, isEnabled = true)
+
+        // Retroactive
+        clickOnView(allOf(withText(retroactiveSettingShortcutName), isCompletelyDisplayed()))
+        Thread.sleep(500) // Because of throttling
+        checkSettingShortcut(name = retroactiveSettingShortcutName, isEnabled = true)
         tryAction {
             checkViewIsDisplayed(withText(R.string.retroactive_tracking_mode_hint))
         }
+
+        // Categories
+        clickOnView(allOf(withText(categoriesShortcutName), isCompletelyDisplayed()))
+        tryAction {
+            checkViewIsDisplayed(withText(coreR.string.categories_record_type_hint))
+        }
+        pressBack()
+
+        // Archive
+        clickOnView(allOf(withText(archiveShortcutName), isCompletelyDisplayed()))
+        tryAction {
+            checkViewIsDisplayed(withText(coreR.string.archive_empty))
+        }
+        pressBack()
+
+        // Data edit
+        clickOnView(allOf(withText(dataEditShortcutName), isCompletelyDisplayed()))
+        tryAction {
+            checkViewIsDisplayed(withText(coreR.string.data_edit_select_records))
+        }
+        pressBack()
     }
 
     @Suppress("SameParameterValue")
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/IsSettingShortcutEnabledInteractor.kt b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/IsSettingShortcutEnabledInteractor.kt
@@ -18,6 +18,10 @@ class IsSettingShortcutEnabledInteractor @Inject constructor(
             RecordShortcut.SettingAction.RetroactiveMode -> {
                 prefsInteractor.getRetroactiveTrackingMode()
             }
+            RecordShortcut.SettingAction.Categories,
+            RecordShortcut.SettingAction.Archive,
+            RecordShortcut.SettingAction.DataEdit,
+            -> false
         }
     }
 }
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/OnSettingsShortcutClickInteractor.kt b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/OnSettingsShortcutClickInteractor.kt
@@ -5,9 +5,14 @@ import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteracto
 import com.example.util.simpletimetracker.domain.record.interactor.RemoveRunningRecordMediator
 import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor
 import com.example.util.simpletimetracker.domain.recordShortcut.model.RecordShortcut
+import com.example.util.simpletimetracker.navigation.Router
+import com.example.util.simpletimetracker.navigation.params.screen.ArchiveParams
+import com.example.util.simpletimetracker.navigation.params.screen.CategoriesParams
+import com.example.util.simpletimetracker.navigation.params.screen.DataEditParams
 import javax.inject.Inject
 
 class OnSettingsShortcutClickInteractor @Inject constructor(
+    private val router: Router,
     private val prefsInteractor: PrefsInteractor,
     private val runningRecordInteractor: RunningRecordInteractor,
     private val removeRunningRecordMediator: RemoveRunningRecordMediator,
@@ -26,6 +31,15 @@ class OnSettingsShortcutClickInteractor @Inject constructor(
                 prefsInteractor.setRetroactiveTrackingMode(newValue)
                 onRetroactiveTrackingModeChange()
             }
+            RecordShortcut.SettingAction.Categories -> {
+                router.navigate(CategoriesParams)
+            }
+            RecordShortcut.SettingAction.Archive -> {
+                router.navigate(ArchiveParams)
+            }
+            RecordShortcut.SettingAction.DataEdit -> {
+                router.navigate(DataEditParams)
+            }
         }
     }
 
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordShortcutViewDataMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordShortcutViewDataMapper.kt
@@ -53,6 +53,9 @@ class RecordShortcutViewDataMapper @Inject constructor(
         return when (action) {
             RecordShortcut.SettingAction.Multitasking -> R.string.settings_allow_multitasking
             RecordShortcut.SettingAction.RetroactiveMode -> R.string.settings_retroactive_tracking_mode
+            RecordShortcut.SettingAction.Categories -> R.string.categories_title
+            RecordShortcut.SettingAction.Archive -> R.string.settings_archive
+            RecordShortcut.SettingAction.DataEdit -> R.string.settings_data_edit
         }.let(resourceRepo::getString)
     }
 
diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/recordShortcut/RecordShortcutDataLocalMapper.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/recordShortcut/RecordShortcutDataLocalMapper.kt
@@ -57,6 +57,9 @@ class RecordShortcutDataLocalMapper @Inject constructor() {
         return when (dbo) {
             0L -> RecordShortcut.SettingAction.Multitasking
             1L -> RecordShortcut.SettingAction.RetroactiveMode
+            2L -> RecordShortcut.SettingAction.Categories
+            3L -> RecordShortcut.SettingAction.Archive
+            4L -> RecordShortcut.SettingAction.DataEdit
             else -> RecordShortcut.SettingAction.Multitasking
         }
     }
@@ -65,6 +68,9 @@ class RecordShortcutDataLocalMapper @Inject constructor() {
         return when (domain) {
             RecordShortcut.SettingAction.Multitasking -> 0L
             RecordShortcut.SettingAction.RetroactiveMode -> 1L
+            RecordShortcut.SettingAction.Categories -> 2L
+            RecordShortcut.SettingAction.Archive -> 3L
+            RecordShortcut.SettingAction.DataEdit -> 4L
         }
     }
 }
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/recordShortcut/interactor/RecordShortcutInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/recordShortcut/interactor/RecordShortcutInteractor.kt
@@ -51,6 +51,9 @@ class RecordShortcutInteractor @Inject constructor(
         return listOf(
             RecordShortcut.SettingAction.Multitasking,
             RecordShortcut.SettingAction.RetroactiveMode,
+            RecordShortcut.SettingAction.Categories,
+            RecordShortcut.SettingAction.Archive,
+            RecordShortcut.SettingAction.DataEdit,
         )
     }
 
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/recordShortcut/model/RecordShortcut.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/recordShortcut/model/RecordShortcut.kt
@@ -33,5 +33,8 @@ data class RecordShortcut(
     enum class SettingAction {
         Multitasking,
         RetroactiveMode,
+        Categories,
+        Archive,
+        DataEdit,
     }
 }
diff --git a/features/feature_change_shortcut/src/main/java/com/example/util/simpletimetracker/feature_change_shortcut/viewModel/ChangeShortcutViewModel.kt b/features/feature_change_shortcut/src/main/java/com/example/util/simpletimetracker/feature_change_shortcut/viewModel/ChangeShortcutViewModel.kt
@@ -200,7 +200,6 @@ class ChangeShortcutViewModel @Inject constructor(
 
     // TODO move tag to delegates
     // TODO add ShortcutView and replace preview with it, so hint would be visible
-    // TODO add more settings
     fun onSaveClick() {
         val target = buildTarget() ?: return
         saveButtonEnabled.set(false)

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,10 @@ class IsSettingShortcutEnabledInteractor @Inject constructor(`
`18`	`18`	`RecordShortcut.SettingAction.RetroactiveMode -> {`
`19`	`19`	`prefsInteractor.getRetroactiveTrackingMode()`
`20`	`20`	`}`
	`21`	`+ RecordShortcut.SettingAction.Categories,`
	`22`	`+ RecordShortcut.SettingAction.Archive,`
	`23`	`+ RecordShortcut.SettingAction.DataEdit,`
	`24`	`+ -> false`
`21`	`25`	`}`
`22`	`26`	`}`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@ class RecordShortcutViewDataMapper @Inject constructor(`
`53`	`53`	`return when (action) {`
`54`	`54`	`RecordShortcut.SettingAction.Multitasking -> R.string.settings_allow_multitasking`
`55`	`55`	`RecordShortcut.SettingAction.RetroactiveMode -> R.string.settings_retroactive_tracking_mode`
	`56`	`+ RecordShortcut.SettingAction.Categories -> R.string.categories_title`
	`57`	`+ RecordShortcut.SettingAction.Archive -> R.string.settings_archive`
	`58`	`+ RecordShortcut.SettingAction.DataEdit -> R.string.settings_data_edit`
`56`	`59`	`}.let(resourceRepo::getString)`
`57`	`60`	`}`
`58`	`61`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@ class RecordShortcutDataLocalMapper @Inject constructor() {`
`57`	`57`	`return when (dbo) {`
`58`	`58`	`0L -> RecordShortcut.SettingAction.Multitasking`
`59`	`59`	`1L -> RecordShortcut.SettingAction.RetroactiveMode`
	`60`	`+ 2L -> RecordShortcut.SettingAction.Categories`
	`61`	`+ 3L -> RecordShortcut.SettingAction.Archive`
	`62`	`+ 4L -> RecordShortcut.SettingAction.DataEdit`
`60`	`63`	`else -> RecordShortcut.SettingAction.Multitasking`
`61`	`64`	`}`
`62`	`65`	`}`
`@@ -65,6 +68,9 @@ class RecordShortcutDataLocalMapper @Inject constructor() {`
`65`	`68`	`return when (domain) {`
`66`	`69`	`RecordShortcut.SettingAction.Multitasking -> 0L`
`67`	`70`	`RecordShortcut.SettingAction.RetroactiveMode -> 1L`
	`71`	`+ RecordShortcut.SettingAction.Categories -> 2L`
	`72`	`+ RecordShortcut.SettingAction.Archive -> 3L`
	`73`	`+ RecordShortcut.SettingAction.DataEdit -> 4L`
`68`	`74`	`}`
`69`	`75`	`}`
`70`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ class RecordShortcutInteractor @Inject constructor(`
`51`	`51`	`return listOf(`
`52`	`52`	`RecordShortcut.SettingAction.Multitasking,`
`53`	`53`	`RecordShortcut.SettingAction.RetroactiveMode,`
	`54`	`+ RecordShortcut.SettingAction.Categories,`
	`55`	`+ RecordShortcut.SettingAction.Archive,`
	`56`	`+ RecordShortcut.SettingAction.DataEdit,`
`54`	`57`	`)`
`55`	`58`	`}`
`56`	`59`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,8 @@ data class RecordShortcut(`
`33`	`33`	`enum class SettingAction {`
`34`	`34`	`Multitasking,`
`35`	`35`	`RetroactiveMode,`
	`36`	`+ Categories,`
	`37`	`+ Archive,`
	`38`	`+ DataEdit,`
`36`	`39`	`}`
`37`	`40`	`}`