diff --git a/app/src/main/res/layout/auth_ui_layout.xml b/app/src/main/res/layout/auth_ui_layout.xml index ee35330d2..1e4f8a565 100644 --- a/app/src/main/res/layout/auth_ui_layout.xml +++ b/app/src/main/res/layout/auth_ui_layout.xml @@ -54,13 +54,13 @@ android:id="@+id/default_theme" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:checked="true" android:text="@string/default_theme"/> - - - + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4a0ad0672..e4040bae1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,13 +12,11 @@ #EDE7F6 #673AB7 #512DA8 - #E040FB #E8F5E9 #4CAF50 #388E3C #AED581 - #69F0AE #E0E0E0 #ff303030 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 804934f63..f5b6c16fc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,4 +1,5 @@ + - - - + diff --git a/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java b/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java index 336fb0160..1746a973d 100644 --- a/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java +++ b/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java @@ -54,12 +54,7 @@ public void onCancel(DialogInterface dialog) { }); if (isPlayServicesAvailable) { - final FlowParameters flowParams = mActivityHelper.getFlowParams(); - if (flowParams.isReauth) { - showReauthDialog(); - } else { - SignInDelegate.delegate(this, flowParams); - } + start(); } else { mIsWaitingForPlayServices = true; } @@ -79,7 +74,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (requestCode == RC_PLAY_SERVICES) { if (resultCode == ResultCodes.OK) { - SignInDelegate.delegate(this, mActivityHelper.getFlowParams()); + start(); } else { finish(ResultCodes.CANCELED, IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR)); @@ -90,23 +85,18 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } } - /** - * Check if there is an active or soon-to-be-active network connection. - * - * @return true if there is no network connection, false otherwise. - */ - private boolean isOffline() { - ConnectivityManager manager = - (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - - return !(manager != null - && manager.getActiveNetworkInfo() != null - && manager.getActiveNetworkInfo().isConnectedOrConnecting()); + private void start() { + FlowParameters flowParams = mActivityHelper.getFlowParams(); + if (flowParams.isReauth) { + showReauthDialog(); + } else { + SignInDelegate.delegate(this, flowParams); + } } private void showReauthDialog() { final FlowParameters flowParams = mActivityHelper.getFlowParams(); - AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.FirebaseUI_Dialog) + AlertDialog.Builder builder = new AlertDialog.Builder(this) .setTitle(R.string.reauth_dialog_title) .setOnCancelListener(new DialogInterface.OnCancelListener() { @Override @@ -133,4 +123,18 @@ public void onClick(DialogInterface dialog, int which) { builder.create().show(); } + + /** + * Check if there is an active or soon-to-be-active network connection. + * + * @return true if there is no network connection, false otherwise. + */ + private boolean isOffline() { + ConnectivityManager manager = + (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + + return !(manager != null + && manager.getActiveNetworkInfo() != null + && manager.getActiveNetworkInfo().isConnectedOrConnecting()); + } } diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java index 0c2424edb..b56a8f92c 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java @@ -29,7 +29,7 @@ public static void show(String email, FragmentManager manager) { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - return new AlertDialog.Builder(getContext(), R.style.FirebaseUI_Dialog) + return new AlertDialog.Builder(getContext()) .setTitle(R.string.title_confirm_recover_password) .setMessage(getString(R.string.confirm_recovery_body, getArguments().getString(ExtraConstants.EXTRA_EMAIL))) diff --git a/auth/src/main/res/layout/check_email_layout.xml b/auth/src/main/res/layout/check_email_layout.xml index 7b10cf151..cafc9ae3d 100644 --- a/auth/src/main/res/layout/check_email_layout.xml +++ b/auth/src/main/res/layout/check_email_layout.xml @@ -1,6 +1,6 @@ - + style="@style/FirebaseUI.TextInputEditText.EmailField"/> @@ -30,6 +28,6 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_below="@id/email_layout" - android:text="@string/next_default" /> + android:text="@string/next_default"/> diff --git a/auth/src/main/res/layout/forgot_password_layout.xml b/auth/src/main/res/layout/forgot_password_layout.xml index cdc9d37c0..2488b68a5 100644 --- a/auth/src/main/res/layout/forgot_password_layout.xml +++ b/auth/src/main/res/layout/forgot_password_layout.xml @@ -1,8 +1,8 @@ + style="@style/FirebaseUI.WrapperStyle" + android:orientation="vertical"> + android:paddingTop="16dp"> + android:id="@+id/email" + style="@style/FirebaseUI.TextInputEditText.EmailField"/> + android:layout_height="wrap_content" + android:paddingTop="194dp" + android:gravity="end">