Skip to content

Version 1.1.0 qa #515

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 3 commits into from
Jan 12, 2017
Merged

Version 1.1.0 qa #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48a2fe4
Revert "fix : fix wrong colors in AuthUI EditText with NightMode (#504)"
samtstern Jan 12, 2017
baf6d33
Changes resulting from QA:
samtstern Jan 12, 2017
f89d06f
Fix lint issue.
samtstern Jan 12, 2017
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
2 changes: 1 addition & 1 deletion auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
testCompile 'junit:junit:4.12'
//noinspection NewerVersionAvailable, GradleDynamicVersion
testCompile 'org.mockito:mockito-core:2.5.+'
testCompile 'org.robolectric:robolectric:3.2.1'
testCompile 'org.robolectric:robolectric:3.2.2'
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
}
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import android.support.annotation.RestrictTo;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;

import com.firebase.ui.auth.AuthUI;
import com.firebase.ui.auth.AuthUI.IdpConfig;
Expand Down Expand Up @@ -111,7 +111,7 @@ private void populateIdpList(List<IdpConfig> providers) {
}
}

LinearLayout btnHolder = (LinearLayout) findViewById(R.id.btn_holder);
ViewGroup btnHolder = (ViewGroup) findViewById(R.id.btn_holder);
for (final IdpProvider provider : mIdpProviders) {
View loginButton = null;
switch (provider.getProviderId()) {
Expand Down
41 changes: 19 additions & 22 deletions auth/src/main/res/layout/auth_method_picker_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is awesome, thanks!

android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center|bottom"
android:orientation="vertical">
android:layout_height="match_parent">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:gravity="center">
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center|bottom"
android:orientation="vertical">

<ImageView
android:id="@+id/logo"
style="@style/FirebaseUI.AuthMethodPicker.Logo"
android:contentDescription="@string/accessibility_logo"/>
android:layout_marginBottom="64dp"
android:layout_marginTop="48dp"
android:contentDescription="@string/accessibility_logo" />

</LinearLayout>
<LinearLayout
android:id="@+id/btn_holder"
style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder">

<LinearLayout
android:id="@+id/btn_holder"
android:layout_weight="0"
style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder">
<Button
android:id="@+id/email_provider"
style="@style/FirebaseUI.Button.AccountChooser.EmailButton"
android:text="@string/sign_in_with_email" />

<Button
android:id="@+id/email_provider"
style="@style/FirebaseUI.Button.AccountChooser.EmailButton"
android:text="@string/sign_in_with_email"/>
</LinearLayout>

</LinearLayout>

</LinearLayout>
</ScrollView>
2 changes: 1 addition & 1 deletion auth/src/main/res/values-v21/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">8sp</item>
<item name="android:textColorHint">?android:textColor</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textColor">?android:textColor</item>
<item name="android:editTextColor">?android:textColor</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
Expand Down
14 changes: 7 additions & 7 deletions auth/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<resources>

<style name="FirebaseUI" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:textColor">@color/authui_inputTextColorDark</item>
<item name="android:textColorPrimary">@color/authui_inputTextColor</item>
<item name="colorPrimary">@color/authui_colorPrimary</item>
<item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
<item name="colorAccent">@color/authui_colorAccent</item>
<item name="colorButtonNormal">@color/authui_colorPrimary</item>
<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
<item name="colorControlNormal">@color/authui_colorPrimary</item>
<item name="colorControlActivated">@color/authui_colorAccent</item>
<item name="colorControlHighlight">@color/authui_colorAccent</item>
<item name="android:textColor">@color/authui_inputTextColorDark</item>
<item name="android:textColorPrimary">@color/authui_inputTextColor</item>
<item name="android:buttonStyle">@style/FirebaseUI.Button</item>
<item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
</style>

<style name="FirebaseUI.Transparent" parent="FirebaseUI">
Expand Down Expand Up @@ -102,11 +102,11 @@
<!-- Common styles -->
<style name="FirebaseUI.Text.TextInputLayout">
<item name="android:paddingTop">8dp</item>
<item name="android:textColorHint">?android:attr/textColorPrimary</item>
<item name="android:textColorHint">?android:attr/textColor</item>
</style>

<style name="FirebaseUI.Text.HintText" parent="FirebaseUI.Text.T12">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textColor">?android:attr/textColor</item>
</style>

<style name="FirebaseUI.Text.ErrorText" parent="FirebaseUI.Text.T12">
Expand All @@ -133,7 +133,7 @@
</style>

<style name="FirebaseUI.EditText">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textColor">?android:textColor</item>
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">8sp</item>
<item name="android:layout_width">match_parent</item>
Expand Down
7 changes: 6 additions & 1 deletion ...firebase/ui/database/utils/TestUtils.java → ...a/com/firebase/ui/database/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ public static void runAndWaitUntil(FirebaseArray array,
Callable<Boolean> done) throws InterruptedException {
final Semaphore semaphore = new Semaphore(0);
array.setOnChangedListener(new FirebaseArray.OnChangedListener() {
public void onChanged(EventType type, int index, int oldIndex) {

@Override
public void onChildChanged(EventType type, int index, int oldIndex) {
semaphore.release();
}

@Override
public void onDataChanged() {}

@Override
public void onCancelled(DatabaseError databaseError) {
throw new IllegalStateException(databaseError.toException());
Expand Down