Skip to content

Commit 2317c96

Browse files
urstarkurstark
committed
fix: corrected solar icon semantic mappings across UI
1 parent ff6755b commit 2317c96

59 files changed

Lines changed: 284 additions & 228 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/kotlin/urstark/solstice/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1847,7 +1847,7 @@ class MainActivity : ComponentActivity() {
18471847
painterResource(
18481848
when (searchSource) {
18491849
SearchSource.LOCAL -> R.drawable.solar_music_library_2
1850-
SearchSource.ONLINE -> R.drawable.solar_planet
1850+
SearchSource.ONLINE -> R.drawable.solar_folder
18511851
},
18521852
),
18531853
contentDescription = null,

‎app/src/main/kotlin/urstark/solstice/RestoreBackupFileActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private fun RestoreOptionsDialog(
222222
val iconRes =
223223
when (category) {
224224
BackupCategory.LIBRARY -> R.drawable.solar_music_library_2
225-
BackupCategory.ACCOUNT -> R.drawable.solar_route
225+
BackupCategory.ACCOUNT -> R.drawable.solar_user
226226
BackupCategory.SETTINGS -> R.drawable.solar_settings
227227
}
228228
Surface(

‎app/src/main/kotlin/urstark/solstice/onboarding/OnboardingUseCases.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class BuildOnboardingUiStateUseCase
9898
private fun OnboardingPermissionId.iconResId(): Int =
9999
when (this) {
100100
OnboardingPermissionId.NOTIFICATIONS -> R.drawable.solar_music_note
101-
OnboardingPermissionId.LOCAL_AUDIO -> R.drawable.solar_tag
101+
OnboardingPermissionId.LOCAL_AUDIO -> R.drawable.solar_database
102102
OnboardingPermissionId.MICROPHONE -> R.drawable.solar_cosmetic
103103
OnboardingPermissionId.BLUETOOTH_CONNECT -> R.drawable.solar_bluetooth
104104
OnboardingPermissionId.NETWORK -> R.drawable.solar_wi_fi_router

‎app/src/main/kotlin/urstark/solstice/playback/MediaLibrarySessionCallback.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ class MediaLibrarySessionCallback
485485
MusicService.HOME_MIXES_AND_RADIOS,
486486
context.getString(R.string.android_auto_mixes_and_radios),
487487
null,
488-
drawableUri(R.drawable.solar_radio),
488+
drawableUri(R.drawable.solar_magic_stick_3),
489489
MediaMetadata.MEDIA_TYPE_FOLDER_PLAYLISTS,
490490
),
491491
)
@@ -768,7 +768,7 @@ class MediaLibrarySessionCallback
768768
MusicService.HOME_MIXES_AND_RADIOS,
769769
context.getString(R.string.android_auto_mixes_and_radios),
770770
null,
771-
drawableUri(R.drawable.solar_radio),
771+
drawableUri(R.drawable.solar_magic_stick_3),
772772
MediaMetadata.MEDIA_TYPE_FOLDER_PLAYLISTS,
773773
),
774774
null,

‎app/src/main/kotlin/urstark/solstice/playback/MusicService.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3185,7 +3185,7 @@ class MusicService :
31853185
CommandButton
31863186
.Builder()
31873187
.setDisplayName(getString(R.string.start_radio))
3188-
.setIconResId(R.drawable.solar_radio)
3188+
.setIconResId(R.drawable.solar_magic_stick_3)
31893189
.setSessionCommand(CommandToggleStartRadio)
31903190
.setEnabled(currentSong.value != null)
31913191
.build(),

‎app/src/main/kotlin/urstark/solstice/ui/component/ChipsRow.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fun <Int> ChoiceChipsRow(
156156
},
157157
trailingIcon = {
158158
Icon(
159-
painter = painterResource(R.drawable.solar_export),
159+
painter = painterResource(R.drawable.solar_code),
160160
contentDescription = null,
161161
modifier = Modifier.graphicsLayer(rotationZ = rotationAnimation),
162162
)

‎app/src/main/kotlin/urstark/solstice/ui/component/DebugPanel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fun DebugPanelItem(
2727
trailingContent: (@Composable () -> Unit)? = null,
2828
): Material3SettingsItem =
2929
Material3SettingsItem(
30-
icon = painterResource(R.drawable.solar_inbox),
30+
icon = painterResource(R.drawable.solar_info_circle),
3131
title = title,
3232
description = description,
3333
trailingContent = trailingContent,

‎app/src/main/kotlin/urstark/solstice/ui/component/Dialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ fun InfoLabel(text: String) =
319319
modifier = Modifier.padding(horizontal = 8.dp),
320320
) {
321321
Icon(
322-
painter = painterResource(id = R.drawable.solar_inbox),
322+
painter = painterResource(id = R.drawable.solar_info_circle),
323323
contentDescription = null,
324324
tint = MaterialTheme.colorScheme.secondary,
325325
modifier = Modifier.padding(4.dp),

‎app/src/main/kotlin/urstark/solstice/ui/component/SpeedDialGridItem.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ fun SpeedDialGridItem(
154154

155155
if (item !is SongItem) {
156156
Icon(
157-
painter = painterResource(R.drawable.solar_magnet),
157+
painter = painterResource(R.drawable.solar_link_round),
158158
contentDescription = null,
159159
tint = foregroundColor,
160160
modifier = Modifier.size(24.dp),

‎app/src/main/kotlin/urstark/solstice/ui/component/ThumbnailCornerRadiusSelector.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fun ThumbnailCornerRadiusSelectorButton(
5959
description = stringResource(id = R.string.corner_radius, thumbnailCornerRadius.roundToInt()),
6060
icon = {
6161
Icon(
62-
painter = painterResource(id = R.drawable.solar_magnet),
62+
painter = painterResource(id = R.drawable.solar_link_round),
6363
contentDescription = null,
6464
)
6565
},

0 commit comments

Comments
 (0)