feat :: 앱 시작 시 선택한 테마 적용

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

@@ -8,6 +8,8 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 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 +18,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 +31,20 @@ 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()
             _isStartupResolved.value = true
         }
+        viewModelScope.launch {
+            themeDataStoreDataSource.getThemeModeFlow().collect { mode ->
+                _themeMode.value = mode
+            }
+        }
     }
 
     fun resolveSession() {