From 42872e9ad30f5186eadf11d1152d5582b6762fdd Mon Sep 17 00:00:00 2001 From: Eric85710 Date: Thu, 23 Apr 2026 17:24:30 +0800 Subject: [PATCH] dark mode-v7 --- app/src/main/java/com/example/login_v3/MainActivity.kt | 4 +--- .../setting_detail_page/detail_UI/setting_Theme_Page.kt | 3 ++- .../setting_detail_page/viewmodel/Theme_ViewModel.kt | 6 ++++-- 3 files changed, 7 insertions(+), 6 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 46fb8cf..3258fa3 100644 --- a/app/src/main/java/com/example/login_v3/MainActivity.kt +++ b/app/src/main/java/com/example/login_v3/MainActivity.kt @@ -24,9 +24,7 @@ class MainActivity : ComponentActivity() { installSplashScreen() setContent { - val currentAppTheme = themeViewModel.currentTheme.value - - Login_V3Theme(appTheme = currentAppTheme) { + Login_V3Theme(appTheme = themeViewModel.currentTheme) { 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 e29cedd..2ef961d 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 @@ -21,7 +21,8 @@ import com.example.login_v3.ui.theme.AppTheme fun setting_theme_page( viewModel: Theme_ViewModel ){ - val selectedTheme = viewModel.currentTheme.value + // 直接讀取,不需要 .value + val selectedTheme = viewModel.currentTheme Column(modifier = Modifier.padding(16.dp)) { Text( diff --git a/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/viewmodel/Theme_ViewModel.kt b/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/viewmodel/Theme_ViewModel.kt index 8560cd4..6eadd2b 100644 --- a/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/viewmodel/Theme_ViewModel.kt +++ b/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/viewmodel/Theme_ViewModel.kt @@ -1,14 +1,16 @@ package com.example.login_v3.home.setting.setting_detail_page.viewmodel +import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel import com.example.login_v3.ui.theme.AppTheme class Theme_ViewModel : ViewModel() { - var currentTheme = mutableStateOf(AppTheme.SYSTEM) + var currentTheme by mutableStateOf(AppTheme.DARK) private set fun updateTheme(newTheme: AppTheme) { - currentTheme.value = newTheme + currentTheme = newTheme } } \ No newline at end of file