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

fmasa · fmasa · commit 238c9137a912 · 2021-03-10T20:36:49.000Z
Update Jetpack Compose to Beta02

See merge request fmasa/wfrp-master!198
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,11 +13,6 @@ plugins {
 }
 
 android {
-
-    lint {
-        disable("InvalidFragmentVersionForActivityResult") // This is temporary until we drop authentication fragment
-    }
-
     compileSdkVersion(30)
 
     defaultConfig {
@@ -85,7 +80,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.0.0-beta01"
+        kotlinCompilerExtensionVersion = "1.0.0-beta02"
     }
 
     compileOptions {
@@ -140,7 +135,7 @@ dependencies {
     testImplementation("org.mockito:mockito-core:2.7.22")
 
     // Time picker
-    implementation("com.vanpra.compose-material-dialogs:datetime:0.3.0")
+    implementation("com.vanpra.compose-material-dialogs:datetime:0.3.1")
 
     // 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-beta01"
+val composeVersion = "1.0.0-beta02"
 
 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-beta01"
+val composeVersion = "1.0.0-beta02"
 
 android {
     compileSdkVersion(29)
diff --git a/app/compendium/src/main/java/cz/frantisekmasa/wfrp_master/compendium/ui/CompendiumImportScreen.kt b/app/compendium/src/main/java/cz/frantisekmasa/wfrp_master/compendium/ui/CompendiumImportScreen.kt
@@ -1,11 +1,10 @@
 package cz.frantisekmasa.wfrp_master.compendium.ui
 
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContract
+import androidx.activity.compose.registerForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -28,7 +27,6 @@ import cz.frantisekmasa.wfrp_master.compendium.domain.importer.RulebookCompendiu
 import cz.frantisekmasa.wfrp_master.core.ui.buttons.BackButton
 import cz.frantisekmasa.wfrp_master.core.ui.scaffolding.Subtitle
 import cz.frantisekmasa.wfrp_master.core.ui.viewinterop.LocalActivity
-import cz.frantisekmasa.wfrp_master.core.ui.viewinterop.registerForActivityResult
 import cz.frantisekmasa.wfrp_master.core.viewModel.viewModel
 import cz.frantisekmasa.wfrp_master.navigation.Route
 import cz.frantisekmasa.wfrp_master.navigation.Routing
@@ -76,8 +74,8 @@ private fun MainContainer(routing: Routing<Route.CompendiumImport>) {
         )
     }
 
-    val fileChooser by registerFileChooser(
-        onFileChoose = {
+    val fileChooser = registerForActivityResult(ActivityResultContracts.GetContent(),
+        onResult = {
             coroutineScope.launch(Dispatchers.IO) {
                 context.contentResolver.openInputStream(it)?.use { inputStream ->
                     try {
@@ -130,7 +128,7 @@ private fun MainContainer(routing: Routing<Route.CompendiumImport>) {
         )
 
         Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-            Button(onClick = { fileChooser.launch(CHOOSE_COMPENDIUM_FILE) }) {
+            Button(onClick = { fileChooser.launch("application/pdf") }) {
                 Text(stringResource(R.string.import_rulebook).toUpperCase(Locale.current))
             }
             OutlinedButton(
@@ -151,28 +149,3 @@ private fun MainContainer(routing: Routing<Route.CompendiumImport>) {
     }
 }
 
-@Composable
-private fun registerFileChooser(onFileChoose: (Uri) -> Unit): Lazy<ActivityResultLauncher<Int?>> {
-    return registerForActivityResult(FileOpenContract()) { result ->
-        result.intent?.data?.let(onFileChoose)
-    }
-}
-
-private data class Result(val intent: Intent?)
-
-private class FileOpenContract : ActivityResultContract<Int?, Result>() {
-    override fun createIntent(context: Context, requestCode: Int?): Intent {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
-        intent.type = "application/pdf"
-        intent.addCategory(Intent.CATEGORY_OPENABLE)
-
-        return intent
-    }
-
-    override fun parseResult(resultCode: Int, intent: Intent?): Result {
-        Timber.d(resultCode.toString())
-        return Result(intent)
-    }
-}
-
-private const val CHOOSE_COMPENDIUM_FILE = 2
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-beta01"
+val composeVersion = "1.0.0-beta02"
 
 android {
     compileSdkVersion(29)
@@ -64,8 +64,8 @@ dependencies {
     api("androidx.compose.material:material:$composeVersion")
     api("androidx.compose.ui:ui-tooling:$composeVersion")
     api("androidx.compose.runtime:runtime-livedata:$composeVersion")
-    api("androidx.activity:activity-compose:1.3.0-alpha03")
-    api("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02")
+    api("androidx.activity:activity-compose:1.3.0-alpha04")
+    api("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03")
 
 
     // Koin
diff --git a/app/core/src/main/java/cz/frantisekmasa/wfrp_master/core/ui/viewinterop/fragmentManager.kt b/app/core/src/main/java/cz/frantisekmasa/wfrp_master/core/ui/viewinterop/fragmentManager.kt
diff --git a/app/core/src/main/java/cz/frantisekmasa/wfrp_master/core/ui/viewinterop/registerForActivityResult.kt b/app/core/src/main/java/cz/frantisekmasa/wfrp_master/core/ui/viewinterop/registerForActivityResult.kt
diff --git a/app/core/src/main/java/cz/frantisekmasa/wfrp_master/core/viewModel/viewModel.kt b/app/core/src/main/java/cz/frantisekmasa/wfrp_master/core/viewModel/viewModel.kt
@@ -8,5 +8,5 @@ import org.koin.core.parameter.ParametersDefinition
 
 @Composable
 inline fun <reified T : ViewModel> viewModel(noinline parameters: ParametersDefinition? = null): Lazy<T> {
-    return LocalViewModelStoreOwner.current.viewModel(parameters = parameters)
+    return LocalViewModelStoreOwner.current!!.viewModel(parameters = parameters)
 }
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-beta01"
+val composeVersion = "1.0.0-beta02"
 
 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-beta01"
+val composeVersion = "1.0.0-beta02"
 
 android {
     compileSdkVersion(29)
@@ -52,5 +52,5 @@ dependencies {
     implementation(project(":app:core"))
 
     // Navigation
-    api("androidx.navigation:navigation-compose:1.0.0-alpha08")
+    api("androidx.navigation:navigation-compose:1.0.0-alpha09")
 }
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/common/composables/FloatingActionsMenu.kt b/app/src/main/java/cz/muni/fi/rpg/ui/common/composables/FloatingActionsMenu.kt
@@ -58,7 +58,7 @@ fun FloatingActionsMenu(
         }
     }
 
-    Column(horizontalAlignment = Alignment.End) {
+    Column(horizontalAlignment = Alignment.End, modifier = Modifier.fillMaxWidth()) {
         Column(
             horizontalAlignment = Alignment.End,
             verticalArrangement = Arrangement.spacedBy(menuYOffset),
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/settings/SignInCard.kt b/app/src/main/java/cz/muni/fi/rpg/ui/settings/SignInCard.kt
@@ -2,6 +2,7 @@ package cz.muni.fi.rpg.ui.settings
 
 import android.os.Parcelable
 import android.widget.Toast
+import androidx.activity.compose.registerForActivityResult
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -29,7 +30,6 @@ import cz.frantisekmasa.wfrp_master.core.ui.primitives.CardContainer
 import cz.frantisekmasa.wfrp_master.core.ui.primitives.Spacing
 import cz.frantisekmasa.wfrp_master.core.ui.primitives.VisualOnlyIconDescription
 import cz.frantisekmasa.wfrp_master.core.ui.primitives.shortToast
-import cz.frantisekmasa.wfrp_master.core.ui.viewinterop.registerForActivityResult
 import cz.frantisekmasa.wfrp_master.navigation.Route
 import cz.frantisekmasa.wfrp_master.navigation.Routing
 import cz.muni.fi.rpg.R
@@ -62,7 +62,7 @@ fun SignInCard(viewModel: SettingsViewModel, routing: Routing<Route.Settings>) {
         )
     }
 
-    val launcher by registerForActivityResult(contract) { result ->
+    val launcher = registerForActivityResult(contract) { result ->
         coroutineScope.launch(Dispatchers.IO) {
             try {
                 GoogleSignIn.getSignedInAccountFromIntent(result.intent)
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/startup/StartupScreen.kt b/app/src/main/java/cz/muni/fi/rpg/ui/startup/StartupScreen.kt
@@ -1,5 +1,6 @@
 package cz.muni.fi.rpg.ui.startup
 
+import androidx.activity.compose.registerForActivityResult
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -15,7 +16,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.google.android.gms.auth.api.signin.GoogleSignIn
-import cz.frantisekmasa.wfrp_master.core.ui.viewinterop.registerForActivityResult
 import cz.muni.fi.rpg.R
 import cz.muni.fi.rpg.ui.common.composables.Theme
 import cz.muni.fi.rpg.ui.shell.splashBackground
@@ -58,24 +58,23 @@ fun StartupScreen(viewModel: AuthenticationViewModel) {
 
     val context = LocalContext.current
     val contract = remember(viewModel) { viewModel.googleSignInContract() }
-    val googleSignInLauncher by registerForActivityResult(
-        keys = listOf(contract, coroutineScope),
-        contract = contract,
-    ) { result ->
-        if (result.resultCode == 0) {
-            Timber.d("Google Sign-In dialog was dismissed")
-            showAnonymousAuthenticationDialog = true
-            return@registerForActivityResult
-        }
-
-        coroutineScope.launch(Dispatchers.IO) {
-            try {
-                GoogleSignIn.getSignedInAccountFromIntent(result.intent)
-                    .await()
-                    .idToken
-                    ?.let { idToken -> viewModel.signInWithGoogleToken(idToken) }
-            } catch (e: Throwable) {
+    val googleSignInLauncher = key(contract, coroutineScope) {
+        registerForActivityResult(contract) { result ->
+            if (result.resultCode == 0) {
+                Timber.d("Google Sign-In dialog was dismissed")
                 showAnonymousAuthenticationDialog = true
+                return@registerForActivityResult
+            }
+
+            coroutineScope.launch(Dispatchers.IO) {
+                try {
+                    GoogleSignIn.getSignedInAccountFromIntent(result.intent)
+                        .await()
+                        .idToken
+                        ?.let { idToken -> viewModel.signInWithGoogleToken(idToken) }
+                } catch (e: Throwable) {
+                    showAnonymousAuthenticationDialog = true
+                }
             }
         }
     }
diff --git a/app/src/main/java/cz/muni/fi/rpg/viewModels/AuthenticationViewModel.kt b/app/src/main/java/cz/muni/fi/rpg/viewModels/AuthenticationViewModel.kt
@@ -14,7 +14,6 @@ import com.google.firebase.auth.GoogleAuthProvider
 import cz.frantisekmasa.wfrp_master.core.auth.User
 import cz.frantisekmasa.wfrp_master.core.logging.Reporter
 import cz.frantisekmasa.wfrp_master.core.ui.viewinterop.LocalActivity
-import cz.frantisekmasa.wfrp_master.core.ui.viewinterop.IntentResult
 import cz.muni.fi.rpg.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
@@ -160,6 +159,12 @@ class AuthenticationViewModel(private val auth: FirebaseAuth) : ViewModel() {
             .requestEmail()
             .build()
     )
+
+
+    data class IntentResult(
+        val resultCode: Int,
+        val intent: Intent?,
+    )
 }
 
 @Composable
diff --git a/app/src/main/java/cz/muni/fi/rpg/viewModels/JoinPartyViewModel.kt b/app/src/main/java/cz/muni/fi/rpg/viewModels/JoinPartyViewModel.kt
@@ -43,4 +43,4 @@ class JoinPartyViewModel(
 
 @Composable
 fun provideJoinPartyViewModel(): JoinPartyViewModel =
-    LocalViewModelStoreOwner.current.getViewModel()
+    LocalViewModelStoreOwner.current!!.getViewModel()

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-beta01"`
	`7`	`+val composeVersion = "1.0.0-beta02"`
`8`	`8`
`9`	`9`	`android {`
`10`	`10`	`compileSdkVersion(29)`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ import org.koin.core.parameter.ParametersDefinition`
`8`	`8`
`9`	`9`	`@Composable`
`10`	`10`	`inline fun <reified T : ViewModel> viewModel(noinline parameters: ParametersDefinition? = null): Lazy<T> {`
`11`		`- return LocalViewModelStoreOwner.current.viewModel(parameters = parameters)`
	`11`	`+ return LocalViewModelStoreOwner.current!!.viewModel(parameters = parameters)`
`12`	`12`	`}`