From 33412637dca6d1419f1a3b57f7b36f3b7ec37ffb Mon Sep 17 00:00:00 2001 From: Eric85710 Date: Thu, 23 Apr 2026 15:25:19 +0800 Subject: [PATCH] dark mode-v5 --- app/src/main/java/com/example/login_v3/MainActivity.kt | 10 +++++++++- .../detail_UI/setting_Theme_Page.kt | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/example/login_v3/MainActivity.kt b/app/src/main/java/com/example/login_v3/MainActivity.kt index c51f2e3..46fb8cf 100644 --- a/app/src/main/java/com/example/login_v3/MainActivity.kt +++ b/app/src/main/java/com/example/login_v3/MainActivity.kt @@ -4,21 +4,29 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge +import androidx.activity.viewModels import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.example.login_v3.auth.HealthCheckScreen +import com.example.login_v3.home.setting.setting_detail_page.viewmodel.Theme_ViewModel import com.example.login_v3.ui.theme.AppTheme import com.example.login_v3.ui.theme.Login_V3Theme import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class MainActivity : ComponentActivity() { + + //color mode viewmodel + private val themeViewModel by viewModels() + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() installSplashScreen() setContent { - Login_V3Theme(appTheme = AppTheme.DARK) { + val currentAppTheme = themeViewModel.currentTheme.value + + Login_V3Theme(appTheme = currentAppTheme) { Technologia() } } diff --git a/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/detail_UI/setting_Theme_Page.kt b/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/detail_UI/setting_Theme_Page.kt index 414cdb9..190ac5a 100644 --- a/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/detail_UI/setting_Theme_Page.kt +++ b/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/detail_UI/setting_Theme_Page.kt @@ -50,9 +50,9 @@ fun setting_theme_page( ) Text( text = when(theme) { - AppTheme.SYSTEM -> "跟隨系統設定" - AppTheme.LIGHT -> "淺色模式" - AppTheme.DARK -> "深色模式" + AppTheme.SYSTEM -> "follow" + AppTheme.LIGHT -> "dark" + AppTheme.DARK -> "light" }, modifier = Modifier.padding(start = 8.dp) )