meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: remove channel disambiguation suffix

Browse source
This commit is contained in:
andrekir 2024-03-18 08:34:56 -03:00
parent a3a914abce
commit ee61b79aa3
3 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
View file

@ -241,11 +241,12 @@ fun ChannelScreen(
fun sendButton() {
primaryChannel?.let { primaryChannel ->
val humanName = primaryChannel.humanName
val message = buildString {
append(context.getString(R.string.are_you_sure_channel))
if (primaryChannel.settings == Channel.default.settings)
append("\n\n" + context.getString(R.string.warning_default_psk, humanName))
if (primaryChannel.settings == Channel.default.settings) {
append("\n\n")
append(context.getString(R.string.warning_default_psk, primaryChannel.name))
}
}
MaterialAlertDialogBuilder(context)
@ -290,7 +291,7 @@ fun ChannelScreen(
if (!showChannelEditor) item {
ClickableTextField(
label = R.string.channel_name,
value = primaryChannel?.humanName.orEmpty(),
value = primaryChannel?.name.orEmpty(),
onClick = { showChannelEditor = true },
enabled = enabled,
trailingIcon = Icons.TwoTone.Edit,