From 736bcdb99494ea84a8a10f655d045d2d4ea752d0 Mon Sep 17 00:00:00 2001
From: antonio <antoniocappiello.play@gmail.com>
Date: Sat, 9 Sep 2023 18:43:18 +0200
Subject: [PATCH] style: uniformed button size for "more buttons" to make them
 consistent and easier to click

---
 .../ui/adapter/SongHorizontalAdapter.java     |  5 +-
 .../main/res/layout/item_horizontal_album.xml | 43 ++++++------
 .../res/layout/item_horizontal_artist.xml     | 43 ++++++------
 .../res/layout/item_horizontal_download.xml   | 20 ++++--
 .../res/layout/item_horizontal_playlist.xml   | 28 ++++----
 .../main/res/layout/item_horizontal_track.xml | 68 +++++++++++--------
 6 files changed, 115 insertions(+), 92 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
index 4061fe21..367660ce 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
@@ -63,9 +63,8 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
                 .build()
                 .into(holder.item.songCoverImageView);
 
-        if (showCoverArt) holder.item.trackNumberTextView.setVisibility(View.INVISIBLE);
-
-        if (!showCoverArt) holder.item.songCoverImageView.setVisibility(View.INVISIBLE);
+        holder.item.trackNumberTextView.setVisibility(showCoverArt ? View.INVISIBLE : View.VISIBLE);
+        holder.item.songCoverImageView.setVisibility(showCoverArt ? View.VISIBLE : View.INVISIBLE);
 
         if (!showCoverArt && (position > 0 && songs.get(position - 1) != null && songs.get(position - 1).getDiscNumber() != null && songs.get(position).getDiscNumber() != null && songs.get(position - 1).getDiscNumber() < songs.get(position).getDiscNumber())) {
             holder.item.differentDiskDivider.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/layout/item_horizontal_album.xml b/app/src/main/res/layout/item_horizontal_album.xml
index 34889dda..af1ff7f9 100644
--- a/app/src/main/res/layout/item_horizontal_album.xml
+++ b/app/src/main/res/layout/item_horizontal_album.xml
@@ -5,16 +5,15 @@
     android:background="?attr/selectableItemBackground"
     android:clipChildren="false"
     android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingTop="3dp"
-    android:paddingBottom="3dp">
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp">
 
     <ImageView
         android:id="@+id/album_cover_image_view"
         android:layout_width="52dp"
         android:layout_height="52dp"
         android:layout_gravity="center"
-        android:layout_margin="2dp"
+        android:layout_marginStart="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -25,15 +24,14 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:paddingStart="12dp"
-        android:paddingTop="10dp"
-        android:paddingEnd="12dp"
+        android:paddingHorizontal="12dp"
         android:singleLine="true"
         android:text="@string/label_placeholder"
+        app:layout_constraintBottom_toTopOf="@+id/album_artist_text_view"
         app:layout_constraintEnd_toStartOf="@+id/album_more_button"
         app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
-        app:layout_constraintTop_toTopOf="parent" />
-
+        app:layout_constraintTop_toTopOf="@+id/album_cover_image_view"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
         android:id="@+id/album_artist_text_view"
@@ -41,24 +39,27 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
+        android:paddingHorizontal="12dp"
         android:singleLine="true"
-        android:paddingStart="12dp"
-        android:paddingEnd="16dp"
         android:text="@string/label_placeholder"
+        app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"
         app:layout_constraintEnd_toStartOf="@+id/album_more_button"
         app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
         app:layout_constraintTop_toBottomOf="@+id/album_title_text_view" />
 
-    <ImageView
+    <FrameLayout
         android:id="@+id/album_more_button"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:background="@drawable/ic_more_vert"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:gravity="center_vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/album_cover_image_view">
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:background="@drawable/ic_more_vert"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless" />
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_horizontal_artist.xml b/app/src/main/res/layout/item_horizontal_artist.xml
index d56ae095..764f14a3 100644
--- a/app/src/main/res/layout/item_horizontal_artist.xml
+++ b/app/src/main/res/layout/item_horizontal_artist.xml
@@ -5,16 +5,15 @@
     android:background="?attr/selectableItemBackground"
     android:clipChildren="false"
     android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingTop="3dp"
-    android:paddingBottom="3dp">
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp">
 
     <ImageView
         android:id="@+id/artist_cover_image_view"
         android:layout_width="52dp"
         android:layout_height="52dp"
         android:layout_gravity="center"
-        android:layout_margin="2dp"
+        android:layout_marginStart="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -25,17 +24,14 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
+        android:paddingHorizontal="12dp"
         android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintBottom_toTopOf="@id/artist_info_text_view"
         app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
         app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="spread"
-        app:layout_constraintVertical_weight="1" />
-
+        app:layout_constraintTop_toTopOf="@+id/artist_cover_image_view"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
         android:id="@+id/artist_info_text_view"
@@ -43,26 +39,29 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:singleLine="true"
         android:paddingStart="12dp"
         android:paddingEnd="16dp"
+        android:singleLine="true"
         android:text="@string/label_placeholder"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/artist_cover_image_view"
         app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
         app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
         app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view" />
 
-    <ImageView
+    <FrameLayout
         android:id="@+id/artist_more_button"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:background="@drawable/ic_more_vert"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:gravity="center_vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        app:layout_constraintBottom_toBottomOf="@+id/artist_cover_image_view"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/artist_cover_image_view">
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:background="@drawable/ic_more_vert"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless" />
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_horizontal_download.xml b/app/src/main/res/layout/item_horizontal_download.xml
index 1e0d5d47..184087c0 100644
--- a/app/src/main/res/layout/item_horizontal_download.xml
+++ b/app/src/main/res/layout/item_horizontal_download.xml
@@ -69,13 +69,19 @@
         app:layout_constraintStart_toStartOf="@+id/downloaded_item_title_text_view"
         app:layout_constraintBottom_toBottomOf="@+id/item_cover_image_view" />
 
-    <ImageView
+    <FrameLayout
         android:id="@+id/downloaded_item_more_button"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:background="@drawable/ic_more_vert"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        app:layout_constraintBottom_toBottomOf="@+id/item_cover_image_view"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider" />
+        app:layout_constraintTop_toTopOf="@+id/item_cover_image_view" >
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:background="@drawable/ic_more_vert"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless" />
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_horizontal_playlist.xml b/app/src/main/res/layout/item_horizontal_playlist.xml
index 3149daae..457c9cdd 100644
--- a/app/src/main/res/layout/item_horizontal_playlist.xml
+++ b/app/src/main/res/layout/item_horizontal_playlist.xml
@@ -5,16 +5,15 @@
     android:background="?attr/selectableItemBackground"
     android:clipChildren="false"
     android:orientation="horizontal"
-    android:paddingHorizontal="16dp"
-    android:paddingTop="3dp"
-    android:paddingBottom="3dp">
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp">
 
     <ImageView
         android:id="@+id/playlist_cover_image_view"
         android:layout_width="52dp"
         android:layout_height="52dp"
         android:layout_gravity="center"
-        android:layout_margin="2dp"
+        android:layout_marginStart="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -48,14 +47,19 @@
         app:layout_constraintStart_toEndOf="@+id/playlist_cover_image_view"
         app:layout_constraintTop_toBottomOf="@+id/playlist_title_text_view" />
 
-    <ImageView
+    <FrameLayout
         android:id="@+id/playlist_more_button"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:layout_marginStart="12dp"
-        android:background="@drawable/ic_more_vert"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        app:layout_constraintBottom_toBottomOf="@+id/playlist_cover_image_view"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/playlist_cover_image_view">
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:background="@drawable/ic_more_vert"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless" />
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_horizontal_track.xml b/app/src/main/res/layout/item_horizontal_track.xml
index d56691a8..149a5bbb 100644
--- a/app/src/main/res/layout/item_horizontal_track.xml
+++ b/app/src/main/res/layout/item_horizontal_track.xml
@@ -5,25 +5,24 @@
     android:background="?attr/selectableItemBackground"
     android:clipChildren="false"
     android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingTop="3dp"
-    android:paddingBottom="3dp">
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp">
 
     <View
-        style="@style/Divider"
         android:id="@+id/different_disk_divider"
-        android:layout_marginEnd="16dp"
+        style="@style/Divider"
+        android:layout_marginHorizontal="16dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/song_cover_image_view"
         android:layout_width="52dp"
         android:layout_height="52dp"
         android:layout_gravity="center"
-        android:layout_margin="2dp"
+        android:layout_marginStart="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/different_disk_divider" />
@@ -33,7 +32,7 @@
         style="@style/LabelLarge"
         android:layout_width="52dp"
         android:layout_height="52dp"
-        android:layout_margin="2dp"
+        android:layout_marginStart="16dp"
         android:gravity="center"
         android:text="@string/label_placeholder"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -44,9 +43,10 @@
         android:id="@+id/cover_image_separator"
         android:layout_width="12dp"
         android:layout_height="52dp"
+        app:layout_constraintBottom_toBottomOf="@+id/song_cover_image_view"
         app:layout_constraintEnd_toStartOf="@+id/search_result_song_title_text_view"
         app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
-        app:layout_constraintTop_toBottomOf="@+id/different_disk_divider" />
+        app:layout_constraintTop_toTopOf="@+id/song_cover_image_view" />
 
     <TextView
         android:id="@+id/search_result_song_title_text_view"
@@ -54,13 +54,14 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:paddingTop="10dp"
         android:paddingEnd="12dp"
         android:singleLine="true"
         android:text="@string/label_placeholder"
+        app:layout_constraintBottom_toTopOf="@+id/search_result_song_subtitle_text_view"
         app:layout_constraintEnd_toStartOf="@+id/search_result_dowanload_indicator_image_view"
         app:layout_constraintStart_toEndOf="@+id/cover_image_separator"
-        app:layout_constraintTop_toBottomOf="@+id/different_disk_divider" />
+        app:layout_constraintTop_toTopOf="@+id/song_cover_image_view"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
         android:id="@+id/search_result_song_subtitle_text_view"
@@ -71,30 +72,43 @@
         android:paddingEnd="12dp"
         android:singleLine="true"
         android:text="@string/label_placeholder"
+        app:layout_constraintBottom_toBottomOf="@+id/song_cover_image_view"
         app:layout_constraintEnd_toStartOf="@+id/search_result_dowanload_indicator_image_view"
         app:layout_constraintStart_toEndOf="@+id/cover_image_separator"
         app:layout_constraintTop_toBottomOf="@+id/search_result_song_title_text_view" />
 
-    <ImageView
+    <FrameLayout
         android:id="@+id/search_result_dowanload_indicator_image_view"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:layout_margin="8dp"
-        android:background="@drawable/ic_download"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/song_cover_image_view"
         app:layout_constraintEnd_toStartOf="@+id/search_result_song_more_button"
-        app:layout_constraintTop_toBottomOf="@+id/different_disk_divider" />
+        app:layout_constraintStart_toEndOf="@+id/search_result_song_title_text_view"
+        app:layout_constraintTop_toTopOf="@+id/song_cover_image_view">
 
-    <ImageView
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:background="@drawable/ic_download"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless" />
+    </FrameLayout>
+
+    <FrameLayout
         android:id="@+id/search_result_song_more_button"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:background="@drawable/ic_more_vert"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        app:layout_constraintBottom_toBottomOf="@+id/song_cover_image_view"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/different_disk_divider" />
+        app:layout_constraintStart_toEndOf="@+id/search_result_dowanload_indicator_image_view"
+        app:layout_constraintTop_toTopOf="@+id/song_cover_image_view">
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:background="@drawable/ic_more_vert"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless" />
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file