Skip to content

Refactor email flow into fragments #447

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 10 commits into from
Dec 22, 2016
Merged

Refactor email flow into fragments #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
18baedf
Refactor email flow into fragments
samtstern Dec 7, 2016
0783098
Add some better transitions/animations
samtstern Dec 8, 2016
1184b91
Review comments and lint checks
samtstern Dec 8, 2016
bc428ed
Fix RTL lint errors
samtstern Dec 8, 2016
57ee6c2
Fix travis
SUPERCILEX Dec 8, 2016
3276b1f
Move back to sudo in travis
samtstern Dec 8, 2016
18d06ae
Update dependencies (#3)
SUPERCILEX Dec 14, 2016
5b2fc22
Merge branch 'version-1.1.0-dev' into email-refactor
samtstern Dec 20, 2016
f6fb313
Fix a ton of bugs (#4)
SUPERCILEX Dec 20, 2016
2c7ffbc
Update ExtraConstants.java (#5)
SUPERCILEX Dec 21, 2016
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
23 changes: 1 addition & 22 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cache:
android:
components:
- tools
- build-tools-25.0.1
- build-tools-25.0.2
- android-25
- platform-tools
- extra-android-m2repository
Expand All @@ -32,24 +32,3 @@ after_failure:
- cat app/build/reports/lint-results.html
- cat app/build/reports/findbugs.html
- cat app/build/reports/pmd.html

# auth
- cat auth/build/reports/checkstyle.html
- cat auth/build/reports/lint-results.xml
- cat auth/build/reports/lint-results.html
- cat auth/build/reports/findbugs.html
- cat auth/build/reports/pmd.html

# database
- cat database/build/reports/checkstyle.html
- cat database/build/reports/lint-results.xml
- cat database/build/reports/lint-results.html
- cat database/build/reports/findbugs.html
- cat database/build/reports/pmd.html

# storage
- cat storage/build/reports/checkstyle.html
- cat storage/build/reports/lint-results.xml
- cat storage/build/reports/lint-results.html
- cat storage/build/reports/findbugs.html
- cat storage/build/reports/pmd.html
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.firebase.uidemo">

<uses-permission android:name="android.permission.INTERNET"/>
Expand All @@ -13,7 +14,8 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:supportsRtl="true">
android:supportsRtl="false"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name=".ChooserActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/firebase/uidemo/database/ChatActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.Query;

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

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;

@SuppressWarnings("LogConditional")
public class ImageActivity extends AppCompatActivity {

private static final String TAG = "ImageDemo";
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/values-v21/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@
<item name="android:colorForeground">@color/material_gray_850</item>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:textColor">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
<item name="android:textColorSecondary">@color/abc_secondary_text_material_dark</item>
<item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColor">@color/text_default_material_dark_primary</item>
<item name="android:textColorPrimary">@color/text_default_material_dark_primary</item>
<item name="android:textColorPrimaryInverse">@color/text_default_material_light_primary</item>
<item name="android:textColorSecondary">@color/text_default_material_dark_secondary</item>
<item name="android:textColorSecondaryInverse">@color/text_default_material_light_secondary</item>
<item name="android:windowBackground">@color/material_gray_850</item>
</style>

Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
<color name="colorPrimaryDark">#0288D1</color>
<color name="colorAccent">#FFA000</color>

<!-- Text -->
<color name="text_default_material_dark_primary">#ffffffff</color>
<color name="text_default_material_light_primary">#de000000</color>
<color name="text_default_material_dark_secondary">#b3ffffff</color>
<color name="text_default_material_light_secondary">#8a000000</color>

<color name="material_deep_purple_50">#EDE7F6</color>
<color name="material_deep_purple_500">#673AB7</color>
<color name="material_deep_purple_700">#512DA8</color>
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
<item name="colorAccent">@android:color/black</item>
<item name="android:colorBackground">@color/material_gray_850</item>
<item name="android:colorForeground">@android:color/white</item>
<item name="android:textColor">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
<item name="android:textColorSecondary">@color/abc_secondary_text_material_dark</item>
<item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColor">@color/text_default_material_dark_primary</item>
<item name="android:textColorPrimary">@color/text_default_material_dark_primary</item>
<item name="android:textColorPrimaryInverse">@color/text_default_material_light_primary</item>
<item name="android:textColorSecondary">@color/text_default_material_dark_secondary</item>
<item name="android:textColorSecondaryInverse">@color/text_default_material_light_secondary</item>
<item name="android:windowBackground">@color/material_gray_850</item>
</style>

Expand Down
8 changes: 5 additions & 3 deletions auth/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ dependencies {
and add the Fabric repository

```groovy
repositories {
// ...
maven { url 'https://maven.fabric.io/public' }
allprojects {
repositories {
// ...
maven { url 'https://maven.fabric.io/public' }
}
}
```

Expand Down
3 changes: 2 additions & 1 deletion auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ dependencies {
compile "com.android.support:cardview-v7:$support_library_version"

testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.2.28'
//noinspection GradleDynamicVersion
testCompile 'org.mockito:mockito-core:2.3.+'
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
5 changes: 3 additions & 2 deletions auth/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>

<application>
<application
android:supportsRtl="false">

<meta-data
android:name="com.google.android.gms.version"
Expand Down Expand Up @@ -33,7 +34,7 @@

<activity
android:name=".ui.email.RegisterEmailActivity"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we replace this title with something?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's supplied by the fragments, but I'll add a default

android:label="@string/title_register_email_activity"
android:label="@string/title_check_email"
android:exported="false"
android:theme="@style/FirebaseUI"/>

Expand Down
1 change: 1 addition & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/AppCompatBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

@SuppressWarnings("Registered")
public class AppCompatBase extends AppCompatActivity {

protected ActivityHelper mActivityHelper;

@Override
Expand Down
1 change: 1 addition & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/ExtraConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/
public class ExtraConstants {
public static final String EXTRA_EMAIL = "extra_email";
public static final String EXTRA_USER = "extra_user";
public static final String EXTRA_ERROR_MESSAGE = "extra_error_msg";
public static final String EXTRA_FLOW_PARAMS = "extra_flow_params";
public static final String EXTRA_IDP_RESPONSE = "extra_idp_response";
Expand Down
Loading