Skip to content

Commit 3c3421f

Browse files
samtsternsamtstern
authored
Migrate to AndroidX (#1668)
1 parent 4aef53e commit 3c3421f

File tree

214 files changed

+1004
-789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+1004
-789
lines changed

‎app/build.gradle.kts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,19 @@ android {
2222
}
2323

2424
lintOptions {
25-
disable("ResourceName", "MissingTranslation")
25+
disable("ResourceName", "MissingTranslation", "DuplicateStrings")
26+
}
27+
28+
compileOptions {
29+
setSourceCompatibility(JavaVersion.VERSION_1_8)
30+
setTargetCompatibility(JavaVersion.VERSION_1_8)
2631
}
2732
}
2833

2934
dependencies {
3035
implementation(Config.Libs.Firebase.core)
31-
implementation(Config.Libs.Support.design)
32-
implementation(Config.Libs.Support.multidex)
36+
implementation(Config.Libs.Androidx.design)
37+
implementation(Config.Libs.Androidx.multidex)
3338

3439
implementation(project(":auth"))
3540
implementation(project(":auth-github"))
@@ -39,8 +44,8 @@ dependencies {
3944

4045
implementation(Config.Libs.Provider.facebook)
4146
// Needed to override Facebook
42-
implementation(Config.Libs.Support.cardView)
43-
implementation(Config.Libs.Support.customTabs)
47+
implementation(Config.Libs.Androidx.cardView)
48+
implementation(Config.Libs.Androidx.customTabs)
4449
implementation(Config.Libs.Provider.twitter) { isTransitive = true }
4550

4651
implementation(Config.Libs.Misc.glide)
@@ -54,7 +59,7 @@ dependencies {
5459
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
5560
implementation(Config.Libs.Misc.permissions)
5661
implementation(Config.Libs.Misc.butterKnife)
57-
implementation(Config.Libs.Support.constraint)
62+
implementation(Config.Libs.Androidx.constraint)
5863
annotationProcessor(Config.Libs.Misc.butterKnifeCompiler)
5964
debugImplementation(Config.Libs.Misc.leakCanary)
6065
debugImplementation(Config.Libs.Misc.leakCanaryFragments)

‎app/src/main/java/com/firebase/uidemo/ChooserActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616

1717
import android.content.Intent;
1818
import android.os.Bundle;
19-
import android.support.annotation.Nullable;
20-
import android.support.annotation.StringRes;
21-
import android.support.v7.app.AppCompatActivity;
22-
import android.support.v7.widget.LinearLayoutManager;
23-
import android.support.v7.widget.RecyclerView;
2419
import android.view.LayoutInflater;
2520
import android.view.View;
2621
import android.view.ViewGroup;
@@ -36,6 +31,11 @@
3631
import com.firebase.uidemo.database.realtime.RealtimeDbChatActivity;
3732
import com.firebase.uidemo.storage.ImageActivity;
3833

34+
import androidx.annotation.Nullable;
35+
import androidx.annotation.StringRes;
36+
import androidx.appcompat.app.AppCompatActivity;
37+
import androidx.recyclerview.widget.LinearLayoutManager;
38+
import androidx.recyclerview.widget.RecyclerView;
3939
import butterknife.BindView;
4040
import butterknife.ButterKnife;
4141

‎app/src/main/java/com/firebase/uidemo/FirebaseUIDemo.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package com.firebase.uidemo;
22

3-
import android.support.multidex.MultiDexApplication;
4-
import android.support.v7.app.AppCompatDelegate;
5-
63
import com.squareup.leakcanary.LeakCanary;
74

8-
public class FirebaseUIDemo extends MultiDexApplication {
9-
static {
10-
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO);
11-
}
5+
import androidx.multidex.MultiDexApplication;
126

7+
public class FirebaseUIDemo extends MultiDexApplication {
138
@Override
149
public void onCreate() {
1510
super.onCreate();

‎app/src/main/java/com/firebase/uidemo/auth/AnonymousUpgradeActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.app.AppCompatActivity;
85
import android.text.TextUtils;
96
import android.util.Log;
107
import android.widget.Button;
@@ -25,6 +22,9 @@
2522

2623
import java.util.List;
2724

25+
import androidx.annotation.NonNull;
26+
import androidx.annotation.Nullable;
27+
import androidx.appcompat.app.AppCompatActivity;
2828
import butterknife.BindView;
2929
import butterknife.ButterKnife;
3030
import butterknife.OnClick;

‎app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
import android.content.Context;
1818
import android.content.Intent;
1919
import android.os.Bundle;
20-
import android.support.annotation.DrawableRes;
21-
import android.support.annotation.NonNull;
22-
import android.support.annotation.Nullable;
23-
import android.support.annotation.StringRes;
24-
import android.support.annotation.StyleRes;
25-
import android.support.design.widget.Snackbar;
26-
import android.support.v7.app.AppCompatActivity;
27-
import android.support.v7.app.AppCompatDelegate;
2820
import android.util.Log;
2921
import android.view.View;
3022
import android.widget.CheckBox;
@@ -44,13 +36,21 @@
4436
import com.google.android.gms.common.Scopes;
4537
import com.google.android.gms.tasks.OnCompleteListener;
4638
import com.google.android.gms.tasks.Task;
39+
import com.google.android.material.snackbar.Snackbar;
4740
import com.google.firebase.auth.ActionCodeSettings;
4841
import com.google.firebase.auth.AuthResult;
4942
import com.google.firebase.auth.FirebaseAuth;
5043

5144
import java.util.ArrayList;
5245
import java.util.List;
5346

47+
import androidx.annotation.DrawableRes;
48+
import androidx.annotation.NonNull;
49+
import androidx.annotation.Nullable;
50+
import androidx.annotation.StringRes;
51+
import androidx.annotation.StyleRes;
52+
import androidx.appcompat.app.AppCompatActivity;
53+
import androidx.appcompat.app.AppCompatDelegate;
5454
import butterknife.BindView;
5555
import butterknife.ButterKnife;
5656
import butterknife.OnClick;
@@ -346,7 +346,7 @@ private void startSignedInActivity(@Nullable IdpResponse response) {
346346
@OnClick({R.id.default_theme, R.id.purple_theme, R.id.green_theme, R.id.dark_theme})
347347
public void toggleDarkTheme() {
348348
int mode = mDarkTheme.isChecked() ?
349-
AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_AUTO;
349+
AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO;
350350
AppCompatDelegate.setDefaultNightMode(mode);
351351
getDelegate().setLocalNightMode(mode);
352352
}

‎app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
import android.content.DialogInterface;
1919
import android.content.Intent;
2020
import android.os.Bundle;
21-
import android.support.annotation.NonNull;
22-
import android.support.annotation.Nullable;
23-
import android.support.annotation.StringRes;
24-
import android.support.design.widget.Snackbar;
25-
import android.support.v7.app.AlertDialog;
26-
import android.support.v7.app.AppCompatActivity;
2721
import android.text.TextUtils;
2822
import android.util.Log;
2923
import android.view.View;
@@ -37,6 +31,7 @@
3731
import com.firebase.uidemo.storage.GlideApp;
3832
import com.google.android.gms.tasks.OnCompleteListener;
3933
import com.google.android.gms.tasks.Task;
34+
import com.google.android.material.snackbar.Snackbar;
4035
import com.google.firebase.auth.EmailAuthProvider;
4136
import com.google.firebase.auth.FacebookAuthProvider;
4237
import com.google.firebase.auth.FirebaseAuth;
@@ -50,6 +45,11 @@
5045
import java.util.ArrayList;
5146
import java.util.List;
5247

48+
import androidx.annotation.NonNull;
49+
import androidx.annotation.Nullable;
50+
import androidx.annotation.StringRes;
51+
import androidx.appcompat.app.AlertDialog;
52+
import androidx.appcompat.app.AppCompatActivity;
5353
import butterknife.BindView;
5454
import butterknife.ButterKnife;
5555
import butterknife.OnClick;

‎app/src/main/java/com/firebase/uidemo/database/AbstractChat.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.firebase.uidemo.database;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
3+
import androidx.annotation.NonNull;
4+
import androidx.annotation.Nullable;
55

66
/**
77
* Common interface for chat messages, helps share code between RTDB and Firestore examples.

‎app/src/main/java/com/firebase/uidemo/database/ChatHolder.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
import android.graphics.PorterDuff;
44
import android.graphics.drawable.GradientDrawable;
55
import android.graphics.drawable.RotateDrawable;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.Nullable;
8-
import android.support.v4.content.ContextCompat;
9-
import android.support.v7.widget.RecyclerView;
106
import android.view.Gravity;
117
import android.view.View;
128
import android.widget.FrameLayout;
@@ -18,6 +14,11 @@
1814
import com.google.firebase.auth.FirebaseAuth;
1915
import com.google.firebase.auth.FirebaseUser;
2016

17+
import androidx.annotation.NonNull;
18+
import androidx.annotation.Nullable;
19+
import androidx.core.content.ContextCompat;
20+
import androidx.recyclerview.widget.RecyclerView;
21+
2122
public class ChatHolder extends RecyclerView.ViewHolder {
2223
private final TextView mNameField;
2324
private final TextView mTextField;

‎app/src/main/java/com/firebase/uidemo/database/firestore/Chat.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.firebase.uidemo.database.firestore;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.annotation.Nullable;
5-
63
import com.firebase.uidemo.database.AbstractChat;
74
import com.google.firebase.firestore.IgnoreExtraProperties;
85
import com.google.firebase.firestore.ServerTimestamp;
96

107
import java.util.Date;
118

9+
import androidx.annotation.NonNull;
10+
import androidx.annotation.Nullable;
11+
1212
@IgnoreExtraProperties
1313
public class Chat extends AbstractChat {
1414
private String mName;

‎app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package com.firebase.uidemo.database.firestore;
22

33
import android.os.Bundle;
4-
import android.support.annotation.NonNull;
5-
import android.support.annotation.Nullable;
6-
import android.support.v7.app.AppCompatActivity;
7-
import android.support.v7.widget.LinearLayoutManager;
8-
import android.support.v7.widget.RecyclerView;
94
import android.util.Log;
105
import android.view.LayoutInflater;
116
import android.view.View;
@@ -27,6 +22,11 @@
2722
import com.google.firebase.firestore.FirebaseFirestore;
2823
import com.google.firebase.firestore.Query;
2924

25+
import androidx.annotation.NonNull;
26+
import androidx.annotation.Nullable;
27+
import androidx.appcompat.app.AppCompatActivity;
28+
import androidx.recyclerview.widget.LinearLayoutManager;
29+
import androidx.recyclerview.widget.RecyclerView;
3030
import butterknife.BindView;
3131
import butterknife.ButterKnife;
3232
import butterknife.OnClick;

0 commit comments

Comments
 (0)