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: maintain NodeMenu item order for consistency

Browse source
This commit is contained in:
andrekir 2024-11-12 09:24:37 -03:00
parent cfdb245da2
commit f38a7ac0de
1 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/com/geeksville/mesh/ui/components/NodeMenu.kt
View file

@ -1,8 +1,10 @@
package com.geeksville.mesh.ui.components
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.Checkbox
import androidx.compose.material.CheckboxDefaults
import androidx.compose.material.Divider
import androidx.compose.material.DropdownMenu
import androidx.compose.material.DropdownMenuItem
@ -15,6 +17,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.geeksville.mesh.R
import com.geeksville.mesh.database.entity.NodeEntity
@ -75,7 +78,6 @@ fun NodeMenu(
},
content = { Text(stringResource(R.string.direct_message)) }
)
Divider()
DropdownMenuItem(
onClick = {
onDismissRequest()
@ -83,7 +85,6 @@ fun NodeMenu(
},
content = { Text(stringResource(R.string.request_userinfo)) }
)
Divider()
DropdownMenuItem(
onClick = {
onDismissRequest()
@ -91,7 +92,6 @@ fun NodeMenu(
},
content = { Text(stringResource(R.string.request_position)) }
)
Divider()
DropdownMenuItem(
onClick = {
onDismissRequest()
@ -99,34 +99,32 @@ fun NodeMenu(
},
content = { Text(stringResource(R.string.traceroute)) }
)
Divider()
DropdownMenuItem(
onClick = {
onDismissRequest()
displayRemoveDialog = true
},
content = { Text(stringResource(R.string.remove)) },
)
Divider()
DropdownMenuItem(
onClick = {
onDismissRequest()
displayIgnoreDialog = true
},
content = {
Text(stringResource(R.string.ignore))
Checkbox(
colors = CheckboxDefaults.colors(checkedColor = MaterialTheme.colors.primary),
checked = isIgnored,
onCheckedChange = {
onDismissRequest()
displayIgnoreDialog = true
},
)
},
enabled = ignoreIncomingList.size < 3 || isIgnored
)
Divider()
) {
Text(stringResource(R.string.ignore))
Spacer(Modifier.weight(1f))
Checkbox(
checked = isIgnored,
onCheckedChange = {
onDismissRequest()
displayIgnoreDialog = true
},
enabled = isIgnored || ignoreIncomingList.size < 3,
modifier = Modifier.size(24.dp),
)
}
DropdownMenuItem(
onClick = {
onDismissRequest()
displayRemoveDialog = true
},
) { Text(stringResource(R.string.remove)) }
Divider(Modifier.padding(vertical = 8.dp))
}
DropdownMenuItem(
onClick = {