Merge branch '334-upgrade-to-android-15' into 'master'

melanieatpace · melanieatpace · commit b704d6c036f9 · 2025-01-16T14:10:14.000Z
Resolve "Upgrade to Android 15"

Closes #334

See merge request pace/mobile/android/pace-cloud-sdk!372
diff --git a/app/src/main/java/cloud/pace/sdk/app/BiometrySubSettingsActivity.kt b/app/src/main/java/cloud/pace/sdk/app/BiometrySubSettingsActivity.kt
@@ -3,6 +3,7 @@ package cloud.pace.sdk.app
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.mutableStateOf
 import cloud.pace.sdk.app.ui.components.settings.BiometrySubSettingView
@@ -20,7 +21,9 @@ internal var biometryStatus = mutableStateOf(false)
 
 class BiometrySubSettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+
         setContent {
             PACETheme {
                 BiometrySubSettingView(
diff --git a/app/src/main/java/cloud/pace/sdk/app/LoginScreenActivity.kt b/app/src/main/java/cloud/pace/sdk/app/LoginScreenActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
@@ -21,6 +22,7 @@ import kotlinx.coroutines.launch
 class LoginScreenActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         setContent {
diff --git a/app/src/main/java/cloud/pace/sdk/app/MainScreenActivity.kt b/app/src/main/java/cloud/pace/sdk/app/MainScreenActivity.kt
@@ -6,6 +6,7 @@ import android.location.Location
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.getValue
@@ -41,6 +42,7 @@ class MainScreenActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         setContent {
diff --git a/app/src/main/java/cloud/pace/sdk/app/ui/components/App.kt b/app/src/main/java/cloud/pace/sdk/app/ui/components/App.kt
@@ -2,11 +2,13 @@ package cloud.pace.sdk.app.ui.components
 
 import android.location.Location
 import android.widget.Toast
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.DrawerValue
 import androidx.compose.material.Icon
@@ -19,6 +21,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Menu
+import androidx.compose.material.primarySurface
 import androidx.compose.material.rememberDrawerState
 import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
@@ -68,6 +71,9 @@ fun App(
     val scaffoldState = rememberScaffoldState(rememberDrawerState(DrawerValue.Closed))
 
     Scaffold(
+        modifier = Modifier
+            .background(MaterialTheme.colors.primarySurface)
+            .safeDrawingPadding(),
         scaffoldState = scaffoldState,
         topBar = {
             TopAppBar(
diff --git a/app/src/main/java/cloud/pace/sdk/app/ui/components/loginscreen/LoginScreen.kt b/app/src/main/java/cloud/pace/sdk/app/ui/components/loginscreen/LoginScreen.kt
@@ -3,17 +3,21 @@ package cloud.pace.sdk.app.ui.components.loginscreen
 import android.widget.Toast
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
+import androidx.compose.material.primarySurface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -30,6 +34,9 @@ import cloud.pace.sdk.app.ui.components.NoSupportedBrowserDialog
 @Composable
 fun ShowLoginScreen(showDialog: Boolean, onDialogDismiss: () -> Unit, openLogin: () -> Unit) {
     Scaffold(
+        modifier = Modifier
+            .background(MaterialTheme.colors.primarySurface)
+            .safeDrawingPadding(),
         topBar = {
             TopAppBar(
                 title = {
diff --git a/app/src/main/java/cloud/pace/sdk/app/ui/components/settings/BiometrySubSettings.kt b/app/src/main/java/cloud/pace/sdk/app/ui/components/settings/BiometrySubSettings.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
@@ -72,6 +73,7 @@ fun BiometrySubSettingView(
     Column(
         modifier = Modifier
             .fillMaxSize()
+            .safeDrawingPadding(),
     ) {
         // userEmailDisplay row:
         Row(
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+    </style>
+
+</resources>
diff --git a/buildSrc/src/main/java/Libs.kt b/buildSrc/src/main/java/Libs.kt
@@ -1,5 +1,6 @@
 object Libs {
 
+    const val ACTIVITY = "androidx.activity:activity-ktx:${Versions.ACTIVITY}"
     const val APPAUTH = "net.openid:appauth:${Versions.APPAUTH}"
     const val ANDROID_GRADLE_PLUGIN = "com.android.tools.build:gradle:${Versions.ANDROID_GRADLE_PLUGIN}"
     const val APPCOMPAT = "androidx.appcompat:appcompat:${Versions.APPCOMPAT}"
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -3,10 +3,11 @@ object Versions {
     const val DEFAULT_VERSION_CODE_LIBRARY = 1
     const val DEFAULT_VERSION_NAME_LIBRARY = "18.0.0"
 
-    const val COMPILE_SDK = 34
-    const val TARGET_SDK = 34
+    const val COMPILE_SDK = 35
+    const val TARGET_SDK = 35
     const val MIN_SDK = 26
 
+    const val ACTIVITY = "1.9.3"
     const val APPAUTH = "0.11.1"
     const val ANDROID_GRADLE_PLUGIN = "8.2.2"
     const val APPCOMPAT = "1.6.1"
diff --git a/fueling-app/src/main/AndroidManifest.xml b/fueling-app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Material3.DayNight.NoActionBar">
+        android:theme="@style/AppTheme">
 
         <activity
             android:name=".MainActivity"
diff --git a/fueling-app/src/main/java/cloud/pace/sdk/fueling_app/MainActivity.kt b/fueling-app/src/main/java/cloud/pace/sdk/fueling_app/MainActivity.kt
@@ -1,14 +1,23 @@
 package cloud.pace.sdk.fueling_app
 
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import cloud.pace.sdk.fueling_app.databinding.ActivityMainBinding
+import cloud.pace.sdk.utils.applyInsets
+import cloud.pace.sdk.utils.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
+    private val binding by viewBinding(ActivityMainBinding::inflate)
+
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+
+        setContentView(binding.root)
+        binding.root.applyInsets()
     }
 }
diff --git a/fueling-app/src/main/res/values-v27/themes.xml b/fueling-app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
+    </style>
+
+</resources>
diff --git a/fueling-app/src/main/res/values/themes.xml b/fueling-app/src/main/res/values/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+    </style>
+
+</resources>
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -109,6 +109,7 @@ dependencies {
     implementation(Libs.LIFECYCLE_PROCESS_KTX)
     implementation(Libs.BIOMETRIC)
     implementation(Libs.BROWSER)
+    implementation(Libs.ACTIVITY)
 
     // Jetpack Compose
     // The api declaration and the animation dependency is needed for clients without Jetpack Compose
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/app/AppActivity.kt b/library/src/main/java/cloud/pace/sdk/appkit/app/AppActivity.kt
@@ -2,6 +2,7 @@ package cloud.pace.sdk.appkit.app
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import cloud.pace.sdk.api.utils.RequestUtils
@@ -27,6 +28,7 @@ import cloud.pace.sdk.utils.ErrorListener
 import cloud.pace.sdk.utils.Failure
 import cloud.pace.sdk.utils.Ok
 import cloud.pace.sdk.utils.Success
+import cloud.pace.sdk.utils.applyInsets
 import cloud.pace.sdk.utils.getResultFor
 import cloud.pace.sdk.utils.viewBinding
 import com.google.android.gms.wallet.AutoResolveHelper
@@ -52,8 +54,11 @@ class AppActivity : AppCompatActivity(), CloudSDKKoinComponent {
     private var completableDeferred: CompletableDeferred<PaymentResult>? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+
         setContentView(binding.root)
+        binding.root.applyInsets()
 
         paymentsClient = GooglePayUtils.createPaymentsClient(this)
 
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/app/deeplink/RedirectUriReceiverActivity.kt b/library/src/main/java/cloud/pace/sdk/appkit/app/deeplink/RedirectUriReceiverActivity.kt
@@ -2,6 +2,7 @@ package cloud.pace.sdk.appkit.app.deeplink
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import cloud.pace.sdk.appkit.app.deeplink.DeepLinkManagementActivity.Companion.REDIRECT
 import cloud.pace.sdk.utils.ErrorListener
@@ -10,6 +11,7 @@ import timber.log.Timber
 class RedirectUriReceiverActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         Timber.d("Forward the following intent data to DeepLinkManagementActivity: ${intent.data?.toString()}")
diff --git a/library/src/main/java/cloud/pace/sdk/appkit/app/deeplink/WebViewActivity.kt b/library/src/main/java/cloud/pace/sdk/appkit/app/deeplink/WebViewActivity.kt
@@ -8,6 +8,7 @@ import android.webkit.CookieManager
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import cloud.pace.sdk.appkit.AppKit
 import cloud.pace.sdk.appkit.app.webview.DefaultWebChromeClient
@@ -18,13 +19,15 @@ import cloud.pace.sdk.appkit.app.webview.DefaultWebChromeClient.Companion.SMS_SC
 import cloud.pace.sdk.appkit.app.webview.DefaultWebChromeClient.Companion.TEL_SCHEME
 import cloud.pace.sdk.utils.DeviceUtils
 import cloud.pace.sdk.utils.ErrorListener
+import cloud.pace.sdk.utils.applyInsets
 import timber.log.Timber
 
 class WebViewActivity : AppCompatActivity() {
 
     private lateinit var webView: WebView
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         val uri = intent.data
@@ -54,6 +57,7 @@ class WebViewActivity : AppCompatActivity() {
             CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true)
 
             setContentView(webView)
+            webView.applyInsets()
         } else {
             ErrorListener.reportError(NullPointerException("URL to load in payment WebView cannot be null. Finish WebViewActivity."))
             finish()
diff --git a/library/src/main/java/cloud/pace/sdk/idkit/authorization/integrated/AuthorizationWebViewActivity.kt b/library/src/main/java/cloud/pace/sdk/idkit/authorization/integrated/AuthorizationWebViewActivity.kt
@@ -12,10 +12,12 @@ import android.webkit.WebChromeClient
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import cloud.pace.sdk.appkit.AppKit
 import cloud.pace.sdk.utils.CloudSDKKoinComponent
 import cloud.pace.sdk.utils.DeviceUtils
+import cloud.pace.sdk.utils.applyInsets
 import net.openid.appauth.AuthorizationException
 import net.openid.appauth.AuthorizationException.AuthorizationRequestErrors
 import net.openid.appauth.AuthorizationManagementRequest
@@ -37,6 +39,7 @@ class AuthorizationWebViewActivity : AppCompatActivity(), CloudSDKKoinComponent
     private var appAuthRedirectScheme: String? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         val state = savedInstanceState ?: intent.extras
@@ -114,6 +117,7 @@ class AuthorizationWebViewActivity : AppCompatActivity(), CloudSDKKoinComponent
         CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true)
 
         setContentView(webView)
+        webView.applyInsets()
     }
 
     private fun intercept(newUri: Uri?): Boolean {
diff --git a/library/src/main/java/cloud/pace/sdk/idkit/browsermatcher/CustomBrowserMatcher.kt b/library/src/main/java/cloud/pace/sdk/idkit/browsermatcher/CustomBrowserMatcher.kt
@@ -22,7 +22,7 @@ class CustomBrowserMatcher(private val context: Context) : BrowserMatcher {
         }
 
         val packageInfo = packageInfo
-        return if (packageInfo != null && CHROME_CUSTOM_TAB.matches(BrowserDescriptor(packageInfo, true)) && packageInfo.applicationInfo.enabled) {
+        return if (packageInfo != null && CHROME_CUSTOM_TAB.matches(BrowserDescriptor(packageInfo, true)) && packageInfo.applicationInfo?.enabled == true) {
             Timber.i(
                 "A supported Chrome custom tab is installed and enabled but this browser descriptor is not the Chrome custom tab. " +
                     "Return false so that AppAuth continues with next browser."
@@ -37,7 +37,7 @@ class CustomBrowserMatcher(private val context: Context) : BrowserMatcher {
     private fun getInstalledChromePackageInfo(): PackageInfo? {
         return try {
             context.packageManager.getPackageInfo(Browsers.Chrome.PACKAGE_NAME, PackageManager.GET_SIGNATURES).also {
-                Timber.d("Chrome is installed: version = ${it.versionName}, enabled = ${it.applicationInfo.enabled}")
+                Timber.d("Chrome is installed: version = ${it.versionName}, enabled = ${it.applicationInfo?.enabled}")
             }
         } catch (e: PackageManager.NameNotFoundException) {
             Timber.i(e, "Chrome is not installed")
diff --git a/library/src/main/java/cloud/pace/sdk/utils/Extensions.kt b/library/src/main/java/cloud/pace/sdk/utils/Extensions.kt
@@ -2,7 +2,12 @@ package cloud.pace.sdk.utils
 
 import android.content.res.Resources
 import android.util.TypedValue
+import android.view.View
+import android.view.ViewGroup
 import androidx.compose.ui.graphics.Color
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import cloud.pace.sdk.PACECloudSDK
 import timber.log.Timber
 import java.security.SecureRandom
@@ -86,3 +91,19 @@ fun String?.toColorOrNull(): Color? {
         null
     }
 }
+
+fun View.applyInsets() {
+    // Apply insets on all sides to not overlap content with system bars
+    ViewCompat.setOnApplyWindowInsetsListener(this) { rootView, windowInsets ->
+        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+        rootView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+            leftMargin = insets.left
+            topMargin = insets.top
+            rightMargin = insets.right
+            bottomMargin = insets.bottom
+        }
+
+        WindowInsetsCompat.CONSUMED
+    }
+}
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
