diff --git a/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt b/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt index 9e0bffca1..87b74fbf2 100644 --- a/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt +++ b/app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt @@ -345,14 +345,9 @@ fun GlobalRuleExcludePage(subsItemId: Long, groupKey: Int) { } item { Spacer(modifier = Modifier.height(EmptyHeight)) - if (showAppInfos.isEmpty()) { - Column( - modifier = Modifier.fillMaxWidth(), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - EmptyText(text = "暂无搜索结果") - Spacer(modifier = Modifier.height(EmptyHeight)) - } + if (showAppInfos.isEmpty() && searchStr.isNotEmpty()) { + val hasShowAll = showSystemApp && showHiddenApp + EmptyText(text = if (hasShowAll) "暂无搜索结果" else "暂无搜索结果,请尝试修改筛选条件") } QueryPkgAuthCard() } diff --git a/app/src/main/kotlin/li/songe/gkd/ui/SubsPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/SubsPage.kt index 4735812f8..c4f840336 100644 --- a/app/src/main/kotlin/li/songe/gkd/ui/SubsPage.kt +++ b/app/src/main/kotlin/li/songe/gkd/ui/SubsPage.kt @@ -284,9 +284,11 @@ fun SubsPage( item { Spacer(modifier = Modifier.height(EmptyHeight)) if (appAndConfigs.isEmpty()) { - EmptyText( - text = if (searchStr.isNotEmpty()) "暂无搜索结果" else "暂无规则", - ) + EmptyText(text = if (searchStr.isNotEmpty()) { + if (showUninstallApp) "暂无搜索结果" else "暂无搜索结果,请尝试修改筛选条件" + } else { + "暂无规则" + }) } else if (editable) { Spacer(modifier = Modifier.height(EmptyHeight)) } diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt index 426b8852a..6665ca7b0 100644 --- a/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt +++ b/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt @@ -366,7 +366,8 @@ fun useAppListPage(): ScaffoldExt { item { Spacer(modifier = Modifier.height(EmptyHeight)) if (orderedAppInfos.isEmpty() && searchStr.isNotEmpty()) { - EmptyText(text = "暂无搜索结果") + val hasShowAll = showSystemApp && showHiddenApp + EmptyText(text = if (hasShowAll) "暂无搜索结果" else "暂无搜索结果,请尝试修改筛选条件") } QueryPkgAuthCard() }