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

Fix crashing when switching between tabs fast

Browse source
This commit is contained in:
h4h13 2019-10-13 00:35:17 +05:30
parent 7c95fe2e69
commit cf402a27c2
15 changed files with 27 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.kt
View file

@ -50,30 +50,30 @@ interface AlbumDetailsPresenter : Presenter<AlbumDetailsView> {
override fun loadMore(artistId: Int) {
disposable += repository.getArtistByIdFlowable(artistId)
.map {
view.loadArtistImage(it)
view?.loadArtistImage(it)
return@map it.albums
}
.map {
it.filter { filterAlbum -> album.id != filterAlbum.id }
}
.subscribe {
.subscribe({
if (it.isEmpty()) {
return@subscribe
}
view.moreAlbums(ArrayList(it))
}
view?.moreAlbums(ArrayList(it))
}, { t -> println(t) })
}
override fun loadAlbum(albumId: Int) {
disposable += repository.getAlbumFlowable(albumId)
.doOnComplete {
view.complete()
view?.complete()
}
.subscribe {
.subscribe({
album = it
view.album(it)
}
view?.album(it)
}, { t -> println(t) })
}
override fun detachView() {

5
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.kt
View file

@ -42,16 +42,17 @@ interface AlbumsPresenter : Presenter<AlbumsView> {
private var disposable: Disposable? = null
private fun showList(albums: ArrayList<Album>) {
if (albums.isNotEmpty()) view.albums(albums) else view.showEmptyView()
view?.albums(albums)
}
override fun detachView() {
super.detachView()
disposable?.dispose()
}
override fun loadAlbums() {
disposable = repository.allAlbumsFlowable
.subscribe { this.showList(it) }
.subscribe({ view?.albums(it) }, { t -> println(t) })
}
}
}

14
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
View file

@ -51,7 +51,7 @@ interface ArtistDetailsPresenter : Presenter<ArtistDetailsView> {
cache: String?) {
disposable += repository.artistInfoFloable(name, lang, cache)
.subscribe {
view.artistInfo(it)
view?.artistInfo(it)
}
}
@ -60,20 +60,16 @@ interface ArtistDetailsPresenter : Presenter<ArtistDetailsView> {
override fun loadArtist(artistId: Int) {
disposable += repository.getArtistByIdFlowable(artistId)
.doOnComplete {
view.complete()
}
.subscribe {
this.showArtist(it)
view?.complete()
}
.subscribe({
view?.artist(it)
}, { t -> println(t) })
}
override fun detachView() {
super.detachView()
disposable.dispose()
}
private fun showArtist(artist: Artist) {
view.artist(artist)
}
}
}

15
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.kt
View file

@ -14,14 +14,12 @@
package code.name.monkey.retromusic.mvp.presenter
import code.name.monkey.retromusic.helper.SearchQueryHelper.songs
import code.name.monkey.retromusic.model.Artist
import code.name.monkey.retromusic.mvp.BaseView
import code.name.monkey.retromusic.mvp.Presenter
import code.name.monkey.retromusic.mvp.PresenterImpl
import code.name.monkey.retromusic.providers.interfaces.Repository
import io.reactivex.disposables.Disposable
import io.reactivex.functions.Consumer
import javax.inject.Inject
interface ArtistsView : BaseView {
@ -38,13 +36,6 @@ interface ArtistsPresenter : Presenter<ArtistsView> {
private var disposable: Disposable? = null
private fun showList(artists: ArrayList<Artist>) {
if (songs.isNotEmpty())
view.artists(artists)
else
view.showEmptyView()
}
override fun detachView() {
super.detachView()
disposable?.dispose()
@ -52,11 +43,7 @@ interface ArtistsPresenter : Presenter<ArtistsView> {
override fun loadArtists() {
disposable = repository.allArtistsFlowable
.subscribe({
view.artists(it)
}, {
println(it)
})
.subscribe({ view?.artists(it) }, { t -> println(t) })
}
}
}

13
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt
View file

@ -48,18 +48,7 @@ interface GenreDetailsPresenter : Presenter<GenreDetailsView> {
override fun loadGenreSongs(genreId: Int) {
disposable = repository.getGenreFlowable(genreId)
.subscribe {
showGenre(it)
}
}
private fun showGenre(songs: ArrayList<Song>) {
if (songs.isNotEmpty()) {
view.songs(songs)
} else {
view.showEmptyView()
}
.subscribe({ view?.songs(it) }, { t -> println(t) })
}
}
}

10
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.kt
View file

@ -41,15 +41,7 @@ interface GenresPresenter : Presenter<GenresView> {
override fun loadGenres() {
disposable = repository.allGenresFlowable
.subscribe { this.showList(it) }
}
private fun showList(genres: ArrayList<Genre>) {
if (genres.isNotEmpty()) {
view.genres(genres)
} else {
view.showEmptyView()
}
.subscribe({ view.genres(it) }, { t -> println(t) })
}
}
}

10
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.kt
View file

@ -43,15 +43,7 @@ interface PlaylistsPresenter : Presenter<PlaylistView> {
override fun playlists() {
disposable = repository.allPlaylistsFlowable
.subscribe { this.showList(it) }
}
private fun showList(arrayList: ArrayList<Playlist>) {
if (arrayList.isEmpty()) {
view.showEmptyView()
} else {
view.playlists(arrayList)
}
.subscribe({ view?.playlists(it) }, { t -> println(t) })
}
}
}

9
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt
View file

@ -41,19 +41,12 @@ interface PlaylistSongsPresenter : Presenter<PlaylistSongsView> {
override fun loadPlaylistSongs(playlist: Playlist) {
disposable = repository.getPlaylistSongsFlowable(playlist)
.subscribe {
view.songs(it)
}
.subscribe({ view?.songs(it) }, { t -> println(t) })
}
override fun detachView() {
super.detachView()
disposable?.dispose()
}
override fun attachView(view: PlaylistSongsView) {
super.attachView(view)
}
}
}

2
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt
View file

@ -46,7 +46,7 @@ interface SearchPresenter : Presenter<SearchView> {
}
override fun search(query: String?) {
view.showData(repository.search(query))
view?.showData(repository.search(query))
}
}
}

4
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.kt
View file

@ -42,9 +42,7 @@ interface SongPresenter : Presenter<SongView> {
override fun loadSongs() {
disposable = repository.allSongsFlowable
.subscribe({
view?.songs(it)
}, { t -> print(t) })
.subscribe({ view?.songs(it) }, { t -> print(t) })
}
override fun detachView() {