Merge pull request #40 from miguelguzmanr/main

Add search to AppPickerDialog
langerhans · May 16, 2024 · fde638d · fde638d
2 parents b32e54f + b0a4f14
commit fde638d
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 23 deletions.
diff --git a/app/src/main/java/de/langerhans/odintools/appsettings/AppOverrideListScreen.kt b/app/src/main/java/de/langerhans/odintools/appsettings/AppOverrideListScreen.kt
@@ -6,30 +6,40 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 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.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
 import de.langerhans.odintools.R
-import de.langerhans.odintools.ui.composables.DialogButton
 import de.langerhans.odintools.ui.composables.OdinTopAppBar
 
 @Composable
@@ -116,26 +126,71 @@ fun AppItem(packageName: String, label: String, icon: Drawable, iconSize: Dp = 4
 
 @Composable
 fun AppPickerDialog(apps: List<AppUiModel>, onAppSelected: (String) -> Unit, onDismiss: () -> Unit) {
-    AlertDialog(onDismissRequest = {}, confirmButton = { }, dismissButton = {
-        DialogButton(text = stringResource(id = R.string.cancel), onDismiss)
-    }, title = {}, text = {
-        if (apps.isEmpty()) {
-            Text(text = stringResource(id = R.string.noOverrideCandidates))
-            return@AlertDialog
-        }
-        LazyColumn(
-            modifier = Modifier.fillMaxWidth(),
-        ) {
-            items(items = apps, itemContent = {
-                AppItem(
-                    it.packageName,
-                    it.appName,
-                    it.appIcon,
-                    36.dp,
-                    "",
-                    onAppSelected,
+    var searchText by rememberSaveable { mutableStateOf("") }
+    val filteredApps = apps.filter {
+        it.appName.contains(searchText, ignoreCase = true)
+    }.ifEmpty {
+        apps.filter { it.packageName.contains(searchText, ignoreCase = true) }
+    }
+
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        title = {},
+        text = {
+            val focusManager = LocalFocusManager.current
+            if (apps.isEmpty()) {
+                Text(text = stringResource(id = R.string.noOverrideCandidates))
+                return@AlertDialog
+            }
+            Column {
+                OutlinedTextField(
+                    value = searchText,
+                    onValueChange = {
+                        searchText = it
+                    },
+                    modifier = Modifier.fillMaxWidth(),
+                    placeholder = {
+                        Text(text = stringResource(id = R.string.searchApp))
+                    },
+                    keyboardOptions = KeyboardOptions(
+                        imeAction = ImeAction.Search,
+                        keyboardType = KeyboardType.Text,
+                    ),
+                    keyboardActions = KeyboardActions(
+                        onAny = {
+                            searchText = searchText.trim()
+                            focusManager.clearFocus()
+                        },
+                    ),
+                    singleLine = true,
                 )
-            })
-        }
-    })
+                Spacer(modifier = Modifier.height(4.dp))
+                if (filteredApps.isEmpty()) {
+                    Text(
+                        text = stringResource(id = R.string.noMatches),
+                    )
+                } else {
+                    LazyColumn(
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        items(
+                            items = filteredApps,
+                            itemContent = {
+                                AppItem(
+                                    it.packageName,
+                                    it.appName,
+                                    it.appIcon,
+                                    36.dp,
+                                    "",
+                                    onAppSelected,
+                                )
+                            },
+                        )
+                    }
+                }
+            }
+        },
+        confirmButton = {},
+        dismissButton = {},
+    )
 }
diff --git a/app/src/main/java/de/langerhans/odintools/ui/composables/Preferences.kt b/app/src/main/java/de/langerhans/odintools/ui/composables/Preferences.kt
@@ -52,6 +52,7 @@ import androidx.compose.ui.window.Dialog
 import de.langerhans.odintools.R
 import de.langerhans.odintools.main.CheckboxPreferenceUiModel
 import de.langerhans.odintools.ui.theme.Typography
+import java.util.Locale
 import kotlin.math.roundToInt
 
 @Composable
@@ -253,7 +254,7 @@ fun SaturationPreferenceDialog(initialValue: Float, onCancel: () -> Unit, onSave
                     .padding(end = 4.dp),
             )
             Text(
-                text = String.format("%.1f", userValue),
+                text = String.format(Locale.getDefault(), "%.1f", userValue),
                 style = MaterialTheme.typography.bodyLarge,
             )
         }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -56,6 +56,8 @@
     <string name="overrideDelayDescription">Delay applying overrides by 0.5s. This can help if apps crash when applying an
         override.
     </string>
+    <string name="searchApp">Search</string>
+    <string name="noMatches">No matches.</string>
 
     <string name="haptics">Haptics</string>
     <string name="vibrationStrength">Vibration strength</string>