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

Move entities package from JavaRosa #6236

Merged
merged 9 commits into from
Jul 10, 2024
Merged

Conversation

seadowg
Copy link
Member

@seadowg seadowg commented Jun 27, 2024

Blocked by getodk/javarosa#772

This allows us to iterate on entities without as much back and forth between Collect and JavaRosa changes.

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

I could have converted more classes to Kotlin, but there's a lot of code here and I felt like that would easier to review on a case by case basis as we touch those classes.

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?

A lot of code has been moved, and a few things have been converted to Kotlin, so there's definitely a risk of type conversion problems. The most important things to look at will be form loading and finalization, especially for forms with entities.

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

@lognaturel lognaturel changed the title Move entites package to Collect Move entities package to Collect Jun 27, 2024
@lognaturel lognaturel changed the title Move entities package to Collect Move entities package from JavaRosa Jun 27, 2024
@seadowg seadowg force-pushed the entities-package branch from 73990a2 to e20e401 Compare July 4, 2024 09:07
@seadowg seadowg removed the blocked label Jul 4, 2024
@seadowg seadowg marked this pull request as ready for review July 4, 2024 12:10
@seadowg seadowg requested a review from grzesiek2010 July 8, 2024 14:26
@seadowg seadowg force-pushed the entities-package branch from 392e89d to 0e9b96a Compare July 8, 2024 14:26
@seadowg seadowg requested a review from lognaturel July 9, 2024 14:34
@seadowg seadowg mentioned this pull request Jul 9, 2024
6 tasks
@lognaturel
Copy link
Member

Am I understanding correctly that the next steps are to put in a JR PR to remove these same files, merge to master, do some quick QA?

Is the entities.javarosa subpackage named that way because it interacts closely with the JR API? I think I'd mostly expect that functionality to be directly in entities but maybe there's a benefit to the subpackage that I'm not seeing.

@seadowg
Copy link
Member Author

seadowg commented Jul 10, 2024

Am I understanding correctly that the next steps are to put in a JR PR to remove these same files, merge to master, do some quick QA?

Yup! There was a bit of "chicken n' egg"-ing going on here where I needed to expose scenario, move everything over and then finally delete so as not to break anything (due to auto snapshot releases).

Is the entities.javarosa subpackage named that way because it interacts closely with the JR API?

Spot on. Basically Collect now has some code that's for its own entities implementation and then some that's its JavaRosa "plugin".

@seadowg seadowg merged commit b0b0212 into getodk:master Jul 10, 2024
6 checks passed
@seadowg seadowg deleted the entities-package branch July 10, 2024 08:10
@grzesiek2010
Copy link
Member

@seadowg don't you think this pr needs testing? You didn't add the label.

@seadowg
Copy link
Member Author

seadowg commented Jul 10, 2024

Whoops! Adding now. I usually only add it after reviewing so generally don't do it for my own PRs. Are you thinking of it the other way around?

@grzesiek2010
Copy link
Member

I usually only add it after reviewing so generally don't do it for my own PRs. Are you thinking of it the other way around?

I don't have any strong preferences. Usually, I review and manage immediately. In such cases, I add the label. The person who merges should at least double-check tha the label is there.

@dbemke
Copy link

dbemke commented Jul 11, 2024

Tested with Success!

Verified on a device with Android 10

Verified Cases:

  • registration and update forms
  • saving, sending, finalizing forms

@WKobus
Copy link

WKobus commented Jul 11, 2024

Tested with Success!

Verified on a device with Android 14

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants