[TIMOB-18062] Android:Enable links to work in textfields and textarea

tidev · Feb 23, 2015 · f446787 · f446787
1 parent ed1e8b1
commit f446787
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/AttributedStringProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/AttributedStringProxy.java
@@ -18,6 +18,7 @@
 import org.appcelerator.titanium.util.TiUIHelper;
 
 import android.app.Activity;
+import android.os.Bundle;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -95,9 +96,19 @@ public static AttributeProxy attributeProxyFor(Object obj, KrollProxy proxy)
 			return attributeProxy;
 		}
 	}
-	
+
 	public static Spannable toSpannable(AttributedStringProxy attrString, Activity activity)
 	{
+		Bundle results = toSpannableInBundle(attrString, activity);
+		if (results.containsKey(TiC.PROPERTY_ATTRIBUTED_STRING)) {
+			return (Spannable) results.getCharSequence(TiC.PROPERTY_ATTRIBUTED_STRING);
+		}
+		return null;
+	}
+
+	public static Bundle toSpannableInBundle(AttributedStringProxy attrString, Activity activity)
+	{
+		Bundle results = new Bundle();
 		if (attrString != null && attrString.hasProperty(TiC.PROPERTY_TEXT)) {
 			String textString = TiConvert.toString(attrString.getProperty(TiC.PROPERTY_TEXT));
 			if (!TextUtils.isEmpty(textString)) {
@@ -176,16 +187,18 @@ public static Spannable toSpannable(AttributedStringProxy attrString, Activity a
 											spannableText.setSpan(new URLSpan(TiConvert.toString(attrValue)), range[0], range[0]
 												+ range[1], Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 										}
+										results.putBoolean(TiC.PROPERTY_HAS_LINK, true);
 										break;
 								}
 							}
 						}
 					}
 				}
-				return spannableText;
+				results.putCharSequence(TiC.PROPERTY_ATTRIBUTED_STRING, spannableText);
+				return results;
 			}
 		}
-		return null;
+		return results;
 	}
 
 	@Override

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIText.java
@@ -21,17 +21,18 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.AttributedStringProxy;
-import android.content.Context;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.os.Build;
+import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Spannable;
 import android.text.TextUtils.TruncateAt;
 import android.text.TextWatcher;
 import android.text.method.DialerKeyListener;
 import android.text.method.DigitsKeyListener;
+import android.text.method.LinkMovementMethod;
 import android.text.method.NumberKeyListener;
 import android.text.method.PasswordTransformationMethod;
 import android.view.Gravity;
@@ -630,9 +631,12 @@ public void handleReturnKeyType(int type)
 	}
 
 	public void setAttributedStringText(AttributedStringProxy attrString) {
-		Spannable spannableText = AttributedStringProxy.toSpannable(attrString, TiApplication.getAppCurrentActivity());
-		if (spannableText != null) {
-			tv.setText(spannableText);
+		Bundle bundleText = AttributedStringProxy.toSpannableInBundle(attrString, TiApplication.getAppCurrentActivity());
+		if (bundleText.containsKey(TiC.PROPERTY_ATTRIBUTED_STRING)) {
+			tv.setText((Spannable) bundleText.getCharSequence(TiC.PROPERTY_ATTRIBUTED_STRING));
+			if(bundleText.getBoolean(TiC.PROPERTY_HAS_LINK, false)){
+				tv.setMovementMethod(LinkMovementMethod.getInstance());
+			}
 		}
 	}
 

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -1340,6 +1340,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_HAS_CHILD = "hasChild";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_HAS_LINK = "hasLink";
+
 	/**
 	 * @module.api
 	 */