Use top-level func

This commit is contained in:
tarsin committed 2023-02-08 08:48:30 +08:00
1 parent a3f0d7092d
commit 22e144cb3b
4 files changed
+22 -28

No files matched your search

@@ -64,7 +64,7 @@ import java.util.Locale
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun CookieSignInScene(navController: NavController, postLogin: suspend () -> Unit) {
fun CookieSignInScene(navController: NavController) {
val clipboardManager = LocalClipboardManager.current
val focusManager = LocalFocusManager.current
val snackbarHostState = remember { SnackbarHostState() }
@@ -25,21 +25,15 @@ class LoginActivity : EhActivity() {
NavHost(navController = navController, startDestination = SIGN_IN_ROUTE_NAME) {
composable(SIGN_IN_ROUTE_NAME) {
SignInScreen(navController) {
postLogin()
}
SignInScreen(navController)
}
composable(WEBVIEW_SIGN_IN_ROUTE_NAME) {
WebviewSignInScreen(navController) {
postLogin()
}
WebviewSignInScreen(navController)
}
composable(COOKIE_SIGN_IN_ROUTE_NAME) {
CookieSignInScene(navController) {
postLogin()
}
CookieSignInScene(navController)
}
composable(SELECT_SITE_ROUTE_NAME) {
@@ -64,28 +58,28 @@ class LoginActivity : EhActivity() {
Settings.putNeedSignIn(false)
ActivityNavigator.applyPopAnimationsToPendingTransition(this)
}
}
private suspend fun postLogin() {
runCatching {
EhEngine.getProfile().run {
Settings.putDisplayName(displayName)
Settings.putAvatar(avatar)
}
}.onFailure {
it.printStackTrace()
suspend fun postLogin() {
runCatching {
EhEngine.getProfile().run {
Settings.putDisplayName(displayName)
Settings.putAvatar(avatar)
}
}.onFailure {
it.printStackTrace()
}
runCatching {
Settings.putGallerySite(EhUrl.SITE_EX)
EhEngine.getUConfig()
}.onFailure {
Settings.putSelectSite(false)
Settings.putGallerySite(EhUrl.SITE_E)
runCatching {
Settings.putGallerySite(EhUrl.SITE_EX)
EhEngine.getUConfig()
}.onFailure {
Settings.putSelectSite(false)
Settings.putGallerySite(EhUrl.SITE_E)
runCatching {
EhEngine.getUConfig()
}.onFailure {
it.printStackTrace()
}
it.printStackTrace()
}
}
}
@@ -67,7 +67,7 @@ import rikka.core.util.ContextUtils.requireActivity
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SignInScreen(navController: NavController, postLogin: suspend () -> Unit) {
fun SignInScreen(navController: NavController) {
val coroutineScope = rememberCoroutineScope()
val focusManager = LocalFocusManager.current
var isProgressIndicatorVisible by rememberSaveable { mutableStateOf(false) }
@@ -23,7 +23,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
@SuppressLint("SetJavaScriptEnabled")
@Composable
fun WebviewSignInScreen(navController: NavController, postLogin: suspend () -> Unit) {
fun WebviewSignInScreen(navController: NavController) {
val context = LocalContext.current
val coroutineScope = rememberCoroutineScope()
AndroidView(factory = {