added support for localisation json, updated flutter version

Author: filipraj08

lib/model/localization_settings.dart

@@ -4,7 +4,12 @@ import 'package:flutter_localization/model/local_file.dart';
 
 class LocalizationSettings {
   /// Path to the localisation file in app bundle
-  final String localisationFilePath;
+  /// Use either [localisationFilePath] or [localisationJson]
+  final String? localisationFilePath;
+
+  /// Localisation json
+  /// Use either [localisationFilePath] or [localisationJson]
+  final String? localisationJson;
 
   /// The [supportedLanguages] of the app.
   ///
@@ -17,8 +22,11 @@ class LocalizationSettings {
   final List<LocalFile> localFiles;
 
   LocalizationSettings({
-    required this.localisationFilePath,
+    this.localisationFilePath,
+    this.localisationJson,
     this.supportedLanguages = const ['en'],
     this.localFiles = const [],
-  }) : assert(supportedLanguages.length > 0, 'supportedLanguages cannot be empty');
+  })  : assert(supportedLanguages.length > 0, 'supportedLanguages cannot be empty'),
+        assert(localisationFilePath != null || localisationJson != null,
+            'localisationFilePath or localisationJson must not be null');
 }

lib/service/localization_service.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:ui';
 
 import 'package:flutter_localization/model/localization_settings.dart';
 import 'package:flutter_localization/model/localized_string.dart';
@@ -44,8 +43,8 @@ class LocalizationService {
   }
 
   Future<void> _readLocalization() async {
-    final Map<String, dynamic> localizationMap =
-        jsonDecode(await rootBundle.loadString(_settings.localisationFilePath));
+    final localizationJson = _settings.localisationJson ?? await rootBundle.loadString(_settings.localisationFilePath!);
+    final Map<String, dynamic> localizationMap = jsonDecode(localizationJson);
     _initLocalizationStringFromJsonMap(localizationMap);
   }
 
@@ -122,13 +121,10 @@ class LocalizationService {
   }
 
   Future<String?> getLocalizedLocalFile(String id) async {
-    var localFile =
-        _settings.localFiles.firstWhereOrNull((file) => file.id == id && file.langCode == currentLanguageCode);
+    var localFile = _settings.localFiles.firstWhereOrNull((file) => file.id == id && file.langCode == currentLanguageCode);
     if (localFile == null) {
-      print(
-          'flutter_localization: Local file with id: $id not found for current language. Fallback to default language');
-      localFile =
-          _settings.localFiles.firstWhereOrNull((file) => file.id == id && file.langCode == defaultLanguageCode);
+      print('flutter_localization: Local file with id: $id not found for current language. Fallback to default language');
+      localFile = _settings.localFiles.firstWhereOrNull((file) => file.id == id && file.langCode == defaultLanguageCode);
     }
     if (localFile == null) {
       print('flutter_localization: Local file with id: $id not found for default language');

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,14 +21,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -85,14 +85,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -146,7 +153,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -160,7 +167,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=1.20.0"

pubspec.yaml

@@ -1,8 +1,7 @@
 name: flutter_localization
 description: Flutter Localization
-version: 2.0.0
-author: Filip Rajicic
-homepage: www.credeo.de
+version: 2.1.0
+homepage: www.credeo.rs
 
 environment:
   sdk: ">=2.12.0 <3.0.0"