Merge pull request #8 from akiller/master

Adding setAllSelectedDisplayMode() to change how display reacts when all items selected
thomashaertel · Feb 20, 2017 · f20df36 · f20df36
2 parents df12693 + 4bb4d4a
commit f20df36
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/library/src/main/java/com/thomashaertel/widget/MultiSpinner.java b/library/src/main/java/com/thomashaertel/widget/MultiSpinner.java
@@ -36,12 +36,18 @@
 
 public class MultiSpinner extends TextView implements OnMultiChoiceClickListener {
 
+    public enum AllSelectedDisplayMode {
+        UseAllText,
+        DisplayAllItems
+    }
+
     private SpinnerAdapter mAdapter;
     private boolean[] mOldSelection;
     private boolean[] mSelected;
     private String mDefaultText;
     private String mAllText;
     private boolean mAllSelected;
+    private AllSelectedDisplayMode mAllSelectedDisplayMode;
     private MultiSpinnerListener mListener;
 
     public MultiSpinner(Context context) {
@@ -188,7 +194,7 @@ private void refreshSpinner() {
         String spinnerText;
 
         if (!allUnselected) {
-            if (someUnselected && !(mAllText != null && mAllText.length() > 0)) {
+            if ((someUnselected && !(mAllText != null && mAllText.length() > 0)) || mAllSelectedDisplayMode == AllSelectedDisplayMode.DisplayAllItems) {
                 spinnerText = spinnerBuffer.toString();
                 if (spinnerText.length() > 2)
                     spinnerText = spinnerText.substring(0, spinnerText.length() - 2);
@@ -217,4 +223,12 @@ public String getAllText() {
     public void setAllText(String allText) {
         this.mAllText = allText;
     }
+
+    public AllSelectedDisplayMode getAllSelectedDisplayMode() {
+        return mAllSelectedDisplayMode;
+    }
+
+    public void setAllSelectedDisplayMode(AllSelectedDisplayMode allSelectedDisplayMode) {
+        this.mAllSelectedDisplayMode = allSelectedDisplayMode;
+    }
 }