optimize searching in package selector

2026-03-23 19:15:58 +00:00 · 2024-08-12 18:49:57 +08:00
parent d56983790f
commit 7ab60e4dc9
7 changed files with 82 additions and 55 deletions
--- a/app/src/main/java/com/bintianqi/owndroid/PkgSelector.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/PkgSelector.kt
@@ -42,6 +42,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
@@ -76,6 +78,7 @@ fun PackageSelector(navCtrl: NavHostController, pkgName: MutableState<String>) {
    var hideProgress by remember { mutableStateOf(true) }
    var system by remember { mutableStateOf(false) }
    var search by remember { mutableStateOf("") }
+    var searchMode by remember { mutableStateOf(false) }
    val scrollState = rememberLazyListState()
    val focusMgr = LocalFocusManager.current
    val co = rememberCoroutineScope()
@@ -99,49 +102,65 @@ fun PackageSelector(navCtrl: NavHostController, pkgName: MutableState<String>) {
        topBar = {
            TopAppBar(
                actions = {
-                    Icon(
-                        painter = painterResource(R.drawable.filter_alt_fill0),
-                        contentDescription = "filter",
-                        modifier = Modifier
-                            .padding(horizontal = 4.dp)
-                            .clip(RoundedCornerShape(50))
-                            .clickable {
-                                system = !system
-                                Toast.makeText(context, if(system) R.string.show_system_app else R.string.show_user_app, Toast.LENGTH_SHORT).show()
-                            }
-                            .padding(5.dp)
-                    )
-                    Icon(
-                        painter = painterResource(R.drawable.refresh_fill0),
-                        contentDescription = "refresh",
-                        modifier = Modifier
-                            .padding(horizontal = 4.dp)
-                            .clip(RoundedCornerShape(50))
-                            .clickable {
-                                co.launch { getPkgList() }
-                            }
-                            .padding(5.dp)
-                    )
+                    if(!searchMode) {
+                        Icon(
+                            painter = painterResource(R.drawable.search_fill0),
+                            contentDescription = "search",
+                            modifier = Modifier
+                                .padding(horizontal = 4.dp)
+                                .clip(RoundedCornerShape(50))
+                                .clickable { searchMode = true }
+                                .padding(5.dp)
+                        )
+                        Icon(
+                            painter = painterResource(R.drawable.filter_alt_fill0),
+                            contentDescription = "filter",
+                            modifier = Modifier
+                                .padding(horizontal = 4.dp)
+                                .clip(RoundedCornerShape(50))
+                                .clickable {
+                                    system = !system
+                                    Toast.makeText(context, if(system) R.string.show_system_app else R.string.show_user_app, Toast.LENGTH_SHORT).show()
+                                }
+                                .padding(5.dp)
+                        )
+                        Icon(
+                            painter = painterResource(R.drawable.refresh_fill0),
+                            contentDescription = "refresh",
+                            modifier = Modifier
+                                .padding(horizontal = 4.dp)
+                                .clip(RoundedCornerShape(50))
+                                .clickable { co.launch { getPkgList() } }
+                                .padding(5.dp)
+                        )
+                    }
                },
                title = {
-                    OutlinedTextField(
-                        value = search,
-                        onValueChange = { search = it },
-                        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-                        keyboardActions = KeyboardActions { focusMgr.clearFocus() },
-                        placeholder = { Text(stringResource(R.string.search)) },
-                        trailingIcon = {
-                            Icon(
-                                painter = painterResource(R.drawable.close_fill0),
-                                contentDescription = "clear search",
-                                modifier = Modifier.clickable {
-                                    search = ""
-                                    focusMgr.clearFocus()
-                                }
-                            )
-                        },
-                        modifier = Modifier.padding(vertical = 8.dp)
-                    )
+                    if(searchMode) {
+                        val fr = FocusRequester()
+                        LaunchedEffect(Unit) { fr.requestFocus() }
+                        OutlinedTextField(
+                            value = search,
+                            onValueChange = { search = it },
+                            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
+                            keyboardActions = KeyboardActions { focusMgr.clearFocus() },
+                            placeholder = { Text(stringResource(R.string.search)) },
+                            trailingIcon = {
+                                Icon(
+                                    painter = painterResource(R.drawable.close_fill0),
+                                    contentDescription = "clear search",
+                                    modifier = Modifier.clickable {
+                                        focusMgr.clearFocus()
+                                        search = ""
+                                        searchMode = false
+                                    }
+                                )
+                            },
+                            modifier = Modifier.fillMaxWidth().focusRequester(fr)
+                        )
+                    } else {
+                        Text(stringResource(R.string.pkg_selector))
+                    }
                },
                navigationIcon = { NavIcon{ navCtrl.navigateUp() } },
                colors = TopAppBarDefaults.topAppBarColors(containerColor = colorScheme.background)
@@ -186,11 +205,16 @@ fun PackageSelector(navCtrl: NavHostController, pkgName: MutableState<String>) {

@Composable
 private fun PackageItem(pkg: PkgInfo, navCtrl: NavHostController, pkgName: MutableState<String>) {
+    val focusMgr = LocalFocusManager.current
    Row(
        verticalAlignment = Alignment.CenterVertically,
        modifier = Modifier
            .fillMaxWidth()
-            .clickable{ pkgName.value = pkg.pkgName; navCtrl.navigateUp() }
+            .clickable{
+                pkgName.value = pkg.pkgName
+                focusMgr.clearFocus()
+                navCtrl.navigateUp()
+            }
            .padding(vertical = 6.dp)
    ) {
        Spacer(Modifier.padding(start = 15.dp))
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
@@ -142,7 +142,10 @@ fun ApplicationManage(navCtrl:NavHostController, pkgName: MutableState<String>,
                        Icon(painter = painterResource(R.drawable.checklist_fill0), contentDescription = null,
                            modifier = Modifier
                                .clip(RoundedCornerShape(50))
-                                .clickable(onClick = {navCtrl.navigate("PackageSelector")})
+                                .clickable(onClick = {
+                                    focusMgr.clearFocus()
+                                    navCtrl.navigate("PackageSelector")
+                                })
                                .padding(3.dp))
                    },
                    singleLine = true
--- a/app/src/main/res/drawable/search_fill0.xml
+++ b/app/src/main/res/drawable/search_fill0.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M784,840 L532,588q-30,24 -69,38t-83,14q-109,0 -184.5,-75.5T120,380q0,-109 75.5,-184.5T380,120q109,0 184.5,75.5T640,380q0,44 -14,83t-38,69l252,252 -56,56ZM380,560q75,0 127.5,-52.5T560,380q0,-75 -52.5,-127.5T380,200q-75,0 -127.5,52.5T200,380q0,75 52.5,127.5T380,560Z"
+      android:fillColor="#000000"/>
+</vector>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -298,7 +298,6 @@
    <string name="loading">Yükleniyor</string>
    <string name="show_user_app">Kullanıcı uygulamalarını göster</string>
    <string name="show_system_app">Sistem uygulamalarını göster</string>
-    <string name="permission_picker">İzin seçici</string>
    <string name="suspend">Askıya al</string>
    <string name="hide">Gizle</string>
    <string name="isapphidden_desc">Mevcut olmayan uygulamalar gizlidir</string>
@@ -512,7 +511,6 @@
    <string name="confirm_password">Confirm password</string> <!--TODO-->
    <string name="do_not_ask_credentials_on_boot">Başlangıçta kimlik bilgilerini sorma</string>
    <string name="reset_password_require_entry">Giriş gerektir</string>
-    <string name="require_4_digit_password">En az 4 haneli şifre gerektir</string>
    <string name="reset_password_with_token">Jeton ile şifreyi sıfırla</string>
    <string name="required_password_complexity">Gereken şifre karmaşıklığı</string>
    <string name="require_set_new_password">Yeni şifre ayarlanmasını iste</string>
@@ -594,7 +592,6 @@
    <string name="permission_NEARBY_WIFI_DEVICES">Nearby Wi-Fi devices</string> <!--TODO-->
    <string name="permission_CALL_PHONE">Telefonla arama yap</string>
    <string name="permission_ANSWER_PHONE_CALLS">Answer phone calls</string> <!--TODO-->
-    <string name="permission_READ_PHONE_NUMBERS">Read phone numbers</string> <!--TODO-->
    <string name="permission_READ_PHONE_STATE">Telefon durumunu oku</string>
    <string name="permission_USE_SIP">Use SIP</string> <!--TODO-->
    <string name="permission_UWB_RANGING">UWB ranging</string> <!--TODO-->
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -293,7 +293,6 @@
    <string name="loading">加载中</string>
    <string name="show_user_app">显示用户应用</string>
    <string name="show_system_app">显示系统应用</string>
-    <string name="permission_picker">权限选择器</string>
    <string name="suspend">挂起</string>
    <string name="hide">隐藏</string>
    <string name="isapphidden_desc">如果隐藏，有可能是没安装</string>
@@ -504,7 +503,6 @@
    <string name="confirm_password">确认密码</string>
    <string name="do_not_ask_credentials_on_boot">启动(boot)时不要求密码</string>
    <string name="reset_password_require_entry">不允许其他设备管理员重置密码直至用户输入一次密码</string>
-    <string name="require_4_digit_password">需要4位密码</string>
    <string name="reset_password_with_token">使用令牌重置密码</string>
    <string name="required_password_complexity">密码复杂度要求</string>
    <string name="require_set_new_password">要求设置新密码</string>
@@ -586,7 +584,6 @@
    <string name="permission_NEARBY_WIFI_DEVICES">附近的Wi-Fi设备</string>
    <string name="permission_CALL_PHONE">打电话</string>
    <string name="permission_ANSWER_PHONE_CALLS">接电话</string>
-    <string name="permission_READ_PHONE_NUMBERS">读取手机号码</string>
    <string name="permission_READ_PHONE_STATE">读取手机状态</string>
    <string name="permission_USE_SIP">使用SIP</string>
    <string name="permission_UWB_RANGING">超宽频</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -306,7 +306,6 @@
    <string name="loading">Loading</string>
    <string name="show_user_app">Show user apps</string>
    <string name="show_system_app">Show system apps</string>
-    <string name="permission_picker">Permission picker</string>
    <string name="suspend">Suspend</string>
    <string name="hide">Hide</string>
    <string name="isapphidden_desc">Non-existent apps is hidden</string>
@@ -518,7 +517,6 @@
    <string name="confirm_password">Confirm password</string>
    <string name="do_not_ask_credentials_on_boot">Do not ask credentials on boot</string>
    <string name="reset_password_require_entry">Require entry</string>
-    <string name="require_4_digit_password">Require at least 4 digit password</string>
    <string name="reset_password_with_token">Reset password with token</string>
    <string name="required_password_complexity">Required password complexity</string>
    <string name="require_set_new_password">Request to set a new password</string>
@@ -600,7 +598,6 @@
    <string name="permission_NEARBY_WIFI_DEVICES">Nearby Wi-Fi devices</string>
    <string name="permission_CALL_PHONE">Call phone</string>
    <string name="permission_ANSWER_PHONE_CALLS">Answer phone calls</string>
-    <string name="permission_READ_PHONE_NUMBERS">Read phone numbers</string>
    <string name="permission_READ_PHONE_STATE">Read phone state</string>
    <string name="permission_USE_SIP">Use SIP</string>
    <string name="permission_UWB_RANGING">UWB ranging</string>