Make routes for new home page buttons; Change Sentry alertes catching again

lib/main.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:dubp/dubp.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/cesiumPlus.dart';
@@ -17,32 +19,11 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:catcher/catcher.dart';
 
-// import 'dart:io';
-// import 'package:flutter_logs/flutter_logs.dart';
-// import 'package:downloads_path_provider/downloads_path_provider.dart';
-
 final bool enableSentry = true;
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  // var downloadsDirectory = DownloadsPathProvider.downloadsDirectory;
-  // File logFile = File(downloadsDirectory.toString() + '/gecko.log');
-
-  // await FlutterLogs.initLogs(
-  //     logLevelsEnabled: [
-  //       LogLevel.INFO,
-  //       LogLevel.WARNING,
-  //       LogLevel.ERROR,
-  //       LogLevel.SEVERE
-  //     ],
-  //     timeStampFormat: TimeStampFormat.TIME_FORMAT_READABLE,
-  //     directoryStructure: DirectoryStructure.FOR_EVENT,
-  //     logTypesEnabled: ["Locations", "APIs"],
-  //     logFileExtension: LogFileExtension.LOG,
-  //     logsWriteDirectoryName: downloadsDirectory.toString(),
-  //     logsExportDirectoryName: downloadsDirectory.toString());
-
   HomeProvider _homeProvider = HomeProvider();
   await _homeProvider.getAppPath();
   await _homeProvider.createDefaultAvatar();
@@ -55,23 +36,33 @@ Future<void> main() async {
   endPointGVA = await _homeProvider.getValidEndpoint();
 
   if (kReleaseMode && enableSentry) {
-    CatcherOptions debugOptions = CatcherOptions(DialogReportMode(), [
+    // CatcherOptions debugOptions = CatcherOptions(DialogReportMode(), [
-      SentryHandler(SentryClient(SentryOptions(
+    //   SentryHandler(SentryClient(SentryOptions(
-          dsn:
+    //       dsn:
-              "https://c09587b46eaa42e8b9fda28d838ed180@o496840.ingest.sentry.io/5572110")))
+    //           "https://c09587b46eaa42e8b9fda28d838ed180@o496840.ingest.sentry.io/5572110")))
-    ]);
-    // CatcherOptions releaseOptions = CatcherOptions(NotificationReportMode(), [
-    //   EmailManualHandler(["poka@p2p.legal"])
     // ]);
-    Catcher(rootWidget: Gecko(endPointGVA, _store), debugConfig: debugOptions);
+    // // CatcherOptions releaseOptions = CatcherOptions(NotificationReportMode(), [
+    // //   EmailManualHandler(["poka@p2p.legal"])
+    // // ]);
+    // Catcher(rootWidget: Gecko(endPointGVA, _store), debugConfig: debugOptions);
 
-    // await SentryFlutter.init(
+    await SentryFlutter.init((options) {
-    //   (options) {
+      options.dsn =
-    //     options.dsn =
+          'https://c09587b46eaa42e8b9fda28d838ed180@o496840.ingest.sentry.io/5572110';
-    //         'https://c09587b46eaa42e8b9fda28d838ed180@o496840.ingest.sentry.io/5572110';
+    }, appRunner: () => runApp(Gecko(endPointGVA, _store)));
+
+    // runZoned<Future<void>>(
+    //       () async {
+    //         runApp(Gecko(endPointGVA, _store));
     //       },
-    //   appRunner: () => runApp(Gecko(endPointGVA, _store)),
+    //       onError: (dynamic error, StackTrace stackTrace) {
-    // );
+    //         print("=================== CAUGHT DART ERROR");
+    //         // Sentry.captureException(
+    //         //   error,
+    //         //   stackTrace: stackTrace,
+    //         // );
+    //       },
+    //     ));
   } else {
     print('Debug mode enabled: No sentry alerte');
 
@@ -108,6 +99,8 @@ class Gecko extends StatelessWidget {
       }
     }
 
+    // HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context);
+    // HistoryProvider('').snackNode(context);
     return MultiProvider(
         providers: [
           // Provider(create: (context) => HistoryProvider()),

lib/models/history.dart

@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/home.dart';
+import 'package:gecko/screens/history.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
@@ -64,6 +65,12 @@ class HistoryProvider with ChangeNotifier {
       isHistoryScreen = false;
       historySwitchButtun = "Voir l'historique";
       _homeProvider.handleSearchEnd();
+      Navigator.push(
+        context,
+        MaterialPageRoute(builder: (context) {
+          return HistoryScreen();
+        }),
+      );
       notifyListeners();
 
       return pubkey;
@@ -202,8 +209,8 @@ class HistoryProvider with ChangeNotifier {
       }
       final snackBar =
           SnackBar(content: Text(_message), duration: Duration(seconds: 2));
-      Scaffold.of(context).showSnackBar(snackBar);
       isFirstBuild = false;
+      Scaffold.of(context).showSnackBar(snackBar);
     }
   }
 

lib/models/home.dart

@@ -17,6 +17,9 @@ class HomeProvider with ChangeNotifier {
   Icon searchIcon = Icon(Icons.search);
   final TextEditingController searchQuery = new TextEditingController();
   Widget appBarTitle = Text('Ğecko', style: TextStyle(color: Colors.grey[850]));
+  Widget appBarExplorer =
+      Text('Explorateur', style: TextStyle(color: Colors.grey[850]));
+
   List currentTab = [HistoryScreen(), WalletsHome()];
 
   get currentIndex => _currentIndex;
@@ -124,6 +127,8 @@ class HomeProvider with ChangeNotifier {
       color: Colors.grey[850],
     );
     appBarTitle = Text('Ğecko', style: TextStyle(color: Colors.grey[850]));
+    appBarExplorer =
+        Text('Explorateur', style: TextStyle(color: Colors.grey[850]));
     isSearching = false;
     searchQuery.clear();
 

lib/screens/history.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/cesiumPlus.dart';
+import 'package:gecko/models/home.dart';
 import 'package:gecko/models/queries.dart';
 import 'package:gecko/models/history.dart';
 import 'package:flutter/material.dart';
@@ -28,14 +29,55 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
   @override
   Widget build(BuildContext context) {
     HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context);
+    HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
     this._outputPubkey.text = _historyProvider.pubkey;
     print('Build pubkey : ' + _historyProvider.pubkey);
     // _historyProvider.snackNode(context);
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {});
-      _historyProvider.snackNode(context);
-    });
 
     return Scaffold(
+        appBar: AppBar(
+          title: _homeProvider.appBarExplorer,
+          actions: [
+            Padding(
+                padding: EdgeInsets.symmetric(horizontal: 16),
+                child: IconButton(
+                    icon: _homeProvider.searchIcon,
+                    color: Colors.grey[850],
+                    onPressed: () {
+                      if (_homeProvider.searchIcon.icon == Icons.search) {
+                        _homeProvider.searchIcon = Icon(
+                          Icons.close,
+                          color: Colors.grey[850],
+                        );
+                        _homeProvider.appBarExplorer = TextField(
+                          autofocus: true,
+                          controller: _homeProvider.searchQuery,
+                          onChanged: (text) {
+                            print("Clé tappé: $text");
+                            final String searchResult =
+                                _historyProvider.isPubkey(context, text);
+                            if (searchResult != '') {
+                              _homeProvider.currentIndex = 0;
+                            }
+                          },
+                          style: TextStyle(
+                            color: Colors.grey[850],
+                          ),
+                          decoration: InputDecoration(
+                              prefixIcon:
+                                  Icon(Icons.search, color: Colors.grey[850]),
+                              hintText: "Rechercher ...",
+                              hintStyle: TextStyle(color: Colors.grey[850])),
+                        );
+                        _homeProvider.handleSearchStart();
+                      } else {
+                        _homeProvider.handleSearchEnd();
+                      }
+                    }))
+          ],
+          backgroundColor: Color(0xffFFD58D),
+        ),
         floatingActionButton: Container(
           height: 80.0,
           width: 80.0,

lib/screens/home.dart

@@ -2,6 +2,7 @@ import 'package:gecko/globals.dart';
 import 'package:gecko/models/history.dart';
 import 'package:gecko/models/home.dart';
 import 'package:flutter/material.dart';
+import 'package:gecko/screens/myWallets/walletsHome.dart';
 import 'dart:ui';
 import 'package:gecko/screens/settings.dart';
 import 'package:provider/provider.dart';
@@ -11,7 +12,10 @@ class HomeScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
     HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context);
+    // _historyProvider.snackNode(context);
+
     return Scaffold(
+        resizeToAvoidBottomInset: false,
         drawer: Drawer(
           child: Column(
             children: <Widget>[
@@ -112,7 +116,11 @@ class HomeScreen extends StatelessWidget {
         ),
         backgroundColor: Color(0xffF9F9F1),
         body: // _homeProvider.currentTab[_homeProvider.currentIndex],
-          Column(children: <Widget>[
+            Builder(
+          builder: (context) => Column(children: <Widget>[
+            // _historyProvider.snackNode(context),
+            // SnackBar(content: Text('tataaa')),
+
             Padding(
                 padding: EdgeInsets.only(top: 22),
                 child: Row(
@@ -147,9 +155,12 @@ class HomeScreen extends StatelessWidget {
                                 child: InkWell(
                                   splashColor: Colors.black, // inkwell color
                                   child: Image(
-                                  image: AssetImage('assets/qrcode-scan.png'),
+                                      image:
+                                          AssetImage('assets/qrcode-scan.png'),
                                       height: 58),
-                              onTap: () {},
+                                  onTap: () async {
+                                    await _historyProvider.scan(context);
+                                  },
                                 )),
                           ),
                         ),
@@ -176,7 +187,8 @@ class HomeScreen extends StatelessWidget {
                                 child: InkWell(
                                   splashColor: Colors.black, // inkwell color
                                   child: Image(
-                                  image: AssetImage('assets/blockchain.png'),
+                                      image:
+                                          AssetImage('assets/blockchain.png'),
                                       height: 65),
                                   onTap: () {},
                                 )),
@@ -189,7 +201,7 @@ class HomeScreen extends StatelessWidget {
                           style: TextStyle(color: Colors.black, fontSize: 13),
                         )
                       ]),
-                  SizedBox(width: 160),
+                      SizedBox(width: 140),
                       Column(children: <Widget>[
                         ClipOval(
                           child: Material(
@@ -201,7 +213,14 @@ class HomeScreen extends StatelessWidget {
                                   child: Image(
                                       image: AssetImage('assets/lock.png'),
                                       height: 50),
-                              onTap: () {},
+                                  onTap: () {
+                                    Navigator.push(
+                                      context,
+                                      MaterialPageRoute(builder: (context) {
+                                        return WalletsHome();
+                                      }),
+                                    );
+                                  },
                                 )),
                           ),
                         ),
@@ -235,6 +254,6 @@ class HomeScreen extends StatelessWidget {
           //     ),
           //   ],
           // ),
-    );
+        ));
   }
 }

lib/screens/myWallets/walletsHome.dart

@@ -27,6 +27,11 @@ class WalletsHome extends StatelessWidget {
     }
 
     return Scaffold(
+        appBar: AppBar(
+          title: Text('Mes portefeuilles',
+              style: TextStyle(color: Colors.grey[850])),
+          backgroundColor: Color(0xffFFD58D),
+        ),
         floatingActionButton: Visibility(
             visible: (isWalletsExists && firstWalletDerivation != -1),
             child: Container(

pubspec.yaml

@@ -5,7 +5,7 @@ description: A new Flutter project.
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 0.0.1+13
+version: 0.0.1+14
 
 environment:
   sdk: ">=2.7.0 <3.0.0"