add back exchange menu option and adjust icon color

This commit is contained in:
julian 2022-11-18 12:34:25 -06:00
parent 792b91b7c4
commit 7ef31cbf87
2 changed files with 41 additions and 37 deletions

View file

@ -104,10 +104,10 @@ class _DesktopMenuState extends ConsumerState<DesktopMenu> {
.state .state
? Theme.of(context) ? Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
: Theme.of(context) : Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
.withOpacity(0.8), .withOpacity(0.8),
), ),
label: "My Stack", label: "My Stack",
@ -120,29 +120,33 @@ class _DesktopMenuState extends ConsumerState<DesktopMenu> {
const SizedBox( const SizedBox(
height: 2, height: 2,
), ),
// DesktopMenuItem( DesktopMenuItem(
// icon: SvgPicture.asset( icon: SvgPicture.asset(
// Assets.svg.exchangeDesktop, Assets.svg.exchangeDesktop,
// width: 20, width: 20,
// height: 20, height: 20,
// color: DesktopMenuItemId.exchange == ref.watch(currentDesktopMenuItemProvider.state).state color: DesktopMenuItemId.exchange ==
// ? Theme.of(context) ref
// .extension<StackColors>()! .watch(currentDesktopMenuItemProvider.state)
// .textDark .state
// : Theme.of(context) ? Theme.of(context)
// .extension<StackColors>()! .extension<StackColors>()!
// .textDark .accentColorDark
// .withOpacity(0.8), : Theme.of(context)
// ), .extension<StackColors>()!
// label: "Exchange", .accentColorDark
// value: DesktopMenuItemId.exchange, .withOpacity(0.8),
// group: ref.watch(currentDesktopMenuItemProvider.state).state, ),
// onChanged: updateSelectedMenuItem, label: "Exchange",
// iconOnly: _width == minimizedWidth, value: DesktopMenuItemId.exchange,
// ), group:
// const SizedBox( ref.watch(currentDesktopMenuItemProvider.state).state,
// height: 2, onChanged: updateSelectedMenuItem,
// ), iconOnly: _width == minimizedWidth,
),
const SizedBox(
height: 2,
),
DesktopMenuItem( DesktopMenuItem(
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.bell, Assets.svg.bell,
@ -154,10 +158,10 @@ class _DesktopMenuState extends ConsumerState<DesktopMenu> {
.state .state
? Theme.of(context) ? Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
: Theme.of(context) : Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
.withOpacity(0.8), .withOpacity(0.8),
), ),
label: "Notifications", label: "Notifications",
@ -181,10 +185,10 @@ class _DesktopMenuState extends ConsumerState<DesktopMenu> {
.state .state
? Theme.of(context) ? Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
: Theme.of(context) : Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
.withOpacity(0.8), .withOpacity(0.8),
), ),
label: "Address Book", label: "Address Book",
@ -208,10 +212,10 @@ class _DesktopMenuState extends ConsumerState<DesktopMenu> {
.state .state
? Theme.of(context) ? Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
: Theme.of(context) : Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
.withOpacity(0.8), .withOpacity(0.8),
), ),
label: "Settings", label: "Settings",
@ -235,10 +239,10 @@ class _DesktopMenuState extends ConsumerState<DesktopMenu> {
.state .state
? Theme.of(context) ? Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
: Theme.of(context) : Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
.withOpacity(0.8), .withOpacity(0.8),
), ),
label: "Support", label: "Support",
@ -262,10 +266,10 @@ class _DesktopMenuState extends ConsumerState<DesktopMenu> {
.state .state
? Theme.of(context) ? Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
: Theme.of(context) : Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
.withOpacity(0.8), .withOpacity(0.8),
), ),
label: "About", label: "About",
@ -283,7 +287,7 @@ class _DesktopMenuState extends ConsumerState<DesktopMenu> {
height: 20, height: 20,
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark .accentColorDark
.withOpacity(0.8), .withOpacity(0.8),
), ),
label: "Exit", label: "Exit",

View file

@ -21,7 +21,7 @@ class OceanBreezeColors extends StackColorTheme {
@override @override
Color get accentColorOrange => const Color(0xFFFF985F); Color get accentColorOrange => const Color(0xFFFF985F);
@override @override
Color get accentColorDark => const Color(0xFF232323); Color get accentColorDark => const Color(0xFF227386);
@override @override
Color get shadow => const Color(0xFF388192); Color get shadow => const Color(0xFF388192);