UX: improve appBar in safeHome

lib/screens/activity.dart

@@ -12,6 +12,7 @@ import 'package:flutter/material.dart';
 import 'package:gecko/screens/wallet_view.dart';
 import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:gecko/widgets/header_profile.dart';
+import 'package:gecko/widgets/page_route_no_transition.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:provider/provider.dart';
 
@@ -361,7 +362,7 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
                     // _cesiumPlusProvider.avatarCancelToken.cancel('cancelled');
                     Navigator.push(
                       context,
-                      MaterialPageRoute(builder: (context) {
+                      PageNoTransit(builder: (context) {
                         return WalletViewScreen(
                           address: repository[1],
                           username: username ?? '',

lib/screens/myWallets/wallet_options.dart

@@ -464,7 +464,7 @@ class WalletOptions extends StatelessWidget {
         // _historyProvider.nPage = 1;
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) {
+          PageNoTransit(builder: (context) {
             return ActivityScreen(
                 address: walletProvider.address.text,
                 avatar: wallet.imageCustomPath == null

lib/screens/myWallets/wallets_home.dart

@@ -63,7 +63,9 @@ class WalletsHome extends StatelessWidget {
           backgroundColor: const Color(0xffFFD58D),
         ),
         bottomNavigationBar: myWalletProvider.lastFlyBy == ''
-            ? const GeckoBottomAppBar()
+            ? const GeckoBottomAppBar(
+                actualRoute: 'safeHome',
+              )
             : dragInfo(context),
         body: SafeArea(
           child: Stack(children: [
@@ -336,7 +338,8 @@ class WalletsHome extends StatelessWidget {
                                         Color.fromARGB(255, 255, 255, 211),
                                         yellowC,
                                       ],
-                                  )),
+                                    ),
+                                  ),
                                   child:
                                       // SvgPicture.asset('assets/chopp-gecko2.png',
                                       //         semanticsLabel: 'Gecko', height: 48),

lib/widgets/bottom_app_bar.dart

@@ -12,9 +12,8 @@ import 'package:gecko/screens/search.dart';
 import 'package:provider/provider.dart';
 
 class GeckoBottomAppBar extends StatelessWidget {
-  const GeckoBottomAppBar({
+  const GeckoBottomAppBar({Key? key, this.actualRoute = ''}) : super(key: key);
-    Key? key,
+  final String actualRoute;
-  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -24,8 +23,8 @@ class GeckoBottomAppBar extends StatelessWidget {
         Provider.of<WalletsProfilesProvider>(context, listen: false);
 
     final size = MediaQuery.of(context).size;
-
     const bool showBottomBar = true;
+    final lockAction = actualRoute == 'safeHome';
 
     return Visibility(
       visible: showBottomBar,
@@ -33,15 +32,7 @@ class GeckoBottomAppBar extends StatelessWidget {
         color: yellowC,
         width: size.width,
         height: 80,
-        child:
+        child: Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-            // Stack(
-            //   children: [
-            //     // CustomPaint(
-            //     //   size: Size(size.width, 110),
-            //     //   painter: CustomRoundedButton(),
-            //     // ),
-            Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-          // SizedBox(width: 0),
           const Spacer(),
           const SizedBox(width: 11),
           IconButton(
@@ -77,12 +68,39 @@ class GeckoBottomAppBar extends StatelessWidget {
           ),
           const Spacer(),
           const SizedBox(width: 15),
+          Stack(
+            children: [
+              if (lockAction)
+                Center(
+                  child: Padding(
+                    padding: const EdgeInsets.only(left: 0),
+                    child: Container(
+                      width: 75,
+                      height: 75,
+                      decoration: BoxDecoration(
+                        shape: BoxShape.circle,
+                        border:
+                            Border.all(color: orangeC.withOpacity(0), width: 3),
+                        gradient: RadialGradient(
+                          radius: 0.5,
+                          colors: [
+                            yellowC,
+                            orangeC.withOpacity(0.1),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
               IconButton(
                 key: keyAppBarChest,
                 iconSize: 60,
                 icon: const Image(image: AssetImage('assets/wallet.png')),
-            onPressed: () async {
+                onPressed: lockAction
-              WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
+                    ? null
+                    : () async {
+                        WalletData? defaultWallet =
+                            myWalletProvider.getDefaultWallet();
                         String? pin;
                         if (myWalletProvider.pinCode == '') {
                           pin = await Navigator.push(
@@ -109,6 +127,8 @@ class GeckoBottomAppBar extends StatelessWidget {
                         }
                       },
               ),
+            ],
+          ),
           const Spacer(),
         ]),
       ),

pubspec.yaml

@@ -5,7 +5,7 @@ description: Pay with G1.
 # 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.14+46
+version: 0.0.15+47
 
 environment:
   sdk: '>=2.12.0 <3.0.0'