added currentLocale call

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1 - 15 Feb 2019
+
+* Added currentLocale call
+
 ## 0.1.0
 
 * Removed Swift code. Now uses Objective C for iOS implementation

README.md

@@ -11,9 +11,10 @@ then
 
 ```
 List languages = await Devicelocale.preferredLanguages;
+String locale = await Devicelocale.currentLocale;
 ```
 
-this should return a list of the preferred/current language locales setup on the device, with the current one being the first in the list.
+this should return a list of the preferred/current language locales setup on the device, with the current one being the first in the list or just the currently set device locale.
 
 
 ## iOS

android/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

android/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>devicelocale</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=../example/android
+eclipse.preferences.version=1

android/src/main/java/com/example/devicelocale/DevicelocalePlugin.java

@@ -22,10 +22,16 @@ public void onMethodCall(MethodCall call, Result result) {
     String method = call.method;
     switch(method){
       case "preferredLanguages": result.success(getPreferredLanguages()); break;
+      case "currentLocale": result.success(getCurrentLocale()); break;
       default: result.notImplemented();
     }
   }
 
+  private String getCurrentLocale() {
+    String locale = Locale.getDefault().toString();
+    return locale; 
+  }
+
   private List<String> getPreferredLanguages() {
     LocaleList list = Resources.getSystem().getConfiguration().getLocales().getAdjustedDefault();
     List<String> result = new ArrayList<String>();

example/lib/main.dart

@@ -13,6 +13,7 @@ class MyApp extends StatefulWidget {
 
 class _MyAppState extends State<MyApp> {
   List _languages = List();
+  String _locale;
 
   @override
   void initState() {
@@ -23,12 +24,20 @@ class _MyAppState extends State<MyApp> {
   // Platform messages are asynchronous, so we initialize in an async method.
   Future<void> initPlatformState() async {
     List languages;
+    String currentLocale;
 
     // Platform messages may fail, so we use a try/catch PlatformException.
     try {
       languages = await Devicelocale.preferredLanguages;
+      print(languages);
     } on PlatformException {
-      print("Error obtaining preferred language");
+      print("Error obtaining preferred languages");
+    }
+    try {
+      currentLocale = await Devicelocale.currentLocale;
+      print(currentLocale);
+    } on PlatformException {
+      print("Error obtaining current locale");
     }
 
     // If the widget was removed from the tree while the asynchronous platform
@@ -38,6 +47,7 @@ class _MyAppState extends State<MyApp> {
 
     setState(() {
       _languages = languages;
+      _locale = currentLocale;
     });
   }
 
@@ -49,7 +59,15 @@ class _MyAppState extends State<MyApp> {
           title: const Text('Plugin example app'),
         ),
         body: Center(
-          child: Text('$_languages\n'),
+          child: Column(
+            children: <Widget>[
+              Text("Current locale: "),
+              Text('$_locale'),
+              Text("Preferred Languages: "),
+              Text(_languages.toString()),
+
+            ],
+          )
         ),
       ),
     );

ios/Classes/DevicelocalePlugin.m

@@ -10,8 +10,14 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 }
 
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
+
   if ([@"preferredLanguages" isEqualToString:call.method]) {
     result([NSLocale preferredLanguages]);
+  } else if([@"currentLocale" isEqualToString:call.method]){
+    NSString *locale = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
+    NSString *language = [[NSLocale currentLocale] objectForKey: NSLocaleLanguageCode];
+    NSString *formattedStr = [NSString stringWithFormat:@"%@-%@",language, locale];
+    result(formattedStr);
   } else {
     result(FlutterMethodNotImplemented);
   }

lib/devicelocale.dart

@@ -3,18 +3,23 @@
 import 'dart:async';
 import 'package:flutter/services.dart';
 
-/// A Simple plug-in that can be used to interogate a device( iOS or Android) to obtain a list of current set up locales
-///
-/// The currentl default locale should be the first in the list
+/// A Simple plug-in that can be used to interogate a device( iOS or Android) to obtain a list of current set up locales and languages
 class Devicelocale {
   static const MethodChannel _channel =
       const MethodChannel('uk.spiralarm.flutter/devicelocale');
 
-  /// Returns a 'List' of locales from the device
-  ///
-  /// for example **['en-GB', 'es-GB']**
+  /// Returns a [List] of locales from the device
+  /// the first in the list should be the current one set on the device
+  /// for example iOS **['en-GB', 'es-GB'] or for Android **['en_GB, 'es_GB]**
   static Future<List> get preferredLanguages async {
     final List version = await _channel.invokeMethod('preferredLanguages');
     return version;
   }
+
+  /// Returns a [String] of the currently set DEVICE locale made up of the language and the region
+  /// (e.g. en-US or en_US)
+  static Future<String> get currentLocale async {
+    final String locale = await _channel.invokeMethod('currentLocale');
+    return locale;
+  }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: devicelocale
 description: A Flutter package that can be used to extract the locales that are currently defined on a device with the current locale set as the first in the list.
-version: 0.1.0
+version: 0.1.1
 author: Steve Rogers <[email protected]>
 homepage: https://github.com/magnatronus/flutter-devicelocale