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

Respect short label forms #2186

Merged
merged 1 commit into from
May 15, 2018
Merged

Conversation

grzesiek2010
Copy link
Member

@grzesiek2010 grzesiek2010 commented May 11, 2018

Closes #1401

What has been done to verify that this works as intended?

I tested the attached form.

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

Are there any risks to merging this code? If so, what are they?

No.

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

ShorLabel.xml.txt

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

Hmmm I'm not sure...

Before submitting this PR, please make sure you have:

  • run ./gradlew pmd checkstyle lint findbugs and confirmed all checks still pass.
  • verified that any new UI elements use theme colors so that they work with both light and dark themes.

Copy link
Member

@lognaturel lognaturel left a comment

Choose a reason for hiding this comment

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

Small opportunity to reduce redundancy but otherwise looks good!

@@ -398,4 +398,14 @@ public void onClick(DialogInterface dialog, int i) {
alertDialog.setButton(getString(R.string.ok), errorListener);
alertDialog.show();
}

private String getLabel(FormEntryPrompt formEntryPrompt) {
Copy link
Member

Choose a reason for hiding this comment

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

You shouldn't need this one -- FormEntryPrompt extends FormEntryCaption.

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, thanks, it's fixed

@mmarciniak90
Copy link
Contributor

Tested with success!

Verified on Android 4.1, 4.2, 4.4, 5.1, 6.0, 8.1

long short
screenshot_20180515-114202 screenshot_20180515-114051

@opendatakit-bot label "behavior verified"
@opendatakit-bot unlabel "needs testing"

@lognaturel lognaturel merged commit 3715f90 into getodk:master May 15, 2018
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.

4 participants