diff --git a/LocaleBaseClass.js b/LocaleBaseClass.js index cfafdf5..0dd4732 100644 --- a/LocaleBaseClass.js +++ b/LocaleBaseClass.js @@ -1,34 +1,32 @@ -import { Platform, NativeModules } from 'react-native'; -const NativeLocale = NativeModules.Locale; +import { NativeEventEmitter, NativeModules } from 'react-native'; +const RCTLocale = NativeModules.Locale; const warning = require('fbjs/lib/warning'); -class LocaleBaseClass { +export default class LocaleBaseClass { static constants() { - return NativeLocale; + return RCTLocale; } - static numberFromDecimalString(number : string) { - return NativeLocale.numberFromDecimalString(number); + static numberFromDecimalString(number) { + return RCTLocale.numberFromDecimalString(number); } - static decimalStyle(number : number) { - return NativeLocale.decimalStyle(number); + static decimalStyle(number) { + return RCTLocale.decimalStyle(number); } - static validateDateFormatStyle(style : string) { + static validateDateFormatStyle(style) { let valid = ['full', 'long', 'medium', 'short', 'none']; if(Platform.OS == 'ios') valid.push('default'); return valid.indexOf(style) >= 0; } - static dateFormat(date, dateStyle : string, timeStyle : string) { + static dateFormat(date, dateStyle, timeStyle) { warning(LocaleBaseClass.validateDateFormatStyle(dateStyle), 'Locale: DateStyle must be one of [full/long/medium/short/none]'); warning(LocaleBaseClass.validateDateFormatStyle(timeStyle), 'Locale: TimeStyle must be one of [full/long/medium/short/none]'); - return NativeLocale.dateFormat(date, dateStyle, timeStyle); + return RCTLocale.dateFormat(date, dateStyle, timeStyle); } } - -module.exports = LocaleBaseClass; diff --git a/android/build.gradle b/android/build.gradle index 21bdef3..5c91c21 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,12 +5,12 @@ def safeExtGet(prop, fallback) { } android { - compileSdkVersion safeExtGet('compileSdkVersion', 23) - buildToolsVersion safeExtGet('buildToolsVersion', "23.0.1") + compileSdkVersion safeExtGet('compileSdkVersion', 27) + buildToolsVersion safeExtGet('buildToolsVersion', '28.0.2') defaultConfig { minSdkVersion safeExtGet('minSdkVersion', 16) - targetSdkVersion safeExtGet('targetSdkVersion', 22) + targetSdkVersion safeExtGet('targetSdkVersion', 27) versionCode 1 versionName "1.0" } @@ -24,5 +24,5 @@ repositories { } dependencies { - implementation 'com.facebook.react:react-native:0.17.+' + implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" } \ No newline at end of file diff --git a/index.android.js b/index.android.js index 784e5fd..e06d161 100644 --- a/index.android.js +++ b/index.android.js @@ -1,14 +1,12 @@ -const LocaleBaseClass = require('./LocaleBaseClass'); +import LocaleBaseClass from './LocaleBaseClass'; -class Locale extends LocaleBaseClass { +export default class Locale extends LocaleBaseClass { /** * Android can't pass Long's as ReactMethod arguments so send a string that is parsed */ - static dateFormat(date : Date, dateStyle : string, timeStyle : string) { + static dateFormat(date, dateStyle, timeStyle) { return LocaleBaseClass.dateFormat(''+date.getTime(), dateStyle, timeStyle); } } - -module.exports = Locale; diff --git a/index.ios.js b/index.ios.js index 8251c85..dfd415a 100644 --- a/index.ios.js +++ b/index.ios.js @@ -1,20 +1,18 @@ -import {NativeModules} from 'react-native'; -const NativeLocale = NativeModules.Locale; -const LocaleBaseClass = require('./LocaleBaseClass'); +import { NativeModules } from 'react-native'; +import LocaleBaseClass from './LocaleBaseClass'; +const RCTLocale = NativeModules.Locale; -class Locale extends LocaleBaseClass { - static currencyStyle(number : number) { - return NativeLocale.currencyStyle(number); +export default class Locale extends LocaleBaseClass { + static currencyStyle(number) { + return RCTLocale.currencyStyle(number); } - static percentStyle(number : number) { - return NativeLocale.percentStyle(number); + static percentStyle(number) { + return RCTLocale.percentStyle(number); } - static scientificStyle(number : number) { - return NativeLocale.scientificStyle(number); + static scientificStyle(number) { + return RCTLocale.scientificStyle(number); } - static spelloutStyle(number : number) { - return NativeLocale.scientificStyle(number); + static spelloutStyle(number) { + return RCTLocale.scientificStyle(number); } } - -module.exports = Locale;