From f3801d90fad4720357989d6b5bdf630ef874ae5d Mon Sep 17 00:00:00 2001 From: Christoph Nakazawa Date: Wed, 24 Apr 2019 03:40:06 -0700 Subject: [PATCH] Revert "improve RTL (#24069)" (#24580) Summary: This reverts commit b3c74967ca6b20d7bda84c690ae3a99dfe255843. Fixes #24267 [Android] [Fixed] - Invalid text alignment for RTL fonts. Pull Request resolved: https://github.com/facebook/react-native/pull/24580 Differential Revision: D15061667 Pulled By: cpojer fbshipit-source-id: 6d02c9e938f1f8630ba691f57bdf79fd57db3bb2 --- .../react/views/text/ReactBaseTextShadowNode.java | 14 +++++++------- .../react/views/text/ReactTextShadowNode.java | 12 ++++++------ .../react/views/text/TextAttributeProps.java | 14 +++++++------- .../views/textinput/ReactTextInputManager.java | 7 +++---- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java index e5c94e0084f..5b9d5b21df5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java @@ -315,10 +315,10 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode { private int getTextAlign() { int textAlign = mTextAlign; if (getLayoutDirection() == YogaDirection.RTL) { - if (textAlign == Gravity.END) { - textAlign = Gravity.START; - } else if (textAlign == Gravity.START) { - textAlign = Gravity.END; + if (textAlign == Gravity.RIGHT) { + textAlign = Gravity.LEFT; + } else if (textAlign == Gravity.LEFT) { + textAlign = Gravity.RIGHT; } } return textAlign; @@ -364,7 +364,7 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { mJustificationMode = Layout.JUSTIFICATION_MODE_INTER_WORD; } - mTextAlign = Gravity.START; + mTextAlign = Gravity.LEFT; } else { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { mJustificationMode = Layout.JUSTIFICATION_MODE_NONE; @@ -373,9 +373,9 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode { if (textAlign == null || "auto".equals(textAlign)) { mTextAlign = Gravity.NO_GRAVITY; } else if ("left".equals(textAlign)) { - mTextAlign = Gravity.START; + mTextAlign = Gravity.LEFT; } else if ("right".equals(textAlign)) { - mTextAlign = Gravity.END; + mTextAlign = Gravity.RIGHT; } else if ("center".equals(textAlign)) { mTextAlign = Gravity.CENTER_HORIZONTAL; } else { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java index e5eaf49ff01..5cf16db80f0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java @@ -76,10 +76,10 @@ public class ReactTextShadowNode extends ReactBaseTextShadowNode { Layout.Alignment alignment = Layout.Alignment.ALIGN_NORMAL; switch (getTextAlign()) { - case Gravity.START: + case Gravity.LEFT: alignment = Layout.Alignment.ALIGN_NORMAL; break; - case Gravity.END: + case Gravity.RIGHT: alignment = Layout.Alignment.ALIGN_OPPOSITE; break; case Gravity.CENTER_HORIZONTAL: @@ -179,10 +179,10 @@ public class ReactTextShadowNode extends ReactBaseTextShadowNode { private int getTextAlign() { int textAlign = mTextAlign; if (getLayoutDirection() == YogaDirection.RTL) { - if (textAlign == Gravity.END) { - textAlign = Gravity.START; - } else if (textAlign == Gravity.START) { - textAlign = Gravity.END; + if (textAlign == Gravity.RIGHT) { + textAlign = Gravity.LEFT; + } else if (textAlign == Gravity.LEFT) { + textAlign = Gravity.RIGHT; } } return textAlign; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java index 34ca9213b35..e23961d75d8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java @@ -164,10 +164,10 @@ public class TextAttributeProps { public int getTextAlign() { int textAlign = mTextAlign; if (getLayoutDirection() == YogaDirection.RTL) { - if (textAlign == Gravity.END) { - textAlign = Gravity.START; - } else if (textAlign == Gravity.START) { - textAlign = Gravity.END; + if (textAlign == Gravity.RIGHT) { + textAlign = Gravity.LEFT; + } else if (textAlign == Gravity.LEFT) { + textAlign = Gravity.RIGHT; } } return textAlign; @@ -210,7 +210,7 @@ public class TextAttributeProps { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { mJustificationMode = Layout.JUSTIFICATION_MODE_INTER_WORD; } - mTextAlign = Gravity.START; + mTextAlign = Gravity.LEFT; } else { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { mJustificationMode = Layout.JUSTIFICATION_MODE_NONE; @@ -219,9 +219,9 @@ public class TextAttributeProps { if (textAlign == null || "auto".equals(textAlign)) { mTextAlign = Gravity.NO_GRAVITY; } else if ("left".equals(textAlign)) { - mTextAlign = Gravity.START; + mTextAlign = Gravity.LEFT; } else if ("right".equals(textAlign)) { - mTextAlign = Gravity.END; + mTextAlign = Gravity.RIGHT; } else if ("center".equals(textAlign)) { mTextAlign = Gravity.CENTER_HORIZONTAL; } else { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java index 62da81900d6..63d80befc06 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java @@ -9,7 +9,6 @@ package com.facebook.react.views.textinput; import static android.view.View.FOCUS_FORWARD; -import android.annotation.TargetApi; import android.graphics.PorterDuff; import android.graphics.Typeface; import android.graphics.drawable.Drawable; @@ -473,7 +472,7 @@ public class ReactTextInputManager extends BaseViewManager= Build.VERSION_CODES.O) { view.setJustificationMode(Layout.JUSTIFICATION_MODE_INTER_WORD); } - view.setGravityHorizontal(Gravity.START); + view.setGravityHorizontal(Gravity.LEFT); } else { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { view.setJustificationMode(Layout.JUSTIFICATION_MODE_NONE); @@ -482,9 +481,9 @@ public class ReactTextInputManager extends BaseViewManager