Automattic · ParaskP7 · Mar 23, 2022 · Feb 28, 2022 · Feb 28, 2022 · Feb 28, 2022
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,7 +1,7 @@
 common-params:
   &publish-android-artifacts-docker-container
   docker#v3.8.0:
-    image: "public.ecr.aws/automattic/android-build-image:v1.1.0"
+    image: "public.ecr.aws/automattic/android-build-image:v1.2.0"
     propagate-environment: true
     environment:
       # DO NOT MANUALLY SET THESE VALUES!

diff --git a/app/build.gradle b/app/build.gradle
@@ -55,6 +55,7 @@ android {
     lintOptions {
         abortOnError false
         lintConfig file('lint.xml')
+        disable("IconLocation")
     }
 
     useLibrary 'android.test.runner'

diff --git a/app/src/main/res/drawable/background.jpg b/app/src/main/res/drawable/background.jpg
diff --git a/app/src/main/res/drawable/media_bar_button_image_multiple_disabled.xml b/app/src/main/res/drawable/media_bar_button_image_multiple_disabled.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="48dp"
         android:height="48dp"
         android:viewportHeight="48"
-        android:viewportWidth="48">
+        android:viewportWidth="48"
+        tools:ignore="UnusedResources">
 
     <!-- @color/grey_lighten_20 -->
     <path

diff --git a/app/src/main/res/drawable/media_bar_button_image_multiple_highlighted.xml b/app/src/main/res/drawable/media_bar_button_image_multiple_highlighted.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="48dp"
         android:height="48dp"
         android:viewportHeight="48"
-        android:viewportWidth="48">
+        android:viewportWidth="48"
+        tools:ignore="UnusedResources">
 
     <!-- @color/almost_black -->
     <path

diff --git a/app/src/main/res/drawable/media_bar_button_image_multiple_selector.xml b/app/src/main/res/drawable/media_bar_button_image_multiple_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
 
     <item android:drawable="@drawable/media_bar_button_image_multiple_disabled" android:state_enabled="false"/>
     <item android:drawable="@drawable/media_bar_button_image_multiple_highlighted" android:state_focused="true"/>

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -45,6 +45,7 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/fab_margin"
             android:tint="@color/colorPrimary"
-            app:srcCompat="@drawable/ic_add_white_24dp"/>
+            app:srcCompat="@drawable/ic_add_white_24dp"
+            tools:ignore="ContentDescription" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/intro_template_view.xml b/app/src/main/res/layout/intro_template_view.xml
@@ -10,11 +10,12 @@
         android:id="@+id/background_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/promo_background_image_margin_side"
-        android:layout_marginEnd="@dimen/promo_background_image_margin_side"
         android:layout_marginBottom="@dimen/promo_background_image_margin_bottom"
+        android:layout_marginEnd="@dimen/promo_background_image_margin_side"
+        android:layout_marginStart="@dimen/promo_background_image_margin_side"
+        android:contentDescription="@null"
         android:scaleType="centerCrop"
-        tools:src="@drawable/intro05"/>
+        tools:src="@drawable/intro05" />
 
     <LinearLayout
         android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/intro_title_template_view.xml b/app/src/main/res/layout/intro_title_template_view.xml
@@ -10,11 +10,12 @@
         android:id="@+id/background_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/promo_background_image_margin_side"
-        android:layout_marginEnd="@dimen/promo_background_image_margin_side"
         android:layout_marginBottom="@dimen/promo_background_image_margin_bottom"
+        android:layout_marginEnd="@dimen/promo_background_image_margin_side"
+        android:layout_marginStart="@dimen/promo_background_image_margin_side"
+        android:contentDescription="@null"
         android:scaleType="centerCrop"
-        tools:src="@drawable/intro01"/>
+        tools:src="@drawable/intro01" />
 
     <LinearLayout
         android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/photo_picker_fragment.xml b/app/src/main/res/layout/photo_picker_fragment.xml
@@ -13,11 +13,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
+        android:layout_margin="@dimen/fab_margin"
         android:backgroundTint="@color/pink_50"
-        android:tint="@color/white"
         android:src="@drawable/ic_photo_camera_24px"
-        android:layout_margin="@dimen/fab_margin"
-        tools:ignore="InconsistentLayout"/>
+        android:tint="@color/white"
+        tools:ignore="ContentDescription,InconsistentLayout" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
     <color name="colorPrimary">@color/colorPrimary_wp</color>
     <color name="colorPrimaryDark">@color/colorPrimaryDark_wp</color>
     <color name="colorAccent">@color/colorAccent_wp</color>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="button_height">64dp</dimen>
 

diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
@@ -11,7 +11,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
     -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="Typos">
 <array name="com_google_android_gms_fonts_certs">
     <item>@array/com_google_android_gms_fonts_certs_dev</item>
     <item>@array/com_google_android_gms_fonts_certs_prod</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">loop</string>
 
     <string name="main_placeholder">Still working on this! Tap the + to continue.</string>
@@ -32,12 +32,12 @@
     <string name="photo_picker_soft_ask_allow">Allow</string>
     <string name="photo_picker_soft_ask_label">%s needs permissions to access your photos</string>
     <string name="photo_picker_device_desc">pick from device</string>
-    <string name="photo_picker_camera_desc">open camera</string>
-    <string name="photo_picker_wpmedia_desc">pick from WordPress media</string>
+    <string name="photo_picker_camera_desc" tools:ignore="UnusedResources">open camera</string>
+    <string name="photo_picker_wpmedia_desc" tools:ignore="UnusedResources">pick from WordPress media</string>
     <string name="content_description_person_reading_device_notification">Person reading device with notifications</string>
 
     <string name="dialog_general_announcement_title">General announcement</string>
-    <string name="dialog_general_announcement_message">This is an announcement you can make from the host app</string>
+    <string name="dialog_general_announcement_message" tools:ignore="UnusedResources">This is an announcement you can make from the host app</string>
 
     <!-- Photo picker - Loop   -->
     <string name="photo_picker_add_photos_to_story">Choose the photos and videos you\'d like to add to your story</string>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -25,7 +25,7 @@
         <item name="colorAccent">?attr/colorPrimary</item>
     </style>
 
-    <style name="EditText">
+    <style name="EditText" tools:ignore="UnusedResources">
         <item name="android:singleLine">true</item>
         <item name="colorControlNormal">#FFFFFF</item>
         <item name="colorControlActivated">#FFFFFF</item>

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists