From 0cecbc969b471977f520211990ad88ed2aa9eccc Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 16 Jan 2025 16:07:05 +0100
Subject: [PATCH 001/109] Updated target SDK to 35

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index d93c363dc61..b22d4ea92f7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -39,7 +39,7 @@ gradle.ext.mediaPickerSourceWordPressBinaryPath = "org.wordpress.mediapicker:sou
 
 gradle.ext {
     compileSdkVersion = 35
-    targetSdkVersion = 34
+    targetSdkVersion = 35
     minSdkVersion = 26
 }
 

From c8eaca4f6b54010621d783711f62b529715e1f41 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 17 Jan 2025 11:03:36 +0100
Subject: [PATCH 002/109] Main activity to look like before - less or more

---
 WooCommerce/src/main/AndroidManifest.xml      | 43 +++++++++++++------
 .../android/ui/main/MainActivity.kt           |  5 +++
 .../ui/main/MainActivityEdgeToEdgeHelper.kt   | 28 ++++++++++++
 .../src/main/res/values/styles_base.xml       |  1 +
 WooCommerce/src/main/res/values/themes.xml    |  4 +-
 5 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100644 WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt

diff --git a/WooCommerce/src/main/AndroidManifest.xml b/WooCommerce/src/main/AndroidManifest.xml
index f3e73dc44b2..78e92f79d10 100644
--- a/WooCommerce/src/main/AndroidManifest.xml
+++ b/WooCommerce/src/main/AndroidManifest.xml
@@ -110,7 +110,8 @@
         <activity
             android:name=".ui.login.MagicLinkInterceptActivity"
             android:exported="true"
-            android:theme="@style/LoginTheme">
+            android:theme="@style/LoginTheme"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -124,53 +125,67 @@
         </activity>
         <activity
             android:name=".ui.prefs.AppSettingsActivity"
-            android:theme="@style/Theme.Woo.DayNight" />
+            android:theme="@style/Theme.Woo.DayNight"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.prefs.UnifiedAboutScreenActivity"
-            android:theme="@style/Theme.Woo.UnifiedAbout" />
+            android:theme="@style/Theme.Woo.UnifiedAbout"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".support.WooLogViewerActivity"
             android:label="@string/logviewer_activity_title"
-            android:theme="@style/Theme.Woo.DayNight" />
+            android:theme="@style/Theme.Woo.DayNight"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".support.SSRActivity"
             android:label="@string/support_system_status_report"
-            android:theme="@style/Theme.Woo.DayNight" />
+            android:theme="@style/Theme.Woo.DayNight"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".support.requests.SupportRequestFormActivity"
             android:label="@string/support_request"
-            android:theme="@style/Theme.Woo.DayNight" />
+            android:theme="@style/Theme.Woo.DayNight"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".support.help.HelpActivity"
             android:label="@string/support_help"
-            android:theme="@style/Theme.Woo.DayNight" />
+            android:theme="@style/Theme.Woo.DayNight"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="zendesk.support.guide.HelpCenterActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk" />
+            android:theme="@style/Theme.Woo.DayNight.Zendesk"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="zendesk.support.guide.ViewArticleActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk" />
+            android:theme="@style/Theme.Woo.DayNight.Zendesk"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="zendesk.support.request.RequestActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk" />
+            android:theme="@style/Theme.Woo.DayNight.Zendesk"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="zendesk.support.requestlist.RequestListActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk" />
+            android:theme="@style/Theme.Woo.DayNight.Zendesk"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.wordpress.android.mediapicker.ui.MediaPickerActivity"
-            android:theme="@style/Theme.Woo.DayNight" />
+            android:theme="@style/Theme.Woo.DayNight"
+            android:windowSoftInputMode="adjustResize" />
         <!--        Make sure portrait screen orientation is not required for the installation of the app -->
         <activity
             android:name="com.google.mlkit.vision.codescanner.internal.GmsBarcodeScanningDelegateActivity"
             android:screenOrientation="unspecified"
+            android:windowSoftInputMode="adjustResize"
             tools:replace="android:screenOrientation" />
         <activity
             android:name="com.woocommerce.android.ui.woopos.root.WooPosActivity"
+            android:exported="false"
             android:theme="@style/Theme.WooPos"
-            android:exported="false" />
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderActivity"
-            android:theme="@style/Theme.WooPos.Transparent" />
+            android:theme="@style/Theme.WooPos.Transparent"
+            android:windowSoftInputMode="adjustResize" />
 
         <!-- Stats today app widget -->
         <meta-data
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
index 84bcc116432..7de999bc5ba 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
@@ -181,6 +181,8 @@ class MainActivity :
 
     @Inject lateinit var animatorHelper: MainAnimatorHelper
 
+    @Inject lateinit var edgeToEdgeHelper: MainActivityEdgeToEdgeHelper
+
     private val viewModel: MainActivityViewModel by viewModels()
 
     private var unfilledOrderCount: Int = 0
@@ -302,7 +304,10 @@ class MainActivity :
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        edgeToEdgeHelper.applyEdgeToEdgeSettings(binding.appBarLayout)
+
         toolbar = binding.toolbar.toolbar
+
         setSupportActionBar(toolbar)
         toolbar.navigationIcon = null
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
new file mode 100644
index 00000000000..ec4d05f5972
--- /dev/null
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -0,0 +1,28 @@
+package com.woocommerce.android.ui.main
+
+import android.graphics.Color
+import android.view.View
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import javax.inject.Inject
+
+class MainActivityEdgeToEdgeHelper @Inject constructor() {
+    fun applyEdgeToEdgeSettings(viewToApplyPadding: View) {
+        (viewToApplyPadding.context as ComponentActivity).enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
+            navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
+
+        ViewCompat.setOnApplyWindowInsetsListener(viewToApplyPadding) { v, insets ->
+            val innerPadding = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                    or WindowInsetsCompat.Type.displayCutout()
+            )
+            v.setPadding(0, innerPadding.top, 0, 0)
+            insets
+        }
+    }
+}
diff --git a/WooCommerce/src/main/res/values/styles_base.xml b/WooCommerce/src/main/res/values/styles_base.xml
index cde73b4e00d..4f8dc66ecc9 100644
--- a/WooCommerce/src/main/res/values/styles_base.xml
+++ b/WooCommerce/src/main/res/values/styles_base.xml
@@ -34,6 +34,7 @@ theme across the entire app. Overridden versions should be added to the styles.x
     <style name="Woo.CollapsedToolbarLayout" parent="Widget.MaterialComponents.Toolbar.Surface">
         <item name="layout_scrollFlags">scroll|exitUntilCollapsed</item>
         <item name="android:background">@color/color_toolbar</item>
+        <item name="statusBarScrim">@android:color/transparent</item>
         <item name="collapsedTitleTextAppearance">
             @style/TextAppearance.Woo.CollapsingToolbar.Collapsed
         </item>
diff --git a/WooCommerce/src/main/res/values/themes.xml b/WooCommerce/src/main/res/values/themes.xml
index f9b2a46ef27..6b4fee2c0a2 100644
--- a/WooCommerce/src/main/res/values/themes.xml
+++ b/WooCommerce/src/main/res/values/themes.xml
@@ -12,7 +12,7 @@
     </style>
 
     <style name="Theme.Woo" parent="Theme.WooBase">
-        <item name="android:statusBarColor">@color/color_status_bar</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
     </style>
     <style name="Theme.WooBase" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
@@ -38,7 +38,7 @@
         <item name="colorControlNormal">@color/color_primary</item>
         <item name="android:colorControlActivated">@color/color_primary</item>
         <item name="scrimBackground">@color/color_scrim_background</item>
-<!--        <item name="android:navigationBarColor">@color/nav_bar</item>-->
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="elevationOverlayEnabled">true</item>
         <item name="elevationOverlayColor">@color/woo_white</item>
         <item name="android:textColorLink">@color/color_primary</item>

From 1b71885ec312d9ba81ffce434aa87e6bc97eafc6 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 17 Jan 2025 11:16:51 +0100
Subject: [PATCH 003/109] Enable edge to edge for all the activities in the app

---
 .../com/woocommerce/android/AppInitializer.kt |  4 +++
 .../ui/main/MainActivityEdgeToEdgeHelper.kt   |  9 ------
 .../util/ApplicationEdgeToEdgeEnabler.kt      | 32 +++++++++++++++++++
 3 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/AppInitializer.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/AppInitializer.kt
index 45e975ab368..023a1bef056 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/AppInitializer.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/AppInitializer.kt
@@ -45,6 +45,7 @@ import com.woocommerce.android.ui.login.AccountRepository
 import com.woocommerce.android.ui.main.MainActivity
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderOnboardingChecker
 import com.woocommerce.android.util.AppThemeUtils
+import com.woocommerce.android.util.ApplicationEdgeToEdgeEnabler
 import com.woocommerce.android.util.ApplicationLifecycleMonitor
 import com.woocommerce.android.util.ApplicationLifecycleMonitor.ApplicationLifecycleListener
 import com.woocommerce.android.util.GetWooCorePluginCachedVersion
@@ -160,6 +161,8 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
 
     @Inject lateinit var backgroundUpdatesDisabled: BackgroundUpdatesDisabled
 
+    @Inject lateinit var edgeToEdgeEnabler: ApplicationEdgeToEdgeEnabler
+
     private var connectionReceiverRegistered = false
 
     private lateinit var application: Application
@@ -219,6 +222,7 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
         val lifecycleMonitor = ApplicationLifecycleMonitor(this)
         application.registerActivityLifecycleCallbacks(lifecycleMonitor)
         application.registerComponentCallbacks(lifecycleMonitor)
+        application.registerActivityLifecycleCallbacks(edgeToEdgeEnabler)
 
         trackStartupAnalytics()
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index ec4d05f5972..ee4646f1f12 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -1,21 +1,12 @@
 package com.woocommerce.android.ui.main
 
-import android.graphics.Color
 import android.view.View
-import androidx.activity.ComponentActivity
-import androidx.activity.SystemBarStyle
-import androidx.activity.enableEdgeToEdge
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import javax.inject.Inject
 
 class MainActivityEdgeToEdgeHelper @Inject constructor() {
     fun applyEdgeToEdgeSettings(viewToApplyPadding: View) {
-        (viewToApplyPadding.context as ComponentActivity).enableEdgeToEdge(
-            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
-            navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
-        )
-
         ViewCompat.setOnApplyWindowInsetsListener(viewToApplyPadding) { v, insets ->
             val innerPadding = insets.getInsets(
                 WindowInsetsCompat.Type.systemBars()
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
new file mode 100644
index 00000000000..e023b65e995
--- /dev/null
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
@@ -0,0 +1,32 @@
+package com.woocommerce.android.util
+
+import android.app.Activity
+import android.app.Application
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.enableEdgeToEdge
+import javax.inject.Inject
+
+class ApplicationEdgeToEdgeEnabler @Inject constructor() : Application.ActivityLifecycleCallbacks {
+    override fun onActivityCreated(activity: Activity, bindle: Bundle?) {
+        (activity as ComponentActivity).enableEdgeToEdge()
+    }
+
+    override fun onActivityStarted(activity: Activity) {
+    }
+
+    override fun onActivityResumed(activity: Activity) {
+    }
+
+    override fun onActivityPaused(activity: Activity) {
+    }
+
+    override fun onActivityStopped(activity: Activity) {
+    }
+
+    override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {
+    }
+
+    override fun onActivityDestroyed(activity: Activity) {
+    }
+}

From eabfc03ca4aab207b348c91a59e3f3939acac2c9 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 17 Jan 2025 11:51:49 +0100
Subject: [PATCH 004/109] Changed order subtitle and toolbar otherwise on some
 devices toolbar partially covers subtitile

---
 WooCommerce/src/main/res/layout/activity_main.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WooCommerce/src/main/res/layout/activity_main.xml b/WooCommerce/src/main/res/layout/activity_main.xml
index f3344b6fe21..8b2f35459dd 100644
--- a/WooCommerce/src/main/res/layout/activity_main.xml
+++ b/WooCommerce/src/main/res/layout/activity_main.xml
@@ -29,6 +29,10 @@
                 android:layout_height="@dimen/expanded_toolbar_height"
                 app:titleEnabled="true">
 
+                <include
+                    android:id="@+id/toolbar"
+                    layout="@layout/view_toolbar" />
+
                 <TextView
                     android:id="@+id/toolbar_subtitle"
                     style="@style/Woo.TextView.Subtitle1.ToolbarSubtitle"
@@ -39,10 +43,6 @@
                     android:visibility="gone"
                     tools:text="Subtitle shop name"
                     tools:visibility="visible" />
-
-                <include
-                    android:id="@+id/toolbar"
-                    layout="@layout/view_toolbar" />
             </com.google.android.material.appbar.CollapsingToolbarLayout>
 
             <View

From 96883629b507645095501e60d1d11d68d22295ad Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 17 Jan 2025 12:00:29 +0100
Subject: [PATCH 005/109] added comments into the empty methods so detekt is
 happy

---
 .../android/util/ApplicationEdgeToEdgeEnabler.kt            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
index e023b65e995..6585bdd08ad 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
@@ -13,20 +13,26 @@ class ApplicationEdgeToEdgeEnabler @Inject constructor() : Application.ActivityL
     }
 
     override fun onActivityStarted(activity: Activity) {
+        // no-op
     }
 
     override fun onActivityResumed(activity: Activity) {
+        // no-op
     }
 
     override fun onActivityPaused(activity: Activity) {
+        // no-op
     }
 
     override fun onActivityStopped(activity: Activity) {
+        // no-op
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {
+        // no-op
     }
 
     override fun onActivityDestroyed(activity: Activity) {
+        // no-op
     }
 }

From 9807a6adaacddd3e180bab7b351f5a1f423217e8 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Wed, 22 Jan 2025 11:42:40 +0100
Subject: [PATCH 006/109] Simpulate edge to edge with using the same color as
 toolbar

---
 .../android/support/WooLogViewerActivity.kt   |  2 +-
 .../android/support/WooLogViewerScreen.kt     | 54 +++++++++++--------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerActivity.kt
index 2dabcf74a5c..1ebba5327b0 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerActivity.kt
@@ -35,7 +35,7 @@ class WooLogViewerActivity : AppCompatActivity() {
         intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + " " + title)
         try {
             startActivity(Intent.createChooser(intent, getString(R.string.share)))
-        } catch (ex: android.content.ActivityNotFoundException) {
+        } catch (_: android.content.ActivityNotFoundException) {
             ToastUtils.showToast(this, R.string.logviewer_share_error)
         }
     }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
index ec3b1bd842b..89533f77ab7 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
@@ -3,10 +3,14 @@ package com.woocommerce.android.support
 import androidx.annotation.ColorRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.text.selection.SelectionContainer
@@ -42,27 +46,35 @@ fun WooLogViewerScreen(
 ) {
     Scaffold(
         topBar = {
-            Toolbar(
-                title = stringResource(id = R.string.logviewer_activity_title),
-                onNavigationButtonClick = onBackPress,
-                actions = {
-                    IconButton(onClick = { onCopyButtonClick() }) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_copy_white_24dp),
-                            contentDescription = stringResource(id = R.string.copy),
-                            tint = colorResource(id = R.color.color_icon_menu)
-                        )
-                    }
-                    IconButton(onClick = { onShareButtonClick() }) {
-                        Icon(
-                            Icons.Filled.Share,
-                            contentDescription = stringResource(id = R.string.share),
-                            tint = colorResource(id = R.color.color_icon_menu)
-                        )
-                    }
-                }
-            )
-        }
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(color = colorResource(id = R.color.color_toolbar))
+            ) {
+                Toolbar(
+                    title = stringResource(id = R.string.logviewer_activity_title),
+                    onNavigationButtonClick = onBackPress,
+                    actions = {
+                        IconButton(onClick = { onCopyButtonClick() }) {
+                            Icon(
+                                painter = painterResource(R.drawable.ic_copy_white_24dp),
+                                contentDescription = stringResource(id = R.string.copy),
+                                tint = colorResource(id = R.color.color_icon_menu)
+                            )
+                        }
+                        IconButton(onClick = { onShareButtonClick() }) {
+                            Icon(
+                                Icons.Filled.Share,
+                                contentDescription = stringResource(id = R.string.share),
+                                tint = colorResource(id = R.color.color_icon_menu)
+                            )
+                        }
+                    },
+                    modifier = Modifier
+                        .windowInsetsPadding(WindowInsets.statusBars)
+                )
+            }
+        },
     ) { padding ->
         LogViewerEntries(
             entries,

From e7fca4c11f9d4f96566a098b701775c6d0baf16c Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 24 Jan 2025 14:42:26 +0100
Subject: [PATCH 007/109] Removed, assumable not used zendesk SDK's activities
 from the manifest: ViewArticleActivity, RequestActivity, RequestListActivity

---
 WooCommerce/src/main/AndroidManifest.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/WooCommerce/src/main/AndroidManifest.xml b/WooCommerce/src/main/AndroidManifest.xml
index 78e92f79d10..7ccb0133d1f 100644
--- a/WooCommerce/src/main/AndroidManifest.xml
+++ b/WooCommerce/src/main/AndroidManifest.xml
@@ -155,18 +155,6 @@
             android:name="zendesk.support.guide.HelpCenterActivity"
             android:theme="@style/Theme.Woo.DayNight.Zendesk"
             android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="zendesk.support.guide.ViewArticleActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk"
-            android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="zendesk.support.request.RequestActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk"
-            android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="zendesk.support.requestlist.RequestListActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk"
-            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.wordpress.android.mediapicker.ui.MediaPickerActivity"
             android:theme="@style/Theme.Woo.DayNight"

From 0abbf0da93f7820c967e933f742f97d03ac0cda7 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Mon, 3 Feb 2025 11:55:34 +0100
Subject: [PATCH 008/109] Removed unused
 zendesk.support.guide.HelpCenterActivity activity from the manifest

---
 WooCommerce/src/main/AndroidManifest.xml   | 4 ----
 WooCommerce/src/main/res/values/themes.xml | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/WooCommerce/src/main/AndroidManifest.xml b/WooCommerce/src/main/AndroidManifest.xml
index 7ccb0133d1f..02494d04db5 100644
--- a/WooCommerce/src/main/AndroidManifest.xml
+++ b/WooCommerce/src/main/AndroidManifest.xml
@@ -151,10 +151,6 @@
             android:label="@string/support_help"
             android:theme="@style/Theme.Woo.DayNight"
             android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="zendesk.support.guide.HelpCenterActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk"
-            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.wordpress.android.mediapicker.ui.MediaPickerActivity"
             android:theme="@style/Theme.Woo.DayNight"
diff --git a/WooCommerce/src/main/res/values/themes.xml b/WooCommerce/src/main/res/values/themes.xml
index 09660275733..7fc3830dbce 100644
--- a/WooCommerce/src/main/res/values/themes.xml
+++ b/WooCommerce/src/main/res/values/themes.xml
@@ -146,13 +146,6 @@
         <item name="android:textAppearance">@style/TextAppearance.Woo.Headline6</item>
     </style>
 
-    <style name="Theme.Woo.DayNight.Zendesk">
-        <item name="colorPrimary">@color/color_primary_surface</item>
-        <item name="colorPrimaryDark">@color/color_primary</item>
-        <item name="colorAccent">@color/color_primary</item>
-        <item name="android:colorForeground">@color/woo_black_90</item>
-    </style>
-
     <style name="MediaPicker.Button.Colored" parent="Woo.Button.Colored" />
 
     <style name="Theme.WooPos" parent="Theme.Woo">

From 91c5cf27420e685425a15c479b7dea3b5ad2886e Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Mon, 3 Feb 2025 12:12:55 +0100
Subject: [PATCH 009/109] Edge to edge support fo the SSRActivity

---
 .../woocommerce/android/support/SSRScreen.kt  | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
index e873885c6c6..ee849308c6e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
@@ -3,8 +3,12 @@ package com.woocommerce.android.support
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
@@ -51,26 +55,34 @@ fun SSRScreen(
 ) {
     Scaffold(
         topBar = {
-            Toolbar(
-                title = stringResource(id = R.string.support_system_status_report),
-                onNavigationButtonClick = onBackPressed,
-                actions = {
-                    IconButton(onClick = onCopyButtonClick, enabled = !isLoading) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_copy_white_24dp),
-                            contentDescription = stringResource(id = R.string.support_system_status_report_copy_label),
-                            tint = colorResource(id = R.color.color_icon_menu),
-                        )
-                    }
-                    IconButton(onClick = onShareButtonClick, enabled = !isLoading) {
-                        Icon(
-                            imageVector = Icons.Filled.Share,
-                            contentDescription = stringResource(id = R.string.support_system_status_report_share_label),
-                            tint = colorResource(id = R.color.color_icon_menu)
-                        )
-                    }
-                }
-            )
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(color = colorResource(id = R.color.color_toolbar))
+            ) {
+                Toolbar(
+                    title = stringResource(id = R.string.support_system_status_report),
+                    onNavigationButtonClick = onBackPressed,
+                    actions = {
+                        IconButton(onClick = onCopyButtonClick, enabled = !isLoading) {
+                            Icon(
+                                painter = painterResource(id = R.drawable.ic_copy_white_24dp),
+                                contentDescription = stringResource(id = R.string.support_system_status_report_copy_label),
+                                tint = colorResource(id = R.color.color_icon_menu),
+                            )
+                        }
+                        IconButton(onClick = onShareButtonClick, enabled = !isLoading) {
+                            Icon(
+                                imageVector = Icons.Filled.Share,
+                                contentDescription = stringResource(id = R.string.support_system_status_report_share_label),
+                                tint = colorResource(id = R.color.color_icon_menu)
+                            )
+                        }
+                    },
+                    modifier = Modifier
+                        .windowInsetsPadding(WindowInsets.statusBars)
+                )
+            }
         }
     ) { padding ->
         val scrollState = rememberScrollState()

From 57997e9ee753bf8975afb8cafd551cd69deab733 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Mon, 3 Feb 2025 12:16:46 +0100
Subject: [PATCH 010/109] Fixed formatting

---
 .../kotlin/com/woocommerce/android/support/SSRScreen.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
index ee849308c6e..280aad6f3ff 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
@@ -67,14 +67,18 @@ fun SSRScreen(
                         IconButton(onClick = onCopyButtonClick, enabled = !isLoading) {
                             Icon(
                                 painter = painterResource(id = R.drawable.ic_copy_white_24dp),
-                                contentDescription = stringResource(id = R.string.support_system_status_report_copy_label),
+                                contentDescription = stringResource(
+                                    id = R.string.support_system_status_report_copy_label
+                                ),
                                 tint = colorResource(id = R.color.color_icon_menu),
                             )
                         }
                         IconButton(onClick = onShareButtonClick, enabled = !isLoading) {
                             Icon(
                                 imageVector = Icons.Filled.Share,
-                                contentDescription = stringResource(id = R.string.support_system_status_report_share_label),
+                                contentDescription = stringResource(
+                                    id = R.string.support_system_status_report_share_label
+                                ),
                                 tint = colorResource(id = R.color.color_icon_menu)
                             )
                         }

From a571f9cdb81777baf97e8069f8470e1c368b02ed Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Mon, 3 Feb 2025 14:55:40 +0100
Subject: [PATCH 011/109] More idiomatic way of archiving of the same

---
 .../woocommerce/android/support/SSRScreen.kt  | 59 +++++++++----------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
index 280aad6f3ff..84cbf9caa9f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.windowInsetsPadding
@@ -55,39 +54,35 @@ fun SSRScreen(
 ) {
     Scaffold(
         topBar = {
-            Box(
+            Toolbar(
+                title = stringResource(id = R.string.support_system_status_report),
+                onNavigationButtonClick = onBackPressed,
+                actions = {
+                    IconButton(onClick = onCopyButtonClick, enabled = !isLoading) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_copy_white_24dp),
+                            contentDescription = stringResource(
+                                id = R.string.support_system_status_report_copy_label
+                            ),
+                            tint = colorResource(id = R.color.color_icon_menu),
+                        )
+                    }
+                    IconButton(onClick = onShareButtonClick, enabled = !isLoading) {
+                        Icon(
+                            imageVector = Icons.Filled.Share,
+                            contentDescription = stringResource(
+                                id = R.string.support_system_status_report_share_label
+                            ),
+                            tint = colorResource(id = R.color.color_icon_menu)
+                        )
+                    }
+                },
                 modifier = Modifier
-                    .fillMaxWidth()
                     .background(color = colorResource(id = R.color.color_toolbar))
-            ) {
-                Toolbar(
-                    title = stringResource(id = R.string.support_system_status_report),
-                    onNavigationButtonClick = onBackPressed,
-                    actions = {
-                        IconButton(onClick = onCopyButtonClick, enabled = !isLoading) {
-                            Icon(
-                                painter = painterResource(id = R.drawable.ic_copy_white_24dp),
-                                contentDescription = stringResource(
-                                    id = R.string.support_system_status_report_copy_label
-                                ),
-                                tint = colorResource(id = R.color.color_icon_menu),
-                            )
-                        }
-                        IconButton(onClick = onShareButtonClick, enabled = !isLoading) {
-                            Icon(
-                                imageVector = Icons.Filled.Share,
-                                contentDescription = stringResource(
-                                    id = R.string.support_system_status_report_share_label
-                                ),
-                                tint = colorResource(id = R.color.color_icon_menu)
-                            )
-                        }
-                    },
-                    modifier = Modifier
-                        .windowInsetsPadding(WindowInsets.statusBars)
-                )
-            }
-        }
+                    .windowInsetsPadding(WindowInsets.statusBars)
+            )
+        },
+        modifier = Modifier.fillMaxSize()
     ) { padding ->
         val scrollState = rememberScrollState()
 

From faf2792abdff4bb59eed69212e68a7231edddc7a Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Mon, 3 Feb 2025 15:30:17 +0100
Subject: [PATCH 012/109] Apply top inset for UnifiedAboutScreenActivity

---
 .../ui/prefs/UnifiedAboutScreenActivity.kt      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt
index 08ce22c0a18..188d368095f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt
@@ -2,6 +2,10 @@ package com.woocommerce.android.ui.prefs
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import androidx.fragment.app.FragmentContainerView
 import com.automattic.about.model.AboutConfigProvider
 import com.woocommerce.android.R
 import dagger.hilt.android.AndroidEntryPoint
@@ -14,6 +18,19 @@ class UnifiedAboutScreenActivity : AppCompatActivity(), AboutConfigProvider {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.unified_about_screen_activity)
+
+        applyTopInset()
+    }
+
+    private fun applyTopInset() {
+        val fragmentContainer = findViewById<FragmentContainerView>(
+            R.id.about_fragment_container
+        )
+        ViewCompat.setOnApplyWindowInsetsListener(fragmentContainer) { view, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(top = insets.top)
+            WindowInsetsCompat.CONSUMED
+        }
     }
 
     override fun getAboutConfig() = configBuilder.createAboutConfig(this)

From a7367944cf584ed2ce79de885ef01d96047062f8 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 09:28:59 +0100
Subject: [PATCH 013/109] Bottom padding so the while content is visible when
 scrolled up

---
 .../com/woocommerce/android/support/SSRScreen.kt     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
index 84cbf9caa9f..35090cb130a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
@@ -4,7 +4,11 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.windowInsetsPadding
@@ -118,7 +122,13 @@ fun SSRContent(isLoading: Boolean, formattedSSR: String, modifier: Modifier) {
             SelectionContainer {
                 Text(
                     text = formattedSSR,
-                    modifier = Modifier.padding(dimensionResource(R.dimen.major_100))
+                    modifier = Modifier
+                        .padding(dimensionResource(R.dimen.major_100))
+                        .padding(
+                            WindowInsets.navigationBars
+                                .only(WindowInsetsSides.Bottom)
+                                .asPaddingValues()
+                        )
                 )
             }
         }

From 4c14735d6dd0fd9b3c270577ed644f5d52a6e887 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 10:18:30 +0100
Subject: [PATCH 014/109] Fix for order creation

---
 .../totals/OrderCreateEditTotalsFullView.kt    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsFullView.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsFullView.kt
index 805c22e255e..130581161a7 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsFullView.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsFullView.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -62,12 +63,17 @@ import com.woocommerce.android.ui.orders.creation.OrderCreateEditViewModel
 @Composable
 fun OrderCreateEditTotalsView(viewModel: OrderCreateEditViewModel) {
     viewModel.totalsData.observeAsState().value?.let { state ->
-        OrderCreateEditTotalsView(
-            state,
-            modifier = Modifier.onGloballyPositioned {
-                state.onHeightChanged(it.size.height)
-            }
-        )
+        Box(
+            modifier = Modifier
+                .navigationBarsPadding()
+        ) {
+            OrderCreateEditTotalsView(
+                state,
+                modifier = Modifier.onGloballyPositioned {
+                    state.onHeightChanged(it.size.height)
+                }
+            )
+        }
     }
 }
 

From b0b5c3a78c1dec49d2e6bcea541091ae8dfa42ea Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 11:16:57 +0100
Subject: [PATCH 015/109] Revert "Fix for order creation"

This reverts commit 4c14735d6dd0fd9b3c270577ed644f5d52a6e887.
---
 .../totals/OrderCreateEditTotalsFullView.kt    | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsFullView.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsFullView.kt
index 130581161a7..805c22e255e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsFullView.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsFullView.kt
@@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -63,17 +62,12 @@ import com.woocommerce.android.ui.orders.creation.OrderCreateEditViewModel
 @Composable
 fun OrderCreateEditTotalsView(viewModel: OrderCreateEditViewModel) {
     viewModel.totalsData.observeAsState().value?.let { state ->
-        Box(
-            modifier = Modifier
-                .navigationBarsPadding()
-        ) {
-            OrderCreateEditTotalsView(
-                state,
-                modifier = Modifier.onGloballyPositioned {
-                    state.onHeightChanged(it.size.height)
-                }
-            )
-        }
+        OrderCreateEditTotalsView(
+            state,
+            modifier = Modifier.onGloballyPositioned {
+                state.onHeightChanged(it.size.height)
+            }
+        )
     }
 }
 

From 5aa6cdefac46595267c7477d603bc04861301434 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 11:17:52 +0100
Subject: [PATCH 016/109] Apply bottom inset for all but button navigation bar,
 as it handles it itself. Ideal solution would be adding paddings where needed
 in the fragments but it's 23 fragments in there so a bit out of scope for
 updating target sdk project and should be a separate one

---
 .../android/ui/main/MainActivity.kt           |  6 +++-
 .../ui/main/MainActivityEdgeToEdgeHelper.kt   | 29 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
index 9d9146123bb..68169a40129 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
@@ -304,7 +304,7 @@ class MainActivity :
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        edgeToEdgeHelper.applyEdgeToEdgeSettings(binding.appBarLayout)
+        edgeToEdgeHelper.applyEdgeToEdgeSettings(binding.appBarLayout, binding.snackRoot)
 
         toolbar = binding.toolbar.toolbar
 
@@ -1274,6 +1274,10 @@ class MainActivity :
         viewModel.showBottomNav()
     }
 
+    fun isBottomNavVisible(): Boolean {
+        return binding.bottomNav.visibility == View.VISIBLE
+    }
+
     /**
      * The Flexible in app update is successful.
      * Display a success snack bar and ask users to manually restart the app
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index ee4646f1f12..b12d0881550 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -5,14 +5,29 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import javax.inject.Inject
 
-class MainActivityEdgeToEdgeHelper @Inject constructor() {
-    fun applyEdgeToEdgeSettings(viewToApplyPadding: View) {
-        ViewCompat.setOnApplyWindowInsetsListener(viewToApplyPadding) { v, insets ->
-            val innerPadding = insets.getInsets(
-                WindowInsetsCompat.Type.systemBars()
-                    or WindowInsetsCompat.Type.displayCutout()
+class MainActivityEdgeToEdgeHelper @Inject constructor(private val activity: MainActivity) {
+    fun applyEdgeToEdgeSettings(appBarLayout: View, contentView: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(appBarLayout) { v, insets ->
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
             )
-            v.setPadding(0, innerPadding.top, 0, 0)
+
+            v.setPadding(0, systemInsets.top, 0, 0)
+            insets
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(contentView) { v, insets ->
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+
+            val isBottomNavVisible = activity.isBottomNavVisible()
+
+            // Apply bottom padding only if bottom nav is hidden
+            // because bottom nav is already handling the padding
+            val bottomPadding = if (!isBottomNavVisible) systemInsets.bottom else 0
+
+            v.setPadding(v.paddingLeft, v.paddingTop, v.paddingRight, bottomPadding)
             insets
         }
     }

From 1cc492cec8535a7dfb9fdaa11a788ec153b74620 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 14:53:58 +0100
Subject: [PATCH 017/109] Handle landscape mode too

---
 .../android/ui/main/MainActivityEdgeToEdgeHelper.kt           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index b12d0881550..6851bdca4ac 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -25,9 +25,9 @@ class MainActivityEdgeToEdgeHelper @Inject constructor(private val activity: Mai
 
             // Apply bottom padding only if bottom nav is hidden
             // because bottom nav is already handling the padding
-            val bottomPadding = if (!isBottomNavVisible) systemInsets.bottom else 0
+            val bottomPadding = if (isBottomNavVisible) 0 else systemInsets.bottom
 
-            v.setPadding(v.paddingLeft, v.paddingTop, v.paddingRight, bottomPadding)
+            v.setPadding(systemInsets.left, 0, systemInsets.right, bottomPadding)
             insets
         }
     }

From 30941257a5ff6606d6b57d9a6629b7eb6418918f Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 15:09:32 +0100
Subject: [PATCH 018/109] Small refactoring

---
 .../com/woocommerce/android/ui/main/MainActivity.kt      | 6 +-----
 .../android/ui/main/MainActivityEdgeToEdgeHelper.kt      | 9 +++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
index 68169a40129..7124b899af1 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
@@ -304,7 +304,7 @@ class MainActivity :
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        edgeToEdgeHelper.applyEdgeToEdgeSettings(binding.appBarLayout, binding.snackRoot)
+        edgeToEdgeHelper.applyEdgeToEdgeSettings(binding)
 
         toolbar = binding.toolbar.toolbar
 
@@ -1274,10 +1274,6 @@ class MainActivity :
         viewModel.showBottomNav()
     }
 
-    fun isBottomNavVisible(): Boolean {
-        return binding.bottomNav.visibility == View.VISIBLE
-    }
-
     /**
      * The Flexible in app update is successful.
      * Display a success snack bar and ask users to manually restart the app
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index 6851bdca4ac..f36023b8138 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -3,11 +3,12 @@ package com.woocommerce.android.ui.main
 import android.view.View
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import com.woocommerce.android.databinding.ActivityMainBinding
 import javax.inject.Inject
 
 class MainActivityEdgeToEdgeHelper @Inject constructor(private val activity: MainActivity) {
-    fun applyEdgeToEdgeSettings(appBarLayout: View, contentView: View) {
-        ViewCompat.setOnApplyWindowInsetsListener(appBarLayout) { v, insets ->
+    fun applyEdgeToEdgeSettings(binding: ActivityMainBinding) {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.appBarLayout) { v, insets ->
             val systemInsets = insets.getInsets(
                 WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
             )
@@ -16,12 +17,12 @@ class MainActivityEdgeToEdgeHelper @Inject constructor(private val activity: Mai
             insets
         }
 
-        ViewCompat.setOnApplyWindowInsetsListener(contentView) { v, insets ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.snackRoot) { v, insets ->
             val systemInsets = insets.getInsets(
                 WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
             )
 
-            val isBottomNavVisible = activity.isBottomNavVisible()
+            val isBottomNavVisible = binding.bottomNav.visibility == View.VISIBLE
 
             // Apply bottom padding only if bottom nav is hidden
             // because bottom nav is already handling the padding

From 43d92e59d1260008beb574c3fab19f1567da6a35 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 15:09:54 +0100
Subject: [PATCH 019/109] Removed unused param

---
 .../woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index f36023b8138..ffd59bc995a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -6,7 +6,7 @@ import androidx.core.view.WindowInsetsCompat
 import com.woocommerce.android.databinding.ActivityMainBinding
 import javax.inject.Inject
 
-class MainActivityEdgeToEdgeHelper @Inject constructor(private val activity: MainActivity) {
+class MainActivityEdgeToEdgeHelper @Inject constructor() {
     fun applyEdgeToEdgeSettings(binding: ActivityMainBinding) {
         ViewCompat.setOnApplyWindowInsetsListener(binding.appBarLayout) { v, insets ->
             val systemInsets = insets.getInsets(

From e5b71077817b7ab2296a944a1a4ceace6bafec1b Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 15:37:59 +0100
Subject: [PATCH 020/109] Proper handling of the landscape mode with 3 buttons
 navigation for SSRActivity

---
 .../com/woocommerce/android/support/SSRScreen.kt   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
index 35090cb130a..80491a545da 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
@@ -81,12 +81,16 @@ fun SSRScreen(
                         )
                     }
                 },
-                modifier = Modifier
-                    .background(color = colorResource(id = R.color.color_toolbar))
-                    .windowInsetsPadding(WindowInsets.statusBars)
             )
         },
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier
+            .fillMaxSize()
+            .background(color = colorResource(id = R.color.color_toolbar))
+            .windowInsetsPadding(
+                WindowInsets.systemBars.only(
+                    WindowInsetsSides.Start + WindowInsetsSides.Top + WindowInsetsSides.End
+                )
+            )
     ) { padding ->
         val scrollState = rememberScrollState()
 

From 69177b30d2c6a3ce54ce2eca9603530a0a65f072 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 15:47:42 +0100
Subject: [PATCH 021/109] Proper handling of the landscape mode with 3 buttons
 navigation for WooLogViewerScreen

---
 .../android/support/WooLogViewerScreen.kt     | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
index 89533f77ab7..d9e73d4608f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
@@ -3,13 +3,15 @@ package com.woocommerce.android.support
 import androidx.annotation.ColorRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -46,35 +48,35 @@ fun WooLogViewerScreen(
 ) {
     Scaffold(
         topBar = {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .background(color = colorResource(id = R.color.color_toolbar))
-            ) {
-                Toolbar(
-                    title = stringResource(id = R.string.logviewer_activity_title),
-                    onNavigationButtonClick = onBackPress,
-                    actions = {
-                        IconButton(onClick = { onCopyButtonClick() }) {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_copy_white_24dp),
-                                contentDescription = stringResource(id = R.string.copy),
-                                tint = colorResource(id = R.color.color_icon_menu)
-                            )
-                        }
-                        IconButton(onClick = { onShareButtonClick() }) {
-                            Icon(
-                                Icons.Filled.Share,
-                                contentDescription = stringResource(id = R.string.share),
-                                tint = colorResource(id = R.color.color_icon_menu)
-                            )
-                        }
-                    },
-                    modifier = Modifier
-                        .windowInsetsPadding(WindowInsets.statusBars)
-                )
-            }
+            Toolbar(
+                title = stringResource(id = R.string.logviewer_activity_title),
+                onNavigationButtonClick = onBackPress,
+                actions = {
+                    IconButton(onClick = { onCopyButtonClick() }) {
+                        Icon(
+                            painter = painterResource(R.drawable.ic_copy_white_24dp),
+                            contentDescription = stringResource(id = R.string.copy),
+                            tint = colorResource(id = R.color.color_icon_menu)
+                        )
+                    }
+                    IconButton(onClick = { onShareButtonClick() }) {
+                        Icon(
+                            Icons.Filled.Share,
+                            contentDescription = stringResource(id = R.string.share),
+                            tint = colorResource(id = R.color.color_icon_menu)
+                        )
+                    }
+                },
+            )
         },
+        modifier = Modifier
+            .fillMaxSize()
+            .background(color = colorResource(id = R.color.color_toolbar))
+            .windowInsetsPadding(
+                WindowInsets.systemBars.only(
+                    WindowInsetsSides.Start + WindowInsetsSides.Top + WindowInsetsSides.End
+                )
+            )
     ) { padding ->
         LogViewerEntries(
             entries,

From b7a15872934a0b925ddbe5f8a933040155fc7967 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 16:34:29 +0100
Subject: [PATCH 022/109] Proper handling of the landscape mode with 3 buttons
 navigation for SupportRequestFormActivity

---
 .../com/woocommerce/android/extensions/ViewExt.kt    | 12 ++++++++++++
 .../support/requests/SupportRequestFormActivity.kt   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
index a4c9025f6cc..37640b18fea 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
@@ -13,6 +13,8 @@ import android.view.animation.Transformation
 import android.widget.LinearLayout.LayoutParams
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.Group
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.children
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
@@ -182,3 +184,13 @@ fun View.scrollStartEvents(): Flow<Unit> {
         .filter { it == MotionEvent.ACTION_MOVE }
         .map { }
 }
+
+fun View.edgeToEdgeHandlingForNavigationBar() {
+    ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
+        val systemInsets = insets.getInsets(
+            WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+        )
+        v.setPadding(systemInsets.left, 0, systemInsets.right, systemInsets.bottom)
+        insets
+    }
+}
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
index 687a9d50ec8..831f26b06fc 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
@@ -13,6 +13,7 @@ import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.databinding.ActivitySupportRequestFormBinding
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationBar
 import com.woocommerce.android.extensions.serializable
 import com.woocommerce.android.support.SupportHelper
 import com.woocommerce.android.support.help.HelpOrigin
@@ -51,6 +52,7 @@ class SupportRequestFormActivity : AppCompatActivity() {
         zendeskSettings.setup(context = this)
 
         ActivitySupportRequestFormBinding.inflate(layoutInflater).apply {
+            this.root.edgeToEdgeHandlingForNavigationBar()
             setContentView(root)
             setupActionBar()
             observeViewEvents(this)

From 3e4f4a609f4bd2e7f42bd02d505ea6c8fbad740c Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 16:36:13 +0100
Subject: [PATCH 023/109] App bar background color too make it look like edge
 to edge

---
 .../src/main/res/layout/activity_support_request_form.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WooCommerce/src/main/res/layout/activity_support_request_form.xml b/WooCommerce/src/main/res/layout/activity_support_request_form.xml
index 1affc31934b..1b855b29a48 100644
--- a/WooCommerce/src/main/res/layout/activity_support_request_form.xml
+++ b/WooCommerce/src/main/res/layout/activity_support_request_form.xml
@@ -8,6 +8,7 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
+        android:background="@color/color_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

From 26ae6d998301c6f461bc8095514600943c98c37c Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 4 Feb 2025 17:09:22 +0100
Subject: [PATCH 024/109] Fixed UnifiedAboutScreenActivity to use edge-to-edge
 handling for navigation and status bar

---
 .../woocommerce/android/extensions/ViewExt.kt   | 12 +++++++++---
 .../ui/prefs/UnifiedAboutScreenActivity.kt      | 17 ++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
index 37640b18fea..30b11a5f378 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
@@ -187,10 +187,16 @@ fun View.scrollStartEvents(): Flow<Unit> {
 
 fun View.edgeToEdgeHandlingForNavigationBar() {
     ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
-        val systemInsets = insets.getInsets(
-            WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
-        )
+        val systemInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
         v.setPadding(systemInsets.left, 0, systemInsets.right, systemInsets.bottom)
         insets
     }
 }
+
+fun View.edgeToEdgeHandlingForNavigationAndStatusBar() {
+    ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
+        val systemInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        v.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, systemInsets.bottom)
+        insets
+    }
+}
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt
index 188d368095f..45d465249ae 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt
@@ -2,35 +2,26 @@ package com.woocommerce.android.ui.prefs
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
 import androidx.fragment.app.FragmentContainerView
 import com.automattic.about.model.AboutConfigProvider
 import com.woocommerce.android.R
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class UnifiedAboutScreenActivity : AppCompatActivity(), AboutConfigProvider {
-    @Inject lateinit var configBuilder: AboutConfigBuilder
+    @Inject
+    lateinit var configBuilder: AboutConfigBuilder
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.unified_about_screen_activity)
 
-        applyTopInset()
-    }
-
-    private fun applyTopInset() {
         val fragmentContainer = findViewById<FragmentContainerView>(
             R.id.about_fragment_container
         )
-        ViewCompat.setOnApplyWindowInsetsListener(fragmentContainer) { view, windowInsets ->
-            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            view.updatePadding(top = insets.top)
-            WindowInsetsCompat.CONSUMED
-        }
+        fragmentContainer.edgeToEdgeHandlingForNavigationAndStatusBar()
     }
 
     override fun getAboutConfig() = configBuilder.createAboutConfig(this)

From a1908601ba89f39dc99a7ce95663f65535bad1ee Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Wed, 5 Feb 2025 09:28:53 +0100
Subject: [PATCH 025/109] Implement edge-to-edge handling for navigation bar in
 HelpActivity and set app bar background color

---
 .../kotlin/com/woocommerce/android/support/help/HelpActivity.kt | 2 ++
 WooCommerce/src/main/res/layout/activity_help.xml               | 1 +
 2 files changed, 3 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/help/HelpActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/help/HelpActivity.kt
index d5f01b7bb99..d22eb76e083 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/help/HelpActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/help/HelpActivity.kt
@@ -17,6 +17,7 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_HELP_CON
 import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_SOURCE_FLOW
 import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_SOURCE_STEP
 import com.woocommerce.android.databinding.ActivityHelpBinding
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationBar
 import com.woocommerce.android.extensions.isNotNullOrEmpty
 import com.woocommerce.android.extensions.serializable
 import com.woocommerce.android.extensions.show
@@ -68,6 +69,7 @@ class HelpActivity : AppCompatActivity() {
 
         binding = ActivityHelpBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        binding.root.edgeToEdgeHandlingForNavigationBar()
 
         setSupportActionBar(binding.toolbar.toolbar as Toolbar)
         supportActionBar?.setHomeButtonEnabled(true)
diff --git a/WooCommerce/src/main/res/layout/activity_help.xml b/WooCommerce/src/main/res/layout/activity_help.xml
index d872d382673..898b19a792c 100644
--- a/WooCommerce/src/main/res/layout/activity_help.xml
+++ b/WooCommerce/src/main/res/layout/activity_help.xml
@@ -10,6 +10,7 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
+        android:background="@color/color_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

From ca910d0f0d81e39a1e9b0e04281532c401e0f4bf Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Wed, 5 Feb 2025 10:13:21 +0100
Subject: [PATCH 026/109] Add edge-to-edge handling for navigation bar in
 AppSettingsActivity and set app bar background color

---
 .../com/woocommerce/android/ui/prefs/AppSettingsActivity.kt     | 2 ++
 WooCommerce/src/main/res/layout/activity_app_settings.xml       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
index 83a68e9c89d..14a718227e9 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
@@ -18,6 +18,7 @@ import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.databinding.ActivityAppSettingsBinding
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationBar
 import com.woocommerce.android.notifications.push.NotificationMessageHandler
 import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.tools.SiteConnectionType
@@ -67,6 +68,7 @@ class AppSettingsActivity :
 
         binding = ActivityAppSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        binding.root.edgeToEdgeHandlingForNavigationBar()
 
         presenter.takeView(this)
 
diff --git a/WooCommerce/src/main/res/layout/activity_app_settings.xml b/WooCommerce/src/main/res/layout/activity_app_settings.xml
index 873e78ca507..4e73af5ac28 100644
--- a/WooCommerce/src/main/res/layout/activity_app_settings.xml
+++ b/WooCommerce/src/main/res/layout/activity_app_settings.xml
@@ -8,6 +8,7 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
+        android:background="@color/color_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

From 5c1b46fa0411e60691fff2df51e58e2bedda6f80 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Wed, 5 Feb 2025 11:49:46 +0100
Subject: [PATCH 027/109] Implement edge-to-edge handling for PluginsScreen and
 adjust background color

---
 .../android/ui/prefs/plugins/PluginsScreen.kt       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsScreen.kt
index 9a7e15ed6dc..e76fe9233f0 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsScreen.kt
@@ -13,12 +13,17 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.Divider
@@ -65,11 +70,17 @@ fun PluginsScreen(viewModel: PluginsViewModel) {
                 navigationIcon = Icons.AutoMirrored.Filled.ArrowBack
             )
         },
-        modifier = Modifier.background(MaterialTheme.colors.surface)
+        modifier = Modifier
+            .fillMaxSize()
+            .background(color = colorResource(id = R.color.color_toolbar))
+            .windowInsetsPadding(
+                WindowInsets.systemBars.only(WindowInsetsSides.Top)
+            )
     ) { paddingValues ->
         Surface(
             modifier = Modifier
                 .fillMaxSize()
+                .background(MaterialTheme.colors.surface)
                 .padding(paddingValues)
         ) {
             viewModel.viewState.observeAsState().value?.let { state ->

From 5b18e7b22a3586439ab2e5d632f146595077d837 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Wed, 5 Feb 2025 11:57:04 +0100
Subject: [PATCH 028/109] Implement edge-to-edge handling for
 DomainDashboardScreen and adjust toolbar background

---
 .../ui/prefs/domain/DomainDashboardScreen.kt  | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/domain/DomainDashboardScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/domain/DomainDashboardScreen.kt
index 279cdca1c2d..9ddf7cd49a2 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/domain/DomainDashboardScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/domain/DomainDashboardScreen.kt
@@ -12,9 +12,14 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -64,13 +69,21 @@ import com.woocommerce.android.ui.prefs.domain.DomainDashboardViewModel.ViewStat
 fun DomainDashboardScreen(viewModel: DomainDashboardViewModel) {
     viewModel.viewState.observeAsState().value?.let { state ->
         Crossfade(targetState = state) { viewState ->
-            Scaffold(topBar = {
-                ToolbarWithHelpButton(
-                    title = stringResource(id = string.domains),
-                    onNavigationButtonClick = viewModel::onCancelPressed,
-                    onHelpButtonClick = viewModel::onHelpPressed
-                )
-            }) { padding ->
+            Scaffold(
+                topBar = {
+                    ToolbarWithHelpButton(
+                        title = stringResource(id = string.domains),
+                        onNavigationButtonClick = viewModel::onCancelPressed,
+                        onHelpButtonClick = viewModel::onHelpPressed
+                    )
+                },
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(color = colorResource(id = color.color_toolbar))
+                    .windowInsetsPadding(
+                        WindowInsets.systemBars.only(WindowInsetsSides.Top)
+                    )
+            ) { padding ->
                 when (viewState) {
                     is DashboardState -> {
                         DomainDashboard(
@@ -83,6 +96,7 @@ fun DomainDashboardScreen(viewModel: DomainDashboardViewModel) {
                                 .padding(padding)
                         )
                     }
+
                     is ErrorState -> ErrorScreen(viewState.errorType)
                     LoadingState -> ProgressIndicator()
                 }

From 305f96013e4d420974f2ad82f11afb4e49b1f23f Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Wed, 5 Feb 2025 12:07:26 +0100
Subject: [PATCH 029/109] Add edge-to-edge handling for ThemePickerScreen and
 adjust toolbar background

---
 .../android/ui/themes/ThemePickerScreen.kt    | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/themes/ThemePickerScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/themes/ThemePickerScreen.kt
index 7df171b55b7..7dab1b4d169 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/themes/ThemePickerScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/themes/ThemePickerScreen.kt
@@ -9,12 +9,17 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
@@ -63,13 +68,21 @@ import okhttp3.OkHttpClient
 @Composable
 fun ThemePickerScreen(viewModel: ThemePickerViewModel) {
     viewModel.viewState.observeAsState().value?.let { viewState ->
-        Scaffold(topBar = {
-            Toolbar(
-                title = stringResource(id = R.string.settings_themes),
-                navigationIcon = Icons.AutoMirrored.Filled.ArrowBack,
-                onNavigationButtonClick = viewModel::onArrowBackPressed
-            )
-        }) { padding ->
+        Scaffold(
+            topBar = {
+                Toolbar(
+                    title = stringResource(id = R.string.settings_themes),
+                    navigationIcon = Icons.AutoMirrored.Filled.ArrowBack,
+                    onNavigationButtonClick = viewModel::onArrowBackPressed
+                )
+            },
+            modifier = Modifier
+                .fillMaxSize()
+                .background(color = colorResource(id = color.color_toolbar))
+                .windowInsetsPadding(
+                    WindowInsets.systemBars.only(WindowInsetsSides.Top)
+                )
+        ) { padding ->
             ThemePicker(
                 modifier = Modifier
                     .padding(padding)

From 8969f2e87c34f2b590d2dcc8cf35d1f95fa002bf Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Wed, 5 Feb 2025 12:37:18 +0100
Subject: [PATCH 030/109] Add edge-to-edge handling for FeedbackSurveyFragment
 and adjust toolbar background

---
 .../res/layout/fragment_feedback_survey.xml   | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/WooCommerce/src/main/res/layout/fragment_feedback_survey.xml b/WooCommerce/src/main/res/layout/fragment_feedback_survey.xml
index f632d7c9186..acde0203e46 100644
--- a/WooCommerce/src/main/res/layout/fragment_feedback_survey.xml
+++ b/WooCommerce/src/main/res/layout/fragment_feedback_survey.xml
@@ -5,15 +5,23 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:elevation="@dimen/appbar_elevation"
-        app:layout_collapseMode="pin"
-        app:navigationIcon="@drawable/ic_gridicons_cross_24dp"
-        app:title="@string/feedback_survey_request_title"
-        style="@style/Widget.Woo.Toolbar" />
+        android:layout_height="wrap_content"
+        android:background="@color/color_toolbar">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Widget.Woo.Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:elevation="@dimen/appbar_elevation"
+            app:layout_collapseMode="pin"
+            app:navigationIcon="@drawable/ic_gridicons_cross_24dp"
+            app:title="@string/feedback_survey_request_title" />
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <WebView
         android:id="@+id/webView"

From c785da9b16a5c9176c08965c9bbfd41511652146 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Wed, 5 Feb 2025 16:36:45 +0100
Subject: [PATCH 031/109] Fixed bottom padding for the lazy column in
 WooLogViewerScreen

---
 .../com/woocommerce/android/support/WooLogViewerScreen.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
index d9e73d4608f..b632b6caa40 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.only
@@ -90,7 +91,10 @@ fun LogViewerEntries(
     entries: RollingLogEntries,
     modifier: Modifier = Modifier
 ) {
-    LazyColumn(modifier = modifier) {
+    LazyColumn(
+        modifier = modifier,
+        contentPadding = WindowInsets.systemBars.only(WindowInsetsSides.Bottom).asPaddingValues()
+    ) {
         itemsIndexed(entries) { index, entry ->
             LogViewerEntry(index, entry)
             if (index < entries.lastIndex) {

From 3ae16d036b8db79737fade7f102c8668320648f0 Mon Sep 17 00:00:00 2001
From: Alejo <alejandro.torres.veiga@automattic.com>
Date: Wed, 5 Feb 2025 22:59:16 -0300
Subject: [PATCH 032/109] use safe cast to enable enableEdgeToEdge

---
 .../woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
index 6585bdd08ad..af3d2a18ee1 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
@@ -9,7 +9,7 @@ import javax.inject.Inject
 
 class ApplicationEdgeToEdgeEnabler @Inject constructor() : Application.ActivityLifecycleCallbacks {
     override fun onActivityCreated(activity: Activity, bindle: Bundle?) {
-        (activity as ComponentActivity).enableEdgeToEdge()
+        (activity as? ComponentActivity)?.enableEdgeToEdge()
     }
 
     override fun onActivityStarted(activity: Activity) {

From dd90c0c15fb7e7295f5ba843c01232743af0ce0b Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 11 Feb 2025 14:12:42 +0100
Subject: [PATCH 033/109] Add edge-to-edge handling for display cutout in
 navigation and status bar

---
 .../woocommerce/android/extensions/ViewExt.kt |  8 ++++++--
 .../android/ui/main/MainActivity.kt           |  6 ++----
 .../ui/main/MainActivityEdgeToEdgeHelper.kt   | 19 -------------------
 3 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
index 30b11a5f378..033e8e9bc5c 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
@@ -187,7 +187,9 @@ fun View.scrollStartEvents(): Flow<Unit> {
 
 fun View.edgeToEdgeHandlingForNavigationBar() {
     ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
-        val systemInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val systemInsets = insets.getInsets(
+            WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+        )
         v.setPadding(systemInsets.left, 0, systemInsets.right, systemInsets.bottom)
         insets
     }
@@ -195,7 +197,9 @@ fun View.edgeToEdgeHandlingForNavigationBar() {
 
 fun View.edgeToEdgeHandlingForNavigationAndStatusBar() {
     ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
-        val systemInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val systemInsets = insets.getInsets(
+            WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+        )
         v.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, systemInsets.bottom)
         insets
     }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
index 9d9146123bb..a258b97be48 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
@@ -52,6 +52,7 @@ import com.woocommerce.android.analytics.deviceTypeToAnalyticsString
 import com.woocommerce.android.databinding.ActivityMainBinding
 import com.woocommerce.android.extensions.active
 import com.woocommerce.android.extensions.collapse
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import com.woocommerce.android.extensions.expand
 import com.woocommerce.android.extensions.hide
 import com.woocommerce.android.extensions.navigateSafely
@@ -181,8 +182,6 @@ class MainActivity :
 
     @Inject lateinit var animatorHelper: MainAnimatorHelper
 
-    @Inject lateinit var edgeToEdgeHelper: MainActivityEdgeToEdgeHelper
-
     private val viewModel: MainActivityViewModel by viewModels()
 
     private var unfilledOrderCount: Int = 0
@@ -303,8 +302,7 @@ class MainActivity :
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-
-        edgeToEdgeHelper.applyEdgeToEdgeSettings(binding.appBarLayout)
+        binding.root.edgeToEdgeHandlingForNavigationAndStatusBar()
 
         toolbar = binding.toolbar.toolbar
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
deleted file mode 100644
index ee4646f1f12..00000000000
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.woocommerce.android.ui.main
-
-import android.view.View
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import javax.inject.Inject
-
-class MainActivityEdgeToEdgeHelper @Inject constructor() {
-    fun applyEdgeToEdgeSettings(viewToApplyPadding: View) {
-        ViewCompat.setOnApplyWindowInsetsListener(viewToApplyPadding) { v, insets ->
-            val innerPadding = insets.getInsets(
-                WindowInsetsCompat.Type.systemBars()
-                    or WindowInsetsCompat.Type.displayCutout()
-            )
-            v.setPadding(0, innerPadding.top, 0, 0)
-            insets
-        }
-    }
-}

From 63762cf6af58468c3b9c80c92f73cc9515656d75 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 11 Feb 2025 15:29:35 +0100
Subject: [PATCH 034/109] Refactor edge-to-edge handling in MainActivity to
 improve padding adjustments

---
 .../kotlin/com/woocommerce/android/ui/main/MainActivity.kt  | 6 ++++--
 .../android/ui/main/MainActivityEdgeToEdgeHelper.kt         | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
index a258b97be48..7124b899af1 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
@@ -52,7 +52,6 @@ import com.woocommerce.android.analytics.deviceTypeToAnalyticsString
 import com.woocommerce.android.databinding.ActivityMainBinding
 import com.woocommerce.android.extensions.active
 import com.woocommerce.android.extensions.collapse
-import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import com.woocommerce.android.extensions.expand
 import com.woocommerce.android.extensions.hide
 import com.woocommerce.android.extensions.navigateSafely
@@ -182,6 +181,8 @@ class MainActivity :
 
     @Inject lateinit var animatorHelper: MainAnimatorHelper
 
+    @Inject lateinit var edgeToEdgeHelper: MainActivityEdgeToEdgeHelper
+
     private val viewModel: MainActivityViewModel by viewModels()
 
     private var unfilledOrderCount: Int = 0
@@ -302,7 +303,8 @@ class MainActivity :
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.root.edgeToEdgeHandlingForNavigationAndStatusBar()
+
+        edgeToEdgeHelper.applyEdgeToEdgeSettings(binding)
 
         toolbar = binding.toolbar.toolbar
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index ffd59bc995a..de2b98b6597 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -8,12 +8,12 @@ import javax.inject.Inject
 
 class MainActivityEdgeToEdgeHelper @Inject constructor() {
     fun applyEdgeToEdgeSettings(binding: ActivityMainBinding) {
-        ViewCompat.setOnApplyWindowInsetsListener(binding.appBarLayout) { v, insets ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
             val systemInsets = insets.getInsets(
                 WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
             )
 
-            v.setPadding(0, systemInsets.top, 0, 0)
+            v.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, 0)
             insets
         }
 
@@ -28,7 +28,7 @@ class MainActivityEdgeToEdgeHelper @Inject constructor() {
             // because bottom nav is already handling the padding
             val bottomPadding = if (isBottomNavVisible) 0 else systemInsets.bottom
 
-            v.setPadding(systemInsets.left, 0, systemInsets.right, bottomPadding)
+            v.setPadding(0, 0, 0, bottomPadding)
             insets
         }
     }

From fbb6f8e80a6847586ed962746850d9830fa7b5fd Mon Sep 17 00:00:00 2001
From: Alejo <alejandro.torres.veiga@automattic.com>
Date: Tue, 11 Feb 2025 09:05:14 -0600
Subject: [PATCH 035/109] Enable edge-to-edge only for supported activities

Add a check to prevent enabling edge-to-edge on unsupported activities. Report a crash when an activity is not a `ComponentActivity` and is edge-to-edge enabled.
---
 .../util/ApplicationEdgeToEdgeEnabler.kt      | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
index af3d2a18ee1..926b0627152 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
@@ -5,11 +5,36 @@ import android.app.Application
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.enableEdgeToEdge
+import com.automattic.android.tracks.crashlogging.CrashLogging
 import javax.inject.Inject
 
-class ApplicationEdgeToEdgeEnabler @Inject constructor() : Application.ActivityLifecycleCallbacks {
+class ApplicationEdgeToEdgeEnabler @Inject constructor(
+    private val crashLogger: CrashLogging
+) : Application.ActivityLifecycleCallbacks {
+
+    private val unsupportedEdgeToEdgeActivities = setOf(
+        "leakcanary.internal.RequestPermissionActivity"
+    )
+
     override fun onActivityCreated(activity: Activity, bindle: Bundle?) {
-        (activity as? ComponentActivity)?.enableEdgeToEdge()
+        val isEdgeToEdgeSupported = isEdgeToEdgeSupported(activity)
+        if (PackageUtils.isDebugBuild() && isEdgeToEdgeSupported) {
+            (activity as ComponentActivity).enableEdgeToEdge()
+        } else {
+            (activity as? ComponentActivity)?.enableEdgeToEdge() ?: run {
+                if (isEdgeToEdgeSupported) {
+                    val message = "Activity $activity is not a ComponentActivity"
+                    crashLogger.sendReport(
+                        exception = ClassCastException(message),
+                        message = message
+                    )
+                }
+            }
+        }
+    }
+
+    private fun isEdgeToEdgeSupported(activity: Activity): Boolean {
+        return (activity::class.java.name in unsupportedEdgeToEdgeActivities).not()
     }
 
     override fun onActivityStarted(activity: Activity) {

From 8df5e6b7b14575a287c4c1d6c31d63642553d974 Mon Sep 17 00:00:00 2001
From: Alejo <alejandro.torres.veiga@automattic.com>
Date: Wed, 12 Feb 2025 09:13:56 -0600
Subject: [PATCH 036/109] add documentation

---
 .../util/ApplicationEdgeToEdgeEnabler.kt      | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
index 926b0627152..0243752c8fd 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
@@ -12,11 +12,43 @@ class ApplicationEdgeToEdgeEnabler @Inject constructor(
     private val crashLogger: CrashLogging
 ) : Application.ActivityLifecycleCallbacks {
 
+    /**
+     * Set of activity class names that should not be edge-to-edge.
+     */
     private val unsupportedEdgeToEdgeActivities = setOf(
         "leakcanary.internal.RequestPermissionActivity"
     )
 
-    override fun onActivityCreated(activity: Activity, bindle: Bundle?) {
+    /**
+     * Called when an activity has been created.
+     *
+     * This function checks if edge-to-edge display is supported and, if so, enables it.
+     * It handles different scenarios based on the debug/release build type and whether the
+     * activity is a ComponentActivity.
+     *
+     * @param activity The activity that has been created.
+     * @param bundle  A Bundle containing the activity's previously frozen state, if there was one.
+     *                This parameter is not used within this method but is part of the lifecycle callback.
+     *
+     * @throws ClassCastException if `isEdgeToEdgeSupported` is true and the activity is not an instance of `ComponentActivity`,
+     *                            a `ClassCastException` is thrown. The exception is caught and logged by the crashLogger.
+     *
+     * Behavior:
+     *   - Checks if edge-to-edge is supported using `isEdgeToEdgeSupported(activity)`.
+     *   - **Debug Build:**
+     *     - If edge-to-edge is supported, it calls `enableEdgeToEdge()` directly on the activity,
+     *       assuming it's a `ComponentActivity`.
+     *   - **Release Build or Edge-to-Edge Not Supported in Debug build:**
+     *     - If the activity is a `ComponentActivity`, it calls `enableEdgeToEdge()`.
+     *     - If the activity is not a `ComponentActivity` but edge-to-edge is supported, it logs a
+     *       `ClassCastException` using `crashLogger.sendReport()`.
+     *     - If the activity is not a `ComponentActivity` and edge-to-edge isn't supported, nothing happens.
+     *
+     * Edge Case Handling:
+     *  - In release builds, the code gracefully handles non-ComponentActivities when edge-to-edge is supported by logging the issue instead of crashing.
+     *  - In debug builds, the code will attempt to cast the activity to a `ComponentActivity`. If the cast fails, then a `ClassCastException` will be thrown by the application.
+     */
+    override fun onActivityCreated(activity: Activity, bundle: Bundle?) {
         val isEdgeToEdgeSupported = isEdgeToEdgeSupported(activity)
         if (PackageUtils.isDebugBuild() && isEdgeToEdgeSupported) {
             (activity as ComponentActivity).enableEdgeToEdge()

From 5e78422179741b8ead33f20d617c52a801d93285 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 19 Feb 2025 13:35:18 +0100
Subject: [PATCH 037/109] Fix an issue with bottom navigation insets on API <
 30

---
 .../ui/main/MainActivityEdgeToEdgeHelper.kt   | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index de2b98b6597..64c142296d0 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -1,9 +1,10 @@
 package com.woocommerce.android.ui.main
 
-import android.view.View
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
 import com.woocommerce.android.databinding.ActivityMainBinding
+import com.woocommerce.android.util.SystemVersionUtils
 import javax.inject.Inject
 
 class MainActivityEdgeToEdgeHelper @Inject constructor() {
@@ -13,22 +14,17 @@ class MainActivityEdgeToEdgeHelper @Inject constructor() {
                 WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
             )
 
-            v.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, 0)
-            insets
-        }
-
-        ViewCompat.setOnApplyWindowInsetsListener(binding.snackRoot) { v, insets ->
-            val systemInsets = insets.getInsets(
-                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
-            )
-
-            val isBottomNavVisible = binding.bottomNav.visibility == View.VISIBLE
-
+            val isBottomNavVisible = binding.bottomNav.isVisible
             // Apply bottom padding only if bottom nav is hidden
             // because bottom nav is already handling the padding
-            val bottomPadding = if (isBottomNavVisible) 0 else systemInsets.bottom
+            // Note: this doesn't work well on Android Q and below, so we apply it only on Android R and above
+            // TODO: Remove this when Androidx Core v1.16 is released by using
+            //  ViewGroupCompat#installCompatInsetsDispatch
+            //  see: https://developer.android.com/develop/ui/views/layout/edge-to-edge#backward-compatible-dispatching
+            val bottomPadding = if (SystemVersionUtils.isAtLeastR() && isBottomNavVisible) 0 else systemInsets.bottom
+
+            v.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, bottomPadding)
 
-            v.setPadding(0, 0, 0, bottomPadding)
             insets
         }
     }

From 749600aa6004a07fa8dc0a7b1da7dbbb43beb018 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 19 Feb 2025 14:42:03 +0100
Subject: [PATCH 038/109] Improve handling of insets for MainView

The improvements include:
- Align handling of bottom navigation in all APIs.
- Apply top padding just to appBarLayout to ensure the white background is stretched below the status bar
---
 .../ui/main/MainActivityEdgeToEdgeHelper.kt   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index 64c142296d0..d6a09d43a01 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -3,8 +3,8 @@ package com.woocommerce.android.ui.main
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import com.woocommerce.android.databinding.ActivityMainBinding
-import com.woocommerce.android.util.SystemVersionUtils
 import javax.inject.Inject
 
 class MainActivityEdgeToEdgeHelper @Inject constructor() {
@@ -14,18 +14,21 @@ class MainActivityEdgeToEdgeHelper @Inject constructor() {
                 WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
             )
 
-            val isBottomNavVisible = binding.bottomNav.isVisible
-            // Apply bottom padding only if bottom nav is hidden
-            // because bottom nav is already handling the padding
-            // Note: this doesn't work well on Android Q and below, so we apply it only on Android R and above
-            // TODO: Remove this when Androidx Core v1.16 is released by using
-            //  ViewGroupCompat#installCompatInsetsDispatch
-            //  see: https://developer.android.com/develop/ui/views/layout/edge-to-edge#backward-compatible-dispatching
-            val bottomPadding = if (SystemVersionUtils.isAtLeastR() && isBottomNavVisible) 0 else systemInsets.bottom
+            binding.appBarLayout.setPadding(0, systemInsets.top, 0, 0)
 
-            v.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, bottomPadding)
+            binding.root.updatePadding(left = systemInsets.left, right = systemInsets.right)
 
-            insets
+            if (binding.bottomNav.isVisible) {
+                // When the bottom navigation is visible, apply the bottom padding to it to make sure its
+                // background is drawn behind the system navigation bar
+                binding.bottomNav.updatePadding(bottom = systemInsets.bottom)
+                binding.root.updatePadding(bottom = 0)
+            } else {
+                binding.root.updatePadding(bottom = systemInsets.bottom)
+            }
+
+            // Prevent other views from consuming the insets, including the bottom navigation
+            WindowInsetsCompat.CONSUMED
         }
     }
 }

From d703d43f3b4e7b250b780b686de13d0136613b42 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 19 Feb 2025 15:09:34 +0100
Subject: [PATCH 039/109] Make sure to disable appBarLayout shadow when the
 toolbar is hidden

---
 .../kotlin/com/woocommerce/android/ui/main/MainActivity.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
index 40f1ed58c62..6cecf260bae 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt
@@ -266,7 +266,10 @@ class MainActivity :
                     binding.appBarDivider.isVisible = appBarStatus.hasDivider
                 }
 
-                AppBarStatus.Hidden -> hideToolbar(animate = f is TopLevelFragment)
+                AppBarStatus.Hidden -> {
+                    hideToolbar(animate = f is TopLevelFragment)
+                    binding.appBarLayout.targetElevation = 0f
+                }
             }
 
             if (f is TopLevelFragment) {

From 565005ec349956359b16e8d73aa828abf38b9304 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Thu, 20 Feb 2025 16:28:02 +0100
Subject: [PATCH 040/109] Set global background color of AppBarLayout

---
 WooCommerce/src/main/res/layout/activity_app_settings.xml | 1 -
 WooCommerce/src/main/res/values/styles_base.xml           | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/res/layout/activity_app_settings.xml b/WooCommerce/src/main/res/layout/activity_app_settings.xml
index 4e73af5ac28..873e78ca507 100644
--- a/WooCommerce/src/main/res/layout/activity_app_settings.xml
+++ b/WooCommerce/src/main/res/layout/activity_app_settings.xml
@@ -8,7 +8,6 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
-        android:background="@color/color_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
diff --git a/WooCommerce/src/main/res/values/styles_base.xml b/WooCommerce/src/main/res/values/styles_base.xml
index 4f8dc66ecc9..21e6721f22d 100644
--- a/WooCommerce/src/main/res/values/styles_base.xml
+++ b/WooCommerce/src/main/res/values/styles_base.xml
@@ -62,6 +62,7 @@ theme across the entire app. Overridden versions should be added to the styles.x
         <item name="android:fitsSystemWindows">true</item>
         <item name="elevation">0dp</item>
         <item name="liftOnScroll">true</item>
+        <item name="android:background">@color/color_toolbar</item>
     </style>
 
     <!--

From e5f93581373c78ccdfb4c68b237b32aca746c39d Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 19 Feb 2025 11:06:38 +0100
Subject: [PATCH 041/109] Edge to edge support for API faker UI hint

---
 .../android/apifaker/ApiFakerUiHelper.kt         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt b/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
index 7bb7ecbb269..2631f90817e 100644
--- a/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
+++ b/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
@@ -13,6 +13,7 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.activity.ComponentActivity
 import androidx.appcompat.app.AlertDialog
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.doOnLayout
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
@@ -111,12 +112,27 @@ class ApiFakerUiHelper @Inject constructor() : ActivityLifecycleCallbacks {
         apiFakerHint.doOnLayout { view ->
             activityLayout.updateLayoutParams<MarginLayoutParams> { bottomMargin = view.measuredHeight }
         }
+        apiFakerHint.handleBottomNavigationInset(activity)
     }
 
     private fun View.hideApiFakerHint() {
         val contentLayout = findViewById<ViewGroup>(android.R.id.content)
+        val activityLayout = contentLayout.getChildAt(0)
+
         contentLayout.findViewById<View>(apiFakerHintId)?.let { apiFakerHint ->
             contentLayout.removeView(apiFakerHint)
         }
+        activityLayout.updateLayoutParams<MarginLayoutParams> { bottomMargin = 0 }
+    }
+
+    private fun View.handleBottomNavigationInset(activity: Activity) {
+        // setOnApplyWindowInsetsListener doesn't work for this case because the view is added after the window
+        // insets are applied. So we need to handle it manually.
+        activity.window.decorView.rootWindowInsets.let {
+            val bottomNavigationInset = WindowInsetsCompat.toWindowInsetsCompat(it)
+                .getInsets(WindowInsetsCompat.Type.navigationBars())
+                .bottom
+            updateLayoutParams<MarginLayoutParams> { bottomMargin = bottomNavigationInset }
+        }
     }
 }

From 0a4e95cc5916814d327a2679352fcc49b2df50de Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 19 Feb 2025 11:07:16 +0100
Subject: [PATCH 042/109] Animate API faker hint displaying

---
 .../android/apifaker/ApiFakerUiHelper.kt      | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt b/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
index 2631f90817e..5732ffc9547 100644
--- a/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
+++ b/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
@@ -6,6 +6,7 @@ import android.app.Application
 import android.app.Application.ActivityLifecycleCallbacks
 import android.graphics.Color
 import android.os.Bundle
+import android.transition.TransitionManager
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
@@ -17,6 +18,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.doOnLayout
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.withIndex
 import kotlinx.coroutines.launch
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -54,15 +56,15 @@ class ApiFakerUiHelper @Inject constructor() : ActivityLifecycleCallbacks {
     private suspend fun updateApiFakerHint(
         activityReference: WeakReference<ComponentActivity>
     ) {
-        apiFakerConfig.enabled.collect { enabled ->
+        apiFakerConfig.enabled.withIndex().collect { (index, enabled) ->
             activityReference.get()?.let { activity ->
                 if (enabled) {
                     activity.window.decorView.post {
-                        activity.window.decorView.showApiFakerHint(activity)
+                        activity.window.decorView.showApiFakerHint(activity, animate = index != 0)
                     }
                 } else {
                     activity.window.decorView.post {
-                        activity.window.decorView.hideApiFakerHint()
+                        activity.window.decorView.hideApiFakerHint(index != 0)
                     }
                 }
             }
@@ -70,7 +72,7 @@ class ApiFakerUiHelper @Inject constructor() : ActivityLifecycleCallbacks {
     }
 
     @SuppressLint("SetTextI18n")
-    private fun View.showApiFakerHint(activity: ComponentActivity) {
+    private fun View.showApiFakerHint(activity: ComponentActivity, animate: Boolean) {
         // This works only for activities that has the content view as a direct child of the FrameLayout, which is true
         // for all AppCompat activities, so it should work for all the cases we need.
         val contentLayout = findViewById<View>(android.R.id.content) as? FrameLayout ?: return
@@ -99,6 +101,11 @@ class ApiFakerUiHelper @Inject constructor() : ActivityLifecycleCallbacks {
                     .show()
             }
         }
+
+        if (animate) {
+            TransitionManager.beginDelayedTransition(contentLayout)
+        }
+
         contentLayout.addView(
             apiFakerHint,
             FrameLayout.LayoutParams(
@@ -115,10 +122,14 @@ class ApiFakerUiHelper @Inject constructor() : ActivityLifecycleCallbacks {
         apiFakerHint.handleBottomNavigationInset(activity)
     }
 
-    private fun View.hideApiFakerHint() {
+    private fun View.hideApiFakerHint(animate: Boolean) {
         val contentLayout = findViewById<ViewGroup>(android.R.id.content)
         val activityLayout = contentLayout.getChildAt(0)
 
+        if (animate) {
+            TransitionManager.beginDelayedTransition(contentLayout)
+        }
+
         contentLayout.findViewById<View>(apiFakerHintId)?.let { apiFakerHint ->
             contentLayout.removeView(apiFakerHint)
         }

From 94477877f45913b7e113fc298e4f251c903a185b Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Thu, 20 Feb 2025 14:54:26 +0100
Subject: [PATCH 043/109] Introduce a new extension to make working with insets
 easier

---
 .../woocommerce/android/extensions/ViewExt.kt | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
index 033e8e9bc5c..253a75dff67 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
@@ -13,6 +13,7 @@ import android.view.animation.Transformation
 import android.widget.LinearLayout.LayoutParams
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.Group
+import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.children
@@ -186,21 +187,24 @@ fun View.scrollStartEvents(): Flow<Unit> {
 }
 
 fun View.edgeToEdgeHandlingForNavigationBar() {
-    ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
-        val systemInsets = insets.getInsets(
-            WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
-        )
-        v.setPadding(systemInsets.left, 0, systemInsets.right, systemInsets.bottom)
-        insets
+    doOnApplyWindowInsets {
+        setPadding(it.left, 0, it.right, it.bottom)
     }
 }
 
 fun View.edgeToEdgeHandlingForNavigationAndStatusBar() {
+    doOnApplyWindowInsets {
+        setPadding(it.left, it.top, it.right, it.bottom)
+    }
+}
+
+inline fun View.doOnApplyWindowInsets(
+    insetsMask: Int = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout(),
+    consumeInsets: Boolean = false,
+    crossinline action: (Insets) -> Unit
+) {
     ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
-        val systemInsets = insets.getInsets(
-            WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
-        )
-        v.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, systemInsets.bottom)
-        insets
+        action(insets.getInsets(insetsMask))
+        if (consumeInsets) WindowInsetsCompat.CONSUMED else insets
     }
 }

From 76d3a4fbef462d2b24a7d4ed5f126bfd72418779 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Thu, 20 Feb 2025 14:55:50 +0100
Subject: [PATCH 044/109] Simplify insets handling for AppSettings activity

---
 .../android/ui/prefs/AppSettingsActivity.kt       | 15 +++++++++++++--
 WooCommerce/src/main/res/values/styles_base.xml   |  1 -
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
index 14a718227e9..2e00457f7a6 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
@@ -6,6 +6,7 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -18,7 +19,7 @@ import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.databinding.ActivityAppSettingsBinding
-import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationBar
+import com.woocommerce.android.extensions.doOnApplyWindowInsets
 import com.woocommerce.android.notifications.push.NotificationMessageHandler
 import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.tools.SiteConnectionType
@@ -68,7 +69,17 @@ class AppSettingsActivity :
 
         binding = ActivityAppSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.root.edgeToEdgeHandlingForNavigationBar()
+
+        binding.root.doOnApplyWindowInsets(consumeInsets = true) {
+            binding.root.updatePadding(
+                left = it.left,
+                right = it.right,
+                bottom = it.bottom
+            )
+            binding.appBarLayout.updatePadding(
+                top = it.top
+            )
+        }
 
         presenter.takeView(this)
 
diff --git a/WooCommerce/src/main/res/values/styles_base.xml b/WooCommerce/src/main/res/values/styles_base.xml
index 21e6721f22d..d479b0ebb96 100644
--- a/WooCommerce/src/main/res/values/styles_base.xml
+++ b/WooCommerce/src/main/res/values/styles_base.xml
@@ -59,7 +59,6 @@ theme across the entire app. Overridden versions should be added to the styles.x
         AppBarLayout Style
     -->
     <style name="Woo.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Surface">
-        <item name="android:fitsSystemWindows">true</item>
         <item name="elevation">0dp</item>
         <item name="liftOnScroll">true</item>
         <item name="android:background">@color/color_toolbar</item>

From ab065d29dcd5b4e3f5b8a23135441d97ac77b792 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Thu, 20 Feb 2025 15:27:39 +0100
Subject: [PATCH 045/109] Revert "Add edge-to-edge handling for
 FeedbackSurveyFragment and adjust toolbar background"

This reverts commit 8969f2e87c34f2b590d2dcc8cf35d1f95fa002bf.
---
 .../res/layout/fragment_feedback_survey.xml   | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/WooCommerce/src/main/res/layout/fragment_feedback_survey.xml b/WooCommerce/src/main/res/layout/fragment_feedback_survey.xml
index acde0203e46..f632d7c9186 100644
--- a/WooCommerce/src/main/res/layout/fragment_feedback_survey.xml
+++ b/WooCommerce/src/main/res/layout/fragment_feedback_survey.xml
@@ -5,23 +5,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar_layout"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/color_toolbar">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Widget.Woo.Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="@dimen/appbar_elevation"
-            app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_gridicons_cross_24dp"
-            app:title="@string/feedback_survey_request_title" />
-
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_height="?attr/actionBarSize"
+        android:elevation="@dimen/appbar_elevation"
+        app:layout_collapseMode="pin"
+        app:navigationIcon="@drawable/ic_gridicons_cross_24dp"
+        app:title="@string/feedback_survey_request_title"
+        style="@style/Widget.Woo.Toolbar" />
 
     <WebView
         android:id="@+id/webView"

From 8a4b24e212998e542b444a5b3cf134f988ebfb85 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Thu, 20 Feb 2025 16:59:38 +0100
Subject: [PATCH 046/109] Revert AppSettingsActivity Compose edge-to-edge
 workarounds

This reverts commit 5c1b46fa0411e60691fff2df51e58e2bedda6f80 and 5b18e7b22a3586439ab2e5d632f146595077d837 and 305f96013e4d420974f2ad82f11afb4e49b1f23f.
---
 .../ui/prefs/domain/DomainDashboardScreen.kt  | 28 +++++--------------
 .../android/ui/prefs/plugins/PluginsScreen.kt | 13 +--------
 .../android/ui/themes/ThemePickerScreen.kt    | 27 +++++-------------
 3 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/domain/DomainDashboardScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/domain/DomainDashboardScreen.kt
index 9ddf7cd49a2..279cdca1c2d 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/domain/DomainDashboardScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/domain/DomainDashboardScreen.kt
@@ -12,14 +12,9 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -69,21 +64,13 @@ import com.woocommerce.android.ui.prefs.domain.DomainDashboardViewModel.ViewStat
 fun DomainDashboardScreen(viewModel: DomainDashboardViewModel) {
     viewModel.viewState.observeAsState().value?.let { state ->
         Crossfade(targetState = state) { viewState ->
-            Scaffold(
-                topBar = {
-                    ToolbarWithHelpButton(
-                        title = stringResource(id = string.domains),
-                        onNavigationButtonClick = viewModel::onCancelPressed,
-                        onHelpButtonClick = viewModel::onHelpPressed
-                    )
-                },
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(color = colorResource(id = color.color_toolbar))
-                    .windowInsetsPadding(
-                        WindowInsets.systemBars.only(WindowInsetsSides.Top)
-                    )
-            ) { padding ->
+            Scaffold(topBar = {
+                ToolbarWithHelpButton(
+                    title = stringResource(id = string.domains),
+                    onNavigationButtonClick = viewModel::onCancelPressed,
+                    onHelpButtonClick = viewModel::onHelpPressed
+                )
+            }) { padding ->
                 when (viewState) {
                     is DashboardState -> {
                         DomainDashboard(
@@ -96,7 +83,6 @@ fun DomainDashboardScreen(viewModel: DomainDashboardViewModel) {
                                 .padding(padding)
                         )
                     }
-
                     is ErrorState -> ErrorScreen(viewState.errorType)
                     LoadingState -> ProgressIndicator()
                 }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsScreen.kt
index e76fe9233f0..9a7e15ed6dc 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsScreen.kt
@@ -13,17 +13,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.Divider
@@ -70,17 +65,11 @@ fun PluginsScreen(viewModel: PluginsViewModel) {
                 navigationIcon = Icons.AutoMirrored.Filled.ArrowBack
             )
         },
-        modifier = Modifier
-            .fillMaxSize()
-            .background(color = colorResource(id = R.color.color_toolbar))
-            .windowInsetsPadding(
-                WindowInsets.systemBars.only(WindowInsetsSides.Top)
-            )
+        modifier = Modifier.background(MaterialTheme.colors.surface)
     ) { paddingValues ->
         Surface(
             modifier = Modifier
                 .fillMaxSize()
-                .background(MaterialTheme.colors.surface)
                 .padding(paddingValues)
         ) {
             viewModel.viewState.observeAsState().value?.let { state ->
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/themes/ThemePickerScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/themes/ThemePickerScreen.kt
index 7dab1b4d169..7df171b55b7 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/themes/ThemePickerScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/themes/ThemePickerScreen.kt
@@ -9,17 +9,12 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
@@ -68,21 +63,13 @@ import okhttp3.OkHttpClient
 @Composable
 fun ThemePickerScreen(viewModel: ThemePickerViewModel) {
     viewModel.viewState.observeAsState().value?.let { viewState ->
-        Scaffold(
-            topBar = {
-                Toolbar(
-                    title = stringResource(id = R.string.settings_themes),
-                    navigationIcon = Icons.AutoMirrored.Filled.ArrowBack,
-                    onNavigationButtonClick = viewModel::onArrowBackPressed
-                )
-            },
-            modifier = Modifier
-                .fillMaxSize()
-                .background(color = colorResource(id = color.color_toolbar))
-                .windowInsetsPadding(
-                    WindowInsets.systemBars.only(WindowInsetsSides.Top)
-                )
-        ) { padding ->
+        Scaffold(topBar = {
+            Toolbar(
+                title = stringResource(id = R.string.settings_themes),
+                navigationIcon = Icons.AutoMirrored.Filled.ArrowBack,
+                onNavigationButtonClick = viewModel::onArrowBackPressed
+            )
+        }) { padding ->
             ThemePicker(
                 modifier = Modifier
                     .padding(padding)

From 5ba5514dcf4ae90225697569423eae43c362620e Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Thu, 20 Feb 2025 17:48:49 +0100
Subject: [PATCH 047/109] Handle edge-to-edge layout for
 MagicLinkInterceptActivity

---
 .../android/ui/login/MagicLinkInterceptActivity.kt  | 13 +++++++++++++
 .../res/layout/login_magic_link_sent_screen.xml     |  1 +
 2 files changed, 14 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/MagicLinkInterceptActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/MagicLinkInterceptActivity.kt
index 7e8a3bcc65d..ef0b1bc304f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/MagicLinkInterceptActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/MagicLinkInterceptActivity.kt
@@ -13,12 +13,14 @@ import androidx.activity.viewModels
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.navigation.NavDeepLinkBuilder
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
+import com.woocommerce.android.extensions.doOnApplyWindowInsets
 import com.woocommerce.android.ui.login.MagicLinkInterceptViewModel.ContinueJetpackActivation
 import com.woocommerce.android.ui.login.MagicLinkInterceptViewModel.OpenLogin
 import com.woocommerce.android.ui.login.MagicLinkInterceptViewModel.OpenSitePicker
@@ -55,6 +57,17 @@ class MagicLinkInterceptActivity : AppCompatActivity() {
         loginAnalyticsListener.trackLoginMagicLinkOpened()
 
         setContentView(org.wordpress.android.login.R.layout.login_magic_link_sent_screen)
+
+        val rootLayout = findViewById<View>(org.wordpress.android.login.R.id.login_magic_link_root_layout)
+        rootLayout.doOnApplyWindowInsets {
+            rootLayout.updatePadding(
+                left = it.left,
+                top = it.top,
+                right = it.right,
+                bottom = it.bottom
+            )
+        }
+
         retryButton = findViewById(R.id.login_open_email_client)
         retryContainer = findViewById(R.id.login_magic_link_container)
         retryButton?.text = getString(R.string.retry)
diff --git a/libs/login/src/main/res/layout/login_magic_link_sent_screen.xml b/libs/login/src/main/res/layout/login_magic_link_sent_screen.xml
index 51b12866df5..1e395c05108 100644
--- a/libs/login/src/main/res/layout/login_magic_link_sent_screen.xml
+++ b/libs/login/src/main/res/layout/login_magic_link_sent_screen.xml
@@ -1,6 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/login_magic_link_root_layout"
     android:orientation="vertical">
 
     <include layout="@layout/toolbar_login" />

From a24d7481e5d53908aa1fadf79672423875eb9827 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Thu, 20 Feb 2025 18:29:27 +0100
Subject: [PATCH 048/109] Simplify MainActivity edge-to-edge handling by using
 the new extension

---
 .../ui/main/MainActivityEdgeToEdgeHelper.kt   | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index d6a09d43a01..445c577d929 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -1,34 +1,26 @@
 package com.woocommerce.android.ui.main
 
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import com.woocommerce.android.databinding.ActivityMainBinding
+import com.woocommerce.android.extensions.doOnApplyWindowInsets
 import javax.inject.Inject
 
 class MainActivityEdgeToEdgeHelper @Inject constructor() {
     fun applyEdgeToEdgeSettings(binding: ActivityMainBinding) {
-        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
-            val systemInsets = insets.getInsets(
-                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
-            )
+        binding.root.doOnApplyWindowInsets(consumeInsets = true) { insets ->
+            binding.appBarLayout.setPadding(0, insets.top, 0, 0)
 
-            binding.appBarLayout.setPadding(0, systemInsets.top, 0, 0)
-
-            binding.root.updatePadding(left = systemInsets.left, right = systemInsets.right)
+            binding.root.updatePadding(left = insets.left, right = insets.right)
 
             if (binding.bottomNav.isVisible) {
                 // When the bottom navigation is visible, apply the bottom padding to it to make sure its
                 // background is drawn behind the system navigation bar
-                binding.bottomNav.updatePadding(bottom = systemInsets.bottom)
+                binding.bottomNav.updatePadding(bottom = insets.bottom)
                 binding.root.updatePadding(bottom = 0)
             } else {
-                binding.root.updatePadding(bottom = systemInsets.bottom)
+                binding.root.updatePadding(bottom = insets.bottom)
             }
-
-            // Prevent other views from consuming the insets, including the bottom navigation
-            WindowInsetsCompat.CONSUMED
         }
     }
 }

From 3925f48b58e5e3768ecb590b785e8902abf1d780 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Tue, 25 Feb 2025 11:34:47 +0000
Subject: [PATCH 049/109] Make sure LoginActivity insets are applied always

---
 .../android/ui/login/LoginActivity.kt         | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
index e7ab99e5806..43dd81bcaf9 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
@@ -179,6 +179,8 @@ class LoginActivity :
         binding = ActivityLoginBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        applyDefaultInsets()
+
         when {
             intent?.action == LOGIN_WITH_WPCOM_EMAIL_ACTION -> {
                 val email = intent.extras!!.getString(EMAIL_PARAMETER)
@@ -210,6 +212,19 @@ class LoginActivity :
         }
     }
 
+    private fun applyDefaultInsets() {
+        enableEdgeToEdge()
+
+        WindowCompat.setDecorFitsSystemWindows(window, true)
+
+        // Add system bar insets to the fragment's root
+        ViewCompat.setOnApplyWindowInsetsListener(binding.snackRoot) { v, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+
     private fun handleBackPress() {
         AnalyticsTracker.trackBackPressed(this)
         if (supportFragmentManager.backStackEntryCount == 1) {
@@ -355,17 +370,8 @@ class LoginActivity :
     }
 
     override fun disableDynamicEdgeToEdge() {
-        // Call again to reset the statusBarStyle to its default setting
-        enableEdgeToEdge()
-
-        WindowCompat.setDecorFitsSystemWindows(window, true)
-
-        // Add system bar insets to the fragment's root
-        ViewCompat.setOnApplyWindowInsetsListener(binding.snackRoot) { v, windowInsets ->
-            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
-            WindowInsetsCompat.CONSUMED
-        }
+        // re-apply default insets
+        applyDefaultInsets()
     }
 
     override fun onNewToWooButtonClicked() {

From a0c99d0970404fd4dbbc64c1f59e73b4b6616a62 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Tue, 25 Feb 2025 11:38:38 +0000
Subject: [PATCH 050/109] Use the common helper function to apply default
 insets in LoginActivity

This also ensures we handle the cutout section correctly.
---
 .../com/woocommerce/android/ui/login/LoginActivity.kt     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
index 43dd81bcaf9..e4b830ebb33 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
@@ -12,7 +12,6 @@ import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
@@ -33,6 +32,7 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_NO_WP_
 import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_WP_COM
 import com.woocommerce.android.analytics.ExperimentTracker
 import com.woocommerce.android.databinding.ActivityLoginBinding
+import com.woocommerce.android.extensions.doOnApplyWindowInsets
 import com.woocommerce.android.extensions.parcelable
 import com.woocommerce.android.support.help.HelpActivity
 import com.woocommerce.android.support.help.HelpOrigin
@@ -218,10 +218,8 @@ class LoginActivity :
         WindowCompat.setDecorFitsSystemWindows(window, true)
 
         // Add system bar insets to the fragment's root
-        ViewCompat.setOnApplyWindowInsetsListener(binding.snackRoot) { v, windowInsets ->
-            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
-            WindowInsetsCompat.CONSUMED
+        binding.snackRoot.doOnApplyWindowInsets(consumeInsets = true) { insets ->
+            binding.snackRoot.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
         }
     }
 

From 569abb90e96cf97b8c1f91ab123891ddc0474d14 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Tue, 25 Feb 2025 11:54:10 +0000
Subject: [PATCH 051/109] Fix handling of insets in the prologue carousel

---
 .../ui/login/LoginPrologueCarouselFragment.kt | 21 +++++++------------
 .../fragment_login_prologue_carousel.xml      |  4 ++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginPrologueCarouselFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginPrologueCarouselFragment.kt
index f63dc1621b3..e5afb9a606a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginPrologueCarouselFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginPrologueCarouselFragment.kt
@@ -4,8 +4,6 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import com.woocommerce.android.AppPrefsWrapper
@@ -16,6 +14,7 @@ import com.woocommerce.android.analytics.AnalyticsEvent.LOGIN_ONBOARDING_SKIP_BU
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
 import com.woocommerce.android.databinding.FragmentLoginPrologueCarouselBinding
+import com.woocommerce.android.extensions.doOnApplyWindowInsets
 import com.woocommerce.android.ui.login.UnifiedLoginTracker.Flow
 import com.woocommerce.android.ui.login.UnifiedLoginTracker.Step
 import dagger.hilt.android.AndroidEntryPoint
@@ -54,26 +53,20 @@ class LoginPrologueCarouselFragment : Fragment(R.layout.fragment_login_prologue_
         val binding = FragmentLoginPrologueCarouselBinding.bind(view)
 
         val isTablet = DisplayUtils.isTablet(context) || DisplayUtils.isXLargeTablet(context)
-        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
-            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+        binding.root.doOnApplyWindowInsets(consumeInsets = true) { insets ->
+            val currentBottomMargin = resources.getDimension(R.dimen.prologue_button_skip_bottom_margin)
+            val buttonHorizontalMargin = resources.getDimension(R.dimen.prologue_button_horizontal_margin)
+
             binding.buttonSkip.updateLayoutParams<MarginLayoutParams> {
-                val currentBottomMargin = resources.getDimension(R.dimen.prologue_button_skip_bottom_margin)
                 bottomMargin = currentBottomMargin.roundToInt() + insets.bottom
                 if (!isTablet) {
-                    val buttonHorizontalMargin = resources.getDimension(R.dimen.prologue_button_horizontal_margin)
                     rightMargin = buttonHorizontalMargin.roundToInt() + insets.right
                 }
             }
-            WindowInsetsCompat.CONSUMED
-        }
-        if (!isTablet) {
-            ViewCompat.setOnApplyWindowInsetsListener(binding.buttonNext) { v, windowInsets ->
-                val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-                val buttonHorizontalMargin = resources.getDimension(R.dimen.prologue_button_horizontal_margin)
-                v.updateLayoutParams<MarginLayoutParams> {
+            if (!isTablet) {
+                binding.buttonNext.updateLayoutParams<MarginLayoutParams> {
                     leftMargin = buttonHorizontalMargin.roundToInt() + insets.left
                 }
-                WindowInsetsCompat.CONSUMED
             }
         }
 
diff --git a/WooCommerce/src/main/res/layout/fragment_login_prologue_carousel.xml b/WooCommerce/src/main/res/layout/fragment_login_prologue_carousel.xml
index b73249bf9ae..90ea03e3720 100644
--- a/WooCommerce/src/main/res/layout/fragment_login_prologue_carousel.xml
+++ b/WooCommerce/src/main/res/layout/fragment_login_prologue_carousel.xml
@@ -49,7 +49,7 @@
         style="@style/Woo.Button.Colored"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
+        android:layout_marginHorizontal="@dimen/prologue_button_horizontal_margin"
         android:layout_marginBottom="4dp"
         android:text="@string/next"
         android:textAllCaps="false"
@@ -60,7 +60,7 @@
         style="@style/Woo.Button.TextButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
+        android:layout_marginHorizontal="@dimen/prologue_button_horizontal_margin"
         android:layout_marginBottom="@dimen/prologue_button_skip_bottom_margin"
         android:text="@string/skip"
         android:textAllCaps="false"

From 711dac22ccc91b767210b8f33cd9ea870843b083 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Tue, 25 Feb 2025 12:14:17 +0000
Subject: [PATCH 052/109] Remove not needed call

---
 .../com/woocommerce/android/ui/login/LoginActivity.kt  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
index e4b830ebb33..48b73d37d37 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
@@ -11,7 +11,6 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
@@ -179,7 +178,7 @@ class LoginActivity :
         binding = ActivityLoginBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        applyDefaultInsets()
+        applyDefaultWindowInsets()
 
         when {
             intent?.action == LOGIN_WITH_WPCOM_EMAIL_ACTION -> {
@@ -212,11 +211,9 @@ class LoginActivity :
         }
     }
 
-    private fun applyDefaultInsets() {
+    private fun applyDefaultWindowInsets() {
         enableEdgeToEdge()
 
-        WindowCompat.setDecorFitsSystemWindows(window, true)
-
         // Add system bar insets to the fragment's root
         binding.snackRoot.doOnApplyWindowInsets(consumeInsets = true) { insets ->
             binding.snackRoot.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
@@ -369,7 +366,8 @@ class LoginActivity :
 
     override fun disableDynamicEdgeToEdge() {
         // re-apply default insets
-        applyDefaultInsets()
+        applyDefaultWindowInsets()
+        binding.fragmentContainer.requestLayout()
     }
 
     override fun onNewToWooButtonClicked() {

From bdac0a93c5e7e3b5666a9aee02313ee5f28432ca Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Tue, 25 Feb 2025 12:14:42 +0000
Subject: [PATCH 053/109] Handle insets in login error screens

---
 .../android/ui/login/error/base/LoginErrorScreen.kt  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/error/base/LoginErrorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/error/base/LoginErrorScreen.kt
index a0f9e46e273..4c4d76ca01d 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/error/base/LoginErrorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/error/base/LoginErrorScreen.kt
@@ -3,14 +3,16 @@ package com.woocommerce.android.ui.login.error.base
 import android.content.res.Configuration
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Divider
@@ -48,16 +50,18 @@ fun LoginErrorScreen(
     secondaryButton: LoginErrorButton?
 ) {
     Scaffold(
+        contentWindowInsets = WindowInsets.safeDrawing,
         topBar = {
             ToolbarWithHelpButton(
                 navigationIcon = null,
-                onHelpButtonClick = onHelpButtonClick
+                onHelpButtonClick = onHelpButtonClick,
+                modifier = Modifier.windowInsetsPadding(WindowInsets.safeDrawing)
             )
-        }
+        },
+        backgroundColor = MaterialTheme.colors.surface,
     ) {
         Column(
             modifier = Modifier
-                .background(MaterialTheme.colors.surface)
                 .padding(it)
                 .padding(dimensionResource(id = R.dimen.major_100))
         ) {

From c8f61f8f4f2257bed4404f2e9e9bfadf0213b728 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Tue, 25 Feb 2025 12:18:21 +0000
Subject: [PATCH 054/109] Handle insets in the HelpActivity in a similar way to
 MainActivity

---
 .../android/support/help/HelpActivity.kt          | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/help/HelpActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/help/HelpActivity.kt
index d22eb76e083..f663a7ef496 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/help/HelpActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/help/HelpActivity.kt
@@ -8,6 +8,7 @@ import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.updatePadding
 import com.woocommerce.android.AppPrefs
 import com.woocommerce.android.AppUrls
 import com.woocommerce.android.R
@@ -17,7 +18,7 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_HELP_CON
 import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_SOURCE_FLOW
 import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_SOURCE_STEP
 import com.woocommerce.android.databinding.ActivityHelpBinding
-import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationBar
+import com.woocommerce.android.extensions.doOnApplyWindowInsets
 import com.woocommerce.android.extensions.isNotNullOrEmpty
 import com.woocommerce.android.extensions.serializable
 import com.woocommerce.android.extensions.show
@@ -69,7 +70,17 @@ class HelpActivity : AppCompatActivity() {
 
         binding = ActivityHelpBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.root.edgeToEdgeHandlingForNavigationBar()
+
+        binding.root.doOnApplyWindowInsets(consumeInsets = true) {
+            binding.root.updatePadding(
+                left = it.left,
+                right = it.right,
+                bottom = it.bottom
+            )
+            binding.appBarLayout.updatePadding(
+                top = it.top
+            )
+        }
 
         setSupportActionBar(binding.toolbar.toolbar as Toolbar)
         supportActionBar?.setHomeButtonEnabled(true)

From fcdd48786ac167b385dcda5921bdeeda0c61c243 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Tue, 25 Feb 2025 13:40:31 +0000
Subject: [PATCH 055/109] Force edge to edge in the login dialog fragments in
 all APIs

---
 .../ui/login/error/base/LoginBaseErrorDialogFragment.kt     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/error/base/LoginBaseErrorDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/error/base/LoginBaseErrorDialogFragment.kt
index db42cd3296f..f97915b45cf 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/error/base/LoginBaseErrorDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/error/base/LoginBaseErrorDialogFragment.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.window.Dialog
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import com.woocommerce.android.R
 import com.woocommerce.android.R.string
@@ -46,7 +47,10 @@ abstract class LoginBaseErrorDialogFragment : DialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        dialog?.window?.setWindowAnimations(R.style.Woo_Animations_Dialog)
+        dialog?.window?.let {
+            it.setWindowAnimations(R.style.Woo_Animations_Dialog)
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

From 21e7c7f64f30fb5f7eb682d3feb4a245e34dde6b Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 09:36:03 +0100
Subject: [PATCH 056/109] Remove unused constant for date picker fragment in
 OrderFilterOptionsFragment

---
 .../android/ui/orders/filters/OrderFilterOptionsFragment.kt      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
index 8bd5c9e6e9e..8ce15469e14 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
@@ -32,7 +32,6 @@ class OrderFilterOptionsFragment :
     private var _binding: FragmentOrderFilterListBinding? = null
     private val binding get() = _binding!!
     private companion object {
-        const val DATE_PICKER_FRAGMENT_TAG = "DateRangePicker"
         const val TABLET_LANDSCAPE_WIDTH_RATIO = 0.55f
         const val TABLET_LANDSCAPE_HEIGHT_RATIO = 0.6f
     }

From b677ca92c34bedf7d99c018faad3498d6115c965 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 10:14:27 +0100
Subject: [PATCH 057/109] Implement edge-to-edge handling for navigation and
 status bar in OrderFilterCategoriesFragment

---
 .../woocommerce/android/extensions/ViewExt.kt | 18 ++++++++++--
 .../filters/OrderFilterCategoriesFragment.kt  |  3 ++
 .../res/layout/fragment_order_filter_list.xml | 28 +++++++++++--------
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
index 253a75dff67..6123ee4ce81 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
@@ -19,10 +19,12 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.children
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
 import androidx.transition.ChangeBounds
 import androidx.transition.Transition
 import androidx.transition.TransitionListenerAdapter
 import androidx.transition.TransitionManager
+import com.google.android.material.appbar.AppBarLayout
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
@@ -192,9 +194,19 @@ fun View.edgeToEdgeHandlingForNavigationBar() {
     }
 }
 
-fun View.edgeToEdgeHandlingForNavigationAndStatusBar() {
-    doOnApplyWindowInsets {
-        setPadding(it.left, it.top, it.right, it.bottom)
+fun View.edgeToEdgeHandlingForNavigationAndStatusBar(appBarLayout: AppBarLayout? = null) {
+    doOnApplyWindowInsets(consumeInsets = true) { insets ->
+        updatePadding(
+            left = insets.left,
+            right = insets.right,
+            bottom = insets.bottom
+        )
+
+        if (appBarLayout != null) {
+            appBarLayout.updatePadding(top = insets.top)
+        } else {
+            updatePadding(top = insets.top)
+        }
     }
 }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
index 4377c6c5b0c..8d6025b8783 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.woocommerce.android.R
 import com.woocommerce.android.databinding.FragmentOrderFilterListBinding
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import com.woocommerce.android.extensions.handleResult
 import com.woocommerce.android.extensions.isTwoPanesShouldBeUsed
 import com.woocommerce.android.extensions.navigateBackWithNotice
@@ -57,6 +58,8 @@ class OrderFilterCategoriesFragment :
         super.onViewCreated(view, savedInstanceState)
 
         _binding = FragmentOrderFilterListBinding.bind(view)
+
+        binding.root.edgeToEdgeHandlingForNavigationAndStatusBar(binding.appBarLayout)
         setupToolbar(binding)
         setUpObservers(viewModel)
 
diff --git a/WooCommerce/src/main/res/layout/fragment_order_filter_list.xml b/WooCommerce/src/main/res/layout/fragment_order_filter_list.xml
index 39ac8ad4aa7..467b55cf246 100644
--- a/WooCommerce/src/main/res/layout/fragment_order_filter_list.xml
+++ b/WooCommerce/src/main/res/layout/fragment_order_filter_list.xml
@@ -5,24 +5,30 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_height"
-        android:elevation="@dimen/minor_50"
-        app:layout_collapseMode="pin"
-        style="@style/Widget.Woo.Toolbar"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:title="@string/app_name"/>
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Widget.Woo.Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/toolbar_height"
+            android:elevation="@dimen/minor_50"
+            app:layout_collapseMode="pin"
+            tools:title="@string/app_name" />
+    </com.google.android.material.appbar.AppBarLayout>
 
     <View
         android:id="@+id/app_bar_divider"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
-        app:layout_constraintStart_toStartOf="parent"
+        style="@style/Woo.Divider"
         app:layout_constraintEnd_toEndOf="parent"
-        style="@style/Woo.Divider" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/app_bar_layout" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/filterList"

From aa3ad435280ff0c6f48a443751d397b8ae874052 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 10:16:01 +0100
Subject: [PATCH 058/109] Add edge-to-edge handling for navigation and status
 bar in OrderFilterOptionsFragment

---
 .../android/ui/orders/filters/OrderFilterOptionsFragment.kt     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
index 8ce15469e14..310613e3b52 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.woocommerce.android.R
 import com.woocommerce.android.databinding.FragmentOrderFilterListBinding
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import com.woocommerce.android.extensions.isTwoPanesShouldBeUsed
 import com.woocommerce.android.extensions.navigateBackWithNotice
 import com.woocommerce.android.extensions.navigateBackWithResult
@@ -54,6 +55,7 @@ class OrderFilterOptionsFragment :
         super.onViewCreated(view, savedInstanceState)
 
         _binding = FragmentOrderFilterListBinding.bind(view)
+        binding.root.edgeToEdgeHandlingForNavigationAndStatusBar(binding.appBarLayout)
         setupToolbar(binding)
         setUpObservers(viewModel)
         setUpFilterOptionsRecyclerView(binding)

From da20bee942f6c203fffbf6744552f9bfb43866d8 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 11:08:50 +0100
Subject: [PATCH 059/109] Implement edge-to-edge handling for top app bar in
 OrderCustomerListScreen

---
 .../customerlist/OrderCustomerListScreen.kt   | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
index 1a2de0b6517..1c1cdffa019 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
@@ -2,7 +2,11 @@
 
 package com.woocommerce.android.ui.orders.creation.customerlist
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
@@ -52,21 +56,30 @@ fun OrderCustomerListScreen(
     onEndOfListReached: () -> Unit,
     modifier: Modifier = Modifier
 ) {
+    val toolbarColor = colorResource(id = R.color.color_toolbar)
+
     Scaffold(
         topBar = {
-            TopAppBar(
-                title = { Text(stringResource(id = R.string.order_creation_add_customer)) },
-                navigationIcon = {
-                    IconButton(onNavigateBack) {
-                        Icon(
-                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = stringResource(id = R.string.back)
-                        )
-                    }
-                },
-                backgroundColor = colorResource(id = R.color.color_toolbar),
-                elevation = 0.dp,
-            )
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(toolbarColor)
+            ) {
+                TopAppBar(
+                    title = { Text(stringResource(id = R.string.order_creation_add_customer)) },
+                    navigationIcon = {
+                        IconButton(onNavigateBack) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                contentDescription = stringResource(id = R.string.back)
+                            )
+                        }
+                    },
+                    backgroundColor = toolbarColor,
+                    elevation = 0.dp,
+                    modifier = Modifier.statusBarsPadding()
+                )
+            }
         },
         floatingActionButton = {
             if (state.showFab) CustomerListAddCustomerButton(onAddCustomerClicked)

From 8226ec8203b082d19b33557fa04351fc25ce3707 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 11:38:02 +0100
Subject: [PATCH 060/109] Implement edge-to-edge handling for status bar in
 ProductSelectorScreen

---
 .../selector/ProductSelectorScreen.kt         | 62 ++++++++++++-------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
index 77b567f1934..b8cae63df8f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
@@ -12,9 +12,11 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -77,34 +79,48 @@ fun ProductSelectorScreen(viewModel: ProductSelectorViewModel) {
     val viewState by viewModel.viewState.observeAsState()
     BackHandler(onBack = viewModel::onNavigateBack)
     viewState?.let { state ->
+        val showToolbar = state.selectionMode != SelectionMode.LIVE
         Scaffold(topBar = {
-            if (state.selectionMode != SelectionMode.LIVE) {
-                TopAppBar(
-                    title = {
-                        Text(
-                            text = state.screenTitleOverride
-                                ?: stringResource(id = string.coupon_conditions_products_select_products_title)
-                        )
-                    },
-                    navigationIcon = {
-                        IconButton(viewModel::onNavigateBack) {
-                            Icon(
-                                imageVector = if (state.searchState.isActive) {
-                                    Icons.AutoMirrored.Filled.ArrowBack
-                                } else {
-                                    Icons.Filled.Close
-                                },
-                                contentDescription = stringResource(id = string.back)
+            if (showToolbar) {
+                val toolbarColor = colorResource(id = R.color.color_toolbar)
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(toolbarColor)
+                ) {
+                    TopAppBar(
+                        title = {
+                            Text(
+                                text = state.screenTitleOverride
+                                    ?: stringResource(id = string.coupon_conditions_products_select_products_title)
                             )
-                        }
-                    },
-                    backgroundColor = colorResource(id = color.color_toolbar),
-                    elevation = 0.dp,
-                )
+                        },
+                        navigationIcon = {
+                            IconButton(viewModel::onNavigateBack) {
+                                Icon(
+                                    imageVector = if (state.searchState.isActive) {
+                                        Icons.AutoMirrored.Filled.ArrowBack
+                                    } else {
+                                        Icons.Filled.Close
+                                    },
+                                    contentDescription = stringResource(id = string.back)
+                                )
+                            }
+                        },
+                        backgroundColor = toolbarColor,
+                        elevation = 0.dp,
+                        modifier = Modifier.statusBarsPadding(),
+                    )
+                }
             }
         }) { padding ->
+            val modifier = if (showToolbar) {
+                Modifier.padding(padding)
+            } else {
+                Modifier.padding(padding).statusBarsPadding().navigationBarsPadding()
+            }
             ProductSelectorScreen(
-                modifier = Modifier.padding(padding),
+                modifier = modifier,
                 state = state,
                 onDoneButtonClick = viewModel::onDoneButtonClick,
                 onClearButtonClick = viewModel::onClearButtonClick,

From 6e029348e7815f40e3ebd9b20c87297672e626a6 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 11:48:48 +0100
Subject: [PATCH 061/109] Add edge-to-edge handling for navigation bars in
 CustomerListScreen

---
 .../woocommerce/android/ui/customer/CustomerListScreen.kt  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/customer/CustomerListScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/customer/CustomerListScreen.kt
index 5e37499edc0..9901f7aa0e4 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/customer/CustomerListScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/customer/CustomerListScreen.kt
@@ -11,9 +11,12 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -140,6 +143,7 @@ private fun CustomerListLoaded(
 
     LazyColumn(
         state = listState,
+        contentPadding = WindowInsets.navigationBars.asPaddingValues(),
     ) {
         itemsIndexed(
             items = body.customers,
@@ -288,7 +292,8 @@ private fun CustomerListError(@StringRes message: Int) {
 private fun CustomerListSkeleton() {
     val numberOfSkeletonRows = 10
     LazyColumn(
-        Modifier.background(color = MaterialTheme.colors.surface)
+        Modifier.background(color = MaterialTheme.colors.surface),
+        contentPadding = WindowInsets.navigationBars.asPaddingValues(),
     ) {
         repeat(numberOfSkeletonRows) {
             item {

From 2397e888f7d703a9ce9bae4ebb17a38c017388da Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 11:55:35 +0100
Subject: [PATCH 062/109] Refactor edge-to-edge handling for navigation bars in
 ProductSelectorScreen

---
 .../android/ui/products/selector/ProductSelectorScreen.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
index b8cae63df8f..c4662bc969d 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
@@ -117,8 +117,8 @@ fun ProductSelectorScreen(viewModel: ProductSelectorViewModel) {
             val modifier = if (showToolbar) {
                 Modifier.padding(padding)
             } else {
-                Modifier.padding(padding).statusBarsPadding().navigationBarsPadding()
-            }
+                Modifier.padding(padding).statusBarsPadding()
+            }.navigationBarsPadding()
             ProductSelectorScreen(
                 modifier = modifier,
                 state = state,

From 03a1db3f86fdef8528ffce4bd9d18467fcac2caf Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 12:03:23 +0100
Subject: [PATCH 063/109] Remove unused onCreateMenu method in
 OrderFilterCategoriesFragment

---
 .../ui/orders/filters/OrderFilterCategoriesFragment.kt        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
index 8d6025b8783..b0d1ec1ef67 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
@@ -106,10 +106,6 @@ class OrderFilterCategoriesFragment :
         }
     }
 
-//    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-//        inflater.inflate(R.menu.menu_clear, menu)
-//    }
-
     fun onPrepareMenu(menu: Menu) {
         updateClearButtonVisibility(menu.findItem(R.id.menu_clear))
     }

From 4c551d2d126e5da374f9b97fd346b024f980e15e Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 13:55:28 +0100
Subject: [PATCH 064/109] Add TopAppBarEdgeToEdge component and refactor usage
 in OrderCustomerListScreen and ProductSelectorScreen

---
 .../compose/component/TopAppBarEdgeToEdge.kt  | 38 +++++++++++++
 .../customerlist/OrderCustomerListScreen.kt   | 41 +++++---------
 .../selector/ProductSelectorScreen.kt         | 56 +++++++++----------
 3 files changed, 77 insertions(+), 58 deletions(-)
 create mode 100644 WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/TopAppBarEdgeToEdge.kt

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/TopAppBarEdgeToEdge.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/TopAppBarEdgeToEdge.kt
new file mode 100644
index 00000000000..613e89d0f60
--- /dev/null
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/TopAppBarEdgeToEdge.kt
@@ -0,0 +1,38 @@
+package com.woocommerce.android.ui.compose.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.material.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun TopAppBarEdgeToEdge(
+    title: @Composable () -> Unit,
+    backgroundColor: Color,
+    navigationIcon: @Composable (() -> Unit)? = null,
+    actions: @Composable RowScope.() -> Unit = {},
+    elevation: Dp = 0.dp,
+    modifier: Modifier = Modifier
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(backgroundColor)
+    ) {
+        TopAppBar(
+            title = title,
+            navigationIcon = navigationIcon,
+            actions = actions,
+            backgroundColor = backgroundColor,
+            elevation = elevation,
+            modifier = modifier.statusBarsPadding()
+        )
+    }
+}
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
index 1c1cdffa019..4ca5c9094fd 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
@@ -2,17 +2,12 @@
 
 package com.woocommerce.android.ui.orders.creation.customerlist
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
@@ -25,6 +20,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
+import com.woocommerce.android.ui.compose.component.TopAppBarEdgeToEdge
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 import com.woocommerce.android.ui.customer.CustomerListScreen
 import org.wordpress.android.fluxc.model.customer.WCCustomerModel
@@ -56,30 +52,21 @@ fun OrderCustomerListScreen(
     onEndOfListReached: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val toolbarColor = colorResource(id = R.color.color_toolbar)
-
     Scaffold(
         topBar = {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .background(toolbarColor)
-            ) {
-                TopAppBar(
-                    title = { Text(stringResource(id = R.string.order_creation_add_customer)) },
-                    navigationIcon = {
-                        IconButton(onNavigateBack) {
-                            Icon(
-                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                                contentDescription = stringResource(id = R.string.back)
-                            )
-                        }
-                    },
-                    backgroundColor = toolbarColor,
-                    elevation = 0.dp,
-                    modifier = Modifier.statusBarsPadding()
-                )
-            }
+            TopAppBarEdgeToEdge(
+                title = { Text(stringResource(id = R.string.order_creation_add_customer)) },
+                navigationIcon = {
+                    IconButton(onNavigateBack) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = stringResource(id = R.string.back)
+                        )
+                    }
+                },
+                backgroundColor = colorResource(id = R.color.color_toolbar),
+                elevation = 0.dp,
+            )
         },
         floatingActionButton = {
             if (state.showFab) CustomerListAddCustomerButton(onAddCustomerClicked)
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
index c4662bc969d..3b83807ea6e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
@@ -30,7 +30,6 @@ import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
@@ -54,6 +53,7 @@ import com.woocommerce.android.ui.compose.animations.SkeletonView
 import com.woocommerce.android.ui.compose.component.InfiniteListHandler
 import com.woocommerce.android.ui.compose.component.SearchLayoutWithParams
 import com.woocommerce.android.ui.compose.component.SearchLayoutWithParamsState
+import com.woocommerce.android.ui.compose.component.TopAppBarEdgeToEdge
 import com.woocommerce.android.ui.compose.component.WCColoredButton
 import com.woocommerce.android.ui.compose.component.WCTextButton
 import com.woocommerce.android.ui.products.ProductType.BUNDLE
@@ -82,42 +82,36 @@ fun ProductSelectorScreen(viewModel: ProductSelectorViewModel) {
         val showToolbar = state.selectionMode != SelectionMode.LIVE
         Scaffold(topBar = {
             if (showToolbar) {
-                val toolbarColor = colorResource(id = R.color.color_toolbar)
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .background(toolbarColor)
-                ) {
-                    TopAppBar(
-                        title = {
-                            Text(
-                                text = state.screenTitleOverride
-                                    ?: stringResource(id = string.coupon_conditions_products_select_products_title)
+                TopAppBarEdgeToEdge(
+                    title = {
+                        Text(
+                            text = state.screenTitleOverride
+                                ?: stringResource(id = string.coupon_conditions_products_select_products_title)
+                        )
+                    },
+                    navigationIcon = {
+                        IconButton(viewModel::onNavigateBack) {
+                            Icon(
+                                imageVector = if (state.searchState.isActive) {
+                                    Icons.AutoMirrored.Filled.ArrowBack
+                                } else {
+                                    Icons.Filled.Close
+                                },
+                                contentDescription = stringResource(id = string.back)
                             )
-                        },
-                        navigationIcon = {
-                            IconButton(viewModel::onNavigateBack) {
-                                Icon(
-                                    imageVector = if (state.searchState.isActive) {
-                                        Icons.AutoMirrored.Filled.ArrowBack
-                                    } else {
-                                        Icons.Filled.Close
-                                    },
-                                    contentDescription = stringResource(id = string.back)
-                                )
-                            }
-                        },
-                        backgroundColor = toolbarColor,
-                        elevation = 0.dp,
-                        modifier = Modifier.statusBarsPadding(),
-                    )
-                }
+                        }
+                    },
+                    backgroundColor = colorResource(id = R.color.color_toolbar),
+                    elevation = 0.dp,
+                )
             }
         }) { padding ->
             val modifier = if (showToolbar) {
                 Modifier.padding(padding)
             } else {
-                Modifier.padding(padding).statusBarsPadding()
+                Modifier
+                    .padding(padding)
+                    .statusBarsPadding()
             }.navigationBarsPadding()
             ProductSelectorScreen(
                 modifier = modifier,

From 2064dfc45c8d9b4df234efb8a1eebdfd525664e5 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 14:24:33 +0100
Subject: [PATCH 065/109] Refactor UpdateProductStockStatusScreen to use
 TopAppBarEdgeToEdge for improved navigation and UI consistency

---
 .../UpdateProductStockStatusScreen.kt         | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusScreen.kt
index 769e8250711..4747288eee5 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusScreen.kt
@@ -6,10 +6,14 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
@@ -21,9 +25,10 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.compose.component.ProgressDialog
-import com.woocommerce.android.ui.compose.component.Toolbar
+import com.woocommerce.android.ui.compose.component.TopAppBarEdgeToEdge
 import com.woocommerce.android.ui.compose.component.WcExposedDropDown
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 import com.woocommerce.android.ui.products.UpdateProductStockStatusViewModel.Companion.AVAILABLE_STOCK_STATUSES
@@ -56,9 +61,17 @@ fun UpdateProductStockStatusScreen(
 
     Scaffold(
         topBar = {
-            Toolbar(
-                title = stringResource(id = R.string.product_update_stock_status_title),
-                onNavigationButtonClick = onNavigationUpClicked,
+            TopAppBarEdgeToEdge(
+                title = { Text(stringResource(id = R.string.product_update_stock_status_title)) },
+                backgroundColor = colorResource(id = R.color.color_toolbar),
+                navigationIcon = {
+                    IconButton(onClick = onNavigationUpClicked) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = stringResource(id = R.string.back)
+                        )
+                    }
+                },
                 actions = {
                     TextButton(onClick = onUpdateClicked) {
                         Text(
@@ -66,7 +79,8 @@ fun UpdateProductStockStatusScreen(
                             color = MaterialTheme.colors.primary
                         )
                     }
-                }
+                },
+                elevation = 0.dp
             )
         },
         backgroundColor = MaterialTheme.colors.surface

From 86d6c1d8755fa8ee51e791e306a4ea12e4412362 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 14:33:52 +0100
Subject: [PATCH 066/109] Refactor UpdateProductStockStatusScreen to use
 TopAppBarEdgeToEdge for improved navigation and UI consistency

---
 .../kotlin/com/woocommerce/android/extensions/ViewExt.kt   | 7 +++++++
 .../creation/customerlist/CustomerListDialogFragment.kt    | 2 ++
 .../ui/products/UpdateProductStockStatusFragment.kt        | 3 +++
 .../ui/products/selector/ProductSelectorDialogFragment.kt  | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
index 6123ee4ce81..78fb2f55dbc 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/extensions/ViewExt.kt
@@ -31,6 +31,7 @@ import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
+import org.wordpress.android.util.DisplayUtils
 
 const val EXPAND_COLLAPSE_ANIMATION_DURATION_MILLIS = 300L
 
@@ -194,6 +195,12 @@ fun View.edgeToEdgeHandlingForNavigationBar() {
     }
 }
 
+fun View.edgeToEdgeForInLandscape() {
+    if (DisplayUtils.isLandscape(context)) {
+        edgeToEdgeHandlingForNavigationBar()
+    }
+}
+
 fun View.edgeToEdgeHandlingForNavigationAndStatusBar(appBarLayout: AppBarLayout? = null) {
     doOnApplyWindowInsets(consumeInsets = true) { insets ->
         updatePadding(
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
index 09cd9c5e2a0..2da19ff6d20 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
@@ -11,6 +11,7 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsTracker
+import com.woocommerce.android.extensions.edgeToEdgeForInLandscape
 import com.woocommerce.android.extensions.isTwoPanesShouldBeUsed
 import com.woocommerce.android.extensions.navigateBackWithResult
 import com.woocommerce.android.extensions.navigateSafely
@@ -45,6 +46,7 @@ class CustomerListDialogFragment : DialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ) = ComposeView(requireContext()).apply {
+        edgeToEdgeForInLandscape()
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
         setContent {
             WooThemeWithBackground {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusFragment.kt
index 04f0f4b956e..13fec667d19 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusFragment.kt
@@ -10,6 +10,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.R
+import com.woocommerce.android.extensions.edgeToEdgeForInLandscape
 import com.woocommerce.android.extensions.isTwoPanesShouldBeUsed
 import com.woocommerce.android.extensions.navigateBackWithResult
 import com.woocommerce.android.ui.base.UIMessageResolver
@@ -64,6 +65,8 @@ class UpdateProductStockStatusFragment : DialogFragment() {
                     viewModel.onDoneButtonClicked()
                 }
             )
+        }.apply {
+            edgeToEdgeForInLandscape()
         }
     }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
index 55e354b5f54..3c8940aceaf 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
@@ -11,6 +11,7 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.woocommerce.android.R
+import com.woocommerce.android.extensions.edgeToEdgeForInLandscape
 import com.woocommerce.android.extensions.isTwoPanesShouldBeUsed
 import com.woocommerce.android.extensions.navigateBackWithResult
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
@@ -57,6 +58,7 @@ class ProductSelectorDialogFragment : DialogFragment() {
         return ComposeView(requireContext()).apply {
             id = R.id.product_selector_compose_view
 
+            edgeToEdgeForInLandscape()
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
 
             setContent {

From ccf4b4cbe234af8abc19d69dfdafbc6d97930a04 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 14:49:28 +0100
Subject: [PATCH 067/109] Refactor PrintingInstructionsFragment to implement
 edge-to-edge handling for navigation and status bar

---
 .../details/PrintingInstructionsFragment.kt   |  2 ++
 .../layout/fragment_printing_instructions.xml | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/PrintingInstructionsFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/PrintingInstructionsFragment.kt
index 97e3b086489..fc6bef66679 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/PrintingInstructionsFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/PrintingInstructionsFragment.kt
@@ -7,6 +7,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.R
 import com.woocommerce.android.databinding.FragmentPrintingInstructionsBinding
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import com.woocommerce.android.extensions.isTwoPanesShouldBeUsed
 import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.util.DisplayUtils
@@ -17,6 +18,7 @@ class PrintingInstructionsFragment : DialogFragment(R.layout.fragment_printing_i
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val binding = FragmentPrintingInstructionsBinding.bind(view)
+        binding.root.edgeToEdgeHandlingForNavigationAndStatusBar(binding.appBarLayout)
         setupToolbar(binding)
     }
 
diff --git a/WooCommerce/src/main/res/layout/fragment_printing_instructions.xml b/WooCommerce/src/main/res/layout/fragment_printing_instructions.xml
index bb56c5db018..6c56c237efc 100644
--- a/WooCommerce/src/main/res/layout/fragment_printing_instructions.xml
+++ b/WooCommerce/src/main/res/layout/fragment_printing_instructions.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_height"
-        app:layout_collapseMode="pin"
-        style="@style/Widget.Woo.Toolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:title="@string/app_name"/>
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Widget.Woo.Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/toolbar_height"
+            app:layout_collapseMode="pin"
+            tools:title="@string/app_name" />
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView
         android:layout_width="match_parent"

From caf8106e7442ca6274f14d4a3b33af81b85b95fd Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 15:02:48 +0100
Subject: [PATCH 068/109] Refactor VariationSelectorFragment and
 VariationSelectorScreen to implement edge-to-edge handling for navigation
 bars

---
 .../selector/VariationSelectorFragment.kt         |  3 ++-
 .../selector/VariationSelectorScreen.kt           | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorFragment.kt
index c4b89efd3bc..55863fa871f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorFragment.kt
@@ -10,6 +10,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.R
+import com.woocommerce.android.extensions.edgeToEdgeForInLandscape
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 import com.woocommerce.android.ui.products.variations.selector.VariationSelectorViewModel.ScreenMode
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ExitWithResult
@@ -37,7 +38,7 @@ class VariationSelectorFragment : DialogFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return ComposeView(requireContext()).apply {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-
+            edgeToEdgeForInLandscape()
             setContent {
                 WooThemeWithBackground {
                     VariationSelectorScreen(viewModel)
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorScreen.kt
index 53f094caef1..9fa029f4bc0 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorScreen.kt
@@ -9,9 +9,12 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -26,7 +29,6 @@ import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
@@ -46,6 +48,7 @@ import com.woocommerce.android.R.dimen
 import com.woocommerce.android.R.string
 import com.woocommerce.android.ui.compose.animations.SkeletonView
 import com.woocommerce.android.ui.compose.component.InfiniteListHandler
+import com.woocommerce.android.ui.compose.component.TopAppBarEdgeToEdge
 import com.woocommerce.android.ui.compose.component.WCTextButton
 import com.woocommerce.android.ui.products.selector.SelectionState.SELECTED
 import com.woocommerce.android.ui.products.selector.components.SelectorListItem
@@ -61,7 +64,7 @@ fun VariationSelectorScreen(viewModel: VariationSelectorViewModel) {
     BackHandler(onBack = viewModel::onBackPress)
     Scaffold(
         topBar = {
-            TopAppBar(
+            TopAppBarEdgeToEdge(
                 title = {
                     Text(
                         text = viewState.productName
@@ -165,7 +168,8 @@ private fun VariationList(
             state = listState,
             modifier = Modifier
                 .weight(1f)
-                .fillMaxHeight()
+                .fillMaxHeight(),
+            contentPadding = WindowInsets.navigationBars.asPaddingValues(),
         ) {
             itemsIndexed(state.variations) { _, variation ->
                 SelectorListItem(
@@ -213,7 +217,10 @@ private fun VariationList(
 @Suppress("MagicNumber")
 fun VariationListSkeleton() {
     val numberOfInboxSkeletonRows = 10
-    LazyColumn(Modifier.background(color = MaterialTheme.colors.surface)) {
+    LazyColumn(
+        Modifier.background(color = MaterialTheme.colors.surface),
+        contentPadding = WindowInsets.navigationBars.asPaddingValues(),
+    ) {
         repeat(numberOfInboxSkeletonRows) {
             item {
                 Row(

From 60128f9385e84c86e8bf2778afbe1c46041a8f75 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 27 Feb 2025 16:31:38 +0100
Subject: [PATCH 069/109] Updates robolectric version to support SDK 35

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1abe896283a..aa04a0dc6e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -87,7 +87,7 @@ ksp = '2.1.10-1.0.29'
 mockito-kotlin = '5.4.0'
 mpandroidchart = 'v3.1.0'
 photoview = '2.3.0'
-robolectric = "4.11"
+robolectric = "4.14"
 sentry = '4.10.0'
 squareup-javapoet = "1.7.0"
 squareup-leakcanary = '2.14'

From 43852672ad7b7bf9d7ee6880e74e2c43d0621d17 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Mon, 10 Mar 2025 11:50:37 +0100
Subject: [PATCH 070/109] Enabled edge to edge for older SDK versions on the
 dialogs

---
 .../orders/details/PrintingInstructionsFragment.kt   |  4 ++++
 .../orders/filters/OrderFilterCategoriesFragment.kt  |  5 +++++
 .../ui/orders/filters/OrderFilterOptionsFragment.kt  |  4 ++++
 .../ui/products/UpdateProductStockStatusFragment.kt  | 12 ++++++++----
 .../selector/ProductSelectorDialogFragment.kt        |  4 ++++
 .../variations/selector/VariationSelectorFragment.kt |  9 +++++++++
 .../ui/whatsnew/FeatureAnnouncementDialogFragment.kt |  9 +++++++++
 7 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/PrintingInstructionsFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/PrintingInstructionsFragment.kt
index fc6bef66679..05d5568930e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/PrintingInstructionsFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/PrintingInstructionsFragment.kt
@@ -3,6 +3,7 @@ package com.woocommerce.android.ui.orders.details
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.R
@@ -51,6 +52,9 @@ class PrintingInstructionsFragment : DialogFragment(R.layout.fragment_printing_i
                 (DisplayUtils.getWindowPixelHeight(requireContext()) * TABLET_LANDSCAPE_HEIGHT_RATIO).toInt()
             )
         }
+        dialog?.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
     }
 
     companion object {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
index b0d1ec1ef67..0faa9bc4647 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterCategoriesFragment.kt
@@ -5,6 +5,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -141,6 +142,10 @@ class OrderFilterCategoriesFragment :
                 (DisplayUtils.getWindowPixelHeight(requireContext()) * TABLET_LANDSCAPE_HEIGHT_RATIO).toInt()
             )
         }
+
+        dialog?.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
     }
 
     private fun setUpFiltersRecyclerView(binding: FragmentOrderFilterListBinding) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
index 310613e3b52..b917d5c0044 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/filters/OrderFilterOptionsFragment.kt
@@ -3,6 +3,7 @@ package com.woocommerce.android.ui.orders.filters
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -72,6 +73,9 @@ class OrderFilterOptionsFragment :
                 (DisplayUtils.getWindowPixelHeight(requireContext()) * TABLET_LANDSCAPE_HEIGHT_RATIO).toInt()
             )
         }
+        dialog?.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
     }
 
     private fun setupToolbar(binding: FragmentOrderFilterListBinding) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusFragment.kt
index 13fec667d19..e881aee144e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/UpdateProductStockStatusFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -88,10 +89,13 @@ class UpdateProductStockStatusFragment : DialogFragment() {
             else -> PORTRAIT_WIDTH_RATIO to PORTRAIT_HEIGHT_RATIO
         }
 
-        dialog?.window?.setLayout(
-            (width * widthRatio).toInt(),
-            (height * heightRatio).toInt()
-        )
+        dialog?.window?.let {
+            it.setLayout(
+                (width * widthRatio).toInt(),
+                (height * heightRatio).toInt()
+            )
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
     }
 
     private fun setupObservers() {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
index 3c8940aceaf..dbaf72fcac4 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -83,6 +84,9 @@ class ProductSelectorDialogFragment : DialogFragment() {
                 (DisplayUtils.getWindowPixelHeight(requireContext()) * TABLET_LANDSCAPE_HEIGHT_RATIO).toInt()
             )
         }
+        dialog?.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
     }
 
     @Suppress("UNCHECKED_CAST")
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorFragment.kt
index 55863fa871f..83b355de3f4 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/selector/VariationSelectorFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -52,6 +53,14 @@ class VariationSelectorFragment : DialogFragment() {
         setupObservers()
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        dialog?.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
+    }
+
     private fun setupObservers() {
         viewModel.event.observe(viewLifecycleOwner) { event ->
             when (event) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/whatsnew/FeatureAnnouncementDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/whatsnew/FeatureAnnouncementDialogFragment.kt
index fc5d61b9bb6..87fb1ff82f8 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/whatsnew/FeatureAnnouncementDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/whatsnew/FeatureAnnouncementDialogFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -42,6 +43,14 @@ class FeatureAnnouncementDialogFragment : DialogFragment() {
         setupObservers()
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        dialog?.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
+    }
+
     private fun setupView(binding: FeatureAnnouncementDialogFragmentBinding) {
         binding.closeFeatureAnnouncementButton.setOnClickListener {
             viewModel.handleAnnouncementIsViewed()

From a6175848733b3b0ded24128e748636dc996b3b47 Mon Sep 17 00:00:00 2001
From: Alejo <alejandro.torres.veiga@automattic.com>
Date: Mon, 17 Mar 2025 18:36:24 -0600
Subject: [PATCH 071/109] update picker version

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aa04a0dc6e2..6c6e0122a3e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -101,7 +101,7 @@ wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-libaddressinput = '0.0.2'
 wordpress-lint = "2.1.0"
-wordpress-mediapicker = '0.3.3'
+wordpress-mediapicker = '87-30b12e0996ec61f82039cd72c70506fd89e088e8'
 wordpress-utils = '3.15.0'
 zendesk = '5.0.8'
 

From b777edb6da1a650e1c937d7ec2d57dac6581dc9d Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 18 Mar 2025 16:27:07 +0100
Subject: [PATCH 072/109] Edge to edge support with appbar

---
 .../android/support/requests/SupportRequestFormActivity.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
index fa3a11fbf44..c0e958f7616 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
@@ -13,7 +13,7 @@ import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.databinding.ActivitySupportRequestFormBinding
 import com.woocommerce.android.extensions.adjustActivityTransition
-import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationBar
+import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import com.woocommerce.android.extensions.serializable
 import com.woocommerce.android.support.SupportHelper
 import com.woocommerce.android.support.help.HelpOrigin
@@ -51,7 +51,7 @@ class SupportRequestFormActivity : AppCompatActivity() {
         zendeskSettings.setup(context = this)
 
         ActivitySupportRequestFormBinding.inflate(layoutInflater).apply {
-            this.root.edgeToEdgeHandlingForNavigationBar()
+            this.root.edgeToEdgeHandlingForNavigationAndStatusBar(appBarLayout)
             setContentView(root)
             setupActionBar()
             observeViewEvents(this)

From fa8b6a0dc5fced6b976ae54431957fd6a7ca1309 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 18 Mar 2025 16:29:08 +0100
Subject: [PATCH 073/109] Bottom button fully visible in landscape

---
 .../src/main/res/layout/activity_support_request_form.xml      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/res/layout/activity_support_request_form.xml b/WooCommerce/src/main/res/layout/activity_support_request_form.xml
index 1b855b29a48..3f9439c7695 100644
--- a/WooCommerce/src/main/res/layout/activity_support_request_form.xml
+++ b/WooCommerce/src/main/res/layout/activity_support_request_form.xml
@@ -199,8 +199,7 @@
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.15"
+        android:layout_height="wrap_content"
         android:background="@color/color_surface"
         android:orientation="vertical">
 

From 4421037c243df95904f4dab52b96655332539b68 Mon Sep 17 00:00:00 2001
From: Alejo <alejandro.torres.veiga@automattic.com>
Date: Tue, 18 Mar 2025 10:51:41 -0600
Subject: [PATCH 074/109] update mediapicker commit

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6c6e0122a3e..d1ff4992416 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -101,7 +101,7 @@ wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-libaddressinput = '0.0.2'
 wordpress-lint = "2.1.0"
-wordpress-mediapicker = '87-30b12e0996ec61f82039cd72c70506fd89e088e8'
+wordpress-mediapicker = '87-eded3410d253bc6dd5a2ade4f8599c87ce733d69'
 wordpress-utils = '3.15.0'
 zendesk = '5.0.8'
 

From de8ba5c08bb858e8dbcfe694e7ba356b66e67989 Mon Sep 17 00:00:00 2001
From: Alejo <alejandro.torres.veiga@automattic.com>
Date: Wed, 19 Mar 2025 09:05:16 -0600
Subject: [PATCH 075/109] update mediapicker version

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d1ff4992416..76c24e1108f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -101,7 +101,7 @@ wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-libaddressinput = '0.0.2'
 wordpress-lint = "2.1.0"
-wordpress-mediapicker = '87-eded3410d253bc6dd5a2ade4f8599c87ce733d69'
+wordpress-mediapicker = 'trunk-0e275be05341678996dc1b9abfc8608f331d2540'
 wordpress-utils = '3.15.0'
 zendesk = '5.0.8'
 

From cfb6ebf7b9e6a42e6bf186857ef23eec8bb8bbdd Mon Sep 17 00:00:00 2001
From: malinajirka <malinajirka@gmail.com>
Date: Thu, 27 Mar 2025 12:54:06 +0100
Subject: [PATCH 076/109] Fix insets on login screen when keyboard is shown

---
 .../com/woocommerce/android/ui/login/LoginActivity.kt       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
index d60f2e39467..a861180b184 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
@@ -11,6 +11,7 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
@@ -211,7 +212,10 @@ class LoginActivity :
         enableEdgeToEdge()
 
         // Add system bar insets to the fragment's root
-        binding.snackRoot.doOnApplyWindowInsets(consumeInsets = true) { insets ->
+        binding.snackRoot.doOnApplyWindowInsets(
+            insetsMask = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or WindowInsetsCompat.Type.ime(),
+            consumeInsets = true
+        ) { insets ->
             binding.snackRoot.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
         }
     }

From 4e58f76640ce1d742020d89783738eb118b94992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= <omur.irfan@gmail.com>
Date: Fri, 28 Mar 2025 16:25:31 +0300
Subject: [PATCH 077/109] Update About Automattic library version

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 76c24e1108f..5c4a4b3c169 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ androidx-wear-watchface = '1.2.1'
 androidx-work = '2.7.1'
 apache-commons-text = '1.10.0'
 apache-http-client-android = '4.3.5.1'
-automattic-about = '1.6.0'
+automattic-about = '65-593a217ffe3ed339fc88e2cd63fce95b0ac02d38'
 automattic-measure-builds = '2.1.2'
 automattic-tracks = '5.0.0'
 assertj = '3.27.3'

From cf47ca687e1ced78f47637b059ecf34a661b53ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= <omur.irfan@gmail.com>
Date: Fri, 28 Mar 2025 18:38:37 +0300
Subject: [PATCH 078/109] Fix edge-to-edge issue on System stats report screen

---
 .../com/woocommerce/android/support/SSRScreen.kt | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
index 80491a545da..f9f3dcd3c6e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt
@@ -5,12 +5,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
-import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
@@ -86,11 +84,7 @@ fun SSRScreen(
         modifier = Modifier
             .fillMaxSize()
             .background(color = colorResource(id = R.color.color_toolbar))
-            .windowInsetsPadding(
-                WindowInsets.systemBars.only(
-                    WindowInsetsSides.Start + WindowInsetsSides.Top + WindowInsetsSides.End
-                )
-            )
+            .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal + WindowInsetsSides.Top)),
     ) { padding ->
         val scrollState = rememberScrollState()
 
@@ -103,6 +97,7 @@ fun SSRScreen(
                 modifier = Modifier
                     .background(color = MaterialTheme.colors.surface)
                     .verticalScroll(scrollState)
+                    .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom))
                     .padding(padding)
                     .padding(vertical = dimensionResource(id = R.dimen.major_100))
                     .fillMaxSize()
@@ -128,11 +123,6 @@ fun SSRContent(isLoading: Boolean, formattedSSR: String, modifier: Modifier) {
                     text = formattedSSR,
                     modifier = Modifier
                         .padding(dimensionResource(R.dimen.major_100))
-                        .padding(
-                            WindowInsets.navigationBars
-                                .only(WindowInsetsSides.Bottom)
-                                .asPaddingValues()
-                        )
                 )
             }
         }

From cb31fb056bd446cbe2ec64f0250d6e7759d7a3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= <omur.irfan@gmail.com>
Date: Fri, 28 Mar 2025 18:39:46 +0300
Subject: [PATCH 079/109] Fix edge-to-edge issue on the Application Log screen

---
 .../woocommerce/android/support/WooLogViewerScreen.kt  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
index b632b6caa40..a039cb9801c 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -73,11 +73,7 @@ fun WooLogViewerScreen(
         modifier = Modifier
             .fillMaxSize()
             .background(color = colorResource(id = R.color.color_toolbar))
-            .windowInsetsPadding(
-                WindowInsets.systemBars.only(
-                    WindowInsetsSides.Start + WindowInsetsSides.Top + WindowInsetsSides.End
-                )
-            )
+            .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal + WindowInsetsSides.Top)),
     ) { padding ->
         LogViewerEntries(
             entries,
@@ -93,7 +89,7 @@ fun LogViewerEntries(
 ) {
     LazyColumn(
         modifier = modifier,
-        contentPadding = WindowInsets.systemBars.only(WindowInsetsSides.Bottom).asPaddingValues()
+        contentPadding = WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom).asPaddingValues(),
     ) {
         itemsIndexed(entries) { index, entry ->
             LogViewerEntry(index, entry)

From 9643e46268df79403cbbe061072ecb1778c0bd59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= <irfan.omur@automattic.com>
Date: Thu, 3 Apr 2025 01:30:03 +0300
Subject: [PATCH 080/109] Update about library reference

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5c4a4b3c169..8aad4f51f33 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ androidx-wear-watchface = '1.2.1'
 androidx-work = '2.7.1'
 apache-commons-text = '1.10.0'
 apache-http-client-android = '4.3.5.1'
-automattic-about = '65-593a217ffe3ed339fc88e2cd63fce95b0ac02d38'
+automattic-about = '65-6d2a8fcaf5f3e97bcf46e0e93dc3643c17c82821'
 automattic-measure-builds = '2.1.2'
 automattic-tracks = '5.0.0'
 assertj = '3.27.3'

From a424afc563c74eedf6ec4374571c8e00e584a65b Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 3 Apr 2025 15:32:43 +0200
Subject: [PATCH 081/109] Added inset to to JetpackBenefitsDialog to handle
 insets

---
 .../android/ui/jetpack/benefits/JetpackBenefitsDialog.kt    | 2 --
 .../android/ui/jetpack/benefits/JetpackBenefitsScreen.kt    | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsDialog.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsDialog.kt
index a9b16d6a19c..b1c9e4ef4f8 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsDialog.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsDialog.kt
@@ -34,12 +34,10 @@ class JetpackBenefitsDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        // Use fullscreen style for all cases except tablet in landscape mode
         setStyle(STYLE_NO_TITLE, if (isTabletLandscape()) style.Theme_Woo_Dialog else style.Theme_Woo)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        // Specify transition animations
         dialog?.window?.attributes?.windowAnimations = style.Woo_Animations_Dialog
 
         return ComposeView(requireContext()).apply {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt
index d84a43989d5..425f5dc1592 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt
@@ -8,11 +8,15 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
@@ -58,6 +62,8 @@ fun JetpackBenefitsScreen(
             .background(MaterialTheme.colors.surface)
             .fillMaxSize()
             .padding(dimensionResource(id = R.dimen.major_100))
+            .windowInsetsPadding(WindowInsets.navigationBars)
+            .windowInsetsPadding(WindowInsets.displayCutout)
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,

From 45bf6ec631b47a92c78e09ad0c06c4e62601c4b6 Mon Sep 17 00:00:00 2001
From: jorgemucientesfayos <jorge.mucientes@automattic.com>
Date: Thu, 3 Apr 2025 17:29:58 +0200
Subject: [PATCH 082/109] Fix issue with keyboard hiding focused view

---
 .../jetpack/wpcom/JetpackActivationWPComEmailFragment.kt    | 2 ++
 .../jetpack/wpcom/JetpackActivationWPComEmailScreen.kt      | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt
index a45e9bf15cd..4b5b649bf38 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.extensions.navigateSafely
@@ -31,6 +32,7 @@ class JetpackActivationWPComEmailFragment : BaseFragment() {
     lateinit var uiMessageResolver: UIMessageResolver
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        WindowCompat.setDecorFitsSystemWindows(requireActivity().window, false)
         return ComposeView(requireContext()).apply {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
index 5e35d50f258..edd3adefaad 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@@ -65,10 +66,11 @@ fun JetpackActivationWPComEmailScreen(
     ) { paddingValues ->
         Column(
             modifier = Modifier
+                .imePadding()
                 .background(MaterialTheme.colors.surface)
                 .padding(paddingValues)
                 .fillMaxSize()
-                .verticalScroll(rememberScrollState()),
+                .verticalScroll(rememberScrollState())
         ) {
             Column(
                 modifier = Modifier
@@ -98,6 +100,7 @@ fun JetpackActivationWPComEmailScreen(
                     )
                 )
                 Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_100)))
+
                 WCOutlinedTextField(
                     value = viewState.emailOrUsername,
                     onValueChange = onEmailChanged,
@@ -118,6 +121,7 @@ fun JetpackActivationWPComEmailScreen(
                     )
                 )
                 Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_100)))
+
                 if (!viewState.usernameOnly) {
                     Text(
                         style = MaterialTheme.typography.body2,

From 9b62e64c3d93d91d6aff96c99e2f5158e9a6e0c7 Mon Sep 17 00:00:00 2001
From: jorgemucientesfayos <jorge.mucientes@automattic.com>
Date: Thu, 3 Apr 2025 17:48:09 +0200
Subject: [PATCH 083/109] Remove unnecessary line of code

---
 .../login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt
index 4b5b649bf38..a45e9bf15cd 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailFragment.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.core.view.WindowCompat
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.extensions.navigateSafely
@@ -32,7 +31,6 @@ class JetpackActivationWPComEmailFragment : BaseFragment() {
     lateinit var uiMessageResolver: UIMessageResolver
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        WindowCompat.setDecorFitsSystemWindows(requireActivity().window, false)
         return ComposeView(requireContext()).apply {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
 

From a6ae7a8e40bd1fe33d92c49add0290b3b084855d Mon Sep 17 00:00:00 2001
From: Jorge Mucientes <jorge.mucientes@automattic.com>
Date: Thu, 3 Apr 2025 18:37:28 +0200
Subject: [PATCH 084/109] Move imePadding() after padding()

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
index edd3adefaad..aab668b1d86 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
@@ -66,9 +66,9 @@ fun JetpackActivationWPComEmailScreen(
     ) { paddingValues ->
         Column(
             modifier = Modifier
-                .imePadding()
                 .background(MaterialTheme.colors.surface)
                 .padding(paddingValues)
+                .imePadding()
                 .fillMaxSize()
                 .verticalScroll(rememberScrollState())
         ) {

From dd0d543fbb19f79346684f979a9a1fbb7b9ae30e Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 4 Apr 2025 15:03:25 +0200
Subject: [PATCH 085/109] Update JetpackBenefitsScreen to use safeDrawing for
 window insets

---
 .../android/ui/jetpack/benefits/JetpackBenefitsScreen.kt    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt
index 425f5dc1592..2139585b240 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt
@@ -9,12 +9,11 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
@@ -62,8 +61,7 @@ fun JetpackBenefitsScreen(
             .background(MaterialTheme.colors.surface)
             .fillMaxSize()
             .padding(dimensionResource(id = R.dimen.major_100))
-            .windowInsetsPadding(WindowInsets.navigationBars)
-            .windowInsetsPadding(WindowInsets.displayCutout)
+            .windowInsetsPadding(WindowInsets.safeDrawing)
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,

From 59df125e4e2fc26492a1b9d38d490fa5951e09d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= <omur.irfan@gmail.com>
Date: Fri, 4 Apr 2025 17:11:05 +0300
Subject: [PATCH 086/109] Update the Automattic About library version

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8aad4f51f33..e17aa2a3d06 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ androidx-wear-watchface = '1.2.1'
 androidx-work = '2.7.1'
 apache-commons-text = '1.10.0'
 apache-http-client-android = '4.3.5.1'
-automattic-about = '65-6d2a8fcaf5f3e97bcf46e0e93dc3643c17c82821'
+automattic-about = '1.7.0'
 automattic-measure-builds = '2.1.2'
 automattic-tracks = '5.0.0'
 assertj = '3.27.3'

From a417cf417e1a43b581298d41520b6020ff2df5c6 Mon Sep 17 00:00:00 2001
From: samiuelson <samiuelson@gmail.com>
Date: Wed, 9 Apr 2025 17:34:29 +0200
Subject: [PATCH 087/109] Fix AiProductPromptScreen screen's ability to scroll
 with keyboard

---
 .../android/ui/products/ai/productinfo/AiProductPromptScreen.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/productinfo/AiProductPromptScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/productinfo/AiProductPromptScreen.kt
index 1ee568b8183..2551a7b968d 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/productinfo/AiProductPromptScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/productinfo/AiProductPromptScreen.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentWidth
@@ -147,6 +148,7 @@ fun AiProductPromptScreen(
                 .background(MaterialTheme.colors.surface)
                 .padding(padding)
                 .fillMaxSize()
+                .imePadding()
         ) {
             Column(
                 modifier = Modifier

From 5a170e28984af36bcac1606ade54c86e1c7c1fba Mon Sep 17 00:00:00 2001
From: samiuelson <samiuelson@gmail.com>
Date: Wed, 9 Apr 2025 17:34:56 +0200
Subject: [PATCH 088/109] Fix EditCouponScreen screen's ability to scroll with
 keyboard

---
 .../com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt
index 6d7f6a78610..3ecac927f82 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -101,6 +102,7 @@ fun EditCouponScreen(
             .verticalScroll(scrollState)
             .padding(vertical = dimensionResource(id = R.dimen.major_100))
             .fillMaxSize()
+            .imePadding()
     ) {
         DetailsSection(
             viewState = viewState,

From 6f92dc742423157c655cc8fac4673f1af23dad0b Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Thu, 10 Apr 2025 15:50:30 +0200
Subject: [PATCH 089/109] target SDK 34 until issue with the texts resolved

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 0f0d3c33755..6c3c2926eb9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -190,7 +190,7 @@ gradle.ext.mediaPickerSourceWordPressBinaryPath = "org.wordpress.mediapicker:sou
 
 gradle.ext {
     compileSdkVersion = 35
-    targetSdkVersion = 35
+    targetSdkVersion = 34
     minSdkVersion = 26
 }
 

From 0ffce017d43c2f2283e22d48e049e3c02e85c1aa Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Mon, 14 Apr 2025 09:37:03 +0200
Subject: [PATCH 090/109] Simplified logic in ApplicationEdgeToEdgeEnabler

---
 .../android/util/ApplicationEdgeToEdgeEnabler.kt   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
index 0243752c8fd..24dbbdeea02 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
@@ -49,18 +49,14 @@ class ApplicationEdgeToEdgeEnabler @Inject constructor(
      *  - In debug builds, the code will attempt to cast the activity to a `ComponentActivity`. If the cast fails, then a `ClassCastException` will be thrown by the application.
      */
     override fun onActivityCreated(activity: Activity, bundle: Bundle?) {
-        val isEdgeToEdgeSupported = isEdgeToEdgeSupported(activity)
-        if (PackageUtils.isDebugBuild() && isEdgeToEdgeSupported) {
+        if (!isEdgeToEdgeSupported(activity)) return
+
+        if (PackageUtils.isDebugBuild()) {
             (activity as ComponentActivity).enableEdgeToEdge()
         } else {
             (activity as? ComponentActivity)?.enableEdgeToEdge() ?: run {
-                if (isEdgeToEdgeSupported) {
-                    val message = "Activity $activity is not a ComponentActivity"
-                    crashLogger.sendReport(
-                        exception = ClassCastException(message),
-                        message = message
-                    )
-                }
+                val message = "Activity $activity is not a ComponentActivity"
+                crashLogger.sendReport(exception = ClassCastException(message), message = message)
             }
         }
     }

From ee751d179a7c6bc058cf5b4f346aafa90b887c28 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Mon, 14 Apr 2025 09:49:30 +0200
Subject: [PATCH 091/109] Fix Leak Canary crash

LeakCanary has more activities beyond `leakcanary.internal.RequestPermissionActivity`. This commit addresses the ClassCastException by applying a more general solution to detect LeakCanary-related activities.
---
 .../android/util/ApplicationEdgeToEdgeEnabler.kt     | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
index 24dbbdeea02..d2a893f4911 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/ApplicationEdgeToEdgeEnabler.kt
@@ -11,14 +11,6 @@ import javax.inject.Inject
 class ApplicationEdgeToEdgeEnabler @Inject constructor(
     private val crashLogger: CrashLogging
 ) : Application.ActivityLifecycleCallbacks {
-
-    /**
-     * Set of activity class names that should not be edge-to-edge.
-     */
-    private val unsupportedEdgeToEdgeActivities = setOf(
-        "leakcanary.internal.RequestPermissionActivity"
-    )
-
     /**
      * Called when an activity has been created.
      *
@@ -61,9 +53,7 @@ class ApplicationEdgeToEdgeEnabler @Inject constructor(
         }
     }
 
-    private fun isEdgeToEdgeSupported(activity: Activity): Boolean {
-        return (activity::class.java.name in unsupportedEdgeToEdgeActivities).not()
-    }
+    private fun isEdgeToEdgeSupported(activity: Activity) = !activity::class.java.name.startsWith("leakcanary")
 
     override fun onActivityStarted(activity: Activity) {
         // no-op

From ea74e24581b891bf9b357439186677a836a01c1e Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 15 Apr 2025 10:38:24 +0200
Subject: [PATCH 092/109] Use IME for inset on the main activity

---
 .../ui/main/MainActivityEdgeToEdgeHelper.kt   | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
new file mode 100644
index 00000000000..a6f40a15735
--- /dev/null
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -0,0 +1,32 @@
+package com.woocommerce.android.ui.main
+
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import com.woocommerce.android.databinding.ActivityMainBinding
+import com.woocommerce.android.extensions.doOnApplyWindowInsets
+import javax.inject.Inject
+
+class MainActivityEdgeToEdgeHelper @Inject constructor() {
+    fun applyEdgeToEdgeSettings(binding: ActivityMainBinding) {
+        binding.root.doOnApplyWindowInsets(
+            insetsMask = WindowInsetsCompat.Type.systemBars() or
+                WindowInsetsCompat.Type.displayCutout() or
+                WindowInsetsCompat.Type.ime(),
+            consumeInsets = true
+        ) { insets ->
+            binding.appBarLayout.setPadding(0, insets.top, 0, 0)
+
+            binding.root.updatePadding(left = insets.left, right = insets.right)
+
+            if (binding.bottomNav.isVisible) {
+                // When the bottom navigation is visible, apply the bottom padding to it to make sure its
+                // background is drawn behind the system navigation bar
+                binding.bottomNav.updatePadding(bottom = insets.bottom)
+                binding.root.updatePadding(bottom = 0)
+            } else {
+                binding.root.updatePadding(bottom = insets.bottom)
+            }
+        }
+    }
+}

From ce4d5ed433a7b6d42e9ff6a593aa5bb2b53cfb2f Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Tue, 15 Apr 2025 10:39:00 +0200
Subject: [PATCH 093/109] Fixed bug when bottom padding was huge after comming
 back from a screen with IME, without IME

---
 .../woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
index a6f40a15735..f805f2d42fa 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt
@@ -26,6 +26,7 @@ class MainActivityEdgeToEdgeHelper @Inject constructor() {
                 binding.root.updatePadding(bottom = 0)
             } else {
                 binding.root.updatePadding(bottom = insets.bottom)
+                binding.bottomNav.updatePadding(bottom = 0)
             }
         }
     }

From 5e9db3e5e16b4d4307e401bca6b10afd79025719 Mon Sep 17 00:00:00 2001
From: jorgemucientesfayos <jorge.mucientes@automattic.com>
Date: Tue, 15 Apr 2025 18:33:28 +0200
Subject: [PATCH 094/109] Replace media picker version with a proper build
 number

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fae84e1018f..29be66b53fd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -101,7 +101,7 @@ wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-libaddressinput = '0.0.2'
 wordpress-lint = "2.1.0"
-wordpress-mediapicker = 'trunk-0e275be05341678996dc1b9abfc8608f331d2540'
+wordpress-mediapicker = '0.3.4'
 wordpress-utils = '3.15.0'
 zendesk = '5.0.8'
 

From cf4545b8b1f3335c2483e1c8dda214a3eb6bff99 Mon Sep 17 00:00:00 2001
From: samiuelson <samiuelson@gmail.com>
Date: Wed, 16 Apr 2025 16:27:38 +0200
Subject: [PATCH 095/109] Make cash payment screen scrollable

---
 .../android/ui/woopos/cashpayment/WooPosCashPaymentScreen.kt   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentScreen.kt
index 3af5fb8f62d..17fe9b225eb 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentScreen.kt
@@ -9,7 +9,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -107,6 +109,7 @@ private fun Collecting(
     Column(
         modifier = Modifier
             .fillMaxSize()
+            .verticalScroll(rememberScrollState())
             .imePadding(),
         verticalArrangement = Arrangement.SpaceBetween
     ) {

From a2401dd61ffc9ecfac4b3c1af1f670f93a7e0a2a Mon Sep 17 00:00:00 2001
From: samiuelson <samiuelson@gmail.com>
Date: Wed, 16 Apr 2025 16:27:57 +0200
Subject: [PATCH 096/109] Make email receipt screen scrollable

---
 .../ui/woopos/emailreceipt/WooPosEmailReceiptScreen.kt        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/emailreceipt/WooPosEmailReceiptScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/emailreceipt/WooPosEmailReceiptScreen.kt
index 6ee67619ceb..6afbafa0410 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/emailreceipt/WooPosEmailReceiptScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/emailreceipt/WooPosEmailReceiptScreen.kt
@@ -7,7 +7,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -56,7 +58,7 @@ private fun WooPosEmailReceiptScreen(
     onEmailSent: () -> Unit,
     onBackClicked: () -> Unit,
 ) {
-    Column(modifier = Modifier.fillMaxSize()) {
+    Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).imePadding()) {
         WooPosToolbar(
             titleText = stringResource(R.string.woopos_email_receipt_title),
             onBackClicked = onBackClicked,

From 9f81ac3147a700eaca6233272007a7c7a0e57d77 Mon Sep 17 00:00:00 2001
From: samiuelson <samiuelson@gmail.com>
Date: Wed, 16 Apr 2025 16:28:31 +0200
Subject: [PATCH 097/109] Make search screen scrollable

---
 .../ui/woopos/home/items/search/WooPosItemsSearchScreen.kt     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchScreen.kt
index 22058f23360..6b20c7bdd4b 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchScreen.kt
@@ -2,6 +2,7 @@ package com.woocommerce.android.ui.woopos.home.items.search
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
@@ -32,7 +33,7 @@ fun WooPosItemsSearchScreen(
     val viewModel = hiltViewModel<WooPosItemsSearchViewModel>()
     val state = viewModel.viewState.collectAsState().value
     WooPosItemsSearchScreen(
-        modifier = modifier,
+        modifier = modifier.imePadding(),
         state = state,
         onUIEvent = viewModel::onUIEvent,
     )

From 6eb4a5c5d3410ac908264f51983767edf9c7f40d Mon Sep 17 00:00:00 2001
From: jorgemucientesfayos <jorge.mucientes@automattic.com>
Date: Wed, 16 Apr 2025 17:26:06 +0200
Subject: [PATCH 098/109] Enhance SupportRequestFormActivity's window insets
 handling

- Add insets handling for system bars, display cutouts, and IME.
- Update root view padding based on insets.
---
 .../support/requests/SupportRequestFormActivity.kt       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
index c0e958f7616..0d2202dea72 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
@@ -7,12 +7,15 @@ import android.view.MenuItem
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.core.widget.doOnTextChanged
 import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.databinding.ActivitySupportRequestFormBinding
 import com.woocommerce.android.extensions.adjustActivityTransition
+import com.woocommerce.android.extensions.doOnApplyWindowInsets
 import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import com.woocommerce.android.extensions.serializable
 import com.woocommerce.android.support.SupportHelper
@@ -52,6 +55,12 @@ class SupportRequestFormActivity : AppCompatActivity() {
 
         ActivitySupportRequestFormBinding.inflate(layoutInflater).apply {
             this.root.edgeToEdgeHandlingForNavigationAndStatusBar(appBarLayout)
+            this.root.doOnApplyWindowInsets(
+                insetsMask = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or WindowInsetsCompat.Type.ime(),
+                consumeInsets = true
+            ) { insets ->
+                this.root.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
+            }
             setContentView(root)
             setupActionBar()
             observeViewEvents(this)

From 535ac5bf1e1eaefaddda6898df8ed4dc1dfc9687 Mon Sep 17 00:00:00 2001
From: jorgemucientesfayos <jorge.mucientes@automattic.com>
Date: Wed, 16 Apr 2025 17:38:27 +0200
Subject: [PATCH 099/109] Fix detekt long line

---
 .../android/support/requests/SupportRequestFormActivity.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
index 0d2202dea72..46adda772cb 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
@@ -56,7 +56,9 @@ class SupportRequestFormActivity : AppCompatActivity() {
         ActivitySupportRequestFormBinding.inflate(layoutInflater).apply {
             this.root.edgeToEdgeHandlingForNavigationAndStatusBar(appBarLayout)
             this.root.doOnApplyWindowInsets(
-                insetsMask = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or WindowInsetsCompat.Type.ime(),
+                insetsMask = WindowInsetsCompat.Type.systemBars()
+                    or WindowInsetsCompat.Type.displayCutout()
+                    or WindowInsetsCompat.Type.ime(),
                 consumeInsets = true
             ) { insets ->
                 this.root.updatePadding(insets.left, insets.top, insets.right, insets.bottom)

From a98e4dbceb21f90de04cf31060fae194f76fb248 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Thu, 17 Apr 2025 12:15:26 +0100
Subject: [PATCH 100/109] Fix NPE crash when the shown Activity is empty

Applies to some SDK activities like the `SignInHubActivity` used in Google sign in.
---
 .../java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt b/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
index 5732ffc9547..1bf31327304 100644
--- a/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
+++ b/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerUiHelper.kt
@@ -76,7 +76,7 @@ class ApiFakerUiHelper @Inject constructor() : ActivityLifecycleCallbacks {
         // This works only for activities that has the content view as a direct child of the FrameLayout, which is true
         // for all AppCompat activities, so it should work for all the cases we need.
         val contentLayout = findViewById<View>(android.R.id.content) as? FrameLayout ?: return
-        val activityLayout = contentLayout.getChildAt(0)
+        val activityLayout = contentLayout.getChildAt(0) ?: return
 
         val apiFakerHint = FrameLayout(context).apply {
             id = apiFakerHintId
@@ -124,7 +124,7 @@ class ApiFakerUiHelper @Inject constructor() : ActivityLifecycleCallbacks {
 
     private fun View.hideApiFakerHint(animate: Boolean) {
         val contentLayout = findViewById<ViewGroup>(android.R.id.content)
-        val activityLayout = contentLayout.getChildAt(0)
+        val activityLayout = contentLayout.getChildAt(0) ?: return
 
         if (animate) {
             TransitionManager.beginDelayedTransition(contentLayout)

From 3debbafa90279fbd1fd9aa7c3e3ae267f1e1f8a9 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 18 Apr 2025 08:47:36 +0200
Subject: [PATCH 101/109] Different way of applying insets

---
 .../support/requests/SupportRequestFormActivity.kt    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
index 46adda772cb..6ba8d2d3563 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/support/requests/SupportRequestFormActivity.kt
@@ -16,7 +16,6 @@ import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.databinding.ActivitySupportRequestFormBinding
 import com.woocommerce.android.extensions.adjustActivityTransition
 import com.woocommerce.android.extensions.doOnApplyWindowInsets
-import com.woocommerce.android.extensions.edgeToEdgeHandlingForNavigationAndStatusBar
 import com.woocommerce.android.extensions.serializable
 import com.woocommerce.android.support.SupportHelper
 import com.woocommerce.android.support.help.HelpOrigin
@@ -54,14 +53,20 @@ class SupportRequestFormActivity : AppCompatActivity() {
         zendeskSettings.setup(context = this)
 
         ActivitySupportRequestFormBinding.inflate(layoutInflater).apply {
-            this.root.edgeToEdgeHandlingForNavigationAndStatusBar(appBarLayout)
             this.root.doOnApplyWindowInsets(
                 insetsMask = WindowInsetsCompat.Type.systemBars()
                     or WindowInsetsCompat.Type.displayCutout()
                     or WindowInsetsCompat.Type.ime(),
                 consumeInsets = true
             ) { insets ->
-                this.root.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
+                this.root.updatePadding(
+                    left = insets.left,
+                    right = insets.right,
+                    bottom = insets.bottom
+                )
+                this.appBarLayout.updatePadding(
+                    top = insets.top
+                )
             }
             setContentView(root)
             setupActionBar()

From e87a5bf4afdcad3a8d6c8d74226a74e9bd7b9198 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Fri, 18 Apr 2025 18:12:04 +0100
Subject: [PATCH 102/109] Handle ime inset in AppSettings Activity

---
 .../woocommerce/android/ui/prefs/AppSettingsActivity.kt   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
index 2e00457f7a6..08b013fb506 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.fragment.app.DialogFragment
@@ -70,7 +71,12 @@ class AppSettingsActivity :
         binding = ActivityAppSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        binding.root.doOnApplyWindowInsets(consumeInsets = true) {
+        binding.root.doOnApplyWindowInsets(
+            insetsMask = WindowInsetsCompat.Type.systemBars() or
+                WindowInsetsCompat.Type.displayCutout() or
+                WindowInsetsCompat.Type.ime(),
+            consumeInsets = true
+        ) {
             binding.root.updatePadding(
                 left = it.left,
                 right = it.right,

From 0bd438e2b50b017705ea5fd2b9070ee38ff4ed9e Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Sun, 20 Apr 2025 00:15:53 +0100
Subject: [PATCH 103/109] Remove calls to `imePadding` from Compose screens

In MainActivity we handle the `ime` insets, and then consume all insets, so it means we shouldn't need to consume them again. And because of a bug in Compose, the insets get consumed twice leading to UI issues.
---
 .../com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt | 2 --
 .../ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt | 2 --
 .../android/ui/products/ai/productinfo/AiProductPromptScreen.kt | 2 --
 3 files changed, 6 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt
index 3ecac927f82..6d7f6a78610 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/edit/EditCouponScreen.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -102,7 +101,6 @@ fun EditCouponScreen(
             .verticalScroll(scrollState)
             .padding(vertical = dimensionResource(id = R.dimen.major_100))
             .fillMaxSize()
-            .imePadding()
     ) {
         DetailsSection(
             viewState = viewState,
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
index aab668b1d86..ee6ebfb75f5 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@@ -68,7 +67,6 @@ fun JetpackActivationWPComEmailScreen(
             modifier = Modifier
                 .background(MaterialTheme.colors.surface)
                 .padding(paddingValues)
-                .imePadding()
                 .fillMaxSize()
                 .verticalScroll(rememberScrollState())
         ) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/productinfo/AiProductPromptScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/productinfo/AiProductPromptScreen.kt
index 2551a7b968d..1ee568b8183 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/productinfo/AiProductPromptScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/productinfo/AiProductPromptScreen.kt
@@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentWidth
@@ -148,7 +147,6 @@ fun AiProductPromptScreen(
                 .background(MaterialTheme.colors.surface)
                 .padding(padding)
                 .fillMaxSize()
-                .imePadding()
         ) {
             Column(
                 modifier = Modifier

From 5d22185f301752ed608da5ab8b15b9662692372b Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Mon, 21 Apr 2025 15:10:15 +0100
Subject: [PATCH 104/109] Handle IME insets on products selector dialog
 fragment

---
 .../selector/ProductSelectorDialogFragment.kt  |  6 ++++--
 .../products/selector/ProductSelectorScreen.kt | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
index dbaf72fcac4..a8bbaa787ea 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
@@ -33,7 +33,8 @@ class ProductSelectorDialogFragment : DialogFragment() {
         private const val TABLET_LANDSCAPE_HEIGHT_RATIO = 0.6f
     }
 
-    @Inject lateinit var navigator: ProductNavigator
+    @Inject
+    lateinit var navigator: ProductNavigator
 
     private val viewModel: ProductSelectorViewModel by viewModels()
 
@@ -64,7 +65,7 @@ class ProductSelectorDialogFragment : DialogFragment() {
 
             setContent {
                 WooThemeWithBackground {
-                    ProductSelectorScreen(viewModel)
+                    ProductSelectorScreen(viewModel, handleImeInsets = true)
                 }
             }
         }
@@ -99,6 +100,7 @@ class ProductSelectorDialogFragment : DialogFragment() {
                         event.data as Collection<SelectedItem>
                     )
                 }
+
                 is ProductNavigationTarget -> navigator.navigate(this, event)
                 is Exit -> findNavController().navigateUp()
             }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
index 3b83807ea6e..1b4ae1e5b1b 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
@@ -75,7 +76,10 @@ import com.woocommerce.android.ui.products.selector.components.SelectorListItem
 import com.woocommerce.android.util.StringUtils
 
 @Composable
-fun ProductSelectorScreen(viewModel: ProductSelectorViewModel) {
+fun ProductSelectorScreen(
+    viewModel: ProductSelectorViewModel,
+    handleImeInsets: Boolean = false
+) {
     val viewState by viewModel.viewState.observeAsState()
     BackHandler(onBack = viewModel::onNavigateBack)
     viewState?.let { state ->
@@ -106,13 +110,11 @@ fun ProductSelectorScreen(viewModel: ProductSelectorViewModel) {
                 )
             }
         }) { padding ->
-            val modifier = if (showToolbar) {
-                Modifier.padding(padding)
-            } else {
-                Modifier
-                    .padding(padding)
-                    .statusBarsPadding()
-            }.navigationBarsPadding()
+            val modifier = Modifier
+                .padding(padding)
+                .navigationBarsPadding()
+                .then(if (!showToolbar) Modifier.statusBarsPadding() else Modifier)
+                .then(if (handleImeInsets) Modifier.imePadding() else Modifier)
             ProductSelectorScreen(
                 modifier = modifier,
                 state = state,

From ceb5ad549636e7d11a1bd30b962ff47a96d61a2c Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Mon, 21 Apr 2025 22:54:21 +0100
Subject: [PATCH 105/109] Handle insets in Customer List dialog fragment

---
 .../customerlist/CustomerListDialogFragment.kt    |  6 +++++-
 .../customerlist/OrderCustomerListScreen.kt       | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
index 2da19ff6d20..47eabca026b 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -50,7 +51,7 @@ class CustomerListDialogFragment : DialogFragment() {
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
         setContent {
             WooThemeWithBackground {
-                OrderCustomerListScreen(viewModel)
+                OrderCustomerListScreen(viewModel, handleImeInsets = true)
             }
         }
     }
@@ -94,6 +95,9 @@ class CustomerListDialogFragment : DialogFragment() {
                 (DisplayUtils.getWindowPixelHeight(requireContext()) * TABLET_LANDSCAPE_HEIGHT_RATIO).toInt()
             )
         }
+        dialog?.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+        }
     }
 
     override fun onResume() {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
index 4ca5c9094fd..2fdca53d4a2 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
@@ -2,6 +2,8 @@
 
 package com.woocommerce.android.ui.orders.creation.customerlist
 
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
@@ -26,11 +28,15 @@ import com.woocommerce.android.ui.customer.CustomerListScreen
 import org.wordpress.android.fluxc.model.customer.WCCustomerModel
 
 @Composable
-fun OrderCustomerListScreen(viewModel: CustomerListSelectionViewModel) {
+fun OrderCustomerListScreen(
+    viewModel: CustomerListSelectionViewModel,
+    handleImeInsets: Boolean = true,
+) {
     val state by viewModel.viewState.observeAsState()
     state?.let {
         OrderCustomerListScreen(
             state = it,
+            handleImeInsets = handleImeInsets,
             onNavigateBack = viewModel::onNavigateBack,
             onAddCustomerClicked = viewModel::onAddCustomerClicked,
             onCustomerSelected = viewModel::onCustomerSelected,
@@ -44,6 +50,7 @@ fun OrderCustomerListScreen(viewModel: CustomerListSelectionViewModel) {
 @Composable
 fun OrderCustomerListScreen(
     state: CustomerListViewState,
+    handleImeInsets: Boolean,
     onNavigateBack: () -> Unit,
     onAddCustomerClicked: () -> Unit,
     onCustomerSelected: (WCCustomerModel) -> Unit,
@@ -74,7 +81,10 @@ fun OrderCustomerListScreen(
         modifier = modifier
     ) { padding ->
         CustomerListScreen(
-            modifier = Modifier.padding(padding),
+            modifier = Modifier
+                .padding(padding)
+                .navigationBarsPadding()
+                .then(if (handleImeInsets) Modifier.imePadding() else Modifier),
             state = state,
             onCustomerSelected = onCustomerSelected,
             onSearchQueryChanged = onSearchQueryChanged,
@@ -161,6 +171,7 @@ fun OrderCustomerListScreenPreview() {
                     shouldResetScrollPosition = true
                 ),
             ),
+            handleImeInsets = false,
             onNavigateBack = {},
             onAddCustomerClicked = {},
             onCustomerSelected = {},

From 2671c65da2d71d3fceede2af22af8ae262aa70f9 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 23 Apr 2025 14:53:51 +0100
Subject: [PATCH 106/109] Allow passing a custom windowInsets to the Toolbar
 composable

---
 .../android/ui/compose/component/Toolbar.kt     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/Toolbar.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/Toolbar.kt
index d41e02526fe..7d482774908 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/Toolbar.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/Toolbar.kt
@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.compose.component
 
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
@@ -27,6 +28,7 @@ fun ToolbarWithHelpButton(
     onNavigationButtonClick: (() -> Unit)? = null,
     navigationIcon: ImageVector? = Icons.AutoMirrored.Filled.ArrowBack,
     navigationIconContentDescription: String = stringResource(id = string.back),
+    windowInsets: WindowInsets = WindowInsets(0),
     onHelpButtonClick: (() -> Unit)
 ) {
     Toolbar(
@@ -37,7 +39,8 @@ fun ToolbarWithHelpButton(
         navigationIconContentDescription = navigationIconContentDescription,
         actionButtonIcon = ImageVector.vectorResource(id = drawable.ic_help_24dp),
         onActionButtonClick = onHelpButtonClick,
-        actionIconContentDescription = stringResource(id = string.help)
+        actionIconContentDescription = stringResource(id = string.help),
+        windowInsets = windowInsets
     )
 }
 
@@ -47,7 +50,8 @@ fun Toolbar(
     title: String = "",
     onNavigationButtonClick: (() -> Unit),
     navigationIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack,
-    navigationIconContentDescription: String = stringResource(id = string.back)
+    navigationIconContentDescription: String = stringResource(id = string.back),
+    windowInsets: WindowInsets = WindowInsets(0),
 ) {
     Toolbar(
         modifier = modifier,
@@ -55,6 +59,7 @@ fun Toolbar(
         onNavigationButtonClick = onNavigationButtonClick,
         navigationIcon = navigationIcon,
         navigationIconContentDescription = navigationIconContentDescription,
+        windowInsets = windowInsets,
     )
 }
 
@@ -65,6 +70,7 @@ fun Toolbar(
     onNavigationButtonClick: (() -> Unit)? = null,
     navigationIcon: ImageVector? = Icons.AutoMirrored.Filled.ArrowBack,
     navigationIconContentDescription: String = stringResource(id = string.back),
+    windowInsets: WindowInsets = WindowInsets(0),
     actionButtonIcon: ImageVector,
     onActionButtonClick: (() -> Unit),
     actionIconContentDescription: String
@@ -75,6 +81,7 @@ fun Toolbar(
         onNavigationButtonClick = onNavigationButtonClick,
         navigationIcon = navigationIcon,
         navigationIconContentDescription = navigationIconContentDescription,
+        windowInsets = windowInsets,
         actions = {
             IconButton(onClick = onActionButtonClick) {
                 Icon(
@@ -93,6 +100,7 @@ fun Toolbar(
     onNavigationButtonClick: (() -> Unit)? = null,
     navigationIcon: ImageVector? = Icons.AutoMirrored.Filled.ArrowBack,
     navigationIconContentDescription: String = stringResource(id = string.back),
+    windowInsets: WindowInsets = WindowInsets(0),
     actions: @Composable RowScope.() -> Unit = {}
 ) {
     Toolbar(
@@ -101,6 +109,7 @@ fun Toolbar(
         onNavigationButtonClick = onNavigationButtonClick,
         navigationIcon = navigationIcon,
         navigationIconContentDescription = navigationIconContentDescription,
+        windowInsets = windowInsets,
         actions = actions
     )
 }
@@ -112,6 +121,7 @@ fun Toolbar(
     onNavigationButtonClick: (() -> Unit)? = null,
     navigationIcon: ImageVector? = Icons.AutoMirrored.Filled.ArrowBack,
     navigationIconContentDescription: String = stringResource(id = string.back),
+    windowInsets: WindowInsets = WindowInsets(0),
     onActionButtonClick: (() -> Unit),
     actionButtonText: String
 ) {
@@ -121,6 +131,7 @@ fun Toolbar(
         onNavigationButtonClick = onNavigationButtonClick,
         navigationIcon = navigationIcon,
         navigationIconContentDescription = navigationIconContentDescription,
+        windowInsets = windowInsets,
         actions = {
             TextButton(onClick = onActionButtonClick) {
                 Text(text = actionButtonText)
@@ -136,9 +147,11 @@ fun Toolbar(
     onNavigationButtonClick: (() -> Unit)? = null,
     navigationIcon: ImageVector? = null,
     navigationIconContentDescription: String = stringResource(id = string.back),
+    windowInsets: WindowInsets = WindowInsets(0),
     actions: @Composable RowScope.() -> Unit = {}
 ) {
     TopAppBar(
+        windowInsets = windowInsets,
         backgroundColor = colorResource(id = R.color.color_toolbar),
         title = title,
         navigationIcon = {

From 91dd1179ff1be4eac00f0179b408cb69519358d8 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 23 Apr 2025 14:55:28 +0100
Subject: [PATCH 107/109] Update ProductSelectorScreen with a parameter to
 allow toggling off insets handling

---
 .../selector/ProductSelectorDialogFragment.kt |  2 +-
 .../selector/ProductSelectorFragment.kt       |  2 +-
 .../selector/ProductSelectorScreen.kt         | 59 ++++++++++---------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
index a8bbaa787ea..a25368a35d8 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorDialogFragment.kt
@@ -65,7 +65,7 @@ class ProductSelectorDialogFragment : DialogFragment() {
 
             setContent {
                 WooThemeWithBackground {
-                    ProductSelectorScreen(viewModel, handleImeInsets = true)
+                    ProductSelectorScreen(viewModel = viewModel, handleInsets = true)
                 }
             }
         }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorFragment.kt
index fc6bc896886..c36169539cf 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorFragment.kt
@@ -54,7 +54,7 @@ class ProductSelectorFragment : BaseFragment() {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 WooThemeWithBackground {
-                    ProductSelectorScreen(viewModel)
+                    ProductSelectorScreen(viewModel = viewModel, handleInsets = false)
                 }
             }
         }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
index 1b4ae1e5b1b..e104fe618ce 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -17,6 +18,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
@@ -26,8 +28,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
@@ -45,7 +45,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
 import com.woocommerce.android.R.color
 import com.woocommerce.android.R.dimen
@@ -54,7 +53,7 @@ import com.woocommerce.android.ui.compose.animations.SkeletonView
 import com.woocommerce.android.ui.compose.component.InfiniteListHandler
 import com.woocommerce.android.ui.compose.component.SearchLayoutWithParams
 import com.woocommerce.android.ui.compose.component.SearchLayoutWithParamsState
-import com.woocommerce.android.ui.compose.component.TopAppBarEdgeToEdge
+import com.woocommerce.android.ui.compose.component.Toolbar
 import com.woocommerce.android.ui.compose.component.WCColoredButton
 import com.woocommerce.android.ui.compose.component.WCTextButton
 import com.woocommerce.android.ui.products.ProductType.BUNDLE
@@ -75,10 +74,18 @@ import com.woocommerce.android.ui.products.selector.SelectionState.SELECTED
 import com.woocommerce.android.ui.products.selector.components.SelectorListItem
 import com.woocommerce.android.util.StringUtils
 
+/**
+ * @param handleInsets true if the screen should handle insets manually.
+ *  This is needed when the screen is used in a DialogFragment, otherwise the handling of insets at the root
+ *  layout will be enough.
+ *
+ *  Note: normally this shouldn't be needed, as we consume the insets in the root layout, but due to this
+ *  bug https://issuetracker.google.com/issues/411868840 the insets are re-applied when the keyboard is shown.
+ */
 @Composable
 fun ProductSelectorScreen(
     viewModel: ProductSelectorViewModel,
-    handleImeInsets: Boolean = false
+    handleInsets: Boolean,
 ) {
     val viewState by viewModel.viewState.observeAsState()
     BackHandler(onBack = viewModel::onNavigateBack)
@@ -86,35 +93,31 @@ fun ProductSelectorScreen(
         val showToolbar = state.selectionMode != SelectionMode.LIVE
         Scaffold(topBar = {
             if (showToolbar) {
-                TopAppBarEdgeToEdge(
-                    title = {
-                        Text(
-                            text = state.screenTitleOverride
-                                ?: stringResource(id = string.coupon_conditions_products_select_products_title)
-                        )
-                    },
-                    navigationIcon = {
-                        IconButton(viewModel::onNavigateBack) {
-                            Icon(
-                                imageVector = if (state.searchState.isActive) {
-                                    Icons.AutoMirrored.Filled.ArrowBack
-                                } else {
-                                    Icons.Filled.Close
-                                },
-                                contentDescription = stringResource(id = string.back)
-                            )
-                        }
+                Toolbar(
+                    title = state.screenTitleOverride
+                        ?: stringResource(id = string.coupon_conditions_products_select_products_title),
+                    navigationIcon = if (state.searchState.isActive) {
+                        Icons.AutoMirrored.Filled.ArrowBack
+                    } else {
+                        Icons.Filled.Close
                     },
-                    backgroundColor = colorResource(id = R.color.color_toolbar),
-                    elevation = 0.dp,
+                    onNavigationButtonClick = viewModel::onNavigateBack,
+                    windowInsets = if (handleInsets) WindowInsets.statusBars else WindowInsets(0),
                 )
             }
         }) { padding ->
             val modifier = Modifier
                 .padding(padding)
-                .navigationBarsPadding()
-                .then(if (!showToolbar) Modifier.statusBarsPadding() else Modifier)
-                .then(if (handleImeInsets) Modifier.imePadding() else Modifier)
+                .then(
+                    if (handleInsets) {
+                        Modifier
+                            .navigationBarsPadding()
+                            .imePadding()
+                            .then(if (!showToolbar) Modifier.statusBarsPadding() else Modifier)
+                    } else {
+                        Modifier
+                    }
+                )
             ProductSelectorScreen(
                 modifier = modifier,
                 state = state,

From 2da56377dfa6f87988c793983fa5c959de03d199 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 23 Apr 2025 15:02:49 +0100
Subject: [PATCH 108/109] Update OrderCustomerListScreen with a parameter to
 allow toggling off insets handling

---
 .../CustomerListDialogFragment.kt             |  2 +-
 .../customerlist/OrderCustomerListFragment.kt |  2 +-
 .../customerlist/OrderCustomerListScreen.kt   | 43 +++++++++----------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
index 47eabca026b..eb8e219e08a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/CustomerListDialogFragment.kt
@@ -51,7 +51,7 @@ class CustomerListDialogFragment : DialogFragment() {
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
         setContent {
             WooThemeWithBackground {
-                OrderCustomerListScreen(viewModel, handleImeInsets = true)
+                OrderCustomerListScreen(viewModel = viewModel, handleInsets = true)
             }
         }
     }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListFragment.kt
index fcf07bba6e7..55dbbf4a42c 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListFragment.kt
@@ -35,7 +35,7 @@ class OrderCustomerListFragment : BaseFragment() {
         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
         setContent {
             WooThemeWithBackground {
-                OrderCustomerListScreen(viewModel)
+                OrderCustomerListScreen(viewModel = viewModel, handleInsets = false)
             }
         }
     }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
index 2fdca53d4a2..4cd8229576a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
@@ -2,14 +2,14 @@
 
 package com.woocommerce.android.ui.orders.creation.customerlist
 
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
 import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
@@ -20,23 +20,30 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
-import com.woocommerce.android.ui.compose.component.TopAppBarEdgeToEdge
+import com.woocommerce.android.ui.compose.component.Toolbar
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 import com.woocommerce.android.ui.customer.CustomerListScreen
 import org.wordpress.android.fluxc.model.customer.WCCustomerModel
 
+/**
+ * @param handleInsets true if the screen should handle insets manually.
+ *  This is needed when the screen is used in a DialogFragment, otherwise the handling of insets at the root
+ *  layout will be enough.
+ *
+ *  Note: normally this shouldn't be needed, as we consume the insets in the root layout, but due to this
+ *  bug https://issuetracker.google.com/issues/411868840 the insets are re-applied when the keyboard is shown.
+ */
 @Composable
 fun OrderCustomerListScreen(
     viewModel: CustomerListSelectionViewModel,
-    handleImeInsets: Boolean = true,
+    handleInsets: Boolean
 ) {
     val state by viewModel.viewState.observeAsState()
     state?.let {
         OrderCustomerListScreen(
             state = it,
-            handleImeInsets = handleImeInsets,
+            handleInsets = handleInsets,
             onNavigateBack = viewModel::onNavigateBack,
             onAddCustomerClicked = viewModel::onAddCustomerClicked,
             onCustomerSelected = viewModel::onCustomerSelected,
@@ -50,7 +57,7 @@ fun OrderCustomerListScreen(
 @Composable
 fun OrderCustomerListScreen(
     state: CustomerListViewState,
-    handleImeInsets: Boolean,
+    handleInsets: Boolean,
     onNavigateBack: () -> Unit,
     onAddCustomerClicked: () -> Unit,
     onCustomerSelected: (WCCustomerModel) -> Unit,
@@ -61,18 +68,11 @@ fun OrderCustomerListScreen(
 ) {
     Scaffold(
         topBar = {
-            TopAppBarEdgeToEdge(
-                title = { Text(stringResource(id = R.string.order_creation_add_customer)) },
-                navigationIcon = {
-                    IconButton(onNavigateBack) {
-                        Icon(
-                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = stringResource(id = R.string.back)
-                        )
-                    }
-                },
-                backgroundColor = colorResource(id = R.color.color_toolbar),
-                elevation = 0.dp,
+            Toolbar(
+                title = stringResource(id = R.string.order_creation_add_customer),
+                navigationIcon = Icons.AutoMirrored.Filled.ArrowBack,
+                onNavigationButtonClick = onNavigateBack,
+                windowInsets = if (handleInsets) WindowInsets.statusBars else WindowInsets(0),
             )
         },
         floatingActionButton = {
@@ -83,8 +83,7 @@ fun OrderCustomerListScreen(
         CustomerListScreen(
             modifier = Modifier
                 .padding(padding)
-                .navigationBarsPadding()
-                .then(if (handleImeInsets) Modifier.imePadding() else Modifier),
+                .then(if (handleInsets) Modifier.navigationBarsPadding().imePadding() else Modifier),
             state = state,
             onCustomerSelected = onCustomerSelected,
             onSearchQueryChanged = onSearchQueryChanged,
@@ -171,7 +170,7 @@ fun OrderCustomerListScreenPreview() {
                     shouldResetScrollPosition = true
                 ),
             ),
-            handleImeInsets = false,
+            handleInsets = false,
             onNavigateBack = {},
             onAddCustomerClicked = {},
             onCustomerSelected = {},

From 4227178fd8dc43f5ac38d0831eb434ba82543645 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 23 Apr 2025 15:18:00 +0100
Subject: [PATCH 109/109] Use the recommended TopAppBar insets

---
 .../orders/creation/customerlist/OrderCustomerListScreen.kt   | 4 ++--
 .../android/ui/products/selector/ProductSelectorScreen.kt     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
index 4cd8229576a..130926d75e7 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/customerlist/OrderCustomerListScreen.kt
@@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBars
+import androidx.compose.material.AppBarDefaults
 import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
 import androidx.compose.material.Scaffold
@@ -72,7 +72,7 @@ fun OrderCustomerListScreen(
                 title = stringResource(id = R.string.order_creation_add_customer),
                 navigationIcon = Icons.AutoMirrored.Filled.ArrowBack,
                 onNavigationButtonClick = onNavigateBack,
-                windowInsets = if (handleInsets) WindowInsets.statusBars else WindowInsets(0),
+                windowInsets = if (handleInsets) AppBarDefaults.topAppBarWindowInsets else WindowInsets(0),
             )
         },
         floatingActionButton = {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
index e104fe618ce..85918662b04 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/selector/ProductSelectorScreen.kt
@@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
@@ -26,6 +25,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.AppBarDefaults
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
@@ -102,7 +102,7 @@ fun ProductSelectorScreen(
                         Icons.Filled.Close
                     },
                     onNavigationButtonClick = viewModel::onNavigateBack,
-                    windowInsets = if (handleInsets) WindowInsets.statusBars else WindowInsets(0),
+                    windowInsets = if (handleInsets) AppBarDefaults.topAppBarWindowInsets else WindowInsets(0),
                 )
             }
         }) { padding ->