Merge branch 'develop' into issue/7540-followed-blog-notifications

woocommerce · Apr 16, 2018 · 983c957 · 983c957
2 parents 8f4f5c2 + 5232ef7
commit 983c957
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ android:
     - extra-android-support
     - platform-tools
     - tools
-    - build-tools-26.0.2
-    - android-26
+    - build-tools-27.0.3
+    - android-27
 
 env:
   global:

diff --git a/WordPressLoginFlow/build.gradle b/WordPressLoginFlow/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
     }
 }
 
@@ -22,7 +22,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 2
         versionName "1.1"
 
@@ -31,14 +31,14 @@ android {
 }
 
 dependencies {
-    implementation ('org.wordpress:utils:1.20.0') {
+    implementation ('org.wordpress:utils:1.20.2') {
         exclude group: "com.mcxiaoke.volley"
     }
 
     implementation 'com.android.support:appcompat-v7:27.1.0'
     implementation 'com.android.support:design:27.1.0'
 
-    implementation 'com.google.android.gms:play-services-auth:10.0.1'
+    implementation 'com.google.android.gms:play-services-auth:12.0.1'
 
     // Share FluxC version from host project if defined, otherwise fallback to default
     if (project.hasProperty("fluxCVersion")) {
@@ -47,8 +47,8 @@ dependencies {
         implementation 'com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:918a9975bd5ac329006d39042b1312cc112781f6'
     }
 
-    implementation 'com.github.bumptech.glide:glide:4.1.1'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.1.1'
+    implementation 'com.github.bumptech.glide:glide:4.6.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1'
 
     // Dagger
     implementation 'com.google.dagger:dagger:2.11'

diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java
@@ -113,7 +113,9 @@ public String getStepName() {
 
     private static class LoginNotification {
         static Notification progress(Context context, int progress) {
-            return AutoForegroundNotification.progress(context, progress,
+            return AutoForegroundNotification.progress(context,
+                    context.getString(R.string.notification_channel_normal_id),
+                    progress,
                     R.string.notification_login_title_in_progress,
                     R.string.notification_logging_in,
                     R.drawable.ic_my_sites_24dp,
@@ -122,6 +124,7 @@ static Notification progress(Context context, int progress) {
 
         static Notification success(Context context) {
             return AutoForegroundNotification.success(context,
+                    context.getString(R.string.notification_channel_normal_id),
                     R.string.notification_login_title_success,
                     R.string.notification_logged_in,
                     R.drawable.ic_my_sites_24dp,
@@ -130,6 +133,7 @@ static Notification success(Context context) {
 
         static Notification failure(Context context, @StringRes int content) {
             return AutoForegroundNotification.failure(context,
+                    context.getString(R.string.notification_channel_normal_id),
                     R.string.notification_login_title_stopped,
                     content,
                     R.drawable.ic_my_sites_24dp,

diff --git a/WordPressLoginFlow/src/main/res/layout/login_input_row.xml b/WordPressLoginFlow/src/main/res/layout/login_input_row.xml
@@ -8,17 +8,18 @@
     tools:ignore="UnusedAttribute">
 
     <ImageView
+        android:layout_centerVertical="true"
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/input_layout"
         android:layout_marginRight="@dimen/margin_extra_large"
         android:layout_marginEnd="@dimen/margin_extra_large"
         android:importantForAccessibility="no"
         android:tint="@color/grey_lighten_10"
         app:srcCompat="@drawable/ic_user_grey_24dp"/>
 
     <org.wordpress.android.util.widgets.WPTextInputLayout
+        android:layout_centerVertical="true"
         app:theme="@style/LoginTheme.EditText"
         android:id="@+id/input_layout"
         android:layout_width="match_parent"

diff --git a/WordPressLoginFlow/src/main/res/values/strings.xml b/WordPressLoginFlow/src/main/res/values/strings.xml
@@ -135,4 +135,11 @@
     This resource will be automatically overwritten in the host project with the real value from google-services.json. -->
     <string name="default_web_client_id">placeholder</string>
 
+    <!-- same as above, we need to have these same-named string resources to be used as channel IDs in a similar way in the
+    host application -->
+    <string name="notification_channel_normal_id">placeholder</string>
+    <string name="notification_channel_important_id">placeholder</string>
+
+    <!-- Image Descriptions for Accessibility -->
+    <string name="login_site_address_help_image">The site address can be found in the navigation bar of your web browser</string>
 </resources>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip