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
|
|
@ -36,7 +36,7 @@ import androidx.compose.ui.tooling.preview.Preview
|
|||
import androidx.compose.ui.unit.dp
|
||||
import kotlinx.coroutines.launch
|
||||
import org.meshtastic.core.ui.icon.Android
|
||||
import org.meshtastic.core.ui.icon.KeyboardArrowRight
|
||||
import org.meshtastic.core.ui.icon.ChevronRight
|
||||
import org.meshtastic.core.ui.icon.MeshtasticIcons
|
||||
import org.meshtastic.core.ui.theme.AppTheme
|
||||
import org.meshtastic.core.ui.util.createClipEntry
|
||||
|
|
@ -55,7 +55,7 @@ fun ListItem(
|
|||
enabled: Boolean = true,
|
||||
leadingIcon: ImageVector? = null,
|
||||
leadingIconTint: Color = LocalContentColor.current,
|
||||
trailingIcon: ImageVector? = MeshtasticIcons.KeyboardArrowRight,
|
||||
trailingIcon: ImageVector? = MeshtasticIcons.ChevronRight,
|
||||
trailingIconTint: Color = LocalContentColor.current,
|
||||
onClick: (() -> Unit)? = null,
|
||||
) {
|
||||
|
|
|
|||
|
|
@ -23,11 +23,10 @@ import org.meshtastic.core.resources.Res
|
|||
import org.meshtastic.core.resources.ic_add
|
||||
import org.meshtastic.core.resources.ic_add_reaction
|
||||
import org.meshtastic.core.resources.ic_bar_chart
|
||||
import org.meshtastic.core.resources.ic_clear
|
||||
import org.meshtastic.core.resources.ic_check
|
||||
import org.meshtastic.core.resources.ic_close
|
||||
import org.meshtastic.core.resources.ic_content_copy
|
||||
import org.meshtastic.core.resources.ic_delete
|
||||
import org.meshtastic.core.resources.ic_done
|
||||
import org.meshtastic.core.resources.ic_delete_fill1
|
||||
import org.meshtastic.core.resources.ic_download
|
||||
import org.meshtastic.core.resources.ic_drag_handle
|
||||
import org.meshtastic.core.resources.ic_edit
|
||||
|
|
@ -64,14 +63,12 @@ val MeshtasticIcons.Add: ImageVector
|
|||
@Composable get() = vectorResource(Res.drawable.ic_add)
|
||||
val MeshtasticIcons.AddReaction: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_add_reaction)
|
||||
val MeshtasticIcons.Clear: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_clear)
|
||||
val MeshtasticIcons.Close: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_close)
|
||||
val MeshtasticIcons.Copy: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_content_copy)
|
||||
val MeshtasticIcons.Delete: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_delete)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_delete_fill1)
|
||||
val MeshtasticIcons.Edit: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_edit)
|
||||
val MeshtasticIcons.More: ImageVector
|
||||
|
|
@ -109,8 +106,8 @@ val MeshtasticIcons.Upload: ImageVector
|
|||
@Composable get() = vectorResource(Res.drawable.ic_upload)
|
||||
val MeshtasticIcons.DragHandle: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_drag_handle)
|
||||
val MeshtasticIcons.Done: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_done)
|
||||
val MeshtasticIcons.Check: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_check)
|
||||
val MeshtasticIcons.QrCode: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_qr_code)
|
||||
val MeshtasticIcons.FolderOpen: ImageVector
|
||||
|
|
|
|||
|
|
@ -21,9 +21,6 @@ import androidx.compose.ui.graphics.vector.ImageVector
|
|||
import org.jetbrains.compose.resources.vectorResource
|
||||
import org.meshtastic.core.resources.Res
|
||||
import org.meshtastic.core.resources.ic_calendar_month
|
||||
import org.meshtastic.core.resources.ic_check
|
||||
import org.meshtastic.core.resources.ic_gps_fixed
|
||||
import org.meshtastic.core.resources.ic_gps_off
|
||||
import org.meshtastic.core.resources.ic_layers
|
||||
import org.meshtastic.core.resources.ic_lens
|
||||
import org.meshtastic.core.resources.ic_location_disabled
|
||||
|
|
@ -58,12 +55,6 @@ val MeshtasticIcons.Place: ImageVector
|
|||
@Composable get() = vectorResource(Res.drawable.ic_place)
|
||||
val MeshtasticIcons.Lens: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_lens)
|
||||
val MeshtasticIcons.GpsFixed: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_gps_fixed)
|
||||
val MeshtasticIcons.GpsOff: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_gps_off)
|
||||
val MeshtasticIcons.Check: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_check)
|
||||
val MeshtasticIcons.Map: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_map)
|
||||
val MeshtasticIcons.LocationOn: ImageVector
|
||||
|
|
|
|||
|
|
@ -26,15 +26,12 @@ import org.meshtastic.core.resources.ic_chevron_right
|
|||
import org.meshtastic.core.resources.ic_expand_less
|
||||
import org.meshtastic.core.resources.ic_expand_more
|
||||
import org.meshtastic.core.resources.ic_keyboard_arrow_down
|
||||
import org.meshtastic.core.resources.ic_keyboard_arrow_right
|
||||
import org.meshtastic.core.resources.ic_keyboard_arrow_up
|
||||
|
||||
val MeshtasticIcons.ArrowBack: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_arrow_back)
|
||||
val MeshtasticIcons.ChevronRight: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_chevron_right)
|
||||
val MeshtasticIcons.KeyboardArrowRight: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_keyboard_arrow_right)
|
||||
val MeshtasticIcons.KeyboardArrowDown: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_keyboard_arrow_down)
|
||||
val MeshtasticIcons.KeyboardArrowUp: ImageVector
|
||||
|
|
|
|||
|
|
@ -20,16 +20,16 @@ import androidx.compose.runtime.Composable
|
|||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import org.jetbrains.compose.resources.vectorResource
|
||||
import org.meshtastic.core.resources.Res
|
||||
import org.meshtastic.core.resources.ic_delete_outline
|
||||
import org.meshtastic.core.resources.ic_do_disturb_on
|
||||
import org.meshtastic.core.resources.ic_delete_fill0
|
||||
import org.meshtastic.core.resources.ic_do_not_disturb_on
|
||||
import org.meshtastic.core.resources.ic_nodes
|
||||
import org.meshtastic.core.resources.ic_notes
|
||||
|
||||
val MeshtasticIcons.Notes: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_notes)
|
||||
val MeshtasticIcons.DoDisturb: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_do_disturb_on)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_do_not_disturb_on)
|
||||
val MeshtasticIcons.DeleteNode: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_delete_outline)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_delete_fill0)
|
||||
val MeshtasticIcons.Nodes: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_nodes)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ import org.meshtastic.core.resources.Res
|
|||
import org.meshtastic.core.resources.ic_account_circle
|
||||
import org.meshtastic.core.resources.ic_group
|
||||
import org.meshtastic.core.resources.ic_groups
|
||||
import org.meshtastic.core.resources.ic_people
|
||||
import org.meshtastic.core.resources.ic_person
|
||||
import org.meshtastic.core.resources.ic_person_add
|
||||
import org.meshtastic.core.resources.ic_person_off
|
||||
|
|
@ -45,4 +44,4 @@ val MeshtasticIcons.Person: ImageVector
|
|||
val MeshtasticIcons.Groups: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_groups)
|
||||
val MeshtasticIcons.PeopleCount: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_people)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_group)
|
||||
|
|
|
|||
|
|
@ -22,16 +22,16 @@ import org.jetbrains.compose.resources.vectorResource
|
|||
import org.meshtastic.core.resources.Res
|
||||
import org.meshtastic.core.resources.ic_arrow_circle_up
|
||||
import org.meshtastic.core.resources.ic_bedtime
|
||||
import org.meshtastic.core.resources.ic_check_circle
|
||||
import org.meshtastic.core.resources.ic_check_circle_outline
|
||||
import org.meshtastic.core.resources.ic_check_circle_fill0
|
||||
import org.meshtastic.core.resources.ic_check_circle_fill1
|
||||
import org.meshtastic.core.resources.ic_cloud
|
||||
import org.meshtastic.core.resources.ic_cloud_done
|
||||
import org.meshtastic.core.resources.ic_cloud_download
|
||||
import org.meshtastic.core.resources.ic_cloud_sync
|
||||
import org.meshtastic.core.resources.ic_cloud_upload
|
||||
import org.meshtastic.core.resources.ic_dangerous
|
||||
import org.meshtastic.core.resources.ic_error
|
||||
import org.meshtastic.core.resources.ic_error_outline
|
||||
import org.meshtastic.core.resources.ic_error_fill0
|
||||
import org.meshtastic.core.resources.ic_error_fill1
|
||||
import org.meshtastic.core.resources.ic_history
|
||||
import org.meshtastic.core.resources.ic_how_to_reg
|
||||
import org.meshtastic.core.resources.ic_info
|
||||
|
|
@ -96,13 +96,13 @@ val MeshtasticIcons.Dangerous: ImageVector
|
|||
|
||||
// Result states
|
||||
val MeshtasticIcons.CheckCircle: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_check_circle_outline)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_check_circle_fill0)
|
||||
val MeshtasticIcons.Success: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_check_circle)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_check_circle_fill1)
|
||||
val MeshtasticIcons.Error: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_error)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_error_fill1)
|
||||
val MeshtasticIcons.ErrorOutline: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_error_outline)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_error_fill0)
|
||||
val MeshtasticIcons.Info: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_info)
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ val MeshtasticIcons.Disconnected: ImageVector
|
|||
val MeshtasticIcons.MessageEnroute: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_schedule)
|
||||
val MeshtasticIcons.MessageError: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_error_outline)
|
||||
@Composable get() = vectorResource(Res.drawable.ic_error_fill0)
|
||||
val MeshtasticIcons.Warning: ImageVector
|
||||
@Composable get() = vectorResource(Res.drawable.ic_warning)
|
||||
val MeshtasticIcons.MqttConnected: ImageVector
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue