diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart index b49a08584..c2e54ccc7 100644 --- a/lib/src/screens/dashboard/widgets/menu_widget.dart +++ b/lib/src/screens/dashboard/widgets/menu_widget.dart @@ -141,6 +141,7 @@ class MenuWidgetState extends State { return Container( height: headerHeight, decoration: BoxDecoration( + borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24)), gradient: LinearGradient(colors: [ Theme.of(context).extension()!.headerFirstGradientColor, Theme.of(context).extension()!.headerSecondGradientColor, @@ -207,7 +208,7 @@ class MenuWidgetState extends State { ); }, separatorBuilder: (_, index) => Container( - height: 1, + height: 0, color: Theme.of(context).extension()!.dividerColor, ), itemCount: itemCount + 1, diff --git a/lib/src/widgets/setting_action_button.dart b/lib/src/widgets/setting_action_button.dart index bebc4b8e1..7f633a6d3 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; @@ -29,56 +33,69 @@ class SettingActionButton extends StatelessWidget { @override Widget build(BuildContext context) { + final isLightMode = Theme.of(context).extension()?.useDarkImage ?? false; Color? color = isSelected ? Theme.of(context).extension()!.settingTitleColor : selectionActive - ? Palette.darkBlue - : Theme.of(context).extension()!.settingTitleColor; - return InkWell( - onTap: onTap, - hoverColor: Colors.transparent, - child: Container( - height: tileHeight, - padding: isLastTile - ? EdgeInsets.only( - left: 24, - right: 24, - top: fromBottomEdge, - ) - : EdgeInsets.only(left: 24, right: 24), - alignment: isLastTile ? Alignment.topLeft : null, - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - image, - height: 16, - width: 16, - color: Theme.of(context) - .extension()! - .settingActionsIconColor, - ), - SizedBox(width: 16), - Expanded( - child: Text( - title, - style: TextStyle( - color: color, - fontSize: 16, - fontWeight: FontWeight.bold, - ), + ? Palette.darkBlue + : Theme.of(context).extension()!.settingTitleColor; + return Container( + //padding: EdgeInsets.only(top: 5, left: 15, bottom: 5), + margin: EdgeInsets.only(top: 10, left: 20, bottom: 0), + child: TextButton( + style: ButtonStyle( + backgroundColor: MaterialStateProperty.all(isLightMode ? Theme.of(context).cardColor : Colors.black12), + shape: MaterialStateProperty.all( + RoundedRectangleBorder( + side: BorderSide( + //color: Colors.black12, + width: 100 + ), + borderRadius: BorderRadius.only(topLeft: Radius.circular(20), bottomLeft: Radius.circular(20), ), ), - if (isArrowVisible) - Icon( - Icons.arrow_forward_ios, - color: color, - size: 16, - ) - ], + ), + ), + onPressed: onTap, + //hoverColor: Colors.transparent, + child: Container( + 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, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + image, + height: 16, + width: 16, + color: Theme.of(context) + .extension()! + .settingActionsIconColor, + ), + SizedBox(width: 16), + Expanded( + child: Text( + title, + style: TextStyle( + color: color, + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + ), + if(isArrowVisible) + Icon( + Icons.arrow_forward_ios, + color: Colors.grey, + size: 16, + ) + ], + ), ), ), ); } -} +} \ No newline at end of file