Added html parser in every adapter

This commit is contained in:
CappielloAntonio 2021-08-01 11:26:06 +02:00
parent fd4250b6f7
commit cf63097e34
17 changed files with 43 additions and 26 deletions

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -43,8 +44,8 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Album album = albums.get(position); Album album = albums.get(position);
holder.textAlbumName.setText(album.getTitle()); holder.textAlbumName.setText(Html.fromHtml(album.getTitle(), Html.FROM_HTML_MODE_COMPACT));
holder.textArtistName.setText(album.getArtistName()); holder.textArtistName.setText(Html.fromHtml(album.getArtistName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC) .from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -42,8 +43,8 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter<AlbumA
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Album album = albums.get(position); Album album = albums.get(position);
holder.textAlbumName.setText(album.getTitle()); holder.textAlbumName.setText(Html.fromHtml(album.getTitle(), Html.FROM_HTML_MODE_COMPACT));
holder.textArtistName.setText(album.getArtistName()); holder.textArtistName.setText(Html.fromHtml(album.getArtistName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC) .from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -80,8 +81,8 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Album album = albums.get(position); Album album = albums.get(position);
holder.textAlbumName.setText(album.getTitle()); holder.textAlbumName.setText(Html.fromHtml(album.getTitle(), Html.FROM_HTML_MODE_COMPACT));
holder.textArtistName.setText(album.getArtistName()); holder.textArtistName.setText(Html.fromHtml(album.getArtistName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC) .from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -53,8 +54,8 @@ public class AlbumHorizontalAdapter extends RecyclerView.Adapter<AlbumHorizontal
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Album album = albums.get(position); Album album = albums.get(position);
holder.albumTitle.setText(album.getTitle()); holder.albumTitle.setText(Html.fromHtml(album.getTitle(), Html.FROM_HTML_MODE_COMPACT));
holder.albumArtist.setText(album.getArtistName()); holder.albumArtist.setText(Html.fromHtml(album.getArtistName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC) .from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -43,7 +44,7 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Artist artist = artists.get(position); Artist artist = artists.get(position);
holder.textArtistName.setText(artist.getName()); holder.textArtistName.setText(Html.fromHtml(artist.getName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, artist.getPrimary(), artist.getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC) .from(context, artist.getPrimary(), artist.getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC)

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -80,7 +81,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Artist artist = artists.get(position); Artist artist = artists.get(position);
holder.textArtistName.setText(artist.getName()); holder.textArtistName.setText(Html.fromHtml(artist.getName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, artist.getPrimary(), artist.getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC) .from(context, artist.getPrimary(), artist.getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC)

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -53,7 +54,7 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Artist artist = artists.get(position); Artist artist = artists.get(position);
holder.artistName.setText(artist.getName()); holder.artistName.setText(Html.fromHtml(artist.getName(), Html.FROM_HTML_MODE_COMPACT));
holder.artistInfo.setText("Album count: " + String.valueOf(artist.getAlbumCount())); holder.artistInfo.setText("Album count: " + String.valueOf(artist.getAlbumCount()));
CustomGlideRequest.Builder CustomGlideRequest.Builder

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -43,7 +44,7 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Artist artist = artists.get(position); Artist artist = artists.get(position);
holder.textArtistName.setText(artist.getName()); holder.textArtistName.setText(Html.fromHtml(artist.getName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, artist.getPrimary(), artist.getPrimaryBlurHash(), CustomGlideRequest.ALBUM_PIC) .from(context, artist.getPrimary(), artist.getPrimaryBlurHash(), CustomGlideRequest.ALBUM_PIC)

View file

@ -1,6 +1,7 @@
package com.cappielloantonio.play.adapter; package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.text.Html;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -50,8 +51,8 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Song song = songs.get(position); Song song = songs.get(position);
holder.textTitle.setText(song.getTitle()); holder.textTitle.setText(Html.fromHtml(song.getTitle(), Html.FROM_HTML_MODE_COMPACT));
holder.textAlbum.setText(song.getAlbumName()); holder.textAlbum.setText(Html.fromHtml(song.getAlbumName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC) .from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)

View file

@ -1,6 +1,7 @@
package com.cappielloantonio.play.adapter; package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -38,7 +39,7 @@ public class GenreAdapter extends RecyclerView.Adapter<GenreAdapter.ViewHolder>
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Genre genre = genres.get(position); Genre genre = genres.get(position);
holder.textGenre.setText(genre.getName()); holder.textGenre.setText(Html.fromHtml(genre.getName(), Html.FROM_HTML_MODE_COMPACT));
} }
@Override @Override

View file

@ -1,6 +1,7 @@
package com.cappielloantonio.play.adapter; package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -75,7 +76,7 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Genre genre = genres.get(position); Genre genre = genres.get(position);
holder.textGenre.setText(genre.getName()); holder.textGenre.setText(Html.fromHtml(genre.getName(), Html.FROM_HTML_MODE_COMPACT));
} }
@Override @Override

View file

@ -1,6 +1,7 @@
package com.cappielloantonio.play.adapter; package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -48,8 +49,8 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Song song = songs.get(position); Song song = songs.get(position);
holder.songTitle.setText(song.getTitle()); holder.songTitle.setText(Html.fromHtml(song.getTitle(), Html.FROM_HTML_MODE_COMPACT));
holder.songArtist.setText(song.getArtistName()); holder.songArtist.setText(Html.fromHtml(song.getArtistName(), Html.FROM_HTML_MODE_COMPACT));
holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false)); holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
CustomGlideRequest.Builder CustomGlideRequest.Builder

View file

@ -3,6 +3,7 @@ package com.cappielloantonio.play.adapter;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -46,7 +47,7 @@ public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHo
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Playlist playlist = playlists.get(position); Playlist playlist = playlists.get(position);
holder.textPlaylistName.setText(playlist.getName()); holder.textPlaylistName.setText(Html.fromHtml(playlist.getName(), Html.FROM_HTML_MODE_COMPACT));
holder.textPlaylistSongCount.setText("Song count: " + String.valueOf(playlist.getSongCount())); holder.textPlaylistSongCount.setText("Song count: " + String.valueOf(playlist.getSongCount()));
CustomGlideRequest.Builder CustomGlideRequest.Builder

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -78,7 +79,7 @@ public class PlaylistCatalogueAdapter extends RecyclerView.Adapter<PlaylistCatal
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Playlist playlist = playlists.get(position); Playlist playlist = playlists.get(position);
holder.textPlaylistName.setText(playlist.getName()); holder.textPlaylistName.setText(Html.fromHtml(playlist.getName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, playlist.getPrimary(), playlist.getBlurHash(), CustomGlideRequest.PLAYLIST_PIC) .from(context, playlist.getPrimary(), playlist.getBlurHash(), CustomGlideRequest.PLAYLIST_PIC)

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -54,8 +55,8 @@ public class RecentMusicAdapter extends RecyclerView.Adapter<RecentMusicAdapter.
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Song song = songs.get(position); Song song = songs.get(position);
holder.textTitle.setText(song.getTitle()); holder.textTitle.setText(Html.fromHtml(song.getTitle(), Html.FROM_HTML_MODE_COMPACT));
holder.textAlbum.setText(song.getAlbumName()); holder.textAlbum.setText(Html.fromHtml(song.getAlbumName(), Html.FROM_HTML_MODE_COMPACT));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC) .from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)

View file

@ -2,6 +2,7 @@ package com.cappielloantonio.play.adapter;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -26,6 +27,7 @@ import java.util.List;
public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAdapter.ViewHolder> { public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAdapter.ViewHolder> {
private static final String TAG = "SongHorizontalAdapter"; private static final String TAG = "SongHorizontalAdapter";
private List<Song> songs; private List<Song> songs;
private LayoutInflater mInflater; private LayoutInflater mInflater;
private MainActivity mainActivity; private MainActivity mainActivity;
@ -50,8 +52,8 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Song song = songs.get(position); Song song = songs.get(position);
holder.songTitle.setText(song.getTitle()); holder.songTitle.setText(Html.fromHtml(song.getTitle(), Html.FROM_HTML_MODE_COMPACT));
holder.songArtist.setText(song.getArtistName()); holder.songArtist.setText(Html.fromHtml(song.getArtistName(), Html.FROM_HTML_MODE_COMPACT));
holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false)); holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
if (song.isOffline()) { if (song.isOffline()) {

View file

@ -172,7 +172,7 @@ public class SongRepository {
} }
public MutableLiveData<List<Song>> getSongsByGenre(String id) { public MutableLiveData<List<Song>> getSongsByGenre(String id) {
MutableLiveData<List<Song>> songsByGenre = new MutableLiveData<>(); MutableLiveData<List<Song>> songsByGenre = new MutableLiveData<>(new ArrayList<>());
App.getSubsonicClientInstance(application, false) App.getSubsonicClientInstance(application, false)
.getAlbumSongListClient() .getAlbumSongListClient()
@ -204,7 +204,7 @@ public class SongRepository {
} }
public MutableLiveData<List<Song>> getSongsByGenres(ArrayList<String> genresId) { public MutableLiveData<List<Song>> getSongsByGenres(ArrayList<String> genresId) {
MutableLiveData<List<Song>> songsByGenre = new MutableLiveData<>(); MutableLiveData<List<Song>> songsByGenre = new MutableLiveData<>(new ArrayList<>());
for(String id: genresId) for(String id: genresId)