diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart index 43897369b..b8bfbd45d 100644 --- a/lib/src/screens/dashboard/dashboard_page.dart +++ b/lib/src/screens/dashboard/dashboard_page.dart @@ -232,7 +232,7 @@ class _DashboardPageView extends BasePage { bottomSheetService: bottomSheetService, child: Container( child: Stack( - fit: StackFit.expand, + //fit: StackFit.expand, alignment: Alignment.bottomCenter, //mainAxisSize: MainAxisSize.max, //alignment: Alignment.bottomCenter, @@ -250,10 +250,23 @@ class _DashboardPageView extends BasePage { ), //), Positioned( - top: 540, + top: 590, child: Container( + // decoration: BoxDecoration( + // boxShadow: [ + // BoxShadow( + // color: Theme.of(context) + // .extension()! + // .thirdGradientBackgroundColor + // .withAlpha(50), + // spreadRadius: 5, + // blurRadius: 7, + // offset: Offset(0, 3), + // ) + // ] + // ), alignment: Alignment.bottomCenter, - padding: EdgeInsets.only(top: 50), + //padding: EdgeInsets.only(top: 50), child: Observer( builder: (context) { return Semantics( @@ -312,12 +325,10 @@ class _DashboardPageView extends BasePage { .withAlpha(150), Theme.of(context) .extension()! - .thirdGradientBackgroundColor - .withAlpha(200), + .thirdGradientBackgroundColor, Theme.of(context) .extension()! .thirdGradientBackgroundColor - .withAlpha(250), // Color.fromARGB(10, 245, 8, 82), // Color.fromARGB(75, 245, 8, 82), // Color.fromARGB(150, 245, 8, 82), @@ -327,7 +338,7 @@ class _DashboardPageView extends BasePage { ), ), child: Container( - //alignment: Alignment.bottomCenter, + alignment: Alignment.bottomCenter, padding: const EdgeInsets.only( left: 16, right: 16, bottom: 24, top: 48), child: ClipRRect( diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart index 9bf924f61..d4f9dd00c 100644 --- a/lib/src/screens/wallet_list/wallet_list_page.dart +++ b/lib/src/screens/wallet_list/wallet_list_page.dart @@ -32,6 +32,8 @@ import 'package:cw_core/wallet_type.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; +import '../../../themes/extensions/dashboard_page_theme.dart'; + class WalletListPage extends BasePage { WalletListPage({ required this.walletListViewModel, @@ -146,10 +148,11 @@ class WalletListBodyState extends State { return Container( padding: EdgeInsets.only(top: 16), - child: Column( - children: [ - Expanded( - child: SingleChildScrollView( + child: Stack( + fit: StackFit.expand, + alignment: Alignment.bottomCenter, + children: [ + SingleChildScrollView( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -326,12 +329,39 @@ class WalletListBodyState extends State { ), ), }, + SizedBox(height: 150) ], ), ), - ), - Padding( - padding: const EdgeInsets.all(24), + Positioned( + top: 505, + bottom: 0, + left: 0, + right: 0, + child: Container( + padding: EdgeInsets.only(top: 50), + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + Theme.of(context).colorScheme.background + .withAlpha(10), + Theme.of(context).colorScheme.background, + Theme.of(context).colorScheme.background, + Theme.of(context).colorScheme.background + // Color.fromARGB(10, 245, 8, 82), + // Color.fromARGB(75, 245, 8, 82), + // Color.fromARGB(150, 245, 8, 82), + // Color.fromARGB(200, 245, 8, 82), + // Color.fromARGB(255, 245, 8, 82), + ], + ), + ), + child: Container( + alignment: Alignment.bottomCenter, + //margin: EdgeInsets.only(top: 24), + padding: EdgeInsets.only(left: 24, right: 24), child: Column( children: [ PrimaryImageButton( @@ -396,6 +426,8 @@ class WalletListBodyState extends State { ], ), ), + ), + ), ], ), );