stop using alertdialog for settings

app/src/main/java/com/geode/launcher/preferences/SettingsComponents.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.defaultMinSize
@@ -23,8 +24,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -248,12 +249,16 @@ fun StringDialog(
 ) {
     var enteredValue by remember { mutableStateOf(initialValue) }
 
-    AlertDialog(
+    BaseDialog(
         onDismissRequest = { onDismissRequest() },
-        title = {
+        title = title,
-            Text(title)
+        content = {
-        },
+            Column(
-        text = {
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 12.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
                 OutlinedTextField(
                     value = enteredValue,
                     onValueChange = {
@@ -275,6 +280,8 @@ fun StringDialog(
                         }
                     }
                 )
+            }
+
         },
         confirmButton = {
             TextButton(onClick = { onSelect(enteredValue) }) {
@@ -305,17 +312,14 @@ fun RangeDialog(
         mutableFloatStateOf(initialValue / scale.toFloat())
     }
 
-    AlertDialog(
+    BaseDialog(
         onDismissRequest = { onDismissRequest() },
-        title = {
+        title = title,
-            Text(title)
+        content = {
-        },
-        text = {
-            Column {
             Row(
                 horizontalArrangement = Arrangement.spacedBy(16.dp),
                 verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.weight(1.0f, false)
+                modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp)
             ) {
                 val precision = log10(scale.toFloat()).roundToInt()
 
@@ -331,8 +335,6 @@ fun RangeDialog(
             }
 
             children()
-
-            }
         },
         confirmButton = {
             TextButton(onClick = { onSelect((enteredValue * scale).roundToInt()) }) {
@@ -367,16 +369,16 @@ fun FrameRateDialog(
     val maximumReached = currentValue != null && currentValue > maxFrameRate
     val minimumReached = currentValue != null && currentValue < minFrameRate
 
-    AlertDialog(
+    BaseDialog(
         onDismissRequest = { onDismissRequest() },
-        title = {
+        title = title,
-            Text(title)
+        content = {
-        },
+            Column(
-        text = {
+                modifier = Modifier
-            Column {
+                    .padding(horizontal = 12.dp)
+            ) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.weight(1.0f, false)
                 ) {
                     IconButton(onClick = {
                         val prevValue = max((currentValue ?: 0) - 5, minFrameRate)
@@ -629,16 +631,14 @@ fun ProfileCreateDialog(onDismissRequest: () -> Unit) {
 
     val isDuplicate = currentProfiles.contains(filename)
 
-    AlertDialog(
+    BaseDialog(
         onDismissRequest = { onDismissRequest() },
-        title = {
+        title = stringResource(R.string.preference_profiles_create),
-            Text(stringResource(R.string.preference_profiles_create))
+        content = {
-        },
+            Column(
-        text = {
+                modifier = Modifier
-            Column {
+                    .fillMaxWidth()
-                Row(
+                    .padding(horizontal = 12.dp)
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.weight(1.0f, false)
             ) {
                 OutlinedTextField(
                     value = enteredValue,
@@ -652,9 +652,9 @@ fun ProfileCreateDialog(onDismissRequest: () -> Unit) {
                     label = {
                         Text(stringResource(R.string.preference_profiles_create_name))
                     },
-                        isError = isDuplicate
+                    isError = isDuplicate,
+                    modifier = Modifier.align(Alignment.CenterHorizontally)
                 )
-                }
 
                 if (isDuplicate) {
                     Spacer(Modifier.size(8.dp))
@@ -806,18 +806,19 @@ fun ProfileSelectCard() {
 }
 
 @Composable
-fun <T> SelectDialog(
+fun BaseDialog(
     title: String,
     onDismissRequest: () -> Unit,
-    onSelect: (T) -> Unit,
+    dismissButton: @Composable () -> Unit,
-    initialValue: T,
+    confirmButton: @Composable () -> Unit,
-    options: @Composable () -> Unit,
+    content: @Composable (ColumnScope.() -> Unit),
 ) {
-    val (selectedValue, setSelectedValue) = remember { mutableStateOf(initialValue) }
-
     Dialog(onDismissRequest = onDismissRequest) {
         Card(
-            shape = RoundedCornerShape(16.dp)
+            shape = RoundedCornerShape(16.dp),
+            colors = CardDefaults.cardColors(
+                containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
+            )
         ) {
             // styling a dialog is actually a little hard if you're doing what i'm doing
             // maybe there's a better way to make these padding values...
@@ -832,15 +833,7 @@ fun <T> SelectDialog(
                     )
                 )
 
-                CompositionLocalProvider(
+                content()
-                    LocalSelectValue provides (selectedValue as Any),
-                    LocalSelectSetValue provides ({
-                        @Suppress("UNCHECKED_CAST")
-                        setSelectedValue(it as T)
-                    })
-                ) {
-                    options()
-                }
 
                 Row(
                     horizontalArrangement = Arrangement.End,
@@ -852,15 +845,46 @@ fun <T> SelectDialog(
                             top = 4.dp
                         )
                 ) {
+                    dismissButton()
+                    confirmButton()
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun <T> SelectDialog(
+    title: String,
+    onDismissRequest: () -> Unit,
+    onSelect: (T) -> Unit,
+    initialValue: T,
+    options: @Composable () -> Unit,
+) {
+    val (selectedValue, setSelectedValue) = remember { mutableStateOf(initialValue) }
+
+    BaseDialog(
+        title = title,
+        onDismissRequest = onDismissRequest,
+        dismissButton = {
             TextButton(onClick = onDismissRequest) {
                 Text(stringResource(R.string.message_box_cancel))
             }
-
+        },
+        confirmButton = {
             TextButton(onClick = { onSelect(selectedValue) }) {
                 Text(stringResource(R.string.message_box_accept))
             }
         }
-            }
+    ) {
+        CompositionLocalProvider(
+            LocalSelectValue provides (selectedValue as Any),
+            LocalSelectSetValue provides ({
+                @Suppress("UNCHECKED_CAST")
+                setSelectedValue(it as T)
+            })
+        ) {
+            options()
         }
     }
 }