diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewScreen.kt index 38c6697b..545cc4bc 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/OverviewScreen.kt @@ -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), ) } diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/DualPodsCard.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/DualPodsCard.kt index 9ca01d20..6ea7c14c 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/DualPodsCard.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/DualPodsCard.kt @@ -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) diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/NoProfilesCard.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/NoProfilesCard.kt index 12bf8ffb..a96f1fd0 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/NoProfilesCard.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/NoProfilesCard.kt @@ -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), ) diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/SinglePodsCard.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/SinglePodsCard.kt index e1b4679d..3dd9dbe2 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/SinglePodsCard.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/SinglePodsCard.kt @@ -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, diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/UnknownPodDeviceCard.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/UnknownPodDeviceCard.kt index f1d0edb8..abda4821 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/UnknownPodDeviceCard.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/UnknownPodDeviceCard.kt @@ -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, diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsScreen.kt index f46e4c3f..bc010af0 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsScreen.kt @@ -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, ) } diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsScreen.kt index 4adf3a58..e7bbfdc4 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/acks/AcknowledgementsScreen.kt @@ -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, ) } diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsScreen.kt index 29c92910..e60bdaae 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsScreen.kt @@ -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( diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsScreen.kt index f568e23e..e53eb9e8 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsScreen.kt @@ -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( diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportScreen.kt index 54606d18..ffbf79e6 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportScreen.kt @@ -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, ) diff --git a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetConfigurationScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetConfigurationScreen.kt index 5663a820..a9c85c4d 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetConfigurationScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/widget/WidgetConfigurationScreen.kt @@ -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), diff --git a/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerScreen.kt b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerScreen.kt index 9eb2a436..479f7523 100644 --- a/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerScreen.kt +++ b/app/src/main/java/eu/darken/capod/profiles/ui/DeviceManagerScreen.kt @@ -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), ) diff --git a/app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationScreen.kt b/app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationScreen.kt index 16428eb9..96f47304 100644 --- a/app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationScreen.kt +++ b/app/src/main/java/eu/darken/capod/profiles/ui/creation/DeviceProfileCreationScreen.kt @@ -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), ) } diff --git a/app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsScreen.kt b/app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsScreen.kt index 821341bf..1693560d 100644 --- a/app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsScreen.kt +++ b/app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsScreen.kt @@ -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( diff --git a/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpContent.kt b/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpContent.kt index 1f1cae4b..1784d355 100644 --- a/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpContent.kt +++ b/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpContent.kt @@ -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), ) diff --git a/app/src/main/java/eu/darken/capod/troubleshooter/ui/TroubleShooterScreen.kt b/app/src/main/java/eu/darken/capod/troubleshooter/ui/TroubleShooterScreen.kt index cd5007dc..6df4d7ea 100644 --- a/app/src/main/java/eu/darken/capod/troubleshooter/ui/TroubleShooterScreen.kt +++ b/app/src/main/java/eu/darken/capod/troubleshooter/ui/TroubleShooterScreen.kt @@ -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, ) } diff --git a/app/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml b/app/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml deleted file mode 100644 index 090786e8..00000000 --- a/app/src/main/res/drawable/ic_baseline_bluetooth_connected_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_book_24.xml b/app/src/main/res/drawable/ic_baseline_book_24.xml deleted file mode 100644 index c94b2a3e..00000000 --- a/app/src/main/res/drawable/ic_baseline_book_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_bug_report_24.xml b/app/src/main/res/drawable/ic_baseline_bug_report_24.xml deleted file mode 100644 index bc724e02..00000000 --- a/app/src/main/res/drawable/ic_baseline_bug_report_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_data_array_24.xml b/app/src/main/res/drawable/ic_baseline_data_array_24.xml deleted file mode 100644 index 18741804..00000000 --- a/app/src/main/res/drawable/ic_baseline_data_array_24.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_baseline_devices_other_24.xml b/app/src/main/res/drawable/ic_baseline_devices_other_24.xml deleted file mode 100644 index 27bbfc93..00000000 --- a/app/src/main/res/drawable/ic_baseline_devices_other_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_disabled_visible_24.xml b/app/src/main/res/drawable/ic_baseline_disabled_visible_24.xml deleted file mode 100644 index 63835ed5..00000000 --- a/app/src/main/res/drawable/ic_baseline_disabled_visible_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_heart_24.xml b/app/src/main/res/drawable/ic_baseline_heart_24.xml deleted file mode 100644 index cff844ad..00000000 --- a/app/src/main/res/drawable/ic_baseline_heart_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_looks_one_24.xml b/app/src/main/res/drawable/ic_baseline_looks_one_24.xml deleted file mode 100644 index 1345585c..00000000 --- a/app/src/main/res/drawable/ic_baseline_looks_one_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_pause_circle_24.xml b/app/src/main/res/drawable/ic_baseline_pause_circle_24.xml deleted file mode 100644 index d5536013..00000000 --- a/app/src/main/res/drawable/ic_baseline_pause_circle_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_play_circle_24.xml b/app/src/main/res/drawable/ic_baseline_play_circle_24.xml deleted file mode 100644 index 56565cf9..00000000 --- a/app/src/main/res/drawable/ic_baseline_play_circle_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_settings_24.xml b/app/src/main/res/drawable/ic_baseline_settings_24.xml deleted file mode 100644 index d99a8ae4..00000000 --- a/app/src/main/res/drawable/ic_baseline_settings_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml b/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml deleted file mode 100644 index 890fc992..00000000 --- a/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_stars_24.xml b/app/src/main/res/drawable/ic_baseline_stars_24.xml deleted file mode 100644 index a9052411..00000000 --- a/app/src/main/res/drawable/ic_baseline_stars_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_support_agent_24.xml b/app/src/main/res/drawable/ic_baseline_support_agent_24.xml deleted file mode 100644 index 153eb6e0..00000000 --- a/app/src/main/res/drawable/ic_baseline_support_agent_24.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_baseline_translate_24.xml b/app/src/main/res/drawable/ic_baseline_translate_24.xml deleted file mode 100644 index dd6d1de6..00000000 --- a/app/src/main/res/drawable/ic_baseline_translate_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_widgets_24.xml b/app/src/main/res/drawable/ic_baseline_widgets_24.xml deleted file mode 100644 index 377cd039..00000000 --- a/app/src/main/res/drawable/ic_baseline_widgets_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_workspaces_24.xml b/app/src/main/res/drawable/ic_baseline_workspaces_24.xml deleted file mode 100644 index 6dc0fb68..00000000 --- a/app/src/main/res/drawable/ic_baseline_workspaces_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cancel.xml b/app/src/main/res/drawable/ic_cancel.xml deleted file mode 100644 index 85478e12..00000000 --- a/app/src/main/res/drawable/ic_cancel.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_checkbox_blank_badge_24.xml b/app/src/main/res/drawable/ic_checkbox_blank_badge_24.xml deleted file mode 100644 index f7f183c9..00000000 --- a/app/src/main/res/drawable/ic_checkbox_blank_badge_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_filter_cog_outline_24.xml b/app/src/main/res/drawable/ic_filter_cog_outline_24.xml deleted file mode 100644 index 0892ecda..00000000 --- a/app/src/main/res/drawable/ic_filter_cog_outline_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_format_list_group_24.xml b/app/src/main/res/drawable/ic_format_list_group_24.xml deleted file mode 100644 index 9a2d4ffd..00000000 --- a/app/src/main/res/drawable/ic_format_list_group_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_message_24.xml b/app/src/main/res/drawable/ic_message_24.xml deleted file mode 100644 index 1d35c302..00000000 --- a/app/src/main/res/drawable/ic_message_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_message_outline_24.xml b/app/src/main/res/drawable/ic_message_outline_24.xml deleted file mode 100644 index 5bbebf32..00000000 --- a/app/src/main/res/drawable/ic_message_outline_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_strategy_24.xml b/app/src/main/res/drawable/ic_strategy_24.xml deleted file mode 100644 index 34863b67..00000000 --- a/app/src/main/res/drawable/ic_strategy_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file