Skip to content

Commit ab9b801

Browse files
SUPERCILEXsamtstern
authored andcommitted
Rename BaseDialog and BaseFragment to be like other bases in FirebaseUI (#476)
1 parent 63e3f95 commit ab9b801

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

auth/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ dependencies {
5151
compile "com.android.support:cardview-v7:$support_library_version"
5252

5353
testCompile 'junit:junit:4.12'
54-
//noinspection GradleDynamicVersion
55-
testCompile 'org.mockito:mockito-core:2.3.+'
54+
//noinspection NewerVersionAvailable, GradleDynamicVersion
55+
testCompile 'org.mockito:mockito-core:2.5.+'
5656
testCompile 'org.robolectric:robolectric:3.1.4'
5757
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
5858
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'

auth/src/main/java/com/firebase/ui/auth/ui/BaseDialog.java renamed to auth/src/main/java/com/firebase/ui/auth/ui/DialogBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.support.annotation.Nullable;
66
import android.support.v4.app.DialogFragment;
77

8-
public class BaseDialog extends DialogFragment {
8+
public class DialogBase extends DialogFragment {
99
protected FragmentHelper mHelper;
1010

1111
@Override

auth/src/main/java/com/firebase/ui/auth/ui/BaseFragment.java renamed to auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.support.annotation.Nullable;
66
import android.support.v4.app.Fragment;
77

8-
public class BaseFragment extends Fragment {
8+
public class FragmentBase extends Fragment {
99
protected FragmentHelper mHelper;
1010

1111
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import android.widget.EditText;
1717

1818
import com.firebase.ui.auth.R;
19-
import com.firebase.ui.auth.ui.BaseFragment;
2019
import com.firebase.ui.auth.ui.ExtraConstants;
2120
import com.firebase.ui.auth.ui.FlowParameters;
21+
import com.firebase.ui.auth.ui.FragmentBase;
2222
import com.firebase.ui.auth.ui.TaskFailureLogger;
2323
import com.firebase.ui.auth.ui.User;
2424
import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
@@ -43,7 +43,7 @@
4343
*
4444
* Host Activities should implement {@link CheckEmailListener}.
4545
*/
46-
public class CheckEmailFragment extends BaseFragment implements View.OnClickListener {
46+
public class CheckEmailFragment extends FragmentBase implements View.OnClickListener {
4747

4848
/**
4949
* Interface to be implemented by Activities hosting this Fragment.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
import com.firebase.ui.auth.R;
1212
import com.firebase.ui.auth.ResultCodes;
13-
import com.firebase.ui.auth.ui.BaseDialog;
13+
import com.firebase.ui.auth.ui.DialogBase;
1414
import com.firebase.ui.auth.ui.ExtraConstants;
1515

16-
public class RecoveryEmailSentDialog extends BaseDialog {
16+
public class RecoveryEmailSentDialog extends DialogBase {
1717
private static final String TAG = "RecoveryEmailSentDialog";
1818

1919
@NonNull

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
import com.firebase.ui.auth.IdpResponse;
2222
import com.firebase.ui.auth.R;
23-
import com.firebase.ui.auth.ui.BaseFragment;
2423
import com.firebase.ui.auth.ui.ExtraConstants;
2524
import com.firebase.ui.auth.ui.FlowParameters;
25+
import com.firebase.ui.auth.ui.FragmentBase;
2626
import com.firebase.ui.auth.ui.TaskFailureLogger;
2727
import com.firebase.ui.auth.ui.User;
2828
import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
@@ -44,7 +44,7 @@
4444
/**
4545
* Fragment to display an email/name/password sign up form for new users.
4646
*/
47-
public class RegisterEmailFragment extends BaseFragment implements
47+
public class RegisterEmailFragment extends FragmentBase implements
4848
View.OnClickListener, View.OnFocusChangeListener {
4949

5050
public static final String TAG = "RegisterEmailFragment";

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import com.firebase.ui.auth.provider.IdpProvider;
3333
import com.firebase.ui.auth.provider.IdpProvider.IdpCallback;
3434
import com.firebase.ui.auth.provider.TwitterProvider;
35-
import com.firebase.ui.auth.ui.BaseFragment;
3635
import com.firebase.ui.auth.ui.ExtraConstants;
3736
import com.firebase.ui.auth.ui.FlowParameters;
37+
import com.firebase.ui.auth.ui.FragmentBase;
3838
import com.firebase.ui.auth.ui.FragmentHelper;
3939
import com.firebase.ui.auth.ui.TaskFailureLogger;
4040
import com.firebase.ui.auth.ui.User;
@@ -44,7 +44,7 @@
4444
import com.google.firebase.auth.GoogleAuthProvider;
4545
import com.google.firebase.auth.TwitterAuthProvider;
4646

47-
public class IdpSignInContainer extends BaseFragment implements IdpCallback {
47+
public class IdpSignInContainer extends FragmentBase implements IdpCallback {
4848
private static final String TAG = "IDPSignInContainer";
4949
private static final int RC_WELCOME_BACK_IDP = 4;
5050

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import android.util.Log;
88
import android.widget.Toast;
99

10-
import com.firebase.ui.auth.ui.BaseFragment;
10+
import com.firebase.ui.auth.ui.FragmentBase;
1111
import com.google.android.gms.auth.api.credentials.Credential;
1212
import com.google.android.gms.auth.api.credentials.IdentityProviders;
1313
import com.google.android.gms.common.ConnectionResult;
@@ -25,7 +25,7 @@
2525
import java.util.Collections;
2626
import java.util.List;
2727

28-
public abstract class SmartLockBase<R extends Result> extends BaseFragment implements
28+
public abstract class SmartLockBase<R extends Result> extends FragmentBase implements
2929
GoogleApiClient.ConnectionCallbacks,
3030
ResultCallback<R>,
3131
GoogleApiClient.OnConnectionFailedListener {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:2.3.0-alpha2'
11+
classpath 'com.android.tools.build:gradle:2.3.0-beta1'
1212
classpath 'com.google.gms:google-services:3.0.0'
1313
classpath 'io.fabric.tools:gradle:1.+'
1414
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'

library/quality/quality.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ task pmd(type: Pmd) {
6969

7070
android {
7171
lintOptions {
72-
disable 'InvalidPackage'
72+
disable 'InvalidPackage', 'RestrictedApi'
7373
baseline file("$configDir/lint-baseline.xml")
7474
checkAllWarnings true
7575
warningsAsErrors true

0 commit comments

Comments
 (0)