Added integer toggle values - warning: Listener changed

Author: Beppi Menozzi

.idea/misc.xml

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

tristatetogglebutton_library/build.gradle

@@ -41,11 +41,29 @@ private ToggleStatus attrToStatus(String attr) {
 		else return on;
 	}
 
-	// Beppi: static shortcut for handling boolean values with 2-state. mid = false.
-	private boolean toggleStatusToBoolean(ToggleStatus toggleStatus) {
+	// Beppi: static shortcuts for handling boolean values with 2-state. mid = false.
+	public static boolean toggleStatusToBoolean(ToggleStatus toggleStatus) {
 		if (toggleStatus == on) return true;
 		else return false;
 	}
+	public static ToggleStatus booleanToToggleStatus(boolean toggleStatus) {
+		if (toggleStatus) return on;
+		else return off;
+	}
+	// Beppi: same with integers
+	public static int toggleStatusToInt(ToggleStatus toggleStatus) {
+		switch (toggleStatus) {
+			case off: return 0;
+			case mid: return 1;
+			case on:
+			default: return 2;
+		}
+	}
+	public static ToggleStatus intToToggleStatus(int toggleIntValue) {
+		if (toggleIntValue == 0) return off;
+		else if (toggleIntValue == 1) return mid;
+		else return on;
+	}
 
 
 	private SpringSystem springSystem;
@@ -203,29 +221,29 @@ public void toggle(boolean animate) {
 		takeEffect(animate);
 
 		if(listener != null){
-			listener.onToggle(toggleStatus, toggleStatusToBoolean(toggleStatus));
+			listener.onToggle(toggleStatus, toggleStatusToBoolean(toggleStatus), toggleStatusToInt(toggleStatus));
 		}
 	}
 
 	public void toggleOn() {
 		setToggleOn();
 		if(listener != null){
-			listener.onToggle(toggleStatus, toggleStatusToBoolean(toggleStatus));
+			listener.onToggle(toggleStatus, toggleStatusToBoolean(toggleStatus), toggleStatusToInt(toggleStatus));
 		}
 	}
 
 	public void toggleOff() {
 		setToggleOff();
 		if(listener != null){
-			listener.onToggle(toggleStatus, toggleStatusToBoolean(toggleStatus));
+			listener.onToggle(toggleStatus, toggleStatusToBoolean(toggleStatus), toggleStatusToInt(toggleStatus));
 		}
 	}
 
 	// Beppi: added method to handle the mid value
 	public void toggleMid() {
 		setToggleMid();
 		if(listener != null){
-			listener.onToggle(toggleStatus, toggleStatusToBoolean(toggleStatus));
+			listener.onToggle(toggleStatus, toggleStatusToBoolean(toggleStatus), toggleStatusToInt(toggleStatus));
 		}
 	}
 
@@ -292,6 +310,12 @@ public void setToggleStatus(boolean toggleStatus, boolean animate) {
 		else 				putValueInToggleStatus(off);
 		takeEffect(animate);
 	}
+	public void setToggleStatus(int toggleIntValue) {
+		setToggleStatus(toggleIntValue, true);
+	}
+	public void setToggleStatus(int toggleIntValue, boolean animate) {
+		setToggleStatus(intToToggleStatus(toggleIntValue), animate);
+	}
 
 	// Beppi: rewritten takeEffect() method to manage 3 states
 /*
@@ -384,7 +408,6 @@ private int clamp(int value, int low, int high) {
 
 	@Override
 	public void draw(Canvas canvas) {
-		// Beppi: added enabled management
 		rect.set(0, 0, getWidth(), getHeight());
 		paint.setColor(borderColor);
 		canvas.drawRoundRect(rect, radius, radius, paint);
@@ -502,7 +525,7 @@ public interface OnToggleChanged{
 		 */
 		// Beppi: changed according to 3 states value
 //		public void onToggle(boolean on);
-		public void onToggle(ToggleStatus toggleStatus, boolean booleanToggleStatus);
+		public void onToggle(ToggleStatus toggleStatus, boolean booleanToggleStatus, int toggleIntValue);
 	}
 
 	public void setOnToggleChanged(OnToggleChanged onToggleChanged) {

tristatetogglebutton_library/src/main/java/it/beppi/tristatetogglebutton_library/TriStateToggleButton.java

@@ -34,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) {
         tstb_1_text.setText("Off");
         tstb_1.setOnToggleChanged(new TriStateToggleButton.OnToggleChanged() {
             @Override
-            public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean booleanToggleStatus) {
+            public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean booleanToggleStatus, int toggleIntValue) {
                 switch (toggleStatus) {
                     case off: tstb_1_text.setText("Off"); break;
                     case mid: tstb_1_text.setText("Half way"); break;
@@ -48,7 +48,7 @@ public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean boo
         tstb_2_text.setText("Almost...");
         tstb_2.setOnToggleChanged(new TriStateToggleButton.OnToggleChanged() {
             @Override
-            public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean booleanToggleStatus) {
+            public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean booleanToggleStatus, int toggleIntValue) {
                 switch (toggleStatus) {
                     case off: tstb_2_text.setText("Off"); break;
                     case mid: tstb_2_text.setText("Almost..."); break;
@@ -62,7 +62,7 @@ public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean boo
         tstb_3_text.setText("undefined");
         tstb_3.setOnToggleChanged(new TriStateToggleButton.OnToggleChanged() {
             @Override
-            public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean booleanToggleStatus) {
+            public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean booleanToggleStatus, int toggleIntValue) {
                 switch (toggleStatus) {
                     case off: tstb_3_text.setText("False"); break;
                     case mid: tstb_3_text.setText("undefined"); break;
@@ -75,7 +75,7 @@ public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean boo
 
         tstb_4.setOnToggleChanged(new TriStateToggleButton.OnToggleChanged() {
             @Override
-            public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean booleanToggleStatus) {
+            public void onToggle(TriStateToggleButton.ToggleStatus toggleStatus, boolean booleanToggleStatus, int toggleIntValue) {
                 tstb_3.setEnabled(booleanToggleStatus);
             }
         });