Refactor code

kackogut · Sep 17, 2023 · f4c3552 · f4c3552
1 parent 7dd0fb3
commit f4c3552
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 101 deletions.
diff --git a/lib/data/token/spl_tokens.dart b/lib/data/token/spl_tokens.dart
@@ -1,4 +1,4 @@
-const Map<String, String?> SPL_TOKENS = {
+const Map<String, String?> splTokens = {
   "SOL": null,
   "USD": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
 };
diff --git a/lib/data/transfer/transfer_request_repository.dart b/lib/data/transfer/transfer_request_repository.dart
@@ -8,14 +8,14 @@ abstract class TransferRequestRepository {
 class DefaultTransferRequestRepository extends TransferRequestRepository {
   @override
   String getLink(SolanaPayRequest solanaPayRequest) {
-    Map<String, dynamic> queryParameters = _getQueryParameters(solanaPayRequest);
+    Map<String, dynamic> queryParameters =
+        _getQueryParameters(solanaPayRequest);
 
     return Uri(
       scheme: solanaProtocol,
       path: solanaPayRequest.address,
       queryParameters: queryParameters,
-    )
-        .toString();
+    ).toString();
   }
 
   Map<String, dynamic> _getQueryParameters(SolanaPayRequest solanaPayRequest) {

diff --git a/lib/feature/input/bloc/parameters_input_cubit.dart b/lib/feature/input/bloc/parameters_input_cubit.dart
@@ -1,20 +1,19 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:sol_pay_gen/data/token/spl_tokens.dart';
 import 'package:sol_pay_gen/feature/input/bloc/parameters_input_state.dart';
 
 class ParametersInputCubit extends Cubit<ParametersInputState> {
   ParametersInputCubit()
       : super(
-    const ParametersInputState(
-      address: "",
-      amount: null,
-      reference: null,
-      memo: null,
-      message: null,
-      label: null,
-      splTokenAddress: null,
-    ),
-  );
+          const ParametersInputState(
+            address: "",
+            amount: null,
+            reference: null,
+            memo: null,
+            message: null,
+            label: null,
+            splTokenAddress: null,
+          ),
+        );
 
   void onAddressChange(String address) {
     emit(state.copyWith(address: address));

diff --git a/lib/feature/input/bloc/parameters_input_state.dart b/lib/feature/input/bloc/parameters_input_state.dart
@@ -9,15 +9,14 @@ class ParametersInputState extends Equatable {
   final String? memo;
   final String? splTokenAddress;
 
-  const ParametersInputState({
-    required this.address,
-    required this.amount,
-    required this.reference,
-    required this.label,
-    required this.message,
-    required this.memo,
-    required this.splTokenAddress
-  });
+  const ParametersInputState(
+      {required this.address,
+      required this.amount,
+      required this.reference,
+      required this.label,
+      required this.message,
+      required this.memo,
+      required this.splTokenAddress});
 
   @override
   List<Object?> get props => [
@@ -27,7 +26,7 @@ class ParametersInputState extends Equatable {
         label,
         message,
         memo,
-    splTokenAddress,
+        splTokenAddress,
       ];
 
   ParametersInputState copyWith({

diff --git a/lib/feature/input/parameters_input_screen.dart b/lib/feature/input/parameters_input_screen.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:sol_pay_gen/data/token/spl_tokens.dart';
 import 'package:sol_pay_gen/feature/input/bloc/parameters_input_cubit.dart';
 import 'package:sol_pay_gen/feature/qr/bloc/qr_generator_cubit.dart';
 import 'package:sol_pay_gen/feature/qr/bloc/qr_generator_state.dart';
@@ -40,81 +39,80 @@ class InputBody extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => Column(
-      mainAxisSize: MainAxisSize.max,
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        Padding(
-          padding: const EdgeInsets.all(24.0),
-          child: ListView(
-            shrinkWrap: true,
-            children: [
-              BaseInput(
-                labelText: 'Receive wallet address',
-                onChanged: (address) => context
-                    .read<ParametersInputCubit>()
-                    .onAddressChange(address),
-              ),
-              const Padding(padding: EdgeInsets.only(top: 16.0)),
-              BaseInput(
-                labelText: 'Amount',
-                keyboardType: TextInputType.number,
-                onChanged: (address) => context
-                    .read<ParametersInputCubit>()
-                    .onAmountChange(address),
-              ),
-              const Padding(padding: EdgeInsets.only(top: 16.0)),
-              BaseInput(
-                labelText: 'Label',
-                onChanged: (text) =>
-                    context.read<ParametersInputCubit>().onLabelChange(text),
-              ),
-              const Padding(padding: EdgeInsets.only(top: 16.0)),
-              BaseInput(
-                labelText: 'Message',
-                onChanged: (text) =>
-                    context.read<ParametersInputCubit>().onMessageChange(text),
-              ),
-              const Padding(padding: EdgeInsets.only(top: 16.0)),
-              BaseInput(
-                labelText: 'Reference',
-                onChanged: (address) => context
-                    .read<ParametersInputCubit>()
-                    .onReferenceChange(address),
+        mainAxisSize: MainAxisSize.max,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(24.0),
+            child: ListView(
+              shrinkWrap: true,
+              children: [
+                BaseInput(
+                  labelText: 'Receive wallet address',
+                  onChanged: (address) => context
+                      .read<ParametersInputCubit>()
+                      .onAddressChange(address),
+                ),
+                const Padding(padding: EdgeInsets.only(top: 16.0)),
+                BaseInput(
+                  labelText: 'Amount',
+                  keyboardType: TextInputType.number,
+                  onChanged: (address) => context
+                      .read<ParametersInputCubit>()
+                      .onAmountChange(address),
+                ),
+                const Padding(padding: EdgeInsets.only(top: 16.0)),
+                BaseInput(
+                  labelText: 'Label',
+                  onChanged: (text) =>
+                      context.read<ParametersInputCubit>().onLabelChange(text),
+                ),
+                const Padding(padding: EdgeInsets.only(top: 16.0)),
+                BaseInput(
+                  labelText: 'Message',
+                  onChanged: (text) => context
+                      .read<ParametersInputCubit>()
+                      .onMessageChange(text),
+                ),
+                const Padding(padding: EdgeInsets.only(top: 16.0)),
+                BaseInput(
+                  labelText: 'Reference',
+                  onChanged: (address) => context
+                      .read<ParametersInputCubit>()
+                      .onReferenceChange(address),
+                ),
+                const Padding(padding: EdgeInsets.only(top: 16.0)),
+                BaseInput(
+                  labelText: 'Memo',
+                  onChanged: (memo) =>
+                      context.read<ParametersInputCubit>().onMemoChange(memo),
+                ),
+                const Padding(padding: EdgeInsets.only(top: 16.0)),
+                BaseInput(
+                  labelText: 'SPL token',
+                  onChanged: (token) => context
+                      .read<ParametersInputCubit>()
+                      .onSplTokenChange(token),
+                ),
+              ],
+            ),
+          ),
+          const Spacer(),
+          Padding(
+            padding: const EdgeInsets.all(24.0),
+            child: MaterialButton(
+              onPressed: () => context.read<QrGeneratorCubit>().onGenerate(),
+              color: Colors.blueAccent,
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(16.0),
               ),
-              const Padding(padding: EdgeInsets.only(top: 16.0)),
-              BaseInput(
-                labelText: 'Memo',
-                onChanged: (memo) => context
-                    .read<ParametersInputCubit>()
-                    .onMemoChange(memo),
+              height: 56.0,
+              child: const Text(
+                "Let's go",
+                style: TextStyle(color: Colors.white),
               ),
-              const Padding(padding: EdgeInsets.only(top: 16.0)),
-
-              BaseInput(
-                labelText: 'SPL token',
-                onChanged: (token) => context
-                    .read<ParametersInputCubit>()
-                    .onSplTokenChange(token),
-              ),
-            ],
-          ),
-        ),
-        const Spacer(),
-        Padding(
-          padding: const EdgeInsets.all(24.0),
-          child: MaterialButton(
-            onPressed: () => context.read<QrGeneratorCubit>().onGenerate(),
-            color: Colors.blueAccent,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(16.0),
             ),
-            height: 56.0,
-            child: const Text(
-              "Let's go",
-              style: TextStyle(color: Colors.white),
-            ),
-          ),
-        )
-      ],
-    );
+          )
+        ],
+      );
 }
diff --git a/lib/feature/qr/bloc/qr_generator_state.dart b/lib/feature/qr/bloc/qr_generator_state.dart
@@ -3,7 +3,6 @@ import 'package:equatable/equatable.dart';
 sealed class QrGeneratorState extends Equatable {}
 
 final class Empty extends QrGeneratorState {
-
   @override
   List<Object?> get props => [];
 }