Skip to content

Add info button to trace/shape questions #7021

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 13 commits into from
Jan 30, 2026
Merged

Add info button to trace/shape questions #7021

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4c65541
Add info button
grzesiek2010 Jan 14, 2026
fb86f34
Implement layouts
grzesiek2010 Jan 15, 2026
dd9055f
Move strings to strings.xml file
grzesiek2010 Jan 15, 2026
b2b123c
Make columns scrollable
grzesiek2010 Jan 15, 2026
4e0812e
Add a button to the error snackbar
grzesiek2010 Jan 15, 2026
41ae741
Display appropriate info based on circumstances
grzesiek2010 Jan 15, 2026
793cb69
Update accepted apk size
grzesiek2010 Jan 15, 2026
f7c3f7a
Update icon used for 'Tap to add a point'
grzesiek2010 Jan 22, 2026
d2686d7
Move recording mode state to ViewModel
grzesiek2010 Jan 29, 2026
e2bb2f4
Use recording mode from viewmodel to set up info dialog
grzesiek2010 Jan 29, 2026
800e0a2
Add tests
grzesiek2010 Jan 29, 2026
6815817
Fix naming
grzesiek2010 Jan 29, 2026
69a034f
Add test for InfoContent done action
grzesiek2010 Jan 29, 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
Prev Previous commit
Add test for InfoContent done action
  • Loading branch information
@grzesiek2010
grzesiek2010 committed Jan 29, 2026
commit 69a034f9a136701ff5608238be1c223ce5e3f7f8
35 changes: 29 additions & 6 deletions geo/src/test/java/org/odk/collect/geo/geopoly/InfoContentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ import android.app.Application
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollTo
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.hamcrest.CoreMatchers.equalTo
import org.hamcrest.MatcherAssert.assertThat
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
Expand All @@ -28,7 +31,7 @@ class InfoContentTest {
}

composeTestRule.setContent {
InfoContent(viewModel, fromSnackbar = true, {})
InfoContent(viewModel, fromSnackbar = true) {}
}

assertInfo(
Expand All @@ -48,7 +51,7 @@ class InfoContentTest {
}

composeTestRule.setContent {
InfoContent(viewModel, fromSnackbar = false, {})
InfoContent(viewModel, fromSnackbar = false) {}
}

assertInfo(
Expand All @@ -68,7 +71,7 @@ class InfoContentTest {
}

composeTestRule.setContent {
InfoContent(viewModel, fromSnackbar = true, {})
InfoContent(viewModel, fromSnackbar = true) {}
}

assertInfo(
Expand All @@ -88,7 +91,7 @@ class InfoContentTest {
}

composeTestRule.setContent {
InfoContent(viewModel, fromSnackbar = false, {})
InfoContent(viewModel, fromSnackbar = false) {}
}

assertInfo(
Expand All @@ -109,7 +112,7 @@ class InfoContentTest {
}

composeTestRule.setContent {
InfoContent(viewModel, fromSnackbar = true, {})
InfoContent(viewModel, fromSnackbar = true) {}
}

assertInfo(
Expand All @@ -129,7 +132,7 @@ class InfoContentTest {
}

composeTestRule.setContent {
InfoContent(viewModel, fromSnackbar = false, {})
InfoContent(viewModel, fromSnackbar = false) {}
}

assertInfo(
Expand All @@ -143,6 +146,26 @@ class InfoContentTest {
)
}

@Test
fun `calls onDone when Done button is clicked`() {
val viewModel = mock<GeoPolyViewModel>().apply {
whenever(recordingMode).thenReturn(GeoPolyViewModel.RecordingMode.PLACEMENT)
}

var onDoneCalled = false

composeTestRule.setContent {
InfoContent(viewModel, false) { onDoneCalled = true }
}

composeTestRule
.onNodeWithText(context.getString(org.odk.collect.strings.R.string.done))
.assertIsDisplayed()
.performClick()

assertThat(onDoneCalled, equalTo(true))
}

private fun assertInfo(items: List<Int>) {
items.forEach {
composeTestRule
Expand Down