TIMOB-20267 Android: fix slider track

tidev · Jun 8, 2017 · e253a37 · e253a37
1 parent 8093ab9
commit e253a37
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/SliderProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/SliderProxy.java
@@ -17,6 +17,7 @@
 @Kroll.proxy(creatableInModule=UIModule.class, propertyAccessors = {
 	"min", "max", "minRange",
 	"maxRange", "thumbImage",
+	TiC.PROPERTY_SPLIT_TRACK,
 	"leftTrackImage","rightTrackImage",
 	TiC.PROPERTY_VALUE
 })
@@ -25,6 +26,7 @@ public class SliderProxy extends TiViewProxy
 	public SliderProxy()
 	{
 		super();
+		defaultValues.put(TiC.PROPERTY_SPLIT_TRACK, false);
 	}
 
 	@Override

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUISlider.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUISlider.java
@@ -91,11 +91,12 @@ public void processProperties(KrollDict d)
 		} else {
 			maxRange = max;
 		}
-
 		if (d.containsKey("thumbImage")) {
 			updateThumb(seekBar, d);
 		}
-
+		if (d.containsKey(TiC.PROPERTY_SPLIT_TRACK)) {
+			seekBar.setSplitTrack(TiConvert.toBoolean(d.get(TiC.PROPERTY_SPLIT_TRACK)));
+		}
 		if (d.containsKey("leftTrackImage") || d.containsKey("rightTrackImage")) {
 			updateTrackingImages(seekBar, d);
 		}
@@ -267,6 +268,8 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			//updateThumb(seekBar, proxy.getDynamicProperties());
 			//seekBar.invalidate();
 			Log.i(TAG, "Dynamically changing thumbImage is not yet supported. Native control doesn't draw");
+		} else if (key.equals(TiC.PROPERTY_SPLIT_TRACK)) {
+			seekBar.setSplitTrack(TiConvert.toBoolean(newValue));
 		} else if (key.equals("leftTrackImage") || key.equals("rightTrackImage")) {
 			//updateTrackingImages(seekBar, proxy.getDynamicProperties());
 			//seekBar.invalidate();

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -2553,6 +2553,11 @@ public class TiC
 	*/
 	public static final String PROPERTY_SPLIT_ACTIONBAR = "splitActionBar";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_SPLIT_TRACK = "splitTrack";
+
 	/**
 	 * @module.api
 	 */

diff --git a/apidoc/Titanium/UI/Slider.yml b/apidoc/Titanium/UI/Slider.yml
@@ -409,6 +409,13 @@ properties:
     type: String
     platforms: [iphone, ipad]
 
+  - name: splitTrack
+    summary: Separates the thumbImage from the slider track.
+    type: Boolean
+    default: false
+    since: 6.2.0
+    platforms: [android]
+
   - name: thumbImage
     summary: Image for the slider thumb.
     description: |