Skip to content

Commit e074fac

Browse files
samtsternsamtstern
authored
Merge pull request #447 from samtstern/email-refactor
Refactor email flow into fragments
2 parents 202c56e + 2c7ffbc commit e074fac

32 files changed

+882
-558
lines changed

‎.travis.yml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cache:
1212
android:
1313
components:
1414
- tools
15-
- build-tools-25.0.1
15+
- build-tools-25.0.2
1616
- android-25
1717
- platform-tools
1818
- extra-android-m2repository
@@ -32,24 +32,3 @@ after_failure:
3232
- cat app/build/reports/lint-results.html
3333
- cat app/build/reports/findbugs.html
3434
- cat app/build/reports/pmd.html
35-
36-
# auth
37-
- cat auth/build/reports/checkstyle.html
38-
- cat auth/build/reports/lint-results.xml
39-
- cat auth/build/reports/lint-results.html
40-
- cat auth/build/reports/findbugs.html
41-
- cat auth/build/reports/pmd.html
42-
43-
# database
44-
- cat database/build/reports/checkstyle.html
45-
- cat database/build/reports/lint-results.xml
46-
- cat database/build/reports/lint-results.html
47-
- cat database/build/reports/findbugs.html
48-
- cat database/build/reports/pmd.html
49-
50-
# storage
51-
- cat storage/build/reports/checkstyle.html
52-
- cat storage/build/reports/lint-results.xml
53-
- cat storage/build/reports/lint-results.html
54-
- cat storage/build/reports/findbugs.html
55-
- cat storage/build/reports/pmd.html

‎app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:tools="http://schemas.android.com/tools"
45
package="com.firebase.uidemo">
56

67
<uses-permission android:name="android.permission.INTERNET"/>
@@ -13,7 +14,8 @@
1314
android:icon="@mipmap/ic_launcher"
1415
android:label="@string/app_name"
1516
android:theme="@style/AppTheme"
16-
android:supportsRtl="true">
17+
android:supportsRtl="false"
18+
tools:ignore="GoogleAppIndexingWarning">
1719
<activity android:name=".ChooserActivity">
1820
<intent-filter>
1921
<action android:name="android.intent.action.MAIN"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import com.google.firebase.database.FirebaseDatabase;
4747
import com.google.firebase.database.Query;
4848

49+
@SuppressWarnings("LogConditional")
4950
public class ChatActivity extends AppCompatActivity implements FirebaseAuth.AuthStateListener {
5051
private static final String TAG = "RecyclerViewDemo";
5152

‎app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import pub.devrel.easypermissions.AfterPermissionGranted;
3535
import pub.devrel.easypermissions.EasyPermissions;
3636

37+
@SuppressWarnings("LogConditional")
3738
public class ImageActivity extends AppCompatActivity {
3839

3940
private static final String TAG = "ImageDemo";

‎app/src/main/res/values-v21/styles.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@
6363
<item name="android:colorForeground">@color/material_gray_850</item>
6464
<item name="android:navigationBarColor">@android:color/black</item>
6565
<item name="android:statusBarColor">@android:color/black</item>
66-
<item name="android:textColor">@color/abc_primary_text_material_dark</item>
67-
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
68-
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
69-
<item name="android:textColorSecondary">@color/abc_secondary_text_material_dark</item>
70-
<item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
66+
<item name="android:textColor">@color/text_default_material_dark_primary</item>
67+
<item name="android:textColorPrimary">@color/text_default_material_dark_primary</item>
68+
<item name="android:textColorPrimaryInverse">@color/text_default_material_light_primary</item>
69+
<item name="android:textColorSecondary">@color/text_default_material_dark_secondary</item>
70+
<item name="android:textColorSecondaryInverse">@color/text_default_material_light_secondary</item>
7171
<item name="android:windowBackground">@color/material_gray_850</item>
7272
</style>
7373

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
<color name="colorPrimaryDark">#0288D1</color>
44
<color name="colorAccent">#FFA000</color>
55

6+
<!-- Text -->
7+
<color name="text_default_material_dark_primary">#ffffffff</color>
8+
<color name="text_default_material_light_primary">#de000000</color>
9+
<color name="text_default_material_dark_secondary">#b3ffffff</color>
10+
<color name="text_default_material_light_secondary">#8a000000</color>
11+
612
<color name="material_deep_purple_50">#EDE7F6</color>
713
<color name="material_deep_purple_500">#673AB7</color>
814
<color name="material_deep_purple_700">#512DA8</color>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
<item name="colorAccent">@android:color/black</item>
3939
<item name="android:colorBackground">@color/material_gray_850</item>
4040
<item name="android:colorForeground">@android:color/white</item>
41-
<item name="android:textColor">@color/abc_primary_text_material_dark</item>
42-
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
43-
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
44-
<item name="android:textColorSecondary">@color/abc_secondary_text_material_dark</item>
45-
<item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
41+
<item name="android:textColor">@color/text_default_material_dark_primary</item>
42+
<item name="android:textColorPrimary">@color/text_default_material_dark_primary</item>
43+
<item name="android:textColorPrimaryInverse">@color/text_default_material_light_primary</item>
44+
<item name="android:textColorSecondary">@color/text_default_material_dark_secondary</item>
45+
<item name="android:textColorSecondaryInverse">@color/text_default_material_light_secondary</item>
4646
<item name="android:windowBackground">@color/material_gray_850</item>
4747
</style>
4848

‎auth/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ dependencies {
5353
and add the Fabric repository
5454

5555
```groovy
56-
repositories {
57-
// ...
58-
maven { url 'https://maven.fabric.io/public' }
56+
allprojects {
57+
repositories {
58+
// ...
59+
maven { url 'https://maven.fabric.io/public' }
60+
}
5961
}
6062
```
6163

‎auth/build.gradle

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

5353
testCompile 'junit:junit:4.12'
54-
testCompile 'org.mockito:mockito-core:2.2.28'
54+
//noinspection GradleDynamicVersion
55+
testCompile 'org.mockito:mockito-core:2.3.+'
5556
testCompile 'org.robolectric:robolectric:3.1.4'
5657
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
5758
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'

‎auth/src/main/AndroidManifest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
66
<uses-permission android:name="android.permission.INTERNET"/>
77

8-
<application>
8+
<application
9+
android:supportsRtl="false">
910

1011
<meta-data
1112
android:name="com.google.android.gms.version"
@@ -33,7 +34,7 @@
3334

3435
<activity
3536
android:name=".ui.email.RegisterEmailActivity"
36-
android:label="@string/title_register_email_activity"
37+
android:label="@string/title_check_email"
3738
android:exported="false"
3839
android:theme="@style/FirebaseUI"/>
3940

‎auth/src/main/java/com/firebase/ui/auth/ui/AppCompatBase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
@SuppressWarnings("Registered")
2222
public class AppCompatBase extends AppCompatActivity {
23+
2324
protected ActivityHelper mActivityHelper;
2425

2526
@Override

‎auth/src/main/java/com/firebase/ui/auth/ui/ExtraConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
public class ExtraConstants {
2121
public static final String EXTRA_EMAIL = "extra_email";
22+
public static final String EXTRA_USER = "extra_user";
2223
public static final String EXTRA_ERROR_MESSAGE = "extra_error_msg";
2324
public static final String EXTRA_FLOW_PARAMS = "extra_flow_params";
2425
public static final String EXTRA_IDP_RESPONSE = "extra_idp_response";

0 commit comments

Comments
 (0)