Add 24 hour detection

react-native-device-info · Nov 15, 2017 · 5d7a8f0 · 5d7a8f0
1 parent 00b7875
commit 5d7a8f0
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 1 deletion.
diff --git a/RNDeviceInfo/RNDeviceInfo.m b/RNDeviceInfo/RNDeviceInfo.m
@@ -183,6 +183,12 @@ - (bool) isTablet
   return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad;
 }
 
+- (bool) is24Hour
+{
+    NSString *format = [NSDateFormatter dateFormatFromTemplate:@"j" options:0 locale:[NSLocale currentLocale]];
+    return ([format rangeOfString:@"a"].location == NSNotFound);
+}
+
 - (NSDictionary *)constantsToExport
 {
     UIDevice *currentDevice = [UIDevice currentDevice];
@@ -208,6 +214,7 @@ - (NSDictionary *)constantsToExport
              @"timezone": self.timezone,
              @"isEmulator": @(self.isEmulator),
              @"isTablet": @(self.isTablet),
+             @"is24Hour": @(self.is24Hour),
              };
 }
 

diff --git a/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java b/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
@@ -89,6 +89,10 @@ private Boolean isTablet() {
     return layout == Configuration.SCREENLAYOUT_SIZE_LARGE || layout == Configuration.SCREENLAYOUT_SIZE_XLARGE;
   }
 
+  private Boolean is24Hour() {
+    return android.text.format.DateFormat.is24HourFormat(this.reactContext.getApplicationContext());
+  }
+
   @ReactMethod
   public void isPinOrFingerprintSet(Callback callback) {
     KeyguardManager keyguardManager = (KeyguardManager) this.reactContext.getApplicationContext().getSystemService(Context.KEYGUARD_SERVICE); //api 16+
@@ -165,6 +169,7 @@ public void getMacAddress(Promise p) {
     constants.put("timezone", TimeZone.getDefault().getID());
     constants.put("isEmulator", this.isEmulator());
     constants.put("isTablet", this.isTablet());
+    constants.put("is24Hour", this.is24Hour());
     if (getCurrentActivity() != null &&
           (getCurrentActivity().checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED ||
             getCurrentActivity().checkCallingOrSelfPermission(Manifest.permission.READ_SMS) == PackageManager.PERMISSION_GRANTED ||

diff --git a/deviceinfo.d.ts b/deviceinfo.d.ts
@@ -20,6 +20,7 @@ export function getTimezone(): string;
 export function getInstanceID(): string;
 export function isEmulator(): boolean;
 export function isTablet(): boolean;
+export function is24Hour(): boolean;
 export function isPinOrFingerprintSet(): (cb: (isPinOrFingerprintSet: boolean) => void) => void;
 export function getFirstInstallTime(): number;
 export function getLastUpdateTime(): number;

diff --git a/deviceinfo.js b/deviceinfo.js
@@ -74,6 +74,9 @@ module.exports = {
   isTablet: function() {
     return RNDeviceInfo.isTablet;
   },
+  is24Hour: function() {
+    return RNDeviceInfo.is24Hour;
+  },
   isPinOrFingerprintSet: function () {
     return RNDeviceInfo.isPinOrFingerprintSet;
   },

diff --git a/deviceinfo.js.flow b/deviceinfo.js.flow
@@ -19,6 +19,7 @@ declare module.exports: {
   getTimezone: () => string,
   isEmulator: () => boolean,
   isTablet: () => boolean,
+  is24Hour: () => boolean,
   isPinOrFingerprintSet: () => (cb: (isPinOrFingerprintSet: boolean) => void) => void,
   getAPILevel: () => number,
   getInstanceID: () => string,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-device-info",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Get device information using react-native",
   "main": "deviceinfo.js",
   "typings": "./deviceinfo.d.ts",

diff --git a/windows/RNDeviceInfo/RNDeviceInfoModule.cs b/windows/RNDeviceInfo/RNDeviceInfoModule.cs
@@ -37,6 +37,11 @@ private bool IsTablet(string os)
             return !rgx.IsMatch(os);
         }
 
+        private bool is24Hour()
+        {
+            return DateTimeFormatInfo.CurrentInfo.ShortTimePattern.Contains("H");
+        }
+
         public override IReadOnlyDictionary<string, object> Constants
         {
 
@@ -111,6 +116,7 @@ private bool IsTablet(string os)
                 constants["timezone"] = TimeZoneInfo.Local.Id;
                 constants["isEmulator"] = IsEmulator(model);
                 constants["isTablet"] = IsTablet(os);
+                constants["is24Hour"] = is24Hour();
 
                 return constants;
             }