upgrade gradle, AGP and dependencies (#1818)

* upgrade gradle, AGP and dependencies

* fix new layout related warnings

app/build.gradle

@@ -112,29 +112,30 @@ project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 
 ext.lifecycleVersion = "2.2.0"
 ext.roomVersion = '2.2.5'
-ext.retrofitVersion = '2.8.1'
+ext.retrofitVersion = '2.9.0'
-ext.okhttpVersion = '4.4.0'
+ext.okhttpVersion = '4.7.2'
 ext.glideVersion = '4.11.0'
-ext.daggerVersion = '2.27'
+ext.daggerVersion = '2.28'
-ext.materialdrawerVersion = '8.0.1'
+ext.materialdrawerVersion = '8.0.3'
 
 // if libraries are changed here, they should also be changed in LicenseActivity
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.core:core-ktx:1.3.0"
-    implementation "androidx.appcompat:appcompat:1.2.0-alpha02"
+    implementation "androidx.appcompat:appcompat:1.2.0-rc01"
-    implementation "androidx.fragment:fragment-ktx:1.2.2"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
     implementation "androidx.browser:browser:1.2.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.exifinterface:exifinterface:1.1.0"
+    implementation "androidx.exifinterface:exifinterface:1.2.0"
     implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.preference:preference:1.1.0"
+    implementation "androidx.preference:preference:1.1.1"
-    implementation "androidx.sharetarget:sharetarget:1.0.0-rc01"
+    implementation "androidx.sharetarget:sharetarget:1.0.0"
-    implementation "androidx.emoji:emoji:1.1.0-beta01"
+    implementation "androidx.emoji:emoji:1.1.0-rc01"
-    implementation "androidx.emoji:emoji-appcompat:1.1.0-beta01"
+    implementation "androidx.emoji:emoji-appcompat:1.1.0-rc01"
-    implementation "androidx.emoji:emoji-bundled:1.1.0-beta01"
+    implementation "androidx.emoji:emoji-bundled:1.1.0-rc01"
+
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycleVersion"
@@ -162,7 +163,7 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
 
-    implementation "io.reactivex.rxjava2:rxjava:2.2.16"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     implementation "io.reactivex.rxjava2:rxkotlin:2.4.0"
 

app/src/main/res/layout/activity_account.xml

@@ -145,12 +145,12 @@
                         android:layout_height="16sp"
                         android:layout_marginStart="4dp"
                         android:contentDescription="@string/description_account_locked"
-                        android:tint="?android:textColorSecondary"
                         android:visibility="gone"
                         app:layout_constraintBottom_toBottomOf="@+id/accountUsernameTextView"
                         app:layout_constraintStart_toEndOf="@+id/accountUsernameTextView"
                         app:layout_constraintTop_toTopOf="@+id/accountUsernameTextView"
                         app:srcCompat="@drawable/ic_reblog_private_24dp"
+                        app:tint="?android:textColorSecondary"
                         tools:visibility="visible" />
                     
                     <TextView

app/src/main/res/layout/item_account.xml

@@ -29,7 +29,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/account_avatar"
         app:layout_constraintEnd_toEndOf="@id/account_avatar"
-        tools:src="@color/accent"
+        tools:src="#000"
         tools:visibility="visible" />
 
     <androidx.emoji.widget.EmojiTextView

app/src/main/res/layout/item_conversation.xml

@@ -76,7 +76,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/status_avatar"
         app:layout_constraintEnd_toEndOf="@id/status_avatar"
-        tools:src="@color/accent"
+        tools:src="#000"
         tools:visibility="visible" />
 
     <androidx.emoji.widget.EmojiTextView

app/src/main/res/layout/item_media_preview.xml

@@ -2,7 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-	tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
         <com.keylesspalace.tusky.view.MediaPreviewImageView
             android:id="@+id/status_media_preview_0"
@@ -25,13 +25,11 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="ContentDescription" />
 
-
         <com.keylesspalace.tusky.view.MediaPreviewImageView
             android:id="@+id/status_media_preview_2"
             android:layout_width="0dp"
             android:layout_height="@dimen/status_media_preview_height"
             android:layout_marginTop="4dp"
-            android:background="@drawable/media_preview_outline"
             android:scaleType="centerCrop"
             app:layout_constraintEnd_toStartOf="@+id/status_media_preview_3"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,6 +42,7 @@
             android:layout_height="@dimen/status_media_preview_height"
             android:layout_marginStart="4dp"
             android:layout_marginTop="4dp"
+            android:background="@drawable/media_preview_outline"
             android:scaleType="centerCrop"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/status_media_preview_2"
@@ -105,19 +104,18 @@
             android:alpha="0.7"
             android:contentDescription="@null"
             android:padding="@dimen/status_sensitive_media_button_padding"
-            android:tint="@color/white"
             android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
             app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
-            app:srcCompat="@drawable/ic_eye_24dp" />
+            app:srcCompat="@drawable/ic_eye_24dp"
+            app:tint="@color/white" />
 
         <TextView
             android:id="@+id/status_sensitive_media_warning"
-			android:layout_width="wrap_content"
+            android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
             android:background="@drawable/media_warning_bg"
             android:gravity="center"
-            android:importantForAccessibility="no"
             android:lineSpacingMultiplier="1.2"
             android:orientation="vertical"
             android:paddingLeft="12dp"
@@ -185,5 +183,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/status_media_label_2" />
 
-
 </merge>

app/src/main/res/layout/item_report_status.xml

@@ -194,12 +194,12 @@
             android:alpha="0.7"
             android:contentDescription="@null"
             android:padding="@dimen/status_sensitive_media_button_padding"
-            android:tint="@color/white"
             android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
             app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
             app:srcCompat="@drawable/ic_eye_24dp"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:tint="@color/white" />
 
         <TextView
             android:id="@+id/status_sensitive_media_warning"

app/src/main/res/layout/item_status.xml

@@ -52,7 +52,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/status_avatar"
         app:layout_constraintEnd_toEndOf="@id/status_avatar"
-        tools:src="@color/accent"
+        tools:src="#000"
         tools:visibility="visible" />
 
     <androidx.emoji.widget.EmojiTextView

app/src/main/res/layout/item_status_detailed.xml

@@ -33,7 +33,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/status_avatar"
         app:layout_constraintEnd_toEndOf="@id/status_avatar"
-        tools:src="@color/accent"
+        tools:src="#000"
         tools:visibility="visible" />
 
     <androidx.emoji.widget.EmojiTextView

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists