diff --git a/CHANGELOG.md b/CHANGELOG.md index 55dacaf97..cd5f1be53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,10 +20,10 @@ - Fixed crash if settings was navigated away before playback state finished saving - Fixed broken album menu +- Fixed crash that would occur when opening a file on some devices #176 #### What's Changed -- Reworked typography and iconography to be more aligned with material -design guidelines +- Reworked typography and iconography to be more aligned with material design guidelines #### Dev/Meta - Migrated preferences from shared object to utility diff --git a/app/src/main/java/org/oxycblt/auxio/music/IndexerService.kt b/app/src/main/java/org/oxycblt/auxio/music/IndexerService.kt index 1fb1e5e9e..97fed10a1 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/IndexerService.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/IndexerService.kt @@ -161,7 +161,7 @@ private class IndexerNotification(private val context: Context) : } setSmallIcon(R.drawable.ic_indexer_32) - setCategory(NotificationCompat.CATEGORY_SERVICE) + setCategory(NotificationCompat.CATEGORY_PROGRESS) setShowWhen(false) setSilent(true) setContentIntent(context.newMainPendingIntent()) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt index 593d938ba..8044946ec 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt @@ -65,7 +65,7 @@ class NotificationComponent( } setSmallIcon(R.drawable.ic_auxio_24) - setCategory(NotificationCompat.CATEGORY_SERVICE) + setCategory(NotificationCompat.CATEGORY_TRANSPORT) setShowWhen(false) setSilent(true) setContentIntent(context.newMainPendingIntent()) @@ -110,6 +110,7 @@ class NotificationComponent( object : BitmapProvider.Target { override fun onCompleted(bitmap: Bitmap?) { setLargeIcon(bitmap) + build() callback.onNotificationChanged(this@NotificationComponent) } }) @@ -118,7 +119,6 @@ class NotificationComponent( /** Set the playing icon on the notification */ fun updatePlaying(isPlaying: Boolean) { mActions[2] = buildPlayPauseAction(context, isPlaying) - if (!provider.isBusy) { callback.onNotificationChanged(this) } @@ -127,7 +127,6 @@ class NotificationComponent( /** Update the first action to reflect the [repeatMode] given. */ fun updateRepeatMode(repeatMode: RepeatMode) { mActions[0] = buildRepeatAction(context, repeatMode) - if (!provider.isBusy) { callback.onNotificationChanged(this) } @@ -136,7 +135,6 @@ class NotificationComponent( /** Update the first action to reflect whether the queue is shuffled or not */ fun updateShuffled(isShuffled: Boolean) { mActions[0] = buildShuffleAction(context, isShuffled) - if (!provider.isBusy) { callback.onNotificationChanged(this) } diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt index 46f395f4d..f6e4dd1fa 100644 --- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt +++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt @@ -60,7 +60,6 @@ class WidgetComponent(private val context: Context) : * Force-update the widget. */ fun update() { - // TODO: Rework margins/button layout to do the magic that other button bars do // TODO: Respond to rounded covers // Updating Auxio's widget is unlike the rest of Auxio for a few reasons: diff --git a/app/src/main/res/color/sel_remote_fab_ripple.xml b/app/src/main/res/color/sel_remote_fab_ripple.xml new file mode 100644 index 000000000..10337c895 --- /dev/null +++ b/app/src/main/res/color/sel_remote_fab_ripple.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about_24.xml b/app/src/main/res/drawable/ic_about_24.xml index c23bc022a..d7b83abad 100644 --- a/app/src/main/res/drawable/ic_about_24.xml +++ b/app/src/main/res/drawable/ic_about_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_accent_24.xml b/app/src/main/res/drawable/ic_accent_24.xml index 66cfbb5c9..40905e6e4 100644 --- a/app/src/main/res/drawable/ic_accent_24.xml +++ b/app/src/main/res/drawable/ic_accent_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_album_24.xml b/app/src/main/res/drawable/ic_album_24.xml index dbc2985af..a612ff60e 100644 --- a/app/src/main/res/drawable/ic_album_24.xml +++ b/app/src/main/res/drawable/ic_album_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_artist_24.xml b/app/src/main/res/drawable/ic_artist_24.xml index f4fa7d874..fe0c8590d 100644 --- a/app/src/main/res/drawable/ic_artist_24.xml +++ b/app/src/main/res/drawable/ic_artist_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_auto_24.xml b/app/src/main/res/drawable/ic_auto_24.xml index fbea38cdc..2d689f658 100644 --- a/app/src/main/res/drawable/ic_auto_24.xml +++ b/app/src/main/res/drawable/ic_auto_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_back_24.xml b/app/src/main/res/drawable/ic_back_24.xml index ec560cf2f..597b57c26 100644 --- a/app/src/main/res/drawable/ic_back_24.xml +++ b/app/src/main/res/drawable/ic_back_24.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_check_24.xml b/app/src/main/res/drawable/ic_check_24.xml index fc72a3ad9..300eb927f 100644 --- a/app/src/main/res/drawable/ic_check_24.xml +++ b/app/src/main/res/drawable/ic_check_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_close_24.xml b/app/src/main/res/drawable/ic_close_24.xml index 56678618d..afab8d6b4 100644 --- a/app/src/main/res/drawable/ic_close_24.xml +++ b/app/src/main/res/drawable/ic_close_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_code_24.xml b/app/src/main/res/drawable/ic_code_24.xml index 81f6372b8..c0d817f1d 100644 --- a/app/src/main/res/drawable/ic_code_24.xml +++ b/app/src/main/res/drawable/ic_code_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_currently_playing_24.xml b/app/src/main/res/drawable/ic_currently_playing_24.xml index 1c5789375..0e518ab3d 100644 --- a/app/src/main/res/drawable/ic_currently_playing_24.xml +++ b/app/src/main/res/drawable/ic_currently_playing_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_dark_24.xml b/app/src/main/res/drawable/ic_dark_24.xml index e1c4c007a..ea2515c0e 100644 --- a/app/src/main/res/drawable/ic_dark_24.xml +++ b/app/src/main/res/drawable/ic_dark_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_delete_24.xml b/app/src/main/res/drawable/ic_delete_24.xml index 9e1e273ba..15e924557 100644 --- a/app/src/main/res/drawable/ic_delete_24.xml +++ b/app/src/main/res/drawable/ic_delete_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_down_24.xml b/app/src/main/res/drawable/ic_down_24.xml index e7ac1c4be..d7315061b 100644 --- a/app/src/main/res/drawable/ic_down_24.xml +++ b/app/src/main/res/drawable/ic_down_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_filter_24.xml b/app/src/main/res/drawable/ic_filter_24.xml index 9693484da..35b020425 100644 --- a/app/src/main/res/drawable/ic_filter_24.xml +++ b/app/src/main/res/drawable/ic_filter_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_genre_24.xml b/app/src/main/res/drawable/ic_genre_24.xml index b0577e9e2..fe8b3e988 100644 --- a/app/src/main/res/drawable/ic_genre_24.xml +++ b/app/src/main/res/drawable/ic_genre_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_handle_24.xml b/app/src/main/res/drawable/ic_handle_24.xml index e691b0ed4..af4460e91 100644 --- a/app/src/main/res/drawable/ic_handle_24.xml +++ b/app/src/main/res/drawable/ic_handle_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_help_24.xml b/app/src/main/res/drawable/ic_help_24.xml index 5e4b14fba..f50caf36d 100644 --- a/app/src/main/res/drawable/ic_help_24.xml +++ b/app/src/main/res/drawable/ic_help_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_indexer_32.xml b/app/src/main/res/drawable/ic_indexer_32.xml index 03ab5c4ab..7583b687c 100644 --- a/app/src/main/res/drawable/ic_indexer_32.xml +++ b/app/src/main/res/drawable/ic_indexer_32.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_license_24.xml b/app/src/main/res/drawable/ic_license_24.xml index 7d507c9f6..6c47a5c83 100644 --- a/app/src/main/res/drawable/ic_license_24.xml +++ b/app/src/main/res/drawable/ic_license_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_light_24.xml b/app/src/main/res/drawable/ic_light_24.xml index c1956fdf3..4ce8368bf 100644 --- a/app/src/main/res/drawable/ic_light_24.xml +++ b/app/src/main/res/drawable/ic_light_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_pause_24.xml b/app/src/main/res/drawable/ic_pause_24.xml index 78212e5dd..d03208bde 100644 --- a/app/src/main/res/drawable/ic_pause_24.xml +++ b/app/src/main/res/drawable/ic_pause_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_pause_32.xml b/app/src/main/res/drawable/ic_pause_32.xml index 8ab8d1190..ebca0bee5 100644 --- a/app/src/main/res/drawable/ic_pause_32.xml +++ b/app/src/main/res/drawable/ic_pause_32.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="32"> + diff --git a/app/src/main/res/drawable/ic_play_24.xml b/app/src/main/res/drawable/ic_play_24.xml index 17809ac46..33c323a1e 100644 --- a/app/src/main/res/drawable/ic_play_24.xml +++ b/app/src/main/res/drawable/ic_play_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_play_32.xml b/app/src/main/res/drawable/ic_play_32.xml index 333940cce..3116666c3 100644 --- a/app/src/main/res/drawable/ic_play_32.xml +++ b/app/src/main/res/drawable/ic_play_32.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="32"> + diff --git a/app/src/main/res/drawable/ic_queue_24.xml b/app/src/main/res/drawable/ic_queue_24.xml index 9b3839063..eb1011e58 100644 --- a/app/src/main/res/drawable/ic_queue_24.xml +++ b/app/src/main/res/drawable/ic_queue_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_remote_default_cover_24.xml b/app/src/main/res/drawable/ic_remote_default_cover_24.xml index 2757013dd..a9db9a52f 100644 --- a/app/src/main/res/drawable/ic_remote_default_cover_24.xml +++ b/app/src/main/res/drawable/ic_remote_default_cover_24.xml @@ -4,9 +4,9 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_remote_repeat_off_24.xml b/app/src/main/res/drawable/ic_remote_repeat_off_24.xml index 872168d23..a3c8159db 100644 --- a/app/src/main/res/drawable/ic_remote_repeat_off_24.xml +++ b/app/src/main/res/drawable/ic_remote_repeat_off_24.xml @@ -2,10 +2,10 @@ + android:viewportHeight="24"> + android:pathData="M7,22 L3,18 7,14 8.4,15.45 6.85,17H17V13H19V19H6.85L8.4,20.55ZM5,11V5H17.15L15.6,3.45L17,2L21,6L17,10L15.6,8.55L17.15,7H7V11Z" /> diff --git a/app/src/main/res/drawable/ic_remote_repeat_on_24.xml b/app/src/main/res/drawable/ic_remote_repeat_on_24.xml index 387c36c72..85ffe9794 100644 --- a/app/src/main/res/drawable/ic_remote_repeat_on_24.xml +++ b/app/src/main/res/drawable/ic_remote_repeat_on_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_remote_repeat_one_24.xml b/app/src/main/res/drawable/ic_remote_repeat_one_24.xml index 783cdf36f..c5a4fe03f 100644 --- a/app/src/main/res/drawable/ic_remote_repeat_one_24.xml +++ b/app/src/main/res/drawable/ic_remote_repeat_one_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_remote_shuffle_off_24.xml b/app/src/main/res/drawable/ic_remote_shuffle_off_24.xml index 3ace07308..c78ffe3f6 100644 --- a/app/src/main/res/drawable/ic_remote_shuffle_off_24.xml +++ b/app/src/main/res/drawable/ic_remote_shuffle_off_24.xml @@ -7,5 +7,5 @@ android:viewportHeight="24"> + android:pathData="M9.175,10.575 L4,5.4 5.4,4 10.575,9.175ZM14,20V18H16.6L13.425,14.825L14.85,13.4L18,16.55V14H20V20ZM5.4,20 L4,18.6 16.6,6H14V4H20V10H18V7.4Z" /> diff --git a/app/src/main/res/drawable/ic_remote_shuffle_on_24.xml b/app/src/main/res/drawable/ic_remote_shuffle_on_24.xml index c448ef4ac..afe894598 100644 --- a/app/src/main/res/drawable/ic_remote_shuffle_on_24.xml +++ b/app/src/main/res/drawable/ic_remote_shuffle_on_24.xml @@ -7,5 +7,5 @@ android:viewportHeight="24"> + android:pathData="M9.175,10.575 L4,5.4 5.4,4 10.575,9.175ZM14,20V18H16.6L13.425,14.825L14.85,13.4L18,16.55V14H20V20ZM5.4,20 L4,18.6 16.6,6H14V4H20V10H18V7.4Z" /> diff --git a/app/src/main/res/drawable/ic_repeat_24.xml b/app/src/main/res/drawable/ic_repeat_24.xml index 03eb25e8e..e61b9f41f 100644 --- a/app/src/main/res/drawable/ic_repeat_24.xml +++ b/app/src/main/res/drawable/ic_repeat_24.xml @@ -2,10 +2,10 @@ + android:viewportHeight="32"> + android:pathData="M 9.3333328,29.333332 3.9999997,23.999999 9.3333328,18.666666 11.199999,20.599999 9.1333328,22.666666 H 22.666666 v -5.333334 h 2.666666 v 8 H 9.1333328 l 2.0666662,2.066667 z M 6.6666662,14.666666 V 6.6666662 H 22.866666 l -2.066667,-2.0666665 1.866667,-1.9333332 5.333333,5.333333 -5.333333,5.3333335 -1.866667,-1.933334 2.066667,-2.0666662 H 9.3333328 v 5.3333332 z" /> diff --git a/app/src/main/res/drawable/ic_repeat_one_24.xml b/app/src/main/res/drawable/ic_repeat_one_24.xml index a4d61e56e..93cb66471 100644 --- a/app/src/main/res/drawable/ic_repeat_one_24.xml +++ b/app/src/main/res/drawable/ic_repeat_one_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_search_24.xml b/app/src/main/res/drawable/ic_search_24.xml index 55c38f427..c1743f63f 100644 --- a/app/src/main/res/drawable/ic_search_24.xml +++ b/app/src/main/res/drawable/ic_search_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_shortcut_shuffle_24.xml b/app/src/main/res/drawable/ic_shortcut_shuffle_24.xml index 94b7909f5..219b90e99 100644 --- a/app/src/main/res/drawable/ic_shortcut_shuffle_24.xml +++ b/app/src/main/res/drawable/ic_shortcut_shuffle_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_shuffle_24.xml b/app/src/main/res/drawable/ic_shuffle_24.xml index 5d6aaf282..ec36a047c 100644 --- a/app/src/main/res/drawable/ic_shuffle_24.xml +++ b/app/src/main/res/drawable/ic_shuffle_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_skip_next_24.xml b/app/src/main/res/drawable/ic_skip_next_24.xml index 5d802e812..de2263c50 100644 --- a/app/src/main/res/drawable/ic_skip_next_24.xml +++ b/app/src/main/res/drawable/ic_skip_next_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_skip_prev_24.xml b/app/src/main/res/drawable/ic_skip_prev_24.xml index e0e4fe3e3..f2d64fd9e 100644 --- a/app/src/main/res/drawable/ic_skip_prev_24.xml +++ b/app/src/main/res/drawable/ic_skip_prev_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_song_24.xml b/app/src/main/res/drawable/ic_song_24.xml index fdc799481..7eb98d4a2 100644 --- a/app/src/main/res/drawable/ic_song_24.xml +++ b/app/src/main/res/drawable/ic_song_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_sort_24.xml b/app/src/main/res/drawable/ic_sort_24.xml index af7317bd7..e5506cc28 100644 --- a/app/src/main/res/drawable/ic_sort_24.xml +++ b/app/src/main/res/drawable/ic_sort_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_time_24.xml b/app/src/main/res/drawable/ic_time_24.xml index 7ab4b27ef..3c531e3d4 100644 --- a/app/src/main/res/drawable/ic_time_24.xml +++ b/app/src/main/res/drawable/ic_time_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ui_remote_fab_bg.xml b/app/src/main/res/drawable/ui_remote_fab_bg.xml new file mode 100644 index 000000000..ec6599f1c --- /dev/null +++ b/app/src/main/res/drawable/ui_remote_fab_bg.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ui_remote_ripple.xml b/app/src/main/res/drawable/ui_remote_ripple.xml index 8daf5be74..0b98cc5db 100644 --- a/app/src/main/res/drawable/ui_remote_ripple.xml +++ b/app/src/main/res/drawable/ui_remote_ripple.xml @@ -1,4 +1,4 @@ + android:radius="20dp" /> diff --git a/app/src/main/res/layout-land/fragment_playback_panel.xml b/app/src/main/res/layout-land/fragment_playback_panel.xml index cfa659379..e3f1d0890 100644 --- a/app/src/main/res/layout-land/fragment_playback_panel.xml +++ b/app/src/main/res/layout-land/fragment_playback_panel.xml @@ -90,9 +90,9 @@ android:id="@+id/playback_controls_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/spacing_medium" android:layout_marginStart="@dimen/spacing_medium" android:layout_marginEnd="@dimen/spacing_medium" + android:layout_marginBottom="@dimen/spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> diff --git a/app/src/main/res/layout-w600dp-land/fragment_playback_panel.xml b/app/src/main/res/layout-w600dp-land/fragment_playback_panel.xml index e46150c03..587b3562e 100644 --- a/app/src/main/res/layout-w600dp-land/fragment_playback_panel.xml +++ b/app/src/main/res/layout-w600dp-land/fragment_playback_panel.xml @@ -81,19 +81,19 @@ android:id="@+id/playback_seek_bar" android:layout_width="0dp" android:layout_height="wrap_content" + app:layout_constraintBottom_toTopOf="@+id/playback_controls_container" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playback_cover" - app:layout_constraintTop_toBottomOf="@+id/playback_album" - app:layout_constraintBottom_toTopOf="@+id/playback_controls_container"/> + app:layout_constraintTop_toBottomOf="@+id/playback_album" /> diff --git a/app/src/main/res/layout/dialog_music_dirs.xml b/app/src/main/res/layout/dialog_music_dirs.xml index 15748c290..ab2588c25 100644 --- a/app/src/main/res/layout/dialog_music_dirs.xml +++ b/app/src/main/res/layout/dialog_music_dirs.xml @@ -82,10 +82,10 @@ android:id="@+id/dirs_mode_desc" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAlignment="viewStart" android:layout_marginStart="@dimen/spacing_mid_large" android:layout_marginTop="@dimen/spacing_small" android:layout_marginEnd="@dimen/spacing_mid_large" + android:textAlignment="viewStart" tools:text="Mode description" /> diff --git a/app/src/main/res/layout/dialog_pre_amp.xml b/app/src/main/res/layout/dialog_pre_amp.xml index c73df9c7d..07b6458a2 100644 --- a/app/src/main/res/layout/dialog_pre_amp.xml +++ b/app/src/main/res/layout/dialog_pre_amp.xml @@ -17,7 +17,7 @@ android:layout_marginStart="@dimen/spacing_mid_large" android:layout_marginTop="@dimen/spacing_medium" android:text="@string/set_pre_amp_with" - android:textAppearance="@style/TextAppearance.Auxio.TitleMedium" + android:textAppearance="@style/TextAppearance.Auxio.TitleMediumLowEmphasis" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -54,7 +54,7 @@ android:layout_marginStart="@dimen/spacing_mid_large" android:layout_marginTop="@dimen/spacing_medium" android:text="@string/set_pre_amp_without" - android:textAppearance="@style/TextAppearance.Auxio.TitleMedium" + android:textAppearance="@style/TextAppearance.Auxio.TitleMediumLowEmphasis" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/with_tags_slider" /> diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 5670ee709..2235edfac 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -54,7 +54,7 @@ android:gravity="center" android:padding="@dimen/spacing_medium" android:text="@string/err_too_small" - android:textAppearance="@style/TextAppearance.Auxio.TitleMedium" + android:textAppearance="@style/TextAppearance.Auxio.TitleMediumLowEmphasis" android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_playback_bar.xml b/app/src/main/res/layout/fragment_playback_bar.xml index ba3c764da..1637a5f2e 100644 --- a/app/src/main/res/layout/fragment_playback_bar.xml +++ b/app/src/main/res/layout/fragment_playback_bar.xml @@ -13,7 +13,7 @@ app:layout_constraintBottom_toTopOf="@+id/playback_progress_container" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:staticIcon="@drawable/ic_song_24"/> + tools:staticIcon="@drawable/ic_song_24" /> diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml index c837c6a4b..9a3dc0b08 100644 --- a/app/src/main/res/layout/item_album_song.xml +++ b/app/src/main/res/layout/item_album_song.xml @@ -16,17 +16,17 @@ style="@style/Widget.Auxio.Image.Small" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:staticIcon="@drawable/ic_song_24" - tools:visibility="invisible"> + app:staticIcon="@drawable/ic_song_24"> + android:paddingTop="@dimen/spacing_medium"> + + + android:paddingStart="@dimen/spacing_mid_small" + android:paddingEnd="@dimen/spacing_mid_small" + android:paddingTop="@dimen/spacing_mid_small" + android:paddingBottom="@dimen/spacing_medium" + android:orientation="horizontal"> + + + + + + + + diff --git a/app/src/main/res/layout/widget_medium.xml b/app/src/main/res/layout/widget_medium.xml index dc7adfb9b..be26b6906 100644 --- a/app/src/main/res/layout/widget_medium.xml +++ b/app/src/main/res/layout/widget_medium.xml @@ -46,8 +46,7 @@ android:layout_alignParentBottom="true" android:layout_gravity="center" android:orientation="vertical" - android:paddingTop="@dimen/spacing_medium" - android:paddingBottom="@dimen/spacing_mid_small"> + android:paddingTop="@dimen/spacing_medium"> + + + android:src="@drawable/sel_playing_state_24" /> + + diff --git a/app/src/main/res/layout/widget_small.xml b/app/src/main/res/layout/widget_small.xml index 70e0260e0..970481ec8 100644 --- a/app/src/main/res/layout/widget_small.xml +++ b/app/src/main/res/layout/widget_small.xml @@ -47,6 +47,14 @@ android:src="@drawable/ic_remote_default_cover_24" tools:ignore="ContentDescription" /> + + android:padding="@dimen/spacing_mid_small"> - + + + + + + diff --git a/app/src/main/res/layout/widget_thin.xml b/app/src/main/res/layout/widget_thin.xml index bda7f5b47..ad50b87d5 100644 --- a/app/src/main/res/layout/widget_thin.xml +++ b/app/src/main/res/layout/widget_thin.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="@dimen/spacing_medium" - android:layout_marginEnd="@dimen/spacing_small" + android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginBottom="@dimen/spacing_medium" android:layout_weight="2" android:orientation="horizontal"> @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginEnd="@dimen/spacing_tiny" + android:layout_marginEnd="@dimen/spacing_medium" android:layout_weight="1" android:orientation="vertical"> @@ -89,25 +89,13 @@ - - - + diff --git a/app/src/main/res/layout/widget_wide.xml b/app/src/main/res/layout/widget_wide.xml index 18a1f9a67..98cd7c5df 100644 --- a/app/src/main/res/layout/widget_wide.xml +++ b/app/src/main/res/layout/widget_wide.xml @@ -40,6 +40,8 @@ android:src="@drawable/ic_remote_default_cover_24" tools:ignore="ContentDescription" /> + + + android:padding="@dimen/spacing_mid_small"> + + - + + + + + + + - diff --git a/app/src/main/res/values-sw600dp/styles_ui.xml b/app/src/main/res/values-sw600dp/styles_ui.xml index d15cad8a9..487c594b1 100644 --- a/app/src/main/res/values-sw600dp/styles_ui.xml +++ b/app/src/main/res/values-sw600dp/styles_ui.xml @@ -1,5 +1,6 @@ + diff --git a/app/src/main/res/values-sw640dp/styles_ui.xml b/app/src/main/res/values-sw640dp/styles_ui.xml index f72e10d34..16109db61 100644 --- a/app/src/main/res/values-sw640dp/styles_ui.xml +++ b/app/src/main/res/values-sw640dp/styles_ui.xml @@ -1,5 +1,6 @@ + diff --git a/app/src/main/res/values-v31/styles_android.xml b/app/src/main/res/values-v31/styles_android.xml deleted file mode 100644 index 03b04c7f0..000000000 --- a/app/src/main/res/values-v31/styles_android.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/values-v31/styles_core.xml b/app/src/main/res/values-v31/styles_core.xml index 6c0c38965..c25a2c718 100644 --- a/app/src/main/res/values-v31/styles_core.xml +++ b/app/src/main/res/values-v31/styles_core.xml @@ -4,6 +4,7 @@ - - - - diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml index a54e3b5aa..e43236437 100644 --- a/app/src/main/res/values/styles_core.xml +++ b/app/src/main/res/values/styles_core.xml @@ -44,7 +44,8 @@ @style/TextAppearance.Auxio.HeadlineSmall @style/TextAppearance.Auxio.TitleLarge - @style/TextAppearance.Auxio.TitleMedium + @style/TextAppearance.Auxio.TitleMediumLowEmphasis + @style/TextAppearance.Auxio.TitleSmall @style/TextAppearance.Auxio.LabelLarge diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml index 5e585da0f..9c3319807 100644 --- a/app/src/main/res/values/styles_ui.xml +++ b/app/src/main/res/values/styles_ui.xml @@ -153,7 +153,8 @@ @@ -197,7 +198,7 @@ @dimen/spacing_medium @dimen/size_btn center_vertical - @style/TextAppearance.Auxio.TitleMediumEmphasis + @style/TextAppearance.Auxio.TitleMedium - - - + +