From 627abb047cf9966cbfc83b2f7688ffaddc4346e1 Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 11 Jan 2023 12:07:33 +0800 Subject: [PATCH] Compose dependency tweaks --- app/build.gradle | 7 ------- app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt | 3 ++- .../com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt | 8 ++++++++ .../java/com/hippo/ehviewer/ui/compose/SignInScreen.kt | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt diff --git a/app/build.gradle b/app/build.gradle index d8c89837a..d0c67a14c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -122,15 +122,8 @@ dependencies { implementation "androidx.collection:collection-ktx:$collection_version" implementation platform("androidx.compose:compose-bom:2022.12.00") - implementation "androidx.compose.animation:animation" - implementation "androidx.compose.foundation:foundation" - implementation "androidx.compose.foundation:foundation-layout" implementation "androidx.compose.material:material-icons-extended" implementation "androidx.compose.material3:material3" - implementation "androidx.compose.runtime:runtime" - implementation "androidx.compose.runtime:runtime-saveable" - implementation "androidx.compose.ui:ui" - implementation 'androidx.compose.ui:ui-graphics' implementation 'androidx.compose.ui:ui-tooling-preview' implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha05" 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 a5617c917..0a47af7f9 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt @@ -9,6 +9,7 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import com.google.accompanist.themeadapter.material3.Mdc3Theme import com.hippo.ehviewer.ui.compose.CookieSignInScene +import com.hippo.ehviewer.ui.compose.SelectSiteScreen import com.hippo.ehviewer.ui.compose.SignInScreen class LoginActivity : ComponentActivity() { @@ -32,7 +33,7 @@ class LoginActivity : ComponentActivity() { } composable(SELECT_SITE_ROUTE_NAME) { - + SelectSiteScreen() } } } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt new file mode 100644 index 000000000..ed1932de1 --- /dev/null +++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt @@ -0,0 +1,8 @@ +package com.hippo.ehviewer.ui.compose + +import androidx.compose.runtime.Composable + +@Composable +fun SelectSiteScreen() { + +} 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 37e10e75d..63f68f5b6 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 @@ -123,7 +123,7 @@ fun SignInScreen(navController: NavController) { getProfile() } withUIContext { - // navigate to selectSite + navController.navigate(SELECT_SITE_ROUTE_NAME) } } }