Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bottom nav being visible when resuming app (fixes #6012)

Browse Source 
(cherry picked from commit 4a27f0546c94f178bdd4bc2a7f54d2f27dbb91fa)
This commit is contained in:
arkon 2022-01-09 10:26:41 -05:00 committed by Jobobby04
parent 6a82d57957
commit b4c9ff4cae
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationHandler.kt
View File

@ -20,10 +20,10 @@ object NotificationHandler {
*/ */
internal fun openDownloadManagerPendingActivity(context: Context): PendingIntent { internal fun openDownloadManagerPendingActivity(context: Context): PendingIntent {
val intent = Intent(context, MainActivity::class.java).apply { val intent = Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
action = MainActivity.SHORTCUT_DOWNLOADS action = MainActivity.SHORTCUT_DOWNLOADS
} }
return PendingIntent.getActivity(context, 0, intent, 0) return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
} }
/** /**

3
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -255,8 +255,6 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
} }
) )
syncActivityViewWithController()
if (savedInstanceState == null) { if (savedInstanceState == null) {
// Reset Incognito Mode on relaunch // Reset Incognito Mode on relaunch
preferences.incognitoMode().set(false) preferences.incognitoMode().set(false)
@ -393,6 +391,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
checkForUpdates() checkForUpdates()
syncActivityViewWithController()
} }
private fun checkForUpdates() { private fun checkForUpdates() {

4
app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiBottomNavigationView.kt
View File

@ -89,7 +89,7 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor(
* *
* @param animate True if slide up should be animated * @param animate True if slide up should be animated
*/ */
fun slideUp(animate: Boolean = true) { fun slideUp(animate: Boolean = true) = post {
currentAnimator?.cancel() currentAnimator?.cancel()
clearAnimation() clearAnimation()
@ -106,7 +106,7 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor(
* *
* @param animate True if slide down should be animated * @param animate True if slide down should be animated
*/ */
fun slideDown(animate: Boolean = true) { fun slideDown(animate: Boolean = true) = post {
currentAnimator?.cancel() currentAnimator?.cancel()
clearAnimation() clearAnimation()