ProfessionalUwU/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash on theme switching, reworded settings for catalouges

Browse Source
This commit is contained in:
Jay 2020-03-11 00:46:55 -07:00
parent dbf5424b77
commit f2a45e5b53
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
View File

@ -339,6 +339,7 @@ fun Controller.scrollViewWith(recycler: RecyclerView,
super.onScrolled(recyclerView, dx, dy) super.onScrolled(recyclerView, dx, dy)
if (router?.backstack?.lastOrNull()?.controller() == this@scrollViewWith && if (router?.backstack?.lastOrNull()?.controller() == this@scrollViewWith &&
statusBarHeight > -1 && statusBarHeight > -1 &&
activity != null &&
activity!!.appbar.height > 0) { activity!!.appbar.height > 0) {
activity!!.appbar.y -= dy activity!!.appbar.y -= dy
activity!!.appbar.y = clamp( activity!!.appbar.y = clamp(
@ -353,7 +354,7 @@ fun Controller.scrollViewWith(recycler: RecyclerView,
super.onScrollStateChanged(recyclerView, newState) super.onScrollStateChanged(recyclerView, newState)
if (newState == RecyclerView.SCROLL_STATE_IDLE) { if (newState == RecyclerView.SCROLL_STATE_IDLE) {
if (router?.backstack?.lastOrNull()?.controller() == this@scrollViewWith && if (router?.backstack?.lastOrNull()?.controller() == this@scrollViewWith &&
statusBarHeight > -1 && statusBarHeight > -1 && activity != null &&
activity!!.appbar.height > 0) { activity!!.appbar.height > 0) {
val halfWay = abs((-activity!!.appbar.height.toFloat()) / 2) val halfWay = abs((-activity!!.appbar.height.toFloat()) / 2)
val shortAnimationDuration = resources?.getInteger( val shortAnimationDuration = resources?.getInteger(

2
app/src/main/res/menu/catalogue_main.xml
View File

@ -11,7 +11,7 @@
app:actionViewClass="androidx.appcompat.widget.SearchView"/> app:actionViewClass="androidx.appcompat.widget.SearchView"/>
<item android:id="@+id/action_filter" <item android:id="@+id/action_filter"
android:title="@string/action_filter" android:title="@string/action_view_all_sources"
android:icon="@drawable/ic_filter_list_white_24dp" android:icon="@drawable/ic_filter_list_white_24dp"
app:showAsAction="never"/> app:showAsAction="never"/>

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

@ -42,6 +42,7 @@
<!-- Actions --> <!-- Actions -->
<string name="action_filter">Filter</string> <string name="action_filter">Filter</string>
<string name="action_view_all_sources">View all sources</string>
<string name="action_view_options">View options</string> <string name="action_view_options">View options</string>
<string name="action_filter_downloaded">Downloaded</string> <string name="action_filter_downloaded">Downloaded</string>
<string name="action_filter_not_downloaded">Not downloaded</string> <string name="action_filter_not_downloaded">Not downloaded</string>