Skip to content

Support updating editable items #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 4 commits into from
May 15, 2026
+63 −9
Merged

Support updating editable items #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
481704b
Support editing existing items in EditableTextMapScreen and EditableT…
Goooler May 14, 2026
41ad4a9
Prefer mutableIntStateOf
Goooler May 15, 2026
e6f87d1
Revert "Prefer mutableIntStateOf"
Goooler May 15, 2026
c28c10c
Use editingKey and editingValue
Goooler May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions ui/settings/src/main/kotlin/com/github/kr328/clash/settings/ui/EditableTextMapScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.kr328.clash.settings.ui

import androidx.annotation.StringRes
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -77,6 +78,7 @@ private fun EditableTextMapScreen(
initialValues?.entries.orEmpty().map { it.toPair() }.toMutableStateList()
}
var showAddDialog by remember { mutableStateOf(false) }
var editingKey by remember { mutableStateOf<String?>(null) }
val lazyListState = rememberLazyListState()
val reorderableLazyListState =
rememberReorderableLazyListState(lazyListState) { from, to ->
Expand Down Expand Up @@ -106,6 +108,11 @@ private fun EditableTextMapScreen(
ListItem(
headlineContent = { Text(key) },
supportingContent = { Text(value) },
modifier =
Modifier.clickable {
editingKey = key
showAddDialog = true
},
leadingContent = {
Icon(
imageVector = TabbyIcons.BaselineDragHandle,
Expand Down Expand Up @@ -142,13 +149,35 @@ private fun EditableTextMapScreen(
}

if (showAddDialog) {
val editingEntry = editingKey?.let { k -> values.firstOrNull { it.first == k } }
MapEntryInputDialog(
title = title,
onDismiss = { showAddDialog = false },
initialKey = editingEntry?.first.orEmpty(),
initialValue = editingEntry?.second.orEmpty(),
onDismiss = {
showAddDialog = false
editingKey = null
},
onConfirm = { key, valueText ->
val index = values.indexOfFirst { it.first == key }
if (index >= 0) values[index] = key to valueText else values.add(key to valueText)
if (editingKey == null) {
val index = values.indexOfFirst { it.first == key }
if (index >= 0) values[index] = key to valueText else values.add(key to valueText)
} else {
val currentIdx = values.indexOfFirst { it.first == editingKey }
val existingIndex = values.indexOfFirst { it.first == key }
when {
existingIndex < 0 || existingIndex == currentIdx -> {
if (currentIdx >= 0) values[currentIdx] = key to valueText
}
else -> {
values[existingIndex] = key to valueText
if (currentIdx >= 0) values.removeAt(currentIdx)
}
}
}

showAddDialog = false
editingKey = null
},
)
}
Expand All @@ -157,11 +186,13 @@ private fun EditableTextMapScreen(
@Composable
private fun MapEntryInputDialog(
@StringRes title: Int,
initialKey: String,
initialValue: String,
onDismiss: () -> Unit,
onConfirm: (String, String) -> Unit,
) {
var keyText by remember { mutableStateOf(initialTextFieldValue("")) }
var valueText by remember { mutableStateOf(initialTextFieldValue("")) }
var keyText by remember(initialKey) { mutableStateOf(initialTextFieldValue(initialKey)) }
var valueText by remember(initialValue) { mutableStateOf(initialTextFieldValue(initialValue)) }
val focusRequester = remember { FocusRequester() }
val keyboardController = LocalSoftwareKeyboardController.current
val confirmEnabled = keyText.text.isNotBlank() && valueText.text.isNotBlank()
Expand Down
31 changes: 27 additions & 4 deletions ui/settings/src/main/kotlin/com/github/kr328/clash/settings/ui/EditableTextSetScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.kr328.clash.settings.ui

import androidx.annotation.StringRes
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -73,6 +74,7 @@ private fun EditableTextSetScreen(
) {
val values = remember(initialValues) { initialValues.orEmpty().toMutableStateList() }
var showAddDialog by remember { mutableStateOf(false) }
var editingValue by remember { mutableStateOf<String?>(null) }
val lazyListState = rememberLazyListState()
val reorderableLazyListState =
rememberReorderableLazyListState(lazyListState) { from, to ->
Expand Down Expand Up @@ -100,6 +102,11 @@ private fun EditableTextSetScreen(
ReorderableItem(reorderableLazyListState, key = value) { _ ->
ListItem(
headlineContent = { Text(value) },
modifier =
Modifier.clickable {
editingValue = value
showAddDialog = true
},
leadingContent = {
Icon(
imageVector = TabbyIcons.BaselineDragHandle,
Expand Down Expand Up @@ -138,12 +145,27 @@ private fun EditableTextSetScreen(
if (showAddDialog) {
SingleTextInputDialog(
title = title,
onDismiss = { showAddDialog = false },
initialText = editingValue.orEmpty(),
onDismiss = {
showAddDialog = false
editingValue = null
},
onConfirm = { newValue ->
if (newValue.isNotBlank() && !values.contains(newValue)) {
values.add(newValue)
val normalizedValue = newValue.trim()

if (normalizedValue.isNotBlank()) {
if (editingValue == null) {
if (!values.contains(normalizedValue)) {
values.add(normalizedValue)
}
} else if (!values.contains(normalizedValue) || editingValue == normalizedValue) {
val idx = values.indexOf(editingValue)
if (idx >= 0) values[idx] = normalizedValue
}
}

showAddDialog = false
editingValue = null
},
)
}
Expand All @@ -152,10 +174,11 @@ private fun EditableTextSetScreen(
@Composable
private fun SingleTextInputDialog(
@StringRes title: Int,
initialText: String,
onDismiss: () -> Unit,
onConfirm: (String) -> Unit,
) {
var inputText by remember { mutableStateOf(initialTextFieldValue("")) }
var inputText by remember(initialText) { mutableStateOf(initialTextFieldValue(initialText)) }
val focusRequester = remember { FocusRequester() }
val keyboardController = LocalSoftwareKeyboardController.current

Expand Down