From a56d5849dba93ce2a9bc465f2fd0a9380da9fec5 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Wed, 8 Jun 2022 09:59:28 -0600 Subject: [PATCH] ui: update bar styles Update the styles of LinearProgressIndicator and Slider to be similar across the entirety of the app. --- CHANGELOG.md | 1 + app/src/main/java/org/oxycblt/auxio/MainFragment.kt | 2 -- .../res/layout-sw640dp/fragment_playback_bar.xml | 3 ++- .../res/layout-w600dp/fragment_playback_bar.xml | 3 ++- app/src/main/res/layout/dialog_pre_amp.xml | 10 ---------- app/src/main/res/layout/fragment_playback_bar.xml | 3 ++- app/src/main/res/layout/view_seek_bar.xml | 7 +------ app/src/main/res/values/styles_core.xml | 2 ++ app/src/main/res/values/styles_ui.xml | 13 +++++++++++++ 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa2fd9356..4e62f5a3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added toggle for edge-to-edge mode [#149] #### What's Improved +- The toolbar in the home UI now collapses when scrolling - Genre parsing now handles multiple integer values and cover/remix indicators (May wipe playback state) #### Dev/Meta diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index fd02bb555..49484b435 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -26,7 +26,6 @@ import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController import org.oxycblt.auxio.databinding.FragmentMainBinding -import org.oxycblt.auxio.music.IndexerViewModel import org.oxycblt.auxio.music.Music import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.playback.PlaybackViewModel @@ -43,7 +42,6 @@ import org.oxycblt.auxio.util.launch class MainFragment : ViewBindingFragment() { private val playbackModel: PlaybackViewModel by activityViewModels() private val navModel: NavigationViewModel by activityViewModels() - private val musicModel: IndexerViewModel by activityViewModels() private var callback: DynamicBackPressedCallback? = null override fun onCreateBinding(inflater: LayoutInflater) = FragmentMainBinding.inflate(inflater) diff --git a/app/src/main/res/layout-sw640dp/fragment_playback_bar.xml b/app/src/main/res/layout-sw640dp/fragment_playback_bar.xml index 8baccdc4b..9cd6077e7 100644 --- a/app/src/main/res/layout-sw640dp/fragment_playback_bar.xml +++ b/app/src/main/res/layout-sw640dp/fragment_playback_bar.xml @@ -89,10 +89,11 @@ android:id="@+id/playback_progress_bar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/spacing_small" + android:layout_marginEnd="@dimen/spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:trackColor="@color/sel_track" tools:progress="70" /> \ No newline at end of file diff --git a/app/src/main/res/layout-w600dp/fragment_playback_bar.xml b/app/src/main/res/layout-w600dp/fragment_playback_bar.xml index 956a68c2b..f9ff9b307 100644 --- a/app/src/main/res/layout-w600dp/fragment_playback_bar.xml +++ b/app/src/main/res/layout-w600dp/fragment_playback_bar.xml @@ -87,10 +87,11 @@ android:id="@+id/playback_progress_bar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/spacing_small" + android:layout_marginEnd="@dimen/spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:trackColor="@color/sel_track" tools:progress="70" /> diff --git a/app/src/main/res/layout/dialog_pre_amp.xml b/app/src/main/res/layout/dialog_pre_amp.xml index d8bcb6486..57f175474 100644 --- a/app/src/main/res/layout/dialog_pre_amp.xml +++ b/app/src/main/res/layout/dialog_pre_amp.xml @@ -28,14 +28,9 @@ android:stepSize="0.1" android:valueFrom="-15.0" android:valueTo="15.0" - app:haloRadius="@dimen/slider_halo_radius" - app:labelBehavior="gone" app:layout_constraintEnd_toStartOf="@+id/with_tags_ticker" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/with_tags_header" - app:thumbRadius="@dimen/slider_thumb_radius" - app:tickVisible="false" - app:trackColorInactive="@color/sel_track" tools:value="0.0" /> diff --git a/app/src/main/res/layout/view_seek_bar.xml b/app/src/main/res/layout/view_seek_bar.xml index 0725b5095..8338861a7 100644 --- a/app/src/main/res/layout/view_seek_bar.xml +++ b/app/src/main/res/layout/view_seek_bar.xml @@ -12,15 +12,10 @@ android:layout_marginBottom="@dimen/spacing_medium" android:valueFrom="0" android:valueTo="1" - app:haloRadius="@dimen/slider_halo_radius" - app:labelBehavior="gone" - app:labelStyle="@style/TextAppearance.Auxio.BodySmall" app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:thumbRadius="@dimen/slider_thumb_radius" - app:trackColorInactive="@color/sel_track" /> + app:layout_constraintStart_toStartOf="parent" /> @style/Theme.Auxio.Dialog + @style/Widget.Auxio.Slider + @style/Widget.Auxio.LinearProgressIndicator @style/TextAppearance.Auxio.DisplayLarge @style/TextAppearance.Auxio.DisplayMedium diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml index b1f588657..8ae675d1d 100644 --- a/app/src/main/res/values/styles_ui.xml +++ b/app/src/main/res/values/styles_ui.xml @@ -73,6 +73,19 @@ @dimen/recycler_fab_space_normal + + + +