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

perf: dialog onDismissRequest auto close

Browse Source
This commit is contained in:
lisonge 2024-08-05 17:11:47 +08:00
parent 3025a96957
commit 602879da5f
8 changed files with 124 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt
View File

@ -46,7 +46,6 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.core.content.ContextCompat
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.viewModelScope
@ -365,57 +364,59 @@ fun AdvancedPage() {
}
if (showPortDlg) {
Dialog(onDismissRequest = { showPortDlg = false }) {
var value by remember {
mutableStateOf(store.httpServerPort.toString())
}
AlertDialog(title = { Text(text = "服务端口") }, text = {
OutlinedTextField(
value = value,
placeholder = {
Text(text = "请输入 5000-65535 的整数")
},
onValueChange = {
value = it.filter { c -> c.isDigit() }.take(5)
},
singleLine = true,
modifier = Modifier.fillMaxWidth(),
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
supportingText = {
Text(
text = "${value.length} / 5",
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.End,
)
},
)
}, onDismissRequest = { showPortDlg = false }, confirmButton = {
TextButton(
enabled = value.isNotEmpty(),
onClick = {
val newPort = value.toIntOrNull()
if (newPort == null || !(5000 <= newPort && newPort <= 65535)) {
toast("请输入 5000-65535 的整数")
return@TextButton
}
storeFlow.value = store.copy(
httpServerPort = newPort
)
showPortDlg = false
}
) {
Text(
text = "确认", modifier = Modifier
)
}
}, dismissButton = {
TextButton(onClick = { showPortDlg = false }) {
Text(
text = "取消"
)
}
})
var value by remember {
mutableStateOf(store.httpServerPort.toString())
}
AlertDialog(title = { Text(text = "服务端口") }, text = {
OutlinedTextField(
value = value,
placeholder = {
Text(text = "请输入 5000-65535 的整数")
},
onValueChange = {
value = it.filter { c -> c.isDigit() }.take(5)
},
singleLine = true,
modifier = Modifier.fillMaxWidth(),
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
supportingText = {
Text(
text = "${value.length} / 5",
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.End,
)
},
)
}, onDismissRequest = {
if (value.isEmpty()) {
showPortDlg = false
}
}, confirmButton = {
TextButton(
enabled = value.isNotEmpty(),
onClick = {
val newPort = value.toIntOrNull()
if (newPort == null || !(5000 <= newPort && newPort <= 65535)) {
toast("请输入 5000-65535 的整数")
return@TextButton
}
storeFlow.value = store.copy(
httpServerPort = newPort
)
showPortDlg = false
}
) {
Text(
text = "确认", modifier = Modifier
)
}
}, dismissButton = {
TextButton(onClick = { showPortDlg = false }) {
Text(
text = "取消"
)
}
})
}
}

18
app/src/main/kotlin/li/songe/gkd/ui/AppItemPage.kt
View File

@ -396,7 +396,11 @@ fun AppItemPage(
focusRequester.requestFocus()
}
},
onDismissRequest = { setEditGroupRaw(null) },
onDismissRequest = {
if (source.isEmpty()) {
setEditGroupRaw(null)
}
},
dismissButton = {
TextButton(onClick = { setEditGroupRaw(null) }) {
Text(text = "取消")
@ -488,7 +492,11 @@ fun AppItemPage(
focusRequester.requestFocus()
}
},
onDismissRequest = { setExcludeGroupRaw(null) },
onDismissRequest = {
if (source.isEmpty()) {
setExcludeGroupRaw(null)
}
},
dismissButton = {
TextButton(onClick = { setExcludeGroupRaw(null) }) {
Text(text = "取消")
@ -532,7 +540,11 @@ fun AppItemPage(
placeholder = { Text(text = "请输入规则组\n可以是APP规则\n也可以是单个规则组") },
maxLines = 10,
)
}, onDismissRequest = { showAddDlg = false }, confirmButton = {
}, onDismissRequest = {
if (source.isEmpty()) {
showAddDlg = false
}
}, confirmButton = {
TextButton(onClick = {
val newAppRaw = try {
RawSubscription.parseRawApp(source)

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

@ -257,7 +257,11 @@ fun CategoryPage(subsItemId: Long) {
placeholder = { Text(text = "请输入类别名称") },
singleLine = true
)
}, onDismissRequest = { setEditNameCategory(null) }, dismissButton = {
}, onDismissRequest = {
if (source.isEmpty()) {
setEditNameCategory(null)
}
}, dismissButton = {
TextButton(onClick = { setEditNameCategory(null) }) {
Text(text = "取消")
}
@ -300,7 +304,11 @@ fun CategoryPage(subsItemId: Long) {
placeholder = { Text(text = "请输入类别名称") },
singleLine = true
)
}, onDismissRequest = { showAddDlg = false }, dismissButton = {
}, onDismissRequest = {
if (source.isEmpty()) {
showAddDlg = false
}
}, dismissButton = {
TextButton(onClick = { showAddDlg = false }) {
Text(text = "取消")
}

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

@ -388,7 +388,11 @@ fun GlobalRuleExcludePage(subsItemId: Long, groupKey: Int) {
focusRequester.requestFocus()
}
},
onDismissRequest = { showEditDlg = false },
onDismissRequest = {
if (source.isEmpty()) {
showEditDlg = false
}
},
dismissButton = {
TextButton(onClick = { showEditDlg = false }) {
Text(text = "取消")

14
app/src/main/kotlin/li/songe/gkd/ui/GlobalRulePage.kt
View File

@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@ -322,7 +321,11 @@ fun GlobalRulePage(subsItemId: Long, focusGroupKey: Int? = null) {
placeholder = { Text(text = "请输入规则组") },
maxLines = 10,
)
}, onDismissRequest = { showAddDlg = false }, confirmButton = {
}, onDismissRequest = {
if (source.isEmpty()) {
showAddDlg = false
}
}, confirmButton = {
TextButton(onClick = {
val newGroup = try {
RawSubscription.parseRawGlobalGroup(source)
@ -403,7 +406,11 @@ fun GlobalRulePage(subsItemId: Long, focusGroupKey: Int? = null) {
focusRequester.requestFocus()
}
},
onDismissRequest = { setEditGroupRaw(null) },
onDismissRequest = {
if (source.isEmpty()) {
setEditGroupRaw(null)
}
},
dismissButton = {
TextButton(onClick = { setEditGroupRaw(null) }) {
Text(text = "取消")
@ -452,7 +459,6 @@ fun GlobalRulePage(subsItemId: Long, focusGroupKey: Int? = null) {
if (showGroupItem != null) {
AlertDialog(
modifier = Modifier.defaultMinSize(300.dp),
onDismissRequest = { setShowGroupItem(null) },
title = {
Text(text = "规则组详情")

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

@ -307,7 +307,11 @@ fun SubsPage(
modifier = Modifier.fillMaxWidth(),
placeholder = { Text(text = "请输入规则\n若应用规则已经存在则追加") },
)
}, onDismissRequest = { showAddDlg = false }, confirmButton = {
}, onDismissRequest = {
if (source.isEmpty()) {
showAddDlg = false
}
}, confirmButton = {
TextButton(onClick = {
val newAppRaw = try {
RawSubscription.parseRawApp(source)
@ -401,7 +405,11 @@ fun SubsPage(
focusRequester.requestFocus()
}
},
onDismissRequest = { editRawApp = null }, confirmButton = {
onDismissRequest = {
if (source.isEmpty()) {
editRawApp = null
}
}, confirmButton = {
TextButton(onClick = {
try {
val newAppRaw = RawSubscription.parseRawApp(source)

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

@ -125,7 +125,11 @@ fun useSettingsPage(): ScaffoldExt {
)
},
)
}, onDismissRequest = { showToastInputDlg = false }, confirmButton = {
}, onDismissRequest = {
if (value.isEmpty()) {
showToastInputDlg = false
}
}, confirmButton = {
TextButton(enabled = value.isNotEmpty(), onClick = {
storeFlow.update { it.copy(clickToast = value) }
showToastInputDlg = false
@ -186,7 +190,11 @@ fun useSettingsPage(): ScaffoldExt {
)
},
)
}, onDismissRequest = { showNotifTextInputDlg = false }, confirmButton = {
}, onDismissRequest = {
if (value.isEmpty()) {
showNotifTextInputDlg = false
}
}, confirmButton = {
TextButton(enabled = value.isNotEmpty(), onClick = {
storeFlow.update { it.copy(customNotifText = value) }
showNotifTextInputDlg = false

14
app/src/main/kotlin/li/songe/gkd/ui/home/SubsManagePage.kt
View File

@ -145,7 +145,17 @@ fun useSubsManagePage(): ScaffoldExt {
},
isError = link.isNotEmpty() && !URLUtil.isNetworkUrl(link),
)
}, onDismissRequest = { showAddLinkDialog = false }, confirmButton = {
}, onDismissRequest = {
if (link.isEmpty()) {
showAddLinkDialog = false
}
}, dismissButton = {
TextButton(onClick = {
showAddLinkDialog = false
}) {
Text(text = "取消")
}
}, confirmButton = {
TextButton(enabled = link.isNotBlank(), onClick = {
if (!URLUtil.isNetworkUrl(link)) {
toast("非法链接")
@ -166,7 +176,7 @@ fun useSubsManagePage(): ScaffoldExt {
vm.addSubsFromUrl(url = link)
}
}) {
Text(text = "添加")
Text(text = "确认")
}
})
}