add underline style

bongole · Apr 10, 2014 · 880cfc2 · 880cfc2
1 parent a336efe
commit 880cfc2
Show file tree

Hide file tree

Showing 13 changed files with 335 additions and 134 deletions.
diff --git a/android/dist/android.jar b/android/dist/android.jar
diff --git a/android/lib/.gitkeep b/android/lib/.gitkeep
diff --git a/android/libs/armeabi-v7a/libcom.bongole.ti.alabel.so b/android/libs/armeabi-v7a/libcom.bongole.ti.alabel.so
diff --git a/android/libs/armeabi/libcom.bongole.ti.alabel.so b/android/libs/armeabi/libcom.bongole.ti.alabel.so
diff --git a/android/libs/x86/libcom.bongole.ti.alabel.so b/android/libs/x86/libcom.bongole.ti.alabel.so
diff --git a/android/src/com/bongole/ti/alabel/AttributedLabel.java b/android/src/com/bongole/ti/alabel/AttributedLabel.java
@@ -17,6 +17,7 @@
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
+import android.text.style.UnderlineSpan;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
@@ -31,25 +32,25 @@ public AttributedLabel(TiViewProxy proxy) {
 
 	private void setAttributedText(TextView tv, HashMap<String, Object> attro){
 		tv.setMovementMethod(LinkMovementMethod.getInstance());
-		
+
 		String txt = (String)attro.get("text");
 		SpannableString stxt = new SpannableString(txt);
-		
+
 		Object[] attributes = (Object[]) attro.get("attributes");
 		for( Object a : attributes ){
 			Object[] aa = (Object[])a;
 			Integer start = (Integer) aa[0];
 			Integer end = (Integer) aa[1];
 			HashMap<String, Object> attr_inner = (HashMap<String, Object>) aa[2];
-			
+
 			if( attr_inner.containsKey("font") ){
 				HashMap<String, Object> font_attr = (HashMap<String, Object>) attr_inner.get("font");
-				
+
 				String fontSize = null;
 		        String fontWeight = null;
 		        String fontFamily = null;
 		        String fontColor = null;
-		        
+
 		        if (font_attr.containsKey("fontSize")) {
 		            fontSize = TiConvert.toString(font_attr, "fontSize");
 		        }
@@ -62,24 +63,24 @@ private void setAttributedText(TextView tv, HashMap<String, Object> attro){
 		        if (font_attr.containsKey("color")) {
 		            fontColor = TiConvert.toString(font_attr, "color");
 		        }
-		        
+
 		        if( fontFamily != null ){
 			        stxt.setSpan(new CustomTypefaceSpan(fontFamily, TiUIHelper.toTypeface(tv.getContext(),fontFamily)), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		        }
-		        
+
 		        if( fontWeight != null ){
 			        stxt.setSpan(new StyleSpan(TiUIHelper.toTypefaceStyle(fontWeight)), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		        }
-		        
+
 		        if( fontSize != null ){
 		        	stxt.setSpan(new AbsoluteSizeSpan((int)TiUIHelper.getRawSize(fontSize, tv.getContext())), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		        }
-		        
+
 		        if( fontColor != null ){
 		        	stxt.setSpan(new ForegroundColorSpan(TiConvert.toColor(fontColor)), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 		        }
 			}
-			
+
 			if( attr_inner.containsKey("a") ){
 				HashMap<String, Object> a_attr = (HashMap<String, Object>) attr_inner.get("a");
 				String href = (String)a_attr.get("href");
@@ -89,21 +90,25 @@ private void setAttributedText(TextView tv, HashMap<String, Object> attro){
 
 						@Override
 						public void onClick(View arg0) {
-							KrollDict event = new KrollDict(); 
+							KrollDict event = new KrollDict();
 							event.put("src", urlspan.getURL());
-							
+
 							proxy.fireEvent("link", event);
 						}
 					});
-					
+
 		        	stxt.setSpan(urlspan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 				}
 			}
+
+			if ( attr_inner.containsKey("u") ) {
+				stxt.setSpan(new UnderlineSpan(), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			}
 		}
-		
+
 		tv.setText(revertSpans(stxt));
 	}
-	
+
 	final Spannable revertSpans(Spanned stext) {
 	    Object[] spans = stext.getSpans(0, stext.length(), Object.class);
 	    Spannable ret = Spannable.Factory.getInstance().newSpannable(stext.toString());
@@ -115,32 +120,32 @@ final Spannable revertSpans(Spanned stext) {
 
 	    return ret;
 	}
-	
+
 	@Override
 	public void processProperties(KrollDict d) {
 		super.processProperties(d);
-		
+
 		TextView tv = (TextView)this.getNativeView();
-		
+
 		if( d.containsKey("attributedText") ){
 			HashMap<String, Object> attro = d.getKrollDict("attributedText");
 			setAttributedText(tv, attro);
-			
+
 			tv.invalidate();
 		}
 	}
-	
+
 	@Override
 	public void propertyChanged(String key, Object oldValue, Object newValue,
 			KrollProxy proxy) {
 		super.propertyChanged(key, oldValue, newValue, proxy);
-		
+
 		if( key.equals("attributedText")){
 			TextView tv = (TextView)this.getNativeView();
-			
+
 			setAttributedText(tv, (HashMap<String, Object>) newValue);
-			
-			tv.invalidate();	
+
+			tv.invalidate();
 		}
 	}
 }
diff --git a/iphone/Classes/ComBongoleTiAlabelLabel.m b/iphone/Classes/ComBongoleTiAlabelLabel.m
@@ -100,6 +100,11 @@ -(void)setAttributedText_:(id)args
                 if (url) {
                     [mas setLink:[NSURL URLWithString:url] range:r];
                 }
+            },
+            @"u": ^(NSMutableAttributedString *mas, id arg, NSRange r){
+                [mas addAttribute:NSUnderlineStyleAttributeName
+                            value:[NSNumber numberWithInteger:NSUnderlineStyleSingle]
+                            range:r];
             }
          } retain];
     }