Skip to content

Rename BaseDialog and BaseFragment to be like other bases in FirebaseUI #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 3, 2017
Merged

Rename BaseDialog and BaseFragment to be like other bases in FirebaseUI #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
827c22c
Rename BaseDialog to be like other bases in FirebaseUI
SUPERCILEX Dec 27, 2016
ca8dea6
and BaseFragment
SUPERCILEX Dec 27, 2016
971e8aa
Disable mockito version checks
SUPERCILEX Dec 31, 2016
acab715
Fix gradle stuff
SUPERCILEX Jan 1, 2017
4d29609
Merge branch 'gradle' into renames
SUPERCILEX Jan 1, 2017
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
4 changes: 2 additions & 2 deletions auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ dependencies {
compile "com.android.support:cardview-v7:$support_library_version"

testCompile 'junit:junit:4.12'
//noinspection GradleDynamicVersion
testCompile 'org.mockito:mockito-core:2.3.+'
//noinspection NewerVersionAvailable, GradleDynamicVersion
testCompile 'org.mockito:mockito-core:2.5.+'
testCompile 'org.robolectric:robolectric:3.1.4'
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/firebase/ui/auth/ui/BaseDialog.java → ...a/com/firebase/ui/auth/ui/DialogBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;

public class BaseDialog extends DialogFragment {
public class DialogBase extends DialogFragment {
protected FragmentHelper mHelper;

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...com/firebase/ui/auth/ui/BaseFragment.java → ...com/firebase/ui/auth/ui/FragmentBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;

public class BaseFragment extends Fragment {
public class FragmentBase extends Fragment {
protected FragmentHelper mHelper;

@Override
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import android.widget.EditText;

import com.firebase.ui.auth.R;
import com.firebase.ui.auth.ui.BaseFragment;
import com.firebase.ui.auth.ui.ExtraConstants;
import com.firebase.ui.auth.ui.FlowParameters;
import com.firebase.ui.auth.ui.FragmentBase;
import com.firebase.ui.auth.ui.TaskFailureLogger;
import com.firebase.ui.auth.ui.User;
import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
Expand All @@ -43,7 +43,7 @@
*
* Host Activities should implement {@link CheckEmailListener}.
*/
public class CheckEmailFragment extends BaseFragment implements View.OnClickListener {
public class CheckEmailFragment extends FragmentBase implements View.OnClickListener {

/**
* Interface to be implemented by Activities hosting this Fragment.
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

import com.firebase.ui.auth.R;
import com.firebase.ui.auth.ResultCodes;
import com.firebase.ui.auth.ui.BaseDialog;
import com.firebase.ui.auth.ui.DialogBase;
import com.firebase.ui.auth.ui.ExtraConstants;

public class RecoveryEmailSentDialog extends BaseDialog {
public class RecoveryEmailSentDialog extends DialogBase {
private static final String TAG = "RecoveryEmailSentDialog";

@NonNull
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

import com.firebase.ui.auth.IdpResponse;
import com.firebase.ui.auth.R;
import com.firebase.ui.auth.ui.BaseFragment;
import com.firebase.ui.auth.ui.ExtraConstants;
import com.firebase.ui.auth.ui.FlowParameters;
import com.firebase.ui.auth.ui.FragmentBase;
import com.firebase.ui.auth.ui.TaskFailureLogger;
import com.firebase.ui.auth.ui.User;
import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
Expand All @@ -44,7 +44,7 @@
/**
* Fragment to display an email/name/password sign up form for new users.
*/
public class RegisterEmailFragment extends BaseFragment implements
public class RegisterEmailFragment extends FragmentBase implements
View.OnClickListener, View.OnFocusChangeListener {

public static final String TAG = "RegisterEmailFragment";
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
import com.firebase.ui.auth.provider.IdpProvider;
import com.firebase.ui.auth.provider.IdpProvider.IdpCallback;
import com.firebase.ui.auth.provider.TwitterProvider;
import com.firebase.ui.auth.ui.BaseFragment;
import com.firebase.ui.auth.ui.ExtraConstants;
import com.firebase.ui.auth.ui.FlowParameters;
import com.firebase.ui.auth.ui.FragmentBase;
import com.firebase.ui.auth.ui.FragmentHelper;
import com.firebase.ui.auth.ui.TaskFailureLogger;
import com.firebase.ui.auth.ui.User;
Expand All @@ -44,7 +44,7 @@
import com.google.firebase.auth.GoogleAuthProvider;
import com.google.firebase.auth.TwitterAuthProvider;

public class IdpSignInContainer extends BaseFragment implements IdpCallback {
public class IdpSignInContainer extends FragmentBase implements IdpCallback {
private static final String TAG = "IDPSignInContainer";
private static final int RC_WELCOME_BACK_IDP = 4;

Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import android.util.Log;
import android.widget.Toast;

import com.firebase.ui.auth.ui.BaseFragment;
import com.firebase.ui.auth.ui.FragmentBase;
import com.google.android.gms.auth.api.credentials.Credential;
import com.google.android.gms.auth.api.credentials.IdentityProviders;
import com.google.android.gms.common.ConnectionResult;
Expand All @@ -25,7 +25,7 @@
import java.util.Collections;
import java.util.List;

public abstract class SmartLockBase<R extends Result> extends BaseFragment implements
public abstract class SmartLockBase<R extends Result> extends FragmentBase implements
GoogleApiClient.ConnectionCallbacks,
ResultCallback<R>,
GoogleApiClient.OnConnectionFailedListener {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.3.0-alpha2'
classpath 'com.android.tools.build:gradle:2.3.0-beta1'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'io.fabric.tools:gradle:1.+'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
Expand Down
2 changes: 1 addition & 1 deletion library/quality/quality.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ task pmd(type: Pmd) {

android {
lintOptions {
disable 'InvalidPackage'
disable 'InvalidPackage', 'RestrictedApi'
baseline file("$configDir/lint-baseline.xml")
checkAllWarnings true
warningsAsErrors true
Expand Down