Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-20267] Android: fix slider track showing #8863

Merged
merged 2 commits into from
Jun 8, 2017
Merged

[TIMOB-20267] Android: fix slider track showing #8863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e253a37
TIMOB-20267 Android: fix slider track
Jun 8, 2017
08f415d
Merge branch 'master' into timob-20267
ssjsamir Jun 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions android/modules/ui/src/java/ti/modules/titanium/ui/SliderProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
@Kroll.proxy(creatableInModule=UIModule.class, propertyAccessors = {
"min", "max", "minRange",
"maxRange", "thumbImage",
TiC.PROPERTY_SPLIT_TRACK,
"leftTrackImage","rightTrackImage",
TiC.PROPERTY_VALUE
})
Expand All @@ -25,6 +26,7 @@ public class SliderProxy extends TiViewProxy
public SliderProxy()
{
super();
defaultValues.put(TiC.PROPERTY_SPLIT_TRACK, false);
}

@Override
Expand Down
7 changes: 5 additions & 2 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUISlider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you guard this line to apply only for API 21 and above? It causes crashes on lower levels since it was added for Lollipop.

https://developer.android.com/reference/android/widget/AbsSeekBar.html#setSplitTrack(boolean)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch Yordan.

We also have to watch out in case the property value is not a boolean. So, the code should look something like this...

if (Build.VERSION.SDK_INT  >= 21) {
	ApiLevel21.setSplitTrack(this.seekBar, TiConvert.toBoolean([[value]], false));
}

private static class ApiLevel21
{
	private ApiLevel21() {}

	public void setSplitTrack(SeekBar seekBar, boolean enabled)
	{
		if (seekBar != null) {
			seekBar.setSplitTrack(enabled);
		}
	}
}

The static inner class above avoids the opcode warning on the lower API levels.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also here:
https://github.com/fmerzadyan/titanium_mobile/blob/08f415de7f9d395a015618ea279ef2f586f51e14/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUISlider.java#L272

}
if (d.containsKey("leftTrackImage") || d.containsKey("rightTrackImage")) {
updateTrackingImages(seekBar, d);
}
Expand Down Expand Up @@ -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();
Expand Down
5 changes: 5 additions & 0 deletions android/titanium/src/java/org/appcelerator/titanium/TiC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
7 changes: 7 additions & 0 deletions apidoc/Titanium/UI/Slider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down