Skip to content

Instantly share code, notes, and snippets.

@znck

znck/a.rb

Last active August 29, 2015 14:02
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save znck/05eb52613036873e11ee to your computer and use it in GitHub Desktop.
Save znck/05eb52613036873e11ee to your computer and use it in GitHub Desktop.
Download ZIP
Raw
a.rb
Merge made by the 'recursive' strategy.
assets/PersonOdml.xml | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
project.properties | 2 +-
res/layout/form_row.xml | 12 +++---
res/menu/form_detail_menu.xml | 11 ++++++
res/menu/form_edit_menu.xml | 11 +-----
res/menu/form_list_menu.xml | 7 ++++
res/menu/form_local_edit_menu.xml | 18 ++++++---
res/values/colors.xml | 1 +
res/values/strings.xml | 1 +
src/cz/zcu/kiv/eeg/mobile/base2/data/Values.java | 14 ++++++-
src/cz/zcu/kiv/eeg/mobile/base2/data/adapter/FormAdapter.java | 12 ++++++
src/cz/zcu/kiv/eeg/mobile/base2/data/adapter/SubformAdapter.java | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/cz/zcu/kiv/eeg/mobile/base2/data/builders/FormBuilder.java | 83 +++++++++++++++++++++++++-------------
src/cz/zcu/kiv/eeg/mobile/base2/data/builders/OdmlBuilder.java | 2 +-
src/cz/zcu/kiv/eeg/mobile/base2/data/builders/ViewBuilder.java | 331 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
src/cz/zcu/kiv/eeg/mobile/base2/data/dao/DataDAO.java | 66 ++++++++++++++++++++++---------
src/cz/zcu/kiv/eeg/mobile/base2/data/dao/DatabaseHelper.java | 2 +-
src/cz/zcu/kiv/eeg/mobile/base2/data/dao/FieldDAO.java | 8 ++++
src/cz/zcu/kiv/eeg/mobile/base2/data/dao/LayoutDAO.java | 6 +--
src/cz/zcu/kiv/eeg/mobile/base2/data/dao/LayoutPropertyDAO.java | 20 +++++-----
src/cz/zcu/kiv/eeg/mobile/base2/data/dao/MenuItemsDAO.java | 15 ++++++-
src/cz/zcu/kiv/eeg/mobile/base2/data/editor/SubformActionMode.java | 89 +++++++++++++++++++++++++++++++++++++++++
src/cz/zcu/kiv/eeg/mobile/base2/data/model/Dataset.java | 2 +
src/cz/zcu/kiv/eeg/mobile/base2/data/model/Form.java | 1 +
src/cz/zcu/kiv/eeg/mobile/base2/data/model/Layout.java | 40 +++++++++++++------
src/cz/zcu/kiv/eeg/mobile/base2/data/model/LayoutProperty.java | 47 ++++++++++++++++++++++
src/cz/zcu/kiv/eeg/mobile/base2/data/model/MenuItems.java | 32 +++++++--------
src/cz/zcu/kiv/eeg/mobile/base2/data/model/ViewNode.java | 108 +++++++++++++++++++++++++++++++++++++++-----------
src/cz/zcu/kiv/eeg/mobile/base2/ui/field/FieldAddFragment.java | 2 +-
src/cz/zcu/kiv/eeg/mobile/base2/ui/form/FormActivity.java | 31 +++++++--------
src/cz/zcu/kiv/eeg/mobile/base2/ui/form/FormDetailsActivity.java | 48 +++++++++++++++++++---
src/cz/zcu/kiv/eeg/mobile/base2/ui/form/FormDetailsFragment.java | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
src/cz/zcu/kiv/eeg/mobile/base2/ui/form/ListAllFormsFragment.java | 98 +++++++++++++++++++++++++++++----------------
src/cz/zcu/kiv/eeg/mobile/base2/ui/main/DashboardActivity.java | 7 ++--
src/cz/zcu/kiv/eeg/mobile/base2/ws/FetchDataTask.java | 42 +++++++++++++++++++-
src/cz/zcu/kiv/eeg/mobile/base2/ws/TaskFragment.java | 6 ++-
36 files changed, 1414 insertions(+), 362 deletions(-)
create mode 100644 res/menu/form_detail_menu.xml
create mode 100644 src/cz/zcu/kiv/eeg/mobile/base2/data/adapter/SubformAdapter.java
create mode 100644 src/cz/zcu/kiv/eeg/mobile/base2/data/editor/SubformActionMode.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment