enrique-lozano · enrique-lozano · Feb 15, 2024 · Feb 10, 2024 · Feb 13, 2024 · Feb 14, 2024
diff --git a/lib/app/accounts/account_form.dart b/lib/app/accounts/account_form.dart
@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -25,7 +24,6 @@ import 'package:monekin/core/utils/text_field_utils.dart';
 import 'package:monekin/i18n/translations.g.dart';
 import 'package:uuid/uuid.dart';
 
-@RoutePage()
 class AccountFormPage extends StatefulWidget {
   const AccountFormPage({super.key, this.account});
 

diff --git a/lib/app/accounts/all_accounts_balance.dart b/lib/app/accounts/all_accounts_balance.dart
@@ -1,16 +1,16 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:monekin/app/accounts/account_form.dart';
 import 'package:monekin/core/database/app_db.dart';
 import 'package:monekin/core/database/services/account/account_service.dart';
 import 'package:monekin/core/models/account/account.dart';
 import 'package:monekin/core/presentation/widgets/animated_progress_bar.dart';
 import 'package:monekin/core/presentation/widgets/card_with_header.dart';
 import 'package:monekin/core/presentation/widgets/transaction_filter/transaction_filters.dart';
-import 'package:monekin/core/routes/app_router.dart';
+import 'package:monekin/core/routes/route_utils.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../../core/database/services/currency/currency_service.dart';
@@ -130,8 +130,9 @@ class _AllAccountBalancePageState extends State<AllAccountBalancePage> {
                           return ListTile(
                             leading:
                                 accountWithMoney.account.displayIcon(context),
-                            onTap: () => context.pushRoute(
-                              AccountFormRoute(
+                            onTap: () => RouteUtils.pushRoute(
+                              context,
+                              AccountFormPage(
                                   account: accountWithMoney.account),
                             ),
                             title: Column(

diff --git a/lib/app/accounts/all_accounts_page.dart b/lib/app/accounts/all_accounts_page.dart
@@ -1,16 +1,16 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:monekin/app/accounts/account_form.dart';
+import 'package:monekin/app/accounts/details/account_details.dart';
 import 'package:monekin/core/database/services/account/account_service.dart';
 import 'package:monekin/core/presentation/app_colors.dart';
 import 'package:monekin/core/presentation/widgets/monekin_reorderable_list.dart';
 import 'package:monekin/core/presentation/widgets/tappable.dart';
-import 'package:monekin/core/routes/app_router.dart';
+import 'package:monekin/core/routes/route_utils.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../../core/presentation/widgets/empty_indicator.dart';
 
-@RoutePage()
 class AllAccountsPage extends StatelessWidget {
   const AllAccountsPage({super.key});
 
@@ -21,9 +21,10 @@ class AllAccountsPage extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(title: Text(t.home.my_accounts)),
       floatingActionButton: FloatingActionButton.extended(
+        heroTag: UniqueKey(),
         icon: const Icon(Icons.add_rounded),
         label: Text(t.account.form.create),
-        onPressed: () => context.pushRoute(AccountFormRoute()),
+        onPressed: () => RouteUtils.pushRoute(context, const AccountFormPage()),
       ),
       body: StreamBuilder(
         stream: AccountService.instance.getAccounts(),
@@ -51,8 +52,12 @@ class AllAccountsPage extends StatelessWidget {
               final account = accounts.elementAt(index);
 
               return Tappable(
-                onTap: () => context.pushRoute(
-                  AccountDetailsRoute(account: account),
+                onTap: () => RouteUtils.pushRoute(
+                  context,
+                  AccountDetailsPage(
+                      account: account,
+                      accountIconHeroTag:
+                          'all-accounts-page__account-icon-${account.id}'),
                 ),
                 bgColor: AppColors.of(context).light,
                 margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
@@ -77,7 +82,7 @@ class AllAccountsPage extends StatelessWidget {
                     ],
                   ),
                   leading: Hero(
-                    tag: 'account-icon-${account.id}',
+                    tag: 'all-accounts-page__account-icon-${account.id}',
                     child: account.displayIcon(context),
                   ),
                   subtitle: Text(

diff --git a/lib/app/accounts/details/account_details.dart b/lib/app/accounts/details/account_details.dart
@@ -1,9 +1,10 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:monekin/app/accounts/details/account_details_actions.dart';
+import 'package:monekin/core/routes/route_utils.dart';
+import 'package:monekin/app/transactions/transactions.page.dart';
 import 'package:monekin/app/transactions/widgets/transaction_list.dart';
 import 'package:monekin/core/database/services/account/account_service.dart';
 import 'package:monekin/core/database/services/exchange-rate/exchange_rate_service.dart';
@@ -19,15 +20,19 @@ import 'package:monekin/core/presentation/widgets/modal_container.dart';
 import 'package:monekin/core/presentation/widgets/monekin_quick_actions_buttons.dart';
 import 'package:monekin/core/presentation/widgets/number_ui_formatters/currency_displayer.dart';
 import 'package:monekin/core/presentation/widgets/transaction_filter/transaction_filters.dart';
-import 'package:monekin/core/routes/app_router.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
-@RoutePage()
 class AccountDetailsPage extends StatefulWidget {
-  const AccountDetailsPage({super.key, required this.account});
+  const AccountDetailsPage({
+    super.key,
+    required this.account,
+    required this.accountIconHeroTag,
+  });
 
   final Account account;
 
+  final Object? accountIconHeroTag;
+
   @override
   State<AccountDetailsPage> createState() => _AccountDetailsPageState();
 }
@@ -157,8 +162,9 @@ class _AccountDetailsPageState extends State<AccountDetailsPage> {
                             ],
                           ),
                           Hero(
-                              tag: 'account-icon-${widget.account.id}',
-                              child: account.displayIcon(context, size: 48)),
+                            tag: widget.accountIconHeroTag ?? UniqueKey(),
+                            child: account.displayIcon(context, size: 48),
+                          ),
                         ],
                       ),
                     ),
@@ -219,13 +225,16 @@ class _AccountDetailsPageState extends State<AccountDetailsPage> {
                           CardWithHeader(
                             title: t.home.last_transactions,
                             onHeaderButtonClick: () {
-                              context.pushRoute(
-                                TransactionsRoute(
+                              RouteUtils.pushRoute(
+                                context,
+                                TransactionsPage(
                                     filters: TransactionFilters(
                                         accountsIDs: [widget.account.id])),
                               );
                             },
                             body: TransactionListComponent(
+                              heroTagBuilder: (tr) =>
+                                  'account-details-page__tr-icon-${tr.id}',
                               filters: TransactionFilters(
                                 status: TransactionStatus.notIn({
                                   TransactionStatus.pending,
@@ -235,8 +244,10 @@ class _AccountDetailsPageState extends State<AccountDetailsPage> {
                               ),
                               limit: 5,
                               showGroupDivider: false,
-                              prevPage:
-                                  AccountDetailsPage(account: widget.account),
+                              prevPage: AccountDetailsPage(
+                                  account: widget.account,
+                                  accountIconHeroTag:
+                                      widget.accountIconHeroTag),
                               onEmptyList: Padding(
                                 padding: const EdgeInsets.all(24),
                                 child: Text(

diff --git a/lib/app/accounts/details/account_details_actions.dart b/lib/app/accounts/details/account_details_actions.dart
@@ -1,13 +1,13 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
+import 'package:monekin/app/accounts/account_form.dart';
 import 'package:monekin/app/accounts/details/account_details.dart';
 import 'package:monekin/app/transactions/form/transaction_form.page.dart';
 import 'package:monekin/core/database/services/account/account_service.dart';
 import 'package:monekin/core/models/account/account.dart';
 import 'package:monekin/core/models/transaction/transaction.dart';
 import 'package:monekin/core/presentation/widgets/confirm_dialog.dart';
-import 'package:monekin/core/routes/app_router.dart';
+import 'package:monekin/core/routes/route_utils.dart';
 import 'package:monekin/core/utils/list_tile_action_item.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
@@ -23,7 +23,8 @@ abstract class AccountDetailsActions {
       ListTileActionItem(
         label: t.general.edit,
         icon: Icons.edit,
-        onClick: () => context.pushRoute(AccountFormRoute(account: account)),
+        onClick: () =>
+            RouteUtils.pushRoute(context, AccountFormPage(account: account)),
       ),
       ListTileActionItem(
           label: t.transfer.create,
@@ -39,8 +40,9 @@ abstract class AccountDetailsActions {
                             Text(t.transfer.need_two_accounts_warning_message)
                           ]);
 
-                  navigateToTransferForm() => context.pushRoute(
-                        TransactionFormRoute(
+                  navigateToTransferForm() => RouteUtils.pushRoute(
+                        context,
+                        TransactionFormPage(
                           fromAccount: account,
                           mode: TransactionFormMode.transfer,
                         ),

diff --git a/lib/app/budgets/budget_details_page.dart b/lib/app/budgets/budget_details_page.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
+import 'package:monekin/app/budgets/budget_form_page.dart';
 import 'package:monekin/app/budgets/budgets_page.dart';
 import 'package:monekin/app/budgets/components/budget_evolution_chart.dart';
 import 'package:monekin/app/transactions/widgets/transaction_list.dart';
@@ -17,14 +17,13 @@ import 'package:monekin/core/presentation/widgets/monekin_popup_menu_button.dart
 import 'package:monekin/core/presentation/widgets/number_ui_formatters/currency_displayer.dart';
 import 'package:monekin/core/presentation/widgets/skeleton.dart';
 import 'package:monekin/core/presentation/widgets/transaction_filter/transaction_filters.dart';
-import 'package:monekin/core/routes/app_router.dart';
+import 'package:monekin/core/routes/route_utils.dart';
 import 'package:monekin/core/utils/list_tile_action_item.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../../core/presentation/app_colors.dart';
 import '../../core/presentation/widgets/empty_indicator.dart';
 
-@RoutePage()
 class BudgetDetailsPage extends StatefulWidget {
   const BudgetDetailsPage({super.key, required this.budget});
 
@@ -94,8 +93,9 @@ class _BudgetDetailsPageState extends State<BudgetDetailsPage> {
                       label: t.budgets.form.edit,
                       icon: Icons.edit,
                       onClick: () {
-                        context.pushRoute(
-                          BudgetFormRoute(
+                        RouteUtils.pushRoute(
+                          context,
+                          BudgetFormPage(
                               prevPage: const BudgetsPage(),
                               budgetToEdit: budget),
                         );
@@ -261,6 +261,7 @@ class _BudgetDetailsPageState extends State<BudgetDetailsPage> {
                 ),
                 SingleChildScrollView(
                   child: TransactionListComponent(
+                    heroTagBuilder: (tr) => 'budgets-page__tr-icon-${tr.id}',
                     filters: TransactionFilters(
                       status: TransactionStatus.notIn({
                         TransactionStatus.pending,

diff --git a/lib/app/budgets/budget_form_page.dart b/lib/app/budgets/budget_form_page.dart
@@ -1,4 +1,3 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:monekin/app/accounts/account_selector.dart';
@@ -19,7 +18,6 @@ import 'package:uuid/uuid.dart';
 import '../../core/models/account/account.dart';
 import '../../core/presentation/widgets/persistent_footer_button.dart';
 
-@RoutePage()
 class BudgetFormPage extends StatefulWidget {
   const BudgetFormPage({super.key, this.budgetToEdit, required this.prevPage});
 

diff --git a/lib/app/budgets/budgets_page.dart b/lib/app/budgets/budgets_page.dart
@@ -1,24 +1,25 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
+import 'package:monekin/app/budgets/budget_details_page.dart';
+import 'package:monekin/app/budgets/budget_form_page.dart';
 import 'package:monekin/core/database/services/budget/budget_service.dart';
 import 'package:monekin/core/models/budget/budget.dart';
 import 'package:monekin/core/presentation/widgets/animated_progress_bar.dart';
 import 'package:monekin/core/presentation/widgets/empty_indicator.dart';
 import 'package:monekin/core/presentation/widgets/number_ui_formatters/currency_displayer.dart';
 import 'package:monekin/core/presentation/widgets/skeleton.dart';
-import 'package:monekin/core/routes/app_router.dart';
+import 'package:monekin/core/routes/route_utils.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../../core/presentation/app_colors.dart';
 
-@RoutePage()
 class BudgetsPage extends StatelessWidget {
   const BudgetsPage({super.key});
 
   Widget buildBudgetCard(BuildContext context, Budget budget) {
     return InkWell(
-      onTap: () => context.pushRoute(BudgetDetailsRoute(budget: budget)),
+      onTap: () =>
+          RouteUtils.pushRoute(context, BudgetDetailsPage(budget: budget)),
       child: Container(
           padding: const EdgeInsets.all(16),
           child: Column(
@@ -106,10 +107,12 @@ class BudgetsPage extends StatelessWidget {
           ),
         ),
         floatingActionButton: FloatingActionButton.extended(
+            heroTag: UniqueKey(),
             icon: const Icon(Icons.add_rounded),
             label: Text(t.budgets.form.create),
-            onPressed: () => context.pushRoute(
-                  BudgetFormRoute(prevPage: const BudgetsPage()),
+            onPressed: () => RouteUtils.pushRoute(
+                  context,
+                  const BudgetFormPage(prevPage: BudgetsPage()),
                 )),
         body: TabBarView(children: [
           StreamBuilder(

diff --git a/lib/app/categories/categories_list.dart b/lib/app/categories/categories_list.dart
@@ -1,11 +1,11 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:monekin/app/categories/category_selector.dart';
+import 'package:monekin/app/categories/form/category_form.dart';
 import 'package:monekin/app/categories/subcategory_selector.dart';
 import 'package:monekin/core/database/services/category/category_service.dart';
 import 'package:monekin/core/models/category/category.dart';
 import 'package:monekin/core/presentation/widgets/persistent_footer_button.dart';
-import 'package:monekin/core/routes/app_router.dart';
+import 'package:monekin/core/routes/route_utils.dart';
 import 'package:monekin/core/utils/color_utils.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
@@ -38,7 +38,6 @@ Future<List<Category>?> showCategoryListModal(
   );
 }
 
-@RoutePage()
 class CategoriesListPage extends CategoriesList {
   const CategoriesListPage()
       : super(mode: CategoriesListMode.page, selectedCategories: const []);
@@ -110,8 +109,8 @@ class _CategoriesListState extends State<CategoriesList> {
             return;
           }
 
-          goToCategoryForm() =>
-              context.pushRoute(CategoryFormRoute(categoryUUID: category.id));
+          goToCategoryForm() => RouteUtils.pushRoute(
+              context, CategoryFormPage(categoryUUID: category.id));
 
           if (widget.mode == CategoriesListMode.page) {
             await goToCategoryForm();
@@ -182,7 +181,7 @@ class _CategoriesListState extends State<CategoriesList> {
                   PersistentFooterButton(
                     child: FilledButton.icon(
                       onPressed: () {
-                        context.pushRoute(CategoryFormRoute());
+                        RouteUtils.pushRoute(context, const CategoryFormPage());
                       },
                       icon: const Icon(Icons.add),
                       label: Text(t.categories.create),

diff --git a/lib/app/categories/category_selector.dart b/lib/app/categories/category_selector.dart
@@ -75,8 +75,6 @@ class _CategorySelectorState extends State<CategorySelector> {
                   if (!widget.multiSelection) {
                     selectedCategories = [categoryToDisplay];
 
-                    print(selectedCategories);
-
                     setState(() {});
 
                     if (widget.onChange != null) {
@@ -137,8 +135,6 @@ class _CategorySelectorState extends State<CategorySelector> {
             ),
         mainColor: AppColors.of(context).onBackground,
         onTap: () {
-          print(selectedCategories);
-
           if (selectedCategories == null) {
             selectedCategories = [];
           } else {

diff --git a/lib/app/categories/form/category_form.dart b/lib/app/categories/form/category_form.dart
@@ -1,4 +1,4 @@
-import 'package:auto_route/auto_route.dart';
+import 'package:monekin/core/routes/route_utils.dart';
 import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
 import 'package:monekin/app/categories/form/category_form_functions.dart';
@@ -16,7 +16,6 @@ import 'package:monekin/core/utils/text_field_utils.dart';
 import 'package:monekin/i18n/translations.g.dart';
 import 'package:uuid/uuid.dart';
 
-@RoutePage()
 class CategoryFormPage extends StatefulWidget {
   const CategoryFormPage({super.key, this.categoryUUID});