button automatic all caps off

tidev · Nov 3, 2016 · c73e1d1 · c73e1d1
1 parent 0758ced
commit c73e1d1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButton.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButton.java
@@ -8,6 +8,7 @@
 
 import java.util.HashMap;
 
+import android.os.Build;
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.common.Log;
@@ -130,6 +131,12 @@ public void processProperties(KrollDict d)
 		if (needShadow) {
 			btn.setShadowLayer(shadowRadius, shadowX, shadowY, shadowColor);
 		}
+		if (d.containsKey(TiC.PROPERTY_TEXT_ALL_CAPS)){
+			boolean caps = TiConvert.toBoolean(d.get(TiC.PROPERTY_TEXT_ALL_CAPS), false);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+				btn.setAllCaps(caps);
+			}
+		}
 		btn.invalidate();
 	}
 
@@ -182,6 +189,11 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			} else {
 				btn.getBackground().setColorFilter( TiConvert.toColor(TiConvert.toString(newValue)), Mode.MULTIPLY);						
 			}
+		} else if (key.equals(TiC.PROPERTY_TEXT_ALL_CAPS)) {
+			boolean caps = TiConvert.toBoolean(newValue);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+				btn.setAllCaps(caps);
+			}
 		} else {
 			super.propertyChanged(key, oldValue, newValue, proxy);
 		}

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -2638,6 +2638,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_TEXT_ALIGN = "textAlign";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_TEXT_ALL_CAPS = "textAllCaps";
+
 	/**
 	 * @module.api
 	 */

diff --git a/apidoc/Titanium/UI/Button.yml b/apidoc/Titanium/UI/Button.yml
@@ -290,6 +290,13 @@ properties:
     constants: Titanium.UI.TEXT_ALIGNMENT_*
     default: <Titanium.UI.TEXT_ALIGNMENT_CENTER>
 
+  - name: textAllCaps
+    summary: |
+      All text to upper case letters, specified using true or false.
+    type: Boolean
+    since: "6.1.0"
+    platforms: [android]
+
   - name: tintColor
     summary: Button tint color.
     type: String