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(ui): Refactor SettingsItem component (#3364)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
James Rich 2025-10-06 21:23:34 -05:00 • committed by GitHub
parent 4d7ad96a09
commit 3f923ae5c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 114 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

20
feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsScreen.kt
View file

@ -34,7 +34,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight
import androidx.compose.material.icons.filled.BugReport
import androidx.compose.material.icons.rounded.AppSettingsAlt
import androidx.compose.material.icons.rounded.FormatPaint
@ -288,7 +287,12 @@ fun SettingsScreen(
SettingsItem(
text = stringResource(R.string.preferences_language),
leadingIcon = Icons.Rounded.Language,
trailingIcon = if (useInAppLangPicker) null else Icons.AutoMirrored.Rounded.KeyboardArrowRight,
trailingContent =
if (useInAppLangPicker) {
null
} else {
{}
},
) {
if (useInAppLangPicker) {
showLanguagePickerDialog = true
@ -306,7 +310,7 @@ fun SettingsScreen(
SettingsItem(
text = stringResource(R.string.theme),
leadingIcon = Icons.Rounded.FormatPaint,
trailingIcon = null,
trailingContent = {},
) {
showThemePickerDialog = true
}
@ -321,7 +325,7 @@ fun SettingsScreen(
SettingsItem(
text = stringResource(R.string.save_rangetest),
leadingIcon = Icons.Rounded.Output,
trailingIcon = null,
trailingContent = {},
) {
val intent =
Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
@ -341,7 +345,7 @@ fun SettingsScreen(
SettingsItem(
text = stringResource(R.string.export_data_csv),
leadingIcon = Icons.Rounded.Output,
trailingIcon = null,
trailingContent = {},
) {
val intent =
Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
@ -355,7 +359,7 @@ fun SettingsScreen(
SettingsItem(
text = stringResource(R.string.intro_show),
leadingIcon = Icons.Rounded.WavingHand,
trailingIcon = null,
trailingContent = {},
) {
settingsViewModel.showAppIntro()
}
@ -363,7 +367,7 @@ fun SettingsScreen(
SettingsItem(
text = stringResource(R.string.system_settings),
leadingIcon = Icons.Rounded.AppSettingsAlt,
trailingIcon = Icons.AutoMirrored.Rounded.KeyboardArrowRight,
trailingContent = null,
) {
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
intent.data = Uri.fromParts("package", context.packageName, null)
@ -405,7 +409,7 @@ private fun AppVersionButton(
SettingsItemDetail(
text = stringResource(R.string.app_version),
icon = Icons.Rounded.Memory,
trailingText = appVersionName,
supportingText = appVersionName,
) {
clickCount = clickCount.inc().coerceIn(0, UNLOCK_CLICK_COUNT)

2
feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/RadioConfig.kt
View file

@ -147,7 +147,7 @@ fun RadioConfigItemList(
enabled = enabled,
text = stringResource(route.title),
leadingIcon = route.icon,
trailingIcon = null,
trailingContent = {},
) {
showDialog = true
}