mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
fix(icons): replace outline (FILL=0) pathData with filled (FILL=1) from upstream Material Symbols (#5056)
This commit is contained in:
parent
77e30b60e1
commit
ce32e640de
159 changed files with 269 additions and 452 deletions
|
|
@ -68,8 +68,8 @@ import org.meshtastic.core.resources.elevation_suffix
|
|||
import org.meshtastic.core.resources.exchange_position
|
||||
import org.meshtastic.core.resources.last_position_update
|
||||
import org.meshtastic.core.ui.icon.ErrorOutline
|
||||
import org.meshtastic.core.ui.icon.GpsFixed
|
||||
import org.meshtastic.core.ui.icon.MeshtasticIcons
|
||||
import org.meshtastic.core.ui.icon.MyLocation
|
||||
import org.meshtastic.feature.node.compass.CompassUiState
|
||||
import org.meshtastic.feature.node.compass.CompassWarning
|
||||
import kotlin.math.PI
|
||||
|
|
@ -152,7 +152,7 @@ fun CompassSheetContent(
|
|||
)
|
||||
// Quick way to re-request a fresh fix without leaving the compass sheet
|
||||
Button(onClick = onRequestPosition, modifier = Modifier.fillMaxWidth()) {
|
||||
Icon(imageVector = MeshtasticIcons.GpsFixed, contentDescription = null)
|
||||
Icon(imageVector = MeshtasticIcons.MyLocation, contentDescription = null)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(text = stringResource(Res.string.exchange_position))
|
||||
}
|
||||
|
|
@ -204,13 +204,13 @@ private fun WarningList(
|
|||
|
||||
if (warnings.contains(CompassWarning.NO_LOCATION_PERMISSION)) {
|
||||
Button(onClick = onRequestPermission, modifier = Modifier.fillMaxWidth()) {
|
||||
Icon(imageVector = MeshtasticIcons.GpsFixed, contentDescription = null)
|
||||
Icon(imageVector = MeshtasticIcons.MyLocation, contentDescription = null)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(text = stringResource(Res.string.compass_no_location_permission))
|
||||
}
|
||||
} else if (warnings.contains(CompassWarning.LOCATION_DISABLED)) {
|
||||
Button(onClick = onOpenLocationSettings, modifier = Modifier.fillMaxWidth()) {
|
||||
Icon(imageVector = MeshtasticIcons.GpsFixed, contentDescription = null)
|
||||
Icon(imageVector = MeshtasticIcons.MyLocation, contentDescription = null)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(text = stringResource(Res.string.compass_location_disabled))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ import org.meshtastic.core.resources.elevation_suffix
|
|||
import org.meshtastic.core.resources.last_position_update
|
||||
import org.meshtastic.core.ui.component.BasicListItem
|
||||
import org.meshtastic.core.ui.component.icon
|
||||
import org.meshtastic.core.ui.icon.KeyboardArrowRight
|
||||
import org.meshtastic.core.ui.icon.ChevronRight
|
||||
import org.meshtastic.core.ui.icon.LocationOn
|
||||
import org.meshtastic.core.ui.icon.MeshtasticIcons
|
||||
import org.meshtastic.core.ui.util.createClipEntry
|
||||
|
|
@ -82,7 +82,7 @@ fun LinkedCoordinatesItem(
|
|||
text = stringResource(Res.string.last_position_update),
|
||||
leadingIcon = MeshtasticIcons.LocationOn,
|
||||
supportingText = "$ago • $coordinates$elevationText",
|
||||
trailingContent = MeshtasticIcons.KeyboardArrowRight.icon(),
|
||||
trailingContent = MeshtasticIcons.ChevronRight.icon(),
|
||||
onClick = { openMap(node.latitude, node.longitude, node.user.long_name) },
|
||||
onLongClick = { coroutineScope.launch { clipboard.setClipEntry(createClipEntry(coordinates, copyLabel)) } },
|
||||
)
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ import org.meshtastic.core.resources.node_filter_show_ignored
|
|||
import org.meshtastic.core.resources.node_filter_title
|
||||
import org.meshtastic.core.resources.node_sort_button
|
||||
import org.meshtastic.core.resources.node_sort_title
|
||||
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.Search
|
||||
import org.meshtastic.core.ui.icon.Sort
|
||||
|
|
@ -179,7 +179,7 @@ private fun NodeFilterTextField(filterText: String, onTextChange: (String) -> Un
|
|||
trailingIcon = {
|
||||
if (filterText.isNotEmpty() || isFocused) {
|
||||
Icon(
|
||||
MeshtasticIcons.Clear,
|
||||
MeshtasticIcons.Close,
|
||||
contentDescription = stringResource(Res.string.desc_node_filter_clear),
|
||||
modifier =
|
||||
Modifier.clickable {
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@ import org.meshtastic.core.resources.device_metrics_log
|
|||
import org.meshtastic.core.resources.env_metrics_log
|
||||
import org.meshtastic.core.resources.host_metrics_log
|
||||
import org.meshtastic.core.resources.ic_charging_station
|
||||
import org.meshtastic.core.resources.ic_group
|
||||
import org.meshtastic.core.resources.ic_groups
|
||||
import org.meshtastic.core.resources.ic_location_on
|
||||
import org.meshtastic.core.resources.ic_memory
|
||||
import org.meshtastic.core.resources.ic_people
|
||||
import org.meshtastic.core.resources.ic_power
|
||||
import org.meshtastic.core.resources.ic_route
|
||||
import org.meshtastic.core.resources.ic_signal_cellular_alt
|
||||
|
|
@ -49,5 +49,5 @@ enum class LogsType(val titleRes: StringResource, val icon: DrawableResource, va
|
|||
TRACEROUTE(Res.string.traceroute_log, Res.drawable.ic_route, { NodeDetailRoute.TracerouteLog(it) }),
|
||||
NEIGHBOR_INFO(Res.string.neighbor_info, Res.drawable.ic_groups, { NodeDetailRoute.NeighborInfoLog(it) }),
|
||||
HOST(Res.string.host_metrics_log, Res.drawable.ic_memory, { NodeDetailRoute.HostMetricsLog(it) }),
|
||||
PAX(Res.string.pax_metrics_log, Res.drawable.ic_people, { NodeDetailRoute.PaxMetrics(it) }),
|
||||
PAX(Res.string.pax_metrics_log, Res.drawable.ic_group, { NodeDetailRoute.PaxMetrics(it) }),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,11 +37,11 @@ import org.meshtastic.core.resources.device
|
|||
import org.meshtastic.core.resources.environment
|
||||
import org.meshtastic.core.resources.host
|
||||
import org.meshtastic.core.resources.ic_cell_tower
|
||||
import org.meshtastic.core.resources.ic_group
|
||||
import org.meshtastic.core.resources.ic_groups
|
||||
import org.meshtastic.core.resources.ic_light_mode
|
||||
import org.meshtastic.core.resources.ic_location_on
|
||||
import org.meshtastic.core.resources.ic_memory
|
||||
import org.meshtastic.core.resources.ic_people
|
||||
import org.meshtastic.core.resources.ic_perm_scan_wifi
|
||||
import org.meshtastic.core.resources.ic_power
|
||||
import org.meshtastic.core.resources.ic_router
|
||||
|
|
@ -244,7 +244,7 @@ enum class NodeDetailScreen(
|
|||
PAX(
|
||||
Res.string.pax,
|
||||
NodeDetailRoute.PaxMetrics::class,
|
||||
Res.drawable.ic_people,
|
||||
Res.drawable.ic_group,
|
||||
{ metricsVM, onNavigateUp -> PaxMetricsScreen(metricsVM, onNavigateUp) },
|
||||
),
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue