From 8a3c86ac1d752df55a7bd1d86cf7b9a3e2cde2ee Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 3 Jun 2016 11:09:39 +0000 Subject: [PATCH] added checkboxes in the Phrasebook UI --- .../res/layout/checkbox_input_list_item.xml | 13 +++++++++ .../se/chalmers/phrasebook/backend/Model.java | 3 ++ .../backend/syntax/SyntaxNodeBoolean.java | 7 +++++ .../gui/fragments/TranslatorFragment.java | 29 ++++++++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 src/ui/android/res/layout/checkbox_input_list_item.xml create mode 100644 src/ui/android/src/se/chalmers/phrasebook/backend/syntax/SyntaxNodeBoolean.java diff --git a/src/ui/android/res/layout/checkbox_input_list_item.xml b/src/ui/android/res/layout/checkbox_input_list_item.xml new file mode 100644 index 000000000..255d0ae8d --- /dev/null +++ b/src/ui/android/res/layout/checkbox_input_list_item.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/ui/android/src/se/chalmers/phrasebook/backend/Model.java b/src/ui/android/src/se/chalmers/phrasebook/backend/Model.java index fe49b0909..b5ebf430d 100644 --- a/src/ui/android/src/se/chalmers/phrasebook/backend/Model.java +++ b/src/ui/android/src/se/chalmers/phrasebook/backend/Model.java @@ -108,6 +108,9 @@ public class Model { } else if (node.getNodeName().equals("option")) { SyntaxNode[] options = constructSyntaxNodeList(node, ids, calls); return new SyntaxNodeOption(desc, options); + } else if (node.getNodeName().equals("boolean")) { + SyntaxNode[] options = constructSyntaxNodeList(node, ids, calls); + return new SyntaxNodeBoolean(desc, options); } else if (node.getNodeName().equals("call")) { if (attributes.getNamedItem("ref") == null) return null; diff --git a/src/ui/android/src/se/chalmers/phrasebook/backend/syntax/SyntaxNodeBoolean.java b/src/ui/android/src/se/chalmers/phrasebook/backend/syntax/SyntaxNodeBoolean.java new file mode 100644 index 000000000..da1e95e04 --- /dev/null +++ b/src/ui/android/src/se/chalmers/phrasebook/backend/syntax/SyntaxNodeBoolean.java @@ -0,0 +1,7 @@ +package se.chalmers.phrasebook.backend.syntax; + +public class SyntaxNodeBoolean extends SyntaxNodeOption { + public SyntaxNodeBoolean(String desc, SyntaxNode[] options) { + super(desc,options); + } +} diff --git a/src/ui/android/src/se/chalmers/phrasebook/gui/fragments/TranslatorFragment.java b/src/ui/android/src/se/chalmers/phrasebook/gui/fragments/TranslatorFragment.java index d6a6edf87..cb5d50841 100644 --- a/src/ui/android/src/se/chalmers/phrasebook/gui/fragments/TranslatorFragment.java +++ b/src/ui/android/src/se/chalmers/phrasebook/gui/fragments/TranslatorFragment.java @@ -62,7 +62,9 @@ public class TranslatorFragment extends Fragment { public View getView (int position, View convertView, ViewGroup parent) { SyntacticChoice choice = mContext.getChoices().get(position); View view = null; - if (choice.getNode() instanceof SyntaxNodeOption) { + if (choice.getNode() instanceof SyntaxNodeBoolean) { + view = createCheckBoxInputView(inflater, choice, (SyntaxNodeBoolean) choice.getNode(), parent); + } else if (choice.getNode() instanceof SyntaxNodeOption) { view = createSpinnerInputView(inflater, choice, (SyntaxNodeOption) choice.getNode(), parent); } else if (choice.getNode() instanceof SyntaxNodeNumeral) { view = createNumeralInputView(inflater, choice, (SyntaxNodeNumeral) choice.getNode(), parent); @@ -215,6 +217,31 @@ public class TranslatorFragment extends Fragment { return view; } + private View createCheckBoxInputView(LayoutInflater inflater, final SyntacticChoice choice, final SyntaxNodeBoolean options, ViewGroup parent) { + View view = inflater.inflate(R.layout.checkbox_input_list_item, parent, false); + final CheckBox checkBox = (CheckBox) view.findViewById(R.id.choice_checkbox); + + String label = options.getDesc(); + if (label != null && !label.isEmpty()) { + checkBox.setText(label); + } + + checkBox.setChecked(choice.getChoice() == 1); + checkBox.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View view) { + int position = checkBox.isChecked() ? 1 : 0; + if (position != choice.getChoice()) { + choice.setChoice(position); + updateSyntax(); + } + } + }); + + return view; + } + public void updateSyntax() { mContext.reset();