Update hamburger menu

This commit is contained in:
tuxpizza 2024-12-20 02:10:16 -05:00
parent 859d1d540c
commit a5b0856eee
2 changed files with 63 additions and 45 deletions

View file

@ -141,6 +141,7 @@ class MenuWidgetState extends State<MenuWidget> {
return Container( return Container(
height: headerHeight, height: headerHeight,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24)),
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).extension<CakeMenuTheme>()!.headerFirstGradientColor, Theme.of(context).extension<CakeMenuTheme>()!.headerFirstGradientColor,
Theme.of(context).extension<CakeMenuTheme>()!.headerSecondGradientColor, Theme.of(context).extension<CakeMenuTheme>()!.headerSecondGradientColor,
@ -207,7 +208,7 @@ class MenuWidgetState extends State<MenuWidget> {
); );
}, },
separatorBuilder: (_, index) => Container( separatorBuilder: (_, index) => Container(
height: 1, height: 0,
color: Theme.of(context).extension<CakeMenuTheme>()!.dividerColor, color: Theme.of(context).extension<CakeMenuTheme>()!.dividerColor,
), ),
itemCount: itemCount + 1, itemCount: itemCount + 1,

View file

@ -1,6 +1,10 @@
import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/themes/extensions/menu_theme.dart'; import 'package:cake_wallet/themes/extensions/menu_theme.dart';
import 'package:flutter/material.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 { class SettingActionButton extends StatelessWidget {
final bool isLastTile; final bool isLastTile;
@ -29,23 +33,35 @@ class SettingActionButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final isLightMode = Theme.of(context).extension<OptionTileTheme>()?.useDarkImage ?? false;
Color? color = isSelected Color? color = isSelected
? Theme.of(context).extension<CakeMenuTheme>()!.settingTitleColor ? Theme.of(context).extension<CakeMenuTheme>()!.settingTitleColor
: selectionActive : selectionActive
? Palette.darkBlue ? Palette.darkBlue
: Theme.of(context).extension<CakeMenuTheme>()!.settingTitleColor; : Theme.of(context).extension<CakeMenuTheme>()!.settingTitleColor;
return InkWell( return Container(
onTap: onTap, //padding: EdgeInsets.only(top: 5, left: 15, bottom: 5),
hoverColor: Colors.transparent, 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),
),
),
),
),
onPressed: onTap,
//hoverColor: Colors.transparent,
child: Container( child: Container(
height: tileHeight, width: double.infinity,
padding: isLastTile padding: EdgeInsets.only(top: 12, left: 20, bottom: 12, right: 15),
? EdgeInsets.only( //margin: EdgeInsets.only(top: 5, left: 15, bottom: 5),
left: 24,
right: 24,
top: fromBottomEdge,
)
: EdgeInsets.only(left: 24, right: 24),
alignment: isLastTile ? Alignment.topLeft : null, alignment: isLastTile ? Alignment.topLeft : null,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
@ -73,12 +89,13 @@ class SettingActionButton extends StatelessWidget {
if(isArrowVisible) if(isArrowVisible)
Icon( Icon(
Icons.arrow_forward_ios, Icons.arrow_forward_ios,
color: color, color: Colors.grey,
size: 16, size: 16,
) )
], ],
), ),
), ),
),
); );
} }
} }