enable main window edge-to-edge attempt after reading documentation a bit

7 files changed, 35 insertions, 8 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index 7ccfb646..9d9d0901 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
@@ -2,7 +2,6 @@ package org.fox.ttrss;
 
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -17,7 +16,10 @@ import android.view.View;
 
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.graphics.Insets;
 import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
@@ -68,6 +70,8 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 
 		setSmallScreen(findViewById(R.id.sw600dp_anchor) == null);
 
+		applyEdgeToEdgeInsets();
+
 		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
 
@@ -221,7 +225,32 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 		}
 	}
 
-    protected void onPostCreate(Bundle savedInstanceState) {
+	private void applyEdgeToEdgeInsets() {
+		// https://stackoverflow.com/questions/79018063/trying-to-understand-edge-to-edge-in-android
+		// https://developer.android.com/develop/ui/views/layout/edge-to-edge
+
+		View coordinatorView = findViewById(R.id.headlines_coordinator);
+
+		if (coordinatorView != null) {
+			ViewCompat.setOnApplyWindowInsetsListener(coordinatorView, (v, windowInsets) -> {
+				Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+				v.setPadding(0, insets.top, 0, insets.bottom);
+				return windowInsets;
+			});
+		}
+
+		View navigationView = findViewById(R.id.modal_navigation_view);
+
+		if (navigationView != null) {
+			ViewCompat.setOnApplyWindowInsetsListener(navigationView, (v, windowInsets) -> {
+				Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+				v.setPadding(0, insets.top, 0, insets.bottom);
+				return windowInsets;
+			});
+		}
+	}
+
+	protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
         if (m_drawerToggle != null) m_drawerToggle.syncState();
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
index f44e0e4a..eb2d9c91 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
@@ -22,7 +22,7 @@
 
         <com.google.android.material.navigation.NavigationView
             xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/navigationView"
+            android:id="@+id/navigation_view"
             android:layout_width="300dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
index 1f422b6a..4ea81118 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
@@ -2,7 +2,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:fitsSystemWindows="true"
     android:layout_height="match_parent">
 
     <include layout="@layout/layout_master_phone" />
diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml
index 1f422b6a..4ea81118 100755
--- a/org.fox.ttrss/src/main/res/layout/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml
@@ -2,7 +2,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:fitsSystemWindows="true"
     android:layout_height="match_parent">
 
     <include layout="@layout/layout_master_phone" />
diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
index f6e5db8f..4ea81118 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
index 3540c094..f4954259 100755
--- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml
+++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="96dp"
+    android:layout_height="72dp"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
diff --git a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml
index e19d4c90..0dda6c7b 100644
--- a/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/layout_master_phone.xml
@@ -6,6 +6,7 @@
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/headlines_coordinator"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -36,7 +37,7 @@
 
     <com.google.android.material.navigation.NavigationView
         xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/navigationView"
+        android:id="@+id/modal_navigation_view"
         android:layout_width="300dp"
         android:layout_height="match_parent"
         android:layout_gravity="start">