@amazon-devices/expo-localization 2.0.9000000000 → 2.0.9000000001

package/CMakeLists.txt

@@ -15,15 +15,26 @@ set(PACKAGE_NAME "expo-localization")
 set(AUTO_LINK_PACKAGE_NAME "${PACKAGE_NAME}-${KEPLER_REACT_NATIVE_MAJOR_VERSION}")
 set(SOURCES_KEPLER kepler/ExpoLocalization.cpp)
 
-find_package(ICU COMPONENTS i18n)
+# ICU::uc is an explicit dependency — previously resolved transitively through expo-kepler-utils -> keplerscript-2
+find_package(ICU COMPONENTS i18n uc)
 
 add_library(${PACKAGE_NAME} STATIC ${SOURCES_KEPLER})
 
+kepler_add_idl_import_library(
+  expo_localization_idl_pkg
+  PACKAGES
+  com.amazon.kepler.env
+  com.amazon.kepler.device_config
+  com.amazon.kepler.experimental_mr33.messaging
+)
+
 target_link_libraries(
   ${PACKAGE_NAME}
   PUBLIC
-  keplerui::keplerscript-${KEPLER_REACT_NATIVE_MAJOR_VERSION}
+  turbomoduleAPI::turbomoduleAPI
   ICU::i18n
+  ICU::uc
+  expo_localization_idl_pkg
 )
 
 add_library(${AUTO_LINK_PACKAGE_NAME} SHARED kepler/KeplerInit.cpp)
@@ -41,8 +52,9 @@ add_executable(${AUTO_LINK_PACKAGE_NAME}_exe kepler/KeplerInit.cpp)
 target_link_libraries(${AUTO_LINK_PACKAGE_NAME}_exe
   PRIVATE
   ${AUTO_LINK_PACKAGE_NAME}
-  keplerui::keplerscript-${KEPLER_REACT_NATIVE_MAJOR_VERSION}
+  turbomoduleAPI::turbomoduleAPI
   ICU::i18n
+  expo_localization_idl_pkg
 )
 
 install(TARGETS ${AUTO_LINK_PACKAGE_NAME}

package/README.kepler.md

@@ -107,3 +107,4 @@ Check out the dedicated documentation page for info about this library, API refe
 | Package version  | Based on | @amazon-devices/react-native-kepler version |
 | ---------------- | -------- | --------------------------------- |
 | 2.0.x    | expo-localization v14.6.0   | 2.0.x            |
+| 2.0.x    | expo-localization v14.6.0   | 4.0.x+rn0.83.0   |

package/build/ExpoLocalization.kepler.d.ts

@@ -1,12 +1,12 @@
-import { Subscription } from 'expo-modules-core';
+import type { Subscription } from 'expo-modules-core';
 import { Calendar, Locale } from './Localization.types';
-export declare function addLocaleListener(listener: (event: any) => void): void;
-export declare function addCalendarListener(listener: (event: any) => void): void;
+export declare function addLocaleListener(listener: () => void): Subscription;
+export declare function addCalendarListener(listener: () => void): Subscription;
 export declare function removeSubscription(subscription: Subscription): void;
 declare const module: {
     getLocales: () => Locale[];
     getCalendars: () => Calendar[];
-    locale: any;
+    locale: string;
 };
 export default module;
 //# sourceMappingURL=ExpoLocalization.kepler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ExpoLocalization.kepler.d.ts","sourceRoot":"","sources":["../src/ExpoLocalization.kepler.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAUtD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,CAAC,KAAK,KAAA,KAAK,IAAI,QAE1D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,CAAC,KAAK,KAAA,KAAK,IAAI,QAE5D;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,QAE5D;AAED,QAAA,MAAM,MAAM;sBAnBM,MAAM,EAAE;wBACN,QAAQ,EAAE;;CAsB7B,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"ExpoLocalization.kepler.d.ts","sourceRoot":"","sources":["../src/ExpoLocalization.kepler.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAUxD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,YAAY,CAEpE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,YAAY,CAStE;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,QAE5D;AAED,QAAA,MAAM,MAAM;sBA1BM,MAAM,EAAE;wBACN,QAAQ,EAAE;;CA6B7B,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/build/ExpoLocalization.kepler.js

@@ -6,21 +6,28 @@
  * Use is subject to license terms.
  */
 import { TurboModuleRegistry } from '@amazon-devices/keplerscript-turbomodule-api';
+import { DeviceEventEmitter } from 'react-native';
 const nativeModule = TurboModuleRegistry.getEnforcing('ExpoLocalization');
-const i18nManager = TurboModuleRegistry.getEnforcing('I18nManager');
 export function addLocaleListener(listener) {
-    i18nManager.addListener('Locale', listener);
+    return DeviceEventEmitter.addListener('onLocaleSettingsChanged', listener);
 }
 export function addCalendarListener(listener) {
-    i18nManager.addListener('Timezone', listener);
+    const localeSubscription = DeviceEventEmitter.addListener('onLocaleSettingsChanged', listener);
+    const timezoneSubscription = DeviceEventEmitter.addListener('onCalendarSettingsChanged', listener);
+    return {
+        remove: () => {
+            localeSubscription.remove();
+            timezoneSubscription.remove();
+        },
+    };
 }
 export function removeSubscription(subscription) {
-    i18nManager.removeListeners();
+    subscription.remove();
 }
 const module = {
     getLocales: nativeModule.getLocales,
     getCalendars: nativeModule.getCalendars,
-    locale: i18nManager.getAppLocale(),
+    locale: nativeModule.getLocale(),
 };
 export default module;
 //# sourceMappingURL=ExpoLocalization.kepler.js.map

package/build/ExpoLocalization.kepler.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoLocalization.kepler.js","sourceRoot":"","sources":["../src/ExpoLocalization.kepler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAoB,mBAAmB,EAAC,MAAM,oCAAoC,CAAC;AAU1F,MAAM,YAAY,GAAG,mBAAmB,CAAC,YAAY,CAAO,kBAAkB,CAAS,CAAC;AACxF,MAAM,WAAW,GAAG,mBAAmB,CAAC,YAAY,CAAC,aAAa,CAAQ,CAAC;AAE3E,MAAM,UAAU,iBAAiB,CAAC,QAAyB;IACvD,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAyB;IACzD,WAAW,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,YAA0B;IACzD,WAAW,CAAC,eAAe,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,MAAM,GAAG;IACX,UAAU,EAAE,YAAY,CAAC,UAAU;IACnC,YAAY,EAAE,YAAY,CAAC,YAAY;IACvC,MAAM,EAAE,WAAW,CAAC,YAAY,EAAE;CACrC,CAAC;AAEF,eAAe,MAAM,CAAC","sourcesContent":["/*\n * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n * PROPRIETARY/CONFIDENTIAL\n *\n * Use is subject to license terms.\n */\n\nimport {KeplerTurboModule, TurboModuleRegistry} from '@amazon-devices/keplerscript-turbomodule-api';\nimport {Subscription} from 'expo-modules-core';\n\nimport {Calendar, Locale} from './Localization.types';\n\ninterface Spec extends KeplerTurboModule {\n    getLocales(): Locale[];\n    getCalendars(): Calendar[];\n}\n\nconst nativeModule = TurboModuleRegistry.getEnforcing<Spec>('ExpoLocalization') as Spec;\nconst i18nManager = TurboModuleRegistry.getEnforcing('I18nManager') as any;\n\nexport function addLocaleListener(listener: (event) => void) {\n    i18nManager.addListener('Locale', listener);\n}\n\nexport function addCalendarListener(listener: (event) => void) {\n    i18nManager.addListener('Timezone', listener);\n}\n\nexport function removeSubscription(subscription: Subscription) {\n    i18nManager.removeListeners();\n}\n\nconst module = {\n    getLocales: nativeModule.getLocales,\n    getCalendars: nativeModule.getCalendars,\n    locale: i18nManager.getAppLocale(),\n};\n\nexport default module;\n"]}
+{"version":3,"file":"ExpoLocalization.kepler.js","sourceRoot":"","sources":["../src/ExpoLocalization.kepler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAqB,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAE5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAUlD,MAAM,YAAY,GAAG,mBAAmB,CAAC,YAAY,CAAO,kBAAkB,CAAC,CAAC;AAEhF,MAAM,UAAU,iBAAiB,CAAC,QAAoB;IAClD,OAAO,kBAAkB,CAAC,WAAW,CAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAoB;IACpD,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,WAAW,CAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;IAC/F,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,WAAW,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAC;IACnG,OAAO;QACH,MAAM,EAAE,GAAG,EAAE;YACT,kBAAkB,CAAC,MAAM,EAAE,CAAC;YAC5B,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAClC,CAAC;KACY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,YAA0B;IACzD,YAAY,CAAC,MAAM,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,MAAM,GAAG;IACX,UAAU,EAAE,YAAY,CAAC,UAAU;IACnC,YAAY,EAAE,YAAY,CAAC,YAAY;IACvC,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE;CACnC,CAAC;AAEF,eAAe,MAAM,CAAC","sourcesContent":["/*\n * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n * PROPRIETARY/CONFIDENTIAL\n *\n * Use is subject to license terms.\n */\n\nimport { KeplerTurboModule, TurboModuleRegistry } from '@amazon-devices/keplerscript-turbomodule-api';\nimport type { Subscription } from 'expo-modules-core';\nimport { DeviceEventEmitter } from 'react-native';\n\nimport { Calendar, Locale } from './Localization.types';\n\ninterface Spec extends KeplerTurboModule {\n    getLocales(): Locale[];\n    getCalendars(): Calendar[];\n    getLocale(): string;\n}\n\nconst nativeModule = TurboModuleRegistry.getEnforcing<Spec>('ExpoLocalization');\n\nexport function addLocaleListener(listener: () => void): Subscription {\n    return DeviceEventEmitter.addListener('onLocaleSettingsChanged', listener);\n}\n\nexport function addCalendarListener(listener: () => void): Subscription {\n    const localeSubscription = DeviceEventEmitter.addListener('onLocaleSettingsChanged', listener);\n    const timezoneSubscription = DeviceEventEmitter.addListener('onCalendarSettingsChanged', listener);\n    return {\n        remove: () => {\n            localeSubscription.remove();\n            timezoneSubscription.remove();\n        },\n    } as Subscription;\n}\n\nexport function removeSubscription(subscription: Subscription) {\n    subscription.remove();\n}\n\nconst module = {\n    getLocales: nativeModule.getLocales,\n    getCalendars: nativeModule.getCalendars,\n    locale: nativeModule.getLocale(),\n};\n\nexport default module;\n"]}

package/kepler/ExpoLocalization.cpp

@@ -8,8 +8,20 @@
 
 #include "ExpoLocalization.h"
 
-#include <Volta/i18n/I18nManager.h>
-#include <uchar.h>
+#include <Kepler/turbomodule/NativeObject.h>
+#include <Kepler/turbomodule/TMLog.h>
+#include <apmf/fn.h>
+#include <apmf/iface/com/amazon/kepler/device_config/DeviceConfigNotFoundError.h>
+#include <apmf/iface/com/amazon/kepler/device_config/DeviceConfigResult.h>
+#include <apmf/iface/com/amazon/kepler/device_config/IDeviceConfig.h>
+#include <apmf/iface/com/amazon/kepler/device_config/IDeviceConfigModule.h>
+#include <apmf/iface/com/amazon/kepler/env/IEnvModule.h>
+#include <apmf/iface/com/amazon/kepler/env/ILocaleConfig.h>
+#include <apmf/iface/com/amazon/kepler/env/IResolvedLocalesListener.h>
+#include <apmf/iface/com/amazon/kepler/experimental_mr33/messaging/IKeplerMessagingModule.h>
+#include <apmf/iface/com/amazon/kepler/experimental_mr33/messaging/IMessageFilterBuilder.h>
+#include <apmf/iface/com/amazon/kepler/experimental_mr33/messaging/IMessageListener.h>
+#include <apmf/apmf_base.h>
 #include <unicode/currunit.h>
 #include <unicode/dcfmtsym.h>
 #include <unicode/dtptngen.h>
@@ -17,112 +29,186 @@
 #include <unicode/ulocdata.h>
 
 #include <memory>
+#include <string>
+#include <fmt/core.h>
 
-std::string toUTF8String(icu::UnicodeString from) {
+namespace env = apmf::iface::com::amazon::kepler::env;
+namespace devConf = apmf::iface::com::amazon::kepler::device_config;
+namespace messaging = apmf::iface::com::amazon::kepler::experimental_mr33::messaging;
+
+static const std::string g_timeZoneConfig{"com.amazon.devconf/system/configuration/time-zone"};
+
+apmf::Ptr<devConf::IDeviceConfig> getDeviceConfig() {
+    return apmf::detail::GetProcessObject()
+            ->getComponent("/com.amazon.kepler.device_config")
+            .TryQueryInterface<devConf::IDeviceConfigModule>()
+            ->getDeviceConfig();
+}
+
+std::string toUTF8String(const icu::UnicodeString& from) {
     std::string result;
     from.toUTF8String(result);
     return result;
 }
 
-ExpoLocalization::ExpoLocalization() : volta::react::KeplerTurboModule("ExpoLocalization") {}
+apmf::Ptr<env::IEnvModule> getEnvModule() {
+    return apmf::detail::GetProcessObject()
+            ->getComponent("/com.amazon.kepler.env")
+            .TryQueryInterface<env::IEnvModule>();
+}
+
+ExpoLocalization::ExpoLocalization() : KeplerTurboModule("ExpoLocalization") {
+    TMDEBUG(fmt::format("ExpoLocalization constructor {}", name()));
+
+    getEnvModule()->getLocaleConfig()->addResolvedLocalesListener(nullptr, apmf::Fn1([this](auto locales) {
+                                                                      this->emit("onLocaleSettingsChanged", nullptr);
+                                                                  }));
+
+    // Subscribe to timezone config changes via MR33 messaging
+    auto proc = apmf::detail::GetProcessObject();
+    auto messagingModule = proc->getComponent("/com.amazon.kepler.experimental_mr33.messaging")
+            .TryQueryInterface<messaging::IKeplerMessagingModule>();
+    if (messagingModule) {
+        struct TZListener : apmf::ApmfBase<TZListener, messaging::IMessageListener> {
+            ExpoLocalization* owner;
+            explicit TZListener(ExpoLocalization* o) : owner(o) {}
+            void onMessage(apmf::View<messaging::IMessage> /*message*/) {
+                owner->emit("onCalendarSettingsChanged", nullptr);
+            }
+            void onError(apmf::View<apmf::IError> /*error*/) {}
+        };
+
+        auto channel = messagingModule->makeMessageChannel(
+                "ExpoLocalization_TZ",
+                apmf::detail::Ptr<TZListener>::Make(this));
+
+        apmf::detail::Array<apmf::detail::Ptr<messaging::IMessageFilter>> filters;
+        filters.push_back(
+                messagingModule->makeMessageFilterBuilder()
+                        ->baseUri("broadcast://*/com.amazon.devconf/system/configuration/time-zone")
+                        ->build());
+        channel->registerMessageFilter(filters);
+        m_timezoneChannel = std::move(channel);
+    }
+};
 
-volta::react::NativeJSArray ExpoLocalization::getLocales() {
-    volta::react::NativeJSObject result;
-    UErrorCode status = U_ZERO_ERROR;
+std::string ExpoLocalization::getLocale() {
+    auto locales = getEnvModule()->getLocaleConfig()->getResolvedLocales(nullptr);
+    if (locales.empty()) {
+        return "";
+    }
+    return locales[0].identifier;
+}
 
-    auto appLocale = volta::i18n::I18nManager::getInstance().getAppLocale();
-    icu::Locale loc(appLocale.c_str());
+tbm::NativeJSArray ExpoLocalization::getLocales() {
+    auto locales = getEnvModule()->getLocaleConfig()->getResolvedLocales(nullptr);
+    tbm::NativeJSArray resultArray(locales.size());
 
-    result["languageCode"] = std::string(loc.getLanguage());
-    result["languageTag"] = appLocale;
+    for (std::size_t i = 0; i < locales.size(); i++) {
+        tbm::NativeJSObject result;
+        const std::string& identifier = locales[i].identifier;
 
-    std::unique_ptr<icu::NumberFormat> nf(icu::NumberFormat::createInstance(loc, status));
-    if (U_SUCCESS(status)) {
-        result["currencyCode"] = toUTF8String(nf->getCurrency());
-    } else {
-        result["currencyCode"] = nullptr;
-    }
+        const icu::Locale loc(identifier.c_str());
+        result["languageCode"] = std::string(loc.getLanguage());
+        result["languageTag"] = identifier;
 
-    status = U_ZERO_ERROR;
-    icu::DecimalFormatSymbols dfs(loc, status);
-    if (U_SUCCESS(status)) {
-        result["currencySymbol"] = toUTF8String(dfs.getSymbol(icu::DecimalFormatSymbols::kCurrencySymbol));
-        result["decimalSeparator"] = toUTF8String(dfs.getSymbol(icu::DecimalFormatSymbols::kDecimalSeparatorSymbol));
-        result["digitGroupingSeparator"] =
-                toUTF8String(dfs.getSymbol(icu::DecimalFormatSymbols::kGroupingSeparatorSymbol));
-    } else {
-        result["currencySymbol"] = nullptr;
-        result["decimalSeparator"] = nullptr;
-        result["digitGroupingSeparator"] = nullptr;
-    }
+        UErrorCode status = U_ZERO_ERROR;
+        std::unique_ptr<icu::NumberFormat> nf(icu::NumberFormat::createInstance(loc, status));
+        if (U_SUCCESS(status) != 0) {
+            result["currencyCode"] = toUTF8String(nf->getCurrency());
+        } else {
+            result["currencyCode"] = nullptr;
+        }
 
-    status = U_ZERO_ERROR;
-    auto measurementSystem = ulocdata_getMeasurementSystem(loc.getLanguage(), &status);
-    if (measurementSystem == UMS_SI) {
-        result["measurementSystem"] = "metric";
-    } else if (measurementSystem == UMS_US) {
-        result["measurementSystem"] = "imperial";
-    } else if (measurementSystem == UMS_UK) {
-        result["measurementSystem"] = "uk";
-    } else {
-        result["measurementSystem"] = nullptr;
-    }
+        status = U_ZERO_ERROR;
+        const icu::DecimalFormatSymbols dfs(loc, status);
+        if (U_SUCCESS(status) != 0) {
+            result["currencySymbol"] = toUTF8String(dfs.getSymbol(icu::DecimalFormatSymbols::kCurrencySymbol));
+            result["decimalSeparator"] =
+                    toUTF8String(dfs.getSymbol(icu::DecimalFormatSymbols::kDecimalSeparatorSymbol));
+            result["digitGroupingSeparator"] =
+                    toUTF8String(dfs.getSymbol(icu::DecimalFormatSymbols::kGroupingSeparatorSymbol));
+        } else {
+            result["currencySymbol"] = nullptr;
+            result["decimalSeparator"] = nullptr;
+            result["digitGroupingSeparator"] = nullptr;
+        }
+
+        status = U_ZERO_ERROR;
+        auto measurementSystem = ulocdata_getMeasurementSystem(loc.getLanguage(), &status);
+        if (measurementSystem == UMS_SI) {
+            result["measurementSystem"] = "metric";
+        } else if (measurementSystem == UMS_US) {
+            result["measurementSystem"] = "imperial";
+        } else if (measurementSystem == UMS_UK) {
+            result["measurementSystem"] = "uk";
+        } else {
+            result["measurementSystem"] = nullptr;
+        }
 
-    result["textDirection"] = loc.isRightToLeft() ? "rtl" : "ltr";
+        result["textDirection"] = (loc.isRightToLeft() != 0) ? "rtl" : "ltr";
 
-    result["regionCode"] = nullptr;
+        result["regionCode"] = nullptr;
 
-    return {result};
+        resultArray[i] = result;
+    }
+
+    return resultArray;
 }
 
-volta::react::NativeJSArray ExpoLocalization::getCalendars() {
-    volta::react::NativeJSObject calendar;
+tbm::NativeJSArray ExpoLocalization::getCalendars() {
+    const auto& locales = getEnvModule()->getLocaleConfig()->getResolvedLocales(nullptr);
+    tbm::NativeJSArray calendarArray(locales.size());
 
-    auto appLocale = volta::i18n::I18nManager::getInstance().getAppLocale();
-    icu::Locale loc(appLocale.c_str());
+    for (std::size_t i = 0; i < locales.size(); i++) {
+        tbm::NativeJSObject calendar;
+        const std::string& identifier = locales[i].identifier;
 
-    std::string timezone = volta::i18n::I18nManager::getInstance().getTimezone();
-    icu::UnicodeString timezoneUc(timezone.c_str());
-    std::unique_ptr<icu::TimeZone> tz(icu::TimeZone::createTimeZone(timezoneUc));
+        const icu::Locale loc(identifier.c_str());
 
-    UErrorCode status = U_ZERO_ERROR;
-    std::unique_ptr<icu::Calendar> c(icu::Calendar::createInstance(loc, status));
-    if (U_SUCCESS(status)) {
-        calendar["calendar"] = std::string(c->getType());
-    } else {
-        calendar["calendar"] = nullptr;
-    }
+        UErrorCode status = U_ZERO_ERROR;
+        std::unique_ptr<icu::Calendar> c(icu::Calendar::createInstance(loc, status));
+        if (U_SUCCESS(status) != 0) {
+            calendar["calendar"] = std::string(c->getType());
+        } else {
+            calendar["calendar"] = nullptr;
+        }
 
-    status = U_ZERO_ERROR;
-    int firstWeekday = (int) c->getFirstDayOfWeek(status);
-    if (U_SUCCESS(status)) {
-        calendar["firstWeekday"] = firstWeekday;
-    } else {
-        calendar["firstWeekday"] = nullptr;
-    }
+        status = U_ZERO_ERROR;
+        const int firstWeekday = static_cast<int>(c->getFirstDayOfWeek(status));
+        if (U_SUCCESS(status) != 0) {
+            calendar["firstWeekday"] = firstWeekday;
+        } else {
+            calendar["firstWeekday"] = nullptr;
+        }
 
-    calendar["uses24hourClock"] = nullptr;
-    status = U_ZERO_ERROR;
-    std::unique_ptr<icu::DateTimePatternGenerator> dtp(icu::DateTimePatternGenerator::createInstance(loc, status));
-    if (U_SUCCESS(status)) {
+        calendar["uses24hourClock"] = nullptr;
         status = U_ZERO_ERROR;
-        auto cycle = dtp->getDefaultHourCycle(status);
-        if (U_SUCCESS(status)) {
-            calendar["uses24hourClock"] = (cycle == UDAT_HOUR_CYCLE_23 || cycle == UDAT_HOUR_CYCLE_24);
+        std::unique_ptr<icu::DateTimePatternGenerator> dtp(icu::DateTimePatternGenerator::createInstance(loc, status));
+        if (U_SUCCESS(status) != 0) {
+            status = U_ZERO_ERROR;
+            auto cycle = dtp->getDefaultHourCycle(status);
+            if (U_SUCCESS(status) != 0) {
+                calendar["uses24hourClock"] = (cycle == UDAT_HOUR_CYCLE_23 || cycle == UDAT_HOUR_CYCLE_24);
+            }
+        }
+
+        apmf::Ptr<devConf::IDeviceConfig> component = getDeviceConfig();
+        try {
+            calendar["timezone"] = component->get(g_timeZoneConfig);
+        } catch (const apmf::BaseError& e) {
+            TMERROR(fmt::format("Error while processing time zone data: {}", e.what()));
+            calendar["timezone"] = nullptr;
         }
-    }
 
-    if (timezone.length() == 0) {
-        calendar["timezone"] = nullptr;
-    } else {
-        calendar["timezone"] = timezone;
+        calendarArray[i] = calendar;
     }
 
-    return {calendar};
+    return calendarArray;
 }
 
-void ExpoLocalization::aggregateMethods(
-        volta::react::MethodAggregator<volta::react::KeplerTurboModule>& methodAggregator) const noexcept {
+void ExpoLocalization::aggregateMethods(tbm::MethodAggregator<KeplerTurboModule>& methodAggregator) const noexcept {
+    methodAggregator.addMethod("getLocale", 0, &ExpoLocalization::getLocale);
     methodAggregator.addMethod("getLocales", 0, &ExpoLocalization::getLocales);
     methodAggregator.addMethod("getCalendars", 0, &ExpoLocalization::getCalendars);
 }

package/kepler/ExpoLocalization.h

@@ -8,15 +8,24 @@
 
 #pragma once
 
-#include <KeplerScript/modules/KeplerTurboModule.h>
+#include <Kepler/turbomodule/KeplerTurboModule.h>
+#include <apmf/iface/com/amazon/kepler/experimental_mr33/messaging/IMessageChannel.h>
+#include <apmf/ptr.h>
 
-class KEPLERSCRIPT_EXPORT ExpoLocalization : public volta::react::KeplerTurboModule {
+#include "expo-export.h"
+
+namespace tbm = com::amazon::kepler::turbomodule;
+
+class EXPO_EXPORT ExpoLocalization : public tbm::KeplerTurboModule {
 public:
     ExpoLocalization();
-    volta::react::NativeJSArray getLocales();
-    volta::react::NativeJSArray getCalendars();
+    std::string getLocale();
+    tbm::JSArray getLocales();
+    tbm::JSArray getCalendars();
+
+    void aggregateMethods(tbm::MethodAggregator<tbm::KeplerTurboModule>& methodAggregator) const noexcept override;
 
-protected:
-    void aggregateMethods(
-            volta::react::MethodAggregator<volta::react::KeplerTurboModule>& methodAggregator) const noexcept override;
+private:
+    apmf::detail::Ptr<apmf::iface::com::amazon::kepler::experimental_mr33::messaging::IMessageChannel>
+            m_timezoneChannel;
 };

package/kepler/KeplerInit.cpp

@@ -6,18 +6,15 @@
  * Use is subject to license terms.
  */
 
-#include <KeplerScript/logger/KPLog.h>
-#include <KeplerScript/utils/autolink/KeplerAutoLinkInfo.h>
-#include <keplerui-072/keplerscript-export.h>
+#include <Kepler/turbomodule/KeplerTurboModuleRegistration.h>
+#include <Kepler/turbomodule/TMLog.h>
 
 #include "ExpoLocalization.h"
-#include "RegisterModule.h"
 
 extern "C" {
-KEPLERSCRIPT_EXPORT void keplerAutoLinkInitV1(const kepler::autolink::v1::KeplerAutoLinkInfo* autoLinkInfo) noexcept {
-    volta::react::KPLog.debug("keplerAutoLinkInitV1 for ExpoLocalization");
-
-    REGISTER_MODULE(autoLinkInfo, ExpoLocalization, "ExpoLocalization");
+__attribute__((visibility("default"))) void autoLinkKeplerTurboModulesV1() noexcept {
+    TMDEBUG("autoLinkKeplerTurboModulesV1 for expo-localization");
+    KEPLER_REGISTER_TURBO_MODULE_WITH_NAME("ExpoLocalization", ExpoLocalization);
 }
 }
 

package/kepler-compatibility.json

@@ -0,0 +1,7 @@
+{
+  "versions": {
+    "2.0.0": "/com.amazon.kepler.expo_localization_2@IExpoLocalization_0",
+    "2.0.9000000000": "/com.amazon.kepler.expo_localization_2@IExpoLocalization_0",
+    "2.0.9000000001": "/com.amazon.kepler.expo_localization_2@IExpoLocalization_0"
+  }
+}

package/package.json

@@ -1 +1 @@
-{"name": "@amazon-devices/expo-localization", "version": "2.0.9000000000+14.6.0", "description": "Provides an interface for native user localization information.", "main": "build/Localization.js", "types": "build/Localization.d.ts", "sideEffects": false, "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "kepler": {"temporary-alias-for-package": {"name": "expo-localization", "version": "14.6.0"}}, "keywords": ["react-native", "expo", "localization", "locales", "l10n"], "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-localization"}, "bugs": {"url": "https://github.com/expo/expo/issues"}, "contributors": ["Evan Bacon <bacon@expo.io> (https://github.com/evanbacon)"], "author": "650 Industries, Inc.", "license": "See license in LICENSE", "homepage": "https://docs.expo.dev/versions/latest/sdk/localization/", "jest": {"preset": "expo-module-scripts"}, "dependencies": {"rtl-detect": "^1.0.2"}, "devDependencies": {"expo-module-scripts": "^3.0.0", "i18n-js": "^3.1.0", "@types/minimatch": "^3.0.5"}, "peerDependencies": {"expo": "*"}}
+{"name": "@amazon-devices/expo-localization", "version": "2.0.9000000001+14.6.0", "description": "Provides an interface for native user localization information.", "main": "build/Localization.js", "types": "build/Localization.d.ts", "sideEffects": false, "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "kepler": {"temporary-alias-for-package": {"name": "expo-localization", "version": "14.6.0"}}, "keywords": ["react-native", "expo", "localization", "locales", "l10n"], "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-localization"}, "bugs": {"url": "https://github.com/expo/expo/issues"}, "contributors": ["Evan Bacon <bacon@expo.io> (https://github.com/evanbacon)"], "author": "650 Industries, Inc.", "license": "See license in LICENSE", "homepage": "https://docs.expo.dev/versions/latest/sdk/localization/", "jest": {"preset": "expo-module-scripts"}, "dependencies": {"rtl-detect": "^1.0.2"}, "devDependencies": {"expo-module-scripts": "^3.0.0", "i18n-js": "^3.1.0", "@types/minimatch": "^3.0.5"}, "peerDependencies": {"expo": "^50.0.0-alpha.1"}}

package/react-native.config.js

@@ -12,6 +12,7 @@ module.exports = {
                 autolink: {
                     ExpoLocalizationLib: {
                         provider: 'system',
+                        libraryName: 'libexpo-localization-2.so.2',
                         turbomodules: ['ExpoLocalization'],
                     },
                 },

package/src/ExpoLocalization.kepler.ts

@@ -6,35 +6,43 @@
  * Use is subject to license terms.
  */
 
-import {KeplerTurboModule, TurboModuleRegistry} from '@amazon-devices/keplerscript-turbomodule-api';
-import {Subscription} from 'expo-modules-core';
+import { KeplerTurboModule, TurboModuleRegistry } from '@amazon-devices/keplerscript-turbomodule-api';
+import type { Subscription } from 'expo-modules-core';
+import { DeviceEventEmitter } from 'react-native';
 
-import {Calendar, Locale} from './Localization.types';
+import { Calendar, Locale } from './Localization.types';
 
 interface Spec extends KeplerTurboModule {
     getLocales(): Locale[];
     getCalendars(): Calendar[];
+    getLocale(): string;
 }
 
-const nativeModule = TurboModuleRegistry.getEnforcing<Spec>('ExpoLocalization') as Spec;
-const i18nManager = TurboModuleRegistry.getEnforcing('I18nManager') as any;
+const nativeModule = TurboModuleRegistry.getEnforcing<Spec>('ExpoLocalization');
 
-export function addLocaleListener(listener: (event) => void) {
-    i18nManager.addListener('Locale', listener);
+export function addLocaleListener(listener: () => void): Subscription {
+    return DeviceEventEmitter.addListener('onLocaleSettingsChanged', listener);
 }
 
-export function addCalendarListener(listener: (event) => void) {
-    i18nManager.addListener('Timezone', listener);
+export function addCalendarListener(listener: () => void): Subscription {
+    const localeSubscription = DeviceEventEmitter.addListener('onLocaleSettingsChanged', listener);
+    const timezoneSubscription = DeviceEventEmitter.addListener('onCalendarSettingsChanged', listener);
+    return {
+        remove: () => {
+            localeSubscription.remove();
+            timezoneSubscription.remove();
+        },
+    } as Subscription;
 }
 
 export function removeSubscription(subscription: Subscription) {
-    i18nManager.removeListeners();
+    subscription.remove();
 }
 
 const module = {
     getLocales: nativeModule.getLocales,
     getCalendars: nativeModule.getCalendars,
-    locale: i18nManager.getAppLocale(),
+    locale: nativeModule.getLocale(),
 };
 
 export default module;

package/plugin/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["./src/withExpoLocalization.ts"],"version":"5.9.3"}