antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-01 09:53:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Imports optimization and entries rearranged

Browse source
This commit is contained in:
CappielloAntonio 2021-04-27 11:01:02 +02:00
parent 3c2837e096
commit 65e47f61ef
63 changed files with 987 additions and 1087 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,9 +12,8 @@ import com.cappielloantonio.play.repository.AlbumRepository;
import java.util.List;
public class AlbumCatalogueViewModel extends AndroidViewModel {
private AlbumRepository albumRepository;
public LiveData<List<Album>> albumList;
private AlbumRepository albumRepository;
private String query = "";
public AlbumCatalogueViewModel(@NonNull Application application) {

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

@ -14,11 +14,11 @@ public class ArtistBottomSheetViewModel extends AndroidViewModel {
super(application);
}
public void setArtist(Artist artist) {
this.artist = artist;
}
public Artist getArtist() {
return artist;
}
public void setArtist(Artist artist) {
this.artist = artist;
}
}

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

@ -6,9 +6,7 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import com.cappielloantonio.play.model.Artist;
import com.cappielloantonio.play.model.Genre;
import com.cappielloantonio.play.repository.ArtistRepository;
import com.cappielloantonio.play.repository.GenreRepository;
import java.util.List;

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

@ -39,7 +39,7 @@ public class HomeViewModel extends AndroidViewModel {
public List<Song> getDiscoverSongList() {
if(dicoverSongSample.isEmpty()) {
if (dicoverSongSample.isEmpty()) {
dicoverSongSample = songRepository.getRandomSample(10);
}

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

@ -10,13 +10,11 @@ import com.cappielloantonio.play.model.Album;
import com.cappielloantonio.play.model.Artist;
import com.cappielloantonio.play.model.Genre;
import com.cappielloantonio.play.model.Playlist;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.AlbumRepository;
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 {
@ -47,7 +45,7 @@ public class LibraryViewModel extends AndroidViewModel {
}
public List<Playlist> getPlaylistSample() {
if(playlistSample.isEmpty()) {
if (playlistSample.isEmpty()) {
playlistSample = playlistRepository.getRandomSample(5);
}

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

@ -19,7 +19,7 @@ public class MainViewModel extends AndroidViewModel {
}
public boolean isQueueLoaded() {
if(queueRepository.count() == 0)
if (queueRepository.count() == 0)
return false;
return true;

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

@ -6,10 +6,10 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import com.cappielloantonio.play.service.MusicPlayerRemote;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.repository.SongRepository;
import com.cappielloantonio.play.service.MusicPlayerRemote;
import java.util.List;

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

@ -6,9 +6,7 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import com.cappielloantonio.play.model.Genre;
import com.cappielloantonio.play.model.Playlist;
import com.cappielloantonio.play.repository.GenreRepository;
import com.cappielloantonio.play.repository.PlaylistRepository;
import java.util.List;

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

@ -1,13 +1,11 @@
package com.cappielloantonio.play.viewmodel;
import android.app.Application;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import com.cappielloantonio.play.model.Album;
import com.cappielloantonio.play.model.Playlist;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.SongRepository;

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

@ -56,7 +56,7 @@ public class SearchViewModel extends AndroidViewModel {
public void setQuery(String query) {
this.query = query;
if(!query.isEmpty()) {
if (!query.isEmpty()) {
insertNewSearch(query);
}
}

8
app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
View file

@ -27,14 +27,14 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
artistRepository = new ArtistRepository(application);
}
public void setSong(Song song) {
this.song = song;
}
public Song getSong() {
return song;
}
public void setSong(Song song) {
this.song = song;
}
public void setFavorite() {
song.setFavorite(!song.isFavorite());
songRepository.setFavoriteStatus(song);

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

@ -16,16 +16,14 @@ import java.util.ArrayList;
import java.util.List;
public class SongListPageViewModel extends AndroidViewModel {
private SongRepository songRepository;
private LiveData<List<Song>> songList;
public String title;
public Genre genre;
public Artist artist;
public ArrayList<String> filters = new ArrayList<>();
public ArrayList<String> filterNames = new ArrayList<>();
public int year = 0;
private SongRepository songRepository;
private LiveData<List<Song>> songList;
public SongListPageViewModel(@NonNull Application application) {
super(application);

16
app/src/main/java/com/cappielloantonio/play/viewmodel/SyncViewModel.java
View file

@ -49,12 +49,12 @@ public class SyncViewModel extends AndroidViewModel {
}
private void countStep() {
if(syncAlbum) step++;
if(syncArtist) step++;
if(syncGenres) step++;
if(syncPlaylist) step++;
if(syncSong) step++;
if(crossSyncSongGenre) step++;
if (syncAlbum) step++;
if (syncArtist) step++;
if (syncGenres) step++;
if (syncPlaylist) step++;
if (syncSong) step++;
if (crossSyncSongGenre) step++;
}
public boolean isSyncAlbum() {
@ -90,7 +90,7 @@ public class SyncViewModel extends AndroidViewModel {
}
public void setProgress(Boolean step) {
if(step) progress++;
if (step) progress++;
}
public int getProgressBarInfo() {
@ -100,7 +100,7 @@ public class SyncViewModel extends AndroidViewModel {
public Map<Integer, Song> getCatalogue() {
Map<Integer, Song> map = new HashMap<>();
for(Song song: songRepository.getCatalogue()){
for (Song song : songRepository.getCatalogue()) {
map.put(song.hashCode(), song);
}