expo-localization 12.0.0 → 13.1.0

package/CHANGELOG.md

@@ -10,6 +10,40 @@
 
 ### 💡 Others
 
+## 13.1.0 — 2022-07-07
+
+### 🎉 New features
+
+- Native module on Android is now written in Kotlin using the new API. ([#17775](https://github.com/expo/expo/pull/17775) by [@barthap](https://github.com/barthap))
+
+### 💡 Others
+
+- Migrated Expo modules definitions to the new naming convention. ([#17193](https://github.com/expo/expo/pull/17193) by [@tsapeta](https://github.com/tsapeta))
+
+## 13.0.0 — 2022-04-18
+
+### 🛠 Breaking changes
+
+- Guess the device language on iOS rather than using the app-specific language. ([#15807](https://github.com/expo/expo/pull/15807) by [@EvanBacon](https://github.com/EvanBacon))
+
+### 🎉 New features
+
+- Use JSI host object instead of the bridge module for communication between JavaScript and native code. ([#16972](https://github.com/expo/expo/pull/16972) by [@tsapeta](https://github.com/tsapeta))
+
+### 🐛 Bug fixes
+
+- Exception in HostObject::get for prop 'NativeUnimoduleProxy': java.lang.NullPointerException ([#16316](https://github.com/expo/expo/pull/16316) by [@nomi9995](https://github.com/nomi9995))
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 12.0.1 - 2022-02-01
+
+### 🐛 Bug fixes
+
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
+
 ## 12.0.0 — 2021-12-03
 
 ### 🎉 New features

package/README.md

@@ -4,12 +4,12 @@ Provides an interface for native user localization information.
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/localization.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/localization/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/localization.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/localization/)
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/localization/).
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/localization/).
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -1,63 +1,80 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '12.0.0'
+version = '13.1.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
-// Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-// Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 22
-    versionName "12.0.0"
+    versionName "13.1.0"
   }
   lintOptions {
     abortOnError false
@@ -67,5 +84,6 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
+  implementation "androidx.core:core-ktx:1.6.0"
 }

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

@@ -3,67 +3,56 @@ package expo.modules.localization
 import android.os.Bundle
 import android.view.View
 import android.text.TextUtils
-import android.content.Context
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
+import androidx.core.os.bundleOf
 
-import expo.modules.core.Promise
-import expo.modules.core.ExportedModule
-import expo.modules.core.interfaces.ExpoMethod
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 
 import kotlin.collections.ArrayList
-import java.lang.ref.WeakReference
 import java.text.DecimalFormatSymbols
 import java.util.*
 
-class LocalizationModule(context: Context) : ExportedModule(context) {
-  private val contextRef: WeakReference<Context> = WeakReference(context)
+class LocalizationModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("ExpoLocalization")
 
-  private val applicationContext: Context?
-    get() = contextRef.get()?.applicationContext
-
-  override fun getName() = "ExpoLocalization"
-
-  override fun getConstants(): Map<String, Any> {
-    val constants = HashMap<String, Any>()
-    val bundle = bundledConstants
-    for (key in bundle.keySet()) {
-      constants[key] = bundle[key] as Any
+    Constants {
+      bundledConstants.toShallowMap()
     }
-    return constants
-  }
 
-  @ExpoMethod
-  fun getLocalizationAsync(promise: Promise) {
-    promise.resolve(bundledConstants)
+    AsyncFunction("getLocalizationAsync") {
+      return@AsyncFunction bundledConstants
+    }
   }
 
   // TODO: Bacon: add set language
   private val bundledConstants: Bundle
     get() {
       val locale = Locale.getDefault()
-      val locales = locales
       val localeNames = getLocaleNames(locales)
       val isRTL = TextUtils.getLayoutDirectionFromLocale(locale) == View.LAYOUT_DIRECTION_RTL
       val region = getRegionCode(locale)
       val symbols = DecimalFormatSymbols(locale)
-      return Bundle().apply {
-        putString("currency", getCurrencyCode(locale))
-        putString("decimalSeparator", symbols.decimalSeparator.toString())
-        putString("digitGroupingSeparator", symbols.groupingSeparator.toString())
-        putStringArrayList("isoCurrencyCodes", iSOCurrencyCodes)
-        putBoolean("isMetric", !USES_IMPERIAL.contains(region))
-        putBoolean("isRTL", isRTL)
-        putString("locale", localeNames[0])
-        putStringArrayList("locales", localeNames)
-        putString("region", region)
-        putString("timezone", TimeZone.getDefault().id)
-      }
+      return bundleOf(
+        "currency" to getCurrencyCode(locale),
+        "decimalSeparator" to symbols.decimalSeparator.toString(),
+        "digitGroupingSeparator" to symbols.groupingSeparator.toString(),
+        "isoCurrencyCodes" to ISOCurrencyCodes,
+        "isMetric" to !USES_IMPERIAL.contains(region),
+        "isRTL" to isRTL,
+        // TODO: (barthap) this can throw IndexOutOfBounds exception - handle this properly
+        "locale" to localeNames[0],
+        "locales" to localeNames,
+        "region" to region,
+        "timezone" to TimeZone.getDefault().id
+      )
     }
 
-  private val locales: ArrayList<Locale>
+  private val locales: List<Locale>
     get() {
-      val context = applicationContext ?: return ArrayList()
+      val context = appContext.reactContext ?: return emptyList()
       val configuration = context.resources.configuration
       return if (VERSION.SDK_INT > VERSION_CODES.N) {
         val locales = ArrayList<Locale>()
@@ -72,7 +61,7 @@ class LocalizationModule(context: Context) : ExportedModule(context) {
         }
         locales
       } else {
-        arrayListOf(configuration.locale)
+        listOf(configuration.locale)
       }
     }
 
@@ -80,6 +69,19 @@ class LocalizationModule(context: Context) : ExportedModule(context) {
     val miuiRegion = getSystemProperty("ro.miui.region")
     return if (!TextUtils.isEmpty(miuiRegion)) {
       miuiRegion
-    } else getCountryCode(locale)
+    } else {
+      getCountryCode(locale)
+    }
+  }
+}
+
+/**
+ * Creates a shallow [Map] from the [Bundle]. Does not traverse nested arrays and bundles.
+ */
+private fun Bundle.toShallowMap(): Map<String, Any?> {
+  val map = HashMap<String, Any?>()
+  for (key in this.keySet()) {
+    map[key] = this[key]
   }
+  return map
 }

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

@@ -2,15 +2,14 @@ package expo.modules.localization
 
 import android.text.TextUtils
 import java.util.*
-import kotlin.collections.ArrayList
 
 val USES_IMPERIAL = listOf("US", "LR", "MM")
 
-val iSOCurrencyCodes: ArrayList<String> by lazy {
-  Currency.getAvailableCurrencies().map { it.currencyCode as String } as ArrayList<String>
+val ISOCurrencyCodes: Array<String> by lazy {
+  Currency.getAvailableCurrencies().map { it.currencyCode as String }.toTypedArray()
 }
 
-fun getLocaleNames(locales: ArrayList<Locale>) = locales.map { it.toLanguageTag() } as ArrayList
+fun getLocaleNames(locales: List<Locale>) = locales.map { it.toLanguageTag() }.toTypedArray()
 
 fun getCountryCode(locale: Locale): String? {
   return runCatching {

package/build/ExpoLocalization.d.ts

@@ -13,3 +13,4 @@ declare const _default: {
     getLocalizationAsync(): Promise<Localization>;
 };
 export default _default;
+//# sourceMappingURL=ExpoLocalization.d.ts.map

package/build/ExpoLocalization.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoLocalization.d.ts","sourceRoot":"","sources":["../src/ExpoLocalization.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;;;;;;;;;;;;4BAqEpB,QAAQ,YAAY,CAAC;;AAnErD,wBA6FE"}

package/build/ExpoLocalization.native.d.ts

@@ -1,2 +1,3 @@
-declare const _default: import("expo-modules-core").ProxyNativeModule;
+declare const _default: any;
 export default _default;
+//# sourceMappingURL=ExpoLocalization.native.d.ts.map

package/build/ExpoLocalization.native.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoLocalization.native.d.ts","sourceRoot":"","sources":["../src/ExpoLocalization.native.ts"],"names":[],"mappings":";AAEA,wBAAuD"}

package/build/ExpoLocalization.native.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoLocalization;
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoLocalization');
 //# sourceMappingURL=ExpoLocalization.native.js.map

package/build/ExpoLocalization.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoLocalization.native.js","sourceRoot":"","sources":["../src/ExpoLocalization.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,eAAe,kBAAkB,CAAC,gBAAgB,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\n\nexport default NativeModulesProxy.ExpoLocalization;\n"]}
+{"version":3,"file":"ExpoLocalization.native.js","sourceRoot":"","sources":["../src/ExpoLocalization.native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,eAAe,mBAAmB,CAAC,kBAAkB,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\nexport default requireNativeModule('ExpoLocalization');\n"]}

package/build/Localization.d.ts

@@ -44,6 +44,8 @@ export declare const locale: string;
 /**
  * List of all the native languages provided by the user settings.
  * These are returned in the order the user defines in their device settings.
+ *
+ * @example `['en', 'en-US', 'zh-Hans', 'zh-Hans-CN', 'en-emodeng']`
  */
 export declare const locales: string[];
 /**
@@ -76,3 +78,4 @@ export declare const region: string | null;
  * ```
  */
 export declare function getLocalizationAsync(): Promise<Localization>;
+//# sourceMappingURL=Localization.d.ts.map

package/build/Localization.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Localization.d.ts","sourceRoot":"","sources":["../src/Localization.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,CAAC;AAGxB;;;;GAIG;AACH,eAAO,MAAM,QAAQ,eAA4B,CAAC;AAGlD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAoC,CAAC;AAGlE;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAA0C,CAAC;AAG9E;;GAEG;AACH,eAAO,MAAM,gBAAgB,UAAoC,CAAC;AAGlE;;;GAGG;AACH,eAAO,MAAM,QAAQ,SAA4B,CAAC;AAGlD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,SAAyB,CAAC;AAG5C;;;;;GAKG;AACH,eAAO,MAAM,MAAM,QAA0B,CAAC;AAG9C;;;;;GAKG;AACH,eAAO,MAAM,OAAO,UAA2B,CAAC;AAGhD;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,QAA4B,CAAC;AAGlD;;;;;GAKG;AACH,eAAO,MAAM,MAAM,eAA0B,CAAC;AAG9C;;;;;;;;;;;;GAYG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,YAAY,CAAC,CAElE"}

package/build/Localization.js

@@ -51,6 +51,8 @@ export const locale = ExpoLocalization.locale;
 /**
  * List of all the native languages provided by the user settings.
  * These are returned in the order the user defines in their device settings.
+ *
+ * @example `['en', 'en-US', 'zh-Hans', 'zh-Hans-CN', 'en-emodeng']`
  */
 export const locales = ExpoLocalization.locales;
 // @needsAudit

package/build/Localization.js.map

@@ -1 +1 @@
-{"version":3,"file":"Localization.js","sourceRoot":"","sources":["../src/Localization.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAKlD,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;AAElD,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,gBAAgB,CAAC;AAElE,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,sBAAsB,CAAC;AAE9E,cAAc;AACd;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,gBAAgB,CAAC;AAElE,cAAc;AACd;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;AAElD,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC;AAE5C,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;AAE9C,cAAc;AACd;;;GAGG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC;AAEhD,cAAc;AACd;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;AAElD,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;AAE9C,cAAc;AACd;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,OAAO,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;AACvD,CAAC","sourcesContent":["import ExpoLocalization from './ExpoLocalization';\nimport { Localization } from './Localization.types';\n\nexport { Localization };\n\n// @needsAudit\n/**\n * Three-character ISO 4217 currency code. Returns `null` on web.\n *\n * @example `'USD'`, `'EUR'`, `'CNY'`, `null`\n */\nexport const currency = ExpoLocalization.currency;\n\n// @needsAudit\n/**\n * Decimal separator used for formatting numbers.\n *\n * @example `','`, `'.'`\n */\nexport const decimalSeparator = ExpoLocalization.decimalSeparator;\n\n// @needsAudit\n/**\n * Digit grouping separator used when formatting numbers larger than 1000.\n *\n * @example `'.'`, `''`, `','`\n */\nexport const digitGroupingSeparator = ExpoLocalization.digitGroupingSeparator;\n\n// @needsAudit\n/**\n * A list of all the supported language ISO codes.\n */\nexport const isoCurrencyCodes = ExpoLocalization.isoCurrencyCodes;\n\n// @needsAudit\n/**\n * Boolean value that indicates whether the system uses the metric system.\n * On Android and web, this is inferred from the current region.\n */\nexport const isMetric = ExpoLocalization.isMetric;\n\n// @needsAudit\n/**\n * Returns if the system's language is written from Right-to-Left.\n * This can be used to build features like [bidirectional icons](https://material.io/design/usability/bidirectionality.html).\n *\n * Returns `false` in Server Side Rendering (SSR) environments.\n */\nexport const isRTL = ExpoLocalization.isRTL;\n\n// @needsAudit\n/**\n * An [IETF BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag),\n * consisting of a two-character language code and optional script, region and variant codes.\n *\n * @example `'en'`, `'en-US'`, `'zh-Hans'`, `'zh-Hans-CN'`, `'en-emodeng'`\n */\nexport const locale = ExpoLocalization.locale;\n\n// @needsAudit\n/**\n * List of all the native languages provided by the user settings.\n * These are returned in the order the user defines in their device settings.\n */\nexport const locales = ExpoLocalization.locales;\n\n// @needsAudit\n/**\n * The current time zone in display format.\n * On Web time zone is calculated with Intl.DateTimeFormat().resolvedOptions().timeZone. For a\n * better estimation you could use the moment-timezone package but it will add significant bloat to\n * your website's bundle size.\n *\n * @example `'America/Los_Angeles'`\n */\nexport const timezone = ExpoLocalization.timezone;\n\n// @needsAudit\n/**\n * The region code for your device that comes from the Region setting under Language & Region on iOS.\n * This value is always available on iOS, but might return `null` on Android or web.\n *\n * @example `'US'`, `'NZ'`, `null`\n */\nexport const region = ExpoLocalization.region;\n\n// @needsAudit\n/**\n * Get the latest native values from the device. Locale can be changed on some Android devices\n * without resetting the app.\n * > On iOS, changing the locale will cause the device to reset meaning the constants will always be\n * correct.\n *\n * @example\n * ```ts\n * // When the app returns from the background on Android...\n *\n * const { locale } = await Localization.getLocalizationAsync();\n * ```\n */\nexport async function getLocalizationAsync(): Promise<Localization> {\n  return await ExpoLocalization.getLocalizationAsync();\n}\n"]}
+{"version":3,"file":"Localization.js","sourceRoot":"","sources":["../src/Localization.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAKlD,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;AAElD,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,gBAAgB,CAAC;AAElE,cAAc;AACd;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,sBAAsB,CAAC;AAE9E,cAAc;AACd;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,gBAAgB,CAAC;AAElE,cAAc;AACd;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;AAElD,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC;AAE5C,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;AAE9C,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC;AAEhD,cAAc;AACd;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;AAElD,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;AAE9C,cAAc;AACd;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,OAAO,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;AACvD,CAAC","sourcesContent":["import ExpoLocalization from './ExpoLocalization';\nimport { Localization } from './Localization.types';\n\nexport { Localization };\n\n// @needsAudit\n/**\n * Three-character ISO 4217 currency code. Returns `null` on web.\n *\n * @example `'USD'`, `'EUR'`, `'CNY'`, `null`\n */\nexport const currency = ExpoLocalization.currency;\n\n// @needsAudit\n/**\n * Decimal separator used for formatting numbers.\n *\n * @example `','`, `'.'`\n */\nexport const decimalSeparator = ExpoLocalization.decimalSeparator;\n\n// @needsAudit\n/**\n * Digit grouping separator used when formatting numbers larger than 1000.\n *\n * @example `'.'`, `''`, `','`\n */\nexport const digitGroupingSeparator = ExpoLocalization.digitGroupingSeparator;\n\n// @needsAudit\n/**\n * A list of all the supported language ISO codes.\n */\nexport const isoCurrencyCodes = ExpoLocalization.isoCurrencyCodes;\n\n// @needsAudit\n/**\n * Boolean value that indicates whether the system uses the metric system.\n * On Android and web, this is inferred from the current region.\n */\nexport const isMetric = ExpoLocalization.isMetric;\n\n// @needsAudit\n/**\n * Returns if the system's language is written from Right-to-Left.\n * This can be used to build features like [bidirectional icons](https://material.io/design/usability/bidirectionality.html).\n *\n * Returns `false` in Server Side Rendering (SSR) environments.\n */\nexport const isRTL = ExpoLocalization.isRTL;\n\n// @needsAudit\n/**\n * An [IETF BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag),\n * consisting of a two-character language code and optional script, region and variant codes.\n *\n * @example `'en'`, `'en-US'`, `'zh-Hans'`, `'zh-Hans-CN'`, `'en-emodeng'`\n */\nexport const locale = ExpoLocalization.locale;\n\n// @needsAudit\n/**\n * List of all the native languages provided by the user settings.\n * These are returned in the order the user defines in their device settings.\n *\n * @example `['en', 'en-US', 'zh-Hans', 'zh-Hans-CN', 'en-emodeng']`\n */\nexport const locales = ExpoLocalization.locales;\n\n// @needsAudit\n/**\n * The current time zone in display format.\n * On Web time zone is calculated with Intl.DateTimeFormat().resolvedOptions().timeZone. For a\n * better estimation you could use the moment-timezone package but it will add significant bloat to\n * your website's bundle size.\n *\n * @example `'America/Los_Angeles'`\n */\nexport const timezone = ExpoLocalization.timezone;\n\n// @needsAudit\n/**\n * The region code for your device that comes from the Region setting under Language & Region on iOS.\n * This value is always available on iOS, but might return `null` on Android or web.\n *\n * @example `'US'`, `'NZ'`, `null`\n */\nexport const region = ExpoLocalization.region;\n\n// @needsAudit\n/**\n * Get the latest native values from the device. Locale can be changed on some Android devices\n * without resetting the app.\n * > On iOS, changing the locale will cause the device to reset meaning the constants will always be\n * correct.\n *\n * @example\n * ```ts\n * // When the app returns from the background on Android...\n *\n * const { locale } = await Localization.getLocalizationAsync();\n * ```\n */\nexport async function getLocalizationAsync(): Promise<Localization> {\n  return await ExpoLocalization.getLocalizationAsync();\n}\n"]}

package/build/Localization.types.d.ts

@@ -2,23 +2,23 @@ export declare type Localization = {
     /**
      * Three-character ISO 4217 currency code. Returns `null` on web.
      *
-     * @example `USD`, `EUR`, `CNY`, null
+     * @example `'USD'`, `'EUR'`, `'CNY'`, `null`
      */
     currency: string | null;
     /**
      * Decimal separator used for formatting numbers.
      *
-     * @example `,`, '.'
+     * @example `','`, `'.'`
      */
     decimalSeparator: string;
     /**
      * Digit grouping separator used when formatting numbers larger than 1000.
      *
-     * @example `.`, '', ','
+     * @example `'.'`, `''`, `','`
      */
     digitGroupingSeparator: string;
     /**
-     * List of all the supported language ISO codes.
+     * A list of all the supported language ISO codes.
      */
     isoCurrencyCodes: string[];
     /**
@@ -30,35 +30,38 @@ export declare type Localization = {
      * Returns if the system's language is written from Right-to-Left.
      * This can be used to build features like [bidirectional icons](https://material.io/design/usability/bidirectionality.html).
      *
-     * Returns `false` in SSR environments.
+     * Returns `false` in Server Side Rendering (SSR) environments.
      */
     isRTL: boolean;
     /**
      * An [IETF BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag),
      * consisting of a two-character language code and optional script, region and variant codes.
      *
-     * @example `en`, `en-US`, `zh-Hans`, `zh-Hans-CN`, `en-emodeng`
+     * @example `'en'`, `'en-US'`, `'zh-Hans'`, `'zh-Hans-CN'`, `'en-emodeng'`
      */
     locale: string;
     /**
-     * List of all the languages provided by the user settings.
+     * List of all the native languages provided by the user settings.
      * These are returned in the order the user defines in their device settings.
      *
-     * @example [`en`, `en-US`, `zh-Hans`, `zh-Hans-CN`, `en-emodeng`]
+     * @example `['en', 'en-US', 'zh-Hans', 'zh-Hans-CN', 'en-emodeng']`
      */
     locales: string[];
     /**
      * The region code for your device that comes from the Region setting under Language & Region on iOS.
      * This value is always available on iOS, but might return `null` on Android or web.
      *
-     * @example `US`, `NZ`, null
+     * @example `'US'`, `'NZ'`, `null`
      */
     region: string | null;
     /**
-     * The current timezone in display format.
-     * On Web timezone is calculated with Intl.DateTimeFormat().resolvedOptions().timeZone. For a better estimation you could use the moment-timezone package but it will add significant bloat to your website's bundle size.
+     * The current time zone in display format.
+     * On Web time zone is calculated with Intl.DateTimeFormat().resolvedOptions().timeZone. For a
+     * better estimation you could use the moment-timezone package but it will add significant bloat to
+     * your website's bundle size.
      *
-     * @example `America/Los_Angeles`
+     * @example `'America/Los_Angeles'`
      */
     timezone: string;
 };
+//# sourceMappingURL=Localization.types.d.ts.map

package/build/Localization.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Localization.types.d.ts","sourceRoot":"","sources":["../src/Localization.types.ts"],"names":[],"mappings":"AACA,oBAAY,YAAY,GAAG;IACzB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;;OAIG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,sBAAsB,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B;;;OAGG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAC;IACf;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}

package/build/Localization.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"Localization.types.js","sourceRoot":"","sources":["../src/Localization.types.ts"],"names":[],"mappings":"","sourcesContent":["export type Localization = {\n  /**\n   * Three-character ISO 4217 currency code. Returns `null` on web.\n   *\n   * @example `USD`, `EUR`, `CNY`, null\n   */\n  currency: string | null;\n  /**\n   * Decimal separator used for formatting numbers.\n   *\n   * @example `,`, '.'\n   */\n  decimalSeparator: string;\n  /**\n   * Digit grouping separator used when formatting numbers larger than 1000.\n   *\n   * @example `.`, '', ','\n   */\n  digitGroupingSeparator: string;\n  /**\n   * List of all the supported language ISO codes.\n   */\n  isoCurrencyCodes: string[];\n  /**\n   * Boolean value that indicates whether the system uses the metric system.\n   * On Android and web, this is inferred from the current region.\n   */\n  isMetric: boolean;\n  /**\n   * Returns if the system's language is written from Right-to-Left.\n   * This can be used to build features like [bidirectional icons](https://material.io/design/usability/bidirectionality.html).\n   *\n   * Returns `false` in SSR environments.\n   */\n  isRTL: boolean;\n  /**\n   * An [IETF BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag),\n   * consisting of a two-character language code and optional script, region and variant codes.\n   *\n   * @example `en`, `en-US`, `zh-Hans`, `zh-Hans-CN`, `en-emodeng`\n   */\n  locale: string;\n  /**\n   * List of all the languages provided by the user settings.\n   * These are returned in the order the user defines in their device settings.\n   *\n   * @example [`en`, `en-US`, `zh-Hans`, `zh-Hans-CN`, `en-emodeng`]\n   */\n  locales: string[];\n  /**\n   * The region code for your device that comes from the Region setting under Language & Region on iOS.\n   * This value is always available on iOS, but might return `null` on Android or web.\n   *\n   * @example `US`, `NZ`, null\n   */\n  region: string | null;\n  /**\n   * The current timezone in display format.\n   * On Web timezone is calculated with Intl.DateTimeFormat().resolvedOptions().timeZone. For a better estimation you could use the moment-timezone package but it will add significant bloat to your website's bundle size.\n   *\n   * @example `America/Los_Angeles`\n   */\n  timezone: string;\n};\n"]}
+{"version":3,"file":"Localization.types.js","sourceRoot":"","sources":["../src/Localization.types.ts"],"names":[],"mappings":"","sourcesContent":["// @needsAudit\nexport type Localization = {\n  /**\n   * Three-character ISO 4217 currency code. Returns `null` on web.\n   *\n   * @example `'USD'`, `'EUR'`, `'CNY'`, `null`\n   */\n  currency: string | null;\n  /**\n   * Decimal separator used for formatting numbers.\n   *\n   * @example `','`, `'.'`\n   */\n  decimalSeparator: string;\n  /**\n   * Digit grouping separator used when formatting numbers larger than 1000.\n   *\n   * @example `'.'`, `''`, `','`\n   */\n  digitGroupingSeparator: string;\n  /**\n   * A list of all the supported language ISO codes.\n   */\n  isoCurrencyCodes: string[];\n  /**\n   * Boolean value that indicates whether the system uses the metric system.\n   * On Android and web, this is inferred from the current region.\n   */\n  isMetric: boolean;\n  /**\n   * Returns if the system's language is written from Right-to-Left.\n   * This can be used to build features like [bidirectional icons](https://material.io/design/usability/bidirectionality.html).\n   *\n   * Returns `false` in Server Side Rendering (SSR) environments.\n   */\n  isRTL: boolean;\n  /**\n   * An [IETF BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag),\n   * consisting of a two-character language code and optional script, region and variant codes.\n   *\n   * @example `'en'`, `'en-US'`, `'zh-Hans'`, `'zh-Hans-CN'`, `'en-emodeng'`\n   */\n  locale: string;\n  /**\n   * List of all the native languages provided by the user settings.\n   * These are returned in the order the user defines in their device settings.\n   *\n   * @example `['en', 'en-US', 'zh-Hans', 'zh-Hans-CN', 'en-emodeng']`\n   */\n  locales: string[];\n  /**\n   * The region code for your device that comes from the Region setting under Language & Region on iOS.\n   * This value is always available on iOS, but might return `null` on Android or web.\n   *\n   * @example `'US'`, `'NZ'`, `null`\n   */\n  region: string | null;\n  /**\n   * The current time zone in display format.\n   * On Web time zone is calculated with Intl.DateTimeFormat().resolvedOptions().timeZone. For a\n   * better estimation you could use the moment-timezone package but it will add significant bloat to\n   * your website's bundle size.\n   *\n   * @example `'America/Los_Angeles'`\n   */\n  timezone: string;\n};\n"]}

package/expo-module.config.json

@@ -3,5 +3,8 @@
   "platforms": ["ios", "android"],
   "ios": {
     "modulesClassNames": ["LocalizationModule"]
+  },
+  "android": {
+    "modulesClassNames": ["expo.modules.localization.LocalizationModule"]
   }
 }

package/ios/LocalizationModule.swift

@@ -5,26 +5,37 @@ import ExpoModulesCore
 
 public class LocalizationModule: Module {
   public func definition() -> ModuleDefinition {
-    name("ExpoLocalization")
+    Name("ExpoLocalization")
 
-    constants {
+    Constants {
       return Self.getCurrentLocalization()
     }
 
-    function("getLocalizationAsync") {
+    AsyncFunction("getLocalizationAsync") {
       return Self.getCurrentLocalization()
     }
   }
+  
+  // If the application isn't manually localized for the device language then the
+  // native `Locale.current` will fallback on using English US
+  // [cite](https://stackoverflow.com/questions/48136456/locale-current-reporting-wrong-language-on-device).
+  // This method will attempt to return the locale that the device is using regardless of the app,
+  // providing better parity across platforms.
+  static func getPreferredLocale() -> Locale {
+      guard let preferredIdentifier = Locale.preferredLanguages.first else {
+          return Locale.current
+      }
+      return Locale(identifier: preferredIdentifier)
+  }
 
   static func getCurrentLocalization() -> [String: Any?] {
-    let locale = Locale.current
+    let locale = getPreferredLocale()
     let languageCode = locale.languageCode ?? "en"
     var languageIds = Locale.preferredLanguages
 
     if languageIds.isEmpty {
       languageIds.append("en-US")
     }
-
     return [
       "currency": locale.currencyCode ?? "USD",
       "decimalSeparator": locale.decimalSeparator ?? ".",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-localization",
-  "version": "12.0.0",
+  "version": "13.1.0",
   "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": "2e5c6983b86d5ecfca028ba64002897d8adc2cc4"
+  "gitHead": "6e131f2da851a47c3a24eb3d6fc971a1a7822086"
 }

package/src/ExpoLocalization.native.ts

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
+import { requireNativeModule } from 'expo-modules-core';
 
-export default NativeModulesProxy.ExpoLocalization;
+export default requireNativeModule('ExpoLocalization');

package/src/Localization.ts

@@ -62,6 +62,8 @@ export const locale = ExpoLocalization.locale;
 /**
  * List of all the native languages provided by the user settings.
  * These are returned in the order the user defines in their device settings.
+ *
+ * @example `['en', 'en-US', 'zh-Hans', 'zh-Hans-CN', 'en-emodeng']`
  */
 export const locales = ExpoLocalization.locales;
 

package/src/Localization.types.ts

@@ -1,24 +1,25 @@
+// @needsAudit
 export type Localization = {
   /**
    * Three-character ISO 4217 currency code. Returns `null` on web.
    *
-   * @example `USD`, `EUR`, `CNY`, null
+   * @example `'USD'`, `'EUR'`, `'CNY'`, `null`
    */
   currency: string | null;
   /**
    * Decimal separator used for formatting numbers.
    *
-   * @example `,`, '.'
+   * @example `','`, `'.'`
    */
   decimalSeparator: string;
   /**
    * Digit grouping separator used when formatting numbers larger than 1000.
    *
-   * @example `.`, '', ','
+   * @example `'.'`, `''`, `','`
    */
   digitGroupingSeparator: string;
   /**
-   * List of all the supported language ISO codes.
+   * A list of all the supported language ISO codes.
    */
   isoCurrencyCodes: string[];
   /**
@@ -30,35 +31,37 @@ export type Localization = {
    * Returns if the system's language is written from Right-to-Left.
    * This can be used to build features like [bidirectional icons](https://material.io/design/usability/bidirectionality.html).
    *
-   * Returns `false` in SSR environments.
+   * Returns `false` in Server Side Rendering (SSR) environments.
    */
   isRTL: boolean;
   /**
    * An [IETF BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag),
    * consisting of a two-character language code and optional script, region and variant codes.
    *
-   * @example `en`, `en-US`, `zh-Hans`, `zh-Hans-CN`, `en-emodeng`
+   * @example `'en'`, `'en-US'`, `'zh-Hans'`, `'zh-Hans-CN'`, `'en-emodeng'`
    */
   locale: string;
   /**
-   * List of all the languages provided by the user settings.
+   * List of all the native languages provided by the user settings.
    * These are returned in the order the user defines in their device settings.
    *
-   * @example [`en`, `en-US`, `zh-Hans`, `zh-Hans-CN`, `en-emodeng`]
+   * @example `['en', 'en-US', 'zh-Hans', 'zh-Hans-CN', 'en-emodeng']`
    */
   locales: string[];
   /**
    * The region code for your device that comes from the Region setting under Language & Region on iOS.
    * This value is always available on iOS, but might return `null` on Android or web.
    *
-   * @example `US`, `NZ`, null
+   * @example `'US'`, `'NZ'`, `null`
    */
   region: string | null;
   /**
-   * The current timezone in display format.
-   * On Web timezone is calculated with Intl.DateTimeFormat().resolvedOptions().timeZone. For a better estimation you could use the moment-timezone package but it will add significant bloat to your website's bundle size.
+   * The current time zone in display format.
+   * On Web time zone is calculated with Intl.DateTimeFormat().resolvedOptions().timeZone. For a
+   * better estimation you could use the moment-timezone package but it will add significant bloat to
+   * your website's bundle size.
    *
-   * @example `America/Los_Angeles`
+   * @example `'America/Los_Angeles'`
    */
   timezone: string;
 };

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
 }

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

@@ -1,10 +0,0 @@
-package expo.modules.localization
-
-import android.content.Context
-import expo.modules.core.BasePackage
-import expo.modules.core.ExportedModule
-
-class LocalizationPackage : BasePackage() {
-  override fun createExportedModules(context: Context): List<ExportedModule> =
-    listOf(LocalizationModule(context))
-}