Navigation Bar #35
Merged
Navigation Bar #35
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: res/values/colors.xml
… the form's edges
Fixed behavior for "Finish" button popping in too late on question lists with optional questions Updated icons to proper flatness. Introduced a depression state on the navigation buttons to signify "presses"
…ether it will exit the form if conditional repeats are followed
… edge cases in form navigation
Conflicts: res/values/styles.xml src/org/odk/collect/android/activities/FormEntryActivity.java src/org/odk/collect/android/views/ODKView.java
…enabled on new releases by hand.
| android:gravity="center" | ||
| android:paddingBottom="1dp" | ||
| android:paddingTop="1dp" | ||
| android:text="DESHYDRATION" > |
There was a problem hiding this comment.
Is this supposed to be here? Though I assume it gets overwritten elsewhere so it doesn't really matter.
There was a problem hiding this comment.
Oh, good point. Bad form regardless of overwrite. Fixing
|
A couple of minor questions above, otherwise looks great to me. |
|
Cool, I think I've addressed all of the comments but let me know if you On Fri, Oct 3, 2014 at 11:05 AM, Jenny Schweers notifications@github.com
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Navigation bar implementation wired in. Interacts properly with the progress bar now so that it can be enabled/disabled and takes the place of the progress bar when enabled.