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

Fixed display of long texts in adapters

Browse source
This commit is contained in:
CappielloAntonio 2021-08-02 15:37:29 +02:00
parent 0cf3eaff17
commit 9295c10dcd
8 changed files with 35 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
View file

@ -50,7 +50,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
holder.songTitle.setText(MusicUtil.getReadableInfo(song.getTitle()));
holder.songArtist.setText(MusicUtil.getReadableInfo(song.getArtistName()));
holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
CustomGlideRequest.Builder
.from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
@ -60,7 +59,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
if (position < MusicPlayerRemote.getPosition()) {
holder.songTitle.setTextColor(context.getResources().getColor(R.color.songToPlayTextColor, null));
holder.songArtist.setTextColor(context.getResources().getColor(R.color.songToPlayTextColor, null));
holder.songDuration.setTextColor(context.getResources().getColor(R.color.songToPlayTextColor, null));
}
}
@ -85,7 +83,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
TextView songTitle;
TextView songArtist;
TextView songDuration;
ImageView cover;
ViewHolder(View itemView) {
@ -93,7 +90,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
songTitle = itemView.findViewById(R.id.queue_song_title_text_view);
songArtist = itemView.findViewById(R.id.queue_song_artist_text_view);
songDuration = itemView.findViewById(R.id.queue_song_duration_text_view);
cover = itemView.findViewById(R.id.queue_song_cover_image_view);
itemView.setOnClickListener(this);

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
View file

@ -115,7 +115,7 @@ public class ArtistPageFragment extends Fragment {
private void initBackdrop() {
CustomGlideRequest.Builder
.from(requireContext(), artistPageViewModel.getArtist().getPrimary(), artistPageViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC)
.from(requireContext(), artistPageViewModel.getArtist().getId(), artistPageViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC)
.build()
.into(bind.artistBackdropImageView);
}

6
app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
View file

@ -57,12 +57,12 @@ public class PlayingNotification {
Intent action = new Intent(service, MainActivity.class);
action.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
final PendingIntent clickIntent = PendingIntent.getActivity(service, 0, action, 0);
final PendingIntent clickIntent = PendingIntent.getActivity(service, 0, action, PendingIntent.FLAG_IMMUTABLE);
final ComponentName serviceName = new ComponentName(service, MusicService.class);
Intent intent = new Intent(MusicService.ACTION_QUIT);
intent.setComponent(serviceName);
final PendingIntent deleteIntent = PendingIntent.getService(service, 0, intent, 0);
final PendingIntent deleteIntent = PendingIntent.getService(service, 0, intent, PendingIntent.FLAG_IMMUTABLE);
final int bigNotificationImageSize = service.getResources().getDimensionPixelSize(R.dimen.notification_big_image_size);
service.runOnUiThread(() -> CustomGlideRequest.Builder
@ -130,7 +130,7 @@ public class PlayingNotification {
Intent intent = new Intent(action);
intent.setComponent(serviceName);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
return PendingIntent.getService(service, 0, intent, 0);
return PendingIntent.getService(service, 0, intent, PendingIntent.FLAG_IMMUTABLE);
}
void updateNotifyModeAndPostNotification(Notification notification) {

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

@ -28,11 +28,11 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:maxLines="1"
android:paddingStart="12dp"
android:paddingTop="10dp"
android:paddingEnd="12dp"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/label_placeholder"
app:layout_constraintEnd_toStartOf="@+id/album_more_button"
app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
@ -48,12 +48,13 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:maxLines="1"
android:paddingStart="12dp"
android:paddingEnd="16dp"
android:text="@string/label_placeholder"
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"/>
app:layout_constraintTop_toBottomOf="@+id/album_title_text_view" />
<ImageView
android:id="@+id/album_more_button"

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

@ -28,11 +28,11 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:maxLines="1"
android:paddingStart="12dp"
android:paddingTop="10dp"
android:paddingEnd="12dp"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/label_placeholder"
app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
@ -48,12 +48,13 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:maxLines="1"
android:paddingStart="12dp"
android:paddingEnd="16dp"
android:text="@string/label_placeholder"
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"/>
app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view" />
<ImageView
android:id="@+id/artist_more_button"

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

@ -38,21 +38,25 @@
app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingEnd="12dp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@+id/search_result_dowanload_indicator_image_view"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
app:layout_constraintTop_toBottomOf="@+id/search_result_song_title_text_view">
<TextView
android:id="@+id/album_artist_text_view"
style="@style/ItemSubtitleTextView"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:paddingStart="12dp"
android:paddingEnd="4dp"
android:text="@string/label_placeholder" />
@ -69,6 +73,7 @@
style="@style/ItemSubtitleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:paddingStart="4dp"
android:paddingEnd="12dp"
android:text="@string/label_placeholder" />

46
app/src/main/res/layout/item_player_queue_song.xml
View file

@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/cardColor"
android:clipChildren="false"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingStart="24dp"
@ -29,50 +30,31 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:maxLines="1"
android:paddingStart="12dp"
android:paddingTop="10dp"
android:paddingEnd="12dp"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/label_placeholder"
app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"
app:layout_constraintStart_toEndOf="@+id/queue_song_cover_image_view"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="0dp"
<TextView
android:id="@+id/queue_song_artist_text_view"
style="@style/ItemSubtitleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingEnd="12dp"
android:ellipsize="end"
android:maxLines="1"
android:paddingStart="12dp"
android:paddingEnd="4dp"
android:text="@string/label_placeholder"
app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constrainedWidth="true"
app:layout_constraintStart_toEndOf="@+id/queue_song_cover_image_view"
app:layout_constraintTop_toBottomOf="@+id/queue_song_title_text_view">
<TextView
android:id="@+id/queue_song_artist_text_view"
style="@style/ItemSubtitleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="4dp"
android:text="@string/label_placeholder" />
<TextView
android:id="@+id/queue_separator_text_view"
style="@style/ItemSubtitleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_dot_separator" />
<TextView
android:id="@+id/queue_song_duration_text_view"
style="@style/ItemSubtitleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="4dp"
android:paddingEnd="12dp"
android:text="@string/label_placeholder" />
</LinearLayout>
app:layout_constraintTop_toBottomOf="@+id/queue_song_title_text_view" />
<ImageView
android:id="@+id/queue_song_holder_image"