Skip to content

Fix issues with incremental question #6998

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
seadowg merged 14 commits into from
Dec 19, 2025
Merged

Fix issues with incremental question #6998

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
599a5dc
Don't answer geo questions until they are the correct length
seadowg Dec 17, 2025
5b23837
Don't dismiss same snackbar
seadowg Dec 17, 2025
a5537ec
Set empty result rather than null to clear question answer
seadowg Dec 17, 2025
72d9667
Hook up back pressed dispatcher for geo poly UI
seadowg Dec 17, 2025
2f28141
incremental is an additional (body) attribute
seadowg Dec 17, 2025
c67fbef
Fix rotate for GeoPolyFragment
seadowg Dec 18, 2025
f30097c
Add failing test for discard flow
seadowg Dec 18, 2025
695b04e
Add failing test for discard when editing a polygon
seadowg Dec 18, 2025
012d069
Fix discard flow
seadowg Dec 18, 2025
09d3f0c
Add test for discard after recreation
seadowg Dec 18, 2025
a5281f3
Simplify FragmentResultRecorder
seadowg Dec 18, 2025
4e452a8
Reduce test noise with new helpers
seadowg Dec 18, 2025
da11967
Add test for invalid length polygon defaults
seadowg Dec 18, 2025
97c7144
Make result routes distinct
seadowg Dec 18, 2025
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
Prev Previous commit
Next Next commit
Fix rotate for GeoPolyFragment
  • Loading branch information
@seadowg
seadowg committed Dec 18, 2025
commit c67fbeffa5dfaba5a24e0dfcf941e24b66bb3a3a
2 changes: 1 addition & 1 deletion collect_app/src/main/java/org/odk/collect/android/widgets/utilities/GeoPolyDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class GeoPolyDialogFragment(viewModelFactory: ViewModelProvider.Factory) :
val inputPolygon = GeoPolyUtils.parseGeometry(answer?.value as String?)

return GeoPolyFragment(
(requireDialog() as ComponentDialog).onBackPressedDispatcher,
{ (requireDialog() as ComponentDialog).onBackPressedDispatcher },
outputMode,
prompt.isReadOnly,
retainMockAccuracy,
Expand Down
4 changes: 2 additions & 2 deletions geo/src/main/java/org/odk/collect/geo/geopoly/GeoPolyFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit
import javax.inject.Inject

class GeoPolyFragment @JvmOverloads constructor(
val onBackPressedDispatcher: OnBackPressedDispatcher,
val onBackPressedDispatcher: () -> OnBackPressedDispatcher,
val outputMode: OutputMode = OutputMode.GEOTRACE,
val readOnly: Boolean = false,
val retainMockAccuracy: Boolean = false,
Expand Down Expand Up @@ -159,7 +159,7 @@ class GeoPolyFragment @JvmOverloads constructor(
}
}

onBackPressedDispatcher.addCallback(viewLifecycleOwner, onBackPressedCallback)
onBackPressedDispatcher().addCallback(viewLifecycleOwner, onBackPressedCallback)
}

override fun onSaveInstanceState(state: Bundle) {
Expand Down
44 changes: 22 additions & 22 deletions geo/src/test/java/org/odk/collect/geo/geopoly/GeoPolyFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class GeoPolyFragmentTest {
val scenario = fragmentLauncherRule.launchInContainer(
GeoPolyFragment::class.java,
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) { GeoPolyFragment(OnBackPressedDispatcher()) }
.forClass(GeoPolyFragment::class) { GeoPolyFragment({ OnBackPressedDispatcher() }) }
.build()
)
mapFragment.ready()
Expand All @@ -118,7 +118,7 @@ class GeoPolyFragmentTest {
fragmentLauncherRule.launchInContainer(
GeoPolyFragment::class.java,
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) { GeoPolyFragment(OnBackPressedDispatcher()) }
.forClass(GeoPolyFragment::class) { GeoPolyFragment({ OnBackPressedDispatcher() }) }
.build()
)

Expand All @@ -132,7 +132,7 @@ class GeoPolyFragmentTest {
fragmentLauncherRule.launchInContainer(
GeoPolyFragment::class.java,
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) { GeoPolyFragment(OnBackPressedDispatcher()) }
.forClass(GeoPolyFragment::class) { GeoPolyFragment({ OnBackPressedDispatcher() }) }
.build()
)

Expand All @@ -149,7 +149,7 @@ class GeoPolyFragmentTest {
GeoPolyFragment::class.java,
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(OnBackPressedDispatcher(), inputPolygon = polygon)
GeoPolyFragment({ OnBackPressedDispatcher() }, inputPolygon = polygon)
}
.build()
)
Expand All @@ -171,7 +171,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOSHAPE,
inputPolygon = polygon
)
Expand All @@ -196,7 +196,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOSHAPE,
inputPolygon = emptyList()
)
Expand All @@ -216,7 +216,7 @@ class GeoPolyFragmentTest {
val scenario = fragmentLauncherRule.launchInContainer(
GeoPolyFragment::class.java,
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) { GeoPolyFragment(onBackPressedDispatcher = onBackPressedDispatcher) }
.forClass(GeoPolyFragment::class) { GeoPolyFragment(onBackPressedDispatcher = { onBackPressedDispatcher }) }
.build()
)

Expand Down Expand Up @@ -244,7 +244,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE,
false,
true,
Expand All @@ -266,7 +266,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE,
false,
false,
Expand All @@ -286,7 +286,7 @@ class GeoPolyFragmentTest {
fragmentLauncherRule.launchInContainer(
GeoPolyFragment::class.java,
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) { GeoPolyFragment(OnBackPressedDispatcher()) }
.forClass(GeoPolyFragment::class) { GeoPolyFragment({ OnBackPressedDispatcher() }) }
.build()
)

Expand All @@ -303,7 +303,7 @@ class GeoPolyFragmentTest {
fragmentLauncherRule.launchInContainer(
GeoPolyFragment::class.java,
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) { GeoPolyFragment(OnBackPressedDispatcher()) }
.forClass(GeoPolyFragment::class) { GeoPolyFragment({ OnBackPressedDispatcher() }) }
.build()
)

Expand All @@ -323,7 +323,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE,
false,
false,
Expand All @@ -349,7 +349,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE,
true,
false,
Expand All @@ -375,7 +375,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE,
false,
false,
Expand All @@ -398,7 +398,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE,
true,
false,
Expand All @@ -419,7 +419,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE,
false,
true,
Expand All @@ -436,7 +436,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE,
false,
false,
Expand All @@ -454,7 +454,7 @@ class GeoPolyFragmentTest {
val scenario = fragmentLauncherRule.launchInContainer(
GeoPolyFragment::class.java,
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) { GeoPolyFragment(OnBackPressedDispatcher()) }
.forClass(GeoPolyFragment::class) { GeoPolyFragment({ OnBackPressedDispatcher() }) }
.build()
)
mapFragment.ready()
Expand All @@ -473,7 +473,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
invalidMessage = invalidMessage
)
}
Expand All @@ -495,7 +495,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOTRACE
)
}
Expand Down Expand Up @@ -539,7 +539,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
OutputMode.GEOSHAPE
)
}
Expand Down Expand Up @@ -591,7 +591,7 @@ class GeoPolyFragmentTest {
factory = FragmentFactoryBuilder()
.forClass(GeoPolyFragment::class) {
GeoPolyFragment(
OnBackPressedDispatcher(),
{ OnBackPressedDispatcher() },
inputPolygon =
listOf(
MapPoint(0.0, 0.0),
Expand Down