shortcuts screen

Razeeman · Razeeman · commit c96c8226fe89 · 2026-03-14T11:32:42.000+03:00
diff --git a/README.md b/README.md
@@ -128,6 +128,7 @@
     │   ├── feature_records_filter            # Dialog for records filters.
     │   ├── feature_running_records           # One of main tabs, timers.
     │   ├── feature_settings                  # One of main tabs, settings.
+    │   ├── feature_shortcuts                 # Screen for all shortcuts.
     │   ├── feature_statistics                # One of main tabs, statistics.
     │   ├── feature_statistics_detail         # Screen showing detailed statistics.
     │   ├── feature_suggestions               # Screen for activity suggestions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -127,6 +127,7 @@ dependencies {
     implementation(project(":feature_pomodoro"))
     implementation(project(":feature_complex_rules"))
     implementation(project(":feature_suggestions"))
+    implementation(project(":feature_shortcuts"))
     implementation(project(":feature_change_complex_rule"))
     implementation(project(":feature_change_goals"))
     implementation(project(":feature_change_goals:api"))
diff --git a/app/src/main/java/com/example/util/simpletimetracker/di/NavigationScreenMapModule.kt b/app/src/main/java/com/example/util/simpletimetracker/di/NavigationScreenMapModule.kt
@@ -14,6 +14,7 @@ import com.example.util.simpletimetracker.navigation.NavigationData
 import com.example.util.simpletimetracker.navigation.bundleCreator.BundleCreator
 import com.example.util.simpletimetracker.navigation.bundleCreator.bundleCreatorDelegate
 import com.example.util.simpletimetracker.navigation.params.screen.ActivitySuggestionsParams
+import com.example.util.simpletimetracker.navigation.params.screen.ShortcutsParams
 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.ChangeActivityFilterParams
@@ -173,6 +174,16 @@ class NavigationScreenMapModule {
         )
     }
 
+    @IntoMap
+    @Provides
+    @ScreenKey(ShortcutsParams::class)
+    fun shortcuts(): NavigationData {
+        return NavigationData(
+            R.id.action_to_shortcutsFragment,
+            BundleCreator.empty(),
+        )
+    }
+
     @IntoMap
     @Provides
     @ScreenKey(ChangeCategoryFromTagsParams::class)
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
@@ -45,6 +45,14 @@
         app:popEnterAnim="@anim/slide_in_left"
         app:popExitAnim="@anim/slide_out_right" />
 
+    <action
+        android:id="@+id/action_to_shortcutsFragment"
+        app:destination="@id/shortcutsFragment"
+        app:enterAnim="@anim/slide_in_right"
+        app:exitAnim="@anim/slide_out_left"
+        app:popEnterAnim="@anim/slide_in_left"
+        app:popExitAnim="@anim/slide_out_right" />
+
     <action
         android:id="@+id/action_to_statisticsDetailFragment"
         app:destination="@id/statisticsDetailFragment"
@@ -233,6 +241,11 @@
         android:name="com.example.util.simpletimetracker.feature_suggestions.view.ActivitySuggestionsFragment"
         android:label="ActivitySuggestionsFragment"
         tools:layout="@layout/activity_suggestions_fragment" />
+    <fragment
+        android:id="@+id/shortcutsFragment"
+        android:name="com.example.util.simpletimetracker.feature_shortcuts.view.ShortcutsFragment"
+        android:label="ShortcutsFragment"
+        tools:layout="@layout/shortcuts_fragment" />
     <fragment
         android:id="@+id/changeComplexRuleFragment"
         android:name="com.example.util.simpletimetracker.feature_change_complex_rule.view.ChangeComplexRuleFragment"
diff --git a/features/feature_settings/api/src/main/java/com/example/util/simpletimetracker/feature_settings/api/SettingsBlock.kt b/features/feature_settings/api/src/main/java/com/example/util/simpletimetracker/feature_settings/api/SettingsBlock.kt
@@ -90,6 +90,7 @@ enum class SettingsBlock {
     AdditionalDataEdit,
     AdditionalComplexRules,
     AdditionalActivitySuggestions,
+    AdditionalShortcuts,
     AdditionalBottom,
 
     BackupTop,
diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsAdditionalViewDataInteractor.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsAdditionalViewDataInteractor.kt
@@ -202,6 +202,11 @@ class SettingsAdditionalViewDataInteractor @Inject constructor(
                 block = SettingsBlock.AdditionalActivitySuggestions,
                 title = resourceRepo.getString(R.string.settings_activity_suggestions),
                 subtitle = "",
+            )
+            result += SettingsTextViewData(
+                block = SettingsBlock.AdditionalShortcuts,
+                title = resourceRepo.getString(R.string.change_record_shortcut),
+                subtitle = "",
                 dividerIsVisible = false,
             )
         }
diff --git a/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsAdditionalViewModelDelegate.kt b/features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsAdditionalViewModelDelegate.kt
@@ -20,6 +20,7 @@ import com.example.util.simpletimetracker.feature_settings.mapper.SettingsMapper
 import com.example.util.simpletimetracker.feature_settings.viewModel.SettingsViewModel
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.ActivitySuggestionsParams
+import com.example.util.simpletimetracker.navigation.params.screen.ShortcutsParams
 import com.example.util.simpletimetracker.navigation.params.screen.ComplexRulesParams
 import com.example.util.simpletimetracker.navigation.params.screen.DataEditParams
 import com.example.util.simpletimetracker.navigation.params.screen.DurationDialogParams
@@ -78,6 +79,7 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
             SettingsBlock.AdditionalDataEdit -> onDataEditClick()
             SettingsBlock.AdditionalComplexRules -> onComplexRulesClick()
             SettingsBlock.AdditionalActivitySuggestions -> onActivitySuggestionsClick()
+            SettingsBlock.AdditionalShortcuts -> onShortcutsClick()
             else -> {
                 // Do nothing
             }
@@ -309,6 +311,10 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
         router.navigate(ActivitySuggestionsParams)
     }
 
+    private fun onShortcutsClick() {
+        router.navigate(ShortcutsParams)
+    }
+
     private fun onAutomatedTrackingHelpClick() {
         delegateScope.launch {
             val isDarkTheme = prefsInteractor.getDarkMode()
diff --git a/features/feature_shortcuts/.gitignore b/features/feature_shortcuts/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/features/feature_shortcuts/build.gradle.kts b/features/feature_shortcuts/build.gradle.kts
@@ -0,0 +1,22 @@
+import com.example.util.simpletimetracker.Base
+import com.example.util.simpletimetracker.applyAndroidLibrary
+
+plugins {
+    alias(libs.plugins.gradleLibrary)
+    alias(libs.plugins.kotlin)
+    alias(libs.plugins.kotlinParcelize)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.hilt)
+}
+
+applyAndroidLibrary()
+
+android {
+    namespace = "${Base.namespace}.feature_shortcuts"
+}
+
+dependencies {
+    implementation(project(":core"))
+    implementation(libs.google.dagger)
+    ksp(libs.kapt.dagger)
+}
diff --git a/features/feature_shortcuts/src/main/AndroidManifest.xml b/features/feature_shortcuts/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application android:theme="@style/AppTheme" />
+
+</manifest>
diff --git a/features/feature_shortcuts/src/main/java/com/example/util/simpletimetracker/feature_shortcuts/interactor/ShortcutsViewDataInteractor.kt b/features/feature_shortcuts/src/main/java/com/example/util/simpletimetracker/feature_shortcuts/interactor/ShortcutsViewDataInteractor.kt
@@ -0,0 +1,62 @@
+package com.example.util.simpletimetracker.feature_shortcuts.interactor
+
+import com.example.util.simpletimetracker.core.mapper.RecordShortcutViewDataMapper
+import com.example.util.simpletimetracker.core.repo.ResourceRepo
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.recordShortcut.interactor.RecordShortcutInteractor
+import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
+import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
+import com.example.util.simpletimetracker.feature_base_adapter.empty.EmptyViewData
+import com.example.util.simpletimetracker.feature_base_adapter.emptySpace.EmptySpaceViewData
+import com.example.util.simpletimetracker.feature_shortcuts.R
+import javax.inject.Inject
+
+class ShortcutsViewDataInteractor @Inject constructor(
+    private val resourceRepo: ResourceRepo,
+    private val prefsInteractor: PrefsInteractor,
+    private val recordTypeInteractor: RecordTypeInteractor,
+    private val recordTagInteractor: RecordTagInteractor,
+    private val recordShortcutInteractor: RecordShortcutInteractor,
+    private val recordShortcutViewDataMapper: RecordShortcutViewDataMapper,
+) {
+
+    suspend fun getViewData(
+        navBarHeightDp: Int,
+    ): List<ViewHolderType> {
+        val isDarkTheme = prefsInteractor.getDarkMode()
+        val recordTypesMap = recordTypeInteractor.getAll().associateBy { it.id }
+        val recordTags = recordTagInteractor.getAll()
+        val shortcuts = recordShortcutInteractor.getAll()
+
+        val content = shortcuts.mapNotNull { shortcut ->
+            val recordType = recordTypesMap[shortcut.typeId] ?: return@mapNotNull null
+            recordShortcutViewDataMapper.map(
+                shortcut = shortcut,
+                recordType = recordType,
+                recordTags = recordTags,
+                isDarkTheme = isDarkTheme,
+                isFiltered = false,
+            )
+        }
+
+        val result = content.ifEmpty { mapEmptyData() }
+
+        val bottomSpace = EmptySpaceViewData(
+            id = "shortcuts_nav_bar_space".hashCode().toLong(),
+            height = EmptySpaceViewData.ViewDimension.ExactSizeDp(navBarHeightDp),
+            wrapBefore = true,
+        )
+
+        return result + bottomSpace
+    }
+
+    private fun mapEmptyData(): List<ViewHolderType> {
+        return listOf(
+            EmptyViewData(
+                message = resourceRepo.getString(R.string.no_data),
+                hint = "",
+            ),
+        )
+    }
+}
diff --git a/features/feature_shortcuts/src/main/java/com/example/util/simpletimetracker/feature_shortcuts/view/ShortcutsFragment.kt b/features/feature_shortcuts/src/main/java/com/example/util/simpletimetracker/feature_shortcuts/view/ShortcutsFragment.kt
@@ -0,0 +1,64 @@
+package com.example.util.simpletimetracker.feature_shortcuts.view
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import com.example.util.simpletimetracker.core.base.BaseFragment
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
+import com.example.util.simpletimetracker.core.utils.doOnApplyWindowInsetsListener
+import com.example.util.simpletimetracker.core.utils.getNavBarInsets
+import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
+import com.example.util.simpletimetracker.feature_base_adapter.empty.createEmptyAdapterDelegate
+import com.example.util.simpletimetracker.feature_base_adapter.emptySpace.createEmptySpaceAdapterDelegate
+import com.example.util.simpletimetracker.feature_base_adapter.loader.createLoaderAdapterDelegate
+import com.example.util.simpletimetracker.feature_base_adapter.recordShortcut.createRecordShortcutAdapterDelegate
+import com.example.util.simpletimetracker.feature_shortcuts.viewModel.ShortcutsViewModel
+import com.example.util.simpletimetracker.feature_views.extension.pxToDp
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
+import dagger.hilt.android.AndroidEntryPoint
+import com.example.util.simpletimetracker.feature_shortcuts.databinding.ShortcutsFragmentBinding as Binding
+
+@AndroidEntryPoint
+class ShortcutsFragment : BaseFragment<Binding>() {
+
+    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
+        Binding::inflate
+
+    override var insetConfiguration: InsetConfiguration =
+        InsetConfiguration.DoNotApply
+
+    private val viewModel: ShortcutsViewModel by viewModels()
+
+    private val adapter: BaseRecyclerAdapter by lazy {
+        BaseRecyclerAdapter(
+            createEmptySpaceAdapterDelegate(),
+            createLoaderAdapterDelegate(),
+            createEmptyAdapterDelegate(),
+            createRecordShortcutAdapterDelegate(
+                onItemClick = {},
+            ),
+        )
+    }
+
+    override fun initUi(): Unit = with(binding) {
+        rvShortcutsList.apply {
+            layoutManager = FlexboxLayoutManager(requireContext()).apply {
+                flexDirection = FlexDirection.ROW
+                justifyContent = JustifyContent.CENTER
+                flexWrap = FlexWrap.WRAP
+            }
+            adapter = this@ShortcutsFragment.adapter
+        }
+
+        view?.doOnApplyWindowInsetsListener {
+            viewModel.onChangeInsets(navBarHeight = it.getNavBarInsets().bottom.pxToDp())
+        }
+    }
+
+    override fun initViewModel(): Unit = with(viewModel) {
+        viewData.observe(adapter::replace)
+    }
+}
diff --git a/features/feature_shortcuts/src/main/java/com/example/util/simpletimetracker/feature_shortcuts/viewModel/ShortcutsViewModel.kt b/features/feature_shortcuts/src/main/java/com/example/util/simpletimetracker/feature_shortcuts/viewModel/ShortcutsViewModel.kt
@@ -0,0 +1,38 @@
+package com.example.util.simpletimetracker.feature_shortcuts.viewModel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.viewModelScope
+import com.example.util.simpletimetracker.core.base.BaseViewModel
+import com.example.util.simpletimetracker.core.extension.lazySuspend
+import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
+import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData
+import com.example.util.simpletimetracker.feature_shortcuts.interactor.ShortcutsViewDataInteractor
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class ShortcutsViewModel @Inject constructor(
+    private val shortcutsViewDataInteractor: ShortcutsViewDataInteractor,
+) : BaseViewModel() {
+
+    val viewData: LiveData<List<ViewHolderType>> by lazySuspend {
+        listOf(LoaderViewData()).also { updateViewData() }
+    }
+
+    private var navBarHeightDp: Int = 0
+
+    fun onChangeInsets(navBarHeight: Int) {
+        if (navBarHeightDp != navBarHeight) {
+            navBarHeightDp = navBarHeight
+            updateViewData()
+        }
+    }
+
+    private fun updateViewData() = viewModelScope.launch {
+        val data = shortcutsViewDataInteractor.getViewData(navBarHeightDp)
+        delayLoad()
+        viewData.set(data)
+    }
+}
diff --git a/features/feature_shortcuts/src/main/res/layout/shortcuts_fragment.xml b/features/feature_shortcuts/src/main/res/layout/shortcuts_fragment.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tvShortcutsTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="12dp"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        android:paddingHorizontal="16dp"
+        android:text="@string/change_record_shortcut"
+        android:textColor="?appTextPrimaryColor"
+        android:textSize="22sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tvShortcutsHint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="12dp"
+        android:gravity="center"
+        android:text="@string/change_record_shortcut_hint"
+        android:textColor="?appTextHintColor"
+        app:layout_constraintTop_toBottomOf="@id/tvShortcutsTitle" />
+
+    <com.example.util.simpletimetracker.feature_views.DividerFullView
+        android:id="@+id/dividerShortcuts"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tvShortcutsHint" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvShortcutsList"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingTop="6dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/dividerShortcuts"
+        tools:listitem="@layout/item_record_shortcut_layout" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/ShortcutsParams.kt b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/ShortcutsParams.kt
@@ -0,0 +1,3 @@
+package com.example.util.simpletimetracker.navigation.params.screen
+
+object ShortcutsParams : ScreenParams

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,11 @@ class SettingsAdditionalViewDataInteractor @Inject constructor(`
`202`	`202`	`block = SettingsBlock.AdditionalActivitySuggestions,`
`203`	`203`	`title = resourceRepo.getString(R.string.settings_activity_suggestions),`
`204`	`204`	`subtitle = "",`
	`205`	`+ )`
	`206`	`+ result += SettingsTextViewData(`
	`207`	`+ block = SettingsBlock.AdditionalShortcuts,`
	`208`	`+ title = resourceRepo.getString(R.string.change_record_shortcut),`
	`209`	`+ subtitle = "",`
`205`	`210`	`dividerIsVisible = false,`
`206`	`211`	`)`
`207`	`212`	`}`