From a820724ff2ed6a0b4bfb95a09803b32fc5493976 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Fri, 24 Sep 2021 20:39:10 -0600 Subject: [PATCH] ui: increase seekbar height Make the seekbar more touchable by increasing it's height. This should have no measurable impact since I did some layout black magic and made the rest of the layout slightly inset into the SeekBar's bounds. This is not a nice solution. Hopefully I'll be able to make a dedicated view with a Seeker with the same insetting things later on. --- .../main/res/drawable/ui_circle_ripple.xml | 2 +- .../res/layout-land/fragment_playback.xml | 16 ++++++++++----- .../layout-xlarge-land/fragment_playback.xml | 20 +++++++++++++------ .../res/layout-xlarge/fragment_playback.xml | 6 +++--- app/src/main/res/layout/fragment_playback.xml | 15 +++++++------- app/src/main/res/values/styles_android.xml | 2 +- app/src/main/res/values/styles_ui.xml | 3 +-- 7 files changed, 39 insertions(+), 25 deletions(-) diff --git a/app/src/main/res/drawable/ui_circle_ripple.xml b/app/src/main/res/drawable/ui_circle_ripple.xml index 07d7e249d..5a950b569 100644 --- a/app/src/main/res/drawable/ui_circle_ripple.xml +++ b/app/src/main/res/drawable/ui_circle_ripple.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml index ca528b3e1..80a165152 100644 --- a/app/src/main/res/layout-land/fragment_playback.xml +++ b/app/src/main/res/layout-land/fragment_playback.xml @@ -56,7 +56,7 @@ android:layout_marginEnd="@dimen/spacing_mid_large" app:layout_constraintBottom_toTopOf="@+id/playback_artist" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playback_cover" app:layout_constraintTop_toBottomOf="@+id/playback_toolbar" app:layout_constraintVertical_chainStyle="packed"> @@ -83,6 +83,7 @@ android:text="@{song.album.artist.name}" app:layout_constraintBottom_toTopOf="@+id/playback_album" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playback_cover" app:layout_constraintTop_toBottomOf="@+id/playback_song_container" tools:text="Artist Name" /> @@ -98,6 +99,7 @@ android:text="@{song.album.name}" app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playback_cover" app:layout_constraintTop_toBottomOf="@+id/playback_artist" tools:text="Album Name" /> @@ -107,9 +109,11 @@ style="@style/Widget.Auxio.SeekBar" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacing_medium" - app:layout_constraintBottom_toTopOf="@+id/playback_duration_current" + android:paddingStart="@dimen/spacing_mid_large" + android:paddingEnd="@dimen/spacing_mid_large" + app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" 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" tools:progress="70" /> @@ -121,7 +125,7 @@ android:layout_marginStart="@dimen/spacing_mid_large" android:text="@{playbackModel.formattedPosition}" android:textColor="@color/sel_accented_secondary" - app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" + app:layout_constraintBottom_toBottomOf="@+id/playback_seek_bar" app:layout_constraintStart_toEndOf="@+id/playback_cover" app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar" tools:text="11:38" /> @@ -132,6 +136,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/spacing_mid_large" android:text="@{song.formattedDuration}" + app:layout_constraintBottom_toBottomOf="@+id/playback_seek_bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar" tools:text="16:16" /> @@ -176,8 +181,9 @@ android:src="@drawable/sel_playing_state" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/playback_song_duration" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="@+id/playback_duration_current" - app:layout_constraintTop_toBottomOf="@+id/playback_duration_current" + app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar" tools:src="@drawable/ic_pause" /> @@ -84,6 +85,7 @@ android:text="@{song.album.artist.name}" app:layout_constraintBottom_toTopOf="@+id/playback_album" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playback_cover" app:layout_constraintTop_toBottomOf="@+id/playback_song_container" tools:text="Artist Name" /> @@ -99,6 +101,7 @@ android:text="@{song.album.name}" app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playback_cover" app:layout_constraintTop_toBottomOf="@+id/playback_artist" tools:text="Album Name" /> @@ -108,9 +111,11 @@ style="@style/Widget.Auxio.SeekBar" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacing_medium" - app:layout_constraintBottom_toTopOf="@+id/playback_duration_current" + android:paddingStart="@dimen/spacing_mid_large" + android:paddingEnd="@dimen/spacing_mid_large" + app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" 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" tools:progress="70" /> @@ -122,17 +127,18 @@ android:layout_marginStart="@dimen/spacing_mid_large" android:text="@{playbackModel.formattedPosition}" android:textColor="@color/sel_accented_secondary" - app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" + app:layout_constraintBottom_toBottomOf="@+id/playback_seek_bar" app:layout_constraintStart_toEndOf="@+id/playback_cover" app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar" tools:text="11:38" /> @@ -176,9 +182,10 @@ android:onClick="@{() -> playbackModel.invertPlayingStatus()}" android:src="@drawable/sel_playing_state" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="@+id/playback_song_container_duration" + app:layout_constraintEnd_toEndOf="@+id/playback_song_duration" + app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="@+id/playback_duration_current" - app:layout_constraintTop_toBottomOf="@+id/playback_duration_current" + app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar" tools:src="@drawable/ic_pause" /> + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_playback.xml b/app/src/main/res/layout-xlarge/fragment_playback.xml index 96a60fc7a..299e0f90e 100644 --- a/app/src/main/res/layout-xlarge/fragment_playback.xml +++ b/app/src/main/res/layout-xlarge/fragment_playback.xml @@ -96,9 +96,10 @@ style="@style/Widget.Auxio.SeekBar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="16dp" android:paddingStart="@dimen/spacing_mid_huge" android:paddingEnd="@dimen/spacing_mid_huge" - app:layout_constraintBottom_toTopOf="@+id/playback_duration_current" + app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" tools:progress="70" /> @@ -108,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/spacing_mid_huge" - android:layout_marginBottom="@dimen/spacing_medium" + android:layout_marginBottom="@dimen/spacing_small" android:text="@{playbackModel.formattedPosition}" android:textColor="@color/sel_accented_secondary" app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" @@ -120,7 +121,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/spacing_mid_huge" - android:layout_marginBottom="@dimen/spacing_medium" android:text="@{song.formattedDuration}" app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml index 85e9c4d98..13c148ca6 100644 --- a/app/src/main/res/layout/fragment_playback.xml +++ b/app/src/main/res/layout/fragment_playback.xml @@ -82,7 +82,6 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/spacing_mid_large" android:layout_marginEnd="@dimen/spacing_mid_large" - android:layout_marginBottom="@dimen/spacing_medium" android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}" android:text="@{song.album.name}" app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar" @@ -95,7 +94,10 @@ style="@style/Widget.Auxio.SeekBar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_constraintBottom_toTopOf="@+id/playback_duration_current" + android:paddingStart="@dimen/spacing_mid_large" + android:paddingEnd="@dimen/spacing_mid_large" + android:layout_marginBottom="@dimen/spacing_medium" + app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" tools:progress="70" /> @@ -104,8 +106,8 @@ android:id="@+id/playback_duration_current" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="8dp" android:layout_marginStart="@dimen/spacing_mid_large" - android:layout_marginBottom="@dimen/spacing_medium" android:text="@{playbackModel.formattedPosition}" android:textColor="@color/sel_accented_secondary" app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" @@ -117,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/spacing_mid_large" - android:layout_marginBottom="@dimen/spacing_medium" + android:layout_marginBottom="8dp" android:text="@{song.formattedDuration}" app:layout_constraintBottom_toTopOf="@+id/playback_play_pause" app:layout_constraintEnd_toEndOf="parent" @@ -154,13 +156,12 @@ style="@style/Widget.Auxio.Button.Circular" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacing_medium" - android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginStart="@dimen/spacing_medium" + android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginBottom="@dimen/spacing_medium" android:contentDescription="@string/desc_play_pause" - android:src="@drawable/sel_playing_state" android:onClick="@{() -> playbackModel.invertPlayingStatus()}" + android:src="@drawable/sel_playing_state" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/playback_song_duration" app:layout_constraintStart_toStartOf="@+id/playback_duration_current" diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml index 71eaf6043..d4d59bcf2 100644 --- a/app/src/main/res/values/styles_android.xml +++ b/app/src/main/res/values/styles_android.xml @@ -76,7 +76,7 @@ diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml index 72c572df9..69ec2906b 100644 --- a/app/src/main/res/values/styles_ui.xml +++ b/app/src/main/res/values/styles_ui.xml @@ -36,14 +36,13 @@