Merge pull request #171 from TeamAmaze/bugfix/fullscreen-cutoff

Fix cutout mode crashes for full screen players
TeamAmaze · Jul 8, 2024 · 383b104 · 383b104
2 parents dfcda81 + 868d0c4
commit 383b104
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 4 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -94,7 +94,7 @@
         <activity
             android:name=".image_viewer.ImageViewerActivity"
             android:label="@string/image_viewer"
-            android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark"
+            android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark.Fallback"
             android:exported="true"
             >
             <intent-filter
@@ -111,7 +111,7 @@
         <activity
             android:name=".image_viewer.editor.EditImageActivity"
             android:label="@string/image_editor"
-            android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark"
+            android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark.Fallback"
             android:exported="true"
             >
             <intent-filter
@@ -159,7 +159,7 @@
             android:supportsPictureInPicture="true"
             android:resizeableActivity="true"
             android:taskAffinity="com.amaze.fileutilitiespip"
-            android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark"
+            android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark.Fallback"
             android:exported="true">
             <intent-filter
                 android:label="@string/video_player_full_screen"

diff --git a/app/src/main/java/com/amaze/fileutilities/image_viewer/ImageViewerActivity.kt b/app/src/main/java/com/amaze/fileutilities/image_viewer/ImageViewerActivity.kt
@@ -20,6 +20,7 @@
 
 package com.amaze.fileutilities.image_viewer
 
+import android.os.Build
 import android.os.Bundle
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager2.widget.ViewPager2
@@ -28,9 +29,10 @@ import com.amaze.fileutilities.R
 import com.amaze.fileutilities.databinding.GenericPagerViewerActivityBinding
 import com.amaze.fileutilities.utilis.Utils.Companion.showProcessingDialog
 import com.amaze.fileutilities.utilis.showToastInCenter
+import java.io.File
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import java.io.File
+
 
 class ImageViewerActivity : PermissionsActivity() {
 
@@ -42,6 +44,14 @@ class ImageViewerActivity : PermissionsActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            try {
+                setTheme(R.style.Theme_AmazeFileUtilities_FullScreen_Dark)
+            } catch (e: Exception) {
+                log.warn("failed to set theme Theme_AmazeFileUtilities_FullScreen_Dark")
+                setTheme(R.style.Theme_AmazeFileUtilities_FullScreen_Dark_Fallback)
+            }
+        }
         super.onCreate(savedInstanceState)
         setContentView(viewBinding.root)
 

diff --git a/app/src/main/java/com/amaze/fileutilities/image_viewer/editor/EditImageActivity.kt b/app/src/main/java/com/amaze/fileutilities/image_viewer/editor/EditImageActivity.kt
@@ -30,6 +30,7 @@ import android.graphics.Bitmap
 import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
 import android.view.MotionEvent
@@ -143,6 +144,14 @@ class EditImageActivity :
     )
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            try {
+                setTheme(R.style.Theme_AmazeFileUtilities_FullScreen_Dark)
+            } catch (e: Exception) {
+                log.warn("failed to set theme Theme_AmazeFileUtilities_FullScreen_Dark")
+                setTheme(R.style.Theme_AmazeFileUtilities_FullScreen_Dark_Fallback)
+            }
+        }
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_edit_image)
         initViews()

diff --git a/app/src/main/java/com/amaze/fileutilities/video_player/VideoPlayerActivity.kt b/app/src/main/java/com/amaze/fileutilities/video_player/VideoPlayerActivity.kt
@@ -27,6 +27,7 @@ import android.view.View
 import android.view.WindowInsets
 import android.view.WindowInsetsController
 import android.view.WindowManager
+import com.amaze.fileutilities.R
 
 class VideoPlayerActivity : BaseVideoPlayerActivity() {
 
@@ -39,6 +40,14 @@ class VideoPlayerActivity : BaseVideoPlayerActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            try {
+                setTheme(R.style.Theme_AmazeFileUtilities_FullScreen_Dark)
+            } catch (e: Exception) {
+                log.warn("failed to set theme Theme_AmazeFileUtilities_FullScreen_Dark", e)
+                setTheme(R.style.Theme_AmazeFileUtilities_FullScreen_Dark_Fallback)
+            }
+        }
         initLocalVideoModel(intent)
         super.onCreate(savedInstanceState)
         handleVideoPlayerActivityResources()

diff --git a/app/src/main/res/values-v27/themes.xml → app/src/main/res/values-v28/themes.xml b/app/src/main/res/values-v27/themes.xml → app/src/main/res/values-v28/themes.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -66,6 +66,12 @@
         <item name="android:windowBackground">@color/black</item>
     </style>
 
+    <style name="Theme.AmazeFileUtilities.FullScreen.Dark.Fallback" parent="Theme.AmazeFileUtilities.Dark">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowBackground">@color/black</item>
+    </style>
+
     <style name="BottomNavigationTheme" parent="Theme.AppCompat.Light">
         <item name="colorPrimary">@color/blue</item>
         <item name="android:textColorSecondary">@color/blue</item>