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

fmasa · fmasa · commit 48330232db4d · 2021-03-26T19:59:58.000Z
Update Jetpack Compose to Beta 03 Closes #71 See merge request fmasa/wfrp-master!199
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

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ android {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`composeOptions {`
`83`		`- kotlinCompilerExtensionVersion = "1.0.0-beta02"`
	`83`	`+ kotlinCompilerExtensionVersion = "1.0.0-beta03"`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`compileOptions {`
`@@ -135,7 +135,7 @@ dependencies {`
`135`	`135`	`testImplementation("org.mockito:mockito-core:2.7.22")`
`136`	`136`
`137`	`137`	`// Time picker`
`138`		`- implementation("com.vanpra.compose-material-dialogs:datetime:0.3.1")`
	`138`	`+ implementation("com.vanpra.compose-material-dialogs:datetime:0.3.2")`
`139`	`139`
`140`	`140`	`// Checking network access`
`141`	`141`	`implementation("com.github.pwittchen:reactivenetwork-rx2:3.0.8")`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`id("kotlin-parcelize")`
`5`	`5`	`}`
`6`	`6`
`7`		`-val composeVersion = "1.0.0-beta02"`
	`7`	`+val composeVersion = "1.0.0-beta03"`
`8`	`8`
`9`	`9`	`android {`
`10`	`10`	`compileSdkVersion(29)`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,14 @@ private fun Time(viewModel: GameMasterViewModel, time: DateTime.TimeOfDay) {`
`76`	`76`
`77`	`77`	`withContext(Dispatchers.Main) { dialog.hide() }`
`78`	`78`	`}`
	`79`	`+`
`79`	`80`	`}`
`80`	`81`	`)`
	`82`	`+`
	`83`	`+ buttons {`
	`84`	`+ positiveButton(stringResource(R.string.button_save))`
	`85`	`+ negativeButton(stringResource(R.string.button_cancel))`
	`86`	`+ }`
`81`	`87`	`}`
`82`	`88`
`83`	`89`	`Text(`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- classpath("com.android.tools.build:gradle:7.0.0-alpha08")`
	`10`	`+ classpath("com.android.tools.build:gradle:7.0.0-alpha12")`
`11`	`11`	`classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30")`
`12`	`12`
`13`	`13`	`// Firebase-related dependencies`