From 4a674e46e6f2b4ebcc7f71f97ba8b340300d2acb Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 30 Dec 2022 16:40:46 +0800 Subject: [PATCH] Fixup! Handle drawer on back-pressed --- .../com/hippo/ehviewer/ui/MainActivity.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java index 451dacd65..2674279a2 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -28,7 +28,6 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; -import android.view.Gravity; import android.view.MenuItem; import android.view.View; import android.widget.Toast; @@ -638,9 +637,7 @@ public final class MainActivity extends StageActivity } @Override - public void onDrawerSlide(@NonNull View drawerView, float slideOffset) { - - } + public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {} @Override public void onDrawerOpened(@NonNull View drawerView) { @@ -648,14 +645,17 @@ public final class MainActivity extends StageActivity } @Override - public void onDrawerClosed(@NonNull View drawerView) { - if (!mLayout.isDrawerVisible(GravityCompat.START) && !mLayout.isDrawerVisible(GravityCompat.END)) - setEnabled(false); - } + public void onDrawerClosed(@NonNull View drawerView) {} @Override public void onDrawerStateChanged(int newState) { - + switch (newState) { + case DrawerLayout.STATE_DRAGGING, DrawerLayout.STATE_SETTLING -> setEnabled(true); + case DrawerLayout.STATE_IDLE -> { + if (!mLayout.isDrawerVisible(GravityCompat.START) && !mLayout.isDrawerVisible(GravityCompat.END)) + setEnabled(false); + } + } } } }