add activity suggestions module

Razeeman · Dec 30, 2024 · b301eac · b301eac
1 parent b408f93
commit b301eac
Show file tree

Hide file tree

Showing 34 changed files with 870 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -100,6 +100,7 @@ Simple app that helps track how much time you spend on all the useless activitie
     │   ├── feature_settings                  # One of main tabs, settings.
     │   ├── feature_statistics                # One of main tabs, statistics.
     │   ├── feature_statistics_detail         # Screen showing detailed statistics.
+    │   ├── feature_suggestions               # Screen for activity suggestions.
     │   ├── feature_tag_selection             # Screen for selecting tags.
     │   ├── feature_views                     # Custom views.
     │   ├── feature_wear                      # Phone app logic to connect to wear app.

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -109,6 +109,7 @@ dependencies {
     implementation(project(":feature_goals"))
     implementation(project(":feature_pomodoro"))
     implementation(project(":feature_complex_rules"))
+    implementation(project(":feature_suggestions"))
     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
@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.view.Statist
 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.ArchiveParams
 import com.example.util.simpletimetracker.navigation.params.screen.CategoriesParams
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeActivityFilterParams
@@ -162,6 +163,16 @@ class NavigationScreenMapModule {
         )
     }
 
+    @IntoMap
+    @Provides
+    @ScreenKey(ActivitySuggestionsParams::class)
+    fun activitySuggestions(): NavigationData {
+        return NavigationData(
+            R.id.action_to_activitySuggestionsFragment,
+            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
@@ -37,6 +37,14 @@
         app:popEnterAnim="@anim/slide_in_left"
         app:popExitAnim="@anim/slide_out_right" />
 
+    <action
+        android:id="@+id/action_to_activitySuggestionsFragment"
+        app:destination="@id/activitySuggestionsFragment"
+        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"
@@ -210,8 +218,13 @@
     <fragment
         android:id="@+id/complexRulesFragment"
         android:name="com.example.util.simpletimetracker.feature_complex_rules.view.ComplexRulesFragment"
-        android:label="DataEditFragment"
+        android:label="ComplexRulesFragment"
         tools:layout="@layout/complex_rules_fragment" />
+    <fragment
+        android:id="@+id/activitySuggestionsFragment"
+        android:name="com.example.util.simpletimetracker.feature_suggestions.view.ActivitySuggestionsFragment"
+        android:label="ActivitySuggestionsFragment"
+        tools:layout="@layout/activity_suggestions_fragment" />
     <fragment
         android:id="@+id/changeComplexRuleFragment"
         android:name="com.example.util.simpletimetracker.feature_change_complex_rule.view.ChangeComplexRuleFragment"

diff --git a/.../src/main/java/com/example/util/simpletimetracker/core/mapper/RecordTypeViewDataMapper.kt b/.../src/main/java/com/example/util/simpletimetracker/core/mapper/RecordTypeViewDataMapper.kt
@@ -6,6 +6,7 @@ import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.interactor.GetCurrentRecordsDurationInteractor
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.recordType.extension.getDaily
+import com.example.util.simpletimetracker.domain.extension.orFalse
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.recordType.extension.value
 import com.example.util.simpletimetracker.domain.color.model.AppColor
@@ -95,7 +96,7 @@ class RecordTypeViewDataMapper @Inject constructor(
     }
 
     fun mapToAddItem(
-        numberOfCards: Int,
+        numberOfCards: Int?,
         isDarkTheme: Boolean,
     ): RunningRecordTypeSpecialViewData {
         return mapToSpecial(
@@ -209,7 +210,7 @@ class RecordTypeViewDataMapper @Inject constructor(
         type: RunningRecordTypeSpecialViewData.Type,
         @StringRes name: Int,
         icon: RecordTypeIcon,
-        numberOfCards: Int,
+        numberOfCards: Int?, // TODO SUG revert?
         isDarkTheme: Boolean,
         checkState: GoalCheckmarkView.CheckState,
     ): RunningRecordTypeSpecialViewData {
@@ -218,9 +219,9 @@ class RecordTypeViewDataMapper @Inject constructor(
             name = name.let(resourceRepo::getString),
             iconId = icon,
             color = colorMapper.toInactiveColor(isDarkTheme),
-            width = recordTypeCardSizeMapper.toCardWidth(numberOfCards),
-            height = recordTypeCardSizeMapper.toCardHeight(numberOfCards),
-            asRow = recordTypeCardSizeMapper.toCardAsRow(numberOfCards),
+            width = numberOfCards?.let(recordTypeCardSizeMapper::toCardWidth),
+            height = numberOfCards?.let(recordTypeCardSizeMapper::toCardHeight),
+            asRow = numberOfCards?.let(recordTypeCardSizeMapper::toCardAsRow).orFalse(),
             checkState = checkState,
         )
     }

diff --git a/.../util/simpletimetracker/domain/record/interactor/CalculateAdjacentActivitiesInteractor.kt b/.../util/simpletimetracker/domain/record/interactor/CalculateAdjacentActivitiesInteractor.kt
@@ -12,6 +12,7 @@ class CalculateAdjacentActivitiesInteractor @Inject constructor() {
     fun calculateNextActivities(
         typeIds: List<Long>,
         records: List<Record>,
+        maxCount: Int,
     ): Map<Long, List<CalculationResult>> {
         val counts = mutableMapOf<Long, MutableMap<Long, Long>>()
         val recordsSorted = records.sortedBy { it.timeStarted }
@@ -40,7 +41,7 @@ class CalculateAdjacentActivitiesInteractor @Inject constructor() {
         return counts.mapValues { (_, counts) ->
             counts.keys
                 .sortedByDescending { counts[it].orZero() }
-                .take(MAX_COUNT)
+                .take(maxCount)
                 .map { CalculationResult(it, counts[it].orZero()) }
         }
     }
@@ -49,6 +50,7 @@ class CalculateAdjacentActivitiesInteractor @Inject constructor() {
     fun calculateMultitasking(
         typeId: Long,
         records: List<RecordBase>,
+        maxCount: Int,
     ): List<CalculationResult> {
         val counts = mutableMapOf<Long, Long>()
 
@@ -76,16 +78,12 @@ class CalculateAdjacentActivitiesInteractor @Inject constructor() {
 
         return counts.keys
             .sortedByDescending { counts[it].orZero() }
-            .take(MAX_COUNT)
+            .take(maxCount)
             .map { CalculationResult(it, counts[it].orZero()) }
     }
 
     data class CalculationResult(
         val typeId: Long,
         val count: Long,
     )
-
-    companion object {
-        private const val MAX_COUNT = 5
-    }
 }
diff --git a/...example/util/simpletimetracker/domain/mapper/CalculateAdjacentActivitiesInteractorTest.kt b/...example/util/simpletimetracker/domain/mapper/CalculateAdjacentActivitiesInteractorTest.kt
@@ -23,6 +23,7 @@ class CalculateAdjacentActivitiesInteractorTest(
         val actual = subject.calculateNextActivities(
             typeIds = input.first,
             records = input.second,
+            maxCount = 5,
         )
 
         assertEquals(

diff --git a/.../java/com/example/util/simpletimetracker/feature_base_adapter/hint/HintAdapterDelegate.kt b/.../java/com/example/util/simpletimetracker/feature_base_adapter/hint/HintAdapterDelegate.kt
@@ -1,5 +1,6 @@
 package com.example.util.simpletimetracker.feature_base_adapter.hint
 
+import android.view.Gravity
 import androidx.core.view.updatePadding
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
 import com.example.util.simpletimetracker.feature_views.extension.dpToPx
@@ -10,6 +11,13 @@ fun createHintAdapterDelegate() = createRecyclerBindingAdapterDelegate<ViewData,
     Binding::inflate,
 ) { binding, item, _ ->
 
+    fun ViewData.Gravity.toViewData(): Int {
+        return when (this) {
+            ViewData.Gravity.CENTER -> Gravity.CENTER
+            ViewData.Gravity.START -> Gravity.START
+        }
+    }
+
     with(binding) {
         item as ViewData
 
@@ -18,5 +26,6 @@ fun createHintAdapterDelegate() = createRecyclerBindingAdapterDelegate<ViewData,
             bottom = item.paddingBottom.dpToPx(),
         )
         tvHintItemText.text = item.text
+        tvHintItemText.gravity = item.gravity.toViewData()
     }
 }
diff --git a/...rc/main/java/com/example/util/simpletimetracker/feature_base_adapter/hint/HintViewData.kt b/...rc/main/java/com/example/util/simpletimetracker/feature_base_adapter/hint/HintViewData.kt
@@ -6,9 +6,15 @@ data class HintViewData(
     val text: String,
     val paddingTop: Int = 8,
     val paddingBottom: Int = 8,
+    val gravity: Gravity = Gravity.CENTER,
 ) : ViewHolderType {
 
     override fun getUniqueId(): Long = text.hashCode().toLong()
 
     override fun isValidType(other: ViewHolderType): Boolean = other is HintViewData
+
+    enum class Gravity {
+        CENTER,
+        START,
+    }
 }
diff --git a/...tracker/feature_base_adapter/recordTypeSpecial/RunningRecordTypeSpecialAdapterDelegate.kt b/...tracker/feature_base_adapter/recordTypeSpecial/RunningRecordTypeSpecialAdapterDelegate.kt
@@ -16,8 +16,8 @@ fun createRunningRecordTypeSpecialAdapterDelegate(
         item as ViewData
 
         layoutParams = layoutParams.also { params ->
-            params.width = item.width.dpToPx()
-            params.height = item.height.dpToPx()
+            item.width?.dpToPx()?.let { params.width = it }
+            item.height?.dpToPx()?.let { params.height = it }
         }
 
         itemIsRow = item.asRow

diff --git a/...pletimetracker/feature_base_adapter/recordTypeSpecial/RunningRecordTypeSpecialViewData.kt b/...pletimetracker/feature_base_adapter/recordTypeSpecial/RunningRecordTypeSpecialViewData.kt
@@ -10,8 +10,8 @@ data class RunningRecordTypeSpecialViewData(
     val name: String,
     val iconId: RecordTypeIcon,
     @ColorInt val color: Int,
-    val width: Int,
-    val height: Int,
+    val width: Int?,
+    val height: Int?,
     val asRow: Boolean = false,
     val checkState: CheckState = CheckState.HIDDEN,
 ) : ViewHolderType {

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
@@ -14,7 +14,7 @@
         app:layout_constraintBottom_toTopOf="@id/dividerChangeRecordButton"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0"
-        tools:visibility="gone">
+        tools:visibility="visible">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -519,7 +519,7 @@
         app:layout_constraintTop_toBottomOf="@id/containerChangeRecordMain"
         tools:itemCount="1"
         tools:listitem="@layout/change_record_comment_field_item"
-        tools:visibility="visible" />
+        tools:visibility="gone" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvChangeRecordAction"

diff --git a/features/feature_complex_rules/src/main/res/layout/complex_rules_fragment.xml b/features/feature_complex_rules/src/main/res/layout/complex_rules_fragment.xml
@@ -29,7 +29,7 @@
         android:textColor="?appTextHintColor"
         app:layout_constraintTop_toBottomOf="@id/tvComplexRulesTitle" />
 
-    <com.example.util.simpletimetracker.feature_views.DividerView
+    <com.example.util.simpletimetracker.feature_views.DividerFullView
         android:id="@+id/dividerComplexRules"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -40,6 +40,7 @@
         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/dividerComplexRules"
         tools:listitem="@layout/item_complex_rule_layout" />

diff --git a/...til/simpletimetracker/feature_dialogs/typesSelection/viewModel/TypesSelectionViewModel.kt b/...til/simpletimetracker/feature_dialogs/typesSelection/viewModel/TypesSelectionViewModel.kt
@@ -67,6 +67,7 @@ class TypesSelectionViewModel @Inject constructor(
     }
 
     fun onShowAllClick() {
+        dataIdsSelected.clear()
         dataIdsSelected.addAll(viewDataCache.map(TypesSelectionCacheHolder::id))
         updateViewData()
     }

diff --git a/...pi/src/main/java/com/example/util/simpletimetracker/feature_settings/api/SettingsBlock.kt b/...pi/src/main/java/com/example/util/simpletimetracker/feature_settings/api/SettingsBlock.kt
@@ -84,6 +84,7 @@ enum class SettingsBlock {
     AdditionalSendEvents,
     AdditionalDataEdit,
     AdditionalComplexRules,
+    AdditionalActivitySuggestions,
     AdditionalBottom,
 
     BackupTop,

diff --git a/...til/simpletimetracker/feature_settings/interactor/SettingsAdditionalViewDataInteractor.kt b/...til/simpletimetracker/feature_settings/interactor/SettingsAdditionalViewDataInteractor.kt
@@ -182,6 +182,11 @@ class SettingsAdditionalViewDataInteractor @Inject constructor(
                 block = SettingsBlock.AdditionalComplexRules,
                 title = resourceRepo.getString(R.string.settings_complex_rules),
                 subtitle = "",
+            )
+            result += SettingsTextViewData(
+                block = SettingsBlock.AdditionalActivitySuggestions,
+                title = resourceRepo.getString(R.string.settings_activity_suggestions),
+                subtitle = "",
                 dividerIsVisible = false,
             )
         }

diff --git a/...pletimetracker/feature_settings/viewModel/delegate/SettingsAdditionalViewModelDelegate.kt b/...pletimetracker/feature_settings/viewModel/delegate/SettingsAdditionalViewModelDelegate.kt
@@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.feature_settings.mapper.SettingsAutoma
 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.ComplexRulesParams
 import com.example.util.simpletimetracker.navigation.params.screen.DataEditParams
 import com.example.util.simpletimetracker.navigation.params.screen.DurationDialogParams
@@ -71,6 +72,7 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
             SettingsBlock.AdditionalKeepScreenOn -> onKeepScreenOnClicked()
             SettingsBlock.AdditionalDataEdit -> onDataEditClick()
             SettingsBlock.AdditionalComplexRules -> onComplexRulesClick()
+            SettingsBlock.AdditionalActivitySuggestions -> onActivitySuggestionsClick()
             else -> {
                 // Do nothing
             }
@@ -262,6 +264,10 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
         router.navigate(ComplexRulesParams)
     }
 
+    private fun onActivitySuggestionsClick() {
+        router.navigate(ActivitySuggestionsParams)
+    }
+
     private fun onAutomatedTrackingHelpClick() {
         delegateScope.launch {
             val isDarkTheme = prefsInteractor.getDarkMode()

diff --git a/...cker/feature_statistics_detail/interactor/StatisticsDetailAdjacentActivitiesInteractor.kt b/...cker/feature_statistics_detail/interactor/StatisticsDetailAdjacentActivitiesInteractor.kt
@@ -41,10 +41,10 @@ class StatisticsDetailAdjacentActivitiesInteractor @Inject constructor(
         val recordTypes = recordTypeInteractor.getAll().associateBy(RecordType::id)
         val actualRecords = getRecords(rangeLength, rangePosition)
         val nextActivitiesIds = calculateAdjacentActivitiesInteractor
-            .calculateNextActivities(listOf(typeId), actualRecords)
+            .calculateNextActivities(listOf(typeId), actualRecords, MAX_COUNT)
             .getOrElse(typeId) { emptyList() }
         val multitaskingActivitiesIds = calculateAdjacentActivitiesInteractor
-            .calculateMultitasking(typeId, actualRecords)
+            .calculateMultitasking(typeId, actualRecords, MAX_COUNT)
 
         fun mapPreviews(typeToCounts: List<CalculationResult>): List<ViewHolderType> {
             val total = typeToCounts.sumOf(CalculationResult::count)
@@ -129,4 +129,8 @@ class StatisticsDetailAdjacentActivitiesInteractor @Inject constructor(
     private fun getEmptyViewData(): List<ViewHolderType> {
         return emptyList()
     }
+
+    companion object {
+        private const val MAX_COUNT = 5
+    }
 }
diff --git a/features/feature_suggestions/.gitignore b/features/feature_suggestions/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/features/feature_suggestions/build.gradle.kts b/features/feature_suggestions/build.gradle.kts
@@ -0,0 +1,21 @@
+import com.example.util.simpletimetracker.Base
+import com.example.util.simpletimetracker.applyAndroidLibrary
+
+plugins {
+    alias(libs.plugins.gradleLibrary)
+    alias(libs.plugins.kotlin)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.hilt)
+}
+
+applyAndroidLibrary()
+
+android {
+    namespace = "${Base.namespace}.feature_suggestions"
+}
+
+dependencies {
+    implementation(project(":core"))
+    implementation(libs.google.dagger)
+    ksp(libs.kapt.dagger)
+}
diff --git a/features/feature_suggestions/src/main/AndroidManifest.xml b/features/feature_suggestions/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application android:theme="@style/AppTheme" />
+
+</manifest>