Mirrors/tachiyomi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed animation when starting a download from recents

Browse Source
This commit is contained in:
Jay 2020-04-24 14:00:47 -04:00
parent 6237a61b4b
commit 3fc510fe4b
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt
View File

@ -73,8 +73,10 @@ class DownloadBottomSheet @JvmOverloads constructor(
} }
update() update()
setInformationView() setInformationView()
if (sheetBehavior?.state != BottomSheetBehavior.STATE_EXPANDED && sheetBehavior?.isHideable == true) sheetBehavior?.state = if (!controller.hasQueue()) {
BottomSheetBehavior.STATE_HIDDEN sheetBehavior?.isHideable = true
sheetBehavior?.state = BottomSheetBehavior.STATE_HIDDEN
}
} }
fun update() { fun update() {
@ -215,7 +217,6 @@ class DownloadBottomSheet @JvmOverloads constructor(
sheetBehavior?.skipCollapsed = !hasQueue sheetBehavior?.skipCollapsed = !hasQueue
if (sheetBehavior?.state == BottomSheetBehavior.STATE_HIDDEN) sheetBehavior?.state = if (sheetBehavior?.state == BottomSheetBehavior.STATE_HIDDEN) sheetBehavior?.state =
BottomSheetBehavior.STATE_COLLAPSED BottomSheetBehavior.STATE_COLLAPSED
sheetBehavior?.isHideable = !hasQueue
} else { } else {
sheetBehavior?.isHideable = !hasQueue sheetBehavior?.isHideable = !hasQueue
sheetBehavior?.skipCollapsed = !hasQueue sheetBehavior?.skipCollapsed = !hasQueue

20
app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
View File

@ -165,6 +165,22 @@ class RecentsController(bundle: Bundle? = null) : BaseController(bundle),
activity?.invalidateOptionsMenu() activity?.invalidateOptionsMenu()
} }
if (state == BottomSheetBehavior.STATE_COLLAPSED) {
if (hasQueue()) {
dl_bottom_sheet.sheetBehavior?.isHideable = false
} else {
dl_bottom_sheet.sheetBehavior?.isHideable = true
dl_bottom_sheet.sheetBehavior?.state = BottomSheetBehavior.STATE_HIDDEN
}
} else if (state == BottomSheetBehavior.STATE_HIDDEN) {
if (!hasQueue()) {
dl_bottom_sheet.sheetBehavior?.skipCollapsed = true
} else {
dl_bottom_sheet.sheetBehavior?.skipCollapsed = false
dl_bottom_sheet.sheetBehavior?.state = BottomSheetBehavior.STATE_COLLAPSED
}
}
if (state == BottomSheetBehavior.STATE_HIDDEN || state == BottomSheetBehavior.STATE_COLLAPSED) { if (state == BottomSheetBehavior.STATE_HIDDEN || state == BottomSheetBehavior.STATE_COLLAPSED) {
shadow2.alpha = if (state == BottomSheetBehavior.STATE_COLLAPSED) 0.25f else 0f shadow2.alpha = if (state == BottomSheetBehavior.STATE_COLLAPSED) 0.25f else 0f
shadow.alpha = if (state == BottomSheetBehavior.STATE_COLLAPSED) 0.5f else 0f shadow.alpha = if (state == BottomSheetBehavior.STATE_COLLAPSED) 0.5f else 0f
@ -407,8 +423,10 @@ class RecentsController(bundle: Bundle? = null) : BaseController(bundle),
} }
} }
fun hasQueue() = presenter.downloadManager.hasQueue()
override fun showSheet() { override fun showSheet() {
if (dl_bottom_sheet.sheetBehavior?.isHideable == false || presenter.downloadManager.hasQueue()) if (dl_bottom_sheet.sheetBehavior?.isHideable == false || hasQueue())
dl_bottom_sheet.sheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED dl_bottom_sheet.sheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED
} }