Add max number of states #1

Author: davidmigloz

CHANGELOG.md

@@ -1,28 +1,33 @@
 # Changelog
 
-## `1.3.1` (14/11/10)
+## `1.4.0` (17/12/18)
+
+- Fix NPE when replacing state before view being measured #3
+- Add max number of states #1
+
+## `1.3.1` (14/12/18)
 
 - Fix NPE when trying to create state bitmap #2
 
-## `1.3.0` (11/11/10)
+## `1.3.0` (11/12/18)
 
 - Add extra methods to add states from strings.
 - Fix wrong type for disabled_text_color attribute.
 
-## `1.2.1` (10/11/10)
+## `1.2.1` (10/12/18)
 
 - Prevent NPE when selecting state if view not initialised.
 
-## `1.2.0` (10/11/10)
+## `1.2.0` (10/12/18)
 
 - Allow replacing state directly from a string.
 
-## `1.1.0` (10/11/10)
+## `1.1.0` (10/12/18)
 
 - Allow replacing state without styles.
 - Allow adding state directly from a string.
 - Allow not to notify listeners when selecting state.
 
-## `1.0.0` (09/11/10)
+## `1.0.0` (09/12/18)
 
 - Initial release.

README.md

@@ -25,7 +25,7 @@ Add the dependency:
 
 ```gradle
 dependencies {
-	compile 'com.github.davidmigloz:multi-state-switch:1.3.1'
+	compile 'com.github.davidmigloz:multi-state-switch:1.4.0'
 }
 ```
 

lib/src/main/java/com/davidmiguel/multistateswitch/MultiStateSwitch.java

@@ -65,6 +65,7 @@ public class MultiStateSwitch extends View {
     private int disabledTextColor;
     @Dimension
     private int disabledTextSize;
+    private int maxNumberStates;
 
     private final Rect drawingArea = new Rect();
 
@@ -135,6 +136,7 @@ private void processAttributes(@NonNull Context context, @Nullable AttributeSet
             disabledBackgroundColor = a.getColor(R.styleable.MultiStateSwitch_multistateswitch_disabled_background_color, 0);
             disabledTextColor = a.getColor(R.styleable.MultiStateSwitch_multistateswitch_disabled_text_color, 0);
             disabledTextSize = a.getDimensionPixelSize(R.styleable.MultiStateSwitch_multistateswitch_disabled_text_size, 0);
+            maxNumberStates = a.getInt(R.styleable.MultiStateSwitch_multistateswitch_max_number_states, -1);
         } finally {
             a.recycle();
         }
@@ -158,9 +160,10 @@ private void configEditMode() {
         if (!isInEditMode()) {
             return;
         }
-        addState(new State("ONE"));
-        addState(new State("TWO"));
-        addState(new State("THREE"));
+        int numMockStates = maxNumberStates > 0 ? maxNumberStates : 3;
+        for (int i = 1; i <= numMockStates; i++) {
+            addStateFromString(Integer.toString(i));
+        }
     }
 
     /**
@@ -171,6 +174,9 @@ public void addState(@NonNull State state, @Nullable StateStyle stateStyle) {
         if (states == null) {
             createDataStructures(DEFAULT_NUM_STATES);
         }
+        if (hasMaxNumberStates() && getNumberStates() >= getMaxNumberStates()) {
+            return;
+        }
         states.add(state);
         if (stateStyle != null) {
             statesStyles.put(states.size() - 1, stateStyle);
@@ -197,6 +203,9 @@ public void addStates(@NonNull List<State> states, @Nullable List<StateStyle> st
             createDataStructures(states.size());
         }
         for (int i = 0; i < states.size(); i++) {
+            if (hasMaxNumberStates() && getNumberStates() >= getMaxNumberStates()) {
+                return;
+            }
             this.states.add(states.get(i));
             if (stateStyles != null) {
                 statesStyles.put(states.size() - 1, stateStyles.get(i));
@@ -622,6 +631,35 @@ public int getNumberStates() {
         return states != null ? states.size() : 0;
     }
 
+    /**
+     * Sets the max number of states. If you try to add a new state but the number of states is
+     * already maxNumberStates the state will be ignored. By default is -1 which means that there
+     * is no restriction.
+     * This parameter is also used to determine how many states to show in the editor preview. If
+     * it is set to no limit, 3 will be rendered by default, if not the number of states drawn will
+     * match maxNumberStates.
+     */
+    public void setMaxNumberStates(int maxNumberStates) {
+        if (maxNumberStates == 0) {
+            throw new IllegalArgumentException("Max number of states cannot be zero!");
+        }
+        this.maxNumberStates = maxNumberStates;
+    }
+
+    /**
+     * Returns max number of states. By default is -1 which means that there is no restriction.
+     */
+    public int getMaxNumberStates() {
+        return maxNumberStates;
+    }
+
+    /**
+     * Checks whether there is a limit in the number of states or not.
+     */
+    public boolean hasMaxNumberStates() {
+        return getMaxNumberStates() > 0;
+    }
+
     /**
      * Sets typeface.
      */

lib/src/main/res/values/attrs.xml

@@ -16,6 +16,7 @@
         <attr name="multistateswitch_disabled_background_color" format="color|reference" />
         <attr name="multistateswitch_disabled_text_color" format="color|reference" />
         <attr name="multistateswitch_disabled_text_size" format="dimension|reference" />
+        <attr name="multistateswitch_max_number_states" format="integer|reference" />
 
     </declare-styleable>
 </resources>

lib/src/main/res/values/styles.xml

@@ -13,5 +13,6 @@
         <item name="multistateswitch_disabled_background_color">@color/multistateswitch_white</item>
         <item name="multistateswitch_disabled_text_color">@color/multistateswitch_water_blue</item>
         <item name="multistateswitch_disabled_text_size">@dimen/multistateswitch_disabled_text_size</item>
+        <item name="multistateswitch_max_number_states">-1</item>
     </style>
 </resources>

sample/src/main/res/layout/activity_main.xml

@@ -44,10 +44,11 @@
             android:layout_width="wrap_content"
             android:layout_height="55dp"
             android:layout_marginTop="16dp"
-            app:multistateswitch_disabled_state_enabled="true"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/disabledLabel" />
+            app:layout_constraintTop_toBottomOf="@id/disabledLabel"
+            app:multistateswitch_disabled_state_enabled="true"
+            app:multistateswitch_max_number_states="5" />
 
         <TextView
             android:id="@+id/customizedLabel"
@@ -66,12 +67,12 @@
             android:layout_marginTop="16dp"
             android:paddingStart="100dp"
             android:paddingEnd="100dp"
-            app:multistateswitch_disabled_state_enabled="true"
-            app:multistateswitch_disabled_state_index="1"
-            app:multistateswitch_selected_state_index="1"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/customizedLabel" />
+            app:layout_constraintTop_toBottomOf="@id/customizedLabel"
+            app:multistateswitch_disabled_state_enabled="true"
+            app:multistateswitch_disabled_state_index="1"
+            app:multistateswitch_selected_state_index="1" />
 
         <TextView
             android:id="@+id/selectLabel"
@@ -88,27 +89,27 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/cold"
-         app:layout_constraintTop_toBottomOf="@id/selectLabel"
+            app:layout_constraintEnd_toStartOf="@id/select2Btn"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/select2Btn"/>
+            app:layout_constraintTop_toBottomOf="@id/selectLabel" />
 
         <Button
             android:id="@+id/select2Btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/off"
-            app:layout_constraintTop_toBottomOf="@id/selectLabel"
+            app:layout_constraintEnd_toStartOf="@id/select3Btn"
             app:layout_constraintStart_toEndOf="@id/select1Btn"
-            app:layout_constraintEnd_toStartOf="@id/select3Btn"/>
+            app:layout_constraintTop_toBottomOf="@id/selectLabel" />
 
         <Button
             android:id="@+id/select3Btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/hot"
-            app:layout_constraintTop_toBottomOf="@id/selectLabel"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/select2Btn"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintTop_toBottomOf="@id/selectLabel" />
 
         <TextView
             android:id="@+id/listenerLabel"