Skip to content
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.

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

Address review comments for PR 6118, 6169, 6175 #6438

Merged
merged 9 commits into from
Nov 21, 2024

Conversation

grzesiek2010
Copy link
Member

@grzesiek2010 grzesiek2010 commented Oct 2, 2024

Closes #6174

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

I was meant to handle this earlier, but I got caught up with other tasks and kept postponing it. Better late than never. I've addressed most of the comments, though not all of them (some were outdated and not relevant anymore). Some are less critical and/or too risky, as they would require retesting the functionality so I skipped them. I think what I've fixed is enough and we can merge the changes and close the issue.
The comments I skipped are:

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?

I think it doesn't require testing.

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

No.

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

@grzesiek2010 grzesiek2010 marked this pull request as draft October 2, 2024 09:41
@grzesiek2010 grzesiek2010 marked this pull request as ready for review October 2, 2024 20:29
@grzesiek2010 grzesiek2010 requested review from seadowg and removed request for lognaturel October 23, 2024 10:47
@@ -57,4 +59,14 @@ object Interactions {
onView(view).perform(ViewActions.replaceText(text))
closeSoftKeyboard()
}

fun onListItem(listId: Int, position: Int, childViewId: Int): ViewInteraction {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't really fit the pattern of the other helpers in Interactions/Assertions. Maybe instead you could pull out a custom helper (maybe to ViewMatchers) like atPositionInRecyclerView(listId: Int, position: Int, childViewId: Int): Matcher<View that you can then use with our helpers like clickOn:

clickOn(atPositionInRecyclerView(R.id.layers, 1, R.id.path))

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@grzesiek2010 grzesiek2010 requested a review from seadowg November 15, 2024 21:21
@seadowg seadowg merged commit ef74c4d into getodk:master Nov 21, 2024
6 checks passed
@seadowg
Copy link
Member

seadowg commented Nov 22, 2024

I've added "needs testing" to this as it derisks releasing it as part of the next hotfix. The main thing to check here is just a general run through of offline layer importing/management. There's no behaviour changes - just code and test improvements.

@seadowg seadowg added the high priority Should be looked at before other PRs/issues label Nov 27, 2024
@srujner
Copy link

srujner commented Nov 27, 2024

Tested with Success!

Verified on Device with Android 10,14

Verified cases:

  • Importing/Managing Offline layers;
  • Adding/Deleting Layers from Select Offline Layers panel and from Settings;
  • Regression check on forms with Geo Questions;
  • Select One from map;
  • Different map sources.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
behavior verified high priority Should be looked at before other PRs/issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Address review comments for PR 6118, 6169, 6175
3 participants