From bc0bc6c7115fc96e2eabfa39c9f10f14adf3b200 Mon Sep 17 00:00:00 2001
From: Niek Haarman <haarman.niek@gmail.com>
Date: Tue, 11 May 2021 16:41:11 +0200
Subject: [PATCH] com.android.tools.build:gradle:4.1.3

---
 .idea/misc.xml                                        | 11 +++++++++++
 build.gradle                                          |  2 +-
 dependencies.gradle                                   |  2 +-
 .../src/main/res/layout/favorites_scene.xml           |  2 +-
 .../src/main/res/layout/music_scene.xml               |  2 +-
 .../src/main/res/layout/news_scene.xml                |  2 +-
 .../src/main/res/layout/places_scene.xml              |  2 +-
 .../android/src/main/res/layout/itemlist_scene.xml    |  5 +++--
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d6289f44..72ac66a7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="samples/hello-bottombar/src/main/res/drawable/ic_favorite_white_196dp.xml" value="0.3536458333333333" />
+        <entry key="samples/hello-bottombar/src/main/res/drawable/ic_music_white_196dp.xml" value="0.3536458333333333" />
+        <entry key="samples/hello-bottombar/src/main/res/drawable/ic_news_white_196dp.xml" value="0.3536458333333333" />
+        <entry key="samples/hello-bottombar/src/main/res/drawable/ic_place_white_196p.xml" value="0.3536458333333333" />
+        <entry key="samples/notes-app/android/src/main/res/drawable/ic_check_white_24dp.xml" value="0.3536458333333333" />
+      </map>
+    </option>
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
diff --git a/build.gradle b/build.gradle
index 5945055d..658aa3c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.1")
+        classpath("com.android.tools.build:gradle:4.1.3")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         classpath("de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1")
         classpath("com.adarshr:gradle-test-logger-plugin:3.0.0")
diff --git a/dependencies.gradle b/dependencies.gradle
index 2812d954..097721db 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -50,7 +50,7 @@ dependencyManagement {
         dependency "androidx.test:rules:1.3.0"
         dependency "androidx.test.uiautomator:uiautomator:2.2.0"
 
-        def androidToolsVersion = "26.5.1"
+        def androidToolsVersion = "27.1.3"
         dependency "com.android.tools.lint:lint:$androidToolsVersion"
         dependency "com.android.tools.lint:lint-api:$androidToolsVersion"
         dependency "com.android.tools.lint:lint-checks:$androidToolsVersion"
diff --git a/samples/hello-bottombar/src/main/res/layout/favorites_scene.xml b/samples/hello-bottombar/src/main/res/layout/favorites_scene.xml
index 84deddeb..f5afde44 100644
--- a/samples/hello-bottombar/src/main/res/layout/favorites_scene.xml
+++ b/samples/hello-bottombar/src/main/res/layout/favorites_scene.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_favorite_white_196dp"
         android:textSize="46sp"
-        android:tint="?android:colorPrimary"
+        app:tint="?android:colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/samples/hello-bottombar/src/main/res/layout/music_scene.xml b/samples/hello-bottombar/src/main/res/layout/music_scene.xml
index ebf31d4d..126a9ef1 100644
--- a/samples/hello-bottombar/src/main/res/layout/music_scene.xml
+++ b/samples/hello-bottombar/src/main/res/layout/music_scene.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_music_white_196dp"
         android:textSize="46sp"
-        android:tint="?android:colorPrimary"
+        app:tint="?android:colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/samples/hello-bottombar/src/main/res/layout/news_scene.xml b/samples/hello-bottombar/src/main/res/layout/news_scene.xml
index b39ec9bc..2b135ba6 100644
--- a/samples/hello-bottombar/src/main/res/layout/news_scene.xml
+++ b/samples/hello-bottombar/src/main/res/layout/news_scene.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_news_white_196dp"
         android:textSize="46sp"
-        android:tint="?android:colorPrimary"
+        app:tint="?android:colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/samples/hello-bottombar/src/main/res/layout/places_scene.xml b/samples/hello-bottombar/src/main/res/layout/places_scene.xml
index 5921bb79..3d0be0c9 100644
--- a/samples/hello-bottombar/src/main/res/layout/places_scene.xml
+++ b/samples/hello-bottombar/src/main/res/layout/places_scene.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_place_white_196p"
         android:textSize="46sp"
-        android:tint="?android:colorPrimary"
+        app:tint="?android:colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/samples/notes-app/android/src/main/res/layout/itemlist_scene.xml b/samples/notes-app/android/src/main/res/layout/itemlist_scene.xml
index 20401092..975ace3c 100644
--- a/samples/notes-app/android/src/main/res/layout/itemlist_scene.xml
+++ b/samples/notes-app/android/src/main/res/layout/itemlist_scene.xml
@@ -20,10 +20,11 @@
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/createButton"
         android:layout_width="wrap_content"
-        android:src="@drawable/ic_add_white_24dp"
+        android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:src="@drawable/ic_add_white_24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />