Improve Token Migration loading indicator. Add app icon for AuthFlowTester.

Author: brandonpage

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/TokenMigrationActivity.kt

@@ -52,16 +52,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.net.toUri
 import androidx.core.view.WindowCompat
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.salesforce.androidsdk.accounts.MigrationCallbackRegistry
-import com.salesforce.androidsdk.accounts.UserAccount
 import com.salesforce.androidsdk.accounts.UserAccountManager
-import com.salesforce.androidsdk.analytics.model.InstrumentationEvent
 import com.salesforce.androidsdk.app.SalesforceSDKManager
 import com.salesforce.androidsdk.app.SalesforceSDKManager.Theme.DARK
 import com.salesforce.androidsdk.auth.OAuth2.FRONTDOOR_URL_KEY
@@ -227,6 +223,9 @@ internal class TokenMigrationActivity : ComponentActivity() {
                 val migrationFinished = url.startsWith(callbackUrl)
 
                 if (migrationFinished) {
+                    viewModel.authFinished.value = true
+                    viewModel.loading.value = true
+
                     val params = UriFragmentParser.parse(request.url)
                     val error = params["error"]
                     // Did we fail?
@@ -281,14 +280,17 @@ internal class TokenMigrationActivity : ComponentActivity() {
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
-                if (!viewModel.authFinished.value) {
-                    viewModel.loading.value = false
-                }
-
                 view?.evaluateJavascript(BACKGROUND_COLOR_JAVASCRIPT) { result ->
                     makeStatusBarVisible()
-                    viewModel.dynamicBackgroundColor.value = validateAndExtractBackgroundColor(result)
-                        ?: return@evaluateJavascript
+                    validateAndExtractBackgroundColor(result)?.let { color ->
+                        viewModel.dynamicBackgroundColor.value = color
+
+                        // This check is inside validateAndExtractBackgroundColor because we only
+                        // want to stop showing the spinner if WebView UI is actually displayed.
+                        if (!viewModel.authFinished.value) {
+                            viewModel.loading.value = false
+                        }
+                    }
                 }
 
                 super.onPageFinished(view, url)

native/NativeSampleApps/AuthFlowTester/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application android:icon="@drawable/sf__icon"
+    <application android:icon="@mipmap/msdk_icon"
         android:name=".AuthFlowTesterApplication"
         android:label="@string/app_name"
         android:manageSpaceActivity="com.salesforce.androidsdk.ui.ManageSpaceActivity">

native/NativeSampleApps/AuthFlowTester/src/main/res/mipmap-anydpi-v26/msdk_icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/msdk_icon_background"/>
+    <foreground android:drawable="@mipmap/msdk_icon_foreground"/>
+</adaptive-icon>

native/NativeSampleApps/AuthFlowTester/src/main/res/mipmap-hdpi/msdk_icon_foreground.webp

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="msdk_icon_background">#414450</color>
+</resources>