mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-14 11:56:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2906 - remove Lora.ignore_incoming (#2925)

Browse Source
This commit is contained in:
DaneEvans
2025-08-30 10:18:01 +10:00
committed by GitHub
parent b2f34c9b69
commit 1e0b2f3e6c
2 changed files with 60 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
app/src/main/java/com/geeksville/mesh/ui/common/components/EditListPreference.kt
View File

@@ -61,55 +61,56 @@ inline fun <reified T> EditListPreference(
val listState = remember(list) { mutableStateListOf<T>().apply { addAll(list) } }
Column(modifier = modifier) {
Text(
modifier = modifier.padding(16.dp),
text = title,
style = MaterialTheme.typography.bodyMedium,
)
Text(modifier = modifier.padding(16.dp), text = title, style = MaterialTheme.typography.bodyMedium)
listState.forEachIndexed { index, value ->
val trailingIcon = @Composable {
IconButton(
onClick = {
focusManager.clearFocus()
listState.removeAt(index)
onValuesChanged(listState)
val trailingIcon =
@Composable {
IconButton(
onClick = {
focusManager.clearFocus()
listState.removeAt(index)
onValuesChanged(listState)
},
) {
Icon(
imageVector = Icons.TwoTone.Close,
contentDescription = stringResource(R.string.delete),
modifier = Modifier.wrapContentSize(),
)
}
) {
Icon(
imageVector = Icons.TwoTone.Close,
contentDescription = stringResource(R.string.delete),
modifier = Modifier.wrapContentSize(),
)
}
}
// handle lora.ignoreIncoming: List<Int>
if (value is Int) EditTextPreference(
title = "${index + 1}/$maxCount",
value = value,
enabled = enabled,
keyboardActions = keyboardActions,
onValueChanged = {
listState[index] = it as T
onValuesChanged(listState)
},
modifier = modifier.fillMaxWidth(),
trailingIcon = trailingIcon,
)
if (value is Int) {
EditTextPreference(
title = "${index + 1}/$maxCount",
value = value,
enabled = enabled,
keyboardActions = keyboardActions,
onValueChanged = {
listState[index] = it as T
onValuesChanged(listState)
},
modifier = modifier.fillMaxWidth(),
trailingIcon = trailingIcon,
)
}
// handle security.adminKey: List<ByteString>
if (value is ByteString) EditBase64Preference(
title = "${index + 1}/$maxCount",
value = value,
enabled = enabled,
keyboardActions = keyboardActions,
onValueChange = {
listState[index] = it as T
onValuesChanged(listState)
},
modifier = modifier.fillMaxWidth(),
trailingIcon = trailingIcon,
)
if (value is ByteString) {
EditBase64Preference(
title = "${index + 1}/$maxCount",
value = value,
enabled = enabled,
keyboardActions = keyboardActions,
onValueChange = {
listState[index] = it as T
onValuesChanged(listState)
},
modifier = modifier.fillMaxWidth(),
trailingIcon = trailingIcon,
)
}
// handle remoteHardware.availablePins: List<RemoteHardwarePin>
if (value is RemoteHardwarePin) {
@@ -131,9 +132,8 @@ inline fun <reified T> EditListPreference(
maxSize = 14, // name max_size:15
enabled = enabled,
isError = false,
keyboardOptions = KeyboardOptions.Default.copy(
keyboardType = KeyboardType.Text, imeAction = ImeAction.Done
),
keyboardOptions =
KeyboardOptions.Default.copy(keyboardType = KeyboardType.Text, imeAction = ImeAction.Done),
keyboardActions = keyboardActions,
onValueChanged = {
listState[index] = value.copy { name = it } as T
@@ -144,7 +144,8 @@ inline fun <reified T> EditListPreference(
DropDownPreference(
title = stringResource(R.string.type),
enabled = enabled,
items = RemoteHardwarePinType.entries
items =
RemoteHardwarePinType.entries
.filter { it != RemoteHardwarePinType.UNRECOGNIZED }
.map { it to it.name },
selectedItem = value.type,
@@ -159,16 +160,19 @@ inline fun <reified T> EditListPreference(
modifier = Modifier.fillMaxWidth(),
onClick = {
// Add element based on the type T
val newElement = when (T::class) {
Int::class -> 0 as T
ByteString::class -> ByteString.EMPTY as T
RemoteHardwarePin::class -> remoteHardwarePin {} as T
else -> throw IllegalArgumentException("Unsupported type: ${T::class}")
}
val newElement =
when (T::class) {
Int::class -> 0 as T
ByteString::class -> ByteString.EMPTY as T
RemoteHardwarePin::class -> remoteHardwarePin {} as T
else -> throw IllegalArgumentException("Unsupported type: ${T::class}")
}
listState.add(listState.size, newElement)
},
enabled = maxCount > listState.size,
) { Text(text = stringResource(R.string.add)) }
) {
Text(text = stringResource(R.string.add))
}
}
}
@@ -177,7 +181,7 @@ inline fun <reified T> EditListPreference(
private fun EditListPreferencePreview() {
Column {
EditListPreference(
title = "Ignore incoming",
title = stringResource(R.string.ignore_incoming),
list = listOf(12345, 67890),
maxCount = 4,
enabled = true,
@@ -186,7 +190,8 @@ private fun EditListPreferencePreview() {
)
EditListPreference(
title = "Available pins",
list = listOf(
list =
listOf(
remoteHardwarePin {
gpioPin = 12
name = "Front door"

18
app/src/main/java/com/geeksville/mesh/ui/settings/radio/components/LoRaConfigItemList.kt
View File

@@ -42,7 +42,6 @@ import com.geeksville.mesh.model.Channel
import com.geeksville.mesh.model.RegionInfo
import com.geeksville.mesh.model.numChannels
import com.geeksville.mesh.ui.common.components.DropDownPreference
import com.geeksville.mesh.ui.common.components.EditListPreference
import com.geeksville.mesh.ui.common.components.EditTextPreference
import com.geeksville.mesh.ui.common.components.PreferenceCategory
import com.geeksville.mesh.ui.common.components.PreferenceFooter
@@ -219,23 +218,6 @@ fun LoRaConfigItemList(
}
item { HorizontalDivider() }
item {
EditListPreference(
title = stringResource(R.string.ignore_incoming),
list = loraInput.ignoreIncomingList,
maxCount = 3, // ignore_incoming max_count:3
enabled = enabled,
keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
onValuesChanged = { list ->
loraInput =
loraInput.copy {
ignoreIncoming.clear()
ignoreIncoming.addAll(list.filter { it != 0 })
}
},
)
}
item {
SwitchPreference(
title = stringResource(R.string.sx126x_rx_boosted_gain),