dynamic dark mode

hoc081098 · hoc081098 · commit 3e0809189704 · 2021-02-25T11:57:41.000+07:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
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,9 @@ 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.ChangeTheme
 import com.hoc081098.datastoresample.domain.EnableSortByDeadline
+import com.hoc081098.datastoresample.domain.GetTheme
 import com.hoc081098.datastoresample.domain.model.FilterSortTasks
 import com.hoc081098.datastoresample.ui.MainViewModel
 
@@ -21,9 +23,11 @@ object Locator {
 
     val mainViewModelFactory
         get() = MainViewModel.Factory(
-            filterSortTasks,
-            changeShowCompleted,
-            enableSortByDeadline,
+            filterSortTasks = filterSortTasks,
+            getTheme = getTheme,
+            changeShowCompleted = changeShowCompleted,
+            enableSortByDeadline = enableSortByDeadline,
+            changeTheme = changeTheme,
         )
 
     private val filterSortTasks
@@ -32,6 +36,10 @@ object Locator {
             userPreferencesRepository = userPreferencesRepository
         )
 
+    private val changeTheme get() = ChangeTheme(userPreferencesRepository)
+
+    private val getTheme get() = GetTheme(userPreferencesRepository)
+
     private val changeShowCompleted get() = ChangeShowCompleted(userPreferencesRepository)
 
     private val enableSortByDeadline get() = EnableSortByDeadline(userPreferencesRepository)
diff --git a/app/src/main/java/com/hoc081098/datastoresample/data/UserPreferencesRepositoryImpl.kt b/app/src/main/java/com/hoc081098/datastoresample/data/UserPreferencesRepositoryImpl.kt
@@ -9,6 +9,7 @@ import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.hoc081098.datastoresample.domain.model.SortOrder
 import com.hoc081098.datastoresample.domain.model.SortOrder.*
+import com.hoc081098.datastoresample.domain.model.Theme
 import com.hoc081098.datastoresample.domain.model.UserPreferences
 import com.hoc081098.datastoresample.domain.repo.UserPreferencesRepository
 import kotlinx.coroutines.flow.Flow
@@ -24,6 +25,7 @@ class UserPreferencesRepositoryImpl(
     private object Keys {
         val showCompleted = booleanPreferencesKey("show_completed")
         val sortOrder = stringPreferencesKey("sort_order")
+        val theme = booleanPreferencesKey("theme")
     }
 
     private inline val Preferences.showCompleted
@@ -101,4 +103,27 @@ class UserPreferencesRepositoryImpl(
         dataStore.edit { it[Keys.showCompleted] = showCompleted }
         Log.d("UserPreferencesRepo", "updateShowCompleted $showCompleted")
     }
+
+    override val theme: Flow<Theme> = dataStore.data
+        .catch {
+            // throws an IOException when an error is encountered when reading data
+            if (it is IOException) {
+                emit(emptyPreferences())
+            } else {
+                throw it
+            }
+        }
+        .map {
+            when (it[Keys.theme]) {
+                true -> Theme.NIGHT_YES
+                false -> Theme.NIGHT_NO
+                null -> Theme.NIGHT_UNSPECIFIED
+            }
+        }
+        .distinctUntilChanged()
+
+    override suspend fun changeTheme(lightTheme: Boolean) {
+        dataStore.edit { it[Keys.theme] = lightTheme }
+        Log.d("UserPreferencesRepo", "changeTheme $lightTheme")
+    }
 }
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/ChangeTheme.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/ChangeTheme.kt
@@ -0,0 +1,8 @@
+package com.hoc081098.datastoresample.domain
+
+import com.hoc081098.datastoresample.domain.repo.UserPreferencesRepository
+
+class ChangeTheme(private val userPreferencesRepository: UserPreferencesRepository) {
+    suspend operator fun invoke(lightTheme: Boolean) =
+        userPreferencesRepository.changeTheme(lightTheme)
+}
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/GetTheme.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/GetTheme.kt
@@ -0,0 +1,9 @@
+package com.hoc081098.datastoresample.domain
+
+import com.hoc081098.datastoresample.domain.model.Theme
+import com.hoc081098.datastoresample.domain.repo.UserPreferencesRepository
+import kotlinx.coroutines.flow.Flow
+
+class GetTheme(private val userPreferencesRepository: UserPreferencesRepository) {
+    operator fun invoke(): Flow<Theme> = userPreferencesRepository.theme
+}
diff --git a/app/src/main/java/com/hoc081098/datastoresample/domain/model/Theme.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/model/Theme.kt
@@ -0,0 +1,7 @@
+package com.hoc081098.datastoresample.domain.model
+
+enum class Theme {
+    NIGHT_YES,
+    NIGHT_NO,
+    NIGHT_UNSPECIFIED,
+}
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
@@ -1,7 +1,5 @@
 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/UserPreferencesRepository.kt b/app/src/main/java/com/hoc081098/datastoresample/domain/repo/UserPreferencesRepository.kt
@@ -1,5 +1,6 @@
 package com.hoc081098.datastoresample.domain.repo
 
+import com.hoc081098.datastoresample.domain.model.Theme
 import com.hoc081098.datastoresample.domain.model.UserPreferences
 import kotlinx.coroutines.flow.Flow
 
@@ -11,4 +12,8 @@ interface UserPreferencesRepository {
     suspend fun enableSortByPriority(enabled: Boolean)
 
     suspend fun updateShowCompleted(showCompleted: Boolean)
+
+    suspend fun changeTheme(lightTheme: Boolean)
+
+    val theme: Flow<Theme>
 }
diff --git a/app/src/main/java/com/hoc081098/datastoresample/ui/MainActivity.kt b/app/src/main/java/com/hoc081098/datastoresample/ui/MainActivity.kt
@@ -4,11 +4,13 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import com.hoc081098.datastoresample.Locator
+import com.hoc081098.datastoresample.domain.model.Theme
 import com.hoc081098.datastoresample.ui.theme.DataStoreSampleTheme
 
 class MainActivity : AppCompatActivity() {
@@ -18,15 +20,26 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            DataStoreSampleTheme(true) {
+            val theme by viewModel.theme.collectAsState()
+
+            val darkTheme = when (theme) {
+                Theme.NIGHT_YES -> false
+                Theme.NIGHT_NO -> true
+                Theme.NIGHT_UNSPECIFIED -> isSystemInDarkTheme()
+                null -> return@setContent
+            }
+
+            DataStoreSampleTheme(darkTheme = darkTheme) {
                 // A surface container using the 'background' color from the theme
                 Surface(color = MaterialTheme.colors.background) {
                     val state by viewModel.state.collectAsState()
 
                     MainScreen(
-                        state,
-                        viewModel::changeShowCompleted,
-                        viewModel::enableSortByDeadline,
+                        state = state,
+                        changeShowCompleted = viewModel::changeShowCompleted,
+                        enableSortByDeadline = viewModel::enableSortByDeadline,
+                        lightTheme = !darkTheme,
+                        changeTheme = viewModel::changeTheme,
                     )
                 }
             }
diff --git a/app/src/main/java/com/hoc081098/datastoresample/ui/MainScreen.kt b/app/src/main/java/com/hoc081098/datastoresample/ui/MainScreen.kt
@@ -21,10 +21,12 @@ import androidx.compose.material.Checkbox
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
+import androidx.compose.material.IconToggleButton
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Surface
+import androidx.compose.material.Switch
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
@@ -47,15 +49,23 @@ fun MainScreen(
     state: FilteredSortedTasks?,
     changeShowCompleted: (Boolean) -> Unit,
     enableSortByDeadline: (Boolean) -> Unit,
+    lightTheme: Boolean,
+    changeTheme: (Boolean) -> Unit,
 ) {
     Scaffold(
         topBar = {
             TopAppBar(
                 title = {
                     Text(text = "Jetpack DataStore sample")
+                },
+                actions = {
+                    Switch(
+                        checked = lightTheme,
+                        onCheckedChange = changeTheme,
+                    )
                 }
             )
-        }
+        },
     ) {
         if (state == null) {
             Column(
@@ -219,6 +229,8 @@ fun MainScreenPreview() {
             null,
             {},
             {},
+            false,
+            {}
         )
     }
 }
diff --git a/app/src/main/java/com/hoc081098/datastoresample/ui/MainViewModel.kt b/app/src/main/java/com/hoc081098/datastoresample/ui/MainViewModel.kt
@@ -5,26 +5,37 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 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.GetTheme
 import com.hoc081098.datastoresample.domain.model.FilterSortTasks
 import com.hoc081098.datastoresample.domain.model.FilteredSortedTasks
+import com.hoc081098.datastoresample.domain.model.Theme
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
 class MainViewModel(
     filterSortTasks: FilterSortTasks,
+    getTheme: GetTheme,
     private val _changeShowCompleted: ChangeShowCompleted,
     private val _enableSortByDeadline: EnableSortByDeadline,
+    private val _changeTheme: ChangeTheme,
 ) : ViewModel() {
     val state: StateFlow<FilteredSortedTasks?> = filterSortTasks()
         .stateIn(
             viewModelScope,
             SharingStarted.Eagerly,
-            null as FilteredSortedTasks?,
+            null,
         )
 
+    val theme: StateFlow<Theme?> = getTheme().stateIn(
+        viewModelScope,
+        SharingStarted.Eagerly,
+        null,
+    )
+
     init {
         Log.d("MainViewModel", "$this::init")
     }
@@ -42,18 +53,27 @@ class MainViewModel(
         viewModelScope.launch { _enableSortByDeadline(enabled) }
     }
 
+    fun changeTheme(lightTheme: Boolean) {
+        viewModelScope.launch { _changeTheme(lightTheme) }
+    }
+
     class Factory(
         private val filterSortTasks: FilterSortTasks,
+        private val getTheme: GetTheme,
         private val changeShowCompleted: ChangeShowCompleted,
         private val enableSortByDeadline: EnableSortByDeadline,
+        private val changeTheme: ChangeTheme,
+
         ) : ViewModelProvider.Factory {
         override fun <T : ViewModel?> create(modelClass: Class<T>): T {
             if (modelClass.isAssignableFrom(MainViewModel::class.java)) {
                 @Suppress("UNCHECKED_CAST")
                 return MainViewModel(
-                    filterSortTasks,
-                    changeShowCompleted,
-                    enableSortByDeadline
+                    filterSortTasks = filterSortTasks,
+                    getTheme = getTheme,
+                    _changeShowCompleted = changeShowCompleted,
+                    _enableSortByDeadline = enableSortByDeadline,
+                    _changeTheme = changeTheme,
                 ) as T
             }
             error("Unknown ViewModel class: $modelClass")
