[TIMOB-18062] iOS: AttributedString Parity with Android #6463
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /** | ||
| * Appcelerator Titanium Mobile | ||
| * Copyright (c) 2014-2015 by Appcelerator, Inc. All Rights Reserved. | ||
| * Licensed under the terms of the Apache Public License | ||
| * Please see the LICENSE included with this distribution for details. | ||
| */ | ||
| package ti.modules.titanium.ui; | ||
|
|
||
| import org.appcelerator.kroll.KrollProxy; | ||
| import org.appcelerator.kroll.annotations.Kroll; | ||
| import org.appcelerator.titanium.TiC; | ||
|
|
||
| @Kroll.proxy(propertyAccessors = { | ||
| TiC.PROPERTY_TYPE, | ||
| TiC.PROPERTY_VALUE, | ||
| TiC.PROPERTY_ATTRIBUTE_RANGE, | ||
| }) | ||
| public class AttributeProxy extends KrollProxy | ||
| { | ||
| protected AttributeProxy() | ||
| { | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. #6409 (diff)
#6409 (diff)
#6409 (diff)
|
||
| @Override | ||
| public String getApiName() | ||
| { | ||
| return "Ti.UI.Attribute"; | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| /** | ||
| * Appcelerator Titanium Mobile | ||
| * Copyright (c) 2014-2015 by Appcelerator, Inc. All Rights Reserved. | ||
| * Licensed under the terms of the Apache Public License | ||
| * Please see the LICENSE included with this distribution for details. | ||
| */ | ||
| package ti.modules.titanium.ui; | ||
|
|
||
| import java.util.HashMap; | ||
|
|
||
| import org.appcelerator.kroll.KrollDict; | ||
| import org.appcelerator.kroll.KrollProxy; | ||
| import org.appcelerator.kroll.annotations.Kroll; | ||
| import org.appcelerator.kroll.common.Log; | ||
| import org.appcelerator.titanium.TiC; | ||
| import org.appcelerator.titanium.proxy.TiViewProxy; | ||
| import org.appcelerator.titanium.util.TiConvert; | ||
| import org.appcelerator.titanium.util.TiUIHelper; | ||
|
|
||
| import android.app.Activity; | ||
| import android.text.Spannable; | ||
| import android.text.SpannableString; | ||
| import android.text.TextUtils; | ||
| import android.text.style.AbsoluteSizeSpan; | ||
| import android.text.style.BackgroundColorSpan; | ||
| import android.text.style.ForegroundColorSpan; | ||
| import android.text.style.StrikethroughSpan; | ||
| import android.text.style.StyleSpan; | ||
| import android.text.style.TypefaceSpan; | ||
| import android.text.style.URLSpan; | ||
| import android.text.style.UnderlineSpan; | ||
|
|
||
| @Kroll.proxy(creatableInModule=UIModule.class, propertyAccessors = { | ||
| TiC.PROPERTY_ATTRIBUTES, | ||
|
There was a problem hiding this comment. TiC.PROPERTY_ATTRIBUTES was added to propertyAccessors. |
||
| TiC.PROPERTY_TEXT | ||
| }) | ||
| public class AttributedStringProxy extends KrollProxy | ||
| { | ||
| private static final String TAG = "AttributedString"; | ||
|
|
||
| public AttributedStringProxy() | ||
| { | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Removed method:
#6409 (diff)
There was a problem hiding this comment. Removed method:
|
||
| @Kroll.method | ||
| public void addAttribute(Object attr) | ||
| { | ||
| AttributeProxy attribute; | ||
| KrollDict attributeDict = null; | ||
| if (attr instanceof HashMap) { | ||
| attributeDict = new KrollDict((HashMap)attr); | ||
| } | ||
| if (attributeDict != null) { | ||
| attribute = new AttributeProxy(); | ||
| attribute.setCreationUrl(getCreationUrl().getNormalizedUrl()); | ||
| attribute.handleCreationDict(attributeDict); | ||
| Object obj = getProperty(TiC.PROPERTY_ATTRIBUTES); | ||
| AttributeProxy[] attributes = null; | ||
| if (obj instanceof Object[]) { | ||
| Object[] objArray = (Object[])obj; | ||
| attributes = new AttributeProxy[objArray.length + 1]; | ||
| for (int i = 0; i < objArray.length; i++) { | ||
| attributes[i] = AttributedStringProxy.attributeProxyFor(objArray[i], this); | ||
| } | ||
| attributes[objArray.length] = attribute; | ||
| } else { | ||
| attributes = new AttributeProxy[1]; | ||
| attributes[0] = attribute; | ||
| } | ||
| setProperty(TiC.PROPERTY_ATTRIBUTES, attributes); | ||
| } | ||
| } | ||
|
|
||
| public static AttributeProxy attributeProxyFor(Object obj, KrollProxy proxy) | ||
| { | ||
| AttributeProxy attributeProxy = null; | ||
| if (obj instanceof AttributeProxy) { | ||
| return (AttributeProxy)obj; | ||
| } else { | ||
| KrollDict attributeDict = null; | ||
| if (obj instanceof KrollDict) { | ||
| attributeDict = (KrollDict)obj; | ||
| } else if (obj instanceof HashMap) { | ||
| attributeDict = new KrollDict((HashMap)obj); | ||
| } | ||
| if (attributeDict != null) { | ||
| attributeProxy = new AttributeProxy(); | ||
| attributeProxy.setCreationUrl(proxy.getCreationUrl().getNormalizedUrl()); | ||
| attributeProxy.handleCreationDict(attributeDict); | ||
| } | ||
| if(attributeProxy == null) { | ||
| Log.e(TAG, "Unable to create attribute proxy for object, likely an error in the type of the object passed in."); | ||
| } | ||
|
|
||
| return attributeProxy; | ||
| } | ||
| } | ||
|
|
||
| public static Spannable toSpannable(AttributedStringProxy attrString, Activity activity) | ||
| { | ||
| if (attrString != null && attrString.hasProperty(TiC.PROPERTY_TEXT)) { | ||
| String textString = TiConvert.toString(attrString.getProperty(TiC.PROPERTY_TEXT)); | ||
| if (!TextUtils.isEmpty(textString)) { | ||
| Spannable spannableText = new SpannableString(textString); | ||
| AttributeProxy[] attributes = null; | ||
| Object obj = attrString.getProperty(TiC.PROPERTY_ATTRIBUTES); | ||
| if (obj instanceof Object[]) { | ||
| Object[] objArray = (Object[])obj; | ||
| attributes = new AttributeProxy[objArray.length]; | ||
| for (int i = 0; i < objArray.length; i++) { | ||
| attributes[i] = AttributedStringProxy.attributeProxyFor(objArray[i], attrString); | ||
| } | ||
| } | ||
| if(attributes != null) { | ||
| for (AttributeProxy attr : attributes) { | ||
| if (attr.hasProperty(TiC.PROPERTY_TYPE)) { | ||
| Object type = attr.getProperty(TiC.PROPERTY_TYPE); | ||
| int[] range = null; | ||
| Object inRange = attr.getProperty(TiC.PROPERTY_ATTRIBUTE_RANGE); | ||
| if (inRange instanceof Object[]) { | ||
| range = TiConvert.toIntArray((Object[])inRange); | ||
| } | ||
| Object attrValue = attr.getProperty(TiC.PROPERTY_VALUE); | ||
| if(range != null && (range[0] < (range[0]+range[1]))) { | ||
| switch (TiConvert.toInt(type)) { | ||
| case UIModule.ATTRIBUTE_FONT: | ||
| KrollDict fontProp = null; | ||
| if (attrValue instanceof KrollDict) { | ||
| fontProp = (KrollDict) attrValue; | ||
| } else if (attrValue instanceof HashMap) { | ||
| fontProp = new KrollDict((HashMap<String, Object>) attrValue); | ||
| } | ||
| if(fontProp != null) { | ||
| String[] fontProperties = TiUIHelper.getFontProperties((KrollDict) fontProp); | ||
| if(fontProperties != null) { | ||
| if (fontProperties[TiUIHelper.FONT_SIZE_POSITION] != null) { | ||
| spannableText.setSpan( | ||
| new AbsoluteSizeSpan((int) TiUIHelper.getRawSize( | ||
| fontProperties[TiUIHelper.FONT_SIZE_POSITION], activity)), | ||
| range[0], range[0] + range[1], Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | ||
| } | ||
| if (fontProperties[TiUIHelper.FONT_WEIGHT_POSITION] != null) { | ||
| int typefaceStyle = TiUIHelper.toTypefaceStyle( | ||
| fontProperties[TiUIHelper.FONT_WEIGHT_POSITION], | ||
| fontProperties[TiUIHelper.FONT_STYLE_POSITION]); | ||
| spannableText.setSpan(new StyleSpan(typefaceStyle), range[0], range[0] + range[1], | ||
| Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | ||
| } | ||
| if (fontProperties[TiUIHelper.FONT_FAMILY_POSITION] != null) { | ||
| spannableText.setSpan(new TypefaceSpan(fontProperties[TiUIHelper.FONT_FAMILY_POSITION]), | ||
| range[0], range[0] + range[1], Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | ||
| } | ||
| } | ||
| } | ||
| break; | ||
| case UIModule.ATTRIBUTE_BACKGROUND_COLOR: | ||
| spannableText.setSpan( | ||
| new BackgroundColorSpan(TiConvert.toColor(TiConvert.toString(attrValue))), range[0], | ||
| range[0] + range[1], Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | ||
| break; | ||
| case UIModule.ATTRIBUTE_FOREGROUND_COLOR: | ||
| spannableText.setSpan( | ||
| new ForegroundColorSpan(TiConvert.toColor(TiConvert.toString(attrValue))), range[0], | ||
| range[0] + range[1], Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | ||
| break; | ||
| case UIModule.ATTRIBUTE_STRIKETHROUGH_STYLE: | ||
| spannableText.setSpan(new StrikethroughSpan(), range[0], range[0] + range[1], | ||
| Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | ||
| break; | ||
| case UIModule.ATTRIBUTE_UNDERLINES_STYLE: | ||
| spannableText.setSpan(new UnderlineSpan(), range[0], range[0] + range[1], | ||
| Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | ||
| break; | ||
| case UIModule.ATTRIBUTE_LINK: | ||
| if(attrValue != null) { | ||
| spannableText.setSpan(new URLSpan(TiConvert.toString(attrValue)), range[0], range[0] | ||
| + range[1], Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); | ||
| } | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return spannableText; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public String getApiName() | ||
| { | ||
| return "Ti.UI.AttributedString"; | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Where is the method "addAttribute"? |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,12 +11,14 @@ | |
| import org.appcelerator.kroll.KrollDict; | ||
| import org.appcelerator.kroll.KrollProxy; | ||
| import org.appcelerator.kroll.common.Log; | ||
| import org.appcelerator.titanium.TiApplication; | ||
| import org.appcelerator.titanium.TiC; | ||
| import org.appcelerator.titanium.proxy.TiViewProxy; | ||
| import org.appcelerator.titanium.util.TiConvert; | ||
| import org.appcelerator.titanium.util.TiUIHelper; | ||
| import org.appcelerator.titanium.view.TiUIView; | ||
|
|
||
| import ti.modules.titanium.ui.AttributedStringProxy; | ||
| import android.graphics.Color; | ||
| import android.text.Html; | ||
| import android.text.InputType; | ||
|
|
@@ -215,6 +217,15 @@ public void processProperties(KrollDict d) | |
| if (needShadow) { | ||
| tv.setShadowLayer(shadowRadius, shadowX, shadowY, shadowColor); | ||
| } | ||
| if (d.containsKey(TiC.PROPERTY_ATTRIBUTED_STRING)) { | ||
| Object attributedString = d.get(TiC.PROPERTY_ATTRIBUTED_STRING); | ||
| if (attributedString instanceof AttributedStringProxy) { | ||
| Spannable spannableText = AttributedStringProxy.toSpannable(((AttributedStringProxy)attributedString), TiApplication.getAppCurrentActivity()); | ||
| if (spannableText != null) { | ||
| tv.setText(spannableText); | ||
| } | ||
| } | ||
| } | ||
| // This needs to be the last operation. | ||
| TiUIHelper.linkifyIfEnabled(tv, d.get(TiC.PROPERTY_AUTO_LINK)); | ||
| tv.invalidate(); | ||
|
|
@@ -276,6 +287,11 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP | |
| } else if (key.equals(TiC.PROPERTY_SHADOW_COLOR)) { | ||
| shadowColor = TiConvert.toColor(TiConvert.toString(newValue)); | ||
| tv.setShadowLayer(shadowRadius, shadowX, shadowY, shadowColor); | ||
| } else if (key.equals(TiC.PROPERTY_ATTRIBUTED_STRING) && newValue instanceof AttributedStringProxy) { | ||
|
There was a problem hiding this comment. If the user set "attributedString" and "text" initially, then "attributedString" is respected while "text" is ignored. But if the user later change the property "text", "text" will be respected and "attributedString" will be ignored based on the current implementation of propertyChanged. Is that expected? How about the "font" and "backgroundColor"? There was a problem hiding this comment. I think this should be the behavior. If a user wants to change the "text" while an "attributeString" is currently being used, the user should create a new "attributeString" with "text" as on of it's value and replace the old attributeString with the new attributeString. Especially in a case where, for example, where an attributeString is already set with font and backgroundColor in a Label. If a text is set, it the set font and backgroundColor in attributeString will not be set and used in the Label. This will result in a plain text. If the user wants to change the text and maintain the same font and color, user should replace attributedString and not text. There was a problem hiding this comment. I checked the iOS behavior. If attributedString is set and a change is font is done, it does affect the attributedString and change it's font size or color. Android's behavior matches this.
From the docs http://docs.appcelerator.com/titanium/3.0/#!/api/Titanium.UI.Label, it says "Specify an attributed string for the label. If set, the label ignores the text, color, and shadow properties". So I'll leave it as attributedString first for android. There was a problem hiding this comment. @bhatfield, @vishalduggal, should we resolve this parity issue or just document it? There was a problem hiding this comment. We should try to resolve the parity issue if we can. | Neeraj Gupta | SVP, Product and Engineering From: pingwang2011 <notifications@github.commailto:notifications@github.com> In android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.javahttps://github.com//pull/6463#discussion-diff-22496623:
@bhatfieldhttps://github.com/bhatfield, @vishalduggalhttps://github.com/vishalduggal, should we resolve this parity issue or just document it? Reply to this email directly or view it on GitHubhttps://github.com//pull/6463/files#r22496623. |
||
| Spannable spannableText = AttributedStringProxy.toSpannable(((AttributedStringProxy)newValue), TiApplication.getAppCurrentActivity()); | ||
| if (spannableText != null) { | ||
| tv.setText(spannableText); | ||
| } | ||
| } else { | ||
| super.propertyChanged(key, oldValue, newValue, proxy); | ||
| } | ||
|
|
@@ -284,5 +300,4 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP | |
| public void setClickable(boolean clickable) { | ||
| ((TextView)getNativeView()).setClickable(clickable); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#6409 (diff)
TiC.PROPERTY_ATTRIBUTE_RANGE was added to propertyAccessors.