From 8ff3a293b1966af26ccf657094ea97795a8c86bb Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Sat, 13 May 2017 11:15:22 -0700 Subject: [PATCH 1/7] Fix broken picker layout on small screens --- .travis.yml | 4 ++ auth/build.gradle | 1 + .../auth/ui/idp/AuthMethodPickerActivity.java | 2 +- .../layout-land/auth_method_picker_layout.xml | 43 ++++++++++--------- .../res/layout/auth_method_picker_layout.xml | 36 +++++++++++----- .../include_auth_method_picker_logo.xml | 14 ------ auth/src/main/res/values-sw360dp/dimens.xml | 2 +- auth/src/main/res/values/dimens.xml | 2 +- auth/src/main/res/values/styles.xml | 14 +++--- 9 files changed, 62 insertions(+), 56 deletions(-) delete mode 100644 auth/src/main/res/layout/include_auth_method_picker_logo.xml diff --git a/.travis.yml b/.travis.yml index c8bc246f1..94394fc37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,10 @@ android: - platform-tools - extra-android-m2repository - extra-google-m2repository +before_install: + - mkdir "$ANDROID_HOME/licenses" || true + - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" + - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" before_script: mv library/google-services.json app/google-services.json script: ./gradlew clean assembleDebug check after_failure: diff --git a/auth/build.gradle b/auth/build.gradle index 2916ea4bf..72f1c3fcb 100644 --- a/auth/build.gradle +++ b/auth/build.gradle @@ -40,6 +40,7 @@ android { dependencies { compile "com.android.support:design:$supportLibraryVersion" compile "com.android.support:customtabs:$supportLibraryVersion" + compile 'com.android.support.constraint:constraint-layout:1.0.2' compile "com.google.firebase:firebase-auth:$firebaseVersion" compile "com.google.android.gms:play-services-auth:$firebaseVersion" diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java index 6c458f119..79da7643c 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java @@ -76,7 +76,7 @@ protected void onCreate(Bundle savedInstanceState) { int logoId = mActivityHelper.getFlowParams().logoId; if (logoId == AuthUI.NO_LOGO) { - findViewById(R.id.logo_layout).setVisibility(View.GONE); + findViewById(R.id.logo).setVisibility(View.GONE); } else { ImageView logo = (ImageView) findViewById(R.id.logo); logo.setImageResource(logoId); diff --git a/auth/src/main/res/layout-land/auth_method_picker_layout.xml b/auth/src/main/res/layout-land/auth_method_picker_layout.xml index ea383952a..ca4c52cff 100644 --- a/auth/src/main/res/layout-land/auth_method_picker_layout.xml +++ b/auth/src/main/res/layout-land/auth_method_picker_layout.xml @@ -1,33 +1,34 @@ - + android:clipToPadding="false"> - - - + + + style="@style/FirebaseUI.AuthMethodPicker.ButtonHolder" /> - + - + diff --git a/auth/src/main/res/layout/auth_method_picker_layout.xml b/auth/src/main/res/layout/auth_method_picker_layout.xml index dafd30da8..491b93d14 100644 --- a/auth/src/main/res/layout/auth_method_picker_layout.xml +++ b/auth/src/main/res/layout/auth_method_picker_layout.xml @@ -1,18 +1,34 @@ - + android:clipToPadding="false"> - + - + - + + + + + diff --git a/auth/src/main/res/layout/include_auth_method_picker_logo.xml b/auth/src/main/res/layout/include_auth_method_picker_logo.xml deleted file mode 100644 index cb1cfb7aa..000000000 --- a/auth/src/main/res/layout/include_auth_method_picker_logo.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/auth/src/main/res/values-sw360dp/dimens.xml b/auth/src/main/res/values-sw360dp/dimens.xml index e2e969d81..a074764a0 100644 --- a/auth/src/main/res/values-sw360dp/dimens.xml +++ b/auth/src/main/res/values-sw360dp/dimens.xml @@ -1,7 +1,7 @@ 228dp - 24dp + 12dp 20dp 16dp diff --git a/auth/src/main/res/values/dimens.xml b/auth/src/main/res/values/dimens.xml index 05a774529..fdeb0441b 100644 --- a/auth/src/main/res/values/dimens.xml +++ b/auth/src/main/res/values/dimens.xml @@ -1,7 +1,7 @@ 208dp - 8dp + 4dp 12dp 12dp diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml index 09e1ebe96..07bfcdb92 100644 --- a/auth/src/main/res/values/styles.xml +++ b/auth/src/main/res/values/styles.xml @@ -141,32 +141,30 @@ - -