Merge pull request #1402 from Fry-kun/layout-fix2

Fix layout for screens where it's merged with status bar
ukanth · Nov 2, 2024 · 8e8129c · 8e8129c
2 parents d13af7e + 55efc71
commit 8e8129c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/app/src/main/res/layout/activity_custom_rules.xml b/app/src/main/res/layout/activity_custom_rules.xml
@@ -5,7 +5,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    tools:context="dev.ukanth.ufirewall.activity.CustomRulesActivity">
+    tools:context="dev.ukanth.ufirewall.activity.CustomRulesActivity"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/custom_toolbar_rules"

diff --git a/app/src/main/res/layout/activity_prefs.xml b/app/src/main/res/layout/activity_prefs.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/customscript.xml b/app/src/main/res/layout/customscript.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/custom_toolbar"

diff --git a/app/src/main/res/layout/help_about.xml b/app/src/main/res/layout/help_about.xml
@@ -4,7 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:duplicateParentState="false"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/help_toolbar"

diff --git a/app/src/main/res/layout/log_view.xml b/app/src/main/res/layout/log_view.xml
@@ -5,7 +5,8 @@
     android:layout_height="fill_parent"
     android:duplicateParentState="false"
     android:background="?attr/itemBackground"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/rule_toolbar"

diff --git a/app/src/main/res/layout/rules.xml b/app/src/main/res/layout/rules.xml
@@ -5,7 +5,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:background="?attr/itemBackground"
-    android:duplicateParentState="false">
+    android:duplicateParentState="false"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/rule_toolbar"