ros/tempo
1
0
Fork 0
mirror of https://github.com/CappielloAntonio/tempo.git synced 2026-02-04 16:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: null checking

Browse Source
This commit is contained in:
CappielloAntonio
2024-08-30 17:19:58 +02:00
parent 6c6d56f451
commit 67e4079732
2 changed files with 6 additions and 3 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

@@ -95,7 +95,10 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
) )
) { ) {
holder.item.differentDiskDividerSector.setVisibility(View.VISIBLE); holder.item.differentDiskDividerSector.setVisibility(View.VISIBLE);
holder.item.discTitleTextView.setText(holder.itemView.getContext().getString(R.string.disc_titleless, songs.get(position).getDiscNumber().toString()));
if (songs.get(position).getDiscNumber() != null && !Objects.requireNonNull(songs.get(position).getDiscNumber()).toString().isBlank()) {
holder.item.discTitleTextView.setText(holder.itemView.getContext().getString(R.string.disc_titleless, songs.get(position).getDiscNumber().toString()));
}
if (album.getDiscTitles() != null) { if (album.getDiscTitles() != null) {
Optional<DiscTitle> discTitle = album.getDiscTitles().stream().filter(title -> Objects.equals(title.getDisc(), songs.get(position).getDiscNumber())).findFirst(); Optional<DiscTitle> discTitle = album.getDiscTitles().stream().filter(title -> Objects.equals(title.getDisc(), songs.get(position).getDiscNumber())).findFirst();

4
app/src/main/res/layout/item_horizontal_track.xml
View File

@@ -27,9 +27,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:layout_marginEnd="12dp" android:paddingEnd="12dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/label_placeholder" tools:text="@string/label_placeholder"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/different_disk_divider" app:layout_constraintEnd_toStartOf="@+id/different_disk_divider"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"