fix: Corrected text alignment when layout direction is rtl

CatchABus · CatchABus · commit abd62832b6ff · 2025-02-05T13:25:44.000+02:00
diff --git a/packages/core/ui/button/index.android.ts b/packages/core/ui/button/index.android.ts
@@ -1,14 +1,11 @@
 import { ButtonBase } from './button-common';
-import { AndroidHelper, PseudoClassHandler } from '../core/view';
+import { PseudoClassHandler } from '../core/view';
 import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length, zIndexProperty, minWidthProperty, minHeightProperty } from '../styling/style-properties';
 import { textAlignmentProperty } from '../text-base';
 import { CoreTypes } from '../../core-types';
 import { profile } from '../../profiling';
 import { TouchGestureEventData, TouchAction, GestureTypes } from '../gestures';
-import { Device } from '../../platform';
 import { SDK_VERSION } from '../../utils/constants';
-import type { Background } from '../styling/background';
-import { NativeScriptAndroidView } from '../utils';
 
 export * from './button-common';
 
diff --git a/packages/core/ui/button/index.ios.ts b/packages/core/ui/button/index.ios.ts
@@ -214,15 +214,19 @@ export class Button extends ButtonBase {
 				this.nativeViewProtected.titleLabel.textAlignment = NSTextAlignment.Left;
 				this.nativeViewProtected.contentHorizontalAlignment = UIControlContentHorizontalAlignment.Left;
 				break;
-			case 'initial':
-			case 'center':
-				this.nativeViewProtected.titleLabel.textAlignment = NSTextAlignment.Center;
-				this.nativeViewProtected.contentHorizontalAlignment = UIControlContentHorizontalAlignment.Center;
-				break;
 			case 'right':
 				this.nativeViewProtected.titleLabel.textAlignment = NSTextAlignment.Right;
 				this.nativeViewProtected.contentHorizontalAlignment = UIControlContentHorizontalAlignment.Right;
 				break;
+			case 'justify':
+				this.nativeViewProtected.titleLabel.textAlignment = NSTextAlignment.Justified;
+				this.nativeViewProtected.contentHorizontalAlignment = UIControlContentHorizontalAlignment.Center;
+				break;
+			default:
+				// initial | center
+				this.nativeViewProtected.titleLabel.textAlignment = NSTextAlignment.Center;
+				this.nativeViewProtected.contentHorizontalAlignment = UIControlContentHorizontalAlignment.Center;
+				break;
 		}
 	}
 
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
@@ -307,15 +307,18 @@ export class TextBase extends TextBaseCommon {
 	[textAlignmentProperty.setNative](value: CoreTypes.TextAlignmentType) {
 		const verticalGravity = this.nativeTextViewProtected.getGravity() & android.view.Gravity.VERTICAL_GRAVITY_MASK;
 		switch (value) {
+			case 'left':
+				this.nativeTextViewProtected.setGravity(android.view.Gravity.LEFT | verticalGravity);
+				break;
 			case 'center':
 				this.nativeTextViewProtected.setGravity(android.view.Gravity.CENTER_HORIZONTAL | verticalGravity);
 				break;
 			case 'right':
 				this.nativeTextViewProtected.setGravity(android.view.Gravity.RIGHT | verticalGravity);
 				break;
 			default:
-				// initial | left | justify
-				this.nativeTextViewProtected.setGravity(android.view.Gravity.LEFT | verticalGravity);
+				// initial | justify
+				this.nativeTextViewProtected.setGravity(android.view.Gravity.START | verticalGravity);
 				break;
 		}
 
diff --git a/packages/core/ui/text-base/index.ios.ts b/packages/core/ui/text-base/index.ios.ts
@@ -248,7 +248,6 @@ export class TextBase extends TextBaseCommon {
 	[textAlignmentProperty.setNative](value: CoreTypes.TextAlignmentType) {
 		const nativeView = <UITextField | UITextView | UILabel>this.nativeTextViewProtected;
 		switch (value) {
-			case 'initial':
 			case 'left':
 				nativeView.textAlignment = NSTextAlignment.Left;
 				break;
@@ -261,6 +260,9 @@ export class TextBase extends TextBaseCommon {
 			case 'justify':
 				nativeView.textAlignment = NSTextAlignment.Justified;
 				break;
+			default:
+				nativeView.textAlignment = NSTextAlignment.Natural;
+				break;
 		}
 	}
 
