wip

hoc081098 · hoc081098 · commit 4786d34fa8ba · 2021-02-22T14:53:17.000+07:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -60,6 +60,7 @@ dependencies {
     implementation "androidx.compose.foundation:foundation:$compose_version"
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.material:material-icons-extended:$compose_version"
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
     implementation "androidx.compose.runtime:runtime:$compose_version"
     implementation "androidx.ui:ui-tooling:1.0.0-alpha07"
diff --git a/app/src/main/java/com/hoc081098/datastoresample/Locator.kt b/app/src/main/java/com/hoc081098/datastoresample/Locator.kt
@@ -5,7 +5,8 @@ import androidx.datastore.preferences.createDataStore
 import com.hoc081098.datastoresample.data.TaskRepositoryImpl
 import com.hoc081098.datastoresample.data.UserPreferencesRepositoryImpl
 import com.hoc081098.datastoresample.domain.ChangeShowCompleted
-import com.hoc081098.datastoresample.domain.FilterSortTasks
+import com.hoc081098.datastoresample.domain.EnableSortByDeadline
+import com.hoc081098.datastoresample.domain.model.FilterSortTasks
 import com.hoc081098.datastoresample.ui.MainViewModel
 
 object Locator {
@@ -18,7 +19,12 @@ object Locator {
         this.application = application
     }
 
-    val mainViewModelFactory get() = MainViewModel.Factory(filterSortTasks, changeShowCompleted)
+    val mainViewModelFactory
+        get() = MainViewModel.Factory(
+            filterSortTasks,
+            changeShowCompleted,
+            enableSortByDeadline,
+        )
 
     private val filterSortTasks
         get() = FilterSortTasks(
@@ -28,6 +34,8 @@ object Locator {
 
     private val changeShowCompleted get() = ChangeShowCompleted(userPreferencesRepository)
 
+    private val enableSortByDeadline get() = EnableSortByDeadline(userPreferencesRepository)
+
     private val taskRepository by lazy { TaskRepositoryImpl() }
     private val userPreferencesRepository by lazy {
         val dataStore = requireApplication.createDataStore(name = "user_preferences")
diff --git a/app/src/main/java/com/hoc081098/datastoresample/data/TaskRepositoryImpl.kt b/app/src/main/java/com/hoc081098/datastoresample/data/TaskRepositoryImpl.kt
@@ -1,8 +1,8 @@
 package com.hoc081098.datastoresample.data
 
-import com.hoc081098.datastoresample.domain.Task
-import com.hoc081098.datastoresample.domain.TaskPriority
-import com.hoc081098.datastoresample.domain.TaskRepository
+import com.hoc081098.datastoresample.domain.model.Task
+import com.hoc081098.datastoresample.domain.model.TaskPriority
+import com.hoc081098.datastoresample.domain.repo.TaskRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import java.text.SimpleDateFormat
diff --git a/app/src/main/java/com/hoc081098/datastoresample/data/UserPreferencesRepositoryImpl.kt b/app/src/main/java/com/hoc081098/datastoresample/data/UserPreferencesRepositoryImpl.kt
@@ -7,10 +7,10 @@ import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.stringPreferencesKey
-import com.hoc081098.datastoresample.domain.SortOrder
-import com.hoc081098.datastoresample.domain.SortOrder.*
-import com.hoc081098.datastoresample.domain.UserPreferences
-import com.hoc081098.datastoresample.domain.UserPreferencesRepository
+import com.hoc081098.datastoresample.domain.model.SortOrder
+import com.hoc081098.datastoresample.domain.model.SortOrder.*
+import com.hoc081098.datastoresample.domain.model.UserPreferences
+import com.hoc081098.datastoresample.domain.repo.UserPreferencesRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.distinctUntilChanged
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/ChangeShowCompleted.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/ChangeShowCompleted.kt
@@ -1,5 +1,7 @@
 package com.hoc081098.datastoresample.domain
 
+import com.hoc081098.datastoresample.domain.repo.UserPreferencesRepository
+
 class ChangeShowCompleted(
     private val userPreferencesRepository: UserPreferencesRepository,
 ) {
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/EnableSortByDeadline.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/EnableSortByDeadline.kt
@@ -0,0 +1,10 @@
+package com.hoc081098.datastoresample.domain
+
+import com.hoc081098.datastoresample.domain.repo.UserPreferencesRepository
+
+class EnableSortByDeadline(
+    private val userPreferencesRepository: UserPreferencesRepository,
+) {
+    suspend operator fun invoke(enabled: Boolean) =
+        userPreferencesRepository.enableSortByDeadline(enabled)
+}
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/FilterSortTasks.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/FilterSortTasks.kt
@@ -1,5 +1,7 @@
-package com.hoc081098.datastoresample.domain
+package com.hoc081098.datastoresample.domain.model
 
+import com.hoc081098.datastoresample.domain.repo.TaskRepository
+import com.hoc081098.datastoresample.domain.repo.UserPreferencesRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/TaskRepository.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/TaskRepository.kt
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/UserPreferences.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/UserPreferences.kt
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/model/SortOrder.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/model/SortOrder.kt
@@ -1,4 +1,4 @@
-package com.hoc081098.datastoresample.domain
+package com.hoc081098.datastoresample.domain.model
 
 enum class SortOrder {
     NONE,
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/model/Task.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/model/Task.kt
@@ -1,4 +1,4 @@
-package com.hoc081098.datastoresample.domain
+package com.hoc081098.datastoresample.domain.model
 
 import java.util.*
 
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/model/TaskPriority.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/model/TaskPriority.kt
@@ -1,4 +1,4 @@
-package com.hoc081098.datastoresample.domain
+package com.hoc081098.datastoresample.domain.model
 
 enum class TaskPriority {
     HIGH,
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/model/UserPreferences.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/model/UserPreferences.kt
@@ -0,0 +1,8 @@
+package com.hoc081098.datastoresample.domain.model
+
+import com.hoc081098.datastoresample.domain.model.SortOrder
+
+data class UserPreferences(
+    val showCompleted: Boolean,
+    val sortOrder: SortOrder,
+)
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/repo/TaskRepository.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/repo/TaskRepository.kt
@@ -0,0 +1,8 @@
+package com.hoc081098.datastoresample.domain.repo
+
+import com.hoc081098.datastoresample.domain.model.Task
+import kotlinx.coroutines.flow.Flow
+
+interface TaskRepository {
+    fun tasks(): Flow<List<Task>>
+}
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/repo/UserPreferencesRepository.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/repo/UserPreferencesRepository.kt
@@ -1,5 +1,6 @@
-package com.hoc081098.datastoresample.domain
+package com.hoc081098.datastoresample.domain.repo
 
+import com.hoc081098.datastoresample.domain.model.UserPreferences
 import kotlinx.coroutines.flow.Flow
 
 interface UserPreferencesRepository {
diff --git a/app/src/main/java/com/hoc081098/datastoresample/ui/MainActivity.kt b/app/src/main/java/com/hoc081098/datastoresample/ui/MainActivity.kt
@@ -16,7 +16,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            DataStoreSampleTheme {
+            DataStoreSampleTheme(true) {
                 // A surface container using the 'background' color from the theme
                 Surface(color = MaterialTheme.colors.background) {
                     val viewModel = viewModel<MainViewModel>(factory = Locator.mainViewModelFactory)
@@ -25,6 +25,7 @@ class MainActivity : AppCompatActivity() {
                     MainScreen(
                         state,
                         viewModel::changeShowCompleted,
+                        viewModel::enableSortByDeadline,
                     )
                 }
             }
diff --git a/app/src/main/java/com/hoc081098/datastoresample/ui/MainScreen.kt b/app/src/main/java/com/hoc081098/datastoresample/ui/MainScreen.kt
@@ -1,40 +1,52 @@
 package com.hoc081098.datastoresample.ui
 
-import androidx.compose.foundation.Image
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.preferredSize
+import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.selection.toggleable
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Checkbox
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
+import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Reorder
+import androidx.compose.material.icons.filled.Sort
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.hoc081098.datastoresample.R
-import com.hoc081098.datastoresample.domain.FilteredSortedTasks
-import com.hoc081098.datastoresample.domain.Task
+import com.hoc081098.datastoresample.domain.model.FilteredSortedTasks
+import com.hoc081098.datastoresample.domain.model.SortOrder
+import com.hoc081098.datastoresample.domain.model.Task
 import com.hoc081098.datastoresample.ui.theme.DataStoreSampleTheme
 
 @Composable
 fun MainScreen(
     state: FilteredSortedTasks?,
     changeShowCompleted: (Boolean) -> Unit,
+    enableSortByDeadline: (Boolean) -> Unit,
 ) {
     Scaffold(
         topBar = {
@@ -63,11 +75,19 @@ fun MainScreen(
             ) {
                 MainTasksList(state.tasks, Modifier.weight(1f))
 
-                Row(modifier = Modifier.padding(all = 32.dp)) {
-                    Image(
-                        painter = painterResource(id = R.drawable.ic_baseline_filter_list_24),
+                Row(modifier = Modifier.padding(all = 16.dp)) {
+                    Icon(
+                        imageVector = Icons.Default.Sort,
                         contentDescription = null,
-                        modifier = Modifier.preferredSize(24.dp),
+                        tint = LocalContentColor.current.copy(alpha = 0.5f),
+                    )
+
+                    Spacer(modifier = Modifier.width(16.dp))
+
+                    Text(
+                        modifier = Modifier.wrapContentWidth(),
+                        text = "Show completed tasks",
+                        style = MaterialTheme.typography.subtitle1
                     )
 
                     Spacer(modifier = Modifier.width(16.dp))
@@ -77,6 +97,36 @@ fun MainScreen(
                         onCheckedChange = changeShowCompleted
                     )
                 }
+
+                Row(modifier = Modifier.padding(all = 16.dp)) {
+                    Icon(
+                        imageVector = Icons.Default.Reorder,
+                        contentDescription = null,
+                        tint = LocalContentColor.current.copy(alpha = 0.5f),
+                    )
+
+                    Spacer(modifier = Modifier.width(16.dp))
+
+                    SortChip(
+                        text = "Priority",
+                        selected = state.sortOrder == SortOrder.BY_PRIORITY
+                                || state.sortOrder == SortOrder.BY_DEADLINE_AND_PRIORITY,
+                        setSelected = {
+
+                        },
+                        shape = RoundedCornerShape(14.dp)
+                    )
+
+                    Spacer(modifier = Modifier.width(16.dp))
+
+                    SortChip(
+                        text = "Deadline",
+                        selected = state.sortOrder == SortOrder.BY_DEADLINE
+                                || state.sortOrder == SortOrder.BY_DEADLINE_AND_PRIORITY,
+                        setSelected = enableSortByDeadline,
+                        shape = RoundedCornerShape(14.dp)
+                    )
+                }
             }
         }
     }
@@ -90,7 +140,9 @@ fun MainTasksList(tasks: List<Task>, modifier: Modifier = Modifier) {
     ) {
         items(tasks) { task ->
             TaskRow(task = task)
-            Divider()
+            Divider(
+                thickness = 0.7.dp
+            )
         }
     }
 }
@@ -112,13 +164,61 @@ fun TaskRow(task: Task) {
     }
 }
 
+@Composable
+fun SortChip(
+    text: String,
+    selected: Boolean,
+    setSelected: (Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+    shape: Shape = MaterialTheme.shapes.small,
+) {
+    Surface(
+        modifier = modifier.preferredHeight(28.dp),
+        color = MaterialTheme.colors.secondary,
+        shape = shape,
+        elevation = 2.dp
+    ) {
+        Box(
+            modifier = Modifier.toggleable(
+                value = selected,
+                onValueChange = setSelected,
+            )
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.padding(
+                    horizontal = 8.dp,
+                    vertical = 6.dp
+                )
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Check,
+                    contentDescription = null,
+                    modifier = Modifier.width(animateDpAsState(targetValue = if (selected) 24.dp else 0.dp).value),
+                )
+
+                Spacer(modifier = Modifier.width(animateDpAsState(targetValue = if (selected) 2.dp else 0.dp).value))
+
+                Text(
+                    text = text,
+                    style = MaterialTheme.typography.caption,
+                    maxLines = 1,
+
+                    )
+            }
+
+        }
+    }
+}
+
 @Preview
 @Composable
 fun MainScreenPreview() {
     DataStoreSampleTheme {
         MainScreen(
             null,
             {},
+            {},
         )
     }
-}
+}
diff --git a/app/src/main/java/com/hoc081098/datastoresample/ui/MainViewModel.kt b/app/src/main/java/com/hoc081098/datastoresample/ui/MainViewModel.kt
diff --git a/app/src/main/res/drawable/ic_baseline_filter_list_24.xml b/app/src/main/res/drawable/ic_baseline_filter_list_24.xml
