Fix modal transition animations (#1660)

Author: jyaganeh

urbanairship-layout/src/main/java/com/urbanairship/android/layout/Thomas.kt

@@ -2,6 +2,7 @@
 package com.urbanairship.android.layout
 
 import android.app.ActivityOptions
+import android.app.ActivityOptions.makeSceneTransitionAnimation
 import android.content.Context
 import android.content.Intent
 import androidx.annotation.RestrictTo
@@ -79,7 +80,15 @@ public object Thomas {
                             ModalActivity.EXTRA_DISPLAY_ARGS_LOADER,
                             DisplayArgsLoader.newLoader(args)
                         )
-                    context.startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(getActivity(context)).toBundle())
+                    val activityContext = activityMonitor.resumedActivities.lastOrNull()
+                    if (activityContext != null) {
+                        activityContext.startActivity(
+                            intent,
+                            makeSceneTransitionAnimation(activityContext).toBundle()
+                        )
+                    } else {
+                        context.startActivity(intent)
+                    }
                 }
             }
             is BannerPresentation -> {

urbanairship-layout/src/main/java/com/urbanairship/android/layout/ui/ModalActivity.kt

@@ -50,9 +50,7 @@ public class ModalActivity : AppCompatActivity() {
         ViewModelProvider(this)[LayoutViewModel::class.java]
     }
 
-    // TODO(API35): Replace the hardcoded version with VANILLA_ICE_CREAM
-    //   once we've updated the SDK to target API 35.
-    private val isAtLeastApi35 = Build.VERSION.SDK_INT >= 35
+    private val isAtLeastApi35 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM
 
     private lateinit var loader: DisplayArgsLoader
     private lateinit var externalListener: ThomasListenerInterface

urbanairship-layout/src/main/res/values/style_airship_layout.xml

@@ -14,10 +14,8 @@
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowEnterTransition">@transition/fade</item>
         <item name="android:windowExitTransition">@transition/fade</item>
-        <item name="android:windowSharedElementEnterTransition">
-            @transition/fade</item>
-        <item name="android:windowSharedElementExitTransition">
-            @transition/fade</item>
+        <item name="android:windowSharedElementEnterTransition">@transition/fade</item>
+        <item name="android:windowSharedElementExitTransition">@transition/fade</item>
     </style>
 
     <style name="UrbanAirship.Layout.ModalActivity" parent="UrbanAirship.Layout.ModalActivityBase" />