Merge pull request #129 from okta/fix_cct_start_animation

FeiChen-okta · web-flow · commit a035189d1dfa · 2019-12-09T12:18:11.000-08:00
Fix CCT start animation.
diff --git a/app/src/main/java/com/okta/oidc/example/PlainActivity.java b/app/src/main/java/com/okta/oidc/example/PlainActivity.java
@@ -425,8 +425,8 @@ public void onError(@Nullable String msg,
                 .withEncryptionManager(mCurrentEncryptionManager)
                 .setRequireHardwareBackedKeyStore(!isEmulator)
                 .withTabColor(0)
-                .withStartAnimation(R.anim.pull_in_bottom, R.anim.push_out_right)
-                .withExitAnimation(R.anim.push_out_bottom, R.anim.pull_in_bottom)
+                .withStartAnimation(R.anim.pull_in_bottom, R.anim.push_out_bottom)
+                .withExitAnimation(R.anim.pull_in_bottom, R.anim.push_out_bottom)
                 .withOktaHttpClient(factory.build())
                 .supportedBrowsers(FIRE_FOX)
                 .create();
diff --git a/app/src/main/res/anim/pull_in_bottom.xml b/app/src/main/res/anim/pull_in_bottom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/screen_transition_duration"
+    android:duration="@integer/screen_transition_duration_long"
     android:fromYDelta="100%"
-    android:toYDelta="0%"
     android:interpolator="@android:anim/decelerate_interpolator"
-/>
+    android:toYDelta="0%" />
diff --git a/app/src/main/res/anim/pull_in_right.xml b/app/src/main/res/anim/pull_in_right.xml
diff --git a/app/src/main/res/anim/push_out_bottom.xml b/app/src/main/res/anim/push_out_bottom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/screen_transition_duration"
+    android:duration="@integer/screen_transition_duration_long"
     android:fromYDelta="0%"
-    android:toYDelta="100%"
     android:interpolator="@android:anim/decelerate_interpolator"
-/>
+    android:toYDelta="100%" />
diff --git a/app/src/main/res/anim/push_out_right.xml b/app/src/main/res/anim/push_out_right.xml
diff --git a/library/src/main/java/com/okta/oidc/OktaAuthenticationActivity.java b/library/src/main/java/com/okta/oidc/OktaAuthenticationActivity.java
@@ -212,6 +212,8 @@ protected Intent createBrowserIntent(String packageName, CustomTabsSession sessi
                 intentBuilder.setStartAnimations(this,
                         mCustomTabOptions.getStartEnterResId(),
                         mCustomTabOptions.getStartExitResId());
+                overridePendingTransition(mCustomTabOptions.getStartEnterResId(),
+                        mCustomTabOptions.getStartExitResId());
             }
             if (mCustomTabOptions.getEndEnterResId() != 0 &&
                     mCustomTabOptions.getEndExitResId() != 0) {

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,8 @@ protected Intent createBrowserIntent(String packageName, CustomTabsSession sessi`
`212`	`212`	`intentBuilder.setStartAnimations(this,`
`213`	`213`	`mCustomTabOptions.getStartEnterResId(),`
`214`	`214`	`mCustomTabOptions.getStartExitResId());`
	`215`	`+ overridePendingTransition(mCustomTabOptions.getStartEnterResId(),`
	`216`	`+ mCustomTabOptions.getStartExitResId());`
`215`	`217`	`}`
`216`	`218`	`if (mCustomTabOptions.getEndEnterResId() != 0 &&`
`217`	`219`	`mCustomTabOptions.getEndExitResId() != 0) {`