KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Notify about broken source on list screen

Browse Source
devel
Koitharu 6 months ago
parent 9e5664da3a
commit d0ed1fb85f
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7
3 changed files with 137 additions and 116 deletions
Show Stats Download Patch File Download Diff File

245
app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListFragment.kt
Unescape Escape View File

@ -29,120 +29,133 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.search.domain.SearchKind import org.koitharu.kotatsu.search.domain.SearchKind
@AndroidEntryPoint @AndroidEntryPoint
class RemoteListFragment : MangaListFragment(), FilterCoordinator.Owner { class RemoteListFragment : MangaListFragment(), FilterCoordinator.Owner, View.OnClickListener {
override val viewModel by viewModels<RemoteListViewModel>() override val viewModel by viewModels<RemoteListViewModel>()
override val filterCoordinator: FilterCoordinator override val filterCoordinator: FilterCoordinator
get() = viewModel.filterCoordinator get() = viewModel.filterCoordinator
override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) { override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
super.onViewBindingCreated(binding, savedInstanceState) super.onViewBindingCreated(binding, savedInstanceState)
addMenuProvider(RemoteListMenuProvider()) addMenuProvider(RemoteListMenuProvider())
addMenuProvider(MangaSearchMenuProvider(filterCoordinator, viewModel)) addMenuProvider(MangaSearchMenuProvider(filterCoordinator, viewModel))
viewModel.isRandomLoading.observe(viewLifecycleOwner, MenuInvalidator(requireActivity())) viewModel.isRandomLoading.observe(viewLifecycleOwner, MenuInvalidator(requireActivity()))
viewModel.onOpenManga.observeEvent(viewLifecycleOwner) { router.openDetails(it) } viewModel.onOpenManga.observeEvent(viewLifecycleOwner) { router.openDetails(it) }
filterCoordinator.observe().distinctUntilChangedBy { it.listFilter.isEmpty() } viewModel.onSourceBroken.observeEvent(viewLifecycleOwner) { showSourceBrokenWarning() }
.drop(1) filterCoordinator.observe().distinctUntilChangedBy { it.listFilter.isEmpty() }
.observe(viewLifecycleOwner) { .drop(1)
activity?.invalidateMenu() .observe(viewLifecycleOwner) {
} activity?.invalidateMenu()
} }
}
override fun onScrolledToEnd() {
viewModel.loadNextPage() override fun onScrolledToEnd() {
} viewModel.loadNextPage()
}
override fun onCreateActionMode(
controller: ListSelectionController, override fun onCreateActionMode(
menuInflater: MenuInflater, controller: ListSelectionController,
menu: Menu menuInflater: MenuInflater,
): Boolean { menu: Menu
menuInflater.inflate(R.menu.mode_remote, menu) ): Boolean {
return super.onCreateActionMode(controller, menuInflater, menu) menuInflater.inflate(R.menu.mode_remote, menu)
} return super.onCreateActionMode(controller, menuInflater, menu)
}
override fun onFilterClick(view: View?) {
router.showFilterSheet() override fun onFilterClick(view: View?) {
} router.showFilterSheet()
}
override fun onEmptyActionClick() {
if (filterCoordinator.isFilterApplied) { override fun onEmptyActionClick() {
filterCoordinator.reset() if (filterCoordinator.isFilterApplied) {
} else { filterCoordinator.reset()
openInBrowser(null) // should never be called } else {
} openInBrowser(null) // should never be called
} }
}
override fun onFooterButtonClick() {
val filter = filterCoordinator.snapshot().listFilter override fun onFooterButtonClick() {
when { val filter = filterCoordinator.snapshot().listFilter
!filter.query.isNullOrEmpty() -> router.openSearch(filter.query.orEmpty(), SearchKind.SIMPLE) when {
!filter.author.isNullOrEmpty() -> router.openSearch(filter.author.orEmpty(), SearchKind.AUTHOR) !filter.query.isNullOrEmpty() -> router.openSearch(filter.query.orEmpty(), SearchKind.SIMPLE)
filter.tags.size == 1 -> router.openSearch(filter.tags.singleOrNull()?.title.orEmpty(), SearchKind.TAG) !filter.author.isNullOrEmpty() -> router.openSearch(filter.author.orEmpty(), SearchKind.AUTHOR)
} filter.tags.size == 1 -> router.openSearch(filter.tags.singleOrNull()?.title.orEmpty(), SearchKind.TAG)
} }
}
override fun onSecondaryErrorActionClick(error: Throwable) {
openInBrowser(error.getCauseUrl()) override fun onSecondaryErrorActionClick(error: Throwable) {
} openInBrowser(error.getCauseUrl())
}
private fun openInBrowser(url: String?) {
if (url?.isHttpUrl() == true) { override fun onClick(v: View?) = Unit // from Snackbar, do nothing
router.openBrowser(
url = url, private fun openInBrowser(url: String?) {
source = viewModel.source, if (url?.isHttpUrl() == true) {
title = viewModel.source.getTitle(requireContext()), router.openBrowser(
) url = url,
} else { source = viewModel.source,
Snackbar.make(requireViewBinding().recyclerView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT) title = viewModel.source.getTitle(requireContext()),
.show() )
} } else {
} Snackbar.make(requireViewBinding().recyclerView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT)
.show()
private inner class RemoteListMenuProvider : MenuProvider { }
}
override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
menuInflater.inflate(R.menu.opt_list_remote, menu) private fun showSourceBrokenWarning() {
} val snackbar = Snackbar.make(
viewBinding?.recyclerView ?: return,
override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) { R.string.source_broken_warning,
R.id.action_source_settings -> { Snackbar.LENGTH_INDEFINITE,
router.openSourceSettings(viewModel.source) )
true snackbar.setAction(R.string.got_it, this)
} snackbar.show()
}
R.id.action_random -> {
viewModel.openRandom() private inner class RemoteListMenuProvider : MenuProvider {
true
} override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
menuInflater.inflate(R.menu.opt_list_remote, menu)
R.id.action_filter -> { }
onFilterClick(null)
true override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
} R.id.action_source_settings -> {
router.openSourceSettings(viewModel.source)
R.id.action_filter_reset -> { true
filterCoordinator.reset() }
true
} R.id.action_random -> {
viewModel.openRandom()
else -> false true
} }
override fun onPrepareMenu(menu: Menu) { R.id.action_filter -> {
super.onPrepareMenu(menu) onFilterClick(null)
menu.findItem(R.id.action_random)?.isEnabled = !viewModel.isRandomLoading.value true
menu.findItem(R.id.action_filter_reset)?.isVisible = filterCoordinator.isFilterApplied }
}
} R.id.action_filter_reset -> {
filterCoordinator.reset()
companion object { true
}
const val ARG_SOURCE = "provider"
else -> false
fun newInstance(source: MangaSource) = RemoteListFragment().withArgs(1) { }
putString(ARG_SOURCE, source.name)
} override fun onPrepareMenu(menu: Menu) {
} super.onPrepareMenu(menu)
menu.findItem(R.id.action_random)?.isEnabled = !viewModel.isRandomLoading.value
menu.findItem(R.id.action_filter_reset)?.isVisible = filterCoordinator.isFilterApplied
}
}
companion object {
const val ARG_SOURCE = "provider"
fun newInstance(source: MangaSource) = RemoteListFragment().withArgs(1) {
putString(ARG_SOURCE, source.name)
}
}
} }

7
app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
Unescape Escape View File

@ -44,6 +44,7 @@ import org.koitharu.kotatsu.list.ui.model.toErrorState
import org.koitharu.kotatsu.local.data.LocalStorageChanges import org.koitharu.kotatsu.local.data.LocalStorageChanges
import org.koitharu.kotatsu.local.domain.model.LocalManga import org.koitharu.kotatsu.local.domain.model.LocalManga
import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.parsers.model.MangaParserSource
import org.koitharu.kotatsu.parsers.util.sizeOrZero import org.koitharu.kotatsu.parsers.util.sizeOrZero
import javax.inject.Inject import javax.inject.Inject
@ -65,6 +66,7 @@ open class RemoteListViewModel @Inject constructor(
val source = MangaSource(savedStateHandle[RemoteListFragment.ARG_SOURCE]) val source = MangaSource(savedStateHandle[RemoteListFragment.ARG_SOURCE])
val isRandomLoading = MutableStateFlow(false) val isRandomLoading = MutableStateFlow(false)
val onOpenManga = MutableEventFlow<Manga>() val onOpenManga = MutableEventFlow<Manga>()
val onSourceBroken = MutableEventFlow<Unit>()
protected val repository = mangaRepositoryFactory.create(source) protected val repository = mangaRepositoryFactory.create(source)
private val mangaList = MutableStateFlow<List<Manga>?>(null) private val mangaList = MutableStateFlow<List<Manga>?>(null)
@ -117,6 +119,11 @@ open class RemoteListViewModel @Inject constructor(
launchJob(Dispatchers.Default) { launchJob(Dispatchers.Default) {
sourcesRepository.trackUsage(source) sourcesRepository.trackUsage(source)
} }
if (source is MangaParserSource && source.isBroken) {
// Just notify one. Will show reason in future
onSourceBroken.call(Unit)
}
} }
override fun onRefresh() { override fun onRefresh() {

1
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -899,4 +899,5 @@
<string name="create_or_restore_backup">Create or restore a backup</string> <string name="create_or_restore_backup">Create or restore a backup</string>
<string name="data_removal">Data removal</string> <string name="data_removal">Data removal</string>
<string name="privacy">Privacy</string> <string name="privacy">Privacy</string>
<string name="source_broken_warning">This manga source has been marked as broken. Some features may not work</string>
</resources> </resources>

Write Preview
Loading…
Cancel
Save