diff --git a/frontend/lib/features/account/account_did_page.dart b/frontend/lib/features/account/account_did_page.dart index 8f3e9aa0..858d5a54 100644 --- a/frontend/lib/features/account/account_did_page.dart +++ b/frontend/lib/features/account/account_did_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_starter/features/account/account_providers.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; class AccountDidPage extends HookConsumerWidget { diff --git a/frontend/lib/features/account/account_vc_page.dart b/frontend/lib/features/account/account_vc_page.dart index 3452bcb5..e7f20a46 100644 --- a/frontend/lib/features/account/account_vc_page.dart +++ b/frontend/lib/features/account/account_vc_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_starter/features/account/account_providers.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; class AccountVCPage extends HookConsumerWidget { diff --git a/frontend/lib/shared/currency_converter.dart b/frontend/lib/features/currency/currency_converter.dart similarity index 98% rename from frontend/lib/shared/currency_converter.dart rename to frontend/lib/features/currency/currency_converter.dart index 29f0944b..ee80f122 100644 --- a/frontend/lib/shared/currency_converter.dart +++ b/frontend/lib/features/currency/currency_converter.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; import 'package:flutter_starter/shared/animations/invalid_number_pad_input_animation.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:intl/intl.dart'; class CurrencyConverter extends HookWidget { diff --git a/frontend/lib/shared/currency_modal.dart b/frontend/lib/features/currency/currency_modal.dart similarity index 94% rename from frontend/lib/shared/currency_modal.dart rename to frontend/lib/features/currency/currency_modal.dart index 5d243ba7..98dedb9f 100644 --- a/frontend/lib/shared/currency_modal.dart +++ b/frontend/lib/features/currency/currency_modal.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; class CurrencyModal { - static Future showCurrencyModal( + static Future show( BuildContext context, Function(String) onPressed, List> supportedCurrencyList, diff --git a/frontend/lib/features/deposit/deposit_page.dart b/frontend/lib/features/deposit/deposit_page.dart index 40f7095c..795d42a0 100644 --- a/frontend/lib/features/deposit/deposit_page.dart +++ b/frontend/lib/features/deposit/deposit_page.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:flutter_starter/features/currency/currency_converter.dart'; +import 'package:flutter_starter/features/currency/currency_modal.dart'; +import 'package:flutter_starter/features/payments/payment_details_page.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/currency_converter.dart'; -import 'package:flutter_starter/shared/currency_modal.dart'; import 'package:flutter_starter/shared/fee_details.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:flutter_starter/shared/number_pad.dart'; -import 'package:flutter_starter/shared/payment_details_page.dart'; import 'package:flutter_starter/shared/utils/number_pad_input_validation_util.dart'; // replace with actual currency list @@ -51,7 +51,7 @@ class DepositPage extends HookWidget { .toString())), isValidKeyPress: isValidKeyPress.value, onDropdownTap: () { - CurrencyModal.showCurrencyModal( + CurrencyModal.show( context, (value) => selectedCurrencyItem.value = supportedCurrencyList.firstWhere( diff --git a/frontend/lib/features/home/home_page.dart b/frontend/lib/features/home/home_page.dart index 7035f4f0..44e47b2b 100644 --- a/frontend/lib/features/home/home_page.dart +++ b/frontend/lib/features/home/home_page.dart @@ -3,8 +3,8 @@ import 'package:flutter_starter/features/deposit/deposit_page.dart'; import 'package:flutter_starter/features/home/transaction_details_page.dart'; import 'package:flutter_starter/features/withdraw/withdraw_page.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; -import 'package:flutter_starter/shared/transaction.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; +import 'package:flutter_starter/features/home/transaction.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; class HomePage extends HookConsumerWidget { diff --git a/frontend/lib/shared/transaction.dart b/frontend/lib/features/home/transaction.dart similarity index 100% rename from frontend/lib/shared/transaction.dart rename to frontend/lib/features/home/transaction.dart diff --git a/frontend/lib/features/home/transaction_details_page.dart b/frontend/lib/features/home/transaction_details_page.dart index cdc15b22..87fddb11 100644 --- a/frontend/lib/features/home/transaction_details_page.dart +++ b/frontend/lib/features/home/transaction_details_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:flutter_starter/shared/success_page.dart'; -import 'package:flutter_starter/shared/transaction.dart'; +import 'package:flutter_starter/features/home/transaction.dart'; class TransactionDetailsPage extends HookWidget { final Transaction txn; diff --git a/frontend/lib/features/onboarding/onboarding_welcome_page.dart b/frontend/lib/features/onboarding/onboarding_welcome_page.dart index ff4205d9..e364be42 100644 --- a/frontend/lib/features/onboarding/onboarding_welcome_page.dart +++ b/frontend/lib/features/onboarding/onboarding_welcome_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_starter/features/pfis/pfis_page.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; class OnboardingWelcomePage extends StatelessWidget { const OnboardingWelcomePage({super.key}); diff --git a/frontend/lib/shared/payment_details_page.dart b/frontend/lib/features/payments/payment_details_page.dart similarity index 96% rename from frontend/lib/shared/payment_details_page.dart rename to frontend/lib/features/payments/payment_details_page.dart index 17c44dcd..dbc02c41 100644 --- a/frontend/lib/shared/payment_details_page.dart +++ b/frontend/lib/features/payments/payment_details_page.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:flutter_starter/features/payments/payment_method.dart'; +import 'package:flutter_starter/features/payments/search_payment_methods_page.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:flutter_starter/shared/json_schema_form.dart'; -import 'package:flutter_starter/shared/payment_method.dart'; -import 'package:flutter_starter/shared/search_payment_methods_page.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; class PaymentDetailsPage extends HookConsumerWidget { diff --git a/frontend/lib/shared/payment_method.dart b/frontend/lib/features/payments/payment_method.dart similarity index 100% rename from frontend/lib/shared/payment_method.dart rename to frontend/lib/features/payments/payment_method.dart diff --git a/frontend/lib/shared/search_payment_methods_page.dart b/frontend/lib/features/payments/search_payment_methods_page.dart similarity index 96% rename from frontend/lib/shared/search_payment_methods_page.dart rename to frontend/lib/features/payments/search_payment_methods_page.dart index db3270ae..9b56c21e 100644 --- a/frontend/lib/shared/search_payment_methods_page.dart +++ b/frontend/lib/features/payments/search_payment_methods_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:flutter_starter/features/payments/payment_method.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; -import 'package:flutter_starter/shared/payment_method.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; class SearchPaymentMethodsPage extends HookWidget { final _formKey = GlobalKey(); diff --git a/frontend/lib/features/pfis/pfi_confirmation_page.dart b/frontend/lib/features/pfis/pfi_confirmation_page.dart index 9b6b57b4..a46824d1 100644 --- a/frontend/lib/features/pfis/pfi_confirmation_page.dart +++ b/frontend/lib/features/pfis/pfi_confirmation_page.dart @@ -4,7 +4,7 @@ import 'package:collection/collection.dart'; import 'package:flutter_starter/features/account/account_providers.dart'; import 'package:flutter_starter/services/service_providers.dart'; import 'package:flutter_starter/shared/constants.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:flutter_starter/shared/success_page.dart'; import 'package:http/http.dart' as http; import 'package:flutter/material.dart'; diff --git a/frontend/lib/features/pfis/pfis_page.dart b/frontend/lib/features/pfis/pfis_page.dart index 9fd7e2eb..a6501498 100644 --- a/frontend/lib/features/pfis/pfis_page.dart +++ b/frontend/lib/features/pfis/pfis_page.dart @@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_starter/features/pfis/pfi_verification_page.dart'; import 'package:flutter_starter/features/pfis/pfis_notifier.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; class PfisPage extends HookConsumerWidget { diff --git a/frontend/lib/features/send/send_did_page.dart b/frontend/lib/features/send/send_did_page.dart index c594b34e..a7b68716 100644 --- a/frontend/lib/features/send/send_did_page.dart +++ b/frontend/lib/features/send/send_did_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:flutter_starter/shared/success_page.dart'; class SendDidPage extends HookWidget { diff --git a/frontend/lib/features/send/send_page.dart b/frontend/lib/features/send/send_page.dart index 54485798..14978baf 100644 --- a/frontend/lib/features/send/send_page.dart +++ b/frontend/lib/features/send/send_page.dart @@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_starter/features/send/send_did_page.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; import 'package:flutter_starter/shared/number_pad.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:flutter_starter/shared/animations/invalid_number_pad_input_animation.dart'; import 'package:flutter_starter/shared/utils/number_pad_input_validation_util.dart'; diff --git a/frontend/lib/features/withdraw/withdraw_page.dart b/frontend/lib/features/withdraw/withdraw_page.dart index c86237eb..240ba7c6 100644 --- a/frontend/lib/features/withdraw/withdraw_page.dart +++ b/frontend/lib/features/withdraw/withdraw_page.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:flutter_starter/features/currency/currency_converter.dart'; +import 'package:flutter_starter/features/currency/currency_modal.dart'; +import 'package:flutter_starter/features/payments/payment_details_page.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/currency_converter.dart'; -import 'package:flutter_starter/shared/currency_modal.dart'; import 'package:flutter_starter/shared/fee_details.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:flutter_starter/shared/number_pad.dart'; -import 'package:flutter_starter/shared/payment_details_page.dart'; import 'package:flutter_starter/shared/utils/number_pad_input_validation_util.dart'; // replace with actual currency list @@ -52,7 +52,7 @@ class WithdrawPage extends HookWidget { .toString())), isValidKeyPress: isValidKeyPress.value, onDropdownTap: () { - CurrencyModal.showCurrencyModal( + CurrencyModal.show( context, (value) => selectedCurrencyItem.value = supportedCurrencyList.firstWhere( diff --git a/frontend/lib/shared/animations/invalid_number_pad_input_animation.dart b/frontend/lib/shared/animations/invalid_number_pad_input_animation.dart index 469a3851..575ca4fe 100644 --- a/frontend/lib/shared/animations/invalid_number_pad_input_animation.dart +++ b/frontend/lib/shared/animations/invalid_number_pad_input_animation.dart @@ -34,6 +34,7 @@ class InvalidNumberPadInputAnimation extends HookWidget { }); } }); + return; }, []); useEffect(() { diff --git a/frontend/lib/shared/fee_details.dart b/frontend/lib/shared/fee_details.dart index 6177d424..1ab1b1ca 100644 --- a/frontend/lib/shared/fee_details.dart +++ b/frontend/lib/shared/fee_details.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; class FeeDetails extends HookWidget { final String originCurrency; diff --git a/frontend/lib/shared/json_schema_form.dart b/frontend/lib/shared/json_schema_form.dart index 36573fc9..c6feff1f 100644 --- a/frontend/lib/shared/json_schema_form.dart +++ b/frontend/lib/shared/json_schema_form.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; class JsonSchemaForm extends HookWidget { final String schema; diff --git a/frontend/lib/shared/number_pad.dart b/frontend/lib/shared/number_pad.dart index cce70795..819f6a05 100644 --- a/frontend/lib/shared/number_pad.dart +++ b/frontend/lib/shared/number_pad.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; class NumberPad extends HookWidget { final Function(String) onKeyPressed; diff --git a/frontend/lib/shared/success_page.dart b/frontend/lib/shared/success_page.dart index 2e2018ed..063d440f 100644 --- a/frontend/lib/shared/success_page.dart +++ b/frontend/lib/shared/success_page.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_starter/features/app/app_tabs.dart'; import 'package:flutter_starter/l10n/app_localizations.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; class SuccessPage extends HookWidget { final String text; diff --git a/frontend/lib/shared/grid.dart b/frontend/lib/shared/theme/grid.dart similarity index 100% rename from frontend/lib/shared/grid.dart rename to frontend/lib/shared/theme/grid.dart diff --git a/frontend/lib/shared/theme/theme.dart b/frontend/lib/shared/theme/theme.dart index fe40b423..caa06701 100644 --- a/frontend/lib/shared/theme/theme.dart +++ b/frontend/lib/shared/theme/theme.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_starter/shared/grid.dart'; +import 'package:flutter_starter/shared/theme/grid.dart'; import 'package:flutter_starter/shared/theme/color_scheme.dart'; import 'package:flutter_starter/shared/theme/text_theme.dart'; diff --git a/frontend/test/shared/currency_converter_test.dart b/frontend/test/features/currency/currency_converter_test.dart similarity index 96% rename from frontend/test/shared/currency_converter_test.dart rename to frontend/test/features/currency/currency_converter_test.dart index 5eb5c768..163e69d6 100644 --- a/frontend/test/shared/currency_converter_test.dart +++ b/frontend/test/features/currency/currency_converter_test.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; +import 'package:flutter_starter/features/currency/currency_converter.dart'; import 'package:flutter_starter/shared/animations/invalid_number_pad_input_animation.dart'; -import 'package:flutter_starter/shared/currency_converter.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../helpers/widget_helpers.dart'; +import '../../helpers/widget_helpers.dart'; void main() { group('CurrencyConverter', () { diff --git a/frontend/test/features/deposit/deposit_page_test.dart b/frontend/test/features/deposit/deposit_page_test.dart index c7c873ff..a4e5b7da 100644 --- a/frontend/test/features/deposit/deposit_page_test.dart +++ b/frontend/test/features/deposit/deposit_page_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; +import 'package:flutter_starter/features/currency/currency_converter.dart'; import 'package:flutter_starter/features/deposit/deposit_page.dart'; -import 'package:flutter_starter/shared/currency_converter.dart'; import 'package:flutter_starter/shared/fee_details.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/frontend/test/features/home/home_page_test.dart b/frontend/test/features/home/home_page_test.dart index 827e5da3..6c2f8ac2 100644 --- a/frontend/test/features/home/home_page_test.dart +++ b/frontend/test/features/home/home_page_test.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_starter/features/deposit/deposit_page.dart'; import 'package:flutter_starter/features/home/home_page.dart'; import 'package:flutter_starter/features/withdraw/withdraw_page.dart'; -import 'package:flutter_starter/shared/transaction.dart'; +import 'package:flutter_starter/features/home/transaction.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../helpers/widget_helpers.dart'; diff --git a/frontend/test/features/home/transaction_details_page_test.dart b/frontend/test/features/home/transaction_details_page_test.dart index bef7832d..aac9263d 100644 --- a/frontend/test/features/home/transaction_details_page_test.dart +++ b/frontend/test/features/home/transaction_details_page_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_starter/features/home/transaction_details_page.dart'; -import 'package:flutter_starter/shared/transaction.dart'; +import 'package:flutter_starter/features/home/transaction.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../helpers/widget_helpers.dart'; diff --git a/frontend/test/shared/payment_details_page_test.dart b/frontend/test/features/payments/payment_details_page_test.dart similarity index 97% rename from frontend/test/shared/payment_details_page_test.dart rename to frontend/test/features/payments/payment_details_page_test.dart index b4ef9745..a0d53e49 100644 --- a/frontend/test/shared/payment_details_page_test.dart +++ b/frontend/test/features/payments/payment_details_page_test.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:flutter_starter/shared/payment_details_page.dart'; -import 'package:flutter_starter/shared/payment_method.dart'; -import 'package:flutter_starter/shared/search_payment_methods_page.dart'; +import 'package:flutter_starter/features/payments/payment_details_page.dart'; +import 'package:flutter_starter/features/payments/payment_method.dart'; +import 'package:flutter_starter/features/payments/search_payment_methods_page.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../helpers/widget_helpers.dart'; +import '../../helpers/widget_helpers.dart'; void main() { group('PaymentDetailsPage', () { diff --git a/frontend/test/shared/search_payment_methods_page_test.dart b/frontend/test/features/payments/search_payment_methods_page_test.dart similarity index 93% rename from frontend/test/shared/search_payment_methods_page_test.dart rename to frontend/test/features/payments/search_payment_methods_page_test.dart index 2dccf09d..8efefa8e 100644 --- a/frontend/test/shared/search_payment_methods_page_test.dart +++ b/frontend/test/features/payments/search_payment_methods_page_test.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_starter/shared/payment_method.dart'; -import 'package:flutter_starter/shared/search_payment_methods_page.dart'; +import 'package:flutter_starter/features/payments/payment_method.dart'; +import 'package:flutter_starter/features/payments/search_payment_methods_page.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../helpers/widget_helpers.dart'; +import '../../helpers/widget_helpers.dart'; final _paymentMethods = [ PaymentMethod( diff --git a/frontend/test/features/withdraw/withdraw_page_test.dart b/frontend/test/features/withdraw/withdraw_page_test.dart index ef0d2aed..bcdc97fa 100644 --- a/frontend/test/features/withdraw/withdraw_page_test.dart +++ b/frontend/test/features/withdraw/withdraw_page_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; +import 'package:flutter_starter/features/currency/currency_converter.dart'; import 'package:flutter_starter/features/withdraw/withdraw_page.dart'; -import 'package:flutter_starter/shared/currency_converter.dart'; import 'package:flutter_starter/shared/fee_details.dart'; import 'package:flutter_test/flutter_test.dart';