Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-23 19:51:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed filter sheet not hidden in landscape

Browse Source
This commit is contained in:
Jay 2020-02-10 02:13:02 -08:00
parent d781a71425
commit d2dae05ab2
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -215,6 +215,13 @@ class LibraryController(
fab.setOnClickListener {
router.pushController(DownloadController().withFadeTransaction())
}
if (presenter.isDownloading()) {
fab.scaleY = 1f
fab.scaleX = 1f
fab.isClickable = true
fab.isFocusable = true
}
presenter.onRestore()
val library = presenter.getAllManga()
if (library != null) onNextLibraryUpdate(presenter.categories, library)

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -84,6 +84,8 @@ class LibraryPresenter(
var currentLibrary:Library? = null
}
fun isDownloading() = downloadManager.hasQueue()
fun onDestroy() {
if (currentMangaMap != null)
currentLibrary = Library(categories, currentMangaMap!!)

8
app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/SortFilterBottomSheet.kt
View File

@ -152,7 +152,8 @@ class SortFilterBottomSheet @JvmOverloads constructor(context: Context, attrs: A
if (phoneLandscape && shadow2.visibility != View.GONE) {
shadow2.gone()
}
sheetBehavior?.peekHeight = peekHeight
if (phoneLandscape)
sheetBehavior?.peekHeight = 0
top_bar.viewTreeObserver.addOnGlobalLayoutListener {
val peekingHeight = if (phoneLandscape) 0
else if (!title.text.isNullOrBlank()) top_bar.height
@ -204,7 +205,10 @@ class SortFilterBottomSheet @JvmOverloads constructor(context: Context, attrs: A
this.peekHeight = state.getInt("peek")
this.startingTitle = state.getString("title") ?: ""
val sheet = BottomSheetBehavior.from(this)
sheet.peekHeight = peekHeight
if (isLandscape() && !isTablet())
sheet.peekHeight = 0
else
sheet.peekHeight = peekHeight
title.text = startingTitle
super.onRestoreInstanceState( state.getParcelable("superState"))
top_bar.alpha =

12
app/src/main/res/layout-sw600dp/filter_bottom_sheet.xml
View File

@ -212,6 +212,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/pill"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:src="@drawable/draggable_pill"
android:alpha="0.15"
android:contentDescription="@string/drag_handle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/title_icon"
@ -219,6 +230,7 @@
android:layout_height="0dp"
android:layout_marginStart="24dp"
android:src="@drawable/ic_sort_white_24dp"
android:contentDescription="@string/sorting_mode"
app:layout_constraintBottom_toBottomOf="@+id/title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/title" />