From ce7dd48f02fb68e2de669a8a288c86ebac59c89d Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Tue, 12 Jul 2022 13:13:08 -0600 Subject: [PATCH] all: clean up resources Clean up resource implementations, removing useless attributes and simplifying layouts. --- .../org/oxycblt/auxio/home/HomeFragment.kt | 5 --- .../playback/state/PlaybackStateManager.kt | 2 +- app/src/main/res/drawable/ic_author_24.xml | 10 +++--- app/src/main/res/drawable/ic_repeat_on_24.xml | 10 +++--- .../main/res/drawable/ic_repeat_one_24.xml | 10 +++--- .../main/res/drawable/ic_shuffle_on_24.xml | 10 +++--- .../layout-land/fragment_playback_panel.xml | 4 +-- .../fragment_playback_panel.xml | 4 +-- .../fragment_playback_panel.xml | 4 +-- .../fragment_playback_panel.xml | 4 +-- app/src/main/res/layout/dialog_accent.xml | 2 -- app/src/main/res/layout/dialog_tabs.xml | 2 -- app/src/main/res/layout/fragment_about.xml | 9 +++--- app/src/main/res/layout/fragment_detail.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 9 +++--- .../res/layout/fragment_playback_panel.xml | 4 +-- app/src/main/res/layout/fragment_queue.xml | 6 ++-- app/src/main/res/layout/fragment_search.xml | 10 +++--- app/src/main/res/layout/fragment_settings.xml | 6 ++-- app/src/main/res/layout/item_album_song.xml | 4 +-- app/src/main/res/layout/item_disc_header.xml | 6 ++-- app/src/main/res/layout/item_header.xml | 10 +++--- app/src/main/res/layout/item_music_dir.xml | 17 ++++------ app/src/main/res/layout/item_tab.xml | 31 +++++++------------ app/src/main/res/layout/view_seek_bar.xml | 9 +----- app/src/main/res/layout/widget_large.xml | 4 +-- app/src/main/res/layout/widget_medium.xml | 4 +-- app/src/main/res/layout/widget_small.xml | 4 +-- app/src/main/res/layout/widget_thin.xml | 4 +-- app/src/main/res/layout/widget_wide.xml | 2 +- app/src/main/res/values-sw640dp/styles_ui.xml | 1 + .../main/res/values-v23/styles_android.xml | 9 ------ app/src/main/res/values-v31/styles_core.xml | 1 + app/src/main/res/values/colors.xml | 5 +-- app/src/main/res/values/settings.xml | 2 +- app/src/main/res/values/styles_android.xml | 17 +++------- app/src/main/res/values/styles_core.xml | 2 +- app/src/main/res/values/styles_ui.xml | 4 ++- app/src/main/res/values/typography.xml | 10 +++--- 39 files changed, 110 insertions(+), 149 deletions(-) delete mode 100644 app/src/main/res/values-v23/styles_android.xml diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt index 4fa150696..c7b0df19a 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt @@ -104,11 +104,6 @@ class HomeFragment : ViewBindingFragment(), Toolbar.OnMenuI binding.homeToolbar.setOnMenuItemClickListener(this@HomeFragment) - binding.homeIndexingContainer.setOnApplyWindowInsetsListener { v, insets -> - logD("do basics you retard") - insets - } - updateTabConfiguration() // Load the track color in manually as it's unclear whether the track actually supports diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt index 842f2d6c4..1ba47ed3a 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt @@ -35,7 +35,7 @@ import org.oxycblt.auxio.util.logW * Master class (and possible god object) for the playback state. * * Whereas other apps centralize the playback state around the MediaSession, Auxio does not, as - * MediaSession is a terrible API that prevents nice features like better album cover loading and a + * MediaSession is a terrible API that prevents nice features like better album cover loading or a * reasonable queue system. * * This should ***NOT*** be used outside of the playback module. diff --git a/app/src/main/res/drawable/ic_author_24.xml b/app/src/main/res/drawable/ic_author_24.xml index 4c9371665..0db93bc39 100644 --- a/app/src/main/res/drawable/ic_author_24.xml +++ b/app/src/main/res/drawable/ic_author_24.xml @@ -2,10 +2,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_repeat_on_24.xml b/app/src/main/res/drawable/ic_repeat_on_24.xml index 74749dfe4..592f3d843 100644 --- a/app/src/main/res/drawable/ic_repeat_on_24.xml +++ b/app/src/main/res/drawable/ic_repeat_on_24.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="24"> + 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 30350536e..307b27ecf 100644 --- a/app/src/main/res/drawable/ic_repeat_one_24.xml +++ b/app/src/main/res/drawable/ic_repeat_one_24.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_shuffle_on_24.xml b/app/src/main/res/drawable/ic_shuffle_on_24.xml index 22325d478..8a64e052f 100644 --- a/app/src/main/res/drawable/ic_shuffle_on_24.xml +++ b/app/src/main/res/drawable/ic_shuffle_on_24.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="24"> + 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 c0b51c474..e35cf1c17 100644 --- a/app/src/main/res/layout-land/fragment_playback_panel.xml +++ b/app/src/main/res/layout-land/fragment_playback_panel.xml @@ -7,12 +7,12 @@ diff --git a/app/src/main/res/layout-sw600dp-land/fragment_playback_panel.xml b/app/src/main/res/layout-sw600dp-land/fragment_playback_panel.xml index 0c5142b09..971b0e745 100644 --- a/app/src/main/res/layout-sw600dp-land/fragment_playback_panel.xml +++ b/app/src/main/res/layout-sw600dp-land/fragment_playback_panel.xml @@ -7,12 +7,12 @@ diff --git a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml index c902b5760..edab0cd45 100644 --- a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml +++ b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml @@ -8,12 +8,12 @@ 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 da85272fa..50776f631 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 @@ -7,12 +7,12 @@ diff --git a/app/src/main/res/layout/dialog_accent.xml b/app/src/main/res/layout/dialog_accent.xml index ddaff0d4e..2e8fe4336 100644 --- a/app/src/main/res/layout/dialog_accent.xml +++ b/app/src/main/res/layout/dialog_accent.xml @@ -8,7 +8,5 @@ android:paddingStart="@dimen/spacing_medium" android:paddingEnd="@dimen/spacing_medium" app:layoutManager="org.oxycblt.auxio.ui.accent.AccentGridLayoutManager" - app:layout_constraintBottom_toTopOf="@+id/accent_cancel" - app:layout_constraintTop_toBottomOf="@+id/accent_header" tools:itemCount="16" tools:listitem="@layout/item_accent" /> diff --git a/app/src/main/res/layout/dialog_tabs.xml b/app/src/main/res/layout/dialog_tabs.xml index 7624cbb45..6c3cab382 100644 --- a/app/src/main/res/layout/dialog_tabs.xml +++ b/app/src/main/res/layout/dialog_tabs.xml @@ -6,7 +6,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - app:layout_constraintBottom_toTopOf="@+id/accent_cancel" - app:layout_constraintTop_toBottomOf="@+id/accent_header" tools:itemCount="5" tools:listitem="@layout/item_tab" /> diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 2446bfafb..3c5e3c6e3 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -84,9 +84,9 @@ android:id="@+id/about_version_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/spacing_medium" android:contentDescription="@string/lbl_version" android:src="@drawable/ic_about_24" - android:layout_marginStart="@dimen/spacing_medium" app:layout_constraintBottom_toBottomOf="@+id/about_version" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/about_version_title" /> @@ -95,8 +95,8 @@ android:id="@+id/about_version_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacing_medium" android:layout_marginStart="@dimen/spacing_medium" + android:layout_marginTop="@dimen/spacing_medium" android:text="@string/lbl_version" android:textAppearance="@style/TextAppearance.Auxio.BodyLarge" app:layout_constraintBottom_toTopOf="@+id/about_version" @@ -107,21 +107,20 @@ android:id="@+id/about_version" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/spacing_medium" android:textAppearance="@style/TextAppearance.Auxio.BodySmall" app:layout_constraintStart_toStartOf="@+id/about_version_title" app:layout_constraintTop_toBottomOf="@+id/about_version_title" - android:layout_marginBottom="@dimen/spacing_medium" tools:text="16.16.16" /> - diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index f2474ae32..0130ebd31 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -35,9 +35,9 @@ android:id="@+id/home_content" android:layout_width="match_parent" android:layout_height="match_parent" - app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" android:animateLayoutChanges="true" - android:clipToPadding="false"> + android:clipToPadding="false" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> + android:visibility="invisible"> diff --git a/app/src/main/res/layout/fragment_playback_panel.xml b/app/src/main/res/layout/fragment_playback_panel.xml index 65e429ffb..0ae0c32a1 100644 --- a/app/src/main/res/layout/fragment_playback_panel.xml +++ b/app/src/main/res/layout/fragment_playback_panel.xml @@ -7,12 +7,12 @@ diff --git a/app/src/main/res/layout/fragment_queue.xml b/app/src/main/res/layout/fragment_queue.xml index 913f68298..06a4533ab 100644 --- a/app/src/main/res/layout/fragment_queue.xml +++ b/app/src/main/res/layout/fragment_queue.xml @@ -14,10 +14,10 @@ diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 6610973eb..bb1607a02 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -10,12 +10,12 @@ app:liftOnScroll="true" app:liftOnScrollTargetViewId="@id/search_recycler"> - + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:menu="@menu/menu_search" + app:navigationIcon="@drawable/ic_back_24"> diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml index 9a3dc0b08..75e0a61c5 100644 --- a/app/src/main/res/layout/item_album_song.xml +++ b/app/src/main/res/layout/item_album_song.xml @@ -7,8 +7,8 @@ - - + diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml index 007cf132a..0c718d8fb 100644 --- a/app/src/main/res/layout/item_header.xml +++ b/app/src/main/res/layout/item_header.xml @@ -1,18 +1,16 @@ - + android:layout_height="wrap_content" + android:orientation="vertical"> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_music_dir.xml b/app/src/main/res/layout/item_music_dir.xml index cec1a061b..38c51efc1 100644 --- a/app/src/main/res/layout/item_music_dir.xml +++ b/app/src/main/res/layout/item_music_dir.xml @@ -1,10 +1,11 @@ - - + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="horizontal">