wip

Author: hoc081098

app/src/main/java/com/hoc081098/datastoresample/Locator.kt

@@ -7,6 +7,7 @@ import com.hoc081098.datastoresample.data.UserPreferencesRepositoryImpl
 import com.hoc081098.datastoresample.domain.ChangeShowCompleted
 import com.hoc081098.datastoresample.domain.ChangeTheme
 import com.hoc081098.datastoresample.domain.EnableSortByDeadline
+import com.hoc081098.datastoresample.domain.EnableSortByPriority
 import com.hoc081098.datastoresample.domain.GetTheme
 import com.hoc081098.datastoresample.domain.model.FilterSortTasks
 import com.hoc081098.datastoresample.ui.MainViewModel
@@ -27,6 +28,7 @@ object Locator {
             getTheme = getTheme,
             changeShowCompleted = changeShowCompleted,
             enableSortByDeadline = enableSortByDeadline,
+            enableSortByPriority = enableSortByPriority,
             changeTheme = changeTheme,
         )
 
@@ -44,6 +46,8 @@ object Locator {
 
     private val enableSortByDeadline get() = EnableSortByDeadline(userPreferencesRepository)
 
+    private val enableSortByPriority get() = EnableSortByPriority(userPreferencesRepository)
+
     private val taskRepository by lazy { TaskRepositoryImpl() }
     private val userPreferencesRepository by lazy {
         val dataStore = requireApplication.createDataStore(name = "user_preferences")

app/src/main/java/com/hoc081098/datastoresample/domain/EnableSortByPriority.kt

@@ -0,0 +1,8 @@
+package com.hoc081098.datastoresample.domain
+
+import com.hoc081098.datastoresample.domain.repo.UserPreferencesRepository
+
+class EnableSortByPriority(private val userPreferencesRepository: UserPreferencesRepository) {
+    suspend operator fun invoke(enabled: Boolean) =
+        userPreferencesRepository.enableSortByPriority(enabled)
+}

app/src/main/java/com/hoc081098/datastoresample/ui/MainActivity.kt

@@ -38,6 +38,7 @@ class MainActivity : AppCompatActivity() {
                         state = state,
                         changeShowCompleted = viewModel::changeShowCompleted,
                         enableSortByDeadline = viewModel::enableSortByDeadline,
+                        enableSortByPriority=viewModel::enableSortByPriority,
                         lightTheme = !darkTheme,
                         changeTheme = viewModel::changeTheme,
                     )

app/src/main/java/com/hoc081098/datastoresample/ui/MainScreen.kt

@@ -49,6 +49,7 @@ fun MainScreen(
     state: FilteredSortedTasks?,
     changeShowCompleted: (Boolean) -> Unit,
     enableSortByDeadline: (Boolean) -> Unit,
+    enableSortByPriority: (Boolean) -> Unit,
     lightTheme: Boolean,
     changeTheme: (Boolean) -> Unit,
 ) {
@@ -121,9 +122,7 @@ fun MainScreen(
                         text = "Priority",
                         selected = state.sortOrder == SortOrder.BY_PRIORITY
                                 || state.sortOrder == SortOrder.BY_DEADLINE_AND_PRIORITY,
-                        setSelected = {
-
-                        },
+                        setSelected = enableSortByPriority,
                         shape = RoundedCornerShape(14.dp)
                     )
 
@@ -228,11 +227,12 @@ fun SortChip(
 fun MainScreenPreview() {
     DataStoreSampleTheme {
         MainScreen(
-            null,
-            {},
-            {},
-            false,
-            {}
+            state = null,
+            changeShowCompleted = {},
+            enableSortByDeadline = {},
+            enableSortByPriority = {},
+            lightTheme = false,
+            changeTheme = {}
         )
     }
 }

app/src/main/java/com/hoc081098/datastoresample/ui/MainViewModel.kt

@@ -7,6 +7,7 @@ import androidx.lifecycle.viewModelScope
 import com.hoc081098.datastoresample.domain.ChangeShowCompleted
 import com.hoc081098.datastoresample.domain.ChangeTheme
 import com.hoc081098.datastoresample.domain.EnableSortByDeadline
+import com.hoc081098.datastoresample.domain.EnableSortByPriority
 import com.hoc081098.datastoresample.domain.GetTheme
 import com.hoc081098.datastoresample.domain.model.FilterSortTasks
 import com.hoc081098.datastoresample.domain.model.FilteredSortedTasks
@@ -21,6 +22,7 @@ class MainViewModel(
     getTheme: GetTheme,
     private val _changeShowCompleted: ChangeShowCompleted,
     private val _enableSortByDeadline: EnableSortByDeadline,
+    private val _enableSortByPriority: EnableSortByPriority,
     private val _changeTheme: ChangeTheme,
 ) : ViewModel() {
     val state: StateFlow<FilteredSortedTasks?> = filterSortTasks()
@@ -53,6 +55,10 @@ class MainViewModel(
         viewModelScope.launch { _enableSortByDeadline(enabled) }
     }
 
+    fun enableSortByPriority(enabled: Boolean) {
+        viewModelScope.launch { _enableSortByPriority(enabled) }
+    }
+
     fun changeTheme(lightTheme: Boolean) {
         viewModelScope.launch { _changeTheme(lightTheme) }
     }
@@ -62,6 +68,7 @@ class MainViewModel(
         private val getTheme: GetTheme,
         private val changeShowCompleted: ChangeShowCompleted,
         private val enableSortByDeadline: EnableSortByDeadline,
+        private val enableSortByPriority: EnableSortByPriority,
         private val changeTheme: ChangeTheme,
 
         ) : ViewModelProvider.Factory {
@@ -73,6 +80,7 @@ class MainViewModel(
                     getTheme = getTheme,
                     _changeShowCompleted = changeShowCompleted,
                     _enableSortByDeadline = enableSortByDeadline,
+                    _enableSortByPriority = enableSortByPriority,
                     _changeTheme = changeTheme,
                 ) as T
             }