prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix error messages

Browse Source
This commit is contained in:
Koitharu
2020-03-11 20:43:24 +02:00
parent e123399911
commit b706e600c7
6 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListFragment.kt
View File

@@ -99,7 +99,7 @@ abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list), Mang
override fun onPrepareOptionsMenu(menu: Menu) {
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)
}
@@ -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) {
Snackbar.make(recyclerView, e.getDisplayMessage(resources), Snackbar.LENGTH_SHORT)
.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) {
val hasItems = recyclerView.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)
}
adapter?.notifyDataSetChanged()

3
app/src/main/java/org/koitharu/kotatsu/ui/main/list/MangaListView.kt
View File

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

6
app/src/main/java/org/koitharu/kotatsu/ui/main/list/favourites/FavouritesListPresenter.kt
View File

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

6
app/src/main/java/org/koitharu/kotatsu/ui/main/list/history/HistoryListPresenter.kt
View File

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

2
app/src/main/java/org/koitharu/kotatsu/ui/main/list/local/LocalListPresenter.kt
View File

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

6
app/src/main/java/org/koitharu/kotatsu/ui/main/list/remote/RemoteListPresenter.kt
View File

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