Merge pull request #320 from GuoXiCheng/dev-c

GuoXiCheng · web-flow · commit 8b927baed890 · 2025-04-16T14:46:05.000+08:00
add query to WhiteListActivity
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,8 @@
 - 修复加载的配置文件包含 Unicode 编码时未转换为中文的问题
 - 修复点击右上角「功能介绍」后菜单未自动关闭的问题
 - 新增「悬浮窗按钮」用于执行布局检查功能
+- 应用白名单增加搜索功能
 - TODO: 断网无法访问的问题
-- TODO: 应用白名单增加搜索功能
 
 ## v3.0.0 - 2024.09.27
 
diff --git a/app/src/main/java/com/android/skip/ui/theme/AppTheme.kt b/app/src/main/java/com/android/skip/ui/theme/AppTheme.kt
@@ -19,15 +19,19 @@ private val darkScheme = darkColorScheme(
     secondary = PurpleGrey80,
     tertiary = Pink80,
     background = Black,
-    onBackground = White
+    onBackground = White,
+    primaryContainer = Black54,
+    onPrimaryContainer = Black91
 )
 
 private val lightScheme = lightColorScheme(
     primary = Purple40,
     secondary = PurpleGrey40,
     tertiary = Pink40,
     background = White,
-    onBackground = Black
+    onBackground = Black,
+    primaryContainer = Gray232,
+    onPrimaryContainer = Gray172
 )
 
 @Composable
diff --git a/app/src/main/java/com/android/skip/ui/theme/Color.kt b/app/src/main/java/com/android/skip/ui/theme/Color.kt
@@ -9,4 +9,8 @@ val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
 val Pink40 = Color(0xFF7D5260)
 val White = Color.White
-val Black = Color.Black
+val Black = Color.Black
+val Gray232 = Color(0xFFE8E8E8)
+val Gray172 = Color(0xFFACACAC)
+val Black54 = Color(0xFF363636)
+val Black91 = Color(0xFF5B5B5B)
diff --git a/app/src/main/java/com/android/skip/ui/whitelist/WhiteListActivity.kt b/app/src/main/java/com/android/skip/ui/whitelist/WhiteListActivity.kt
@@ -5,9 +5,14 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Text
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import com.android.skip.MyApp
 import com.android.skip.R
 import com.android.skip.ui.components.ResourceIcon
@@ -18,6 +23,8 @@ import com.android.skip.ui.theme.AppTheme
 import com.android.skip.ui.webview.WebViewActivity
 import com.android.skip.ui.whitelist.list.AppListColumn
 import com.android.skip.ui.whitelist.list.AppListViewModel
+import com.android.skip.ui.whitelist.search.SearchTextField
+import com.android.skip.ui.whitelist.search.SearchViewModel
 import com.android.skip.ui.whitelist.system.ShowSystemButton
 import com.android.skip.ui.whitelist.system.ShowSystemViewModel
 import dagger.hilt.android.AndroidEntryPoint
@@ -32,12 +39,21 @@ class WhiteListActivity : AppCompatActivity() {
 
     private val switchThemeViewModel by viewModels<SwitchThemeViewModel>()
 
+    private val searchViewModel by viewModels<SearchViewModel>()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
             AppTheme(switchThemeViewModel) {
                 ScaffoldPage(R.string.whitelist, { finish() }, {
-                    AppListColumn(appListViewModel, whiteListViewModel)
+                    // 添加搜索栏和应用列表
+                    Column {
+                        // 搜索栏
+                        SearchTextField(searchViewModel)
+                        Spacer(modifier = Modifier.height(8.dp))
+                        // 应用列表
+                        AppListColumn(appListViewModel, whiteListViewModel)
+                    }
                 }, {
                     DropdownMenuItem(
                         leadingIcon = { ResourceIcon(iconResource = R.drawable.help) },
@@ -55,7 +71,11 @@ class WhiteListActivity : AppCompatActivity() {
         }
 
         showSystemViewModel.isShowSystem.observe(this) {
-            appListViewModel.reloadData(it)
+            appListViewModel.reloadData(it, searchViewModel.getQuery())
+        }
+
+        searchViewModel.query.observe(this) {
+            appListViewModel.reloadData(showSystemViewModel.getIsShowSystem(), it)
         }
     }
 }
diff --git a/app/src/main/java/com/android/skip/ui/whitelist/list/AppListPagingSource.kt b/app/src/main/java/com/android/skip/ui/whitelist/list/AppListPagingSource.kt
@@ -7,7 +7,8 @@ import javax.inject.Inject
 
 class AppListPagingSource @Inject constructor(
     private val appListRepository: AppListRepository,
-    private val isShowSystem: Boolean
+    private val isShowSystem: Boolean,
+    private val query: String
 ) : PagingSource<Int, AppListItem>() {
     override fun getRefreshKey(state: PagingState<Int, AppListItem>): Int? {
         return state.anchorPosition?.let { anchorPosition ->
@@ -20,7 +21,7 @@ class AppListPagingSource @Inject constructor(
         val currentPage = params.key ?: 0
         val pageSize = params.loadSize
 
-        val pageData = appListRepository.getData(currentPage, pageSize, isShowSystem)
+        val pageData = appListRepository.getData(currentPage, pageSize, isShowSystem, query)
 
         return LoadResult.Page(
             data = pageData,
diff --git a/app/src/main/java/com/android/skip/ui/whitelist/list/AppListRepository.kt b/app/src/main/java/com/android/skip/ui/whitelist/list/AppListRepository.kt
@@ -16,19 +16,28 @@ class AppListRepository @Inject constructor() {
         MyApp.context.packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
     }
 
-    fun getData(currentPage: Int, pageSize: Int, isShowSystem: Boolean): List<AppListItem> {
+    fun getData(currentPage: Int, pageSize: Int, isShowSystem: Boolean, query: String = ""): List<AppListItem> {
         try {
             val pkgManager = MyApp.context.packageManager
 
+            // 是否显示系统应用的过滤
             val apps = if (isShowSystem) {
                 appInfos
             } else {
                 appInfos.filter { (it.flags and ApplicationInfo.FLAG_SYSTEM) == 0 }
             }
+
+            // 根据关键字进行过滤
+            val filteredApps = if (query.isNotEmpty()) {
+                apps.filter { it.loadLabel(pkgManager).toString().contains(query, ignoreCase = true) }
+            } else {
+                apps
+            }
+
             val fromIndex = currentPage * pageSize
-            val toIndex = minOf(fromIndex + pageSize, apps.size)
+            val toIndex = minOf(fromIndex + pageSize, filteredApps.size)
 
-            return apps.subList(fromIndex, toIndex)
+            return filteredApps.subList(fromIndex, toIndex)
                 .map {
                     AppListItem(
                         it.loadLabel(pkgManager).toString(),
diff --git a/app/src/main/java/com/android/skip/ui/whitelist/list/AppListViewModel.kt b/app/src/main/java/com/android/skip/ui/whitelist/list/AppListViewModel.kt
@@ -22,19 +22,19 @@ class AppListViewModel @Inject constructor(
 
     private var currentPagingSource: AppListPagingSource? = null
 
-    fun reloadData(isShowSystem: Boolean) {
+    fun reloadData(isShowSystem: Boolean, query: String = "") {
         currentPagingSource?.invalidate()
-        _pagingData.value = createPager(isShowSystem).flow.cachedIn(viewModelScope)
+        _pagingData.value = createPager(isShowSystem, query).flow.cachedIn(viewModelScope)
     }
 
-    private fun createPager(isShowSystem: Boolean): Pager<Int, AppListItem> {
+    private fun createPager(isShowSystem: Boolean, query: String = ""): Pager<Int, AppListItem> {
         return Pager(
             config = PagingConfig(
                 pageSize = 20,
                 enablePlaceholders = false
             ),
             pagingSourceFactory = {
-                val newPagingSource = AppListPagingSource(appListRepository, isShowSystem)
+                val newPagingSource = AppListPagingSource(appListRepository, isShowSystem, query)
                 currentPagingSource = newPagingSource
                 newPagingSource
             }
diff --git a/app/src/main/java/com/android/skip/ui/whitelist/search/SearchTextField.kt b/app/src/main/java/com/android/skip/ui/whitelist/search/SearchTextField.kt
@@ -0,0 +1,63 @@
+package com.android.skip.ui.whitelist.search
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.android.skip.R
+
+@Composable
+fun SearchTextField(
+    searchViewModel: SearchViewModel
+) {
+    val queryValue = searchViewModel.query.observeAsState()
+
+    OutlinedTextField(
+        value = queryValue.value ?: "",
+        onValueChange = {
+            searchViewModel.changeQuery(it)
+        },
+        placeholder = {
+            Text(
+                stringResource(id = R.string.search_hint),
+                fontSize = 14.sp,
+                color = Color.Gray
+            )
+        },
+        leadingIcon = {
+            Icon(
+                imageVector = Icons.Default.Search,
+                contentDescription = stringResource(id = R.string.search_hint)
+            )
+        },
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(56.dp)
+            .padding(horizontal = 16.dp)
+            .clip(RoundedCornerShape(16.dp)) // 圆角效果
+            .background(color = MaterialTheme.colorScheme.primaryContainer), // 灰色背景
+        colors = OutlinedTextFieldDefaults.colors(
+            focusedBorderColor = Color.Transparent,
+            unfocusedBorderColor = Color.Transparent,
+            cursorColor = MaterialTheme.colorScheme.onBackground,
+            focusedTextColor = MaterialTheme.colorScheme.onBackground,
+            unfocusedTextColor = MaterialTheme.colorScheme.onBackground
+        )
+    )
+}
diff --git a/app/src/main/java/com/android/skip/ui/whitelist/search/SearchViewModel.kt b/app/src/main/java/com/android/skip/ui/whitelist/search/SearchViewModel.kt
@@ -0,0 +1,21 @@
+package com.android.skip.ui.whitelist.search
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class SearchViewModel @Inject constructor(): ViewModel() {
+    private val _query = MutableLiveData("")
+    val query: LiveData<String> = _query
+
+    fun changeQuery(query: String) {
+        _query.postValue(query)
+    }
+
+    fun getQuery(): String {
+        return _query.value ?: ""
+    }
+}
diff --git a/app/src/main/java/com/android/skip/ui/whitelist/system/ShowSystemViewModel.kt b/app/src/main/java/com/android/skip/ui/whitelist/system/ShowSystemViewModel.kt
@@ -14,4 +14,8 @@ class ShowSystemViewModel @Inject constructor():ViewModel() {
     fun changeIsShowSystem(isShow: Boolean) {
         _isShowSystem.postValue(isShow)
     }
+
+    fun getIsShowSystem(): Boolean {
+        return _isShowSystem.value ?: false
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -122,4 +122,5 @@
 
     <string name="loading">加载中…</string>
     <string name="checking">检查中…</string>
+    <string name="search_hint">搜索应用</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,8 @@ class ShowSystemViewModel @Inject constructor():ViewModel() {`
`14`	`14`	`fun changeIsShowSystem(isShow: Boolean) {`
`15`	`15`	`_isShowSystem.postValue(isShow)`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+ fun getIsShowSystem(): Boolean {`
	`19`	`+ return _isShowSystem.value ?: false`
	`20`	`+ }`
`17`	`21`	`}`