diff --git a/app/build.gradle b/app/build.gradle index 60d2762cb..113a4a346 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -178,6 +178,10 @@ dependencies { implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' implementation 'com.drakeet.drawer:drawer:1.0.3' + + def accompanist_version = "0.28.0" + implementation "com.google.accompanist:accompanist-themeadapter-material3:$accompanist_version" + implementation 'com.google.android.material:material:1.8.0-rc01' implementation 'com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.11' diff --git a/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt index 8a3498e83..6ea295536 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt @@ -6,14 +6,14 @@ import androidx.activity.compose.setContent import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import com.google.accompanist.themeadapter.material3.Mdc3Theme import com.hippo.ehviewer.ui.compose.SignInScreen -import com.hippo.ehviewer.ui.compose.theme.EhViewerTheme class LoginActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - EhViewerTheme { + Mdc3Theme { val navController = rememberNavController() NavHost(navController = navController, startDestination = SIGN_IN_ROUTE_NAME) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/SignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/SignInScreen.kt index 22fe96ed2..db133e92a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/compose/SignInScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/SignInScreen.kt @@ -24,10 +24,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.hippo.ehviewer.R -import com.hippo.ehviewer.ui.compose.theme.EhViewerTheme @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -122,11 +120,3 @@ fun SignInScreen() { CircularProgressIndicator() } } - -@Preview -@Composable -fun SignInScreenPreview() { - EhViewerTheme { - SignInScreen() - } -} diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/theme/Theme.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/theme/Theme.kt deleted file mode 100644 index 391818e21..000000000 --- a/app/src/main/java/com/hippo/ehviewer/ui/compose/theme/Theme.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.hippo.ehviewer.ui.compose.theme - -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.dynamicDarkColorScheme -import androidx.compose.material3.dynamicLightColorScheme -import androidx.compose.material3.lightColorScheme -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext -import com.google.android.material.color.DynamicColors - -private val DarkColorScheme = darkColorScheme() -private val LightColorScheme = lightColorScheme() - -@Composable -fun EhViewerTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - content: @Composable () -> Unit -) { - val colorScheme = when { - DynamicColors.isDynamicColorAvailable() -> { - val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) - } - - darkTheme -> DarkColorScheme - else -> LightColorScheme - } - - MaterialTheme( - colorScheme = colorScheme, - content = content - ) -} \ No newline at end of file