Skip to content

Commit e9abcec

Browse files
author
devrel-build
committed
Merge commit '1572468fc7df578618b38cb7a5030d6c1ab48744' into HEAD
2 parents 4b4256e + 1572468 commit e9abcec

File tree

17 files changed

+263
-17
lines changed

17 files changed

+263
-17
lines changed

‎auth/app/build.gradle

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@ android {
2222

2323
productFlavors {
2424

25-
// Build variant to include the Facebook Android SDk
26-
// The Facebook Android SDK has a min SDK version of 15
27-
facebook {
28-
minSdkVersion 15
25+
// Build variant with minSdk 16 to include Facebook and FirebaseUI libraries.
26+
minSdkJellybean {
27+
minSdkVersion 16
2928
}
3029

31-
// Build variant to exclude the Facebook Android SDK
32-
// Firebase Authentication has a min SDK version of 9
33-
nofacebook {
30+
// Build variant with minSdk 9, excludes Facebook and FirebaseUI libraries.
31+
minSdkGingerbread {
3432
minSdkVersion 9
3533
}
3634

@@ -50,10 +48,15 @@ dependencies {
5048
// Google Sign In SDK (only required for Google Sign In)
5149
compile 'com.google.android.gms:play-services-auth:9.6.1'
5250

51+
// Firebase UI
52+
// Used in FirebaseUIActivity. The FirebaseUI-Android library has a minSdk level of 16
53+
// so this library is only included in the minSdkJellybean variant.
54+
minSdkJellybeanCompile 'com.firebaseui:firebase-ui-auth:0.6.0'
55+
5356
// Facebook Android SDK (only required for Facebook Login)
54-
// This is only compiled into the 'facebook' variant of this app. You can build
55-
// a 'nofacebook' variant to test on devices with SDK < 15.
56-
facebookCompile 'com.facebook.android:facebook-android-sdk:4.9.0'
57+
// Used in FacebookLoginActivity. This is only compiled into the minSdkJellybean variant of this
58+
// app. You can build a 'minSdkGingerbread' variant to test on devices with 9 <= SDK <= 15.
59+
minSdkJellybeanCompile 'com.facebook.android:facebook-android-sdk:4.9.0'
5760

5861
// Twitter Android SDK (only required for Twitter Login)
5962
compile('com.twitter.sdk.android:twitter-core:1.6.6@aar') {

‎auth/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<category android:name="android.intent.category.LAUNCHER" />
1818
</intent-filter>
1919
</activity>
20-
2120
<activity
2221
android:name=".CustomAuthActivity"
2322
android:label="@string/label_custom_auth" />
@@ -34,11 +33,12 @@
3433
<activity
3534
android:name=".AnonymousAuthActivity"
3635
android:label="@string/label_anonymous_auth" />
37-
3836
<activity
3937
android:name=".TwitterLoginActivity"
4038
android:label="@string/label_twitter_login" />
41-
39+
<activity
40+
android:name=".FirebaseUIActivity"
41+
android:label="@string/label_firebase_ui"/>
4242
</application>
4343

44-
</manifest>
44+
</manifest>

‎auth/app/src/main/java/com/google/firebase/quickstart/auth/ChooserActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public class ChooserActivity extends AppCompatActivity implements AdapterView.On
4747
TwitterLoginActivity.class,
4848
EmailPasswordActivity.class,
4949
AnonymousAuthActivity.class,
50+
FirebaseUIActivity.class,
5051
CustomAuthActivity.class
5152
};
5253

@@ -56,6 +57,7 @@ public class ChooserActivity extends AppCompatActivity implements AdapterView.On
5657
R.string.desc_twitter_login,
5758
R.string.desc_emailpassword,
5859
R.string.desc_anonymous_auth,
60+
R.string.desc_firebase_ui,
5961
R.string.desc_custom_auth,
6062
};
6163

‎auth/app/src/main/res/layout/activity_firebase_ui.xml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:id="@+id/main_layout"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:background="@color/grey_100"
7+
android:orientation="vertical"
8+
android:weightSum="4">
9+
10+
<LinearLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="0dp"
13+
android:layout_weight="3"
14+
android:gravity="center_horizontal"
15+
android:orientation="vertical">
16+
17+
<ImageView
18+
android:id="@+id/icon"
19+
style="@style/ThemeOverlay.FirebaseIcon"
20+
android:layout_width="wrap_content"
21+
android:layout_height="wrap_content"
22+
android:contentDescription="@string/desc_firebase_lockup"
23+
android:src="@drawable/firebase_lockup_400" />
24+
25+
<TextView
26+
android:id="@+id/title_text"
27+
android:layout_width="wrap_content"
28+
android:layout_height="wrap_content"
29+
android:layout_marginBottom="@dimen/title_bottom_margin"
30+
android:text="@string/firebaseui_title_text"
31+
android:theme="@style/ThemeOverlay.MyTitleText" />
32+
33+
<TextView
34+
android:id="@+id/status"
35+
style="@style/ThemeOverlay.MyTextDetail"
36+
android:text="@string/signed_out" />
37+
38+
<TextView
39+
android:id="@+id/detail"
40+
style="@style/ThemeOverlay.MyTextDetail"
41+
tools:text="Firebase User ID: 123456789abc" />
42+
43+
</LinearLayout>
44+
45+
46+
<RelativeLayout
47+
android:layout_width="fill_parent"
48+
android:layout_height="0dp"
49+
android:layout_weight="1"
50+
android:background="@color/grey_300"
51+
android:gravity="center_vertical">
52+
53+
<Button
54+
android:id="@+id/sign_in_button"
55+
android:layout_width="wrap_content"
56+
android:layout_height="wrap_content"
57+
android:layout_centerInParent="true"
58+
android:text="@string/sign_in"
59+
android:theme="@style/ThemeOverlay.MyDarkButton"
60+
android:visibility="visible" />
61+
62+
<Button
63+
android:id="@+id/sign_out_button"
64+
android:layout_width="wrap_content"
65+
android:layout_height="wrap_content"
66+
android:layout_centerInParent="true"
67+
android:text="@string/sign_out"
68+
android:theme="@style/ThemeOverlay.MyDarkButton"
69+
android:visibility="gone" />
70+
71+
</RelativeLayout>
72+
73+
</LinearLayout>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@
1414
<string name="desc_emailpassword">Use an email and password to authenticate with Firebase.</string>
1515

1616
<string name="label_anonymous_auth">Anonymous Authentication</string>
17-
<string name="desc_anonymous_auth">Sign in anonymously and then later upgrade to a full Firebase Auth user..</string>
17+
<string name="desc_anonymous_auth">Sign in anonymously and then later upgrade to a full Firebase Auth user.</string>
1818

1919
<string name="label_custom_auth">Custom Authentication</string>
2020
<string name="desc_custom_auth">Use a custom token signed by your own server to authenticate with Firebase.</string>
2121

22+
<string name="label_firebase_ui">FirebaseUI Auth</string>
23+
<string name="desc_firebase_ui">Use the FirebaseUI-Android library to authenticate with Firebase.</string>
24+
2225
<string name="hint_user_id">User ID</string>
2326
<string name="get_custom_token">Get Token</string>
2427
<string name="sign_in">Sign In</string>
@@ -49,6 +52,9 @@
4952
<string name="twitter_status_fmt">Twitter User: %s</string>
5053
<string name="twitter_title_text">Twitter Login</string>
5154

55+
<string name="firebaseui_status_fmt">Firebase User: %s</string>
56+
<string name="firebaseui_title_text">FirebaseUI Auth</string>
57+
5258
<string name="id_fmt">User ID: %s</string>
5359
<string name="email_fmt">Email: %s</string>
5460
</resources>

‎auth/app/src/minSdkGingerbread/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
3+
<application>
4+
<activity android:name="com.google.firebase.quickstart.auth.FirebaseUIActivity"></activity>
5+
</application>
6+
</manifest>

‎auth/app/src/nofacebook/java/com/google/firebase/quickstart/auth/FacebookLoginActivity.java renamed to ‎auth/app/src/minSdkGingerbread/java/com/google/firebase/quickstart/auth/FacebookLoginActivity.java

File renamed without changes.

‎auth/app/src/minSdkGingerbread/java/com/google/firebase/quickstart/auth/FirebaseUIActivity.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.google.firebase.quickstart.auth;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class FirebaseUIActivity extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_firebase_ui);
12+
}
13+
}

‎auth/app/src/nofacebook/res/layout/activity_facebook.xml renamed to ‎auth/app/src/minSdkGingerbread/res/layout/activity_facebook.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<TextView
1212
android:layout_width="wrap_content"
1313
android:layout_height="wrap_content"
14-
android:text="This variant excludes Facebook. Build the 'facebookDebug' or 'facebookRelease' variants in order to try Firebase Authentication with Facebook" />
14+
android:text="This variant excludes Facebook. Build the 'minSdkJellybeanDebug' or 'minSdkJellybeanRelease' variants in order to try Firebase Authentication with Facebook." />
1515

1616
</LinearLayout>

‎auth/app/src/minSdkGingerbread/res/layout/activity_firebase_ui.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/activity_firebase_ui"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:paddingBottom="@dimen/activity_vertical_margin"
8+
android:paddingLeft="@dimen/activity_horizontal_margin"
9+
android:paddingRight="@dimen/activity_horizontal_margin"
10+
android:paddingTop="@dimen/activity_vertical_margin"
11+
tools:context="com.google.firebase.quickstart.auth.FirebaseUIActivity">
12+
13+
<TextView
14+
android:layout_width="wrap_content"
15+
android:layout_height="wrap_content"
16+
android:text="This variant excludes FirebaseUI. Build the 'minSdkJellybeanDebug' or 'minSdkJellybeanRelease' variants in order to try Firebase Authentication with FirebaseUI" />
17+
18+
</RelativeLayout>

0 commit comments

Comments
 (0)