diff --git a/lib/entity/account.dart b/lib/entity/account.dart index be543ffa..deafb1fd 100644 --- a/lib/entity/account.dart +++ b/lib/entity/account.dart @@ -1,7 +1,6 @@ import 'package:flow/data/flow_icon.dart'; import 'package:flow/entity/_base.dart'; import 'package:flow/entity/transaction.dart'; -import 'package:flutter/widgets.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:objectbox/objectbox.dart'; @@ -38,16 +37,13 @@ class Account implements EntityBase { bool excludeFromTotalBalance; - /// Returns [IconData] from [iconCode] - /// - /// Falls back to [Symbols.error_rounded] @Transient() @JsonKey(includeFromJson: false, includeToJson: false) FlowIconData get icon { try { return FlowIconData.parse(iconCode); } catch (e) { - return FlowIconData.emoji("🤷"); + return FlowIconData.icon(Symbols.wallet_rounded); } } diff --git a/lib/entity/category.dart b/lib/entity/category.dart index 26cc1f86..c1483d9e 100644 --- a/lib/entity/category.dart +++ b/lib/entity/category.dart @@ -2,6 +2,7 @@ import 'package:flow/data/flow_icon.dart'; import 'package:flow/entity/_base.dart'; import 'package:flow/entity/transaction.dart'; import 'package:json_annotation/json_annotation.dart'; +import 'package:material_symbols_icons/symbols.dart'; import 'package:objectbox/objectbox.dart'; import 'package:uuid/uuid.dart'; @@ -34,7 +35,7 @@ class Category implements EntityBase { try { return FlowIconData.parse(iconCode); } catch (e) { - return FlowIconData.emoji("🤷"); + return FlowIconData.icon(Symbols.category_rounded); } } diff --git a/lib/routes/account_page.dart b/lib/routes/account_page.dart index 05449e5b..3cbae41f 100644 --- a/lib/routes/account_page.dart +++ b/lib/routes/account_page.dart @@ -47,7 +47,8 @@ class _AccountPageState extends State { late final Account? _currentlyEditing; String get iconCodeOrError => - _iconData?.toString() ?? FlowIconData.emoji("❌").toString(); + _iconData?.toString() ?? + FlowIconData.icon(Symbols.wallet_rounded).toString(); dynamic error; diff --git a/lib/routes/category_page.dart b/lib/routes/category_page.dart index 833756e2..175b7113 100644 --- a/lib/routes/category_page.dart +++ b/lib/routes/category_page.dart @@ -40,7 +40,8 @@ class _CategoryPageState extends State { late final Category? _currentlyEditing; String get iconCodeOrError => - _iconData?.toString() ?? FlowIconData.emoji("❌").toString(); + _iconData?.toString() ?? + FlowIconData.icon(Symbols.category_rounded).toString(); dynamic error;