diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart index 953463269..3d6abf0a9 100644 --- a/lib/src/screens/dashboard/dashboard_page.dart +++ b/lib/src/screens/dashboard/dashboard_page.dart @@ -173,6 +173,7 @@ class _DashboardPageView extends BasePage { return Container( alignment: Alignment.centerRight, + //padding: EdgeInsets.all(20), width: 40, child: TextButton( key: ValueKey('dashboard_page_wallet_menu_button_key'), diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart index 1caeb4c51..a1e843ba8 100644 --- a/lib/src/screens/dashboard/widgets/menu_widget.dart +++ b/lib/src/screens/dashboard/widgets/menu_widget.dart @@ -22,7 +22,7 @@ class MenuWidgetState extends State { : this.menuWidth = 0, this.screenWidth = 0, this.screenHeight = 0, - this.headerHeight = 120, + this.headerHeight = 500, this.tileHeight = 60, this.fromTopEdge = 50, this.fromBottomEdge = 25, @@ -137,6 +137,7 @@ class MenuWidgetState extends State { itemBuilder: (_, index) { if (index == 0) { return Container( + margin: EdgeInsets.only(bottom: 10), height: headerHeight, decoration: BoxDecoration( gradient: LinearGradient(colors: [ @@ -205,8 +206,8 @@ class MenuWidgetState extends State { ); }, separatorBuilder: (_, index) => Container( - height: 1, - color: Theme.of(context).extension()!.dividerColor, + height: 0, + color: Colors.transparent ), itemCount: itemCount + 1, ), diff --git a/lib/src/widgets/setting_action_button.dart b/lib/src/widgets/setting_action_button.dart index bebc4b8e1..7753702cd 100644 --- a/lib/src/widgets/setting_action_button.dart +++ b/lib/src/widgets/setting_action_button.dart @@ -1,6 +1,10 @@ import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/themes/extensions/menu_theme.dart'; import 'package:flutter/material.dart'; +import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart'; +import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart'; +import 'package:cake_wallet/themes/extensions/balance_page_theme.dart'; +import 'package:cake_wallet/themes/extensions/option_tile_theme.dart'; class SettingActionButton extends StatelessWidget { final bool isLastTile; @@ -34,18 +38,29 @@ class SettingActionButton extends StatelessWidget { : selectionActive ? Palette.darkBlue : Theme.of(context).extension()!.settingTitleColor; - return InkWell( - onTap: onTap, - hoverColor: Colors.transparent, + return Container( + //padding: EdgeInsets.only(top: 5, left: 15, bottom: 5), + margin: EdgeInsets.only(top: 5, left: 20, bottom: 5), + child: TextButton( + style: ButtonStyle( + backgroundColor: MaterialStateProperty.all(Colors.black12), + shape: MaterialStateProperty.all( + RoundedRectangleBorder( + side: BorderSide( + //color: Colors.black12, + width: 100 + ), + borderRadius: BorderRadius.only(topLeft: Radius.circular(20), bottomLeft: Radius.circular(20), + ), + ), + ), + ), + onPressed: onTap, + //hoverColor: Colors.transparent, child: Container( - height: tileHeight, - padding: isLastTile - ? EdgeInsets.only( - left: 24, - right: 24, - top: fromBottomEdge, - ) - : EdgeInsets.only(left: 24, right: 24), + width: double.infinity, + padding: EdgeInsets.only(top: 12, left: 20, bottom: 12, right: 15), + //margin: EdgeInsets.only(top: 5, left: 15, bottom: 5), alignment: isLastTile ? Alignment.topLeft : null, child: Row( mainAxisAlignment: MainAxisAlignment.start, @@ -70,15 +85,16 @@ class SettingActionButton extends StatelessWidget { ), ), ), - if (isArrowVisible) + if(isArrowVisible) Icon( Icons.arrow_forward_ios, - color: color, + color: Colors.grey, size: 16, ) ], ), ), + ), ); } }