From 569c7d404af91371dc82fbc753e4479013eee561 Mon Sep 17 00:00:00 2001
From: Christian Maier <christian.maier@snabble.io>
Date: Tue, 21 Jan 2025 09:31:29 +0100
Subject: [PATCH 1/2] Add `fitsSystemWindows` for edge-to-edge support

---
 ui/src/main/res/layout/snabble_activity_checkout.xml         | 1 +
 ui/src/main/res/layout/snabble_activity_simple_fragment.xml  | 5 +++--
 .../layout/snabble_activity_simple_fragment_with_toolbar.xml | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/src/main/res/layout/snabble_activity_checkout.xml b/ui/src/main/res/layout/snabble_activity_checkout.xml
index 1017199b73..7b99a9bcc5 100644
--- a/ui/src/main/res/layout/snabble_activity_checkout.xml
+++ b/ui/src/main/res/layout/snabble_activity_checkout.xml
@@ -4,6 +4,7 @@
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <!-- Workaround for alignment bug in MaterialToolbar when setting padding -->
diff --git a/ui/src/main/res/layout/snabble_activity_simple_fragment.xml b/ui/src/main/res/layout/snabble_activity_simple_fragment.xml
index 8e31af6da4..f6aa73d8b6 100644
--- a/ui/src/main/res/layout/snabble_activity_simple_fragment.xml
+++ b/ui/src/main/res/layout/snabble_activity_simple_fragment.xml
@@ -2,6 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/ui/src/main/res/layout/snabble_activity_simple_fragment_with_toolbar.xml b/ui/src/main/res/layout/snabble_activity_simple_fragment_with_toolbar.xml
index 7d98b0a63f..41824f6174 100644
--- a/ui/src/main/res/layout/snabble_activity_simple_fragment_with_toolbar.xml
+++ b/ui/src/main/res/layout/snabble_activity_simple_fragment_with_toolbar.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"

From 7f6745cc2663d53f34efb2de7abcd5ce45eceaa0 Mon Sep 17 00:00:00 2001
From: Christian Maier <christian.maier@snabble.io>
Date: Tue, 21 Jan 2025 09:49:31 +0100
Subject: [PATCH 2/2] Update CHANGELOG

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23d6a6a2ef..d21d56f116 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 ## UNRELEASED
 ### Added
+### Changed
+### Removed
+### Fixed
+
+## [0.80.4]
+### Added
+* ui: Improve edge-to-edge support for apps targing API level 35
 * ui: Add UI for deposit return vouchers (APPS-1643)
 * core: Handle invalid items (APPS-2039)
 * ui/core: Integrate new states for deposit return vouchers into the checkout process and handle them