From 8e3944985604524bc7574be9560705d169b176df Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 11 Jan 2023 13:06:27 +0800 Subject: [PATCH] Restore finish from SelectSiteScreen --- app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt | 4 +++- .../java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 0a47af7f9..eb2b72c41 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt @@ -33,7 +33,9 @@ class LoginActivity : ComponentActivity() { } composable(SELECT_SITE_ROUTE_NAME) { - SelectSiteScreen() + SelectSiteScreen() { + finish() + } } } } 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 index 94763dae7..adc17fb9b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt @@ -37,7 +37,7 @@ import com.hippo.ehviewer.Settings import com.hippo.ehviewer.client.EhUrl @Composable -fun SelectSiteScreen() { +fun SelectSiteScreen(finish: () -> Unit) { var site by remember { mutableStateOf(EhApplication.ehCookieStore.hasSignedIn()) } // false for e, true for ex Column( @@ -112,7 +112,7 @@ fun SelectSiteScreen() { Settings.putGallerySite(EhUrl.SITE_E) else Settings.putGallerySite(EhUrl.SITE_EX) - // finish activity + finish() }, Modifier.fillMaxWidth()) { Text(text = stringResource(id = android.R.string.ok)) }