Fix error messages

pull/1/head
Koitharu 6 years ago
parent e123399911
commit b706e600c7

@ -99,7 +99,7 @@ abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list), Mang
override fun onPrepareOptionsMenu(menu: Menu) { override fun onPrepareOptionsMenu(menu: Menu) {
menu.findItem(R.id.action_filter).isVisible = drawer != null && menu.findItem(R.id.action_filter).isVisible = drawer != null &&
drawer?.getDrawerLockMode(GravityCompat.END) != DrawerLayout.LOCK_MODE_LOCKED_CLOSED drawer?.getDrawerLockMode(GravityCompat.END) != DrawerLayout.LOCK_MODE_LOCKED_CLOSED
super.onPrepareOptionsMenu(menu) super.onPrepareOptionsMenu(menu)
} }
@ -151,7 +151,7 @@ abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list), Mang
} }
} }
override fun onError(e: Throwable) { override fun onListError(e: Throwable) {
if (recyclerView.hasItems) { if (recyclerView.hasItems) {
Snackbar.make(recyclerView, e.getDisplayMessage(resources), Snackbar.LENGTH_SHORT) Snackbar.make(recyclerView, e.getDisplayMessage(resources), Snackbar.LENGTH_SHORT)
.show() .show()
@ -167,6 +167,10 @@ abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list), Mang
} }
} }
override fun onError(e: Throwable) {
Snackbar.make(recyclerView, e.getDisplayMessage(resources), Snackbar.LENGTH_SHORT).show()
}
override fun onLoadingStateChanged(isLoading: Boolean) { override fun onLoadingStateChanged(isLoading: Boolean) {
val hasItems = recyclerView.hasItems val hasItems = recyclerView.hasItems
progressBar.isVisible = isLoading && !hasItems progressBar.isVisible = isLoading && !hasItems
@ -235,7 +239,7 @@ abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list), Mang
) )
} }
) )
if(mode == ListMode.GRID) { if (mode == ListMode.GRID) {
recyclerView.addOnLayoutChangeListener(UiUtils.SpanCountResolver) recyclerView.addOnLayoutChangeListener(UiUtils.SpanCountResolver)
} }
adapter?.notifyDataSetChanged() adapter?.notifyDataSetChanged()

@ -19,6 +19,9 @@ interface MangaListView<E> : BaseMvpView {
@StateStrategyType(AddToEndStrategy::class, tag = "content") @StateStrategyType(AddToEndStrategy::class, tag = "content")
fun onListAppended(list: List<Manga>) fun onListAppended(list: List<Manga>)
@StateStrategyType(AddToEndSingleTagStrategy::class, tag = "content")
fun onListError(e: Throwable)
@AddToEndSingle @AddToEndSingle
fun onInitFilter(sortOrders: List<SortOrder>, tags: List<MangaTag>, currentFilter: MangaFilter?) fun onInitFilter(sortOrders: List<SortOrder>, tags: List<MangaTag>, currentFilter: MangaFilter?)

@ -38,7 +38,11 @@ class FavouritesListPresenter : BasePresenter<MangaListView<Unit>>() {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
e.printStackTrace() e.printStackTrace()
} }
viewState.onError(e) if (offset == 0) {
viewState.onListError(e)
} else {
viewState.onError(e)
}
} finally { } finally {
viewState.onLoadingStateChanged(false) viewState.onLoadingStateChanged(false)
} }

@ -40,7 +40,11 @@ class HistoryListPresenter : BasePresenter<MangaListView<MangaHistory>>() {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
e.printStackTrace() e.printStackTrace()
} }
viewState.onError(e) if (offset == 0) {
viewState.onListError(e)
} else {
viewState.onError(e)
}
} finally { } finally {
viewState.onLoadingStateChanged(false) viewState.onLoadingStateChanged(false)
} }

@ -46,7 +46,7 @@ class LocalListPresenter : BasePresenter<MangaListView<File>>() {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
e.printStackTrace() e.printStackTrace()
} }
viewState.onError(e) viewState.onListError(e)
} finally { } finally {
viewState.onLoadingStateChanged(false) viewState.onLoadingStateChanged(false)
} }

@ -40,7 +40,11 @@ class RemoteListPresenter : BasePresenter<MangaListView<Unit>>() {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
e.printStackTrace() e.printStackTrace()
} }
viewState.onError(e) if (offset == 0) {
viewState.onListError(e)
} else {
viewState.onError(e)
}
} finally { } finally {
viewState.onLoadingStateChanged(false) viewState.onLoadingStateChanged(false)
} }

Loading…
Cancel
Save