From 7580e8ab62170cb73cb1216e200558b8e7c68701 Mon Sep 17 00:00:00 2001
From: zt64 <nwowens32@gmail.com>
Date: Fri, 25 Mar 2022 14:18:25 -0400
Subject: [PATCH] Switched to Material 3 text field

---
 .../manager/ui/components/PluginsList.kt      |  5 ++-
 .../manager/ui/components/TextField.kt        | 45 -------------------
 .../manager/ui/screens/SettingsScreen.kt      | 13 +++---
 3 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 app/src/main/kotlin/com/aliucord/manager/ui/components/TextField.kt

diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/PluginsList.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/PluginsList.kt
index 4e5ac90..7788f3c 100644
--- a/app/src/main/kotlin/com/aliucord/manager/ui/components/PluginsList.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/PluginsList.kt
@@ -36,10 +36,11 @@ fun PluginsList() = Column(
     var search by remember { mutableStateOf("") }
 
     if (plugins.isNotEmpty()) {
-        TextField(
+        OutlinedTextField(
+            modifier = Modifier.fillMaxWidth(),
             value = search,
             onValueChange = { search = it },
-            placeholder = { Text(stringResource(R.string.search)) },
+            label = { Text(stringResource(R.string.search)) },
             trailingIcon = { Icon(Icons.Default.Search, stringResource(R.string.search_plugins)) },
             keyboardOptions = KeyboardOptions(autoCorrect = false, imeAction = ImeAction.Search),
             keyboardActions = KeyboardActions { focusManager.clearFocus() },
diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/TextField.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/TextField.kt
deleted file mode 100644
index a77a4e5..0000000
--- a/app/src/main/kotlin/com/aliucord/manager/ui/components/TextField.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2022 Juby210 & zt
- * Licensed under the Open Software License version 3.0
- */
-
-package com.aliucord.manager.ui.components
-
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.TextFieldDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun TextField(
-    value: String,
-    onValueChange: (String) -> Unit,
-    placeholder: @Composable (() -> Unit)? = null,
-    label: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    keyboardOptions: KeyboardOptions = KeyboardOptions(autoCorrect = false),
-    keyboardActions: KeyboardActions = KeyboardActions.Default,
-) = OutlinedTextField(
-    modifier = Modifier.fillMaxWidth(),
-    singleLine = true,
-    value = value,
-    onValueChange = onValueChange,
-    placeholder = placeholder,
-    label = label,
-    trailingIcon = trailingIcon,
-    keyboardOptions = keyboardOptions,
-    keyboardActions = keyboardActions,
-    shape = RoundedCornerShape(16.dp),
-    colors = TextFieldDefaults.outlinedTextFieldColors(
-        textColor = MaterialTheme.colorScheme.onSecondaryContainer,
-        backgroundColor = MaterialTheme.colorScheme.secondaryContainer,
-        focusedBorderColor = MaterialTheme.colorScheme.outline,
-        cursorColor = MaterialTheme.colorScheme.primary
-    )
-)
diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/SettingsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/SettingsScreen.kt
index c6c8728..5855c01 100644
--- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/SettingsScreen.kt
@@ -22,7 +22,6 @@ import androidx.compose.ui.unit.dp
 import com.aliucord.manager.R
 import com.aliucord.manager.preferences.Prefs
 import com.aliucord.manager.ui.components.ListItem
-import com.aliucord.manager.ui.components.TextField
 import com.aliucord.manager.ui.components.settings.*
 import com.ramcosta.composedestinations.annotation.Destination
 
@@ -57,10 +56,12 @@ fun SettingsScreen() = Column(
         preference = Prefs.replaceBg
     )
 
-    TextField(
+    OutlinedTextField(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 10.dp),
         value = Prefs.appName.get(),
         onValueChange = Prefs.appName::set,
-        placeholder = { Text(stringResource(R.string.app_name_setting)) },
         label = { Text(stringResource(R.string.app_name_setting)) },
     )
 
@@ -73,10 +74,12 @@ fun SettingsScreen() = Column(
     )
 
     if (devModeOn) {
-        TextField(
+        OutlinedTextField(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp),
             value = Prefs.packageName.get(),
             onValueChange = Prefs.packageName::set,
-            placeholder = { Text(stringResource(R.string.package_name)) },
             label = { Text(stringResource(R.string.package_name)) },
         )