Update lib to use constants

Author: mironiasty

android/src/main/java/xyz/miron/reactnativehourformat/RNHourFormatModule.java

@@ -4,37 +4,42 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import android.text.format.DateFormat;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
-import android.text.format.DateFormat;
+import java.util.Map;
+import java.util.HashMap;
 
 public class RNHourFormatModule extends ReactContextBaseJavaModule {
 
-  private final ReactApplicationContext reactContext;
+  private static final String LOCALE = "LOCALE";
+  private static final String HOUR_FORMAT = "HOUR_FORMAT";
+
 
   public RNHourFormatModule(ReactApplicationContext reactContext) {
     super(reactContext);
-    this.reactContext = reactContext;
   }
 
   @Override
   public String getName() {
     return "RNHourFormat";
   }
 
-  @ReactMethod
-  public void getLocale(Promise promise) {
-    promise.resolve(getPreferences().getString("locale_override", null));
+  @Override
+  public Map<String, Object> getConstants() {
+    final Map<String, Object> constants = new HashMap<>();
+    constants.put(LOCALE, this.getLocale());
+    constants.put(HOUR_FORMAT, this.getHourFormat());
+    return constants;
   }
 
-  @ReactMethod
-  public void getHourFormat(Promise promise) {
-    promise.resolve(DateFormat.is24HourFormat(getReactApplicationContext()) ? "24" : "12");
+  private String getLocale() {
+    SharedPreferences preferences = getReactApplicationContext().getSharedPreferences("react-native", Context.MODE_PRIVATE);
+    return preferences.getString("locale_override", null);
   }
 
-  private SharedPreferences getPreferences() {
-    return getReactApplicationContext().getSharedPreferences("react-native", Context.MODE_PRIVATE);
+  private String getHourFormat() {
+    return DateFormat.is24HourFormat(getReactApplicationContext()) ? "24" : "12";
   }
 }

index.js

@@ -1,28 +1,16 @@
 import { NativeModules } from 'react-native';
 const { RNHourFormat } = NativeModules;
 
-let locale = 'en-US';
-RNHourFormat.getLocale().then(result => (locale = result));
-
-let is24hourformat = false;
-RNHourFormat.getHourFormat().then(result => (is24hourformat = result === '24'));
-
 export class HourFormat {
 	static getLocale() {
-		return locale;
+		return RNHourFormat.LOCALE;
 	}
 
-	static is24HourFormat() {
-		return is24hourformat;
+  static getHourFormat() {
+		return RNHourFormat.HOUR_FORMAT;
 	}
-}
 
-export class HourFormatAsync {
-  static getLocaleAsync() {
-    return RNHourFormat.getLocale();
-  }
-
-  static is24HourFormatAsync() {
-    return RNHourFormat.getHourFormat().then(result => result === "24");
-  }
+	static is24HourFormat() {
+		return RNHourFormat.HOUR_FORMAT === '24';
+	}
 }

ios/RNHourFormat.m

@@ -9,34 +9,41 @@
 
 @implementation RNHourFormat
 
-RCT_EXPORT_MODULE();
 
+- (dispatch_queue_t)methodQueue
+{
+    return dispatch_get_main_queue();
+}
+
+RCT_EXPORT_MODULE();
 
-RCT_REMAP_METHOD(getLocale,
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+- (NSString *)getLocale
 {
     NSArray *locales = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
-    if (locales == nil) { reject(@"no_locales", @"No locales", nil); }
-    if ([locales count] == 0) { reject(@"no_locales", @"No locales", nil); }
+    if (locales == nil) { return @""; }
+    if ([locales count] == 0) { return @""; }
 
     NSString* currentLocale = locales[0];
-    resolve(currentLocale);
+    return currentLocale;
 }
 
-RCT_REMAP_METHOD(getHourFormat,
-                  hourFormatResolve:(RCTPromiseResolveBlock)resolve
-                  hourFormatReject:(RCTPromiseRejectBlock)reject)
+- (NSString *)getHourFormat
 {
     // https://stackoverflow.com/a/11660380
     NSString *formatStringForHours = [NSDateFormatter dateFormatFromTemplate:@"j" options:0 locale:[NSLocale currentLocale]];
 
     NSRange containsA = [formatStringForHours rangeOfString:@"a"];
     if (containsA.location == NSNotFound) {
-        resolve(@"24");
+        return @"24";
     } else{
-        resolve(@"12");
+        return @"12";
     };
 }
 
+- (NSDictionary *)constantsToExport
+{
+    return @{ @"LOCALE" : ([self getLocale]),
+              @"HOUR_FORMAT" : ([self getHourFormat]) };
+}
+
 @end