Skip to content

Commit 4b06d16

Browse files
samtsternsamtstern
authored
Version 6.2.0
Version 6.2.0
2 parents d78e72b + 86f01c6 commit 4b06d16

29 files changed

Lines changed: 83 additions & 931 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ libraries.
4848
```groovy
4949
dependencies {
5050
// FirebaseUI for Firebase Realtime Database
51-
implementation 'com.firebaseui:firebase-ui-database:6.1.0'
51+
implementation 'com.firebaseui:firebase-ui-database:6.2.0'
5252
5353
// FirebaseUI for Cloud Firestore
54-
implementation 'com.firebaseui:firebase-ui-firestore:6.1.0'
54+
implementation 'com.firebaseui:firebase-ui-firestore:6.2.0'
5555
5656
// FirebaseUI for Firebase Auth
57-
implementation 'com.firebaseui:firebase-ui-auth:6.1.0'
57+
implementation 'com.firebaseui:firebase-ui-auth:6.2.0'
5858
5959
// FirebaseUI for Cloud Storage
60-
implementation 'com.firebaseui:firebase-ui-storage:6.1.0'
60+
implementation 'com.firebaseui:firebase-ui-storage:6.2.0'
6161
}
6262
```
6363

‎app/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dependencies {
3737
implementation(Config.Libs.Androidx.multidex)
3838

3939
implementation(project(":auth"))
40-
implementation(project(":auth-github"))
4140
implementation(project(":firestore"))
4241
implementation(project(":database"))
4342
implementation(project(":storage"))
@@ -46,7 +45,6 @@ dependencies {
4645
// Needed to override Facebook
4746
implementation(Config.Libs.Androidx.cardView)
4847
implementation(Config.Libs.Androidx.customTabs)
49-
implementation(Config.Libs.Provider.twitter) { isTransitive = true }
5048

5149
implementation(Config.Libs.Misc.glide)
5250
annotationProcessor(Config.Libs.Misc.glideCompiler)

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public class AuthUiActivity extends AppCompatActivity {
7979
@BindView(R.id.apple_provider) CheckBox mUseAppleProvider;
8080
@BindView(R.id.microsoft_provider) CheckBox mUseMicrosoftProvider;
8181
@BindView(R.id.yahoo_provider) CheckBox mUseYahooProvider;
82+
@BindView(R.id.github_provider) CheckBox mUseGitHubProvider;
8283

8384
@BindView(R.id.default_layout) RadioButton mDefaultLayout;
8485
@BindView(R.id.custom_layout) RadioButton mCustomLayout;
@@ -149,12 +150,6 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
149150
});
150151
}
151152

152-
if (ConfigurationUtils.isTwitterMisconfigured(this)) {
153-
mUseTwitterProvider.setChecked(false);
154-
mUseTwitterProvider.setEnabled(false);
155-
mUseTwitterProvider.setText(R.string.twitter_label_missing_config);
156-
}
157-
158153
mUseEmailLinkProvider.setOnCheckedChangeListener(new OnCheckedChangeListener() {
159154
@Override
160155
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -188,13 +183,13 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
188183
mUseMicrosoftProvider.setChecked(false);
189184
mUseYahooProvider.setChecked(false);
190185
mUseAppleProvider.setChecked(false);
186+
mUseGitHubProvider.setChecked(false);
191187
}
192188
}
193189
});
194190

195191
if (ConfigurationUtils.isGoogleMisconfigured(this)
196-
|| ConfigurationUtils.isFacebookMisconfigured(this)
197-
|| ConfigurationUtils.isTwitterMisconfigured(this)) {
192+
|| ConfigurationUtils.isFacebookMisconfigured(this)) {
198193
showSnackbar(R.string.configuration_required);
199194
}
200195

@@ -394,10 +389,6 @@ private List<IdpConfig> getSelectedProviders() {
394389
.build());
395390
}
396391

397-
if (mUseTwitterProvider.isChecked()) {
398-
selectedProviders.add(new IdpConfig.TwitterBuilder().build());
399-
}
400-
401392
if (mUseEmailProvider.isChecked()) {
402393
selectedProviders.add(new IdpConfig.EmailBuilder()
403394
.setRequireName(mRequireName.isChecked())
@@ -427,6 +418,10 @@ private List<IdpConfig> getSelectedProviders() {
427418
selectedProviders.add(new IdpConfig.AnonymousBuilder().build());
428419
}
429420

421+
if (mUseTwitterProvider.isChecked()) {
422+
selectedProviders.add(new IdpConfig.TwitterBuilder().build());
423+
}
424+
430425
if (mUseMicrosoftProvider.isChecked()) {
431426
selectedProviders.add(new IdpConfig.MicrosoftBuilder().build());
432427
}
@@ -439,6 +434,10 @@ private List<IdpConfig> getSelectedProviders() {
439434
selectedProviders.add(new IdpConfig.AppleBuilder().build());
440435
}
441436

437+
if (mUseGitHubProvider.isChecked()) {
438+
selectedProviders.add(new IdpConfig.GitHubBuilder().build());
439+
}
440+
442441
return selectedProviders;
443442
}
444443

‎app/src/main/java/com/firebase/uidemo/util/ConfigurationUtils.java‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@ public static boolean isFacebookMisconfigured(@NonNull Context context) {
2828
context.getString(R.string.facebook_application_id));
2929
}
3030

31-
public static boolean isTwitterMisconfigured(@NonNull Context context) {
32-
List<String> twitterConfigs = Arrays.asList(
33-
context.getString(R.string.twitter_consumer_key),
34-
context.getString(R.string.twitter_consumer_secret)
35-
);
36-
37-
return twitterConfigs.contains(AuthUI.UNCONFIGURED_CONFIG_VALUE);
38-
}
39-
4031
@NonNull
4132
public static List<AuthUI.IdpConfig> getConfiguredProviders(@NonNull Context context) {
4233
List<AuthUI.IdpConfig> providers = new ArrayList<>();
@@ -49,10 +40,6 @@ public static List<AuthUI.IdpConfig> getConfiguredProviders(@NonNull Context con
4940
providers.add(new AuthUI.IdpConfig.FacebookBuilder().build());
5041
}
5142

52-
if (!isTwitterMisconfigured(context)) {
53-
providers.add(new AuthUI.IdpConfig.TwitterBuilder().build());
54-
}
55-
5643
ActionCodeSettings actionCodeSettings = ActionCodeSettings.newBuilder()
5744
.setAndroidPackageName("com.firebase.uidemo", true, null)
5845
.setHandleCodeInApp(true)
@@ -65,7 +52,7 @@ public static List<AuthUI.IdpConfig> getConfiguredProviders(@NonNull Context con
6552
.setActionCodeSettings(actionCodeSettings)
6653
.build());
6754

68-
55+
providers.add(new AuthUI.IdpConfig.TwitterBuilder().build());
6956
providers.add(new AuthUI.IdpConfig.PhoneBuilder().build());
7057
providers.add(new AuthUI.IdpConfig.MicrosoftBuilder().build());
7158
providers.add(new AuthUI.IdpConfig.YahooBuilder().build());

‎app/src/main/res/layout/auth_ui_layout.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@
123123
android:checked="true"
124124
android:text="@string/providers_yahoo" />
125125

126+
<CheckBox
127+
android:id="@+id/github_provider"
128+
android:layout_width="wrap_content"
129+
android:layout_height="wrap_content"
130+
android:checked="true"
131+
android:text="@string/providers_github" />
132+
126133
<TextView
127134
style="@style/Base.TextAppearance.AppCompat.Subhead"
128135
android:layout_width="wrap_content"

‎app/src/main/res/values/config.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<string name="facebook_application_id" translatable="false">CHANGE-ME</string>
77
<string name="facebook_login_protocol_scheme" translatable="false">fbYOUR_APP_ID</string>
88

9-
<string name="twitter_consumer_key" translatable="false">CHANGE-ME</string>
10-
<string name="twitter_consumer_secret" translatable="false">CHANGE-ME</string>
11-
129
<string name="github_client_id" translatable="false">CHANGE-ME</string>
1310
<string name="github_client_secret" translatable="false">CHANGE-ME</string>
1411
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<string name="providers_apple">Apple</string>
3434
<string name="providers_microsoft">Microsoft</string>
3535
<string name="providers_yahoo">Yahoo</string>
36+
<string name="providers_github">GitHub</string>
3637

3738
<string name="layout_header">Layout</string>
3839
<string name="layout_default">Default</string>
@@ -71,7 +72,6 @@
7172
<string name="configuration_required">Configuration required - see README.md</string>
7273
<string name="google_label_missing_config">Google configuration missing</string>
7374
<string name="facebook_label_missing_config">Facebook configuration missing</string>
74-
<string name="twitter_label_missing_config">Twitter configuration missing</string>
7575

7676
<string name="sign_in_cancelled">Sign in cancelled</string>
7777
<string name="no_internet_connection">No internet connection</string>

‎auth-github/build.gradle.kts‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎auth-github/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎auth-github/src/main/java/com/firebase/ui/auth/data/model/GitHubProfile.java‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)