修复浏览画廊时全屏模式无法关闭的问题

xiaojieonly · Dec 12, 2024 · 9b32fbc · 9b32fbc
1 parent 4c22c51
commit 9b32fbc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -43,6 +43,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.webkit.MimeTypeMap;
 import android.widget.CompoundButton;
@@ -58,6 +59,10 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 
 import com.hippo.android.resource.AttrResources;
 import com.hippo.ehviewer.AppConfig;
@@ -387,9 +392,12 @@ private void onCreateView(@Nullable Bundle savedInstanceState) {
 
         // System UI helper
         if (Settings.getReadingFullscreen()) {
-            int systemUiLevel;
-            systemUiLevel = SystemUiHelper.LEVEL_IMMERSIVE;
-            mSystemUiHelper = new SystemUiHelper(this, systemUiLevel,
+            Window w = getWindow();
+            w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION,
+                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+            w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+                    WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            mSystemUiHelper = new SystemUiHelper(this, SystemUiHelper.LEVEL_IMMERSIVE,
                     SystemUiHelper.FLAG_LAYOUT_IN_SCREEN_OLDER_DEVICES | SystemUiHelper.FLAG_IMMERSIVE_STICKY);
             mSystemUiHelper.hide();
             mShowSystemUi = false;
@@ -655,7 +663,7 @@ private void autoRead(View view) {
             long initialDelay = Settings.getStartTransferTime();
             long waitTime = initialDelay * 2L;
             try {
-                transferService.scheduleAtFixedRate(
+                transferService.scheduleWithFixedDelay(
                         () -> transHandle.post(() -> {
                             if (mGalleryView == null) {
                                 return;

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -223,10 +223,10 @@
 
     <style name="AppTheme.Toolbar.Black" parent="AppTheme.Black.NoActionBar" />
 
-    <style name="AppTheme.Gallery" parent="AppTheme.Dark.NoActionBar">
+    <style name="AppTheme.Gallery" parent="AppTheme.Dark">
         <item name="gallerySliderBackgroundColor">@color/gallery_slider_background_dark</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
+        <item name="windowNoTitle">true</item>
+<!--        <item name="android:windowFullscreen">true</item>-->
     </style>
 
     <style name="AppTheme.Gallery.Dark" />