refactor(ui): Replace drawable icons with Material TwoTone Compose icons

Switch all Compose screens from Icons.Default/Filled and painterResource
drawable references to Icons.TwoTone for a consistent two-tone icon style.
Delete 24 drawable XML files that are no longer referenced.
This commit is contained in:
darken
2026-02-24 15:23:47 +01:00
committed by Matthias Urhahn
parent 63692595a8
commit 8df2d78070
40 changed files with 121 additions and 341 deletions
@@ -26,7 +26,11 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.painterResource
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.twotone.DevicesOther
import androidx.compose.material.icons.twotone.Favorite
import androidx.compose.material.icons.twotone.Settings
import androidx.compose.material.icons.twotone.Stars
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
@@ -155,14 +159,14 @@ fun OverviewScreen(
actions = {
IconButton(onClick = onManageDevices) {
Icon(
painter = painterResource(R.drawable.ic_baseline_devices_other_24),
imageVector = Icons.TwoTone.DevicesOther,
contentDescription = stringResource(R.string.settings_devices_label),
)
}
IconButton(onClick = onSettings) {
Icon(
painter = painterResource(R.drawable.ic_baseline_settings_24),
imageVector = Icons.TwoTone.Settings,
contentDescription = stringResource(R.string.settings_general_label),
)
}
@@ -173,7 +177,7 @@ fun OverviewScreen(
info.type == UpgradeRepo.Type.GPLAY && !info.isPro -> {
IconButton(onClick = onUpgrade) {
Icon(
painter = painterResource(R.drawable.ic_baseline_stars_24),
imageVector = Icons.TwoTone.Stars,
contentDescription = stringResource(R.string.general_upgrade_action),
)
}
@@ -182,7 +186,7 @@ fun OverviewScreen(
info.type == UpgradeRepo.Type.FOSS && !info.isPro -> {
IconButton(onClick = onUpgrade) {
Icon(
painter = painterResource(R.drawable.ic_baseline_heart_24),
imageVector = Icons.TwoTone.Favorite,
contentDescription = stringResource(R.string.general_donate_action),
)
}
@@ -11,12 +11,12 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.BatteryChargingFull
import androidx.compose.material.icons.filled.GridView
import androidx.compose.material.icons.filled.Hearing
import androidx.compose.material.icons.filled.Key
import androidx.compose.material.icons.filled.KeyboardVoice
import androidx.compose.material.icons.filled.SettingsInputAntenna
import androidx.compose.material.icons.twotone.BatteryChargingFull
import androidx.compose.material.icons.twotone.GridView
import androidx.compose.material.icons.twotone.Hearing
import androidx.compose.material.icons.twotone.Key
import androidx.compose.material.icons.twotone.KeyboardVoice
import androidx.compose.material.icons.twotone.SettingsInputAntenna
import androidx.compose.material.icons.outlined.Key
import androidx.compose.material3.Card
import androidx.compose.material3.Icon
@@ -88,7 +88,7 @@ fun DualPodsCard(
if (device is ApplePods && device.meta.isIRKMatch) {
Spacer(modifier = Modifier.width(6.dp))
Icon(
imageVector = if (device.payload.private != null) Icons.Default.Key else Icons.Outlined.Key,
imageVector = if (device.payload.private != null) Icons.TwoTone.Key else Icons.Outlined.Key,
contentDescription = null,
modifier = Modifier.size(14.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -119,7 +119,7 @@ fun DualPodsCard(
)
Spacer(modifier = Modifier.width(4.dp))
Icon(
imageVector = Icons.Default.SettingsInputAntenna,
imageVector = Icons.TwoTone.SettingsInputAntenna,
contentDescription = null,
modifier = Modifier.size(16.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -196,7 +196,7 @@ fun DualPodsCard(
modifier = Modifier.padding(start = 32.dp, top = 2.dp),
) {
Icon(
imageVector = Icons.Default.GridView,
imageVector = Icons.TwoTone.GridView,
contentDescription = null,
modifier = Modifier.size(14.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -290,7 +290,7 @@ private fun BatteryRow(
horizontalArrangement = Arrangement.End,
) {
Icon(
imageVector = Icons.Default.BatteryChargingFull,
imageVector = Icons.TwoTone.BatteryChargingFull,
contentDescription = null,
modifier = Modifier
.size(16.dp)
@@ -299,7 +299,7 @@ private fun BatteryRow(
)
Icon(
imageVector = Icons.Default.KeyboardVoice,
imageVector = Icons.TwoTone.KeyboardVoice,
contentDescription = stringResource(R.string.pods_microphone_label),
modifier = Modifier
.size(16.dp)
@@ -308,7 +308,7 @@ private fun BatteryRow(
)
Icon(
imageVector = Icons.Default.Hearing,
imageVector = Icons.TwoTone.Hearing,
contentDescription = null,
modifier = Modifier
.size(16.dp)
@@ -13,7 +13,8 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.twotone.DevicesOther
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import eu.darken.capod.R
@@ -47,7 +48,7 @@ fun NoProfilesCard(onManageDevices: () -> Unit) {
modifier = Modifier.align(Alignment.End),
) {
Icon(
painter = painterResource(R.drawable.ic_baseline_devices_other_24),
imageVector = Icons.TwoTone.DevicesOther,
contentDescription = null,
modifier = Modifier.padding(end = 8.dp),
)
@@ -11,9 +11,9 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.BatteryChargingFull
import androidx.compose.material.icons.filled.Hearing
import androidx.compose.material.icons.filled.SettingsInputAntenna
import androidx.compose.material.icons.twotone.BatteryChargingFull
import androidx.compose.material.icons.twotone.Hearing
import androidx.compose.material.icons.twotone.SettingsInputAntenna
import androidx.compose.material3.Card
import androidx.compose.material3.Icon
import androidx.compose.material3.LinearProgressIndicator
@@ -86,7 +86,7 @@ fun SinglePodsCard(
)
Spacer(modifier = Modifier.width(4.dp))
Icon(
imageVector = Icons.Default.SettingsInputAntenna,
imageVector = Icons.TwoTone.SettingsInputAntenna,
contentDescription = null,
modifier = Modifier.size(16.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -137,7 +137,7 @@ fun SinglePodsCard(
) {
if (device is HasChargeDetection && device.isHeadsetBeingCharged) {
Icon(
imageVector = Icons.Default.BatteryChargingFull,
imageVector = Icons.TwoTone.BatteryChargingFull,
contentDescription = null,
modifier = Modifier.size(16.dp),
tint = MaterialTheme.colorScheme.primary,
@@ -146,7 +146,7 @@ fun SinglePodsCard(
if (device is HasEarDetection && device.isBeingWorn) {
Icon(
imageVector = Icons.Default.Hearing,
imageVector = Icons.TwoTone.Hearing,
contentDescription = null,
modifier = Modifier.size(16.dp),
tint = MaterialTheme.colorScheme.primary,
@@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.SettingsInputAntenna
import androidx.compose.material.icons.twotone.SettingsInputAntenna
import androidx.compose.material3.Card
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -61,7 +61,7 @@ fun UnknownPodDeviceCard(
)
Spacer(modifier = Modifier.width(4.dp))
Icon(
imageVector = Icons.Default.SettingsInputAntenna,
imageVector = Icons.TwoTone.SettingsInputAntenna,
contentDescription = null,
modifier = Modifier.size(16.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -3,7 +3,14 @@ package eu.darken.capod.main.ui.settings
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material.icons.twotone.Book
import androidx.compose.material.icons.twotone.DevicesOther
import androidx.compose.material.icons.twotone.Favorite
import androidx.compose.material.icons.twotone.Settings
import androidx.compose.material.icons.twotone.SupportAgent
import androidx.compose.material.icons.twotone.Translate
import androidx.compose.material.icons.twotone.Widgets
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -75,7 +82,7 @@ fun SettingsScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -85,7 +92,7 @@ fun SettingsScreen(
if (sponsorUrl != null) {
IconButton(onClick = { onSponsor(sponsorUrl) }) {
Icon(
painter = painterResource(R.drawable.ic_heart),
imageVector = Icons.TwoTone.Favorite,
contentDescription = "Sponsor development",
)
}
@@ -99,7 +106,7 @@ fun SettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_general_label),
subtitle = stringResource(R.string.settings_general_description),
iconPainter = painterResource(R.drawable.ic_baseline_settings_24),
icon = Icons.TwoTone.Settings,
onClick = onGeneralSettings,
)
}
@@ -107,7 +114,7 @@ fun SettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_devices_label),
subtitle = stringResource(R.string.settings_devices_description),
iconPainter = painterResource(R.drawable.ic_baseline_devices_other_24),
icon = Icons.TwoTone.DevicesOther,
onClick = onDeviceManager,
)
}
@@ -115,7 +122,7 @@ fun SettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_reaction_label),
subtitle = stringResource(R.string.settings_reaction_description),
iconPainter = painterResource(R.drawable.ic_baseline_widgets_24),
icon = Icons.TwoTone.Widgets,
onClick = onReactions,
)
}
@@ -123,7 +130,7 @@ fun SettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_support_label),
subtitle = stringResource(R.string.settings_support_description),
iconPainter = painterResource(R.drawable.ic_baseline_support_agent_24),
icon = Icons.TwoTone.SupportAgent,
onClick = onSupport,
)
}
@@ -142,7 +149,7 @@ fun SettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.help_translate_label),
subtitle = stringResource(R.string.help_translate_description),
iconPainter = painterResource(R.drawable.ic_baseline_translate_24),
icon = Icons.TwoTone.Translate,
onClick = onHelpTranslate,
)
}
@@ -150,7 +157,7 @@ fun SettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_acknowledgements_label),
subtitle = stringResource(R.string.general_thank_you_label),
iconPainter = painterResource(R.drawable.ic_heart),
icon = Icons.TwoTone.Favorite,
onClick = onAcknowledgements,
)
}
@@ -158,7 +165,7 @@ fun SettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_privacy_policy_label),
subtitle = stringResource(R.string.settings_privacy_policy_desc),
iconPainter = painterResource(R.drawable.ic_baseline_book_24),
icon = Icons.TwoTone.Book,
onClick = onPrivacyPolicy,
)
}
@@ -3,7 +3,7 @@ package eu.darken.capod.main.ui.settings.acks
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -46,7 +46,7 @@ fun AcknowledgementsScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -8,7 +8,15 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.selection.selectableGroup
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material.icons.twotone.AccountTree
import androidx.compose.material.icons.twotone.BugReport
import androidx.compose.material.icons.twotone.DisabledVisible
import androidx.compose.material.icons.twotone.FilterList
import androidx.compose.material.icons.automirrored.twotone.Message
import androidx.compose.material.icons.twotone.Notifications
import androidx.compose.material.icons.twotone.SettingsBluetooth
import androidx.compose.material.icons.automirrored.twotone.ViewList
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
@@ -27,7 +35,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.unit.dp
@@ -89,7 +96,7 @@ fun GeneralSettingsScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -102,7 +109,7 @@ fun GeneralSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_monitor_mode_label),
subtitle = stringResource(state.monitorMode.labelRes),
iconPainter = painterResource(R.drawable.ic_baseline_disabled_visible_24),
icon = Icons.TwoTone.DisabledVisible,
onClick = { showMonitorModeDialog = true },
)
}
@@ -110,7 +117,7 @@ fun GeneralSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_scanner_mode_label),
subtitle = stringResource(state.scannerMode.labelRes),
iconPainter = painterResource(R.drawable.ic_baseline_settings_bluetooth_24),
icon = Icons.TwoTone.SettingsBluetooth,
onClick = { showScannerModeDialog = true },
)
}
@@ -121,7 +128,7 @@ fun GeneralSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_monitor_connected_notification_label),
subtitle = stringResource(R.string.settings_monitor_connected_notification_description),
iconPainter = painterResource(R.drawable.ic_checkbox_blank_badge_24),
icon = Icons.TwoTone.Notifications,
onClick = { onShowConnectedNotificationChanged(!state.showConnectedNotification) },
trailingContent = {
Switch(
@@ -136,7 +143,7 @@ fun GeneralSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_keep_notification_after_disconnect_label),
subtitle = stringResource(R.string.settings_keep_notification_after_disconnect_description),
iconPainter = painterResource(R.drawable.ic_message_24),
icon = Icons.AutoMirrored.TwoTone.Message,
onClick = { onKeepNotificationAfterDisconnectChanged(!state.keepNotificationAfterDisconnect) },
enabled = state.showConnectedNotification,
trailingContent = {
@@ -153,7 +160,7 @@ fun GeneralSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_debug_label),
subtitle = stringResource(R.string.settings_debug_description),
iconPainter = painterResource(R.drawable.ic_baseline_bug_report_24),
icon = Icons.TwoTone.BugReport,
onClick = onDebugSettings,
)
}
@@ -164,7 +171,7 @@ fun GeneralSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_compat_offloaded_filtering_disabled_title),
subtitle = stringResource(R.string.settings_compat_offloaded_filtering_disabled_summary),
iconPainter = painterResource(R.drawable.ic_filter_cog_outline_24),
icon = Icons.TwoTone.FilterList,
onClick = { onOffloadedFilteringDisabledChanged(!state.isOffloadedFilteringDisabled) },
trailingContent = {
Switch(
@@ -179,7 +186,7 @@ fun GeneralSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_compat_offloaded_batching_disabled_title),
subtitle = stringResource(R.string.settings_compat_offloaded_batching_disabled_summary),
iconPainter = painterResource(R.drawable.ic_format_list_group_24),
icon = Icons.AutoMirrored.TwoTone.ViewList,
onClick = { onOffloadedBatchingDisabledChanged(!state.isOffloadedBatchingDisabled) },
trailingContent = {
Switch(
@@ -194,7 +201,7 @@ fun GeneralSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_compat_indirectcallback_title),
subtitle = stringResource(R.string.settings_compat_indirectcallback_summary),
iconPainter = painterResource(R.drawable.ic_strategy_24),
icon = Icons.TwoTone.AccountTree,
onClick = { onUseIndirectScanResultCallbackChanged(!state.useIndirectScanResultCallback) },
trailingContent = {
Switch(
@@ -3,7 +3,10 @@ package eu.darken.capod.main.ui.settings.general.debug
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material.icons.twotone.BugReport
import androidx.compose.material.icons.twotone.DataArray
import androidx.compose.material.icons.twotone.DevicesOther
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -14,7 +17,6 @@ import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
@@ -59,7 +61,7 @@ fun DebugSettingsScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -72,7 +74,7 @@ fun DebugSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_debug_mode_label),
subtitle = stringResource(R.string.settings_debug_mode_description),
iconPainter = painterResource(R.drawable.ic_baseline_bug_report_24),
icon = Icons.TwoTone.BugReport,
onClick = { onDebugModeChanged(!state.isDebugModeEnabled) },
trailingContent = {
Switch(
@@ -87,7 +89,7 @@ fun DebugSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_fake_data_label),
subtitle = stringResource(R.string.settings_fake_data_description),
iconPainter = painterResource(R.drawable.ic_baseline_data_array_24),
icon = Icons.TwoTone.DataArray,
onClick = { onShowFakeDataChanged(!state.showFakeData) },
trailingContent = {
Switch(
@@ -102,7 +104,7 @@ fun DebugSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_blescanner_unfiltered_label),
subtitle = stringResource(R.string.settings_blescanner_unfiltered_description),
iconPainter = painterResource(R.drawable.ic_baseline_devices_other_24),
icon = Icons.TwoTone.DevicesOther,
onClick = { onShowUnfilteredChanged(!state.showUnfiltered) },
trailingContent = {
Switch(
@@ -3,7 +3,10 @@ package eu.darken.capod.main.ui.settings.support
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material.icons.twotone.BugReport
import androidx.compose.material.icons.twotone.Cancel
import androidx.compose.material.icons.twotone.Settings
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -63,7 +66,7 @@ fun SupportScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -95,7 +98,7 @@ fun SupportScreen(
SettingsBaseItem(
title = stringResource(R.string.troubleshooter_title),
subtitle = stringResource(R.string.troubleshooter_summary),
iconPainter = painterResource(R.drawable.ic_baseline_settings_24),
icon = Icons.TwoTone.Settings,
onClick = onTroubleShooter,
)
}
@@ -111,10 +114,10 @@ fun SupportScreen(
} else {
stringResource(R.string.debug_debuglog_record_action)
},
iconPainter = if (state.isRecording) {
painterResource(R.drawable.ic_cancel)
icon = if (state.isRecording) {
Icons.TwoTone.Cancel
} else {
painterResource(R.drawable.ic_baseline_bug_report_24)
Icons.TwoTone.BugReport
},
onClick = onDebugLogToggle,
)
@@ -34,7 +34,7 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.twotone.Check
import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FilterChip
@@ -603,7 +603,7 @@ private fun ColorSwatch(
if (isSelected) {
val checkColor = WidgetTheme.bestContrastForeground(color)
Icon(
imageVector = Icons.Default.Check,
imageVector = Icons.TwoTone.Check,
contentDescription = null,
modifier = Modifier.size(16.dp),
tint = Color(checkColor),
@@ -15,8 +15,8 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material.icons.twotone.Add
import androidx.compose.material3.Card
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
@@ -72,7 +72,7 @@ fun DeviceManagerScreen(
navigationIcon = {
IconButton(onClick = onBack) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -82,7 +82,7 @@ fun DeviceManagerScreen(
floatingActionButton = {
FloatingActionButton(onClick = onAddDevice) {
Icon(
imageVector = Icons.Filled.Add,
imageVector = Icons.TwoTone.Add,
contentDescription = stringResource(R.string.profiles_add_action),
)
}
@@ -150,7 +150,7 @@ private fun EmptyState(
Spacer(modifier = Modifier.height(16.dp))
TextButton(onClick = onAddDevice) {
Icon(
imageVector = Icons.Filled.Add,
imageVector = Icons.TwoTone.Add,
contentDescription = null,
modifier = Modifier.size(18.dp),
)
@@ -13,9 +13,9 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Save
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material.icons.twotone.Delete
import androidx.compose.material.icons.twotone.Save
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Card
import androidx.compose.material3.DropdownMenuItem
@@ -149,7 +149,7 @@ fun DeviceProfileCreationScreen(
navigationIcon = {
IconButton(onClick = onBack) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -160,7 +160,7 @@ fun DeviceProfileCreationScreen(
enabled = state.canSave,
) {
Icon(
imageVector = Icons.Filled.Save,
imageVector = Icons.TwoTone.Save,
contentDescription = stringResource(R.string.profiles_save_action),
tint = if (state.canSave) {
MaterialTheme.colorScheme.onSurface
@@ -172,7 +172,7 @@ fun DeviceProfileCreationScreen(
if (state.isEditMode) {
IconButton(onClick = onDelete) {
Icon(
imageVector = Icons.Filled.Delete,
imageVector = Icons.TwoTone.Delete,
contentDescription = stringResource(R.string.profiles_delete_action),
)
}
@@ -9,7 +9,14 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.selection.selectable
import androidx.compose.foundation.selection.selectableGroup
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material.icons.twotone.BluetoothConnected
import androidx.compose.material.icons.twotone.LooksOne
import androidx.compose.material.icons.automirrored.twotone.Message
import androidx.compose.material.icons.twotone.PauseCircle
import androidx.compose.material.icons.twotone.PlayCircle
import androidx.compose.material.icons.twotone.QuestionMark
import androidx.compose.material.icons.twotone.Workspaces
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
@@ -29,7 +36,6 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.unit.dp
@@ -89,7 +95,7 @@ fun ReactionSettingsScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -105,7 +111,7 @@ fun ReactionSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_onepod_mode_label),
subtitle = stringResource(R.string.settings_onepod_mode_description),
iconPainter = painterResource(R.drawable.ic_baseline_looks_one_24),
icon = Icons.TwoTone.LooksOne,
onClick = { onOnePodModeChanged(!state.onePodMode) },
trailingContent = {
Switch(
@@ -120,7 +126,7 @@ fun ReactionSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_autopplay_label),
subtitle = stringResource(R.string.settings_autoplay_description),
iconPainter = painterResource(R.drawable.ic_baseline_play_circle_24),
icon = Icons.TwoTone.PlayCircle,
onClick = { onAutoPlayChanged(!state.autoPlay) },
trailingContent = {
Switch(
@@ -135,7 +141,7 @@ fun ReactionSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_autopause_label),
subtitle = stringResource(R.string.settings_autopause_description),
iconPainter = painterResource(R.drawable.ic_baseline_pause_circle_24),
icon = Icons.TwoTone.PauseCircle,
onClick = { onAutoPauseChanged(!state.autoPause) },
trailingContent = {
Switch(
@@ -150,7 +156,7 @@ fun ReactionSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_eardetection_info_label),
subtitle = stringResource(R.string.settings_eardetection_info_description),
iconPainter = painterResource(R.drawable.ic_baseline_question_mark_24),
icon = Icons.TwoTone.QuestionMark,
onClick = {},
enabled = false,
)
@@ -162,7 +168,7 @@ fun ReactionSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_autoconnect_label),
subtitle = stringResource(R.string.settings_autoconnect_description),
iconPainter = painterResource(R.drawable.ic_baseline_bluetooth_connected_24),
icon = Icons.TwoTone.BluetoothConnected,
onClick = { onAutoConnectChanged(!state.autoConnect) },
trailingContent = {
Switch(
@@ -177,7 +183,7 @@ fun ReactionSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_autoconnect_condition_label),
subtitle = stringResource(state.autoConnectCondition.labelRes),
iconPainter = painterResource(R.drawable.ic_baseline_workspaces_24),
icon = Icons.TwoTone.Workspaces,
onClick = { if (state.autoConnect) showAutoConnectConditionDialog = true },
enabled = state.autoConnect,
)
@@ -189,7 +195,7 @@ fun ReactionSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_popup_caseopen_label),
subtitle = stringResource(R.string.settings_popup_caseopen_description),
iconPainter = painterResource(R.drawable.ic_message_outline_24),
icon = Icons.AutoMirrored.TwoTone.Message,
onClick = { onShowPopUpOnCaseOpenChanged(!state.showPopUpOnCaseOpen) },
trailingContent = {
Switch(
@@ -204,7 +210,7 @@ fun ReactionSettingsScreen(
SettingsBaseItem(
title = stringResource(R.string.settings_popup_connected_label),
subtitle = stringResource(R.string.settings_popup_connected_description),
iconPainter = painterResource(R.drawable.ic_message_24),
icon = Icons.AutoMirrored.TwoTone.Message,
onClick = { onShowPopUpOnConnectionChanged(!state.showPopUpOnConnection) },
trailingContent = {
Switch(
@@ -22,6 +22,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.twotone.SignalCellularAlt
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
@@ -74,7 +76,7 @@ fun PopUpContent(
if (signalText.isNotBlank()) {
Spacer(modifier = Modifier.width(4.dp))
Icon(
painter = painterResource(R.drawable.ic_baseline_signal_cellular_alt_24),
imageVector = Icons.TwoTone.SignalCellularAlt,
contentDescription = null,
modifier = Modifier.size(12.dp),
)
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.twotone.ArrowBack
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CircularProgressIndicator
@@ -65,7 +65,7 @@ fun TroubleShooterScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
contentDescription = null,
)
}
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M7,12l-2,-2 -2,2 2,2 2,-2zM17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88zM19,10l-2,2 2,2 2,-2 -2,-2z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z" />
</vector>
@@ -1,13 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M15,4l0,2l3,0l0,12l-3,0l0,2l5,0l0,-16z" />
<path
android:fillColor="@android:color/white"
android:pathData="M4,20l5,0l0,-2l-3,0l0,-12l3,0l0,-2l-5,0z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M21.99,12.34C22,12.23 22,12.11 22,12c0,-5.52 -4.48,-10 -10,-10S2,6.48 2,12c0,5.17 3.93,9.43 8.96,9.95c-0.93,-0.73 -1.72,-1.64 -2.32,-2.68C5.9,18 4,15.22 4,12c0,-1.85 0.63,-3.55 1.69,-4.9l5.66,5.66c0.56,-0.4 1.17,-0.73 1.82,-1L7.1,5.69C8.45,4.63 10.15,4 12,4c4.24,0 7.7,3.29 7.98,7.45C20.69,11.67 21.37,11.97 21.99,12.34zM17,13c-3.18,0 -5.9,1.87 -7,4.5c1.1,2.63 3.82,4.5 7,4.5s5.9,-1.87 7,-4.5C22.9,14.87 20.18,13 17,13zM17,20c-1.38,0 -2.5,-1.12 -2.5,-2.5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5C19.5,18.88 18.38,20 17,20zM18.5,17.5c0,0.83 -0.67,1.5 -1.5,1.5s-1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5S18.5,16.67 18.5,17.5z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M9.75,7.82C10.62,7.82 11.45,8.23 12,8.87C12.55,8.23 13.38,7.82 14.25,7.82C15.79,7.82 17,9.03 17,10.57C17,12.46 15.3,14 12.72,16.34L12,17L11.28,16.34C8.7,14 7,12.46 7,10.57C7,9.03 8.21,7.82 9.75,7.82Z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17h-2L12,9h-2L10,7h4v10z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM11,16H9V8h2V16zM15,16h-2V8h2V16z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM9.5,16.5v-9l7,4.5L9.5,16.5z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M11,24h2v-2h-2v2zM7,24h2v-2L7,22v2zM15,24h2v-2h-2v2zM17.71,5.71L12,0h-1v7.59L6.41,3 5,4.41 10.59,10 5,15.59 6.41,17 11,12.41L11,20h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,3.83l1.88,1.88L13,7.59L13,3.83zM14.88,14.29L13,16.17v-3.76l1.88,1.88z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM16.23,18L12,15.45 7.77,18l1.12,-4.81 -3.73,-3.23 4.92,-0.42L12,5l1.92,4.53 4.92,0.42 -3.73,3.23L16.23,18z" />
</vector>
@@ -1,19 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M21,12.22C21,6.73 16.74,3 12,3c-4.69,0 -9,3.65 -9,9.28C2.4,12.62 2,13.26 2,14v2c0,1.1 0.9,2 2,2h1v-6.1c0,-3.87 3.13,-7 7,-7s7,3.13 7,7V19h-8v2h8c1.1,0 2,-0.9 2,-2v-1.22c0.59,-0.31 1,-0.92 1,-1.64v-2.3C22,13.14 21.59,12.53 21,12.22z" />
<path
android:fillColor="@android:color/white"
android:pathData="M9,13m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
<path
android:fillColor="@android:color/white"
android:pathData="M15,13m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
<path
android:fillColor="@android:color/white"
android:pathData="M18,11.03C17.52,8.18 15.04,6 12.05,6c-3.03,0 -6.29,2.51 -6.03,6.45c2.47,-1.01 4.33,-3.21 4.86,-5.89C12.19,9.19 14.88,11 18,11.03z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,13c-2.2,0 -4,1.8 -4,4s1.8,4 4,4s4,-1.8 4,-4S8.2,13 6,13zM12,3C9.8,3 8,4.8 8,7s1.8,4 4,4s4,-1.8 4,-4S14.2,3 12,3zM18,13c-2.2,0 -4,1.8 -4,4s1.8,4 4,4s4,-1.8 4,-4S20.2,13 18,13z" />
</vector>
-10
View File
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M23 4.5C23 6.43 21.43 8 19.5 8S16 6.43 16 4.5 17.57 1 19.5 1 23 2.57 23 4.5M19.5 10C16.47 10 14 7.53 14 4.5C14 4 14.08 3.5 14.21 3H5C3.89 3 3 3.89 3 5V19C3 20.11 3.9 21 5 21H19C20.11 21 21 20.11 21 19V9.79C20.5 9.92 20 10 19.5 10Z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M22.77 19.32L21.7 18.5C21.72 18.33 21.74 18.17 21.74 18S21.73 17.67 21.7 17.5L22.76 16.68C22.85 16.6 22.88 16.47 22.82 16.36L21.82 14.63C21.76 14.5 21.63 14.5 21.5 14.5L20.27 15C20 14.82 19.73 14.65 19.42 14.53L19.23 13.21C19.22 13.09 19.11 13 19 13H17C16.87 13 16.76 13.09 16.74 13.21L16.55 14.53C16.25 14.66 15.96 14.82 15.7 15L14.46 14.5C14.35 14.5 14.22 14.5 14.15 14.63L13.15 16.36C13.09 16.47 13.11 16.6 13.21 16.68L14.27 17.5C14.25 17.67 14.24 17.83 14.24 18S14.25 18.33 14.27 18.5L13.21 19.32C13.12 19.4 13.09 19.53 13.15 19.64L14.15 21.37C14.21 21.5 14.34 21.5 14.46 21.5L15.7 21C15.96 21.18 16.24 21.35 16.55 21.47L16.74 22.79C16.76 22.91 16.86 23 17 23H19C19.11 23 19.22 22.91 19.24 22.79L19.43 21.47C19.73 21.34 20 21.18 20.27 21L21.5 21.5C21.63 21.5 21.76 21.5 21.83 21.37L22.83 19.64C22.89 19.53 22.86 19.4 22.77 19.32M18 19.5C17.16 19.5 16.5 18.83 16.5 18S17.17 16.5 18 16.5 19.5 17.17 19.5 18 18.83 19.5 18 19.5M17.62 3.22C17.43 3.08 17.22 3 17 3H3C2.78 3 2.57 3.08 2.38 3.22C1.95 3.56 1.87 4.19 2.21 4.62L7 10.75V15.87C6.96 16.16 7.06 16.47 7.29 16.7L11.3 20.71C11.4 20.81 11.5 20.88 11.65 20.93C11.22 20 11 19 11 18C11 16.17 11.72 14.41 13 13.1V10.75L17.79 4.62C18.13 4.19 18.05 3.56 17.62 3.22M11 10.05V17.58L9 15.58V10.06L5.04 5H14.96L11 10.05Z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M5 5V19H7V21H3V3H7V5H5M20 7H7V9H20V7M20 11H7V13H20V11M20 15H7V17H20V15Z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,2H4A2,2 0 0,0 2,4V22L6,18H20A2,2 0 0,0 22,16V4C22,2.89 21.1,2 20,2Z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20 2H4C2.9 2 2 2.9 2 4V22L6 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2M20 16H5.2L4 17.2V4H20V16Z" />
</vector>
@@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M6.91 5.5L9.21 7.79L7.79 9.21L5.5 6.91L3.21 9.21L1.79 7.79L4.09 5.5L1.79 3.21L3.21 1.79L5.5 4.09L7.79 1.79L9.21 3.21M22.21 16.21L20.79 14.79L18.5 17.09L16.21 14.79L14.79 16.21L17.09 18.5L14.79 20.79L16.21 22.21L18.5 19.91L20.79 22.21L22.21 20.79L19.91 18.5M20.4 6.83L17.18 11L15.6 9.73L16.77 8.23A9.08 9.08 0 0 0 10.11 13.85A4.5 4.5 0 1 1 7.5 13A4 4 0 0 1 8.28 13.08A11.27 11.27 0 0 1 16.43 6.26L15 5.18L16.27 3.6M10 17.5A2.5 2.5 0 1 0 7.5 20A2.5 2.5 0 0 0 10 17.5Z" />
</vector>