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.

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

Jump to bottom

FormHierarchy cleanup #2730

Merged
merged 19 commits into from
Nov 21, 2018
Merged

FormHierarchy cleanup #2730

merged 19 commits into from
Nov 21, 2018

Commits on Nov 5, 2018

  1. Use existing FormController variable which can't be null

    @lognaturel
    lognaturel committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    cefc122 View commit details
    Browse the repository at this point in the history

  2. Extract configureButtons method

    @lognaturel
    lognaturel committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    a563e99 View commit details
    Browse the repository at this point in the history

  3. Override configureButtons in view-only hiearchy

    @lognaturel
    lognaturel committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    505d4a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. Remove step to top of form or group in view-only hierarchy 

    Introduced at https://github.com/grzesiek2010/collect/blob/2ecb17048d6ef1f6779dce5276a7c7e623d218b7/collect_app/src/main/java/org/odk/collect/android/activities/FormHierarchyActivity.java#L116 with the view-only mode. Would be useful if current index could be set when the view-only activity is opened but that doesn't seem possible since the activity is not launched from form filling.
    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    914ca44 View commit details
    Browse the repository at this point in the history

  2. Move the click behavior to the base class and add comment

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    0a61206 View commit details
    Browse the repository at this point in the history

  3. Extract method to handle question click

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    561f8ea View commit details
    Browse the repository at this point in the history

  4. Put default back button behavior in base class

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    f02a54e View commit details
    Browse the repository at this point in the history

  5. Make the FormHierarchyActivity the default and remove edit

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    9280d8d View commit details
    Browse the repository at this point in the history

  6. Rename and comment view-only hierarchy class

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    f1937a8 View commit details
    Browse the repository at this point in the history

  7. Use enum for element types

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    8ec7742 View commit details
    Browse the repository at this point in the history

  8. Clarify meaning of the element list

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    5f58bb2 View commit details
    Browse the repository at this point in the history

  9. Clarify meaning of path field

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    6573309 View commit details
    Browse the repository at this point in the history

  10. Clarify meaning of startIndex field

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    2bd51d9 View commit details
    Browse the repository at this point in the history

  11. Explain code that scrolls hierarchy to last edited question

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    beb151d View commit details
    Browse the repository at this point in the history

  12. Explain refreshView and currentIndex 

    The removed comment was incorrect -- startIndex is used when the back button is pressed.
    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    2d45af1 View commit details
    Browse the repository at this point in the history

  13. Comment HierarchyElement class

    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    eabe0ee View commit details
    Browse the repository at this point in the history

  14. Remove unreachable null block 

    The @nonnull annotations in HierarchyElement make this impossible. The null check was added in https://github.com/opendatakit/collect/blob/77f4f2eadc5302c9968e9cb332fb090018e9681f/src/org/odk/collect/android/activities/FormHierarchyActivity.java#L308 and I am pretty sure that it was needed only because of the .. entry added with an explicitly null index (https://github.com/opendatakit/collect/blob/77f4f2eadc5302c9968e9cb332fb090018e9681f/src/org/odk/collect/android/activities/FormHierarchyActivity.java#L186)
    @lognaturel
    lognaturel committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    2c5a701 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2018

  1. Refactor to prevent audits from ViewOnlyFormHierarchyActivity

    @cooperka @shobhitagarwal1612
    cooperka authored and shobhitagarwal1612 committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    0657bbf View commit details
    Browse the repository at this point in the history

  2. Remove unused imports

    @shobhitagarwal1612
    shobhitagarwal1612 committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    11e26de View commit details
    Browse the repository at this point in the history