Skip to content

Update ShareLocationModal to show bigger QR code #3668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreia-ferreira merged 4 commits into from
Apr 14, 2026
+12 −5
Merged

Update ShareLocationModal to show bigger QR code #3668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a210af
make QR code bigger in the modal
andreia-ferreira Apr 13, 2026
f9575cc
update paddings
andreia-ferreira Apr 13, 2026
1b53b26
add scroll to element on modal test
andreia-ferreira Apr 14, 2026
82f732d
Merge branch 'master' into andreia/small-ui-adjustments
andreia-ferreira Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/src/main/java/org/groundplatform/android/ui/home/mapcontainer/jobs/ShareLocationModal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.JsonPrimitive
Expand All @@ -51,8 +52,12 @@ import org.groundplatform.ui.theme.AppTheme
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ShareLocationModal(loiReport: LoiReport, onDismiss: () -> Unit) {
Dialog(onDismissRequest = onDismiss) {
Dialog(
onDismissRequest = onDismiss,
properties = DialogProperties(usePlatformDefaultWidth = false),
) {
Card(
modifier = Modifier.padding(16.dp),
shape = RoundedCornerShape(24.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
) {
Expand All @@ -68,7 +73,7 @@ fun ShareLocationModal(loiReport: LoiReport, onDismiss: () -> Unit) {
Modifier.fillMaxWidth()
.padding(vertical = 16.dp)
.background(MaterialTheme.colorScheme.background, RoundedCornerShape(12.dp))
.padding(24.dp)
.padding(vertical = 24.dp, horizontal = 8.dp)
) {
GroundQrCode(
modifier = Modifier.align(Alignment.Center),
Expand Down
3 changes: 2 additions & 1 deletion ...src/test/java/org/groundplatform/android/ui/home/mapcontainer/jobs/JobMapComponentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollTo
import kotlin.test.Test
import kotlin.test.assertTrue
import org.groundplatform.android.FakeData.ADHOC_JOB
Expand Down Expand Up @@ -259,7 +260,7 @@ class JobMapComponentTest {
}

composeTestRule.onNodeWithText(getString(R.string.share)).performClick()
composeTestRule.onNodeWithText(getString(R.string.close)).performClick()
composeTestRule.onNodeWithText(getString(R.string.close)).performScrollTo().performClick()
composeTestRule.waitForIdle()

composeTestRule.onNodeWithText(loiSheetData.loi.job.name!!).assertIsDisplayed()
Expand Down
5 changes: 3 additions & 2 deletions core/ui/src/commonMain/kotlin/org/groundplatform/ui/components/qrcode/GroundQrCode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.annotation.VisibleForTesting
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
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
Expand Down Expand Up @@ -96,10 +97,10 @@ fun GroundQrCode(
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
Box(modifier = modifier.sizeIn(minWidth = 142.dp, minHeight = 142.dp)) {
Box(modifier = modifier.aspectRatio(1f).sizeIn(minWidth = 142.dp, minHeight = 142.dp)) {
qrBitmap?.let {
Image(
modifier = Modifier.align(Alignment.Center),
modifier = Modifier.align(Alignment.Center).fillMaxSize(),
bitmap = it,
contentDescription = contentDescription,
contentScale = ContentScale.Fit,
Expand Down
Loading