[#221] [RF] Mixin Formatters to Extensions. Detouch icon converter

lyskouski · Sep 8, 2023 · 06cae24 · 06cae24
1 parent d1338a4
commit 06cae24
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 19 deletions.
diff --git a/lib/_classes/structure/account_app_data.dart b/lib/_classes/structure/account_app_data.dart
@@ -4,7 +4,7 @@
 import 'package:app_finance/_classes/structure/currency/currency_provider.dart';
 import 'package:app_finance/_classes/structure/abstract_app_data.dart';
 import 'package:app_finance/_classes/storage/app_data.dart';
-import 'package:app_finance/_mixins/formatter_mixin.dart';
+import 'package:app_finance/_ext/int_ext.dart';
 import 'package:flutter/material.dart';
 
 class AccountAppData extends AbstractAppData {
@@ -64,7 +64,7 @@ class AccountAppData extends AbstractAppData {
       progress: json['progress'],
       description: json['description'],
       color: json['color'] != null ? MaterialColor(json['color'], const <int, Color>{}) : null,
-      icon: json['icon'] != null ? FormatterMixin.getIconFromString(json['icon']) : null,
+      icon: json['icon'] != null ? int.tryParse(json['icon'])?.toIcon() : null,
       currency: CurrencyProvider.findByCode(json['currency']),
       createdAt: DateTime.parse(json['createdAt']),
       updatedAt: DateTime.parse(json['updatedAt']),

diff --git a/lib/_classes/structure/budget_app_data.dart b/lib/_classes/structure/budget_app_data.dart
@@ -5,7 +5,7 @@ import 'package:app_finance/_classes/herald/app_locale.dart';
 import 'package:app_finance/_classes/structure/currency/currency_provider.dart';
 import 'package:app_finance/_classes/structure/abstract_app_data.dart';
 import 'package:app_finance/_classes/storage/app_data.dart';
-import 'package:app_finance/_mixins/formatter_mixin.dart';
+import 'package:app_finance/_ext/int_ext.dart';
 import 'package:flutter/material.dart';
 
 class BudgetAppData extends AbstractAppData {
@@ -58,7 +58,7 @@ class BudgetAppData extends AbstractAppData {
       uuid: json['uuid'],
       progress: json['progress'],
       color: json['color'] != null ? MaterialColor(json['color'], const <int, Color>{}) : null,
-      icon: json['icon'] != null ? FormatterMixin.getIconFromString(json['icon']) : null,
+      icon: json['icon'] != null ? int.tryParse(json['icon'])?.toIcon() : null,
       currency: CurrencyProvider.findByCode(json['currency']),
       updatedAt: DateTime.parse(json['updatedAt']),
       createdAt: DateTime.parse(json['createdAt']),

diff --git a/lib/_classes/structure/goal_app_data.dart b/lib/_classes/structure/goal_app_data.dart
@@ -4,7 +4,7 @@
 import 'package:app_finance/_classes/structure/currency/currency_provider.dart';
 import 'package:app_finance/_classes/structure/abstract_app_data.dart';
 import 'package:app_finance/_classes/storage/app_data.dart';
-import 'package:app_finance/_mixins/formatter_mixin.dart';
+import 'package:app_finance/_ext/int_ext.dart';
 import 'package:flutter/material.dart';
 
 class GoalAppData extends AbstractAppData {
@@ -64,7 +64,7 @@ class GoalAppData extends AbstractAppData {
       progress: json['progress'],
       description: json['description'],
       color: json['color'] != null ? MaterialColor(json['color'], const <int, Color>{}) : null,
-      icon: json['icon'] != null ? FormatterMixin.getIconFromString(json['icon']) : null,
+      icon: json['icon'] != null ? int.tryParse(json['icon'])?.toIcon() : null,
       currency: CurrencyProvider.findByCode(json['currency']),
       updatedAt: DateTime.parse(json['updatedAt']),
       createdAt: DateTime.parse(json['createdAt']),

diff --git a/lib/_classes/structure/invoice_app_data.dart b/lib/_classes/structure/invoice_app_data.dart
@@ -5,7 +5,7 @@ import 'package:app_finance/_classes/herald/app_locale.dart';
 import 'package:app_finance/_classes/storage/app_data.dart';
 import 'package:app_finance/_classes/structure/abstract_app_data.dart';
 import 'package:app_finance/_classes/structure/currency/currency_provider.dart';
-import 'package:app_finance/_mixins/formatter_mixin.dart';
+import 'package:app_finance/_ext/int_ext.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
@@ -64,7 +64,7 @@ class InvoiceAppData extends AbstractAppData {
       progress: json['progress'],
       description: json['description'],
       color: json['color'] != null ? MaterialColor(json['color'], const <int, Color>{}) : null,
-      icon: json['icon'] != null ? FormatterMixin.getIconFromString(json['icon']) : null,
+      icon: json['icon'] != null ? int.tryParse(json['icon'])?.toIcon() : null,
       currency: CurrencyProvider.findByCode(json['currency']),
       createdAt: DateTime.parse(json['createdAt']),
       updatedAt: DateTime.parse(json['updatedAt']),

diff --git a/lib/_ext/int_ext.dart b/lib/_ext/int_ext.dart
@@ -0,0 +1,17 @@
+// Copyright 2023 The terCAD team. All rights reserved.
+// Use of this source code is governed by a CC BY-NC-ND 4.0 license that can be found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+extension IntExt on int {
+  static final Map<String, IconData> _cache = {};
+
+  IconData toIcon() {
+    if (_cache.containsKey(this)) {
+      return _cache[this]!;
+    } else {
+      const String fontFamily = 'MaterialIcons';
+      return IconData(this, fontFamily: fontFamily);
+    }
+  }
+}
diff --git a/lib/_mixins/formatter_mixin.dart b/lib/_mixins/formatter_mixin.dart
@@ -3,11 +3,9 @@
 
 import 'package:app_finance/_classes/herald/app_locale.dart';
 import 'package:currency_picker/currency_picker.dart';
-import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
 mixin FormatterMixin {
-  static final Map<String, IconData> _cache = {};
   Currency? currency;
 
   String getDateFormatted(DateTime date) {
@@ -28,13 +26,4 @@ mixin FormatterMixin {
     );
     return formatter.format(value);
   }
-
-  static IconData getIconFromString(int icon) {
-    if (_cache.containsKey(icon)) {
-      return _cache[icon]!;
-    } else {
-      const String fontFamily = 'MaterialIcons';
-      return IconData(icon, fontFamily: fontFamily);
-    }
-  }
 }
diff --git a/test/unit/_ext/int_ext_test.dart b/test/unit/_ext/int_ext_test.dart
@@ -0,0 +1,14 @@
+// Copyright 2023 The terCAD team. All rights reserved.
+// Use of this source code is governed by a CC BY-NC-ND 4.0 license that can be found in the LICENSE file.
+
+import 'package:app_finance/_ext/int_ext.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('IntExt', () {
+    test('toIcon', () {
+      expect(984284.toIcon(), Icons.currency_exchange);
+    });
+  });
+}