diff --git a/build.gradle.kts b/build.gradle.kts
index 51f0c2547..10fa1d62d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.0-beta01")
+        classpath("com.android.tools.build:gradle:7.0.0-beta02")
         classpath("com.google.gms:google-services:4.3.5")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index 67e28996c..4236226cf 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -1,11 +1,11 @@
-++--- androidx.databinding:viewbinding:7.0.0-beta01
+++--- androidx.databinding:viewbinding:7.0.0-beta02
 +|    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-++--- androidx.databinding:databinding-common:7.0.0-beta01
-++--- androidx.databinding:databinding-runtime:7.0.0-beta01
+++--- androidx.databinding:databinding-common:7.0.0-beta02
+++--- androidx.databinding:databinding-runtime:7.0.0-beta02
 +|    +--- androidx.collection:collection:1.0.0 -> 1.1.0
 +|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-common:7.0.0-beta01
-+|    +--- androidx.databinding:viewbinding:7.0.0-beta01 (*)
++|    +--- androidx.databinding:databinding-common:7.0.0-beta02
++|    +--- androidx.databinding:viewbinding:7.0.0-beta02 (*)
 +|    \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1
 +|         +--- androidx.arch.core:core-runtime:2.1.0
 +|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -15,10 +15,10 @@
 +|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         +--- androidx.arch.core:core-common:2.1.0 (*)
 +|         \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-++--- androidx.databinding:databinding-adapters:7.0.0-beta01
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-beta01 (*)
-+|    \--- androidx.databinding:databinding-common:7.0.0-beta01
-++--- androidx.databinding:databinding-ktx:7.0.0-beta01
+++--- androidx.databinding:databinding-adapters:7.0.0-beta02
++|    +--- androidx.databinding:databinding-runtime:7.0.0-beta02 (*)
++|    \--- androidx.databinding:databinding-common:7.0.0-beta02
+++--- androidx.databinding:databinding-ktx:7.0.0-beta02
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3
 +|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
@@ -93,7 +93,7 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 +|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-beta01 (*)
++|    +--- androidx.databinding:databinding-runtime:7.0.0-beta02 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
@@ -118,9 +118,9 @@
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*)
 ++--- com.gitlab.bitfireAT:cert4android:26a91a729f
-+|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta01
-+|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta01 (*)
-+|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta01 (*)
++|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta02
++|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta02 (*)
++|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta02 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*)
 +|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 9a3fec073..4e4877847 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -1,11 +1,11 @@
-++--- androidx.databinding:viewbinding:7.0.0-beta01
+++--- androidx.databinding:viewbinding:7.0.0-beta02
 +|    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-++--- androidx.databinding:databinding-common:7.0.0-beta01
-++--- androidx.databinding:databinding-runtime:7.0.0-beta01
+++--- androidx.databinding:databinding-common:7.0.0-beta02
+++--- androidx.databinding:databinding-runtime:7.0.0-beta02
 +|    +--- androidx.collection:collection:1.0.0 -> 1.1.0
 +|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-common:7.0.0-beta01
-+|    +--- androidx.databinding:viewbinding:7.0.0-beta01 (*)
++|    +--- androidx.databinding:databinding-common:7.0.0-beta02
++|    +--- androidx.databinding:viewbinding:7.0.0-beta02 (*)
 +|    \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1
 +|         +--- androidx.arch.core:core-runtime:2.1.0
 +|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -15,10 +15,10 @@
 +|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         +--- androidx.arch.core:core-common:2.1.0 (*)
 +|         \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-++--- androidx.databinding:databinding-adapters:7.0.0-beta01
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-beta01 (*)
-+|    \--- androidx.databinding:databinding-common:7.0.0-beta01
-++--- androidx.databinding:databinding-ktx:7.0.0-beta01
+++--- androidx.databinding:databinding-adapters:7.0.0-beta02
++|    +--- androidx.databinding:databinding-runtime:7.0.0-beta02 (*)
++|    \--- androidx.databinding:databinding-common:7.0.0-beta02
+++--- androidx.databinding:databinding-ktx:7.0.0-beta02
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3
 +|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
@@ -93,7 +93,7 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 +|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-beta01 (*)
++|    +--- androidx.databinding:databinding-runtime:7.0.0-beta02 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
@@ -244,9 +244,9 @@
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*)
 ++--- com.gitlab.bitfireAT:cert4android:26a91a729f
-+|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta01
-+|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta01 (*)
-+|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta01 (*)
++|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta02
++|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta02 (*)
++|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta02 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*)
 +|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0