chore: restructure shared folder

TBD54566975 · Feb 8, 2024 · 3aaeef5 · 3aaeef5
1 parent 7e3d9b9
commit 3aaeef5
Show file tree

Hide file tree

Showing 31 changed files with 48 additions and 47 deletions.
diff --git 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
@@ -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 → ...features/currency/currency_converter.dart b/frontend/lib/shared/currency_converter.dart → ...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 → ...lib/features/currency/currency_modal.dart b/frontend/lib/shared/currency_modal.dart → ...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<dynamic> showCurrencyModal(
+  static Future<dynamic> show(
       BuildContext context,
       Function(String) onPressed,
       List<Map<String, Object>> supportedCurrencyList,

diff --git 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
@@ -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 → frontend/lib/features/home/transaction.dart b/frontend/lib/shared/transaction.dart → 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
@@ -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
@@ -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/...tend/lib/shared/payment_details_page.dart → ...atures/payments/payment_details_page.dart b/...tend/lib/shared/payment_details_page.dart → ...atures/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 → ...lib/features/payments/payment_method.dart b/frontend/lib/shared/payment_method.dart → ...lib/features/payments/payment_method.dart
diff --git a/...b/shared/search_payment_methods_page.dart → ...payments/search_payment_methods_page.dart b/...b/shared/search_payment_methods_page.dart → ...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<FormState>();

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → frontend/lib/shared/theme/grid.dart b/frontend/lib/shared/grid.dart → frontend/lib/shared/theme/grid.dart
diff --git 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/.../test/shared/currency_converter_test.dart → ...res/currency/currency_converter_test.dart b/.../test/shared/currency_converter_test.dart → ...res/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
@@ -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
@@ -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
@@ -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/...est/shared/payment_details_page_test.dart → ...s/payments/payment_details_page_test.dart b/...est/shared/payment_details_page_test.dart → ...s/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/...red/search_payment_methods_page_test.dart → ...nts/search_payment_methods_page_test.dart b/...red/search_payment_methods_page_test.dart → ...nts/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
@@ -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';