diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java index 9c9c9e6f..ae68c446 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java @@ -15,7 +15,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Album; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java index 7ada081c..23b46996 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java @@ -15,7 +15,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Album; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java index 09927456..738b6980 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java @@ -19,7 +19,6 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java index 3cd323d4..8f7ecd90 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java @@ -13,15 +13,10 @@ import androidx.fragment.app.FragmentManager; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Album; -import com.cappielloantonio.play.model.Song; -import com.cappielloantonio.play.repository.QueueRepository; -import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.MusicUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java index 7ed41f42..e21c8290 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java @@ -15,7 +15,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Artist; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java index 65eaf2e2..c5e8f859 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java @@ -19,7 +19,6 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java index d6855ac2..a5d3969c 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java @@ -13,15 +13,10 @@ import androidx.fragment.app.FragmentManager; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Artist; -import com.cappielloantonio.play.model.Song; -import com.cappielloantonio.play.repository.QueueRepository; -import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.MusicUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java index e158b709..8b842936 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java @@ -14,9 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; -import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.model.Artist; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java index f6397e18..6be4387b 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java @@ -20,8 +20,6 @@ import com.cappielloantonio.play.repository.QueueRepository; import com.cappielloantonio.play.repository.SongRepository; import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; -import com.cappielloantonio.play.util.SyncUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java index eb8523cf..1a3e2124 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java @@ -12,7 +12,6 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.service.MusicPlayerRemote; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java index 9be7d0e3..e54ee50a 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java @@ -16,7 +16,6 @@ import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.fragment.PlayerBottomSheetFragment; import com.cappielloantonio.play.util.MusicUtil; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java index 3e0ce89a..a6a23e72 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java @@ -1,6 +1,5 @@ package com.cappielloantonio.play.adapter; -import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; import android.text.Html; @@ -17,7 +16,6 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Playlist; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java index 159ac2b8..39a7bc2f 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java @@ -19,7 +19,6 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Playlist; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java index cb2d68af..8a985159 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java @@ -20,7 +20,6 @@ import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.repository.QueueRepository; import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java index 4e2f4506..1328525e 100644 --- a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java +++ b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java @@ -12,7 +12,6 @@ import com.cappielloantonio.play.database.dao.RecentSearchDao; import com.cappielloantonio.play.model.Download; import com.cappielloantonio.play.model.Queue; import com.cappielloantonio.play.model.RecentSearch; -import com.cappielloantonio.play.model.Song; @Database(entities = {Queue.class, RecentSearch.class, Download.class}, version = 5, exportSchema = false) public abstract class AppDatabase extends RoomDatabase { diff --git a/app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java b/app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java index a9fba21c..7f2986f7 100644 --- a/app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java +++ b/app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java @@ -7,7 +7,6 @@ import androidx.room.OnConflictStrategy; import androidx.room.Query; import com.cappielloantonio.play.model.Queue; -import com.cappielloantonio.play.model.Song; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java index b4e13c05..54b612dc 100644 --- a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java +++ b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java @@ -4,7 +4,6 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.util.Log; import androidx.core.content.res.ResourcesCompat; diff --git a/app/src/main/java/com/cappielloantonio/play/interfaces/SystemCallback.java b/app/src/main/java/com/cappielloantonio/play/interfaces/SystemCallback.java index 5e4bb7b6..186038bc 100644 --- a/app/src/main/java/com/cappielloantonio/play/interfaces/SystemCallback.java +++ b/app/src/main/java/com/cappielloantonio/play/interfaces/SystemCallback.java @@ -1,7 +1,5 @@ package com.cappielloantonio.play.interfaces; -import java.util.List; - public interface SystemCallback { void onError(Exception exception); diff --git a/app/src/main/java/com/cappielloantonio/play/model/Album.java b/app/src/main/java/com/cappielloantonio/play/model/Album.java index 49f7f1c9..77a1735f 100644 --- a/app/src/main/java/com/cappielloantonio/play/model/Album.java +++ b/app/src/main/java/com/cappielloantonio/play/model/Album.java @@ -4,10 +4,6 @@ import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.NonNull; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.PrimaryKey; import com.cappielloantonio.play.subsonic.models.AlbumID3; import com.cappielloantonio.play.subsonic.models.AlbumWithSongsID3; diff --git a/app/src/main/java/com/cappielloantonio/play/model/Genre.java b/app/src/main/java/com/cappielloantonio/play/model/Genre.java index 02d5437a..da1f0d84 100644 --- a/app/src/main/java/com/cappielloantonio/play/model/Genre.java +++ b/app/src/main/java/com/cappielloantonio/play/model/Genre.java @@ -4,9 +4,6 @@ import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.NonNull; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.PrimaryKey; public class Genre implements Parcelable { public String id; diff --git a/app/src/main/java/com/cappielloantonio/play/model/Playlist.java b/app/src/main/java/com/cappielloantonio/play/model/Playlist.java index f050cc72..4124950e 100644 --- a/app/src/main/java/com/cappielloantonio/play/model/Playlist.java +++ b/app/src/main/java/com/cappielloantonio/play/model/Playlist.java @@ -3,11 +3,6 @@ package com.cappielloantonio.play.model; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.NonNull; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.PrimaryKey; - public class Playlist implements Parcelable { public String id; public String name; diff --git a/app/src/main/java/com/cappielloantonio/play/model/Song.java b/app/src/main/java/com/cappielloantonio/play/model/Song.java index fb78e34c..0462a0ab 100644 --- a/app/src/main/java/com/cappielloantonio/play/model/Song.java +++ b/app/src/main/java/com/cappielloantonio/play/model/Song.java @@ -4,12 +4,6 @@ import android.annotation.SuppressLint; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.NonNull; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.PrimaryKey; - import com.cappielloantonio.play.subsonic.models.Child; import java.time.Instant; diff --git a/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java index 158482d3..c94a8a06 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java @@ -8,7 +8,6 @@ import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.App; import com.cappielloantonio.play.interfaces.MediaCallback; import com.cappielloantonio.play.model.Album; -import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.subsonic.models.ResponseStatus; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; diff --git a/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java index 421d5e88..14f087ec 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java @@ -260,7 +260,7 @@ public class ArtistRepository { if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) { List albums = new ArrayList<>(MappingUtil.mapAlbum(response.body().getArtist().getAlbums())); - if(albums.size() > 0) { + if (albums.size() > 0) { AlbumRepository albumRepository = new AlbumRepository(App.getInstance()); for (int index = 0; index < albums.size(); index++) { diff --git a/app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java index 57f7d92e..1c64e5e9 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java @@ -7,12 +7,7 @@ import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.database.AppDatabase; import com.cappielloantonio.play.database.dao.DownloadDao; -import com.cappielloantonio.play.database.dao.QueueDao; import com.cappielloantonio.play.model.Download; -import com.cappielloantonio.play.model.Queue; -import com.cappielloantonio.play.model.Song; -import com.cappielloantonio.play.util.MappingUtil; -import com.cappielloantonio.play.util.QueueUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java index 58eb029b..02520aa3 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java @@ -39,14 +39,13 @@ public class GenreRepository { if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) { List genreList = new ArrayList<>(MappingUtil.mapGenre(response.body().getGenres().getGenres())); - if(random) { + if (random) { Collections.shuffle(genreList); } - if(size != -1) { + if (size != -1) { genres.setValue(genreList.subList(0, Math.min(size, genreList.size()))); - } - else { + } else { genres.setValue(genreList); } } diff --git a/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java index 59dfe726..8ed566cb 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java @@ -5,7 +5,6 @@ import android.app.Application; import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.App; -import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.model.Playlist; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.subsonic.models.ResponseStatus; diff --git a/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java index 7015c27b..87849e97 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java @@ -206,25 +206,25 @@ public class SongRepository { public MutableLiveData> getSongsByGenres(ArrayList genresId) { MutableLiveData> songsByGenre = new MutableLiveData<>(new ArrayList<>()); - for(String id: genresId) + for (String id : genresId) - App.getSubsonicClientInstance(application, false) - .getAlbumSongListClient() - .getSongsByGenre(id, 500, 0) - .enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) { - List songs = new ArrayList<>(MappingUtil.mapSong(response.body().getSongsByGenre().getSongs())); - songsByGenre.setValue(songs); + App.getSubsonicClientInstance(application, false) + .getAlbumSongListClient() + .getSongsByGenre(id, 500, 0) + .enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) { + List songs = new ArrayList<>(MappingUtil.mapSong(response.body().getSongsByGenre().getSongs())); + songsByGenre.setValue(songs); + } } - } - @Override - public void onFailure(Call call, Throwable t) { + @Override + public void onFailure(Call call, Throwable t) { - } - }); + } + }); return songsByGenre; } diff --git a/app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java index e2362777..8bcb9869 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java @@ -4,7 +4,6 @@ import android.app.Application; import com.cappielloantonio.play.App; import com.cappielloantonio.play.interfaces.SystemCallback; -import com.cappielloantonio.play.subsonic.api.system.SystemClient; import com.cappielloantonio.play.subsonic.models.ResponseStatus; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; diff --git a/app/src/main/java/com/cappielloantonio/play/service/DownloadTracker.java b/app/src/main/java/com/cappielloantonio/play/service/DownloadTracker.java index 4842bfb8..f500ddf4 100644 --- a/app/src/main/java/com/cappielloantonio/play/service/DownloadTracker.java +++ b/app/src/main/java/com/cappielloantonio/play/service/DownloadTracker.java @@ -9,7 +9,6 @@ import androidx.annotation.Nullable; import com.cappielloantonio.play.App; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.repository.DownloadRepository; -import com.cappielloantonio.play.repository.SongRepository; import com.cappielloantonio.play.util.MappingUtil; import com.cappielloantonio.play.util.MusicUtil; import com.google.android.exoplayer2.MediaItem; diff --git a/app/src/main/java/com/cappielloantonio/play/service/MusicService.java b/app/src/main/java/com/cappielloantonio/play/service/MusicService.java index 3c5fadf0..265723ec 100644 --- a/app/src/main/java/com/cappielloantonio/play/service/MusicService.java +++ b/app/src/main/java/com/cappielloantonio/play/service/MusicService.java @@ -37,15 +37,11 @@ import com.cappielloantonio.play.repository.SongRepository; import com.cappielloantonio.play.ui.notification.PlayingNotification; import com.cappielloantonio.play.util.PreferenceUtil; - import java.lang.ref.WeakReference; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; import static com.google.android.exoplayer2.Player.MEDIA_ITEM_TRANSITION_REASON_AUTO; import static com.google.android.exoplayer2.Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED; @@ -799,7 +795,8 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks public void handleMessage(@NonNull final Message msg) { switch (msg.what) { case TRACK_STARTED: - case TRACK_CHANGED: break; + case TRACK_CHANGED: + break; case TRACK_ENDED: } } diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java b/app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java index 64e47b89..0df334b3 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java @@ -8,7 +8,6 @@ import com.cappielloantonio.play.subsonic.api.playlist.PlaylistClient; import com.cappielloantonio.play.subsonic.api.searching.SearchingClient; import com.cappielloantonio.play.subsonic.api.system.SystemClient; import com.cappielloantonio.play.subsonic.base.Version; -import com.cappielloantonio.play.subsonic.models.Playlist; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java b/app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java index 12daa574..f1922595 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java @@ -39,8 +39,9 @@ public class SubsonicPreferences { } public void setAuthentication(String password, String token, String salt) { - if(password != null) this.authentication = new SubsonicAuthentication(password); - if(token != null && salt != null) this.authentication = new SubsonicAuthentication(token, salt); + if (password != null) this.authentication = new SubsonicAuthentication(password); + if (token != null && salt != null) + this.authentication = new SubsonicAuthentication(token, salt); } public static class SubsonicAuthentication { diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java index 7a0ccd57..61db7b05 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java @@ -4,7 +4,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; -import com.tickaroo.tikxml.TikXml; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java index fcdad6bb..5ca7ee4d 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java @@ -4,7 +4,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; -import com.tickaroo.tikxml.TikXml; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java index ae883ff9..8ea9dbc5 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java @@ -4,7 +4,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; -import com.tickaroo.tikxml.TikXml; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java index 211f1b7e..0d24f97f 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java @@ -4,7 +4,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; -import com.tickaroo.tikxml.TikXml; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java index 7e560571..26f6df15 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java @@ -4,7 +4,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; -import com.tickaroo.tikxml.TikXml; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java index e196e023..11695ac1 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java @@ -4,7 +4,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; -import com.tickaroo.tikxml.TikXml; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java index dca32f03..f173b26e 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java @@ -4,7 +4,6 @@ import android.util.Log; import com.cappielloantonio.play.subsonic.Subsonic; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; -import com.tickaroo.tikxml.TikXml; import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/base/SubsonicIncompatibilityException.java b/app/src/main/java/com/cappielloantonio/play/subsonic/base/SubsonicIncompatibilityException.java index 8fd35e9d..4073a31a 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/base/SubsonicIncompatibilityException.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/base/SubsonicIncompatibilityException.java @@ -1,6 +1,6 @@ package com.cappielloantonio.play.subsonic.base; -public class SubsonicIncompatibilityException extends RuntimeException{ +public class SubsonicIncompatibilityException extends RuntimeException { private final Version serverApiVersion; private final Version minClientApiVersion; diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java index d6dbff03..0c671dd8 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java @@ -4,7 +4,6 @@ import com.tickaroo.tikxml.annotation.Attribute; import com.tickaroo.tikxml.annotation.Xml; import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter; -import java.time.LocalDateTime; import java.util.Date; @Xml(name = "album") diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.java index dc8158d2..8a679c8a 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.java @@ -10,7 +10,7 @@ import java.util.List; public class AlbumWithSongsID3 extends AlbumID3 { @Element(name = "song") protected List songs; - + public List getSongs() { if (songs == null) { songs = new ArrayList<>(); diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java index cc1bfe8e..17ccdb43 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java @@ -4,7 +4,6 @@ import com.tickaroo.tikxml.annotation.Attribute; import com.tickaroo.tikxml.annotation.Xml; import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter; -import java.time.LocalDateTime; import java.util.Date; @Xml(name = "artist") @@ -19,19 +18,19 @@ public class ArtistID3 { protected int albumCount; @Attribute(converter = DateRfc3339TypeConverter.class) protected Date starred; - + public String getId() { return id; } - + public void setId(String value) { this.id = value; } - + public String getName() { return name; } - + public void setName(String value) { this.name = value; } @@ -39,7 +38,7 @@ public class ArtistID3 { public String getCoverArtId() { return coverArtId; } - + public void setCoverArtId(String value) { this.coverArtId = value; } diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.java index 121364d6..af98f030 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.java @@ -57,7 +57,7 @@ public class ArtistInfoBase { public void setMediumImageUrl(String value) { this.mediumImageUrl = value; } - + public String getLargeImageUrl() { return largeImageUrl; } diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.java index fdaed933..e64389d5 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.java @@ -9,7 +9,7 @@ public class MusicFolder { protected int id; @Attribute protected String name; - + public int getId() { return id; } @@ -17,11 +17,11 @@ public class MusicFolder { public void setId(int value) { this.id = value; } - + public String getName() { return name; } - + public void setName(String value) { this.name = value; } diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.java index 643e2d69..99f9b930 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.java @@ -1,11 +1,9 @@ package com.cappielloantonio.play.subsonic.models; import com.tickaroo.tikxml.annotation.Attribute; -import com.tickaroo.tikxml.annotation.Element; import com.tickaroo.tikxml.annotation.Xml; import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -33,7 +31,7 @@ public class Playlist { protected Date changed; @Attribute protected String coverArtId; - + public List getAllowedUsers() { if (allowedUsers == null) { allowedUsers = new ArrayList<>(); @@ -48,7 +46,7 @@ public class Playlist { public String getId() { return id; } - + public void setId(String value) { this.id = value; } @@ -56,7 +54,7 @@ public class Playlist { public String getName() { return name; } - + public void setName(String value) { this.name = value; } @@ -72,7 +70,7 @@ public class Playlist { public String getOwner() { return owner; } - + public void setOwner(String value) { this.owner = value; } @@ -88,19 +86,19 @@ public class Playlist { public int getSongCount() { return songCount; } - + public void setSongCount(int value) { this.songCount = value; } - + public int getDuration() { return duration; } - + public void setDuration(int value) { this.duration = value; } - + public Date getCreated() { return created; } @@ -108,7 +106,7 @@ public class Playlist { public void setCreated(Date value) { this.created = value; } - + public Date getChanged() { return changed; } diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.java index 55fd8c3c..cd7bece4 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.java @@ -14,21 +14,21 @@ public class SearchResult2 { protected List albums; @Element(name = "song") protected List songs; - + public List getArtists() { if (artists == null) { artists = new ArrayList<>(); } return this.artists; } - + public List getAlbums() { if (albums == null) { albums = new ArrayList<>(); } return this.albums; } - + public List getSongs() { if (songs == null) { songs = new ArrayList<>(); diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.java index e099f80d..7cf435e4 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.java +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.java @@ -14,14 +14,14 @@ public class SearchResult3 { protected List albums; @Element(name = "song") protected List songs; - + public List getArtists() { if (artists == null) { artists = new ArrayList<>(); } return this.artists; } - + public List getAlbums() { if (albums == null) { albums = new ArrayList<>(); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java index 68f1a051..689b00a4 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java @@ -3,7 +3,6 @@ package com.cappielloantonio.play.ui.fragment; import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java index e68b7aac..9b3656ff 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java @@ -10,20 +10,11 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.adapter.AlbumHorizontalAdapter; -import com.cappielloantonio.play.adapter.SongHorizontalAdapter; import com.cappielloantonio.play.databinding.FragmentAlbumListPageBinding; -import com.cappielloantonio.play.databinding.FragmentSongListPageBinding; import com.cappielloantonio.play.model.Album; -import com.cappielloantonio.play.model.Song; -import com.cappielloantonio.play.repository.QueueRepository; -import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.viewmodel.AlbumListPageViewModel; -import com.cappielloantonio.play.viewmodel.SongListPageViewModel; - -import java.util.Collections; public class AlbumListPageFragment extends Fragment { private FragmentAlbumListPageBinding bind; @@ -61,19 +52,16 @@ public class AlbumListPageFragment extends Fragment { } private void init() { - if(getArguments().getString(Album.RECENTLY_PLAYED) != null) { + if (getArguments().getString(Album.RECENTLY_PLAYED) != null) { albumListPageViewModel.title = Album.RECENTLY_PLAYED; bind.pageTitleLabel.setText("Recently played albums"); - } - else if(getArguments().getString(Album.MOST_PLAYED) != null) { + } else if (getArguments().getString(Album.MOST_PLAYED) != null) { albumListPageViewModel.title = Album.MOST_PLAYED; bind.pageTitleLabel.setText("Most played albums"); - } - else if(getArguments().getString(Album.RECENTLY_ADDED) != null) { + } else if (getArguments().getString(Album.RECENTLY_ADDED) != null) { albumListPageViewModel.title = Album.RECENTLY_ADDED; bind.pageTitleLabel.setText("Recently added albums"); - } - else if(getArguments().getString(Album.STARRED) != null) { + } else if (getArguments().getString(Album.STARRED) != null) { albumListPageViewModel.title = Album.STARRED; bind.pageTitleLabel.setText("Starred albums"); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java index 9bec2b2a..a60989ab 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java @@ -21,21 +21,13 @@ import com.cappielloantonio.play.adapter.AlbumArtistPageOrSimilarAdapter; import com.cappielloantonio.play.adapter.SongHorizontalAdapter; import com.cappielloantonio.play.databinding.FragmentAlbumPageBinding; import com.cappielloantonio.play.glide.CustomGlideRequest; -import com.cappielloantonio.play.interfaces.MediaCallback; -import com.cappielloantonio.play.model.Album; -import com.cappielloantonio.play.model.Artist; -import com.cappielloantonio.play.model.Song; -import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.repository.QueueRepository; +import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.util.DownloadUtil; -import com.cappielloantonio.play.util.PreferenceUtil; -import com.cappielloantonio.play.util.SyncUtil; import com.cappielloantonio.play.viewmodel.AlbumPageViewModel; -import java.util.ArrayList; import java.util.Collections; -import java.util.List; public class AlbumPageFragment extends Fragment { private static final String TAG = "AlbumPageFragment"; @@ -133,12 +125,12 @@ public class AlbumPageFragment extends Fragment { private void initAlbumInfoTextButton() { bind.albumArtistLabel.setOnClickListener(v -> { albumPageViewModel.getArtist().observe(requireActivity(), artist -> { - if(artist != null) { + if (artist != null) { Bundle bundle = new Bundle(); bundle.putParcelable("artist_object", artist); activity.navController.navigate(R.id.action_albumPageFragment_to_artistPageFragment, bundle); - } - else Toast.makeText(requireContext(), "Error retrieving artist", Toast.LENGTH_SHORT).show(); + } else + Toast.makeText(requireContext(), "Error retrieving artist", Toast.LENGTH_SHORT).show(); }); }); @@ -152,7 +144,7 @@ public class AlbumPageFragment extends Fragment { private void initMusicButton() { albumPageViewModel.getAlbumSongLiveList().observe(requireActivity(), songs -> { - if(bind != null) { + if (bind != null) { bind.albumPagePlayButton.setOnClickListener(v -> { QueueRepository queueRepository = new QueueRepository(App.getInstance()); queueRepository.insertAllAndStartNew(songs); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java index ffbfcff7..cab7fc2d 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java @@ -26,7 +26,6 @@ import com.cappielloantonio.play.adapter.ArtistCatalogueAdapter; import com.cappielloantonio.play.databinding.FragmentArtistCatalogueBinding; import com.cappielloantonio.play.helper.recyclerview.GridItemDecoration; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.viewmodel.AlbumCatalogueViewModel; import com.cappielloantonio.play.viewmodel.ArtistCatalogueViewModel; public class ArtistCatalogueFragment extends Fragment { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java index 084281a4..ca6d7271 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java @@ -10,13 +10,10 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.cappielloantonio.play.adapter.AlbumHorizontalAdapter; import com.cappielloantonio.play.adapter.ArtistHorizontalAdapter; -import com.cappielloantonio.play.databinding.FragmentAlbumListPageBinding; import com.cappielloantonio.play.databinding.FragmentArtistListPageBinding; import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.viewmodel.AlbumListPageViewModel; import com.cappielloantonio.play.viewmodel.ArtistListPageViewModel; public class ArtistListPageFragment extends Fragment { @@ -55,7 +52,7 @@ public class ArtistListPageFragment extends Fragment { } private void init() { - if(getArguments().getString(Album.STARRED) != null) { + if (getArguments().getString(Album.STARRED) != null) { artistListPageViewModel.title = Album.STARRED; bind.pageTitleLabel.setText("Starred artists"); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java index 4ab654aa..13b27df0 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java @@ -3,7 +3,6 @@ package com.cappielloantonio.play.ui.fragment; import android.annotation.SuppressLint; import android.graphics.BlendMode; import android.graphics.BlendModeColorFilter; -import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; @@ -12,7 +11,6 @@ import android.view.ViewGroup; import android.widget.Toast; import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -20,21 +18,17 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; -import com.cappielloantonio.play.adapter.AlbumAdapter; import com.cappielloantonio.play.adapter.AlbumArtistPageOrSimilarAdapter; import com.cappielloantonio.play.adapter.ArtistSimilarAdapter; import com.cappielloantonio.play.adapter.SongHorizontalAdapter; import com.cappielloantonio.play.databinding.FragmentArtistPageBinding; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.interfaces.MediaCallback; -import com.cappielloantonio.play.model.Artist; -import com.cappielloantonio.play.repository.ArtistRepository; -import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.model.Song; +import com.cappielloantonio.play.repository.ArtistRepository; import com.cappielloantonio.play.repository.QueueRepository; +import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; -import com.cappielloantonio.play.util.SyncUtil; import com.cappielloantonio.play.viewmodel.ArtistPageViewModel; import java.util.ArrayList; @@ -191,7 +185,8 @@ public class ArtistPageFragment extends Fragment { artistSimilarAdapter = new ArtistSimilarAdapter(requireContext()); bind.similarArtistsRecyclerView.setAdapter(artistSimilarAdapter); artistPageViewModel.getArtistInfo(artistPageViewModel.getArtist().getId()).observe(requireActivity(), artist -> { - if(bind != null) bind.similarArtistSector.setVisibility(!artist.getSimilarArtists().isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.similarArtistSector.setVisibility(!artist.getSimilarArtists().isEmpty() ? View.VISIBLE : View.GONE); artistSimilarAdapter.setItems(artist.getSimilarArtists()); }); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java index 47fcbe1b..5fc38e2a 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java @@ -60,8 +60,10 @@ public class FilterFragment extends Fragment { bundle.putStringArrayList("filters_list", filterViewModel.getFilters()); bundle.putStringArrayList("filter_name_list", filterViewModel.getFilterNames()); bind.finishFilteringTextViewClickable.setOnClickListener(v -> { - if(filterViewModel.getFilters().size() > 1) activity.navController.navigate(R.id.action_filterFragment_to_songListPageFragment, bundle); - else Toast.makeText(requireContext(), "Select two or more filters", Toast.LENGTH_SHORT).show(); + if (filterViewModel.getFilters().size() > 1) + activity.navController.navigate(R.id.action_filterFragment_to_songListPageFragment, bundle); + else + Toast.makeText(requireContext(), "Select two or more filters", Toast.LENGTH_SHORT).show(); }); } @@ -96,8 +98,10 @@ public class FilterFragment extends Fragment { chip.setText(genre.getName()); chip.setChecked(filterViewModel.getFilters().contains(genre.getId())); chip.setOnCheckedChangeListener((buttonView, isChecked) -> { - if(isChecked) filterViewModel.addFilter(genre.getId(), buttonView.getText().toString()); - else filterViewModel.removeFilter(genre.getId(), buttonView.getText().toString()); + if (isChecked) + filterViewModel.addFilter(genre.getId(), buttonView.getText().toString()); + else + filterViewModel.removeFilter(genre.getId(), buttonView.getText().toString()); }); bind.filtersChipsGroup.addView(chip); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java index 34556b78..5f418b33 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java @@ -30,7 +30,8 @@ import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.viewmodel.GenreCatalogueViewModel; public class GenreCatalogueFragment extends Fragment { - private static final String TAG = "GenreCatalogueFragment";; + private static final String TAG = "GenreCatalogueFragment"; + ; private FragmentGenreCatalogueBinding bind; private MainActivity activity; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java index c9a6b932..764e96fe 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java @@ -159,8 +159,9 @@ public class HomeFragment extends Fragment { mostPlayedAlbumAdapter = new AlbumAdapter(requireContext()); bind.mostPlayedAlbumsRecyclerView.setAdapter(mostPlayedAlbumAdapter); homeViewModel.getMostPlayedAlbums().observe(requireActivity(), albums -> { - if(albums.size() < 10) reorder(); - if(bind != null) bind.homeMostPlayedAlbumsSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); + if (albums.size() < 10) reorder(); + if (bind != null) + bind.homeMostPlayedAlbumsSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); mostPlayedAlbumAdapter.setItems(albums); }); } @@ -172,13 +173,15 @@ public class HomeFragment extends Fragment { recentlyPlayedAlbumAdapter = new AlbumAdapter(requireContext()); bind.recentlyPlayedAlbumsRecyclerView.setAdapter(recentlyPlayedAlbumAdapter); homeViewModel.getRecentlyPlayedAlbumList().observe(requireActivity(), albums -> { - if(bind != null) bind.homeRecentlyPlayedAlbumsSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.homeRecentlyPlayedAlbumsSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); recentlyPlayedAlbumAdapter.setItems(albums); }); } private void initYearSongView() { - if(bind != null) bind.homeFlashbackSector.setVisibility(!homeViewModel.getYearList().isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.homeFlashbackSector.setVisibility(!homeViewModel.getYearList().isEmpty() ? View.VISIBLE : View.GONE); bind.yearsRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)); bind.yearsRecyclerView.setHasFixedSize(true); @@ -199,7 +202,8 @@ public class HomeFragment extends Fragment { starredSongAdapter = new SongHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); bind.starredTracksRecyclerView.setAdapter(starredSongAdapter); homeViewModel.getStarredTracks().observe(requireActivity(), songs -> { - if(bind != null) bind.homeStarredTracksSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.homeStarredTracksSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE); bind.starredTracksRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), UIUtil.getSpanCount(songs.size(), 5), GridLayoutManager.HORIZONTAL, false)); starredSongAdapter.setItems(songs); }); @@ -214,7 +218,8 @@ public class HomeFragment extends Fragment { starredAlbumAdapter = new AlbumHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); bind.starredAlbumsRecyclerView.setAdapter(starredAlbumAdapter); homeViewModel.getStarredAlbums().observe(requireActivity(), albums -> { - if(bind != null) bind.homeStarredAlbumsSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.homeStarredAlbumsSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); bind.starredAlbumsRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), UIUtil.getSpanCount(albums.size(), 5), GridLayoutManager.HORIZONTAL, false)); starredAlbumAdapter.setItems(albums); }); @@ -229,7 +234,8 @@ public class HomeFragment extends Fragment { starredArtistAdapter = new ArtistHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); bind.starredArtistsRecyclerView.setAdapter(starredArtistAdapter); homeViewModel.getStarredArtists().observe(requireActivity(), artists -> { - if(bind != null) bind.homeStarredArtistsSector.setVisibility(!artists.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.homeStarredArtistsSector.setVisibility(!artists.isEmpty() ? View.VISIBLE : View.GONE); bind.starredArtistsRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), UIUtil.getSpanCount(artists.size(), 5), GridLayoutManager.HORIZONTAL, false)); starredArtistAdapter.setItems(artists); }); @@ -256,7 +262,8 @@ public class HomeFragment extends Fragment { dowanloadedMusicAdapter = new RecentMusicAdapter(activity, requireContext(), getChildFragmentManager()); bind.downloadedTracksRecyclerView.setAdapter(dowanloadedMusicAdapter); homeViewModel.getDownloaded().observe(requireActivity(), downloads -> { - if(bind != null) bind.homeDownloadedTracksSector.setVisibility(!downloads.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.homeDownloadedTracksSector.setVisibility(!downloads.isEmpty() ? View.VISIBLE : View.GONE); dowanloadedMusicAdapter.setItems(MappingUtil.mapDownload(downloads)); }); } @@ -284,7 +291,7 @@ public class HomeFragment extends Fragment { * - Discovery - Recently_added - Year - Favorite - Downloaded - Most_played - Last_played */ public void reorder() { - if(bind != null) { + if (bind != null) { bind.homeLinearLayoutContainer.removeAllViews(); bind.homeLinearLayoutContainer.addView(bind.homeDiscoverSector); bind.homeLinearLayoutContainer.addView(bind.homeRecentlyAddedAlbumsSector); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java index b4caadae..ac80c60d 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java @@ -7,7 +7,6 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -18,13 +17,11 @@ import androidx.viewpager2.widget.ViewPager2; import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.AlbumAdapter; import com.cappielloantonio.play.adapter.ArtistAdapter; -import com.cappielloantonio.play.adapter.DiscoverSongAdapter; import com.cappielloantonio.play.adapter.GenreAdapter; import com.cappielloantonio.play.adapter.PlaylistAdapter; import com.cappielloantonio.play.databinding.FragmentLibraryBinding; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; import com.cappielloantonio.play.viewmodel.LibraryViewModel; public class LibraryFragment extends Fragment { @@ -89,7 +86,8 @@ public class LibraryFragment extends Fragment { albumAdapter = new AlbumAdapter(requireContext()); bind.albumRecyclerView.setAdapter(albumAdapter); libraryViewModel.getAlbumSample().observe(requireActivity(), albums -> { - if(bind != null) bind.libraryAlbumSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.libraryAlbumSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); albumAdapter.setItems(albums); }); } @@ -101,7 +99,8 @@ public class LibraryFragment extends Fragment { artistAdapter = new ArtistAdapter(requireContext()); bind.artistRecyclerView.setAdapter(artistAdapter); libraryViewModel.getArtistSample().observe(requireActivity(), artists -> { - if(bind != null) bind.libraryArtistSector.setVisibility(!artists.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.libraryArtistSector.setVisibility(!artists.isEmpty() ? View.VISIBLE : View.GONE); artistAdapter.setItems(artists); }); } @@ -119,7 +118,8 @@ public class LibraryFragment extends Fragment { }); bind.genreRecyclerView.setAdapter(genreAdapter); libraryViewModel.getGenreSample().observe(requireActivity(), genres -> { - if(bind != null) bind.libraryGenresSector.setVisibility(!genres.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.libraryGenresSector.setVisibility(!genres.isEmpty() ? View.VISIBLE : View.GONE); genreAdapter.setItems(genres); }); } @@ -131,7 +131,8 @@ public class LibraryFragment extends Fragment { bind.playlistViewPager.setAdapter(playlistAdapter); bind.playlistViewPager.setOffscreenPageLimit(3); libraryViewModel.getPlaylistSample().observe(requireActivity(), playlists -> { - if(bind != null) bind.libraryPlaylistSector.setVisibility(!playlists.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.libraryPlaylistSector.setVisibility(!playlists.isEmpty() ? View.VISIBLE : View.GONE); playlistAdapter.setItems(playlists); }); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java index c1a3d157..30beef6d 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java @@ -22,10 +22,10 @@ import com.cappielloantonio.play.adapter.PlayerNowPlayingSongAdapter; import com.cappielloantonio.play.adapter.PlayerSongQueueAdapter; import com.cappielloantonio.play.databinding.FragmentPlayerBottomSheetBinding; import com.cappielloantonio.play.glide.CustomGlideRequest; -import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.helper.MusicProgressViewUpdateHelper; import com.cappielloantonio.play.interfaces.MusicServiceEventListener; import com.cappielloantonio.play.model.Song; +import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.util.MappingUtil; import com.cappielloantonio.play.util.MusicUtil; @@ -150,7 +150,8 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE @Override public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) { - if(originalPosition == -1) originalPosition = viewHolder.getBindingAdapterPosition(); + if (originalPosition == -1) + originalPosition = viewHolder.getBindingAdapterPosition(); fromPosition = viewHolder.getBindingAdapterPosition(); toPosition = target.getBindingAdapterPosition(); @@ -191,13 +192,12 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE @Override public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { - if(!(viewHolder.getBindingAdapterPosition() == MusicPlayerRemote.getPosition()) && !(MusicPlayerRemote.getPlayingQueue().size() <= 1)) { + if (!(viewHolder.getBindingAdapterPosition() == MusicPlayerRemote.getPosition()) && !(MusicPlayerRemote.getPlayingQueue().size() <= 1)) { MusicPlayerRemote.removeFromQueue(viewHolder.getBindingAdapterPosition()); playerBottomSheetViewModel.removeSong(viewHolder.getBindingAdapterPosition()); bind.playerBodyLayout.playerQueueRecyclerView.getAdapter().notifyItemRemoved(viewHolder.getBindingAdapterPosition()); bind.playerBodyLayout.playerSongCoverViewPager.setCurrentItem(MusicPlayerRemote.getPosition(), false); - } - else { + } else { bind.playerBodyLayout.playerQueueRecyclerView.getAdapter().notifyDataSetChanged(); } } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java index 99858335..85f71145 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java @@ -24,11 +24,11 @@ import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.PlaylistCatalogueAdapter; import com.cappielloantonio.play.databinding.FragmentPlaylistCatalogueBinding; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.viewmodel.ArtistCatalogueViewModel; import com.cappielloantonio.play.viewmodel.PlaylistCatalogueViewModel; public class PlaylistCatalogueFragment extends Fragment { - private static final String TAG = "GenreCatalogueFragment";; + private static final String TAG = "GenreCatalogueFragment"; + ; private FragmentPlaylistCatalogueBinding bind; private MainActivity activity; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java index 20cd48e2..b5ed4f18 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java @@ -121,7 +121,7 @@ public class PlaylistPageFragment extends Fragment { private void initMusicButton() { playlistPageViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> { - if(bind != null) { + if (bind != null) { bind.playlistPagePlayButton.setOnClickListener(v -> { QueueRepository queueRepository = new QueueRepository(App.getInstance()); queueRepository.insertAllAndStartNew(songs); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java index ed3b2f4a..f043cc9f 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java @@ -10,17 +10,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; -import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; -import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.AlbumAdapter; import com.cappielloantonio.play.adapter.ArtistAdapter; -import com.cappielloantonio.play.adapter.GenreCatalogueAdapter; import com.cappielloantonio.play.adapter.SongHorizontalAdapter; import com.cappielloantonio.play.databinding.FragmentSearchBinding; -import com.cappielloantonio.play.helper.recyclerview.GridItemDecoration; -import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.viewmodel.SearchViewModel; import com.paulrybitskyi.persistentsearchview.adapters.model.SuggestionItem; @@ -127,8 +122,7 @@ public class SearchFragment extends Fragment { if (isQueryValid(query)) { searchView.collapse(); search(query); - } - else { + } else { Toast.makeText(requireContext(), "Enter at least three characters", Toast.LENGTH_SHORT).show(); } }); @@ -161,15 +155,18 @@ public class SearchFragment extends Fragment { private void performSearch(String query) { searchViewModel.searchSong(query).observe(requireActivity(), songs -> { - if(bind != null) bind.searchSongSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.searchSongSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE); songHorizontalAdapter.setItems(songs); }); searchViewModel.searchAlbum(query).observe(requireActivity(), albums -> { - if(bind != null) bind.searchAlbumSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.searchAlbumSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE); albumAdapter.setItems(albums); }); searchViewModel.searchArtist(query).observe(requireActivity(), artists -> { - if(bind != null) bind.searchArtistSector.setVisibility(!artists.isEmpty() ? View.VISIBLE : View.GONE); + if (bind != null) + bind.searchArtistSector.setVisibility(!artists.isEmpty() ? View.VISIBLE : View.GONE); artistAdapter.setItems(artists); }); @@ -181,7 +178,7 @@ public class SearchFragment extends Fragment { } private void inputFocus() { - if(!isQueryValid(searchViewModel.getQuery())) { + if (!isQueryValid(searchViewModel.getQuery())) { bind.persistentSearchView.expand(); } } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java index 5a3cf34b..10039ca5 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java @@ -5,16 +5,12 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.appcompat.app.AlertDialog; import androidx.preference.ListPreference; -import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import com.cappielloantonio.play.R; import com.cappielloantonio.play.helper.ThemeHelper; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; -import com.cappielloantonio.play.util.SyncUtil; public class SettingsFragment extends PreferenceFragmentCompat { private static final String TAG = "SettingsFragment"; @@ -27,7 +23,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { View view = super.onCreateView(inflater, container, savedInstanceState); - if(view != null) { + if (view != null) { getListView().setPadding(0, 0, 0, (int) getResources().getDimension(R.dimen.global_padding_bottom)); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java index 95983099..bfdbeb31 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java @@ -58,44 +58,36 @@ public class SongListPageFragment extends Fragment { } private void init() { - if(getArguments().getString(Song.RECENTLY_PLAYED) != null) { + if (getArguments().getString(Song.RECENTLY_PLAYED) != null) { songListPageViewModel.title = Song.RECENTLY_PLAYED; bind.pageTitleLabel.setText("Recently played tracks"); - } - else if(getArguments().getString(Song.MOST_PLAYED) != null) { + } else if (getArguments().getString(Song.MOST_PLAYED) != null) { songListPageViewModel.title = Song.MOST_PLAYED; bind.pageTitleLabel.setText("Most played tracks"); - } - else if(getArguments().getString(Song.RECENTLY_ADDED) != null) { + } else if (getArguments().getString(Song.RECENTLY_ADDED) != null) { songListPageViewModel.title = Song.RECENTLY_ADDED; bind.pageTitleLabel.setText("Recently added tracks"); - } - else if(getArguments().getString(Song.BY_GENRE) != null) { + } else if (getArguments().getString(Song.BY_GENRE) != null) { songListPageViewModel.title = Song.BY_GENRE; songListPageViewModel.genre = getArguments().getParcelable("genre_object"); bind.pageTitleLabel.setText(songListPageViewModel.genre.getName() + ": all tracks"); - } - else if(getArguments().getString(Song.BY_ARTIST) != null) { + } else if (getArguments().getString(Song.BY_ARTIST) != null) { songListPageViewModel.title = Song.BY_ARTIST; songListPageViewModel.artist = getArguments().getParcelable("artist_object"); bind.pageTitleLabel.setText(songListPageViewModel.artist.getName() + "'s top tracks"); - } - else if(getArguments().getString(Song.BY_GENRES) != null) { + } else if (getArguments().getString(Song.BY_GENRES) != null) { songListPageViewModel.title = Song.BY_GENRES; songListPageViewModel.filters = getArguments().getStringArrayList("filters_list"); songListPageViewModel.filterNames = getArguments().getStringArrayList("filter_name_list"); bind.pageTitleLabel.setText(songListPageViewModel.getFiltersTitle()); - } - else if(getArguments().getString(Song.BY_YEAR) != null) { + } else if (getArguments().getString(Song.BY_YEAR) != null) { songListPageViewModel.title = Song.BY_YEAR; songListPageViewModel.year = getArguments().getInt("year_object"); bind.pageTitleLabel.setText("Year " + songListPageViewModel.year); - } - else if(getArguments().getString(Song.STARRED) != null) { + } else if (getArguments().getString(Song.STARRED) != null) { songListPageViewModel.title = Song.STARRED; bind.pageTitleLabel.setText("Starred tracks"); - } - else if(getArguments().getString(Song.DOWNLOADED) != null) { + } else if (getArguments().getString(Song.DOWNLOADED) != null) { songListPageViewModel.title = Song.DOWNLOADED; bind.pageTitleLabel.setText("Downloaded"); } @@ -124,7 +116,7 @@ public class SongListPageFragment extends Fragment { private void initButtons() { songListPageViewModel.getSongList().observe(requireActivity(), songs -> { - if(bind != null) { + if (bind != null) { bind.songListShuffleImageView.setOnClickListener(v -> { Collections.shuffle(songs); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SyncFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SyncFragment.java index f51cc391..012f94f3 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SyncFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SyncFragment.java @@ -4,19 +4,13 @@ import android.content.Context; import com.cappielloantonio.play.interfaces.MediaCallback; import com.cappielloantonio.play.model.Playlist; -import com.cappielloantonio.play.model.Song; -import com.cappielloantonio.play.subsonic.models.AlbumID3; -import com.cappielloantonio.play.subsonic.models.ArtistID3; -import com.cappielloantonio.play.subsonic.models.Genre; -import com.cappielloantonio.play.util.DownloadUtil; import com.cappielloantonio.play.util.SyncUtil; -import java.util.ArrayList; import java.util.List; public class SyncFragment { private Context context; - + private void syncLibraries() { SyncUtil.getLibraries(context, new MediaCallback() { @Override diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java index 888eddbf..b44c2206 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java @@ -22,7 +22,6 @@ import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.repository.AlbumRepository; import com.cappielloantonio.play.repository.QueueRepository; -import com.cappielloantonio.play.repository.SongRepository; import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.util.DownloadUtil; @@ -104,7 +103,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements @Override public void onLoadMedia(List media) { - if(media.size() > 0) { + if (media.size() > 0) { QueueRepository queueRepository = new QueueRepository(App.getInstance()); queueRepository.insertAllAndStartNew((ArrayList) media); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java b/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java index 8e723105..a8720c0f 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java @@ -22,7 +22,6 @@ import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.service.MusicService; import com.cappielloantonio.play.ui.activity.MainActivity; -import com.cappielloantonio.play.util.PreferenceUtil; import static android.content.Context.NOTIFICATION_SERVICE; import static com.cappielloantonio.play.service.MusicService.ACTION_REWIND; diff --git a/app/src/main/java/com/cappielloantonio/play/util/UIUtil.java b/app/src/main/java/com/cappielloantonio/play/util/UIUtil.java index 7eb50c62..53795890 100644 --- a/app/src/main/java/com/cappielloantonio/play/util/UIUtil.java +++ b/app/src/main/java/com/cappielloantonio/play/util/UIUtil.java @@ -6,8 +6,7 @@ public class UIUtil { if (itemSize / maxSpan > 0) { return maxSpan; - } - else { + } else { return itemSize % maxSpan; } } diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java index 80035f9c..860bf408 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java @@ -11,7 +11,6 @@ import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.App; import com.cappielloantonio.play.interfaces.MediaCallback; import com.cappielloantonio.play.model.Album; -import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.repository.AlbumRepository; import com.cappielloantonio.play.subsonic.models.AlbumID3; import com.cappielloantonio.play.subsonic.models.ResponseStatus; diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java index 6f90c074..1ebef2bb 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java @@ -1,7 +1,6 @@ package com.cappielloantonio.play.viewmodel; import android.app.Application; -import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.fragment.app.FragmentActivity; @@ -10,13 +9,8 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.model.Album; -import com.cappielloantonio.play.model.Artist; -import com.cappielloantonio.play.model.Genre; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.repository.AlbumRepository; -import com.cappielloantonio.play.repository.DownloadRepository; -import com.cappielloantonio.play.repository.SongRepository; -import com.cappielloantonio.play.util.MappingUtil; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java index 3fa7cf12..9080ccb2 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java @@ -7,7 +7,6 @@ import androidx.lifecycle.AndroidViewModel; import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.repository.AlbumRepository; -import com.cappielloantonio.play.repository.ArtistRepository; public class ArtistBottomSheetViewModel extends AndroidViewModel { private AlbumRepository albumRepository; diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java index d8a6703a..f202853c 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java @@ -9,11 +9,8 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.App; -import com.cappielloantonio.play.interfaces.MediaCallback; -import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.repository.ArtistRepository; -import com.cappielloantonio.play.subsonic.models.AlbumID3; import com.cappielloantonio.play.subsonic.models.ArtistID3; import com.cappielloantonio.play.subsonic.models.IndexID3; import com.cappielloantonio.play.subsonic.models.ResponseStatus; diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java index d44e8c63..0526d4b5 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java @@ -3,15 +3,12 @@ package com.cappielloantonio.play.viewmodel; import android.app.Application; import androidx.annotation.NonNull; -import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.model.Song; -import com.cappielloantonio.play.repository.AlbumRepository; import com.cappielloantonio.play.repository.ArtistRepository; import java.util.ArrayList; diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java index 00599d65..f0b04e6c 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java @@ -93,15 +93,15 @@ public class HomeViewModel extends AndroidViewModel { return downloadedSongSample; } - public LiveData> getMostPlayedAlbums() { + public LiveData> getMostPlayedAlbums() { return mostPlayedAlbumSample; } - public LiveData> getMostRecentlyAddedAlbums() { + public LiveData> getMostRecentlyAddedAlbums() { return recentlyAddedAlbumSample; } - public LiveData> getRecentlyPlayedAlbumList() { + public LiveData> getRecentlyPlayedAlbumList() { return recentlyPlayedAlbumSample; } diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java index 72c68730..659df257 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java @@ -5,7 +5,6 @@ import android.app.Application; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.model.Artist; @@ -16,7 +15,6 @@ import com.cappielloantonio.play.repository.ArtistRepository; import com.cappielloantonio.play.repository.GenreRepository; import com.cappielloantonio.play.repository.PlaylistRepository; -import java.util.ArrayList; import java.util.List; public class LibraryViewModel extends AndroidViewModel { diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java index 90178a71..4de577f4 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java @@ -9,11 +9,8 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.App; -import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.model.Playlist; import com.cappielloantonio.play.repository.PlaylistRepository; -import com.cappielloantonio.play.subsonic.models.ArtistID3; -import com.cappielloantonio.play.subsonic.models.IndexID3; import com.cappielloantonio.play.subsonic.models.ResponseStatus; import com.cappielloantonio.play.subsonic.models.SubsonicResponse; import com.cappielloantonio.play.util.MappingUtil; diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java index 6ab2bb36..e9be117e 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java @@ -4,7 +4,6 @@ import android.app.Application; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; -import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.cappielloantonio.play.model.Playlist; diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java index b07fa496..6ddf98eb 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java @@ -1,7 +1,6 @@ package com.cappielloantonio.play.viewmodel; import android.app.Application; -import android.content.Context; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; @@ -20,7 +19,6 @@ import com.cappielloantonio.play.repository.SearchingRepository; import com.cappielloantonio.play.repository.SongRepository; import java.util.ArrayList; -import java.util.LinkedHashSet; import java.util.List; public class SearchViewModel extends AndroidViewModel { diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java index 8b7b7f9a..a194cc5c 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java @@ -1,18 +1,14 @@ package com.cappielloantonio.play.viewmodel; import android.app.Application; -import android.content.Context; import android.text.TextUtils; -import android.view.View; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.cappielloantonio.play.App; import com.cappielloantonio.play.model.Artist; -import com.cappielloantonio.play.model.Download; import com.cappielloantonio.play.model.Genre; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.repository.DownloadRepository;