clean code

Noso-Project · May 10, 2024 · 6d1e505 · 6d1e505
1 parent b21530e
commit 6d1e505
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 44 deletions.
diff --git a/lib/blocs/app_data_bloc.dart b/lib/blocs/app_data_bloc.dart
@@ -73,11 +73,11 @@ class AppDataBloc extends Bloc<AppDataEvent, AppDataState> {
     await loadConfig();
 
     if (appBlocConfig.lastSeed != null) {
-      await _selectTargetNode(event, emit, InitialNodeAlgh.connectLastNode);
+      await _selectTargetNode(event, emit, InitialNodeAlgorithm.connectLastNode);
     } else if (appBlocConfig.nodesList != null) {
-      await _selectTargetNode(event, emit, InitialNodeAlgh.listenUserNodes);
+      await _selectTargetNode(event, emit, InitialNodeAlgorithm.listenUserNodes);
     } else {
-      await _selectTargetNode(event, emit, InitialNodeAlgh.listenDefaultNodes);
+      await _selectTargetNode(event, emit, InitialNodeAlgorithm.listenDefaultNodes);
     }
   }
 
@@ -116,16 +116,16 @@ class AppDataBloc extends Bloc<AppDataEvent, AppDataState> {
     if (event.lastNodeRun) {
       emit(state.copyWith(statusConnected: StatusConnectNodes.sync));
       _debugBloc.add(AddStringDebug("Updating data from the last node"));
-      await _selectTargetNode(event, emit, InitialNodeAlgh.connectLastNode,
+      await _selectTargetNode(event, emit, InitialNodeAlgorithm.connectLastNode,
           repeat: true);
     } else {
       _debugBloc.add(AddStringDebug("Reconnecting to new node"));
-      await _selectTargetNode(event, emit, getRandomAlgorithm());
+      await _selectTargetNode(event, emit, _getRandomAlgorithm());
     }
   }
 
   /// This method implements the selection of the node to which we will connect in the future
-  Future<void> _selectTargetNode(event, emit, InitialNodeAlgh initAlgh,
+  Future<void> _selectTargetNode(event, emit, InitialNodeAlgorithm initAlgh,
       {bool repeat = false}) async {
     if (!repeat) {
       emit(state.copyWith(statusConnected: StatusConnectNodes.searchNode));
@@ -145,32 +145,32 @@ class AppDataBloc extends Bloc<AppDataEvent, AppDataState> {
       _debugBloc.add(AddStringDebug(
           "The node did not respond properly -> ${responseTargetNode.seed.toTokenizer}"));
       _debugBloc.add(AddStringDebug("Reconnecting to new node"));
-      await _selectTargetNode(event, emit, getRandomAlgorithm(), repeat: true);
+      await _selectTargetNode(event, emit, _getRandomAlgorithm(), repeat: true);
     }
   }
 
   /// A method that selects a random algorithm type
-  InitialNodeAlgh getRandomAlgorithm() {
+  InitialNodeAlgorithm _getRandomAlgorithm() {
     return Random().nextInt(2) == 0
-        ? InitialNodeAlgh.listenDefaultNodes
-        : InitialNodeAlgh.listenUserNodes;
+        ? InitialNodeAlgorithm.listenDefaultNodes
+        : InitialNodeAlgorithm.listenUserNodes;
   }
 
   /// A method that tests and returns the active node
   Future<ResponseNode<List<int>>> _searchTargetNode(
-      InitialNodeAlgh initAlgh) async {
+      InitialNodeAlgorithm initAlgorithm) async {
     var listUsersNodes = appBlocConfig.nodesList;
     if ((listUsersNodes ?? "").isEmpty) {
-      initAlgh = InitialNodeAlgh.listenDefaultNodes;
+      initAlgorithm = InitialNodeAlgorithm.listenDefaultNodes;
     }
 
-    switch (initAlgh) {
-      case InitialNodeAlgh.connectLastNode:
+    switch (initAlgorithm) {
+      case InitialNodeAlgorithm.connectLastNode:
         return await _repositories.networkRepository.fetchNode(
             NodeRequest.getNodeStatus,
             Seed().tokenizer(NetworkConfig.getRandomNode(null),
                 rawString: appBlocConfig.lastSeed));
-      case InitialNodeAlgh.listenUserNodes:
+      case InitialNodeAlgorithm.listenUserNodes:
         return await _repositories.networkRepository.fetchNode(
             NodeRequest.getNodeStatus,
             Seed().tokenizer(NetworkConfig.getRandomNode(listUsersNodes)));
@@ -335,7 +335,6 @@ class AppDataBloc extends Bloc<AppDataEvent, AppDataState> {
   @override
   Future<void> close() {
     _stopTimerSyncNetwork();
-    //  _stopSyncPriceHistory();
     return super.close();
   }
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -34,15 +34,15 @@ Future<void> main() async {
       await windowManager.focus();
     });
   }
-  runApp(MyApp());
+  runApp(NosoSova());
 }
 
 class NavigationService {
   static GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 }
 
-class MyApp extends StatelessWidget {
-  MyApp({super.key});
+class NosoSova extends StatelessWidget {
+  NosoSova({super.key});
 
   final AppSettings _appSettings = locator<AppSettings>();
 

diff --git a/lib/ui/common/responses_util/snackbar_message.dart b/lib/ui/common/responses_util/snackbar_message.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:nososova/models/responses/response_page_listener.dart';
 import 'package:nososova/ui/common/responses_util/responses_messages.dart';
-import 'package:nososova/ui/config/responsive.dart';
 
+import '../../config/responsive.dart';
 import '../../theme/style/colors.dart';
 import '../../theme/style/text_style.dart';
 

diff --git a/lib/ui/dialogs/import_export/dialog_scanner_qr.dart b/lib/ui/dialogs/import_export/dialog_scanner_qr.dart
@@ -10,6 +10,7 @@ import 'package:qr_code_scanner/qr_code_scanner.dart';
 import '../../../blocs/events/wallet_events.dart';
 import '../../../l10n/app_localizations.dart';
 import '../../../models/address_wallet.dart';
+import '../../../utils/enum.dart';
 import '../../../utils/status_qr.dart';
 import '../../common/route/page_router.dart';
 import '../../theme/style/colors.dart';
@@ -75,8 +76,7 @@ class _ScannerQrWidgetState extends State<ScannerQrWidget> {
                 padding: const EdgeInsets.all(20),
                 child: Text(
                   AppLocalizations.of(context)!.cancel,
-                  style:
-                      AppTextStyles.buttonText,
+                  style: AppTextStyles.buttonText,
                 )),
           ),
         )

diff --git a/lib/utils/enum.dart b/lib/utils/enum.dart
@@ -8,7 +8,7 @@ enum ApiStatus { connected, loading, error, result }
 
 enum ConsensusStatus { sync, error }
 
-enum InitialNodeAlgh { listenDefaultNodes, connectLastNode, listenUserNodes }
+enum InitialNodeAlgorithm { listenDefaultNodes, connectLastNode, listenUserNodes }
 
 enum ActionsFileWallet {
   walletOpen,
@@ -20,4 +20,10 @@ enum ActionsFileWallet {
 
 enum FormatWalletFile { pkw, nososova }
 
-enum AddressTileStyle { sDefault, sCustom }
+enum AddressTileStyle { sDefault, sCustom }
+
+enum TypeQrCode {
+  qrAddress,
+  qrKeys,
+  none
+}
diff --git a/lib/utils/status_qr.dart b/lib/utils/status_qr.dart
@@ -1,3 +1,5 @@
+import 'enum.dart';
+
 final class CheckQrCode {
 
   static TypeQrCode checkQrScan(String dataScan) {
@@ -10,8 +12,4 @@ final class CheckQrCode {
   }
 }
 
-enum TypeQrCode {
-  qrAddress,
-  qrKeys,
-  none
-}
+
diff --git a/sovarpc/lib/blocs/noso_network_bloc.dart b/sovarpc/lib/blocs/noso_network_bloc.dart
@@ -62,9 +62,11 @@ class NosoNetworkBloc extends Bloc<NetworkNosoEvents, NosoNetworksState> {
     await loadConfig();
     _debugBloc.add(AddStringDebug("Init Noso-Network", StatusReport.Node));
     if (appBlocConfig.nodesList != null) {
-      await _selectTargetNode(event, emit, InitialNodeAlgh.listenUserNodes);
+      await _selectTargetNode(
+          event, emit, InitialNodeAlgorithm.listenUserNodes);
     } else {
-      await _selectTargetNode(event, emit, InitialNodeAlgh.listenDefaultNodes);
+      await _selectTargetNode(
+          event, emit, InitialNodeAlgorithm.listenDefaultNodes);
     }
   }
 
@@ -77,49 +79,50 @@ class NosoNetworkBloc extends Bloc<NetworkNosoEvents, NosoNetworksState> {
     _stopTimerSyncNetwork();
     if (event.lastNodeRun) {
       emit(state.copyWith(statusConnected: StatusConnectNodes.sync));
-      await _selectTargetNode(event, emit, InitialNodeAlgh.connectLastNode,
+      await _selectTargetNode(event, emit, InitialNodeAlgorithm.connectLastNode,
           repeat: true);
     } else {
-      await _selectTargetNode(event, emit, getRandomAlgorithm());
+      await _selectTargetNode(event, emit, _getRandomAlgorithm());
     }
   }
 
   /// This method implements the selection of the node to which we will connect in the future
-  Future<void> _selectTargetNode(event, emit, InitialNodeAlgh initAlgh,
+  Future<void> _selectTargetNode(
+      event, emit, InitialNodeAlgorithm initAlgorithm,
       {bool repeat = false}) async {
     if (!repeat) {
       emit(state.copyWith(statusConnected: StatusConnectNodes.searchNode));
       _debugBloc.add(AddStringDebug("Reconnect new node", StatusReport.Node));
     }
 
     ResponseNode<List<int>> responseTargetNode =
-        await _searchTargetNode(initAlgh);
+        await _searchTargetNode(initAlgorithm);
     final Node? nodeOutput = DataParser.parseDataNode(
         responseTargetNode.value, responseTargetNode.seed);
     if (responseTargetNode.errors == null && nodeOutput != null) {
       await _syncNetwork(event, emit, nodeOutput);
     } else {
-      await _selectTargetNode(event, emit, getRandomAlgorithm(), repeat: true);
+      await _selectTargetNode(event, emit, _getRandomAlgorithm(), repeat: true);
     }
   }
 
   /// A method that selects a random algorithm type
-  InitialNodeAlgh getRandomAlgorithm() {
+  InitialNodeAlgorithm _getRandomAlgorithm() {
     return Random().nextInt(2) == 0
-        ? InitialNodeAlgh.listenDefaultNodes
-        : InitialNodeAlgh.listenUserNodes;
+        ? InitialNodeAlgorithm.listenDefaultNodes
+        : InitialNodeAlgorithm.listenUserNodes;
   }
 
   /// A method that tests and returns the active node
   Future<ResponseNode<List<int>>> _searchTargetNode(
-      InitialNodeAlgh initAlgh) async {
+      InitialNodeAlgorithm initAlgorithm) async {
     var listUsersNodes = appBlocConfig.nodesList;
     if ((listUsersNodes ?? "").isEmpty) {
-      initAlgh = InitialNodeAlgh.listenDefaultNodes;
+      initAlgorithm = InitialNodeAlgorithm.listenDefaultNodes;
     }
 
-    switch (initAlgh) {
-      case InitialNodeAlgh.connectLastNode:
+    switch (initAlgorithm) {
+      case InitialNodeAlgorithm.connectLastNode:
         if (kDebugMode) {
           _debugBloc.add(AddStringDebug(
               "Receive information from the last active node",
@@ -129,7 +132,7 @@ class NosoNetworkBloc extends Bloc<NetworkNosoEvents, NosoNetworksState> {
             NodeRequest.getNodeStatus,
             Seed().tokenizer(NetworkConfig.getRandomNode(null),
                 rawString: appBlocConfig.lastSeed));
-      case InitialNodeAlgh.listenUserNodes:
+      case InitialNodeAlgorithm.listenUserNodes:
         if (kDebugMode) {
           _debugBloc
               .add(AddStringDebug("Search target node", StatusReport.Node));