make some dialogs scrollable

Author: Helium314

app/src/main/java/helium314/keyboard/settings/dialogs/DictionaryDialog.kt

@@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
@@ -62,8 +60,7 @@ fun DictionaryDialog(
         cancelButtonText = stringResource(R.string.dialog_close),
         title = { Text(locale.localizedDisplayName(LocalResources.current)) },
         content = {
-            val state = rememberScrollState()
-            Column(Modifier.verticalScroll(state)) {
+            Column {
                 if (hasInternal) {
                     val color = if (mainDict == null) MaterialTheme.typography.titleSmall.color
                     else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f) // for disabled look
@@ -97,6 +94,7 @@ fun DictionaryDialog(
                 }
             }
         },
+        scrollContent = true,
         neutralButtonText = stringResource(R.string.add_new_dictionary_title),
         onNeutral = {
             val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)

app/src/main/java/helium314/keyboard/settings/dialogs/InfoDialog.kt

@@ -25,6 +25,7 @@ fun InfoDialog(
     ThreeButtonAlertDialog(
         onDismissRequest = onDismissRequest,
         content = { Text(message) },
+        scrollContent = true,
         cancelButtonText = stringResource(android.R.string.ok),
         onConfirmed = { },
         confirmButtonText = null

app/src/main/java/helium314/keyboard/settings/dialogs/NewDictionaryDialog.kt

@@ -116,7 +116,8 @@ fun NewDictionaryDialog(
                         )
                     }
                 }
-            }
+            },
+            scrollContent = true,
         )
     }
 }

app/src/main/java/helium314/keyboard/settings/dialogs/ThreeButtonAlertDialog.kt

@@ -12,6 +12,8 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -36,6 +38,7 @@ fun ThreeButtonAlertDialog(
     modifier: Modifier = Modifier,
     title: @Composable (() -> Unit)? = null,
     content: @Composable (() -> Unit)? = null,
+    scrollContent: Boolean = false,
     onNeutral: () -> Unit = { },
     checkOk: () -> Boolean = { true },
     confirmButtonText: String? = stringResource(android.R.string.ok),
@@ -72,8 +75,19 @@ fun ThreeButtonAlertDialog(
                     }
                     content?.let {
                         CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.bodyMedium) {
-                            Box(Modifier.weight(weight = 1f, fill = false).padding(bottom = if (reducePadding) 2.dp else 8.dp)) {
-                                content()
+                            if (scrollContent) {
+                                val scrollState = rememberScrollState()
+                                Box(Modifier
+                                    .weight(weight = 1f, fill = false)
+                                    .padding(bottom = if (reducePadding) 2.dp else 8.dp)
+                                    .verticalScroll(scrollState)
+                                ) {
+                                    content()
+                                }
+                            } else {
+                                Box(Modifier.weight(weight = 1f, fill = false).padding(bottom = if (reducePadding) 2.dp else 8.dp)) {
+                                    content()
+                                }
                             }
                         }
                     }