Skip to content

fix: use the first language from context to decide Android directionality #54986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kainzhong wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use the first language from context to decide Android directionality #54986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions ...eact-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,18 @@ public class I18nUtil private constructor() {
* * is forcing RTL layout, regardless of the active language (for development purpose)
* * allows RTL layout when using RTL locale
*/
public fun isRTL(context: Context): Boolean =
applicationHasRtlSupport(context) &&
(isRTLForced(context) || (isRTLAllowed(context) && isDevicePreferredLanguageRTL))
public fun isRTL(context: Context): Boolean {
if (!applicationHasRtlSupport(context)) {
return false
}
if (isRTLForced(context)) {
return true
}
if (isRTLAllowed(context) && isApplicationPreferredLanguageRTL(context)) {
return true
}
return false
}

/**
* Android relies on the presence of `android:supportsRtl="true"` being set in order to resolve
Expand Down Expand Up @@ -60,13 +69,11 @@ public class I18nUtil private constructor() {
setPref(context, KEY_FOR_PREFS_FORCERTL, forceRTL)
}

private val isDevicePreferredLanguageRTL: Boolean
private fun isApplicationPreferredLanguageRTL(context: Context): Boolean {
// Check if the current device language is RTL
get() {
val directionality =
TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getAvailableLocales()[0])
return directionality == View.LAYOUT_DIRECTION_RTL
}
val directionality = TextUtilsCompat.getLayoutDirectionFromLocale(context.resources.configuration.locales[0])
return directionality == View.LAYOUT_DIRECTION_RTL
}

private fun isPrefSet(context: Context, key: String, defaultValue: Boolean): Boolean =
context
Expand Down