Austin/gkd
1
0
Fork 0
mirror of https://github.com/gkd-kit/gkd.git synced 2024-11-16 11:42:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

perf: Underline system app name

Browse Source
This commit is contained in:
lisonge 2024-03-16 22:05:58 +08:00
parent 50adf5f463
commit afcfbb1c66
4 changed files with 66 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/kotlin/li/songe/gkd/ui/ClickLogPage.kt
View File

@ -18,6 +18,7 @@ import androidx.compose.material3.Card
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
@ -36,6 +37,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.hilt.navigation.compose.hiltViewModel
@ -74,7 +76,6 @@ fun ClickLogPage() {
val navController = LocalNavController.current
val vm = hiltViewModel<ClickLogVm>()
// val clickDataList by vm.clickDataListFlow.collectAsState()
val clickLogCount by vm.clickLogCountFlow.collectAsState()
val clickDataItems = vm.pagingDataFlow.collectAsLazyPagingItems()
val appInfoCache by appInfoCacheFlow.collectAsState()
@ -151,9 +152,19 @@ fun ClickLogPage() {
fontFamily = FontFamily.Monospace
)
Spacer(modifier = Modifier.width(10.dp))
val appShowName = appInfoCache[clickLog.appId]?.name ?: clickLog.appId
val appInfo = appInfoCache[clickLog.appId]
val appShowName = appInfo?.name ?: clickLog.appId
if (appShowName != null) {
Text(text = appShowName)
Text(
text = appShowName,
style = LocalTextStyle.current.let {
if (appInfo?.isSystem == true) {
it.copy(textDecoration = TextDecoration.Underline)
} else {
it
}
}
)
}
}
Spacer(modifier = Modifier.width(10.dp))

12
app/src/main/kotlin/li/songe/gkd/ui/GlobalRuleExcludePage.kt
View File

@ -31,6 +31,7 @@ import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Scaffold
@ -52,6 +53,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@ -280,9 +282,15 @@ fun GlobalRuleExcludePage(subsItemId: Long, groupKey: Int) {
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth()
modifier = Modifier.fillMaxWidth(),
style = LocalTextStyle.current.let {
if (appInfo.isSystem) {
it.copy(textDecoration = TextDecoration.Underline)
} else {
it
}
}
)
Text(
text = appInfo.id,
maxLines = 1,

11
app/src/main/kotlin/li/songe/gkd/ui/component/SubsAppCard.kt
View File

@ -23,6 +23,7 @@ import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
@ -33,6 +34,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.blankj.utilcode.util.ClipboardUtils
@ -106,7 +108,14 @@ fun SubsAppCard(
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth()
modifier = Modifier.fillMaxWidth(),
style = LocalTextStyle.current.let {
if (appInfo?.isSystem == true) {
it.copy(textDecoration = TextDecoration.Underline)
} else {
it
}
}
)
if (rawApp.groups.isNotEmpty()) {

33
app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
View File

@ -1,5 +1,6 @@
package li.songe.gkd.ui.home
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@ -31,11 +32,13 @@ import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
@ -48,12 +51,17 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import com.blankj.utilcode.util.KeyboardUtils
import com.google.accompanist.drawablepainter.rememberDrawablePainter
import kotlinx.coroutines.flow.update
import li.songe.gkd.MainActivity
import li.songe.gkd.ui.component.AppBarTextField
import li.songe.gkd.ui.destinations.AppConfigPageDestination
import li.songe.gkd.util.LocalNavController
@ -69,6 +77,8 @@ val appListNav = BottomNavItem(
@Composable
fun useAppListPage(): ScaffoldExt {
val navController = LocalNavController.current
val context = LocalContext.current as MainActivity
val softwareKeyboardController = LocalSoftwareKeyboardController.current
val vm = hiltViewModel<HomeVm>()
val showSystemApp by vm.showSystemAppFlow.collectAsState()
@ -111,8 +121,22 @@ fun useAppListPage(): ScaffoldExt {
return ScaffoldExt(navItem = appListNav,
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
DisposableEffect(null) {
onDispose {
if (vm.searchStrFlow.value.isEmpty()) {
showSearchBar = false
}
}
}
TopAppBar(scrollBehavior = scrollBehavior, title = {
if (showSearchBar) {
BackHandler(searchStr.isEmpty()) {
if (KeyboardUtils.isSoftInputVisible(context)) {
softwareKeyboardController?.hide()
} else {
showSearchBar = false
}
}
AppBarTextField(
value = searchStr,
onValueChange = { newValue -> vm.searchStrFlow.value = newValue.trim() },
@ -270,7 +294,14 @@ fun useAppListPage(): ScaffoldExt {
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth()
modifier = Modifier.fillMaxWidth(),
style = LocalTextStyle.current.let {
if (appInfo.isSystem) {
it.copy(textDecoration = TextDecoration.Underline)
} else {
it
}
}
)
val appGroups = ruleSummary.appIdToAllGroups[appInfo.id] ?: emptyList()