mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-05-06 21:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Consolidate DropdownMenu into RegularPreference (#2059)

Browse Source
This commit is contained in:
James Rich
2025-06-08 19:38:30 +00:00
committed by GitHub
parent 72ab461661
commit 6becdf137b
2 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/main/java/com/geeksville/mesh/ui/common/components/DropDownPreference.kt
View File

@@ -18,7 +18,6 @@
package com.geeksville.mesh.ui.common.components
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.twotone.KeyboardArrowDown
import androidx.compose.material.icons.twotone.KeyboardArrowUp
@@ -85,7 +84,6 @@ fun <T> DropDownPreference(
emptyList()
}
}
RegularPreference(
title = title,
subtitle = items.find { it.first == selectedItem }?.second
@@ -100,38 +98,37 @@ fun <T> DropDownPreference(
Icons.TwoTone.KeyboardArrowDown
},
summary = summary,
)
Box {
DropdownMenu(
expanded = dropDownExpanded,
onDismissRequest = { dropDownExpanded = !dropDownExpanded },
) {
items.filterNot { it.first in deprecatedItems }.forEach { item ->
DropdownMenuItem(
onClick = {
dropDownExpanded = false
onItemSelected(item.first)
},
modifier = modifier
.background(
color = if (selectedItem == item.first) {
MaterialTheme.colorScheme.primary.copy(alpha = 0.3f)
} else {
Color.Unspecified
},
),
text = {
Text(
text = item.second,
overflow = TextOverflow.Ellipsis,
maxLines = 1,
)
}
)
dropdownMenu = {
DropdownMenu(
expanded = dropDownExpanded,
onDismissRequest = { dropDownExpanded = !dropDownExpanded },
) {
items.filterNot { it.first in deprecatedItems }.forEach { item ->
DropdownMenuItem(
onClick = {
dropDownExpanded = false
onItemSelected(item.first)
},
modifier = modifier
.background(
color = if (selectedItem == item.first) {
MaterialTheme.colorScheme.primary.copy(alpha = 0.3f)
} else {
Color.Unspecified
},
),
text = {
Text(
text = item.second,
overflow = TextOverflow.Ellipsis,
maxLines = 1,
)
}
)
}
}
}
}
)
}
@Preview(showBackground = true)

23
app/src/main/java/com/geeksville/mesh/ui/common/components/RegularPreference.kt
View File

@@ -19,6 +19,7 @@ package com.geeksville.mesh.ui.common.components
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
@@ -47,6 +48,7 @@ fun RegularPreference(
enabled: Boolean = true,
summary: String? = null,
trailingIcon: ImageVector? = null,
dropdownMenu: @Composable () -> Unit = {},
) {
RegularPreference(
title = title,
@@ -56,6 +58,7 @@ fun RegularPreference(
enabled = enabled,
summary = summary,
trailingIcon = trailingIcon,
dropdownMenu = dropdownMenu,
)
}
@@ -69,6 +72,7 @@ fun RegularPreference(
enabled: Boolean = true,
summary: String? = null,
trailingIcon: ImageVector? = null,
dropdownMenu: @Composable () -> Unit = {},
) {
val color = if (enabled) {
MaterialTheme.colorScheme.onSurface
@@ -107,14 +111,17 @@ fun RegularPreference(
)
}
if (trailingIcon != null) {
Icon(
imageVector = trailingIcon,
contentDescription = "trailingIcon",
modifier = Modifier
.padding(start = 8.dp)
.wrapContentWidth(Alignment.End),
tint = color,
)
Box {
Icon(
imageVector = trailingIcon,
contentDescription = "trailingIcon",
modifier = Modifier
.padding(start = 8.dp)
.wrapContentWidth(Alignment.End),
tint = color,
)
dropdownMenu()
}
}
}
if (summary != null) {