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

fix(icons): replace outline (FILL=0) pathData with filled (FILL=1) from upstream Material Symbols (#5056)

Browse source
This commit is contained in:
James Rich 2026-04-10 17:15:43 -05:00 • committed by GitHub
parent 77e30b60e1
commit ce32e640de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
159 changed files with 269 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

4
feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/component/AppInfoSection.kt
View file

@ -44,8 +44,8 @@ import org.meshtastic.core.resources.modules_unlocked
import org.meshtastic.core.resources.system_settings
import org.meshtastic.core.ui.component.ListItem
import org.meshtastic.core.ui.icon.AppSettingsAlt
import org.meshtastic.core.ui.icon.ChevronRight
import org.meshtastic.core.ui.icon.Info
import org.meshtastic.core.ui.icon.KeyboardArrowRight
import org.meshtastic.core.ui.icon.Memory
import org.meshtastic.core.ui.icon.MeshtasticIcons
import org.meshtastic.core.ui.icon.Notifications
@ -101,7 +101,7 @@ fun AppInfoSection(
ListItem(
text = stringResource(Res.string.acknowledgements),
leadingIcon = MeshtasticIcons.Info,
trailingIcon = MeshtasticIcons.KeyboardArrowRight,
trailingIcon = MeshtasticIcons.ChevronRight,
) {
onNavigateToAbout()
}

4
feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/component/AppearanceSection.kt
View file

@ -31,8 +31,8 @@ import org.meshtastic.core.resources.app_settings
import org.meshtastic.core.resources.preferences_language
import org.meshtastic.core.resources.theme
import org.meshtastic.core.ui.component.ListItem
import org.meshtastic.core.ui.icon.ChevronRight
import org.meshtastic.core.ui.icon.FormatPaint
import org.meshtastic.core.ui.icon.KeyboardArrowRight
import org.meshtastic.core.ui.icon.Language
import org.meshtastic.core.ui.icon.MeshtasticIcons
import org.meshtastic.core.ui.theme.AppTheme
@ -52,7 +52,7 @@ fun AppearanceSection(onShowLanguagePicker: () -> Unit, onShowThemePicker: () ->
ListItem(
text = stringResource(Res.string.preferences_language),
leadingIcon = MeshtasticIcons.Language,
trailingIcon = if (useInAppLangPicker) null else MeshtasticIcons.KeyboardArrowRight,
trailingIcon = if (useInAppLangPicker) null else MeshtasticIcons.ChevronRight,
) {
if (useInAppLangPicker) {
onShowLanguagePicker()

10
feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/debugging/DebugFilters.kt
View file

@ -60,8 +60,8 @@ import org.meshtastic.core.resources.debug_filters
import org.meshtastic.core.resources.match_all
import org.meshtastic.core.resources.match_any
import org.meshtastic.core.ui.icon.Add
import org.meshtastic.core.ui.icon.Clear
import org.meshtastic.core.ui.icon.Done
import org.meshtastic.core.ui.icon.Check
import org.meshtastic.core.ui.icon.Close
import org.meshtastic.core.ui.icon.FilterAlt
import org.meshtastic.core.ui.icon.FilterAltOff
import org.meshtastic.core.ui.icon.MeshtasticIcons
@ -151,7 +151,7 @@ fun DebugPresetFilters(
leadingIcon = {
if (filter in filterTexts) {
Icon(
imageVector = MeshtasticIcons.Done,
imageVector = MeshtasticIcons.Check,
contentDescription = stringResource(Res.string.debug_filter_included),
)
}
@ -266,7 +266,7 @@ fun DebugActiveFilters(
}
IconButton(onClick = { onFilterTextsChange(emptyList()) }) {
Icon(
imageVector = MeshtasticIcons.Clear,
imageVector = MeshtasticIcons.Close,
contentDescription = stringResource(Res.string.debug_filter_clear),
)
}
@ -282,7 +282,7 @@ fun DebugActiveFilters(
onClick = { onFilterTextsChange(filterTexts - filter) },
label = { Text(filter) },
leadingIcon = { Icon(imageVector = MeshtasticIcons.FilterAlt, contentDescription = null) },
trailingIcon = { Icon(imageVector = MeshtasticIcons.Clear, contentDescription = null) },
trailingIcon = { Icon(imageVector = MeshtasticIcons.Close, contentDescription = null) },
)
}
}

4
feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/debugging/DebugSearch.kt
View file

@ -50,7 +50,7 @@ import org.meshtastic.core.resources.debug_logs_export
import org.meshtastic.core.resources.debug_search_clear
import org.meshtastic.core.resources.debug_search_next
import org.meshtastic.core.resources.debug_search_prev
import org.meshtastic.core.ui.icon.Clear
import org.meshtastic.core.ui.icon.Close
import org.meshtastic.core.ui.icon.FileDownload
import org.meshtastic.core.ui.icon.KeyboardArrowDown
import org.meshtastic.core.ui.icon.KeyboardArrowUp
@ -130,7 +130,7 @@ fun DebugSearchBar(
if (searchState.searchText.isNotEmpty()) {
IconButton(onClick = onClearSearch, modifier = Modifier.size(32.dp)) {
Icon(
imageVector = MeshtasticIcons.Clear,
imageVector = MeshtasticIcons.Close,
contentDescription = stringResource(Res.string.debug_search_clear),
modifier = Modifier.size(16.dp),
)

6
feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/navigation/ModuleRoute.kt
View file

@ -30,10 +30,10 @@ import org.meshtastic.core.resources.external_notification
import org.meshtastic.core.resources.ic_alt_route
import org.meshtastic.core.resources.ic_cloud
import org.meshtastic.core.resources.ic_data_usage
import org.meshtastic.core.resources.ic_group
import org.meshtastic.core.resources.ic_light_mode
import org.meshtastic.core.resources.ic_message
import org.meshtastic.core.resources.ic_notifications
import org.meshtastic.core.resources.ic_people
import org.meshtastic.core.resources.ic_perm_scan_wifi
import org.meshtastic.core.resources.ic_sensors
import org.meshtastic.core.resources.ic_settings_remote
@ -116,7 +116,7 @@ enum class ModuleRoute(
NEIGHBOR_INFO(
Res.string.neighbor_info,
SettingsRoute.NeighborInfo,
Res.drawable.ic_people,
Res.drawable.ic_group,
AdminMessage.ModuleConfigType.NEIGHBORINFO_CONFIG.value,
),
AMBIENT_LIGHTING(
@ -154,7 +154,7 @@ enum class ModuleRoute(
TAK(
Res.string.tak,
SettingsRoute.TAK,
Res.drawable.ic_people,
Res.drawable.ic_group,
AdminMessage.ModuleConfigType.TAK_CONFIG.value,
isSupported = { it.supportsTakConfig },
isApplicable = { it == Config.DeviceConfig.Role.TAK || it == Config.DeviceConfig.Role.TAK_TRACKER },

8
feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/RadioConfig.kt
View file

@ -56,9 +56,9 @@ import org.meshtastic.core.ui.component.ListItem
import org.meshtastic.core.ui.icon.AdminPanelSettings
import org.meshtastic.core.ui.icon.AppSettingsAlt
import org.meshtastic.core.ui.icon.BugReport
import org.meshtastic.core.ui.icon.ChevronRight
import org.meshtastic.core.ui.icon.CleaningServices
import org.meshtastic.core.ui.icon.Download
import org.meshtastic.core.ui.icon.KeyboardArrowRight
import org.meshtastic.core.ui.icon.MeshtasticIcons
import org.meshtastic.core.ui.icon.Settings
import org.meshtastic.core.ui.icon.SystemUpdate
@ -122,7 +122,7 @@ private fun DeviceConfigSection(isManaged: Boolean, enabled: Boolean, onNavigate
ListItem(
text = stringResource(Res.string.device_configuration),
leadingIcon = MeshtasticIcons.AppSettingsAlt,
trailingIcon = MeshtasticIcons.KeyboardArrowRight,
trailingIcon = MeshtasticIcons.ChevronRight,
enabled = enabled,
) {
onNavigate(SettingsRoute.DeviceConfiguration)
@ -139,7 +139,7 @@ private fun ModuleSettingsSection(isManaged: Boolean, enabled: Boolean, onNaviga
ListItem(
text = stringResource(Res.string.module_settings),
leadingIcon = MeshtasticIcons.Settings,
trailingIcon = MeshtasticIcons.KeyboardArrowRight,
trailingIcon = MeshtasticIcons.ChevronRight,
enabled = enabled,
) {
onNavigate(SettingsRoute.ModuleConfiguration)
@ -175,7 +175,7 @@ private fun AdministrationSection(enabled: Boolean, onNavigate: (Route) -> Unit)
ListItem(
text = stringResource(Res.string.administration),
leadingIcon = MeshtasticIcons.AdminPanelSettings,
trailingIcon = MeshtasticIcons.KeyboardArrowRight,
trailingIcon = MeshtasticIcons.ChevronRight,
leadingIconTint = MaterialTheme.colorScheme.error,
textColor = MaterialTheme.colorScheme.error,
trailingIconTint = MaterialTheme.colorScheme.error,

4
feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/component/DeviceConfigScreen.kt
View file

@ -106,7 +106,7 @@ import org.meshtastic.core.ui.component.EditTextPreference
import org.meshtastic.core.ui.component.InsetDivider
import org.meshtastic.core.ui.component.SwitchPreference
import org.meshtastic.core.ui.component.TitledCard
import org.meshtastic.core.ui.icon.Clear
import org.meshtastic.core.ui.icon.Close
import org.meshtastic.core.ui.icon.MeshtasticIcons
import org.meshtastic.core.ui.icon.PhoneAndroid
import org.meshtastic.core.ui.icon.role
@ -269,7 +269,7 @@ fun DeviceConfigScreenCommon(viewModel: RadioConfigViewModel, onBack: () -> Unit
onValueChanged = { formState.value = formState.value.copy(tzdef = it) },
trailingIcon = {
IconButton(onClick = { formState.value = formState.value.copy(tzdef = "") }) {
Icon(imageVector = MeshtasticIcons.Clear, contentDescription = null)
Icon(imageVector = MeshtasticIcons.Close, contentDescription = null)
}
},
)

4
feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/component/StatusMessageConfigItemList.kt
View file

@ -36,7 +36,7 @@ import org.meshtastic.core.resources.status_message
import org.meshtastic.core.resources.status_message_config
import org.meshtastic.core.ui.component.EditTextPreference
import org.meshtastic.core.ui.component.TitledCard
import org.meshtastic.core.ui.icon.Clear
import org.meshtastic.core.ui.icon.Close
import org.meshtastic.core.ui.icon.MeshtasticIcons
import org.meshtastic.feature.settings.radio.RadioConfigViewModel
@ -90,7 +90,7 @@ fun StatusMessageConfigScreen(viewModel: RadioConfigViewModel, onBack: () -> Uni
if (formState.value.node_status.isNotEmpty()) {
IconButton(onClick = { formState.value = formState.value.copy(node_status = "") }) {
Icon(
imageVector = MeshtasticIcons.Clear,
imageVector = MeshtasticIcons.Close,
contentDescription = stringResource(Res.string.clear),
)
}

4
feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/DesktopSettingsScreen.kt
View file

@ -59,9 +59,9 @@ import org.meshtastic.core.ui.component.DropDownPreference
import org.meshtastic.core.ui.component.ListItem
import org.meshtastic.core.ui.component.MainAppBar
import org.meshtastic.core.ui.component.MeshtasticDialog
import org.meshtastic.core.ui.icon.ChevronRight
import org.meshtastic.core.ui.icon.FormatPaint
import org.meshtastic.core.ui.icon.Info
import org.meshtastic.core.ui.icon.KeyboardArrowRight
import org.meshtastic.core.ui.icon.Language
import org.meshtastic.core.ui.icon.Memory
import org.meshtastic.core.ui.icon.MeshtasticIcons
@ -238,7 +238,7 @@ private fun DesktopAppInfoSection(
ListItem(
text = stringResource(Res.string.acknowledgements),
leadingIcon = MeshtasticIcons.Info,
trailingIcon = MeshtasticIcons.KeyboardArrowRight,
trailingIcon = MeshtasticIcons.ChevronRight,
) {
onNavigateToAbout()
}