From 62d0de3ef6ed9a516404a2116b6630a27fe83167 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Fri, 17 Dec 2021 11:56:34 +0900
Subject: [PATCH] Changed Theme / Deprecated Preferences. Use DataStore
 instead.

---
 app/build.gradle.kts                              |  5 ++++-
 .../quaver/pupil/ui/composable/ProgressCard.kt    |  3 ++-
 .../main/java/xyz/quaver/pupil/ui/theme/Theme.kt  | 14 ++++++++++++--
 .../quaver/pupil/ui/viewmodel/MainViewModel.kt    | 15 +++++++++++----
 .../java/xyz/quaver/pupil/util/Preferences.kt     |  1 +
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b4fc8664..da4d115b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -111,10 +111,13 @@ dependencies {
     kapt("androidx.room:room-compiler:2.3.0")
     implementation("androidx.room:room-ktx:2.3.0")
 
+    implementation("androidx.datastore:datastore:1.0.0")
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
+
     implementation("org.kodein.di:kodein-di-framework-compose:7.9.0")
 
     implementation("com.google.android.material:material:1.4.0")
-    0
+
     implementation(platform("com.google.firebase:firebase-bom:28.3.0"))
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation("com.google.firebase:firebase-crashlytics")
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/composable/ProgressCard.kt b/app/src/main/java/xyz/quaver/pupil/ui/composable/ProgressCard.kt
index 474215e8..d713cbf0 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/composable/ProgressCard.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/composable/ProgressCard.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Card
 import androidx.compose.material.LinearProgressIndicator
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -20,7 +21,7 @@ fun ProgressCard(progress: Float? = null, content: @Composable () -> Unit) {
         elevation = 4.dp
     ) {
         Column {
-            progress?.run { LinearProgressIndicator(progress = progress, modifier = Modifier.fillMaxWidth()) }
+            progress?.run { LinearProgressIndicator(progress = progress, modifier = Modifier.fillMaxWidth(), color = MaterialTheme.colors.secondary) }
             content()
         }
     }
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/theme/Theme.kt b/app/src/main/java/xyz/quaver/pupil/ui/theme/Theme.kt
index bc238c6d..05fe729d 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/theme/Theme.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/theme/Theme.kt
@@ -23,9 +23,19 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.darkColors
 import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
 
-private val DarkColorPalette = darkColors()
-private val LightColorPalette = lightColors()
+private val DarkColorPalette = darkColors(
+    secondary = Pink600,
+    onSecondary = Color.White
+)
+private val LightColorPalette = lightColors(
+    primary = LightBlue300,
+    primaryVariant = LightBlue700,
+    secondary = Pink600,
+    onPrimary = Color.White,
+    onSecondary = Color.White
+)
 
 @Composable
 fun PupilTheme(
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/viewmodel/MainViewModel.kt b/app/src/main/java/xyz/quaver/pupil/ui/viewmodel/MainViewModel.kt
index 4ae94c60..19766229 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/viewmodel/MainViewModel.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/viewmodel/MainViewModel.kt
@@ -18,10 +18,15 @@
 
 package xyz.quaver.pupil.ui.viewmodel
 
-import android.annotation.SuppressLint
 import android.app.Application
-import androidx.compose.runtime.*
-import androidx.lifecycle.*
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
+import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.*
 import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
@@ -29,7 +34,9 @@ import org.kodein.di.direct
 import org.kodein.di.instance
 import org.kodein.log.LoggerFactory
 import org.kodein.log.newLogger
-import xyz.quaver.pupil.sources.*
+import xyz.quaver.pupil.sources.History
+import xyz.quaver.pupil.sources.ItemInfo
+import xyz.quaver.pupil.sources.Source
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.source
 import kotlin.math.ceil
diff --git a/app/src/main/java/xyz/quaver/pupil/util/Preferences.kt b/app/src/main/java/xyz/quaver/pupil/util/Preferences.kt
index 1fce3dff..4df4cfb7 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/Preferences.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/Preferences.kt
@@ -23,6 +23,7 @@ import kotlin.reflect.KClass
 
 lateinit var preferences: SharedPreferences
 
+@Deprecated("Use DataStore")
 object Preferences: SharedPreferences by preferences {
 
     val defMap = mapOf(