[Android SDK update] Target SDK to 35

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,51 @@
         </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" />
-        <activity
-            android:name="zendesk.support.guide.HelpCenterActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk" />
-        <activity
-            android:name="zendesk.support.guide.ViewArticleActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk" />
-        <activity
-            android:name="zendesk.support.request.RequestActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk" />
-        <activity
-            android:name="zendesk.support.requestlist.RequestListActivity"
-            android:theme="@style/Theme.Woo.DayNight.Zendesk" />
+            android:theme="@style/Theme.Woo.DayNight"
+            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

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()
 

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,19 @@ 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())
+        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
+    }
+}

WooCommerce/src/main/kotlin/com/woocommerce/android/support/SSRScreen.kt

@@ -3,8 +3,15 @@ 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.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.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
@@ -58,20 +65,32 @@ 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)
                         )
                     }
-                }
+                },
+            )
+        },
+        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()
 
@@ -107,7 +126,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()
+                        )
                 )
             }
         }

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)
         }
     }

WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerScreen.kt

@@ -5,8 +5,15 @@ 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.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
 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.itemsIndexed
 import androidx.compose.foundation.text.selection.SelectionContainer
@@ -60,9 +67,17 @@ fun WooLogViewerScreen(
                             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,
@@ -76,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) {

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)

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)

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
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityEdgeToEdgeHelper.kt

@@ -0,0 +1,19 @@
+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
+        }
+    }
+}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/UnifiedAboutScreenActivity.kt

@@ -2,18 +2,26 @@ package com.woocommerce.android.ui.prefs
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+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)
+
+        val fragmentContainer = findViewById<FragmentContainerView>(
+            R.id.about_fragment_container
+        )
+        fragmentContainer.edgeToEdgeHandlingForNavigationAndStatusBar()
     }
 
     override fun getAboutConfig() = configBuilder.createAboutConfig(this)