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

Optimized imports

Browse source
This commit is contained in:
CappielloAntonio 2021-08-01 11:48:18 +02:00
parent 8d517ae3e0
commit 0827fc10a9
80 changed files with 130 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
View file

@ -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;

5
app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
View file

@ -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;

5
app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
View file

@ -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;

2
app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
View file

@ -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;

2
app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
View file

@ -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;

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

@ -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;

2
app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
View file

@ -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 {

1
app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
View file

@ -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;

2
app/src/main/java/com/cappielloantonio/play/interfaces/SystemCallback.java
View file

@ -1,7 +1,5 @@
package com.cappielloantonio.play.interfaces;
import java.util.List;
public interface SystemCallback {
void onError(Exception exception);

4
app/src/main/java/com/cappielloantonio/play/model/Album.java
View file

@ -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;

3
app/src/main/java/com/cappielloantonio/play/model/Genre.java
View file

@ -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;

5
app/src/main/java/com/cappielloantonio/play/model/Playlist.java
View file

@ -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;

6
app/src/main/java/com/cappielloantonio/play/model/Song.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java
View file

@ -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;

2
app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
View file

@ -260,7 +260,7 @@ public class ArtistRepository {
if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) {
List<Album> 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++) {

5
app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java
View file

@ -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;

7
app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java
View file

@ -39,14 +39,13 @@ public class GenreRepository {
if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) {
List<Genre> 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);
}
}

1
app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java
View file

@ -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;

30
app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java
View file

@ -206,25 +206,25 @@ public class SongRepository {
public MutableLiveData<List<Song>> getSongsByGenres(ArrayList<String> genresId) {
MutableLiveData<List<Song>> 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<SubsonicResponse>() {
@Override
public void onResponse(Call<SubsonicResponse> call, Response<SubsonicResponse> response) {
if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) {
List<Song> songs = new ArrayList<>(MappingUtil.mapSong(response.body().getSongsByGenre().getSongs()));
songsByGenre.setValue(songs);
App.getSubsonicClientInstance(application, false)
.getAlbumSongListClient()
.getSongsByGenre(id, 500, 0)
.enqueue(new Callback<SubsonicResponse>() {
@Override
public void onResponse(Call<SubsonicResponse> call, Response<SubsonicResponse> response) {
if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) {
List<Song> songs = new ArrayList<>(MappingUtil.mapSong(response.body().getSongsByGenre().getSongs()));
songsByGenre.setValue(songs);
}
}
}
@Override
public void onFailure(Call<SubsonicResponse> call, Throwable t) {
@Override
public void onFailure(Call<SubsonicResponse> call, Throwable t) {
}
});
}
});
return songsByGenre;
}

1
app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/service/DownloadTracker.java
View file

@ -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;

7
app/src/main/java/com/cappielloantonio/play/service/MusicService.java
View file

@ -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:
}
}

1
app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java
View file

@ -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;

5
app/src/main/java/com/cappielloantonio/play/subsonic/SubsonicPreferences.java
View file

@ -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 {

1
app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java
View file

@ -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;

2
app/src/main/java/com/cappielloantonio/play/subsonic/base/SubsonicIncompatibilityException.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.java
View file

@ -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")

2
app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.java
View file

@ -10,7 +10,7 @@ import java.util.List;
public class AlbumWithSongsID3 extends AlbumID3 {
@Element(name = "song")
protected List<Child> songs;
public List<Child> getSongs() {
if (songs == null) {
songs = new ArrayList<>();

11
app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.java
View file

@ -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;
}

2
app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.java
View file

@ -57,7 +57,7 @@ public class ArtistInfoBase {
public void setMediumImageUrl(String value) {
this.mediumImageUrl = value;
}
public String getLargeImageUrl() {
return largeImageUrl;
}

6
app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.java
View file

@ -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;
}

20
app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.java
View file

@ -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<String> 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;
}

6
app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.java
View file

@ -14,21 +14,21 @@ public class SearchResult2 {
protected List<Child> albums;
@Element(name = "song")
protected List<Child> songs;
public List<Artist> getArtists() {
if (artists == null) {
artists = new ArrayList<>();
}
return this.artists;
}
public List<Child> getAlbums() {
if (albums == null) {
albums = new ArrayList<>();
}
return this.albums;
}
public List<Child> getSongs() {
if (songs == null) {
songs = new ArrayList<>();

4
app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.java
View file

@ -14,14 +14,14 @@ public class SearchResult3 {
protected List<AlbumID3> albums;
@Element(name = "song")
protected List<Child> songs;
public List<ArtistID3> getArtists() {
if (artists == null) {
artists = new ArrayList<>();
}
return this.artists;
}
public List<AlbumID3> getAlbums() {
if (albums == null) {
albums = new ArrayList<>();

1
app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java
View file

@ -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;

20
app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java
View file

@ -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");
}

18
app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
View file

@ -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);

1
app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java
View file

@ -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 {

5
app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java
View file

@ -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");
}

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

@ -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());
});
}

12
app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java
View file

@ -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);
}

3
app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java
View file

@ -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;

25
app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
View file

@ -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);

15
app/src/main/java/com/cappielloantonio/play/ui/fragment/LibraryFragment.java
View file

@ -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);
});

10
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
View file

@ -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();
}
}

4
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
View file

@ -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;

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

@ -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);

19
app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
View file

@ -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();
}
}

6
app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
View file

@ -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));
}

28
app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java
View file

@ -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);

8
app/src/main/java/com/cappielloantonio/play/ui/fragment/SyncFragment.java
View file

@ -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

3
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
View file

@ -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<Song>) media);

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

@ -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;

3
app/src/main/java/com/cappielloantonio/play/util/UIUtil.java
View file

@ -6,8 +6,7 @@ public class UIUtil {
if (itemSize / maxSpan > 0) {
return maxSpan;
}
else {
} else {
return itemSize % maxSpan;
}
}

1
app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java
View file

@ -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;

6
app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java
View file

@ -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;

3
app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java
View file

@ -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;

3
app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java
View file

@ -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;

6
app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java
View file

@ -93,15 +93,15 @@ public class HomeViewModel extends AndroidViewModel {
return downloadedSongSample;
}
public LiveData<List<Album>> getMostPlayedAlbums() {
public LiveData<List<Album>> getMostPlayedAlbums() {
return mostPlayedAlbumSample;
}
public LiveData<List<Album>> getMostRecentlyAddedAlbums() {
public LiveData<List<Album>> getMostRecentlyAddedAlbums() {
return recentlyAddedAlbumSample;
}
public LiveData<List<Album>> getRecentlyPlayedAlbumList() {
public LiveData<List<Album>> getRecentlyPlayedAlbumList() {
return recentlyPlayedAlbumSample;
}

2
app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java
View file

@ -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 {

3
app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java
View file

@ -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;

1
app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java
View file

@ -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;

2
app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java
View file

@ -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 {

4
app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java
View file

@ -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;