Merge branch 'feat/compose-beta-3' into 'master'

Update Jetpack Compose to Beta 03 Closes #71 See merge request fmasa/wfrp-master!199
fmasa · Mar 26, 2021 · 4833023 · 4833023
2 parents 238c913 + 344a38b
commit 4833023
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -80,7 +80,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.0.0-beta02"
+        kotlinCompilerExtensionVersion = "1.0.0-beta03"
     }
 
     compileOptions {
@@ -135,7 +135,7 @@ dependencies {
     testImplementation("org.mockito:mockito-core:2.7.22")
 
     // Time picker
-    implementation("com.vanpra.compose-material-dialogs:datetime:0.3.1")
+    implementation("com.vanpra.compose-material-dialogs:datetime:0.3.2")
 
     // Checking network access
     implementation("com.github.pwittchen:reactivenetwork-rx2:3.0.8")

diff --git a/app/combat/build.gradle.kts b/app/combat/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-parcelize")
 }
 
-val composeVersion = "1.0.0-beta02"
+val composeVersion = "1.0.0-beta03"
 
 android {
     compileSdkVersion(29)

diff --git a/app/compendium/build.gradle.kts b/app/compendium/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-parcelize")
 }
 
-val composeVersion = "1.0.0-beta02"
+val composeVersion = "1.0.0-beta03"
 
 android {
     compileSdkVersion(29)

diff --git a/app/core/build.gradle.kts b/app/core/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-parcelize")
 }
 
-val composeVersion = "1.0.0-beta02"
+val composeVersion = "1.0.0-beta03"
 
 android {
     compileSdkVersion(29)

diff --git a/app/inventory/build.gradle.kts b/app/inventory/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-parcelize")
 }
 
-val composeVersion = "1.0.0-beta02"
+val composeVersion = "1.0.0-beta03"
 
 android {
     compileSdkVersion(29)

diff --git a/app/navigation/build.gradle.kts b/app/navigation/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-parcelize")
 }
 
-val composeVersion = "1.0.0-beta02"
+val composeVersion = "1.0.0-beta03"
 
 android {
     compileSdkVersion(29)

diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/CalendarScreen.kt b/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/CalendarScreen.kt
@@ -76,8 +76,14 @@ private fun Time(viewModel: GameMasterViewModel, time: DateTime.TimeOfDay) {
 
                     withContext(Dispatchers.Main) { dialog.hide() }
                 }
+
             }
         )
+
+        buttons {
+            positiveButton(stringResource(R.string.button_save))
+            negativeButton(stringResource(R.string.button_cancel))
+        }
     }
 
     Text(

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.0-alpha08")
+        classpath("com.android.tools.build:gradle:7.0.0-alpha12")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30")
 
         // Firebase-related dependencies