feat(android): text alignment justify (#12464)

Fixes TIMOB-28348
tidev · Feb 16, 2021 · 851b4f6 · 851b4f6
1 parent 6762beb
commit 851b4f6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/UIModule.java b/android/modules/ui/src/java/ti/modules/titanium/ui/UIModule.java
@@ -244,6 +244,8 @@ public class UIModule extends KrollModule
 	@Kroll.constant
 	public static final String TEXT_ALIGNMENT_RIGHT = "right";
 	@Kroll.constant
+	public static final String TEXT_ALIGNMENT_JUSTIFY = "justify";
+	@Kroll.constant
 	public static final String TEXT_VERTICAL_ALIGNMENT_BOTTOM = "bottom";
 	@Kroll.constant
 	public static final String TEXT_VERTICAL_ALIGNMENT_CENTER = "middle";

diff --git a/android/titanium/src/java/org/appcelerator/titanium/util/TiUIHelper.java b/android/titanium/src/java/org/appcelerator/titanium/util/TiUIHelper.java
@@ -67,10 +67,12 @@
 import android.graphics.drawable.StateListDrawable;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.text.Spanned;
+import android.text.Layout;
 import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;
 import android.util.DisplayMetrics;
@@ -481,12 +483,20 @@ public static void setAlignment(TextView tv, String textAlign, String verticalAl
 		int gravity = Gravity.NO_GRAVITY;
 
 		if (textAlign != null) {
+
+			if (!"justify".equals(textAlign) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				// reset justification
+				tv.setJustificationMode(Layout.JUSTIFICATION_MODE_NONE);
+			}
+
 			if ("left".equals(textAlign)) {
 				gravity |= Gravity.LEFT;
 			} else if ("center".equals(textAlign)) {
 				gravity |= Gravity.CENTER_HORIZONTAL;
 			} else if ("right".equals(textAlign)) {
 				gravity |= Gravity.RIGHT;
+			} else if ("justify".equals(textAlign) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				tv.setJustificationMode(Layout.JUSTIFICATION_MODE_INTER_WORD);
 			} else {
 				Log.w(TAG, "Unsupported horizontal alignment: " + textAlign);
 			}

diff --git a/apidoc/Titanium/UI/UI.yml b/apidoc/Titanium/UI/UI.yml
@@ -30,7 +30,7 @@ description:  |
     fullscreen or modal and can be customized, such as changing their opacity or background color.
     Windows themselves are views and also inherit a views properties, functions and events. There
     are a few specialization of Windows such as a [Tab Group](Titanium.UI.TabGroup) which offer
-    additional behavior beyond the basic Window. It is considered a best practice to use a 
+    additional behavior beyond the basic Window. It is considered a best practice to use a
     [NavigationWindow](Titanium.UI.NavigationWindow) as the root of your application.
 
     Titanium uses the [Factory Pattern](http://en.wikipedia.org/wiki/Factory_method_pattern) for
@@ -53,7 +53,7 @@ description:  |
 
     #### Global Context
 
-    Prior to the release of Titanium SDK `9.0.0.GA` any variable declared in `app.js` or `alloy.js` 
+    Prior to the release of Titanium SDK `9.0.0.GA` any variable declared in `app.js` or `alloy.js`
     was added to a global scope. This however is no longer the case since `9.0.0.GA`. However
     it is still possible to add variables to a global scope by adding `global.` in front of any
     variabled declared in `app.js` or `alloy.js`. However you should be careful with adding variables
@@ -578,7 +578,7 @@ properties:
   - name: ATTRIBUTE_LINE_BREAK
     deprecated:
         since: "7.5.0"
-        notes: Use [ParagraphAttribute.lineBreakMode](ParagraphAttribute.lineBreakMode) instead.  
+        notes: Use [ParagraphAttribute.lineBreakMode](ParagraphAttribute.lineBreakMode) instead.
     summary: |
         Use with <Attribute.type> to wrap and truncate the text.
     description: |
@@ -2357,11 +2357,12 @@ properties:
         Use with the <Titanium.UI.TextField.textAlign>, <Titanium.UI.Button.textAlign> and
         <Titanium.UI.TextArea.textAlign> properties.
 
-        This constant is a number and only available on iOS.
+        This constant is a number on iOS and a string on Android.
     type: [Number, String]
     permission: read-only
-    platforms: [iphone, ipad, macos]
-    since: "6.1.0"
+    platforms: [android, iphone, ipad, macos]
+    osver: {android: {min: "8.0"}}
+    since: { android: "10.0.0", iphone: "6.1.0", ipad: "6.1.0" }
 
   - name: TEXT_ALIGNMENT_LEFT
     summary: Left align text.

diff --git a/tests/Resources/ti.ui.label.test.js b/tests/Resources/ti.ui.label.test.js
@@ -144,10 +144,8 @@ describe('Titanium.UI.Label', function () {
 			should(label.textAlign).eql(Ti.UI.TEXT_ALIGNMENT_RIGHT);
 
 			// TIMOB-3408
-			if (utilities.isIOS()) {
-				label.textAlign = Ti.UI.TEXT_ALIGNMENT_JUSTIFY;
-				should(label.textAlign).eql(Ti.UI.TEXT_ALIGNMENT_JUSTIFY);
-			}
+			label.textAlign = Ti.UI.TEXT_ALIGNMENT_JUSTIFY;
+			should(label.textAlign).eql(Ti.UI.TEXT_ALIGNMENT_JUSTIFY);
 		});
 
 		it('has no accessors', () => {