From dc48384de776c98850c046244dfd0c3088734eb4 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 4 Jul 2023 11:07:30 +0800
Subject: [PATCH] Fix status bar bug for some devices

---
 app/src/main/res/layout/activity_crash.xml                    | 1 +
 .../java/com/fongmi/android/tv/ui/base/BaseActivity.java      | 4 +++-
 app/src/mobile/res/layout/activity_collect.xml                | 1 +
 app/src/mobile/res/layout/activity_history.xml                | 1 +
 app/src/mobile/res/layout/activity_keep.xml                   | 1 +
 app/src/mobile/res/layout/activity_main.xml                   | 3 ++-
 app/src/mobile/res/layout/activity_vod.xml                    | 1 +
 7 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml
index d003e0e9a..a9bbe8d62 100644
--- a/app/src/main/res/layout/activity_crash.xml
+++ b/app/src/main/res/layout/activity_crash.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:gravity="center"
     android:orientation="vertical">
 
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 806fd0ee5..19edab990 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
@@ -5,6 +5,7 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.View;
+import android.view.Window;
 import android.view.WindowManager;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -76,8 +77,9 @@ public abstract class BaseActivity extends AppCompatActivity {
     }
 
     private void setTransparent(Activity activity) {
-        activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
         activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
     }
 
diff --git a/app/src/mobile/res/layout/activity_collect.xml b/app/src/mobile/res/layout/activity_collect.xml
index ec819e9c6..66d2e4b9a 100644
--- a/app/src/mobile/res/layout/activity_collect.xml
+++ b/app/src/mobile/res/layout/activity_collect.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/app/src/mobile/res/layout/activity_history.xml b/app/src/mobile/res/layout/activity_history.xml
index f4ef22ce5..181c12aa8 100644
--- a/app/src/mobile/res/layout/activity_history.xml
+++ b/app/src/mobile/res/layout/activity_history.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/app/src/mobile/res/layout/activity_keep.xml b/app/src/mobile/res/layout/activity_keep.xml
index 131e2e646..950fe46ac 100644
--- a/app/src/mobile/res/layout/activity_keep.xml
+++ b/app/src/mobile/res/layout/activity_keep.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/app/src/mobile/res/layout/activity_main.xml b/app/src/mobile/res/layout/activity_main.xml
index 5ef3d1aa5..91426a895 100644
--- a/app/src/mobile/res/layout/activity_main.xml
+++ b/app/src/mobile/res/layout/activity_main.xml
@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/container"
diff --git a/app/src/mobile/res/layout/activity_vod.xml b/app/src/mobile/res/layout/activity_vod.xml
index c0ebc53c1..f4edec1e8 100644
--- a/app/src/mobile/res/layout/activity_vod.xml
+++ b/app/src/mobile/res/layout/activity_vod.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <TextView