From 3b4807a5b6e43ea15addc46ab905f4bfdb4c607b Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Fri, 19 Sep 2025 02:25:05 +0800
Subject: [PATCH] Fix bug

---
 app/src/mobile/AndroidManifest.xml                    |  3 ++-
 .../fongmi/android/tv/ui/activity/VideoActivity.java  | 11 +----------
 .../com/fongmi/android/tv/ui/base/BaseActivity.java   |  2 +-
 app/src/mobile/res/values-v35/styles.xml              | 10 ++++++++++
 app/src/mobile/res/values/styles.xml                  |  5 ++++-
 5 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 app/src/mobile/res/values-v35/styles.xml

diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml
index 3322daf5a..cab28139d 100644
--- a/app/src/mobile/AndroidManifest.xml
+++ b/app/src/mobile/AndroidManifest.xml
@@ -112,7 +112,8 @@
             android:launchMode="singleTop"
             android:resizeableActivity="true"
             android:screenOrientation="fullUser"
-            android:supportsPictureInPicture="true" />
+            android:supportsPictureInPicture="true"
+            android:theme="@style/Theme.Video" />
 
         <receiver
             android:name=".receiver.ShortcutReceiver"
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 8fa2a6773..0834b4fb8 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -8,6 +8,7 @@ import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.SpannableStringBuilder;
@@ -24,9 +25,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
@@ -382,13 +380,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
         mBinding.control.action.danmaku.setVisibility(Setting.isDanmakuLoad() ? View.VISIBLE : View.GONE);
         mBinding.control.action.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Setting.getReset()]);
         mBinding.video.addOnLayoutChangeListener((view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> mPiP.update(this, view));
-        ViewCompat.setOnApplyWindowInsetsListener(mBinding.video, (v, insets) -> {
-            Insets sysBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
-            lp.topMargin = sysBars.top;
-            v.setLayoutParams(lp);
-            return insets;
-        });
     }
 
     private void setVideoView(boolean isInPictureInPictureMode) {
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java
index 3a9487334..e53617e13 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java
@@ -33,7 +33,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        enableEdgeToEdge();
+        if (transparent()) enableEdgeToEdge();
         setContentView(getBinding().getRoot());
         EventBus.getDefault().register(this);
         initView(savedInstanceState);
diff --git a/app/src/mobile/res/values-v35/styles.xml b/app/src/mobile/res/values-v35/styles.xml
new file mode 100644
index 000000000..5731c1018
--- /dev/null
+++ b/app/src/mobile/res/values-v35/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Video" parent="Theme.App">
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:navigationBarColor">@color/transparent</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/mobile/res/values/styles.xml b/app/src/mobile/res/values/styles.xml
index 19a3aa939..5af3cab83 100644
--- a/app/src/mobile/res/values/styles.xml
+++ b/app/src/mobile/res/values/styles.xml
@@ -5,7 +5,6 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="android:statusBarColor">@color/transparent</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:navigationBarColor">@color/transparent</item>
         <item name="bottomSheetDialogTheme">@style/BottomSheetDialog</item>
     </style>
@@ -19,6 +18,10 @@
 
     <style name="Theme.App" parent="Theme.Base" />
 
+    <style name="Theme.Video" parent="Theme.App">
+        <item name="android:statusBarColor">@color/black</item>
+    </style>
+
     <style name="Control" />
 
     <style name="Control.Action">