Remember last filter combinations on relaunch

Signed-off-by: starry-shivam <[email protected]>
Pool-Of-Tears · Feb 4, 2024 · 3dc4300 · 3dc4300
1 parent 548df94
commit 3dc4300
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/home/viewmodels/HomeViewModel.kt b/app/src/main/java/com/starry/greenstash/ui/screens/home/viewmodels/HomeViewModel.kt
@@ -78,25 +78,37 @@ class HomeViewModel @Inject constructor(
 
     private val _filterFlowData: MutableState<FilterFlowData> = mutableStateOf(
         FilterFlowData(
-            FilterField.Title,
-            FilterSortType.Ascending
+            FilterField.entries[preferenceUtil.getInt(
+                PreferenceUtil.GOAL_FILTER_FIELD_INT,
+                FilterField.Title.ordinal
+            )],
+            FilterSortType.entries[preferenceUtil.getInt(
+                PreferenceUtil.GOAL_FILTER_SORT_TYPE_INT,
+                FilterSortType.Ascending.ordinal
+            )]
         )
     )
     val filterFlowData: State<FilterFlowData> = _filterFlowData
 
     private val filterFlow = MutableStateFlow(filterFlowData.value)
-    private val goalsListFlow = filterFlow.flatMapLatest {
-        when (it.filterField) {
+    private val goalsListFlow = filterFlow.flatMapLatest { ffData ->
+
+        // Save the current filter combination in shared preferences
+        preferenceUtil.putInt(PreferenceUtil.GOAL_FILTER_FIELD_INT, ffData.filterField.ordinal)
+        preferenceUtil.putInt(PreferenceUtil.GOAL_FILTER_SORT_TYPE_INT, ffData.sortType.ordinal)
+
+        // Fetch the goals list based on the current filter combination
+        when (ffData.filterField) {
             FilterField.Title -> {
-                goalDao.getAllGoalsByTitle(it.sortType.value)
+                goalDao.getAllGoalsByTitle(ffData.sortType.value)
             }
 
             FilterField.Amount -> {
-                goalDao.getAllGoalsByAmount(it.sortType.value)
+                goalDao.getAllGoalsByAmount(ffData.sortType.value)
             }
 
             FilterField.Priority -> {
-                goalDao.getAllGoalsByPriority(it.sortType.value)
+                goalDao.getAllGoalsByPriority(ffData.sortType.value)
             }
         }
     }

diff --git a/app/src/main/java/com/starry/greenstash/utils/PreferenceUtil.kt b/app/src/main/java/com/starry/greenstash/utils/PreferenceUtil.kt
@@ -40,6 +40,10 @@ class PreferenceUtil(context: Context) {
         const val DEFAULT_CURRENCY_STR = "default_currency_code"
         const val DATE_FORMAT_STR = "date_format"
         const val APP_LOCK_BOOL = "app_lock"
+
+        // Goal filter preferences
+        const val GOAL_FILTER_FIELD_INT = "goal_filter_field"
+        const val GOAL_FILTER_SORT_TYPE_INT = "goal_filter_sort_type"
     }
 
     private var prefs: SharedPreferences

diff --git a/app/src/main/java/com/starry/greenstash/widget/GoalWidget.kt b/app/src/main/java/com/starry/greenstash/widget/GoalWidget.kt
@@ -113,9 +113,7 @@ class GoalWidget : AppWidgetProvider() {
                         goalItem.getCurrentlySavedAmount(),
                         defCurrency
                     )
-                } / $defCurrency${
-                    Utils.formatCurrency(goalItem.goal.targetAmount, defCurrency)
-                }"
+                } / ${Utils.formatCurrency(goalItem.goal.targetAmount, defCurrency)}"
             )
         views.setCharSequence(R.id.widgetDesc, "setText", widgetDesc)
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.21'
-        gradle_version = '8.2.1'
+        gradle_version = '8.2.2'
         hilt_version = '2.49'
         room_version = '2.6.1'
     }