minor code improvements

aldrinzigmundv · Oct 13, 2023 · a81da57 · a81da57
1 parent f56ac6c
commit a81da57
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 75 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -3,10 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:thirdbank/pages/loadingpage.dart';
 
 void main() => runApp(
-  MaterialApp(
+  const MaterialApp(
     title: "Third Bank",
-    initialRoute: '/',
-    routes: {
-      '/': (context) => const LoadingPage(),
-    },
+    home: LoadingPage(),
 ));
diff --git a/lib/pages/homepage.dart b/lib/pages/homepage.dart
@@ -28,7 +28,7 @@ class _HomePageState extends State<HomePage> {
 
   String _transactionAreaMessage = "Your transactions will appear here.";
 
-  refreshWallet() async {
+  _refreshWallet() async {
     try {
       await wallet.syncWallet();
       await wallet.getBlockchainHeight();
@@ -40,11 +40,11 @@ class _HomePageState extends State<HomePage> {
         });
       }
     } catch (_) {
-      showFailedRefreshingWalletError();
+      _showFailedRefreshingWalletError();
     }
   }
 
-  showTransactionInfo(int index, int blockHeight, int finalFee) {
+  _showTransactionInfo(int index, int blockHeight, int finalFee) {
     showDialog(
       context: context,
       builder: (BuildContext context) {
@@ -76,7 +76,7 @@ class _HomePageState extends State<HomePage> {
     );
   }
 
-  showFailedRefreshingWalletError() {
+  _showFailedRefreshingWalletError() {
     ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
       content:
           Text("Something went wrong. Please, check your internet connection."),
@@ -89,7 +89,7 @@ class _HomePageState extends State<HomePage> {
     super.initState();
     wallet = widget.wallet;
     storage = widget.storage;
-    refreshWallet();
+    _refreshWallet();
   }
 
   @override
@@ -125,7 +125,7 @@ class _HomePageState extends State<HomePage> {
             Padding(
               padding: const EdgeInsets.all(9.0),
               child: ElevatedButton(
-                onPressed: () => refreshWallet(),
+                onPressed: () => _refreshWallet(),
                 style: ButtonStyle(
                     backgroundColor:
                         MaterialStateProperty.all(Colors.yellowAccent),
@@ -205,7 +205,7 @@ class _HomePageState extends State<HomePage> {
                           format.getFee(wallet.transactions[index].fee);
                       return GestureDetector(
                         onTap: () =>
-                            showTransactionInfo(index, blockHeight, finalFee),
+                            _showTransactionInfo(index, blockHeight, finalFee),
                         child: Padding(
                           padding: const EdgeInsets.symmetric(
                               vertical: 3.0, horizontal: 9.0),
@@ -245,7 +245,7 @@ class _HomePageState extends State<HomePage> {
                           format.getFee(wallet.transactions[index].fee);
                       return GestureDetector(
                         onTap: () =>
-                            showTransactionInfo(index, blockHeight, finalFee),
+                            _showTransactionInfo(index, blockHeight, finalFee),
                         child: Padding(
                           padding: const EdgeInsets.symmetric(
                               vertical: 3.0, horizontal: 9.0),

diff --git a/lib/pages/loadingpage.dart b/lib/pages/loadingpage.dart
@@ -19,20 +19,20 @@ class _LoadingPageState extends State<LoadingPage> {
 
   String _loadingpagetext = "Please wait...";
 
-  void startup() async {
+  void _startup() async {
     Future.delayed(const Duration(seconds: 1), () async {
       await storage.initialize();
       await auth.initialize();
       if (await storage.read(key: "setupdone") == "true" &&
           await storage.read(key: "lock") == "true") {
         if (await auth.authenticate()) {
-          startWallet();
+          _startWallet();
         } else {
-          displayError();
+          _displayError();
         }
       } else if (await storage.read(key: "setupdone") == "true" &&
           await storage.read(key: "lock") == "false") {
-        startWallet();
+        _startWallet();
       } else {
         if (context.mounted) {
           goToMnemonicQuestionPage(
@@ -42,7 +42,7 @@ class _LoadingPageState extends State<LoadingPage> {
     });
   }
 
-  void startWallet() async {
+  void _startWallet() async {
     try {
       wallet.mnemonic = await storage.read(key: "mnemonic");
       wallet.walletAddress = await storage.read(key: "address");
@@ -60,7 +60,7 @@ class _LoadingPageState extends State<LoadingPage> {
     }
   }
 
-  displayError() {
+  _displayError() {
     setState(() {
       _loadingpagetext =
           "Something went wrong. Either phone authentication failed or bad internet connection...";
@@ -70,7 +70,7 @@ class _LoadingPageState extends State<LoadingPage> {
   @override
   void initState() {
     super.initState();
-    startup();
+    _startup();
   }
 
   @override

diff --git a/lib/pages/setup pages/authenticationquestionpage.dart b/lib/pages/setup pages/authenticationquestionpage.dart
@@ -26,15 +26,15 @@ class _AuthenticationQuestionPageState
 
   final AuthenticationProvider authentication = AuthenticationProvider();
 
-  addLocalAuth() async {
+  _addLocalAuth() async {
     await storage.write(key: "setupdone", value: "true");
     await storage.write(key: "lock", value: "true");
     if (context.mounted) {
       goToHomePage(context: context, wallet: wallet, storage: storage);
     }
   }
 
-  noLocalAuth() async {
+  _noLocalAuth() async {
     await storage.write(key: "setupdone", value: "true");
     await storage.write(key: "lock", value: "false");
     if (context.mounted) {
@@ -77,7 +77,7 @@ class _AuthenticationQuestionPageState
               Padding(
                 padding: const EdgeInsets.all(9.0),
                 child: ElevatedButton(
-                  onPressed: () => addLocalAuth(),
+                  onPressed: () => _addLocalAuth(),
                   style: ButtonStyle(
                       backgroundColor:
                           MaterialStateProperty.all(Colors.yellowAccent),
@@ -93,7 +93,7 @@ class _AuthenticationQuestionPageState
               Padding(
                 padding: const EdgeInsets.all(9.0),
                 child: ElevatedButton(
-                  onPressed: () => noLocalAuth(),
+                  onPressed: () => _noLocalAuth(),
                   style: ButtonStyle(
                       backgroundColor:
                           MaterialStateProperty.all(Colors.yellowAccent),

diff --git a/lib/pages/setup pages/generatemnemonicpage.dart b/lib/pages/setup pages/generatemnemonicpage.dart
@@ -27,7 +27,11 @@ class _GenerateMnemonicPageState extends State<GenerateMnemonicPage> {
 
   final AuthenticationProvider authentication = AuthenticationProvider();
 
-  proceedWithCreatedMnemonic() async {
+  _regenarateMnemonic() {
+    wallet.generateMnemonic();
+  }
+
+  _proceedWithCreatedMnemonic() async {
     ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
       content: Text("Creating Wallet..."),
       duration: Duration(seconds: 2),
@@ -38,13 +42,13 @@ class _GenerateMnemonicPageState extends State<GenerateMnemonicPage> {
       wallet.mnemonic = "";
       await wallet.getNewAddress();
       await storage.write(key: "address", value: wallet.walletAddress);
-      evaluateNextPage();
+      _evaluateNextPage();
     } catch (_) {
-      showFailedCreatingWalletError();
+      _showFailedCreatingWalletError();
     }
   }
 
-  evaluateNextPage() async {
+  _evaluateNextPage() async {
     final localAuthAvailable =
         await authentication.checkAuthenticationAvailability();
     if (!localAuthAvailable) {
@@ -61,7 +65,7 @@ class _GenerateMnemonicPageState extends State<GenerateMnemonicPage> {
     }
   }
 
-  showFailedCreatingWalletError() {
+  _showFailedCreatingWalletError() {
     ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
       content:
           Text("Something went wrong. Please, check your internet connection."),
@@ -143,7 +147,7 @@ class _GenerateMnemonicPageState extends State<GenerateMnemonicPage> {
             Padding(
               padding: const EdgeInsets.all(9.0),
               child: ElevatedButton(
-                onPressed: () => proceedWithCreatedMnemonic(),
+                onPressed: () => _proceedWithCreatedMnemonic(),
                 style: ButtonStyle(
                     backgroundColor:
                         MaterialStateProperty.all(Colors.yellowAccent),
@@ -159,9 +163,7 @@ class _GenerateMnemonicPageState extends State<GenerateMnemonicPage> {
             Padding(
               padding: const EdgeInsets.all(9.0),
               child: ElevatedButton(
-                onPressed: () {
-                  wallet.generateMnemonic();
-                },
+                onPressed: () => _regenarateMnemonic(),
                 style: ButtonStyle(
                     backgroundColor:
                         MaterialStateProperty.all(Colors.yellowAccent),

diff --git a/lib/pages/setup pages/mnemonicquestionpage.dart b/lib/pages/setup pages/mnemonicquestionpage.dart
@@ -11,6 +11,15 @@ class MnemonicQuestionPage extends StatelessWidget {
   final WalletProvider wallet;
   final StorageProvider storage;
 
+  _goToGenerateMnemonicPage(context) {
+    goToGenerateMnemonicPage(
+        context: context, wallet: wallet, storage: storage);
+  }
+
+  _goToRestoreMnemonicPage(context) {
+    goToRestoreMnemonicPage(context: context, wallet: wallet, storage: storage);
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -37,8 +46,7 @@ class MnemonicQuestionPage extends StatelessWidget {
               Padding(
                 padding: const EdgeInsets.all(9.0),
                 child: ElevatedButton(
-                  onPressed: () => goToGenerateMnemonicPage(
-                      context: context, wallet: wallet, storage: storage),
+                  onPressed: () => _goToGenerateMnemonicPage(context),
                   style: ButtonStyle(
                       backgroundColor:
                           MaterialStateProperty.all(Colors.yellowAccent),
@@ -55,8 +63,7 @@ class MnemonicQuestionPage extends StatelessWidget {
               Padding(
                 padding: const EdgeInsets.all(9.0),
                 child: ElevatedButton(
-                  onPressed: () => goToRestoreMnemonicPage(
-                      context: context, wallet: wallet, storage: storage),
+                  onPressed: () => _goToRestoreMnemonicPage(context),
                   style: ButtonStyle(
                       backgroundColor:
                           MaterialStateProperty.all(Colors.yellowAccent),

diff --git a/lib/pages/setup pages/restoremnemonicpage.dart b/lib/pages/setup pages/restoremnemonicpage.dart
@@ -26,15 +26,15 @@ class _RestoreMnemonicPageState extends State<RestoreMnemonicPage> {
 
   final TextEditingController _mnemonic = TextEditingController();
 
-  bool checkMnemonicLength(String input) {
+  bool _checkMnemonicLength(String input) {
     final List<String> words = input.split(' ');
     final int wordCount = words.length;
 
     return wordCount == 12 || wordCount == 18 || wordCount == 24;
   }
 
-  restoreOldWallet() async {
-    if (checkMnemonicLength(_mnemonic.text)) {
+  _restoreOldWallet() async {
+    if (_checkMnemonicLength(_mnemonic.text)) {
       ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
         content: Text("Restoring..."),
         duration: Duration(seconds: 2),
@@ -45,16 +45,16 @@ class _RestoreMnemonicPageState extends State<RestoreMnemonicPage> {
         wallet.mnemonic = "";
         await wallet.getNewAddress();
         await storage.write(key: "address", value: wallet.walletAddress);
-        evaluateNextPage();
+        _evaluateNextPage();
       } catch (_) {
-        showFailedRestoringWalletError();
+        _showFailedRestoringWalletError();
       }
     } else {
-      showBadPassphraseError();
+      _showBadPassphraseError();
     }
   }
 
-  evaluateNextPage() async {
+  _evaluateNextPage() async {
     final localAuthAvailable =
         await authentication.checkAuthenticationAvailability();
     if (!localAuthAvailable) {
@@ -71,15 +71,15 @@ class _RestoreMnemonicPageState extends State<RestoreMnemonicPage> {
     }
   }
 
-  showFailedRestoringWalletError() {
+  _showFailedRestoringWalletError() {
     ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
       content: Text(
           "Failed restoring wallet. Please, check passphrase or your internet connection."),
       duration: Duration(seconds: 2),
     ));
   }
 
-  showBadPassphraseError() {
+  _showBadPassphraseError() {
     ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
       content: Text("Failed restoring wallet. Please, check passphrase."),
       duration: Duration(seconds: 2),
@@ -142,7 +142,7 @@ class _RestoreMnemonicPageState extends State<RestoreMnemonicPage> {
                 Padding(
                   padding: const EdgeInsets.all(9.0),
                   child: ElevatedButton(
-                    onPressed: () => restoreOldWallet(),
+                    onPressed: () => _restoreOldWallet(),
                     style: ButtonStyle(
                         backgroundColor:
                             MaterialStateProperty.all(Colors.yellowAccent),

diff --git a/lib/pages/transactionpages/receivepage.dart b/lib/pages/transactionpages/receivepage.dart
@@ -19,6 +19,14 @@ class _ReceivePageState extends State<ReceivePage> {
 
   late WalletProvider wallet;
 
+  _copyWalletAddressToClipboard() {
+    Clipboard.setData(ClipboardData(text: wallet.walletAddress));
+          ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
+            content: Text("Wallet address copied to clipboard."),
+            duration: Duration(seconds: 2),
+          ));
+  }
+
   @override
   void initState() {
     super.initState();
@@ -38,13 +46,7 @@ class _ReceivePageState extends State<ReceivePage> {
             )),
       ),
       body: GestureDetector(
-        onTap: () {
-          Clipboard.setData(ClipboardData(text: wallet.walletAddress));
-          ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
-            content: Text("Wallet address copied to clipboard."),
-            duration: Duration(seconds: 2),
-          ));
-        },
+        onTap: () => _copyWalletAddressToClipboard(),
         child: Center(
           child: SingleChildScrollView(
             child: Column(