🔀 :: (#914) 시스템 테마 사용자 선택 제공

Author: uson1004

app/build.gradle.kts

@@ -92,6 +92,7 @@ dependencies {
     implementation(project(ProjectPaths.Core.DEVICE))
     implementation(project(ProjectPaths.Core.WIDGET))
     implementation(project(ProjectPaths.Core.ONBOARDING))
+    implementation(project(ProjectPaths.Core.THEME))
 
     implementation(project(ProjectPaths.DATA))
     implementation(project(ProjectPaths.DATABASE))

app/src/main/kotlin/team/aliens/dms/android/app/MainActivity.kt

@@ -6,7 +6,10 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.getValue
 import androidx.core.view.WindowCompat
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import com.google.android.play.core.appupdate.AppUpdateManagerFactory
 import com.google.android.play.core.appupdate.AppUpdateOptions
@@ -19,6 +22,7 @@ import team.aliens.dms.android.app.ui.DmsApp
 import team.aliens.dms.android.core.designsystem.DmsTheme
 import team.aliens.dms.android.core.jwt.di.IsJwtAvailable
 import team.aliens.dms.android.core.notification.DeviceTokenManager
+import team.aliens.dms.android.core.theme.ThemeMode
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -52,7 +56,14 @@ class MainActivity : ComponentActivity() {
 
         checkAppUpdate()
         setContent {
-            DmsTheme {
+            val themeMode by mainViewModel.themeMode.collectAsStateWithLifecycle()
+            val systemIsDark = isSystemInDarkTheme()
+            val isDark = when (themeMode) {
+                ThemeMode.SYSTEM -> systemIsDark
+                ThemeMode.LIGHT -> false
+                ThemeMode.DARK -> true
+            }
+            DmsTheme(isDarkTheme = isDark) {
                 DmsApp()
             }
         }

app/src/main/kotlin/team/aliens/dms/android/app/MainActivityViewModel.kt

@@ -6,8 +6,11 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import team.aliens.dms.android.core.jwt.JwtProvider
+import team.aliens.dms.android.core.theme.ThemeMode
+import team.aliens.dms.android.core.theme.datastore.ThemeDataStoreDataSource
 import team.aliens.dms.android.onboarding.datastore.OnboardingDataStoreDataSource
 import team.aliens.dms.android.shared.exception.util.runCatchingCancellable
 import javax.inject.Inject
@@ -16,6 +19,7 @@ import javax.inject.Inject
 class MainActivityViewModel @Inject constructor(
     private val jwtProvider: JwtProvider,
     private val onboardingDataSource: OnboardingDataStoreDataSource,
+    private val themeDataStoreDataSource: ThemeDataStoreDataSource,
 ) : ViewModel() {
     val autoSignInAvailable: StateFlow<Boolean> = jwtProvider.isCachedRefreshTokenAvailable
 
@@ -28,12 +32,21 @@ class MainActivityViewModel @Inject constructor(
     private val _isStartupResolved = MutableStateFlow(false)
     val isStartupResolved: StateFlow<Boolean> = _isStartupResolved.asStateFlow()
 
+    private val _themeMode = MutableStateFlow(ThemeMode.SYSTEM)
+    val themeMode: StateFlow<ThemeMode> = _themeMode.asStateFlow()
+
     init {
         viewModelScope.launch {
             runCatchingCancellable { jwtProvider.resolveSession() }
             _isOnboardingCompleted.value = onboardingDataSource.getOnboardingCompleted()
+            _themeMode.value = themeDataStoreDataSource.getThemeModeFlow().first()
             _isStartupResolved.value = true
         }
+        viewModelScope.launch {
+            themeDataStoreDataSource.getThemeModeFlow().collect { mode ->
+                _themeMode.value = mode
+            }
+        }
     }
 
     fun resolveSession() {

buildSrc/src/main/kotlin/ProjectPaths.kt

@@ -20,6 +20,7 @@ object ProjectPaths {
         const val DEVICE = ":core:device"
         const val WIDGET = ":core:widget"
         const val ONBOARDING = ":core:onboarding"
+        const val THEME = ":core:theme"
     }
 
     object Shared {

core/datastore/src/main/java/team/aliens/dms/android/core/datastore/DataStore.kt

@@ -10,3 +10,5 @@ internal val Context.featuresStore: PreferencesDataStore by preferencesDataStore
 internal val Context.deviceStore: PreferencesDataStore by preferencesDataStore("device-datastore")
 
 internal val Context.onboardingStore: PreferencesDataStore by preferencesDataStore("onboarding-datastore")
+
+internal val Context.themeStore: PreferencesDataStore by preferencesDataStore("theme-datastore")

core/datastore/src/main/java/team/aliens/dms/android/core/datastore/Qualifier.kt

@@ -17,3 +17,7 @@ annotation class JwtDataStore
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class OnboardingDataStore
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class ThemeDataStore

core/datastore/src/main/java/team/aliens/dms/android/core/datastore/di/DataStoreModule.kt

@@ -11,10 +11,12 @@ import team.aliens.dms.android.core.datastore.FeaturesDataStore
 import team.aliens.dms.android.core.datastore.JwtDataStore
 import team.aliens.dms.android.core.datastore.OnboardingDataStore
 import team.aliens.dms.android.core.datastore.PreferencesDataStore
+import team.aliens.dms.android.core.datastore.ThemeDataStore
 import team.aliens.dms.android.core.datastore.deviceStore
 import team.aliens.dms.android.core.datastore.featuresStore
 import team.aliens.dms.android.core.datastore.jwtStore
 import team.aliens.dms.android.core.datastore.onboardingStore
+import team.aliens.dms.android.core.datastore.themeStore
 import javax.inject.Singleton
 
 @Module
@@ -48,4 +50,11 @@ internal object DataStoreModule {
     fun provideOnboardingDataStore(
         @ApplicationContext context: Context,
     ): PreferencesDataStore = context.onboardingStore
+
+    @Provides
+    @Singleton
+    @ThemeDataStore
+    fun provideThemeDataStore(
+        @ApplicationContext context: Context,
+    ): PreferencesDataStore = context.themeStore
 }

core/theme/.gitignore

@@ -0,0 +1 @@
+/build

core/theme/build.gradle.kts

@@ -0,0 +1,52 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
+}
+
+android {
+    namespace = "team.aliens.dms.android.core.theme"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = Versions.java
+        targetCompatibility = Versions.java
+    }
+
+    kotlinOptions {
+        jvmTarget = Versions.java.toString()
+    }
+}
+
+dependencies {
+    implementation(project(ProjectPaths.Core.DATASTORE))
+
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.datastore.preferences)
+
+    implementation(libs.hilt)
+    ksp(libs.hilt.compiler)
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso)
+}