antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

style: uniformed button size for "more buttons" to make them consistent and easier to click

Browse source
This commit is contained in:
antonio 2023-09-09 18:43:18 +02:00
parent e71472f498
commit 736bcdb994
6 changed files with 115 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
View file

@ -63,9 +63,8 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
.build() .build()
.into(holder.item.songCoverImageView); .into(holder.item.songCoverImageView);
if (showCoverArt) holder.item.trackNumberTextView.setVisibility(View.INVISIBLE); holder.item.trackNumberTextView.setVisibility(showCoverArt ? View.INVISIBLE : View.VISIBLE);
holder.item.songCoverImageView.setVisibility(showCoverArt ? View.VISIBLE : View.INVISIBLE);
if (!showCoverArt) holder.item.songCoverImageView.setVisibility(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())) { 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); holder.item.differentDiskDivider.setVisibility(View.VISIBLE);

43
app/src/main/res/layout/item_horizontal_album.xml
View file

@ -5,16 +5,15 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clipChildren="false" android:clipChildren="false"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="16dp" android:paddingTop="2dp"
android:paddingTop="3dp" android:paddingBottom="2dp">
android:paddingBottom="3dp">
<ImageView <ImageView
android:id="@+id/album_cover_image_view" android:id="@+id/album_cover_image_view"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="2dp" android:layout_marginStart="16dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -25,15 +24,14 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:paddingStart="12dp" android:paddingHorizontal="12dp"
android:paddingTop="10dp"
android:paddingEnd="12dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/label_placeholder" android:text="@string/label_placeholder"
app:layout_constraintBottom_toTopOf="@+id/album_artist_text_view"
app:layout_constraintEnd_toStartOf="@+id/album_more_button" app:layout_constraintEnd_toStartOf="@+id/album_more_button"
app:layout_constraintStart_toEndOf="@+id/album_cover_image_view" 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 <TextView
android:id="@+id/album_artist_text_view" android:id="@+id/album_artist_text_view"
@ -41,24 +39,27 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:paddingHorizontal="12dp"
android:singleLine="true" android:singleLine="true"
android:paddingStart="12dp"
android:paddingEnd="16dp"
android:text="@string/label_placeholder" android:text="@string/label_placeholder"
app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"
app:layout_constraintEnd_toStartOf="@+id/album_more_button" app:layout_constraintEnd_toStartOf="@+id/album_more_button"
app:layout_constraintStart_toEndOf="@+id/album_cover_image_view" app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
app:layout_constraintTop_toBottomOf="@+id/album_title_text_view" /> app:layout_constraintTop_toBottomOf="@+id/album_title_text_view" />
<ImageView <FrameLayout
android:id="@+id/album_more_button" android:id="@+id/album_more_button"
android:layout_width="18dp" android:layout_width="wrap_content"
android:layout_height="18dp" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:padding="12dp"
android:layout_marginEnd="12dp" app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view"
android:background="@drawable/ic_more_vert"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" 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> </androidx.constraintlayout.widget.ConstraintLayout>

43
app/src/main/res/layout/item_horizontal_artist.xml
View file

@ -5,16 +5,15 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clipChildren="false" android:clipChildren="false"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="16dp" android:paddingTop="2dp"
android:paddingTop="3dp" android:paddingBottom="2dp">
android:paddingBottom="3dp">
<ImageView <ImageView
android:id="@+id/artist_cover_image_view" android:id="@+id/artist_cover_image_view"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="2dp" android:layout_marginStart="16dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -25,17 +24,14 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:paddingStart="12dp" android:paddingHorizontal="12dp"
android:paddingEnd="12dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/label_placeholder" android:text="@string/label_placeholder"
app:layout_constraintBottom_toTopOf="@id/artist_info_text_view" app:layout_constraintBottom_toTopOf="@id/artist_info_text_view"
app:layout_constraintEnd_toStartOf="@+id/artist_more_button" app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view" app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="@+id/artist_cover_image_view"
app:layout_constraintVertical_chainStyle="spread" app:layout_constraintVertical_chainStyle="packed" />
app:layout_constraintVertical_weight="1" />
<TextView <TextView
android:id="@+id/artist_info_text_view" android:id="@+id/artist_info_text_view"
@ -43,26 +39,29 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:singleLine="true"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:singleLine="true"
android:text="@string/label_placeholder" android:text="@string/label_placeholder"
android:visibility="gone" 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_constraintEnd_toStartOf="@+id/artist_more_button"
app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view" app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view" /> app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view" />
<ImageView <FrameLayout
android:id="@+id/artist_more_button" android:id="@+id/artist_more_button"
android:layout_width="18dp" android:layout_width="wrap_content"
android:layout_height="18dp" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:padding="12dp"
android:layout_marginEnd="12dp" app:layout_constraintBottom_toBottomOf="@+id/artist_cover_image_view"
android:background="@drawable/ic_more_vert"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" 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> </androidx.constraintlayout.widget.ConstraintLayout>

20
app/src/main/res/layout/item_horizontal_download.xml
View file

@ -69,13 +69,19 @@
app:layout_constraintStart_toStartOf="@+id/downloaded_item_title_text_view" app:layout_constraintStart_toStartOf="@+id/downloaded_item_title_text_view"
app:layout_constraintBottom_toBottomOf="@+id/item_cover_image_view" /> app:layout_constraintBottom_toBottomOf="@+id/item_cover_image_view" />
<ImageView <FrameLayout
android:id="@+id/downloaded_item_more_button" android:id="@+id/downloaded_item_more_button"
android:layout_width="18dp" android:layout_width="wrap_content"
android:layout_height="18dp" android:layout_height="wrap_content"
android:background="@drawable/ic_more_vert" android:padding="12dp"
android:foreground="?android:attr/selectableItemBackgroundBorderless" app:layout_constraintBottom_toBottomOf="@+id/item_cover_image_view"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" 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> </androidx.constraintlayout.widget.ConstraintLayout>

28
app/src/main/res/layout/item_horizontal_playlist.xml
View file

@ -5,16 +5,15 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clipChildren="false" android:clipChildren="false"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingHorizontal="16dp" android:paddingTop="2dp"
android:paddingTop="3dp" android:paddingBottom="2dp">
android:paddingBottom="3dp">
<ImageView <ImageView
android:id="@+id/playlist_cover_image_view" android:id="@+id/playlist_cover_image_view"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="2dp" android:layout_marginStart="16dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -48,14 +47,19 @@
app:layout_constraintStart_toEndOf="@+id/playlist_cover_image_view" app:layout_constraintStart_toEndOf="@+id/playlist_cover_image_view"
app:layout_constraintTop_toBottomOf="@+id/playlist_title_text_view" /> app:layout_constraintTop_toBottomOf="@+id/playlist_title_text_view" />
<ImageView <FrameLayout
android:id="@+id/playlist_more_button" android:id="@+id/playlist_more_button"
android:layout_width="18dp" android:layout_width="wrap_content"
android:layout_height="18dp" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:padding="12dp"
android:background="@drawable/ic_more_vert" app:layout_constraintBottom_toBottomOf="@+id/playlist_cover_image_view"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" 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> </androidx.constraintlayout.widget.ConstraintLayout>

68
app/src/main/res/layout/item_horizontal_track.xml
View file

@ -5,25 +5,24 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clipChildren="false" android:clipChildren="false"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="16dp" android:paddingTop="2dp"
android:paddingTop="3dp" android:paddingBottom="2dp">
android:paddingBottom="3dp">
<View <View
style="@style/Divider"
android:id="@+id/different_disk_divider" android:id="@+id/different_disk_divider"
android:layout_marginEnd="16dp" style="@style/Divider"
android:layout_marginHorizontal="16dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/song_cover_image_view" android:id="@+id/song_cover_image_view"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="2dp" android:layout_marginStart="16dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/different_disk_divider" /> app:layout_constraintTop_toBottomOf="@+id/different_disk_divider" />
@ -33,7 +32,7 @@
style="@style/LabelLarge" style="@style/LabelLarge"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="52dp" android:layout_height="52dp"
android:layout_margin="2dp" android:layout_marginStart="16dp"
android:gravity="center" android:gravity="center"
android:text="@string/label_placeholder" android:text="@string/label_placeholder"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -44,9 +43,10 @@
android:id="@+id/cover_image_separator" android:id="@+id/cover_image_separator"
android:layout_width="12dp" android:layout_width="12dp"
android:layout_height="52dp" 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_constraintEnd_toStartOf="@+id/search_result_song_title_text_view"
app:layout_constraintStart_toEndOf="@+id/song_cover_image_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 <TextView
android:id="@+id/search_result_song_title_text_view" android:id="@+id/search_result_song_title_text_view"
@ -54,13 +54,14 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:paddingTop="10dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/label_placeholder" 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_constraintEnd_toStartOf="@+id/search_result_dowanload_indicator_image_view"
app:layout_constraintStart_toEndOf="@+id/cover_image_separator" 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 <TextView
android:id="@+id/search_result_song_subtitle_text_view" android:id="@+id/search_result_song_subtitle_text_view"
@ -71,30 +72,43 @@
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/label_placeholder" 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_constraintEnd_toStartOf="@+id/search_result_dowanload_indicator_image_view"
app:layout_constraintStart_toEndOf="@+id/cover_image_separator" app:layout_constraintStart_toEndOf="@+id/cover_image_separator"
app:layout_constraintTop_toBottomOf="@+id/search_result_song_title_text_view" /> app:layout_constraintTop_toBottomOf="@+id/search_result_song_title_text_view" />
<ImageView <FrameLayout
android:id="@+id/search_result_dowanload_indicator_image_view" android:id="@+id/search_result_dowanload_indicator_image_view"
android:layout_width="18dp" android:layout_width="wrap_content"
android:layout_height="18dp" android:layout_height="wrap_content"
android:layout_margin="8dp" android:padding="12dp"
android:background="@drawable/ic_download"
android:visibility="gone" 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_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:id="@+id/search_result_song_more_button"
android:layout_width="18dp" android:layout_width="wrap_content"
android:layout_height="18dp" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:padding="12dp"
android:layout_marginEnd="12dp" app:layout_constraintBottom_toBottomOf="@+id/song_cover_image_view"
android:background="@drawable/ic_more_vert"
android:foreground="?android:attr/selectableItemBackgroundBorderless"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" 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> </androidx.constraintlayout.widget.ConstraintLayout>