From e76cae016ef64b96862b372b2a0e80c564d9f5fd Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Fri, 3 Jan 2025 15:21:20 +0100
Subject: [PATCH] fix(platform): Fix edge to edge glitch in MainActivity

Refs: #1713

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 .../nextcloud/deck/ui/main/MainActivity.java  | 27 ++++++++++++
 app/src/main/res/layout/activity_main.xml     | 43 ++++++++++---------
 .../fragment_card_edit_tab_comments.xml       |  3 +-
 3 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java
index f8b193d21..1564faa26 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java
@@ -16,6 +16,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResultLauncher;
@@ -30,10 +31,12 @@
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.core.graphics.Insets;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.splashscreen.SplashScreen;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -243,6 +246,28 @@ protected void onCreate(Bundle savedInstanceState) {
 
         drawerMenuInflater = new DrawerMenuInflater<>(this, binding.navigationView.getMenu());
 
+        ViewCompat.setOnApplyWindowInsetsListener(binding.navigationView, (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            final var mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+            mlp.topMargin = insets.top;
+            mlp.leftMargin = insets.left;
+            mlp.bottomMargin = insets.bottom;
+            mlp.rightMargin = insets.right;
+            v.setLayoutParams(mlp);
+            return WindowInsetsCompat.CONSUMED;
+        });
+        ViewCompat.setOnApplyWindowInsetsListener(binding.fab, (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            final var mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+            final var defaultMargin = getResources().getDimensionPixelSize(R.dimen.fab_margin);
+            mlp.topMargin = insets.top + defaultMargin;
+            mlp.leftMargin = insets.left + defaultMargin;
+            mlp.bottomMargin = insets.bottom + defaultMargin;
+            mlp.rightMargin = insets.right + defaultMargin;
+            v.setLayoutParams(mlp);
+            return WindowInsetsCompat.CONSUMED;
+        });
+
         preferencesViewModel.isDebugModeEnabled$().observe(this, enabled -> headerBinding.copyDebugLogs.setVisibility(enabled ? View.VISIBLE : View.GONE));
         filterViewModel.hasActiveFilter().observe(this, hasActiveFilter -> {
             final var menu = binding.toolbar.getMenu();
@@ -506,6 +531,8 @@ private void applyBoardTheme(@ColorInt int color) {
 
         utils.deck.themeSearchBar(binding.toolbar);
         utils.deck.themeSearchView(binding.searchView);
+        utils.deck.themeAppBarLayoutAndStatusBarWithBackground(binding.appBarLayout);
+//        utils.deck.themeStatusBar(this, binding.appBarLayout);
         utils.deck.themeTabLayoutOnTransparent(binding.stackTitles);
         utils.deck.themeEmptyContentView(binding.emptyContentViewStacks);
         utils.deck.themeEmptyContentView(binding.emptyContentViewSearchNoTerm);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4f4c813b9..5daf49309 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
@@ -13,6 +12,22 @@
         android:layout_height="match_parent"
         tools:context=".ui.main.MainActivity">
 
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:windowBackground"
+            android:fitsSystemWindows="true">
+
+            <com.google.android.material.search.SearchBar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:menu="@menu/main_menu"
+                app:navigationIcon="@drawable/ic_arrow_back_24dp" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -49,7 +64,7 @@
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipe_refresh_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -116,26 +131,11 @@
                     <androidx.viewpager2.widget.ViewPager2
                         android:id="@+id/viewPager"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
         </LinearLayout>
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appBarLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:windowBackground">
-
-            <com.google.android.material.search.SearchBar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:menu="@menu/main_menu"
-                app:navigationIcon="@drawable/ic_arrow_back_24dp" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
@@ -144,7 +144,8 @@
             android:layout_margin="@dimen/fab_margin"
             android:text="@string/add_card"
             android:visibility="gone"
-            app:icon="@drawable/ic_add_24dp" />
+            app:icon="@drawable/ic_add_24dp"
+            tools:visibility="visible" />
 
         <com.google.android.material.search.SearchView
             android:id="@+id/search_view"
@@ -188,7 +189,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:fitsSystemWindows="false"
+        android:fitsSystemWindows="true"
         android:theme="@style/NavigationView"
         app:headerLayout="@layout/nav_header_main"
         app:itemRippleColor="?attr/colorControlHighlight"
diff --git a/app/src/main/res/layout/fragment_card_edit_tab_comments.xml b/app/src/main/res/layout/fragment_card_edit_tab_comments.xml
index e8c29254f..f4f085498 100644
--- a/app/src/main/res/layout/fragment_card_edit_tab_comments.xml
+++ b/app/src/main/res/layout/fragment_card_edit_tab_comments.xml
@@ -30,7 +30,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
             android:id="@+id/replyComment"