Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions auth/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@
android:exported="false"
android:theme="@style/Theme.AppCompat.NoActionBar"/>

<activity
android:name=".ui.email.EmailHintContainerActivity"
android:label="@string/default_toolbar_title"
android:exported="false"
android:theme="@style/Theme.AppCompat.NoActionBar"/>

<activity
android:name=".ui.email.RecoverPasswordActivity"
android:label="@string/title_recover_password_activity"
Expand All @@ -39,12 +33,6 @@
android:exported="false"
android:theme="@style/FirebaseUI"/>

<activity
android:name=".ui.email.SignInNoPasswordActivity"
android:label="@string/title_sign_in_no_password_activity"
android:exported="false"
android:theme="@style/FirebaseUI"/>

<activity
android:name=".ui.email.SignInActivity"
android:label="@string/title_sign_in_activity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ public ActivityHelper(AppCompatBase activity, Intent intent) {
mActivity = activity;
}

public void configureTheme() {
mActivity.setTheme(getFlowParams().themeId);
}

public void startActivityForResult(Intent intent, int requestCode) {
mActivity.startActivityForResult(intent, requestCode);
}
Expand Down
6 changes: 1 addition & 5 deletions auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,14 @@

public class BaseHelper {
protected Context mContext;
protected ProgressDialog mProgressDialog;
private final FlowParameters mFlowParams;
private ProgressDialog mProgressDialog;

public BaseHelper(Context context, FlowParameters parameters) {
mContext = context;
mFlowParams = parameters;
}

public void configureTheme() {
mContext.setTheme(mFlowParams.themeId);
}

public FlowParameters getFlowParams() {
return mFlowParams;
}
Expand Down
17 changes: 12 additions & 5 deletions auth/src/main/java/com/firebase/ui/auth/ui/FragmentHelper.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.firebase.ui.auth.ui;

import android.app.ProgressDialog;
import android.content.Intent;
import android.content.IntentSender;
import android.os.Bundle;
Expand All @@ -9,7 +10,7 @@ public class FragmentHelper extends BaseHelper {
private Fragment mFragment;

public FragmentHelper(Fragment fragment) {
super(fragment.getContext(), (FlowParameters) fragment.getArguments()
super(fragment.getContext().getApplicationContext(), (FlowParameters) fragment.getArguments()
.getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS));
mFragment = fragment;
}
Expand All @@ -18,14 +19,20 @@ public void finish(int resultCode, Intent intent) {
finishActivity(mFragment.getActivity(), resultCode, intent);
}

public static Bundle getFlowParamsBundle(FlowParameters params) {
Bundle bundle = new Bundle();
bundle.putParcelable(ExtraConstants.EXTRA_FLOW_PARAMS, params);
return bundle;
@Override
public void showLoadingDialog(String message) {
dismissDialog();
mProgressDialog = ProgressDialog.show(mFragment.getContext(), "", message, true);
}

public void startIntentSenderForResult(IntentSender sender, int requestCode)
throws IntentSender.SendIntentException {
mFragment.startIntentSenderForResult(sender, requestCode, null, 0, 0, 0, null);
}

public static Bundle getFlowParamsBundle(FlowParameters params) {
Bundle bundle = new Bundle();
bundle.putParcelable(ExtraConstants.EXTRA_FLOW_PARAMS, params);
return bundle;
}
}

This file was deleted.

This file was deleted.

Loading