Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

v2.10

Browse source
This commit is contained in:
h4h13 2018-11-05 19:23:07 +05:30
parent 3d7ba2afc6
commit 08e00b89c5
341 changed files with 7612 additions and 6811 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/code/name/monkey/retromusic/mvp/contract/HomeContract.java
View file

@ -2,10 +2,12 @@ package code.name.monkey.retromusic.mvp.contract;
import java.util.ArrayList;
import code.name.monkey.retromusic.model.AbsCustomPlaylist;
import code.name.monkey.retromusic.model.Album;
import code.name.monkey.retromusic.model.Artist;
import code.name.monkey.retromusic.model.Genre;
import code.name.monkey.retromusic.model.Playlist;
import code.name.monkey.retromusic.model.Song;
import code.name.monkey.retromusic.mvp.BasePresenter;
import code.name.monkey.retromusic.mvp.BaseView;
@ -21,7 +23,9 @@ public interface HomeContract {
void topAlbums(ArrayList<Album> albums);
void suggestions(ArrayList<Playlist> songs);
void suggestions(ArrayList<Song> songs);
void playlists(ArrayList<Playlist> playlists);
void geners(ArrayList<Genre> songs);
}

18
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.java
View file

@ -1,7 +1,6 @@
package code.name.monkey.retromusic.mvp.presenter;
import androidx.annotation.NonNull;
import code.name.monkey.retromusic.RetroApplication;
import code.name.monkey.retromusic.mvp.Presenter;
import code.name.monkey.retromusic.mvp.contract.HomeContract;
import code.name.monkey.retromusic.util.PreferenceUtil;
@ -20,14 +19,11 @@ public class HomePresenter extends Presenter implements HomeContract.HomePresent
loadRecentAlbums();
loadRecentArtists();
loadTopAlbums();
loadTopArtists();
loadSuggestions();
if (PreferenceUtil.getInstance(RetroApplication.getInstance()).isGenreShown()) loadGenres();
if (PreferenceUtil.getInstance().isGenreShown()) loadGenres();
}
@ -40,9 +36,9 @@ public class HomePresenter extends Presenter implements HomeContract.HomePresent
disposable.add(repository.getAllPlaylists()
.observeOn(schedulerProvider.ui())
.subscribeOn(schedulerProvider.io())
.subscribe(playlists -> {
if (!playlists.isEmpty()) {
view.suggestions(playlists);
.subscribe(playlist -> {
if (!playlist.isEmpty()) {
view.playlists(playlist);
}
},
throwable -> view.showEmptyView(), () -> view.completed()));
@ -107,7 +103,11 @@ public class HomePresenter extends Presenter implements HomeContract.HomePresent
@Override
public void loadSuggestions() {
disposable.add(repository.getSuggestionSongs()
.observeOn(schedulerProvider.ui())
.subscribeOn(schedulerProvider.io())
.doOnSubscribe(disposable1 -> view.loading())
.subscribe(songs -> view.suggestions(songs), throwable -> view.showEmptyView(), () -> view.completed()));
}
@Override