expo-localization 15.0.1 → 15.0.3

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 15.0.3 — 2024-05-06
+
+### 🎉 New features
+
+- Added a `forcesRTL` manifest flag for forcing RTL to be on. ([#28129](https://github.com/expo/expo/pull/28129) by [@aleqsio](https://github.com/aleqsio))
+
+## 15.0.2 — 2024-05-01
+
+_This version does not introduce any user-facing changes._
+
 ## 15.0.1 — 2024-04-23
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '15.0.1'
+version = '15.0.3'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.localization"
   defaultConfig {
     versionCode 22
-    versionName "15.0.1"
+    versionName "15.0.3"
   }
 }
 

package/android/src/main/java/expo/modules/localization/LocalizationModule.kt

@@ -22,7 +22,7 @@ import java.util.*
 // must be kept in sync with https://github.com/facebook/react-native/blob/main/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
 private const val SHARED_PREFS_NAME = "com.facebook.react.modules.i18nmanager.I18nUtil"
 private const val KEY_FOR_PREFS_ALLOWRTL = "RCTI18nUtil_allowRTL"
-
+private const val KEY_FOR_PREFS_FORCERTL = "RCTI18nUtil_forceRTL"
 private const val LOCALE_SETTINGS_CHANGED = "onLocaleSettingsChanged"
 private const val CALENDAR_SETTINGS_CHANGED = "onCalendarSettingsChanged"
 
@@ -70,14 +70,31 @@ class LocalizationModule : Module() {
     // These keys are used by React Native here: https://github.com/facebook/react-native/blob/main/React/Modules/RCTI18nUtil.m
     // We set them before React loads to ensure it gets rendered correctly the first time the app is opened.
     val supportsRTL = appContext.reactContext?.getString(R.string.ExpoLocalization_supportsRTL)
-    if (supportsRTL != "true" && supportsRTL != "false") return
-    context
-      .getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE)
-      .edit()
-      .also {
-        it.putBoolean(KEY_FOR_PREFS_ALLOWRTL, supportsRTL == "true")
-        it.apply()
+    val forcesRTL = appContext.reactContext?.getString(R.string.ExpoLocalization_forcesRTL)
+
+    if (forcesRTL == "true") {
+      context
+        .getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE)
+        .edit()
+        .also {
+          it.putBoolean(KEY_FOR_PREFS_ALLOWRTL, true)
+          it.putBoolean(KEY_FOR_PREFS_FORCERTL, true)
+          it.apply()
+        }
+    } else {
+      if (supportsRTL == "true" || supportsRTL == "false") {
+        context
+          .getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE)
+          .edit()
+          .also {
+            it.putBoolean(KEY_FOR_PREFS_ALLOWRTL, supportsRTL == "true")
+            if (forcesRTL == "false") {
+              it.putBoolean(KEY_FOR_PREFS_FORCERTL, false)
+            }
+            it.apply()
+          }
       }
+    }
   }
 
   // TODO: Bacon: add set language
@@ -114,6 +131,7 @@ class LocalizationModule : Module() {
         }
         locales
       } else {
+        @Suppress("DEPRECATION")
         listOf(configuration.locale)
       }
     }

package/android/src/main/java/expo/modules/localization/LocalizationPackage.kt

@@ -24,7 +24,7 @@ object Notifier {
 
 // TODO: Move to new listener API once it's available
 class LocalizationPackage : Package {
-  override fun createApplicationLifecycleListeners(context: Context?): List<out ApplicationLifecycleListener> {
+  override fun createApplicationLifecycleListeners(context: Context?): List<ApplicationLifecycleListener> {
     return listOf(object : ApplicationLifecycleListener {
       override fun onConfigurationChanged(newConfig: Configuration?) {
         super.onConfigurationChanged(newConfig)

package/android/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="ExpoLocalization_supportsRTL" translatable="false">unset</string>
+  <string name="ExpoLocalization_forcesRTL" translatable="false">unset</string>
 </resources>

package/ios/LocalizationModule.swift

@@ -23,8 +23,12 @@ public class LocalizationModule: Module {
       return Self.getCalendars()
     }
     OnCreate {
-      if let enableRTL = Bundle.main.object(forInfoDictionaryKey: "ExpoLocalization_supportsRTL") as? Bool {
-        self.setSupportsRTL(enableRTL)
+      if let forceRTL = Bundle.main.object(forInfoDictionaryKey: "ExpoLocalization_forcesRTL") as? Bool {
+        self.setRTLPreferences(true, forceRTL)
+      } else {
+        if let enableRTL = Bundle.main.object(forInfoDictionaryKey: "ExpoLocalization_supportsRTL") as? Bool {
+          self.setRTLPreferences(enableRTL, false)
+        }
       }
     }
 
@@ -53,13 +57,20 @@ public class LocalizationModule: Module {
     return NSLocale.characterDirection(forLanguage: NSLocale.preferredLanguages.first ?? "en-US") == NSLocale.LanguageDirection.rightToLeft
   }
 
-  func setSupportsRTL(_ supportsRTL: Bool) {
+  func setRTLPreferences(_ supportsRTL: Bool, _ forceRTL: Bool) {
     // These keys are used by React Native here: https://github.com/facebook/react-native/blob/main/React/Modules/RCTI18nUtil.m
     // We set them before React loads to ensure it gets rendered correctly the first time the app is opened.
     // On iOS we need to set both forceRTL and allowRTL so apps don't have to include localization strings.
     // Uses required reason API based on the following reason: CA92.1
-    UserDefaults.standard.set(supportsRTL, forKey: "RCTI18nUtil_allowRTL")
-    UserDefaults.standard.set(supportsRTL ? isRTLPreferredForCurrentLocale() : false, forKey: "RCTI18nUtil_forceRTL")
+
+    if forceRTL {
+      UserDefaults.standard.set(true, forKey: "RCTI18nUtil_allowRTL")
+      UserDefaults.standard.set(true, forKey: "RCTI18nUtil_forceRTL")
+    } else {
+      UserDefaults.standard.set(supportsRTL, forKey: "RCTI18nUtil_allowRTL")
+      UserDefaults.standard.set(supportsRTL ? isRTLPreferredForCurrentLocale() : false, forKey: "RCTI18nUtil_forceRTL")
+    }
+
     UserDefaults.standard.synchronize()
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-localization",
-  "version": "15.0.1",
+  "version": "15.0.3",
   "description": "Provides an interface for native user localization information.",
   "main": "build/Localization.js",
   "types": "build/Localization.d.ts",
@@ -47,5 +47,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
+  "gitHead": "7995f30a8d2af4836f3aef9fe322e9403fc23d34"
 }

package/plugin/build/withExpoLocalization.d.ts

@@ -1,6 +1,7 @@
 import { ExpoConfig } from '@expo/config-types';
 type ConfigPluginProps = {
     supportsRTL?: boolean;
+    forcesRTL?: boolean;
     allowDynamicLocaleChangesAndroid?: boolean;
 };
 declare function withExpoLocalization(config: ExpoConfig, data?: ConfigPluginProps): ExpoConfig;

package/plugin/build/withExpoLocalization.js

@@ -2,14 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const Manifest_1 = require("@expo/config-plugins/build/android/Manifest");
 const config_plugins_1 = require("expo/config-plugins");
-function withExpoLocalizationIos(config) {
-    if (config.extra?.supportsRTL == null)
+function withExpoLocalizationIos(config, data) {
+    const mergedConfig = { ...config.extra, ...data };
+    if (mergedConfig?.supportsRTL == null && mergedConfig?.forcesRTL == null)
         return config;
     if (!config.ios)
         config.ios = {};
     if (!config.ios.infoPlist)
         config.ios.infoPlist = {};
-    config.ios.infoPlist.ExpoLocalization_supportsRTL = config.extra?.supportsRTL || false;
+    if (mergedConfig?.supportsRTL != null) {
+        config.ios.infoPlist.ExpoLocalization_supportsRTL = mergedConfig?.supportsRTL;
+    }
+    if (mergedConfig?.forcesRTL != null) {
+        config.ios.infoPlist.ExpoLocalization_forcesRTL = mergedConfig?.forcesRTL;
+    }
     return config;
 }
 function withExpoLocalizationAndroid(config, data) {
@@ -26,12 +32,23 @@ function withExpoLocalizationAndroid(config, data) {
         });
     }
     return (0, config_plugins_1.withStringsXml)(config, (config) => {
-        config.modResults = config_plugins_1.AndroidConfig.Strings.setStringItem([
-            {
-                $: { name: 'ExpoLocalization_supportsRTL', translatable: 'false' },
-                _: String(data.supportsRTL ?? config.extra?.supportsRTL),
-            },
-        ], config.modResults);
+        const mergedConfig = { ...config.extra, ...data };
+        if (mergedConfig?.supportsRTL != null) {
+            config.modResults = config_plugins_1.AndroidConfig.Strings.setStringItem([
+                {
+                    $: { name: 'ExpoLocalization_supportsRTL', translatable: 'false' },
+                    _: String(mergedConfig?.supportsRTL ?? 'unset'),
+                },
+            ], config.modResults);
+        }
+        if (mergedConfig?.forcesRTL != null) {
+            config.modResults = config_plugins_1.AndroidConfig.Strings.setStringItem([
+                {
+                    $: { name: 'ExpoLocalization_forcesRTL', translatable: 'false' },
+                    _: String(mergedConfig?.forcesRTL ?? 'unset'),
+                },
+            ], config.modResults);
+        }
         return config;
     });
 }

package/plugin/src/withExpoLocalization.ts

@@ -9,14 +9,21 @@ import {
 
 type ConfigPluginProps = {
   supportsRTL?: boolean;
+  forcesRTL?: boolean;
   allowDynamicLocaleChangesAndroid?: boolean;
 };
 
-function withExpoLocalizationIos(config: ExpoConfig) {
-  if (config.extra?.supportsRTL == null) return config;
+function withExpoLocalizationIos(config: ExpoConfig, data: ConfigPluginProps) {
+  const mergedConfig = { ...config.extra, ...data };
+  if (mergedConfig?.supportsRTL == null && mergedConfig?.forcesRTL == null) return config;
   if (!config.ios) config.ios = {};
   if (!config.ios.infoPlist) config.ios.infoPlist = {};
-  config.ios.infoPlist.ExpoLocalization_supportsRTL = config.extra?.supportsRTL || false;
+  if (mergedConfig?.supportsRTL != null) {
+    config.ios.infoPlist.ExpoLocalization_supportsRTL = mergedConfig?.supportsRTL;
+  }
+  if (mergedConfig?.forcesRTL != null) {
+    config.ios.infoPlist.ExpoLocalization_forcesRTL = mergedConfig?.forcesRTL;
+  }
   return config;
 }
 
@@ -34,15 +41,29 @@ function withExpoLocalizationAndroid(config: ExpoConfig, data: ConfigPluginProps
     });
   }
   return withStringsXml(config, (config) => {
-    config.modResults = AndroidConfig.Strings.setStringItem(
-      [
-        {
-          $: { name: 'ExpoLocalization_supportsRTL', translatable: 'false' },
-          _: String(data.supportsRTL ?? config.extra?.supportsRTL),
-        },
-      ],
-      config.modResults
-    );
+    const mergedConfig = { ...config.extra, ...data };
+    if (mergedConfig?.supportsRTL != null) {
+      config.modResults = AndroidConfig.Strings.setStringItem(
+        [
+          {
+            $: { name: 'ExpoLocalization_supportsRTL', translatable: 'false' },
+            _: String(mergedConfig?.supportsRTL ?? 'unset'),
+          },
+        ],
+        config.modResults
+      );
+    }
+    if (mergedConfig?.forcesRTL != null) {
+      config.modResults = AndroidConfig.Strings.setStringItem(
+        [
+          {
+            $: { name: 'ExpoLocalization_forcesRTL', translatable: 'false' },
+            _: String(mergedConfig?.forcesRTL ?? 'unset'),
+          },
+        ],
+        config.modResults
+      );
+    }
     return config;
   });
 }