Merge branch 'fix/invite-link' into 'master'

Fix invitation link button

See merge request fmasa/wfrp-master!214

Author: fmasa

app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/InvitationDialog.kt

@@ -2,17 +2,19 @@ package cz.muni.fi.rpg.ui.gameMaster
 
 import android.content.Context
 import android.content.Intent
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Button
-import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
+import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -23,9 +25,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.toUpperCase
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
@@ -35,6 +36,10 @@ import com.google.firebase.dynamiclinks.ktx.dynamicLinks
 import com.google.firebase.dynamiclinks.ktx.shortLinkAsync
 import com.google.firebase.ktx.Firebase
 import cz.frantisekmasa.wfrp_master.core.domain.party.Invitation
+import cz.frantisekmasa.wfrp_master.core.ui.buttons.CloseButton
+import cz.frantisekmasa.wfrp_master.core.ui.dialogs.FullScreenDialog
+import cz.frantisekmasa.wfrp_master.core.ui.primitives.FullScreenProgress
+import cz.frantisekmasa.wfrp_master.core.ui.primitives.Spacing
 import cz.frantisekmasa.wfrp_master.core.ui.primitives.VisualOnlyIconDescription
 import cz.frantisekmasa.wfrp_master.navigation.Route
 import cz.muni.fi.rpg.R
@@ -43,35 +48,40 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
-import org.koin.core.context.KoinContextHandler
+import org.koin.core.context.GlobalContext
 
 @Composable
-internal fun InvitationDialog2(invitation: Invitation, onDismissRequest: () -> Unit) {
-    Dialog(onDismissRequest = onDismissRequest) {
-        Surface(shape = MaterialTheme.shapes.medium) {
-            Column(Modifier.padding(20.dp)) {
-                Text(
-                    stringResource(R.string.invitation_code_description),
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(top = 16.dp),
-                    style = MaterialTheme.typography.h6,
+internal fun InvitationDialog(invitation: Invitation, onDismissRequest: () -> Unit) {
+    FullScreenDialog(onDismissRequest = onDismissRequest) {
+        Scaffold(
+            topBar = {
+                TopAppBar(
+                    navigationIcon = { CloseButton(onClick = onDismissRequest) },
+                    title = { Text(stringResource(R.string.title_invite_players))},
                 )
-
+            }
+        ) {
+            Column(
+                Modifier
+                    .fillMaxSize()
+                    .verticalScroll(rememberScrollState())
+                    .padding(Spacing.bodyPadding),
+                verticalArrangement = Arrangement.spacedBy(Spacing.small, Alignment.CenterVertically)
+            ) {
                 val sharingOptions = sharingOptions(invitation).collectAsState().value
 
                 if (sharingOptions == null) {
-                    Box(
-                        Modifier
-                            .fillMaxWidth()
-                            .aspectRatio(1f),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        CircularProgressIndicator()
-                    }
+                    FullScreenProgress()
                 } else {
                     val context = LocalContext.current
 
+                    Text(
+                        stringResource(R.string.invitation_code_description),
+                        modifier = Modifier.fillMaxWidth(),
+                        textAlign = TextAlign.Center,
+                        style = MaterialTheme.typography.caption,
+                    )
+
                     QrCode(sharingOptions.json)
 
                     Button(
@@ -91,7 +101,7 @@ internal fun InvitationDialog2(invitation: Invitation, onDismissRequest: () -> U
 
 @Composable
 private fun sharingOptions(invitation: Invitation): StateFlow<SharingOptions?> {
-    val jsonMapper: JsonMapper = KoinContextHandler.get().get()
+    val jsonMapper: JsonMapper = GlobalContext.get().get()
     val flow = remember { MutableStateFlow<SharingOptions?>(null) }
 
     LaunchedEffect(invitation) {

app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/PartySummaryScreen.kt

@@ -99,7 +99,7 @@ internal fun PartySummaryScreen(
             var invitationDialogVisible by remember { mutableStateOf(false) }
 
             if (invitationDialogVisible) {
-                InvitationDialog2(
+                InvitationDialog(
                     invitation = party.getInvitation(),
                     onDismissRequest = { invitationDialogVisible = false },
                 )

app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/QrCode.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.runtime.Composable
@@ -31,15 +32,15 @@ import kotlinx.coroutines.withContext
 internal fun QrCode(data: String) {
     BoxWithConstraints(Modifier.fillMaxWidth()) {
         var qrCode: ImageBitmap? by remember { mutableStateOf(null) }
-        val width = constraints.maxWidth
+        val width = minOf(constraints.maxWidth, constraints.maxHeight)
 
         LaunchedEffect(data, width) {
             qrCode = createQrCode(data, width)
         }
 
         when (val bitmap = qrCode) {
             null -> {
-                Box(Modifier.fillMaxWidth().aspectRatio(1f), contentAlignment = Alignment.Center) {
+                Box(Modifier.fillMaxSize().aspectRatio(1f), contentAlignment = Alignment.Center) {
                     CircularProgressIndicator()
                 }
             }

app/src/main/java/cz/muni/fi/rpg/ui/joinParty/QrCodeScannerAnalyser.kt

@@ -5,8 +5,8 @@ import android.graphics.ImageFormat
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
 import com.google.zxing.BinaryBitmap
-import com.google.zxing.NotFoundException
 import com.google.zxing.PlanarYUVLuminanceSource
+import com.google.zxing.ReaderException
 import com.google.zxing.common.HybridBinarizer
 import com.google.zxing.qrcode.QRCodeReader
 import timber.log.Timber
@@ -60,7 +60,7 @@ class QrCodeScannerAnalyser(
 
             val result = reader.decode(binaryBitmap)
             onQrCodesDetected(result.text)
-        } catch (e: NotFoundException) {
+        } catch (e: ReaderException) {
             Timber.d(e)
         } finally {
             imageProxy.close()

app/src/main/res/values/strings.xml

@@ -85,7 +85,8 @@
     <string name="error_already_party_member">You are already member of this party</string>
     <string name="error_invalid_invitation">Invitation token is not valid</string>
     <string name="error_unkown">Unknown error occurred</string>
-    <string name="invitation_code_description">Players can join using this code</string>
+    <string name="title_invite_players">Invite players…</string>
+    <string name="invitation_code_description">Players can scan this QR code in their apps</string>
     <string name="title_characterCreation">Describe your character…</string>
     <string name="title_character_stats">Attributes</string>
     <string name="title_character_conditions">Conditions</string>

buildSrc/src/main/resources/versions.properties

@@ -1,4 +1,4 @@
-androidGradlePluginVersion=7.1.0-alpha08
+androidGradlePluginVersion=7.1.0-alpha11
 kotlinVersion=1.5.10
 composeVersion=1.0.0
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Aug 31 09:56:08 CEST 2020
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME