Skip to content

Commit 0783098

Browse files
committed
Add some better transitions/animations
Change-Id: I98c1a7b46b312738d8fc9d8ab1e5d5a14d1f7bce
1 parent 18baedf commit 0783098

File tree

7 files changed

+38
-4
lines changed

7 files changed

+38
-4
lines changed

auth/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ dependencies {
5353
testCompile 'junit:junit:4.12'
5454
testCompile 'org.mockito:mockito-core:2.2.28'
5555
testCompile 'org.robolectric:robolectric:3.1.4'
56-
testCompile "org.robolectric:shadows-support-v4:3.1.4"
5756
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
5857
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
5958
}

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
* Activity to control the entire email sign up flow. Plays host to {@link CheckEmailFragment}
3535
* and {@link RegisterEmailFragment} and triggers {@link WelcomeBackPasswordPrompt}.
3636
*/
37-
public class RegisterEmailActivity extends AppCompatBase
38-
implements CheckEmailFragment.CheckEmailListener {
37+
public class RegisterEmailActivity extends AppCompatBase implements
38+
CheckEmailFragment.CheckEmailListener {
3939

4040
private static final int RC_SIGN_IN = 17;
4141
private static final int RC_WELCOME_BACK_IDP = 18;
@@ -76,6 +76,8 @@ public void onExistingEmailUser(@NonNull String email) {
7676
mActivityHelper.getFlowParams(),
7777
new IdpResponse(EmailAuthProvider.PROVIDER_ID, email)),
7878
RC_SIGN_IN);
79+
80+
setSlideAnimation();
7981
}
8082

8183
@Override
@@ -89,6 +91,8 @@ public void onExistingIdpUser(@NonNull String email, @NonNull String provider) {
8991
email);
9092
mActivityHelper.startActivityForResult(intent,
9193
RC_WELCOME_BACK_IDP);
94+
95+
setSlideAnimation();
9296
}
9397

9498
@Override
@@ -100,10 +104,16 @@ public void onNewUser(@NonNull String email, @Nullable String name) {
100104
name);
101105
getSupportFragmentManager().beginTransaction()
102106
.replace(R.id.fragment_register_email, fragment, RegisterEmailFragment.TAG)
107+
.addSharedElement(findViewById(R.id.email_layout), "email_field")
103108
.disallowAddToBackStack()
104109
.commit();
105110
}
106111

112+
private void setSlideAnimation() {
113+
// Make the next activity slide in
114+
overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
115+
}
116+
107117
public static Intent createIntent(Context context, FlowParameters flowParams) {
108118
return createIntent(context, flowParams, null);
109119
}

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ public View onCreateView(LayoutInflater inflater,
123123
@Override
124124
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
125125
super.onActivityCreated(savedInstanceState);
126-
127126
// Set title
128127
if (getActivity().getActionBar() != null) {
129128
getActivity().getActionBar().setTitle(R.string.title_register_email_activity);
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android">
3+
<translate
4+
android:duration="@android:integer/config_mediumAnimTime"
5+
android:fromXDelta="100%p"
6+
android:toXDelta="0%p" />
7+
<!--<alpha-->
8+
<!--android:duration="@android:integer/config_mediumAnimTime"-->
9+
<!--android:fromAlpha="0.0"-->
10+
<!--android:toAlpha="1.0" />-->
11+
</set>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android">
3+
<translate
4+
android:duration="@android:integer/config_mediumAnimTime"
5+
android:fromXDelta="0%p"
6+
android:toXDelta="-100%p" />
7+
<!--<alpha-->
8+
<!--android:duration="@android:integer/config_mediumAnimTime"-->
9+
<!--android:fromAlpha="1.0"-->
10+
<!--android:toAlpha="0.0" />-->
11+
</set>

auth/src/main/res/layout/check_email_layout.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
android:layout_width="match_parent"
1212
android:layout_height="wrap_content"
1313
android:paddingTop="16dp"
14+
android:transitionGroup="true"
15+
android:transitionName="email_field"
1416
app:errorTextAppearance="@style/FirebaseUI.Text.ErrorText"
1517
app:hintTextAppearance="@style/FirebaseUI.Text.HintText">
1618

auth/src/main/res/layout/register_email_layout.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
android:layout_width="match_parent"
2020
android:layout_height="wrap_content"
2121
android:paddingTop="16dp"
22+
android:transitionGroup="true"
23+
android:transitionName="email_field"
2224
app:errorTextAppearance="@style/FirebaseUI.Text.ErrorText"
2325
app:hintTextAppearance="@style/FirebaseUI.Text.HintText">
2426

0 commit comments

Comments
 (0)