feat: Configure main responsive layout with auto_router

enrique-lozano · Nov 26, 2023 · ef850ff · ef850ff
1 parent e4a11ba
commit ef850ff
Show file tree

Hide file tree

Showing 44 changed files with 1,899 additions and 840 deletions.
diff --git a/lib/app/accounts/account_details.dart b/lib/app/accounts/account_details.dart
@@ -1,9 +1,8 @@
+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/account_form.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';
@@ -18,11 +17,13 @@ import 'package:monekin/core/presentation/widgets/inline_info_card.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/core/utils/list_tile_action_item.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../transactions/form/transaction_form.page.dart';
 
+@RoutePage()
 class AccountDetailsPage extends StatefulWidget {
   const AccountDetailsPage({super.key, required this.account});
 
@@ -42,15 +43,10 @@ class _AccountDetailsPageState extends State<AccountDetailsPage> {
 
     return [
       ListTileActionItem(
-          label: t.general.edit,
-          icon: Icons.edit,
-          onClick: () => Navigator.push(
-                context,
-                MaterialPageRoute(
-                    builder: (context) => AccountFormPage(
-                          account: account,
-                        )),
-              )),
+        label: t.general.edit,
+        icon: Icons.edit,
+        onClick: () => context.pushRoute(AccountFormRoute(account: account)),
+      ),
       ListTileActionItem(
           label: t.transfer.create,
           icon: TransactionType.transfer.icon,
@@ -75,13 +71,12 @@ class _AccountDetailsPageState extends State<AccountDetailsPage> {
                         },
                       );
 
-                  navigateToTransferForm() => Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                          builder: (context) => TransactionFormPage(
-                                fromAccount: account,
-                                mode: TransactionFormMode.transfer,
-                              )));
+                  navigateToTransferForm() => context.pushRoute(
+                        TransactionFormRoute(
+                          fromAccount: account,
+                          mode: TransactionFormMode.transfer,
+                        ),
+                      );
 
                   final numberOfAccounts =
                       (await AccountService.instance.getAccounts().first)
@@ -408,14 +403,10 @@ class _AccountDetailsPageState extends State<AccountDetailsPage> {
                           CardWithHeader(
                             title: t.home.last_transactions,
                             onHeaderButtonClick: () {
-                              Navigator.push(
-                                context,
-                                MaterialPageRoute(
-                                  builder: (context) => TransactionsPage(
+                              context.pushRoute(
+                                TransactionsRoute(
                                     filters: TransactionFilters(
-                                        accountsIDs: [widget.account.id]),
-                                  ),
-                                ),
+                                        accountsIDs: [widget.account.id])),
                               );
                             },
                             body: TransactionListComponent(

diff --git a/lib/app/accounts/account_form.dart b/lib/app/accounts/account_form.dart
@@ -1,3 +1,4 @@
+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';
@@ -24,6 +25,7 @@ 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({Key? key, this.account}) : super(key: key);
 

diff --git a/lib/app/accounts/all_accounts_balance.dart b/lib/app/accounts/all_accounts_balance.dart
@@ -1,11 +1,13 @@
 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/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/routes/app_router.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';
@@ -14,7 +16,6 @@ import 'package:monekin/i18n/translations.g.dart';
 import '../../core/database/services/currency/currency_service.dart';
 import '../../core/presentation/widgets/number_ui_formatters/currency_displayer.dart';
 import '../../core/presentation/widgets/skeleton.dart';
-import 'account_form.dart';
 
 class AccountWithMoney {
   final double money;
@@ -140,11 +141,9 @@ class _AllAccountBalancePageState extends State<AllAccountBalancePage> {
                                   size: 22,
                                   color: Theme.of(context).colorScheme.primary,
                                 )),
-                            onTap: () => Navigator.of(context).push(
-                              MaterialPageRoute(
-                                builder: (context) => AccountFormPage(
-                                    account: accountWithMoney.account),
-                              ),
+                            onTap: () => context.pushRoute(
+                              AccountFormRoute(
+                                  account: accountWithMoney.account),
                             ),
                             title: Column(
                               crossAxisAlignment: CrossAxisAlignment.start,

diff --git a/lib/app/accounts/all_accounts_page.dart b/lib/app/accounts/all_accounts_page.dart
@@ -1,11 +1,12 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-import 'package:monekin/app/accounts/account_details.dart';
-import 'package:monekin/app/accounts/account_form.dart';
 import 'package:monekin/core/database/services/account/account_service.dart';
+import 'package:monekin/core/routes/app_router.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../../core/presentation/widgets/empty_indicator.dart';
 
+@RoutePage()
 class AllAccountsPage extends StatelessWidget {
   const AllAccountsPage({super.key});
 
@@ -16,14 +17,10 @@ class AllAccountsPage extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(title: Text(t.home.my_accounts)),
       floatingActionButton: FloatingActionButton.extended(
-          icon: const Icon(Icons.add_rounded),
-          label: Text(t.account.form.create),
-          onPressed: () => {
-                Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                        builder: (context) => const AccountFormPage()))
-              }),
+        icon: const Icon(Icons.add_rounded),
+        label: Text(t.account.form.create),
+        onPressed: () => context.pushRoute(AccountFormRoute()),
+      ),
       body: StreamBuilder(
           stream: AccountService.instance.getAccounts(),
           builder: (context, snapshot) {
@@ -76,12 +73,8 @@ class AllAccountsPage extends StatelessWidget {
                       child: account.displayIcon(context),
                     ),
                     subtitle: Text(account.type.title(context)),
-                    onTap: () => Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                          builder: (context) =>
-                              AccountDetailsPage(account: account)),
-                    ),
+                    onTap: () => context
+                        .pushRoute(AccountDetailsRoute(account: account)),
                   );
                 });
           }),

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';
@@ -16,11 +16,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/utils/list_tile_action_item.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../../core/presentation/widgets/empty_indicator.dart';
 
+@RoutePage()
 class BudgetDetailsPage extends StatefulWidget {
   const BudgetDetailsPage({super.key, required this.budget});
 
@@ -88,13 +90,11 @@ class _BudgetDetailsPageState extends State<BudgetDetailsPage> {
                       label: t.budgets.form.edit,
                       icon: Icons.edit,
                       onClick: () {
-                        Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (context) => BudgetFormPage(
-                                  prevPage: const BudgetsPage(),
-                                  budgetToEdit: budget),
-                            ));
+                        context.pushRoute(
+                          BudgetFormRoute(
+                              prevPage: const BudgetsPage(),
+                              budgetToEdit: budget),
+                        );
                       },
                     ),
                     ListTileActionItem(

diff --git a/lib/app/budgets/budget_form_page.dart b/lib/app/budgets/budget_form_page.dart
@@ -1,3 +1,4 @@
+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';
@@ -18,6 +19,7 @@ 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,25 +1,23 @@
+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/theme.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/i18n/translations.g.dart';
 
+@RoutePage()
 class BudgetsPage extends StatelessWidget {
   const BudgetsPage({super.key});
 
   Widget buildBudgetCard(BuildContext context, Budget budget) {
     return InkWell(
-      onTap: () => Navigator.push(
-          context,
-          MaterialPageRoute(
-              builder: (context) => BudgetDetailsPage(budget: budget))),
+      onTap: () => context.pushRoute(BudgetDetailsRoute(budget: budget)),
       child: Container(
           padding: const EdgeInsets.all(16),
           child: Column(
@@ -110,14 +108,9 @@ class BudgetsPage extends StatelessWidget {
         floatingActionButton: FloatingActionButton.extended(
             icon: const Icon(Icons.add_rounded),
             label: Text(t.budgets.form.create),
-            onPressed: () => {
-                  Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                          builder: (context) => const BudgetFormPage(
-                                prevPage: BudgetsPage(),
-                              )))
-                }),
+            onPressed: () => context.pushRoute(
+                  BudgetFormRoute(prevPage: const BudgetsPage()),
+                )),
         body: TabBarView(children: [
           StreamBuilder(
               stream: BudgetServive.instance

diff --git a/lib/app/categories/categories_list.dart b/lib/app/categories/categories_list.dart
@@ -1,3 +1,4 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:monekin/app/categories/subcategory_selector.dart';
 import 'package:monekin/core/database/services/category/category_service.dart';
@@ -6,11 +7,10 @@ import 'package:monekin/core/presentation/theme.dart';
 import 'package:monekin/core/presentation/widgets/bottomSheetFooter.dart';
 import 'package:monekin/core/presentation/widgets/persistent_footer_button.dart';
 import 'package:monekin/core/presentation/widgets/scrollable_with_bottom_gradient.dart';
+import 'package:monekin/core/routes/app_router.dart';
 import 'package:monekin/core/utils/color_utils.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
-import 'form/category_form.dart';
-
 enum CategoriesListMode {
   page,
   modalSelectSubcategory,
@@ -39,6 +39,12 @@ Future<List<Category>?> showCategoryListModal(
   );
 }
 
+@RoutePage()
+class CategoriesListPage extends CategoriesList {
+  const CategoriesListPage()
+      : super(mode: CategoriesListMode.page, selectedCategories: const []);
+}
+
 class CategoriesList extends StatefulWidget {
   const CategoriesList(
       {super.key, required this.mode, this.selectedCategories = const []});
@@ -78,13 +84,8 @@ class _CategoriesListState extends State<CategoriesList> {
         itemBuilder: (context, index) {
           final category = categoriesToDisplay[index];
 
-          goToCategoryForm() => Navigator.push(
-                context,
-                MaterialPageRoute(
-                    builder: (context) => CategoryFormPage(
-                          categoryUUID: category.id,
-                        )),
-              );
+          goToCategoryForm() =>
+              context.pushRoute(CategoryFormRoute(categoryUUID: category.id));
 
           if (widget.mode != CategoriesListMode.modalSelectMultiCategory) {
             return ListTile(
@@ -192,11 +193,7 @@ class _CategoriesListState extends State<CategoriesList> {
                   PersistentFooterButton(
                     child: FilledButton.icon(
                       onPressed: () {
-                        Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                                builder: (context) =>
-                                    const CategoryFormPage()));
+                        context.pushRoute(CategoryFormRoute());
                       },
                       icon: const Icon(Icons.add),
                       label: Text(t.categories.create),

diff --git a/lib/app/categories/form/category_form.dart b/lib/app/categories/form/category_form.dart
@@ -1,3 +1,4 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
 import 'package:monekin/app/categories/form/category_form_functions.dart';
@@ -15,6 +16,7 @@ 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});
 

diff --git a/lib/app/currencies/currency_manager.dart b/lib/app/currencies/currency_manager.dart
@@ -1,16 +1,18 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-import 'package:monekin/app/currencies/exchange_rate_details.dart';
 import 'package:monekin/app/currencies/exchange_rate_form.dart';
 import 'package:monekin/core/database/services/currency/currency_service.dart';
 import 'package:monekin/core/database/services/exchange-rate/exchange_rate_service.dart';
 import 'package:monekin/core/database/services/user-setting/user_setting_service.dart';
 import 'package:monekin/core/models/currency/currency.dart';
 import 'package:monekin/core/presentation/widgets/currency_selector_modal.dart';
 import 'package:monekin/core/presentation/widgets/skeleton.dart';
+import 'package:monekin/core/routes/app_router.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../../core/presentation/widgets/empty_indicator.dart';
 
+@RoutePage()
 class CurrencyManagerPage extends StatefulWidget {
   const CurrencyManagerPage({super.key});
 
@@ -184,12 +186,8 @@ class _CurrencyManagerPageState extends State<CurrencyManagerPage> {
 
                         if (currency == null) return;
 
-                        Navigator.push(
-                            onTapContext,
-                            MaterialPageRoute(
-                                builder: (context) => ExchangeRateDetailsPage(
-                                      currency: currency,
-                                    )));
+                        onTapContext.pushRoute(
+                            ExchangeRateDetailsRoute(currency: currency));
                       },
                     );
                   },