Skip to content

Commit

Permalink
perf: text desc
Browse files Browse the repository at this point in the history
  • Loading branch information
@lisonge
lisonge committed Mar 2, 2024
1 parent caa328a commit ed3f78a
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 47 deletions.
4 changes: 2 additions & 2 deletions app/src/main/kotlin/li/songe/gkd/ui/AppConfigPage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -94,7 +94,7 @@ fun AppConfigPage(appId: String) {
},
content = {
Icon(
imageVector = Icons.Default.Add,
imageVector = Icons.Default.Edit,
contentDescription = null,
)
}
Expand Down
26 changes: 18 additions & 8 deletions app/src/main/kotlin/li/songe/gkd/ui/AppItemPage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.material3.Card
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
Expand Down Expand Up @@ -184,14 +185,23 @@ fun AppItemPage(
modifier = Modifier.fillMaxWidth()
)
if (group.valid) {
Text(
text = group.desc ?: "",
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth(),
fontSize = 14.sp
)
if (group.desc != null) {
Text(
text = group.desc,
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth(),
fontSize = 14.sp
)
} else {
Text(
text = "暂无描述",
modifier = Modifier.fillMaxWidth(),
fontSize = 14.sp,
color = LocalContentColor.current.copy(alpha = 0.5f)
)
}
} else {
Text(
text = "非法选择器",
Expand Down
21 changes: 14 additions & 7 deletions app/src/main/kotlin/li/songe/gkd/ui/CategoryPage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.material3.Card
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.RadioButton
Expand Down Expand Up @@ -122,10 +123,18 @@ fun CategoryPage(subsItemId: Long) {
Text(
text = category.name, fontSize = 18.sp
)
Spacer(modifier = Modifier.height(2.dp))
Text(
text = if (size > 0) "${size}规则组" else "暂无规则", fontSize = 14.sp
)
if (size > 0) {
Text(
text = "${size}规则组",
fontSize = 14.sp
)
} else {
Text(
text = "暂无规则",
fontSize = 14.sp,
color = LocalContentColor.current.copy(alpha = 0.5f)
)
}
}
if (editable) {
IconButton(onClick = {
Expand Down Expand Up @@ -158,15 +167,13 @@ fun CategoryPage(subsItemId: Long) {
}
}
item {
Spacer(modifier = Modifier.height(40.dp))
if (categories.isEmpty()) {
Spacer(modifier = Modifier.height(40.dp))
Text(
text = "暂无类别",
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth()
)
} else {
Spacer(modifier = Modifier.height(20.dp))
}
}
}
Expand Down
28 changes: 19 additions & 9 deletions app/src/main/kotlin/li/songe/gkd/ui/GlobalRulePage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.material3.Card
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
Expand Down Expand Up @@ -109,7 +110,7 @@ fun GlobalRulePage(subsItemId: Long, focusGroupKey: Int? = null) {
)
}
}, title = {
Text(text = "${rawSubs?.name ?: subsItemId}/全局规则")
Text(text = "全局规则/${rawSubs?.name ?: subsItemId}")
})
},
floatingActionButton = {
Expand Down Expand Up @@ -151,14 +152,23 @@ fun GlobalRulePage(subsItemId: Long, focusGroupKey: Int? = null) {
modifier = Modifier.fillMaxWidth()
)
if (group.valid) {
Text(
text = group.desc ?: "",
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth(),
fontSize = 14.sp
)
if (group.desc != null) {
Text(
text = group.desc,
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth(),
fontSize = 14.sp
)
} else {
Text(
text = "暂无描述",
modifier = Modifier.fillMaxWidth(),
fontSize = 14.sp,
color = LocalContentColor.current.copy(alpha = 0.5f)
)
}
} else {
Text(
text = "非法选择器",
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/kotlin/li/songe/gkd/ui/SubsPage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ fun SubsPage(
)
} else {
Text(
text = "${subsRaw?.name ?: subsItemId}/应用规则",
text = "应用规则/${subsRaw?.name ?: subsItemId}",
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
Expand Down Expand Up @@ -182,7 +182,6 @@ fun SubsPage(
modifier = Modifier.wrapContentSize(Alignment.TopStart)
) {
DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {

SortTypeOption.allSubObject.forEach { sortOption ->
DropdownMenuItem(
text = {
Expand Down
31 changes: 20 additions & 11 deletions app/src/main/kotlin/li/songe/gkd/ui/component/SubsAppCard.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import androidx.compose.material.icons.filled.Android
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -89,18 +90,26 @@ fun SubsAppCard(
modifier = Modifier.fillMaxWidth()
)

val enableDesc = when (enableSize) {
0 -> "${rawApp.groups.size}组规则/${rawApp.groups.size}关闭"
rawApp.groups.size -> "${rawApp.groups.size}组规则"
else -> "${rawApp.groups.size}组规则/${enableSize}启用/${rawApp.groups.size - enableSize}关闭"
if (rawApp.groups.isNotEmpty()) {
val enableDesc = when (enableSize) {
0 -> "${rawApp.groups.size}组规则/${rawApp.groups.size}关闭"
rawApp.groups.size -> "${rawApp.groups.size}组规则"
else -> "${rawApp.groups.size}组规则/${enableSize}启用/${rawApp.groups.size - enableSize}关闭"
}
Text(
text = enableDesc,
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth()
)
} else {
Text(
text = "暂无规则",
modifier = Modifier.fillMaxWidth(),
color = LocalContentColor.current.copy(alpha = 0.5f)
)
}
Text(
text = enableDesc,
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth()
)
}
Spacer(modifier = Modifier.width(10.dp))

Expand Down
18 changes: 10 additions & 8 deletions app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,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.LocalContentColor
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
Expand Down Expand Up @@ -287,16 +288,17 @@ fun useAppListPage(): ScaffoldExt {
globalDesc
}
} else {
appDesc ?: "暂无规则"
appDesc
}

Text(
text = desc,
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.fillMaxWidth()
)
if (desc != null) {
Text(text = desc)
} else {
Text(
text = "暂无规则",
color = LocalContentColor.current.copy(alpha = 0.5f)
)
}
}
}
}
Expand Down

0 comments on commit ed3f78a

Please sign in to comment.