Merge pull request getodk#3531 from grzesiek2010/COLLECT-3530

Fixed readOnly in select widgets
grzesiek2010 · Dec 16, 2019 · 0f6558c · 0f6558c
2 parents 90b6122 + b87c46b
commit 0f6558c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/collect_app/src/main/java/org/odk/collect/android/adapters/AbstractSelectListAdapter.java b/collect_app/src/main/java/org/odk/collect/android/adapters/AbstractSelectListAdapter.java
@@ -202,7 +202,6 @@ View setUpNoButtonsView(int index) {
             view = missingImage;
         }
 
-        view.setEnabled(!getFormEntryPrompt().isReadOnly());
         int itemPadding = context.getResources().getDimensionPixelSize(R.dimen.select_item_border);
         int paddingStartEnd = context.getResources().getDimensionPixelSize(R.dimen.margin_standard);
         view.setPadding(paddingStartEnd, itemPadding, paddingStartEnd, itemPadding);
@@ -244,6 +243,7 @@ void bind(final int index) {
                 view.removeAllViews();
                 view.addView(setUpNoButtonsView(index));
                 view.setOnClickListener(v -> onItemClick(filteredItems.get(index).selection(), v));
+                view.setEnabled(!getFormEntryPrompt().isReadOnly());
             } else {
                 addMediaFromChoice(audioVideoImageTextLabel, index, createButton(index, audioVideoImageTextLabel), filteredItems);
                 audioVideoImageTextLabel.setEnabled(!getFormEntryPrompt().isReadOnly());

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/LikertWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/LikertWidget.java
@@ -150,6 +150,7 @@ public void setStructures() {
 
             optionView.addView(choice);
 
+            optionView.setEnabled(!getFormEntryPrompt().isReadOnly());
             optionView.setOnClickListener(new OnClickListener() {
 
                 @Override