Commit 818bc6a7 authored by Rebecca Hughes's avatar Rebecca Hughes
Browse files

Merge pull request #30 from mikefowler/master 

Add support for device country
parents 033e7370 09cc01de

RNDeviceInfo/RNDeviceInfo.m

+14 −8
Original line number Diff line number Diff line
@@ -132,6 +132,12 @@ RCT_EXPORT_MODULE() 
    return language;

}



- (NSString*) deviceCountry

{

  NSString *country = [[NSLocale currentLocale] objectForKey:NSLocaleCountryCode];

  return country;

}



- (NSDictionary *)constantsToExport

{

    UIDevice *currentDevice = [UIDevice currentDevice];
@@ -146,6 +152,7 @@ RCT_EXPORT_MODULE() 
             @"deviceId": self.deviceId,

             @"deviceName": currentDevice.name,

             @"deviceLocale": self.deviceLocale,

             @"deviceCountry": self.deviceCountry,

             @"uniqueId": uniqueId,

             @"bundleId": [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"],

             @"appVersion": [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
@@ -156,4 +163,3 @@ RCT_EXPORT_MODULE() 
}



@end

android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ public class RNDeviceModule extends ReactContextBaseJavaModule { 
      }

  }



  private String getCurrentCountry() {

    Locale current = getReactApplicationContext().getResources().getConfiguration().locale;

    return current.getCountry();

  }



  @Override

  public @Nullable Map<String, Object> getConstants() {

    HashMap<String, Object> constants = new HashMap<String, Object>();
@@ -77,6 +82,7 @@ public class RNDeviceModule extends ReactContextBaseJavaModule { 
    constants.put("model", Build.MODEL);

    constants.put("deviceId", Build.BOARD);

    constants.put("deviceLocale", this.getCurrentLanguage());

    constants.put("deviceCountry", this.getCurrentCountry());

    constants.put("uniqueId", Secure.getString(this.reactContext.getContentResolver(), Secure.ANDROID_ID));

    constants.put("systemManufacturer", Build.MANUFACTURER);

    constants.put("bundleId", packageName);

deviceinfo.js

+4 −1
Original line number Diff line number Diff line
@@ -43,5 +43,8 @@ module.exports = { 
  },

  getDeviceLocale: function() {

    return RNDeviceInfo.deviceLocale;

  }

  },

  getDeviceCountry: function() {

    return RNDeviceInfo.deviceCountry;

  },

};