Improve Igneous cookie handling

2022-12-01 14:18:52 -05:00
parent 6402258c83
commit 51c5f29b25
3 changed files with 98 additions and 31 deletions
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -22,6 +23,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -105,7 +107,7 @@ fun EhLoginWebViewScreen(
                }
            }
        }
-        var showAdvancedOptions by remember {
+        var showAdvancedOptions by rememberSaveable {
            mutableStateOf(false)
        }

@@ -114,7 +116,9 @@ fun EhLoginWebViewScreen(
                WebView(
                    state = state,
                    navigator = navigator,
-                    modifier = Modifier.padding(bottom = 48.dp),
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(bottom = 48.dp),
                    onCreated = { webView ->
                        webView.setDefaultSettings()

@@ -143,7 +147,11 @@ fun EhLoginWebViewScreen(
                }
            }
            if (showAdvancedOptions) {
-                Box(Modifier.background(Color(0xb5000000))) {
+                Box(
+                    Modifier
+                        .fillMaxSize()
+                        .background(Color(0xb5000000))
+                ) {
                    Dialog(onDismissRequest = { showAdvancedOptions = false }) {
                        fun loadUrl(url: String) {
                            state.content = WebContent.Url(url)
@@ -0,0 +1,61 @@
+package eu.kanade.presentation.webview.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.window.DialogProperties
+import eu.kanade.tachiyomi.R
+
+@Composable
+fun IgneousDialog(
+    onDismissRequest: () -> Unit,
+    onIgneousSet: (String) -> Unit,
+) {
+    var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(TextFieldValue(""))
+    }
+    AlertDialog(
+        onDismissRequest = onDismissRequest,
+        title = { Text(text = stringResource(R.string.custom_igneous_cookie)) },
+        text = {
+            Column {
+                Text(text = stringResource(R.string.custom_igneous_cookie_message))
+                OutlinedTextField(
+                    value = textFieldValue,
+                    onValueChange = { textFieldValue = it },
+                    singleLine = true,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+            }
+        },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = true,
+        ),
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onIgneousSet(textFieldValue.text.trim())
+                    onDismissRequest()
+                },
+            ) {
+                Text(text = stringResource(android.R.string.ok))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismissRequest) {
+                Text(text = stringResource(R.string.action_cancel))
+            }
+        },
+    )
+}