Separate Dashboard desktop view from mobile view

lib/src/screens/dashboard/dashboard_page.dart

@@ -1,9 +1,7 @@
 import 'dart:async';
-import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/main_actions.dart';
+import 'package:cake_wallet/src/screens/dashboard/desktop_dashboard_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart';
-import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
-import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_dashboard_view.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/market_place_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
@@ -40,13 +38,19 @@ class DashboardPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: DesktopSidebarWrapper(
-        child: _DashboardPageView(
-          balancePage: balancePage,
-          walletViewModel: walletViewModel,
-          addressListViewModel: addressListViewModel,
-        ),
-      ),
+      body: ResponsiveLayoutUtil.instance.isMobile(context)
+          ? _DashboardPageView(
+              balancePage: balancePage,
+              walletViewModel: walletViewModel,
+              addressListViewModel: addressListViewModel,
+            )
+          : DesktopSidebarWrapper(
+              child: DesktopDashboardPage(
+                balancePage: balancePage,
+                walletViewModel: walletViewModel,
+                addressListViewModel: addressListViewModel,
+              ),
+            ),
     );
   }
 }
@@ -84,15 +88,6 @@ class _DashboardPageView extends BasePage {
   @override
   Widget get endDrawer => MenuWidget(walletViewModel);
 
-  @override
-  Widget? leading(BuildContext context) {
-    if (!ResponsiveLayoutUtil.instance.isMobile(context)) {
-      return getIt<DesktopWalletSelectionDropDown>();
-    }
-
-    return null;
-  }
-
   @override
   Widget middle(BuildContext context) {
     return SyncIndicator(
@@ -128,9 +123,6 @@ class _DashboardPageView extends BasePage {
   @override
   Widget body(BuildContext context) {
     _setEffects(context);
-    if (!ResponsiveLayoutUtil.instance.isMobile(context)) {
-      return DesktopDashboardView(balancePage);
-    }
 
     return SafeArea(
         minimum: EdgeInsets.only(bottom: 24),

lib/src/screens/dashboard/desktop_dashboard_page.dart

@@ -0,0 +1,125 @@
+import 'dart:async';
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
+import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_dashboard_view.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/screens/yat_emoji_id.dart';
+import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/screens/dashboard/widgets/balance_page.dart';
+import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator.dart';
+import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/main.dart';
+
+class DesktopDashboardPage extends BasePage {
+  DesktopDashboardPage({
+    required this.balancePage,
+    required this.walletViewModel,
+    required this.addressListViewModel,
+  });
+
+  @override
+  Color get backgroundLightColor =>
+      currentTheme.type == ThemeType.bright ? Colors.transparent : Colors.white;
+
+  @override
+  Color get backgroundDarkColor => Colors.transparent;
+
+  @override
+  Widget Function(BuildContext, Widget) get rootWrapper =>
+      (BuildContext context, Widget scaffold) => Container(
+          decoration: BoxDecoration(
+              gradient: LinearGradient(colors: [
+            Theme.of(context).accentColor,
+            Theme.of(context).scaffoldBackgroundColor,
+            Theme.of(context).primaryColor,
+          ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
+          child: scaffold);
+
+  @override
+  bool get resizeToAvoidBottomInset => false;
+
+  @override
+  Widget? leading(BuildContext context) => getIt<DesktopWalletSelectionDropDown>();
+
+  @override
+  Widget middle(BuildContext context) {
+    return SyncIndicator(
+        dashboardViewModel: walletViewModel,
+        onTap: () => Navigator.of(context, rootNavigator: true).pushNamed(Routes.connectionSync));
+  }
+
+  @override
+  Widget trailing(BuildContext context) {
+    return Image.asset('assets/images/menu.png',
+        color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!);
+  }
+
+  final BalancePage balancePage;
+  final DashboardViewModel walletViewModel;
+  final WalletAddressListViewModel addressListViewModel;
+
+  bool _isEffectsInstalled = false;
+  StreamSubscription<bool>? _onInactiveSub;
+
+  @override
+  Widget body(BuildContext context) {
+    _setEffects(context);
+
+    return DesktopDashboardView(balancePage);
+  }
+
+  void _setEffects(BuildContext context) async {
+    if (_isEffectsInstalled) {
+      return;
+    }
+    _isEffectsInstalled = true;
+
+    autorun((_) async {
+      if (!walletViewModel.isOutdatedElectrumWallet) {
+        return;
+      }
+
+      await Future<void>.delayed(Duration(seconds: 1));
+      await showPopUp<void>(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertWithOneAction(
+                alertTitle: S.of(context).pre_seed_title,
+                alertContent: S.of(context).outdated_electrum_wallet_description,
+                buttonText: S.of(context).understand,
+                buttonAction: () => Navigator.of(context).pop());
+          });
+    });
+
+    var needToPresentYat = false;
+    var isInactive = false;
+
+    _onInactiveSub = rootKey.currentState!.isInactive.listen((inactive) {
+      isInactive = inactive;
+
+      if (needToPresentYat) {
+        Future<void>.delayed(Duration(milliseconds: 500)).then((_) {
+          showPopUp<void>(
+              context: navigatorKey.currentContext!,
+              builder: (_) => YatEmojiId(walletViewModel.yatStore.emoji));
+          needToPresentYat = false;
+        });
+      }
+    });
+
+    walletViewModel.yatStore.emojiIncommingStream.listen((String emoji) {
+      if (!_isEffectsInstalled || emoji.isEmpty) {
+        return;
+      }
+
+      needToPresentYat = true;
+    });
+  }
+}

lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart

@@ -2,7 +2,6 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_controller.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart';
-import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/router.dart' as Router;
 
@@ -18,6 +17,7 @@ class DesktopSidebarWrapper extends StatefulWidget {
 class _DesktopSidebarWrapperState extends State<DesktopSidebarWrapper> {
   final page = PageController();
   final sideMenu = SideMenuController();
+
   @override
   void initState() {
     SideMenuGlobal.controller = sideMenu;
@@ -29,10 +29,6 @@ class _DesktopSidebarWrapperState extends State<DesktopSidebarWrapper> {
 
   @override
   Widget build(BuildContext context) {
-    if (ResponsiveLayoutUtil.instance.isMobile(context)) {
-      return widget.child;
-    }
-
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [

lib/src/widgets/nav_bar.dart

@@ -66,14 +66,17 @@ class NavBar extends StatelessWidget implements ObstructingPreferredSizeWidget {
     if (!ResponsiveLayoutUtil.instance.isMobile(context)) {
       return PreferredSize(
         preferredSize: Size.fromHeight(height),
-        child: Row(
-          mainAxisSize: MainAxisSize.max,
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            if (leading != null) Flexible(child: leading!),
-            if (middle != null) middle!,
-            if (trailing != null) trailing!,
-          ],
+        child: Padding(
+          padding: const EdgeInsetsDirectional.only(end: 24),
+          child: Row(
+            mainAxisSize: MainAxisSize.max,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              if (leading != null) Flexible(child: leading!),
+              if (middle != null) middle!,
+              if (trailing != null) trailing!,
+            ],
+          ),
         ),
       );
     }