diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 2ef7609dc..f8dfa2f4a 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -17,5 +17,5 @@ object Versions {
     const val hilt_androidx = "1.0.0-beta01"
     const val lifecycle = "2.3.0"
     const val markwon = "4.6.2"
-    const val compose = "1.0.0-beta03"
+    const val compose = "1.0.0-beta04"
 }
\ No newline at end of file
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index b0318c400..9b0d45b73 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -19,14 +19,14 @@
 +|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*)
 +|    \--- androidx.databinding:databinding-common:7.0.0-alpha14
 ++--- androidx.databinding:databinding-ktx:7.0.0-alpha14
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
-+|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
-+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.32
++|    +--- 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
++|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32
 +|    |    |         |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
 +|    |    |         |    \--- org.jetbrains:annotations:13.0 -> 16.0.1
-+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.32
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.32 (*)
++|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.32
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 (*)
 +|    +--- androidx.lifecycle:lifecycle-extensions:2.2.0
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 (*)
 +|    |    +--- androidx.arch.core:core-common:2.1.0 (*)
@@ -91,7 +91,7 @@
 +|    +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.3.1
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    |    +--- 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-alpha14 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
@@ -155,7 +155,7 @@
 +|    +--- androidx.lifecycle:lifecycle-extensions:2.2.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.32 (*)
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 (*)
++|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.3 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*)
 +|    |    \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -> 2.3.1
 +|    |         +--- androidx.lifecycle:lifecycle-livedata-core:2.3.1 (*)
@@ -163,7 +163,7 @@
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.3.1
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
-+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 +|    +--- com.google.android.material:material:1.2.1 -> 1.3.0
 +|    |    +--- androidx.annotation:annotation:1.0.1 -> 1.2.0
 +|    |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*)
@@ -274,7 +274,7 @@
 ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 -> 2.3.1 (*)
 ++--- androidx.room:room-ktx:2.2.6
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.32 (*)
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*)
++|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.3 (*)
 +|    +--- androidx.room:room-common:2.2.6 (*)
 +|    \--- androidx.room:room-runtime:2.2.6 (*)
 ++--- androidx.appcompat:appcompat:1.3.0-rc01 (*)
@@ -349,7 +349,7 @@
 ++--- androidx.work:work-runtime-ktx:2.5.0
 +|    +--- androidx.work:work-runtime:2.5.0 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.32 (*)
-+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 ++--- com.etesync:journalmanager:1.1.1
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.32 (*)
 +|    +--- com.madgag.spongycastle:core:1.54.0.0
@@ -378,119 +378,119 @@
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 ++--- org.osmdroid:osmdroid-android:6.1.10
-++--- androidx.compose.ui:ui:1.0.0-beta03
-+|    +--- androidx.compose.animation:animation-core:1.0.0-beta03
+++--- androidx.compose.ui:ui:1.0.0-beta04
++|    +--- androidx.compose.animation:animation-core:1.0.0-beta04
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*)
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03
-+|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*)
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04
++|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*)
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 -> 0.3.4 (*)
-+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta03
-+|    |    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta03
++|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta04
++|    |    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta04
 +|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03
-+|    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
++|    |    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04
++|    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    |    \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
++|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    |    \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta04
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui-graphics:1.0.0-beta03
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui-graphics:1.0.0-beta04
 +|    |    +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0
-+|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- androidx.compose.ui:ui-text:1.0.0-beta03
-+|    |    +--- androidx.compose.ui:ui-graphics:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*)
++|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- androidx.compose.ui:ui-text:1.0.0-beta04
++|    |    +--- androidx.compose.ui:ui-graphics:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*)
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
++|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|    |    +--- androidx.collection:collection:1.1.0 (*)
 +|    |    \--- androidx.core:core:1.5.0-beta01 -> 1.5.0-rc01 (*)
-+|    +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*)
++|    +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*)
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*)
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|    +--- androidx.autofill:autofill:1.0.0
 +|    |    \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*)
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*)
 +|    +--- androidx.savedstate:savedstate:1.1.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.3.1 (*)
 +|    \--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*)
-++--- androidx.compose.foundation:foundation:1.0.0-beta03
+++--- androidx.compose.foundation:foundation:1.0.0-beta04
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.compose.animation:animation:1.0.0-beta03
++|    +--- androidx.compose.animation:animation:1.0.0-beta04
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- androidx.compose.animation:animation-core:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03
++|    |    +--- androidx.compose.animation:animation-core:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui-text:1.0.0-beta03 (*)
-+|    \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-++--- androidx.compose.material:material:1.0.0-beta03
-+|    +--- androidx.compose.animation:animation-core:1.0.0-beta03 (*)
-+|    +--- androidx.compose.foundation:foundation:1.0.0-beta03 (*)
-+|    +--- androidx.compose.material:material-icons-core:1.0.0-beta03
-+|    |    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    +--- androidx.compose.material:material-ripple:1.0.0-beta03
-+|    |    +--- androidx.compose.foundation:foundation:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    |    +--- androidx.compose.animation:animation:1.0.0-beta03 (*)
-+|    |    \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui-text:1.0.0-beta03 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- androidx.compose.animation:animation:1.0.0-beta03 (*)
-+|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03 (*)
-+|    \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta03
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
++|    |    |    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui-text:1.0.0-beta04 (*)
++|    \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
+++--- androidx.compose.material:material:1.0.0-beta04
++|    +--- androidx.compose.animation:animation-core:1.0.0-beta04 (*)
++|    +--- androidx.compose.foundation:foundation:1.0.0-beta04 (*)
++|    +--- androidx.compose.material:material-icons-core:1.0.0-beta04
++|    |    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    +--- androidx.compose.material:material-ripple:1.0.0-beta04
++|    |    +--- androidx.compose.foundation:foundation:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    |    +--- androidx.compose.animation:animation:1.0.0-beta04 (*)
++|    |    \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui-text:1.0.0-beta04 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- androidx.compose.animation:animation:1.0.0-beta04 (*)
++|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 (*)
++|    \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
+++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta04
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
 +|    +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    \--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-++--- com.google.android.material:compose-theme-adapter:1.0.0-beta03
++|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    \--- androidx.compose.ui:ui:1.0.0-beta04 (*)
+++--- com.google.android.material:compose-theme-adapter:1.0.0-beta04
 +|    +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0-rc01 (*)
 +|    +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*)
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    +--- androidx.compose.material:material:1.0.0-beta03 (*)
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    +--- androidx.compose.material:material:1.0.0-beta04 (*)
 +|    +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
 +\--- androidx.activity:activity-compose:1.3.0-alpha05
-+     +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+     +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 (*)
++     +--- androidx.compose.runtime:runtime:1.0.0-beta03 -> 1.0.0-beta04 (*)
++     +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 -> 1.0.0-beta04 (*)
 +     +--- androidx.activity:activity-ktx:1.3.0-alpha05 (*)
-+     +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
++     +--- androidx.compose.ui:ui:1.0.0-beta03 -> 1.0.0-beta04 (*)
 +     \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index b9a287164..d5c6750b0 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -19,14 +19,14 @@
 +|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*)
 +|    \--- androidx.databinding:databinding-common:7.0.0-alpha14
 ++--- androidx.databinding:databinding-ktx:7.0.0-alpha14
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
-+|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
-+|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.32
++|    +--- 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
++|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32
 +|    |    |         |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
 +|    |    |         |    \--- org.jetbrains:annotations:13.0 -> 16.0.1
-+|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.32
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.32 (*)
++|    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.32
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 (*)
 +|    +--- androidx.lifecycle:lifecycle-extensions:2.2.0
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 (*)
 +|    |    +--- androidx.arch.core:core-common:2.1.0 (*)
@@ -91,7 +91,7 @@
 +|    +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.3.1
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    |    +--- 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-alpha14 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
@@ -223,7 +223,7 @@
 ++--- com.android.billingclient:billing-ktx:3.0.3
 +|    +--- com.android.billingclient:billing:3.0.3
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.32 (*)
-+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.4.1 (*)
++|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.4.3 (*)
 ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.32 (*)
 +|    \--- org.apache.commons:commons-lang3:3.8.1
@@ -281,7 +281,7 @@
 +|    +--- androidx.lifecycle:lifecycle-extensions:2.2.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.32 (*)
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 (*)
++|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.3 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*)
 +|    |    \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -> 2.3.1
 +|    |         +--- androidx.lifecycle:lifecycle-livedata-core:2.3.1 (*)
@@ -289,7 +289,7 @@
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.3.1
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
-+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 +|    +--- com.google.android.material:material:1.2.1 -> 1.3.0
 +|    |    +--- androidx.annotation:annotation:1.0.1 -> 1.2.0
 +|    |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*)
@@ -391,7 +391,7 @@
 ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 -> 2.3.1 (*)
 ++--- androidx.room:room-ktx:2.2.6
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.32 (*)
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*)
++|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.3 (*)
 +|    +--- androidx.room:room-common:2.2.6 (*)
 +|    \--- androidx.room:room-runtime:2.2.6 (*)
 ++--- androidx.appcompat:appcompat:1.3.0-rc01 (*)
@@ -466,7 +466,7 @@
 ++--- androidx.work:work-runtime-ktx:2.5.0
 +|    +--- androidx.work:work-runtime:2.5.0 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.32 (*)
-+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 ++--- com.etesync:journalmanager:1.1.1
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.32 (*)
 +|    +--- com.madgag.spongycastle:core:1.54.0.0
@@ -495,119 +495,119 @@
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 ++--- org.osmdroid:osmdroid-android:6.1.10
-++--- androidx.compose.ui:ui:1.0.0-beta03
-+|    +--- androidx.compose.animation:animation-core:1.0.0-beta03
+++--- androidx.compose.ui:ui:1.0.0-beta04
++|    +--- androidx.compose.animation:animation-core:1.0.0-beta04
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*)
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03
-+|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*)
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04
++|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*)
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 -> 0.3.4 (*)
-+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta03
-+|    |    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta03
++|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta04
++|    |    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta04
 +|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03
-+|    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
++|    |    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04
++|    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    |    \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
++|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    |    \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta04
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui-graphics:1.0.0-beta03
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui-graphics:1.0.0-beta04
 +|    |    +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0
-+|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- androidx.compose.ui:ui-text:1.0.0-beta03
-+|    |    +--- androidx.compose.ui:ui-graphics:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*)
++|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- androidx.compose.ui:ui-text:1.0.0-beta04
++|    |    +--- androidx.compose.ui:ui-graphics:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*)
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
++|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|    |    +--- androidx.collection:collection:1.1.0 (*)
 +|    |    \--- androidx.core:core:1.5.0-beta01 -> 1.5.0-rc01 (*)
-+|    +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*)
++|    +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*)
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*)
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|    +--- androidx.autofill:autofill:1.0.0
 +|    |    \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*)
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
++|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*)
 +|    +--- androidx.savedstate:savedstate:1.1.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.3.1 (*)
 +|    \--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*)
-++--- androidx.compose.foundation:foundation:1.0.0-beta03
+++--- androidx.compose.foundation:foundation:1.0.0-beta04
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.compose.animation:animation:1.0.0-beta03
++|    +--- androidx.compose.animation:animation:1.0.0-beta04
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    +--- androidx.compose.animation:animation-core:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03
++|    |    +--- androidx.compose.animation:animation-core:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04
 +|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    |    |    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui-text:1.0.0-beta03 (*)
-+|    \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-++--- androidx.compose.material:material:1.0.0-beta03
-+|    +--- androidx.compose.animation:animation-core:1.0.0-beta03 (*)
-+|    +--- androidx.compose.foundation:foundation:1.0.0-beta03 (*)
-+|    +--- androidx.compose.material:material-icons-core:1.0.0-beta03
-+|    |    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    +--- androidx.compose.material:material-ripple:1.0.0-beta03
-+|    |    +--- androidx.compose.foundation:foundation:1.0.0-beta03 (*)
-+|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    |    +--- androidx.compose.animation:animation:1.0.0-beta03 (*)
-+|    |    \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-+|    +--- androidx.compose.ui:ui-text:1.0.0-beta03 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32
-+|    +--- androidx.compose.animation:animation:1.0.0-beta03 (*)
-+|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03 (*)
-+|    \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*)
-++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta03
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
++|    |    |    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    |    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui-text:1.0.0-beta04 (*)
++|    \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
+++--- androidx.compose.material:material:1.0.0-beta04
++|    +--- androidx.compose.animation:animation-core:1.0.0-beta04 (*)
++|    +--- androidx.compose.foundation:foundation:1.0.0-beta04 (*)
++|    +--- androidx.compose.material:material-icons-core:1.0.0-beta04
++|    |    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    +--- androidx.compose.material:material-ripple:1.0.0-beta04
++|    |    +--- androidx.compose.foundation:foundation:1.0.0-beta04 (*)
++|    |    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    |    +--- androidx.compose.animation:animation:1.0.0-beta04 (*)
++|    |    \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui:1.0.0-beta04 (*)
++|    +--- androidx.compose.ui:ui-text:1.0.0-beta04 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
++|    +--- androidx.compose.animation:animation:1.0.0-beta04 (*)
++|    +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 (*)
++|    \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*)
+++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta04
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
 +|    +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
-+|    \--- androidx.compose.ui:ui:1.0.0-beta03 (*)
-++--- com.google.android.material:compose-theme-adapter:1.0.0-beta03
++|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
++|    \--- androidx.compose.ui:ui:1.0.0-beta04 (*)
+++--- com.google.android.material:compose-theme-adapter:1.0.0-beta04
 +|    +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0-rc01 (*)
 +|    +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*)
-+|    +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+|    +--- androidx.compose.material:material:1.0.0-beta03 (*)
++|    +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*)
++|    +--- androidx.compose.material:material:1.0.0-beta04 (*)
 +|    +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)
 +\--- androidx.activity:activity-compose:1.3.0-alpha05
-+     +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*)
-+     +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 (*)
++     +--- androidx.compose.runtime:runtime:1.0.0-beta03 -> 1.0.0-beta04 (*)
++     +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 -> 1.0.0-beta04 (*)
 +     +--- androidx.activity:activity-ktx:1.3.0-alpha05 (*)
-+     +--- androidx.compose.ui:ui:1.0.0-beta03 (*)
++     +--- androidx.compose.ui:ui:1.0.0-beta03 -> 1.0.0-beta04 (*)
 +     \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*)