Add info button to trace/shape questions by grzesiek2010 · Pull Request #7021 · getodk/collect

grzesiek2010 · 2026-01-15T10:41:51Z

Why is this the best possible solution? Were any other approaches considered?

The main thing worth mentioning is that I built the dialog’s UI using Jetpack Compose, but I wrapped it inside a ComposeView so it can be used from a regular DialogFragment. The rest of the screen where this “info” dialog is opened is still based on the legacy XML view system, so embedding Compose this way keeps the integration simple and avoids a bigger refactor.

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

This is a fairly isolated change. It should be enough to ensure that the correct content is displayed depending on the circumstances described in the issue.

Do we need any specific form for testing your changes? If so, please attach one.

Any form with geotrace/geoshape questions.

Does this change require updates to documentation? If so, please file an issue here and include the link below.

No.

Before submitting this PR, please make sure you have:

added or modified tests for any new or changed behavior
run ./gradlew connectedAndroidTest (or ./gradlew testLab) and confirmed all checks still pass
added a comment above any new strings describing it for translators
added any new strings with date formatting to DateFormatsTest
verified that any code or assets from external sources are properly credited in comments and/or in the about file.
verified that any new UI elements use theme colors. UI Components Style guidelines

alyblenkin · 2026-01-15T17:13:07Z

Looking great - this will be so helpful beyond the invalid polygon work too! Explaining to data collectors how to use the different map actions has come up on the forum before, and it came up again just the other day.

Small thing - I noticed we reuse the same icon for tapping and moving. I was think we should use the location marker for tapping instead so we don't repeat the icon and they look more distinct.

seadowg

These needs tests. It might be awkward to mix and match Espresso/Compose tests, but I think at least having tests for which items are shown in which "mode" would be enough.

If GeoPolyFragment stored the recordingAutomatic and recordingEnabled state in GeoPolyViewModel we could have a single Composable that gets passed that view model (and is contained in the ComposeView). That would make testing the bulk of the logic here pretty simple.

.circleci/config.yml

test-shared/src/main/java/org/odk/collect/testshared/DummyActivity.kt

geo/src/main/java/org/odk/collect/geo/geopoly/InfoDialog.kt

seadowg · 2026-01-29T15:33:31Z

.../src/test/java/org/odk/collect/android/widgets/utilities/InternalRecordingRequesterTest.java


    @Before
    public void setup() {
+        ApplicationProvider.getApplicationContext().setTheme(com.google.android.material.R.style.Theme_MaterialComponents);


Why is this change needed? If I take it out, then there's a failure, but it seems completely unrelated to everything else here.

This happens because androidx.compose.ui:ui-test-manifest provides its own test manifest, which changes the default app theme used during tests. Robolectric picks up that manifest even for non-Compose tests, and the new default theme is not AppCompat/Material.

seadowg · 2026-01-29T15:42:19Z

geo/src/main/java/org/odk/collect/geo/geopoly/GeoPolyFragment.kt


    private fun clear() {
-        inputActive = false
+        viewModel.disableInput()


Do we need this? The tests pass without it and I think whenever we call clear we've already had to call GeoPolyViewModel#stopRecording right?

I think whenever we call clear we've already had to call GeoPolyViewModel#stopRecording right?

No, it’s not guaranteed. I didn’t think much about whether it’s mandatory here or not I just tried to mirror the old implementation. So if we used to set the flag to false here, I’m doing the same now.

Gotcha. I can maybe just pull it out in the next PR if it's not needed.

geo/src/test/java/org/odk/collect/geo/geopoly/InfoDialogTest.kt

geo/src/main/java/org/odk/collect/geo/geopoly/InfoDialog.kt

WKobus · 2026-02-03T16:09:20Z

Tested with success

Verified on Android 16

Verified cases:

Info dialog from button map and from constraint snackbar
Geotrace and geoshape questions
Different map sources
Light / dark mode
RTL

srujner · 2026-02-03T16:09:32Z

Tested with success

Verified on Android 14

dbemke · 2026-02-03T16:09:52Z

Tested with success

Verified on Android 10

grzesiek2010 force-pushed the COLLECT-6961 branch 4 times, most recently from 376d119 to ff5d41b Compare January 15, 2026 14:12

grzesiek2010 force-pushed the COLLECT-6961 branch from ff5d41b to fe54103 Compare January 22, 2026 03:50

grzesiek2010 marked this pull request as ready for review January 22, 2026 04:24

grzesiek2010 requested a review from seadowg January 22, 2026 04:24

seadowg requested changes Jan 27, 2026

View reviewed changes

seadowg mentioned this pull request Jan 28, 2026

Block adding point when invalid #7052

Merged

6 tasks

grzesiek2010 added 10 commits January 28, 2026 22:29

Add info button

4c65541

Implement layouts

fb86f34

Move strings to strings.xml file

dd9055f

Make columns scrollable

b2b123c

Add a button to the error snackbar

4e0812e

Display appropriate info based on circumstances

41ae741

Update accepted apk size

793cb69

Update icon used for 'Tap to add a point'

f7c3f7a

Move recording mode state to ViewModel

d2686d7

Use recording mode from viewmodel to set up info dialog

e2bb2f4

grzesiek2010 force-pushed the COLLECT-6961 branch from c7ec087 to 73b35b8 Compare January 29, 2026 02:37

grzesiek2010 requested a review from seadowg January 29, 2026 10:17

seadowg requested changes Jan 29, 2026

View reviewed changes

.circleci/config.yml Show resolved Hide resolved

test-shared/src/main/java/org/odk/collect/testshared/DummyActivity.kt Outdated Show resolved Hide resolved

geo/src/main/java/org/odk/collect/geo/geopoly/InfoDialog.kt Outdated Show resolved Hide resolved

grzesiek2010 force-pushed the COLLECT-6961 branch from 73b35b8 to 090a449 Compare January 29, 2026 13:54

Add tests

800e0a2

grzesiek2010 force-pushed the COLLECT-6961 branch from 090a449 to 800e0a2 Compare January 29, 2026 14:17

grzesiek2010 requested a review from seadowg January 29, 2026 15:15

seadowg requested changes Jan 29, 2026

View reviewed changes

grzesiek2010 added 2 commits January 29, 2026 20:01

Fix naming

6815817

Add test for InfoContent done action

69a034f

grzesiek2010 requested a review from seadowg January 29, 2026 19:32

seadowg approved these changes Jan 30, 2026

View reviewed changes

seadowg added the needs testing label Jan 30, 2026

seadowg merged commit da310ac into getodk:master Jan 30, 2026
7 checks passed

This was referenced Jan 30, 2026

Saved points are not visible in the map until new one is added #7055

Closed

The shape remains on the map even after the points have been deleted with incremental=true. #7058

Closed

How to modify the map modal is to dark in the dark mode. #7059

Closed

dbemke added behavior verified and removed needs testing labels Feb 3, 2026

Conversation

grzesiek2010 commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why is this the best possible solution? Were any other approaches considered?

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

Do we need any specific form for testing your changes? If so, please attach one.

Does this change require updates to documentation? If so, please file an issue here and include the link below.

Before submitting this PR, please make sure you have:

Uh oh!

alyblenkin commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

seadowg left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

seadowg Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

grzesiek2010 Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

seadowg Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

grzesiek2010 Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

seadowg Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

WKobus commented Feb 3, 2026

Uh oh!

srujner commented Feb 3, 2026

Uh oh!

dbemke commented Feb 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

grzesiek2010 commented Jan 15, 2026 •

edited

Loading

alyblenkin commented Jan 15, 2026 •

edited

Loading