Merge pull request #8 from nylo-core/master

v2.2.1 - updates

Author: agordn52

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [2.2.1] - 2021-12-10
+
+* Upgrade to Dart 2.15
+* Update toast notifications
+* Refactor methods in localization
+
 ## [2.2.0] - 2021-12-07
 
 * New validator added to NyState. Allows you to validate data in widgets.

lib/alerts/toast_notification.dart

@@ -5,42 +5,43 @@ import 'package:nylo_support/alerts/toast_enums.dart';
 
 /// ToastNotificationStyleMetaHelper is used to return
 /// the correct value for the [ToastNotificationStyleType] toast style.
-class ToastNotificationStyleMetaHelper {
-  static ToastMeta getValue(ToastNotificationStyleType style) {
+class _ToastNotificationStyleMetaHelper {
+  static _ToastMeta getValue(ToastNotificationStyleType? style) {
     switch (style) {
+      case null:
       case ToastNotificationStyleType.SUCCESS:
-        return ToastMeta.success(action: () {
+        return _ToastMeta.success(action: () {
           ToastManager().dismissAll(showAnim: true);
         });
       case ToastNotificationStyleType.WARNING:
-        return ToastMeta.warning(action: () {
+        return _ToastMeta.warning(action: () {
           ToastManager().dismissAll(showAnim: true);
         });
       case ToastNotificationStyleType.INFO:
-        return ToastMeta.info(action: () {
+        return _ToastMeta.info(action: () {
           ToastManager().dismissAll(showAnim: true);
         });
       case ToastNotificationStyleType.DANGER:
-        return ToastMeta.danger(action: () {
+        return _ToastMeta.danger(action: () {
           ToastManager().dismissAll(showAnim: true);
         });
       default:
-        return ToastMeta.success(action: () {
+        return _ToastMeta.success(action: () {
           ToastManager().dismissAll(showAnim: true);
         });
     }
   }
 }
 
 /// Toast Meta makes it easy to use pre-defined styles in the toast alert.
-class ToastMeta {
+class _ToastMeta {
   Widget icon;
   String title;
   String description;
   Color color;
   Function? action;
   Duration duration;
-  ToastMeta(
+  _ToastMeta(
       {required this.icon,
       required this.title,
       required this.description,
@@ -49,7 +50,7 @@ class ToastMeta {
       this.duration = const Duration(seconds: 2)});
 
   /// DEFAULT SUCCESS TOAST META
-  ToastMeta.success(
+  _ToastMeta.success(
       {this.icon = const Icon(Icons.check, color: Colors.white, size: 30),
       this.title = "Success",
       this.description = "",
@@ -58,7 +59,7 @@ class ToastMeta {
       this.duration = const Duration(seconds: 5)});
 
   /// DEFAULT INFO TOAST META
-  ToastMeta.info(
+  _ToastMeta.info(
       {this.icon = const Icon(Icons.info, color: Colors.white, size: 30),
       this.title = "",
       this.description = "",
@@ -67,7 +68,7 @@ class ToastMeta {
       this.duration = const Duration(seconds: 5)});
 
   /// DEFAULT WARNING TOAST META
-  ToastMeta.warning(
+  _ToastMeta.warning(
       {this.icon =
           const Icon(Icons.error_outline, color: Colors.white, size: 30),
       this.title = "Oops!",
@@ -77,7 +78,7 @@ class ToastMeta {
       this.duration = const Duration(seconds: 6)});
 
   /// DEFAULT DANGER TOAST META
-  ToastMeta.danger(
+  _ToastMeta.danger(
       {this.icon = const Icon(Icons.warning, color: Colors.white, size: 30),
       this.title = "Oops!",
       this.description = "",
@@ -91,12 +92,12 @@ class ToastMeta {
 /// i.e [ToastNotificationStyleType.SUCCESS]
 /// Set a title, description to personalise the message.
 showToastNotification(BuildContext context,
-    {required ToastNotificationStyleType style,
+    {ToastNotificationStyleType? style,
     String? title,
     IconData? icon,
     String description = "",
     Duration? duration}) {
-  ToastMeta toastMeta = ToastNotificationStyleMetaHelper.getValue(style);
+  _ToastMeta toastMeta = _ToastNotificationStyleMetaHelper.getValue(style);
   toastMeta.title = toastMeta.title;
   if (title != null) {
     toastMeta.title = title;

lib/localization/app_localization.dart

@@ -4,7 +4,6 @@ import 'dart:convert';
 import 'dart:ui';
 
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 
@@ -77,7 +76,7 @@ class NyLocalization {
     // --- locale type --- //
     _localeType = localeType ?? LocaleType.device;
 
-    // --- language list --- //
+    // --- language list --- //showToastNotification
     _langList = languagesList;
 
     if (languageCode != null) {
@@ -102,14 +101,14 @@ class NyLocalization {
 
     if (_assetsDir != null) {
       _assetsDir = assetsDirectory;
-      _values = await initLanguage(_locale!.languageCode);
+      _values = await _initLanguage(_locale!.languageCode);
     } else {
       _values = valuesAsMap;
     }
   }
 
   /// Loads language Map<key, value>
-  initLanguage(String languageCode) async {
+  _initLanguage(String languageCode) async {
     String filePath = "$_assetsDir$languageCode.json";
     String content = await rootBundle.loadString(filePath);
     return json.decode(content);
@@ -122,8 +121,8 @@ class NyLocalization {
 
     String? returnValue = value;
 
-    if (isNestedKey(key)) {
-      returnValue = getNested(key);
+    if (_isNestedKey(key)) {
+      returnValue = _getNested(key);
     }
 
     if (returnValue == null) {
@@ -138,8 +137,8 @@ class NyLocalization {
     return value;
   }
 
-  String? getNested(String key) {
-    if (isNestedCached(key)) return _values![key];
+  String? _getNested(String key) {
+    if (_isNestedCached(key)) return _values![key];
 
     final keys = key.split('.');
     final kHead = keys.first;
@@ -153,23 +152,23 @@ class NyLocalization {
     /// If we found the value, cache it. If the value is null then
     /// we're not going to cache it, and returning null instead.
     if (value != null) {
-      cacheNestedKey(key, value);
+      _cacheNestedKey(key, value);
     }
 
     return value;
   }
 
-  bool isNestedCached(String key) => _values!.containsKey(key);
+  bool _isNestedCached(String key) => _values!.containsKey(key);
 
-  void cacheNestedKey(String key, String value) {
-    if (!isNestedKey(key)) {
+  void _cacheNestedKey(String key, String value) {
+    if (!_isNestedKey(key)) {
       throw Exception('Cannot cache a key that is not nested.');
     }
 
     _values![key] = value;
   }
 
-  bool isNestedKey(String key) =>
+  bool _isNestedKey(String key) =>
       !_values!.containsKey(key) && key.contains('.');
 
   /// changes active language
@@ -194,6 +193,18 @@ class NyLocalization {
     }
   }
 
+  /// changes locale
+  Future<void> setLocale({
+    required Locale locale,
+  }) async {
+    _locale = locale;
+
+    String filePath = "$_assetsDir${_locale!.languageCode}.json";
+    String content = await rootBundle.loadString(filePath);
+
+    _values = json.decode(content);
+  }
+
   /// isDirectionRTL(BuildContext context)
   /// returns `true` if active language direction is TRL
   bool isDirectionRTL(BuildContext context) =>

lib/router/router.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:nylo_support/helpers/helper.dart';
 import 'package:nylo_support/router/errors/route_not_found.dart';
 import 'package:nylo_support/router/models/arguments_wrapper.dart';

lib/router/ui/page_not_found.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 class PageNotFound extends StatelessWidget {
   const PageNotFound();

lib/validation/rules.dart

@@ -106,9 +106,7 @@ class URLRule extends ValidationRule {
 /// STRING RULE
 class StringRule extends ValidationRule {
   StringRule(String attribute)
-      : super(
-            signature: "string",
-            description: "The $attribute is not valid");
+      : super(signature: "string", description: "The $attribute is not valid");
 
   @override
   bool handle(Map<String, dynamic> info) {

lib/widgets/ny_state.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:nylo_support/alerts/toast_enums.dart';
 import 'package:nylo_support/alerts/toast_notification.dart';
 import 'package:nylo_support/exceptions/validation_exception.dart';

pubspec.lock

@@ -14,7 +14,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -28,7 +28,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -160,7 +160,7 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
   meta:
     dependency: transitive
     description:
@@ -235,7 +235,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.3"
   typed_data:
     dependency: transitive
     description:
@@ -256,7 +256,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
+  dart: ">=2.15.0 <3.0.0"
   flutter: ">=2.0.0"

pubspec.yaml

@@ -1,13 +1,13 @@
 name: nylo_support
 description: Support library for the Nylo framework. This library supports routing, widgets, localization, cli, storage and more.
-version: 2.2.0
+version: 2.2.1
 homepage: https://nylo.dev
 repository: https://github.com/nylo-core/support
 issue_tracker: https://github.com/nylo-core/support/issues
 documentation: https://github.com/nylo-core/support
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: ">=2.15.0 <3.0.0"
   flutter: ">=1.17.0"
 
 dependencies: