@ -22,6 +22,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.getOrDefault
import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.LocalSource
import eu.kanade.tachiyomi.source.model.Filter
import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.online.HttpSource
@ -33,6 +34,7 @@ import eu.kanade.tachiyomi.ui.source.SourceController
import eu.kanade.tachiyomi.ui.webview.WebViewActivity
import eu.kanade.tachiyomi.util.system.connectivityManager
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.openInBrowser
import eu.kanade.tachiyomi.util.view.gone
import eu.kanade.tachiyomi.util.view.inflate
import eu.kanade.tachiyomi.util.view.scrollViewWith
@ -42,6 +44,7 @@ import eu.kanade.tachiyomi.util.view.visible
import eu.kanade.tachiyomi.util.view.visibleIf
import eu.kanade.tachiyomi.util.view.withFadeTransaction
import eu.kanade.tachiyomi.widget.AutofitRecyclerView
import eu.kanade.tachiyomi.widget.EmptyView
import kotlinx.android.synthetic.main.browse_source_controller.*
import rx.Observable
import rx.Subscription
@ -258,6 +261,9 @@ open class BrowseSourceController(bundle: Bundle) :
val isHttpSource = presenter . source is HttpSource
menu . findItem ( R . id . action _open _in _web _view ) . isVisible = isHttpSource
val isLocalSource = presenter . source is LocalSource
menu . findItem ( R . id . action _local _source _help ) . isVisible = isLocalSource
}
override fun onOptionsItemSelected ( item : MenuItem ) : Boolean {
@ -265,6 +271,7 @@ open class BrowseSourceController(bundle: Bundle) :
R . id . action _search -> expandActionViewFromInteraction = true
R . id . action _display _mode -> swapDisplayMode ( )
R . id . action _open _in _web _view -> openInWebView ( )
R . id . action _local _source _help -> openLocalSourceHelpGuide ( )
else -> return super . onOptionsItemSelected ( item )
}
return true
@ -329,6 +336,10 @@ open class BrowseSourceController(bundle: Bundle) :
startActivity ( intent )
}
private fun openLocalSourceHelpGuide ( ) {
activity ?. openInBrowser ( LocalSource . HELP _URL )
}
/ * *
* Restarts the request with a new query .
*
@ -373,21 +384,52 @@ open class BrowseSourceController(bundle: Bundle) :
hideProgressBar ( )
snack ?. dismiss ( )
val message = if ( error is NoResultsException ) catalogue _view . context . getString ( R . string . no _results _found ) else ( error . message ?: " " )
snack = source _layout ?. snack ( message , Snackbar . LENGTH _INDEFINITE ) {
setAction ( R . string . retry ) {
// If not the first page, show bottom progress bar.
if ( adapter . mainItemCount > 0 ) {
val item = progressItem ?: return @setAction
adapter . addScrollableFooterWithDelay ( item , 0 , true )
} else {
showProgressBar ( )
presenter . requestNext ( )
}
val message = getErrorMessage ( error )
val retryAction = View . OnClickListener {
// If not the first page, show bottom progress bar.
if ( adapter . mainItemCount > 0 && progressItem != null ) {
adapter . addScrollableFooterWithDelay ( progressItem !! , 0 , true )
} else {
showProgressBar ( )
}
presenter . requestNext ( )
}
if ( adapter . isEmpty ) {
val actions = emptyList < EmptyView . Action > ( ) . toMutableList ( )
actions += if ( presenter . source is LocalSource ) {
EmptyView . Action ( R . string . local _source _help _guide , View . OnClickListener { openLocalSourceHelpGuide ( ) } )
} else {
EmptyView . Action ( R . string . retry , retryAction )
}
if ( presenter . source is HttpSource ) {
actions += EmptyView . Action ( R . string . open _in _webview , View . OnClickListener { openInWebView ( ) } )
}
empty _view . show ( R . drawable . ic _local _library _24dp , message , actions )
} else {
snack = source _layout ?. snack ( message , Snackbar . LENGTH _INDEFINITE ) {
setAction ( R . string . retry , retryAction )
}
}
}
private fun getErrorMessage ( error : Throwable ) : String {
if ( error is NoResultsException ) {
return activity !! . getString ( R . string . no _results _found )
}
return when {
error . message == null -> " "
error . message !! . startsWith ( " HTTP error " ) -> " ${error.message} : ${activity!!.getString(R.string.check_site_in_web)} "
else -> error . message !!
}
}
/ * *
* Sets a new progress item and reenables the scroll listener .
* /
Jay
4 years ago