Merge branch '316-webview-opened-with-wrong-theme-setting' into 'master'

Resolve "Webview opened with wrong theme setting"

Closes #316

See merge request pace/mobile/android/pace-cloud-sdk!369

Author: MelissaAtPace

docs/index.md

@@ -24,6 +24,7 @@ This framework combines multipe functionalities provided by PACE i.e. authorizin
         + [21.x.x -> 22.x.x](#from-21xx-to-22xx)
         + [22.x.x -> 23.x.x](#from-22xx-to-23xx)
         + [23.x.x -> 24.x.x](#from-23xx-to-24xx)
+        + [24.x.x -> 25.x.x](#from-24xx-to-25xx)
 
 ## Documentation
 The full documentation and instructions on how to integrate PACE Cloud SDK can be found [here](https://docs.pace.cloud/en/integrating/mobile-app)

library/src/main/java/cloud/pace/sdk/idkit/authorization/AuthorizationManager.kt

@@ -9,13 +9,17 @@ import android.net.Uri
 import android.os.Build
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_DARK
+import androidx.browser.customtabs.CustomTabsIntent.COLOR_SCHEME_LIGHT
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import cloud.pace.sdk.PACECloudSDK
 import cloud.pace.sdk.R
 import cloud.pace.sdk.api.API
+import cloud.pace.sdk.appkit.AppKit
 import cloud.pace.sdk.idkit.authorization.integrated.AuthorizationWebViewActivity
 import cloud.pace.sdk.idkit.model.FailedRetrievingConfigurationWhileDiscovering
 import cloud.pace.sdk.idkit.model.FailedRetrievingSessionWhileAuthorizing
@@ -37,6 +41,7 @@ import cloud.pace.sdk.utils.IntentResult
 import cloud.pace.sdk.utils.Ok
 import cloud.pace.sdk.utils.SetupLogger
 import cloud.pace.sdk.utils.Success
+import cloud.pace.sdk.utils.Theme
 import cloud.pace.sdk.utils.getResultFor
 import cloud.pace.sdk.utils.resumeIfActive
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -151,7 +156,8 @@ internal class AuthorizationManager(
                 authorizationService.performAuthorizationRequest(
                     authorizationRequest,
                     PendingIntent.getActivity(context, 0, Intent(context, completedActivity), flags),
-                    canceledPendingIntent
+                    canceledPendingIntent,
+                    getCustomTabIntentForAuthorization()
                 )
             } catch (e: ActivityNotFoundException) {
                 Timber.i(e, "No supported browser installed to launch the authorization request")
@@ -165,7 +171,7 @@ internal class AuthorizationManager(
             Success(AuthorizationWebViewActivity.createStartIntent(context, authorizationRequest))
         } else {
             try {
-                Success(authorizationService.getAuthorizationRequestIntent(authorizationRequest))
+                Success(authorizationService.getAuthorizationRequestIntent(authorizationRequest, getCustomTabIntentForAuthorization()))
             } catch (e: ActivityNotFoundException) {
                 Timber.i(e, "No supported browser installed to launch the authorization request")
                 showNoSupportedBrowserToast()
@@ -258,7 +264,8 @@ internal class AuthorizationManager(
                     authorizationService.performEndSessionRequest(
                         it,
                         PendingIntent.getActivity(context, 0, Intent(context, completedActivity), flags),
-                        canceledPendingIntent
+                        canceledPendingIntent,
+                        getCustomTabIntentForAuthorization()
                     )
                 } catch (e: ActivityNotFoundException) {
                     Timber.i(e, "No supported browser installed to launch the end session request")
@@ -276,7 +283,7 @@ internal class AuthorizationManager(
             Success(AuthorizationWebViewActivity.createStartIntent(context, endSessionRequest))
         } else {
             try {
-                Success(authorizationService.getEndSessionRequestIntent(endSessionRequest))
+                Success(authorizationService.getEndSessionRequestIntent(endSessionRequest, getCustomTabIntentForAuthorization()))
             } catch (e: ActivityNotFoundException) {
                 Timber.i(e, "No supported browser installed to launch the end session request")
                 showNoSupportedBrowserToast()
@@ -419,6 +426,14 @@ internal class AuthorizationManager(
         }
     }
 
+    private fun getCustomTabIntentForAuthorization(): CustomTabsIntent {
+        val colorScheme = when (AppKit.theme) {
+            Theme.DARK -> COLOR_SCHEME_DARK
+            Theme.LIGHT -> COLOR_SCHEME_LIGHT
+        }
+        return authorizationService.createCustomTabsIntentBuilder().setColorScheme(colorScheme).build()
+    }
+
     override fun onDestroy(owner: LifecycleOwner) {
         // This must be called to avoid memory leaks.
         authorizationService.dispose()

library/src/main/res/values-v27/styles.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppKitTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
+    </style>
+
+</resources>

library/src/main/res/values/styles.xml

@@ -5,6 +5,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
     </style>
 
     <style name="ProgressButton" parent="Widget.AppCompat.Button">