normalize use of gold and yellowLight in activities

now use same color for tooltip popups and activity widgets
This commit is contained in:
avashilling 2025-11-03 11:38:28 -05:00
parent cb997cd0fc
commit 3dae91c05c
3 changed files with 18 additions and 11 deletions

View file

@ -203,9 +203,10 @@ class _ActivityStatsButtonState extends State<ActivityStatsButton> {
),
borderRadius: BorderRadius.circular(12),
color: enabled
? (theme.brightness == Brightness.light
? AppConfig.yellowLight
: Color.lerp(AppConfig.gold, Colors.black, 0.3)!)
? Color.alphaBlend(
Theme.of(context).colorScheme.surface.withAlpha(70),
AppConfig.gold,
)
: theme.colorScheme.surface,
depressed: !enabled || widget.controller.showActivityDropdown,
child: AnimatedContainer(
@ -214,9 +215,10 @@ class _ActivityStatsButtonState extends State<ActivityStatsButton> {
height: 40,
decoration: BoxDecoration(
color: enabled
? theme.brightness == Brightness.light
? AppConfig.yellowLight
: Color.lerp(AppConfig.gold, Colors.black, 0.3)!
? Color.alphaBlend(
Theme.of(context).colorScheme.surface.withAlpha(70),
AppConfig.gold,
)
: theme.colorScheme.surface,
borderRadius: BorderRadius.circular(12),
),

View file

@ -287,8 +287,12 @@ class VocabTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
final color =
isUsed ? AppConfig.goldLight.withAlpha(100) : Colors.transparent;
final color = isUsed
? Color.alphaBlend(
Theme.of(context).colorScheme.surface.withAlpha(150),
AppConfig.gold,
)
: Colors.transparent;
return CompositedTransformTarget(
link: MatrixState.pAnyState
.layerLinkAndKey(

View file

@ -123,9 +123,10 @@ class ButtonControlledCarouselView extends StatelessWidget {
margin: const EdgeInsets.only(right: 5.0),
padding: const EdgeInsets.all(12.0),
decoration: ShapeDecoration(
color: Theme.of(context).brightness == Brightness.light
? AppConfig.yellowLight
: Color.lerp(AppConfig.gold, Colors.black, 0.3),
color: Color.alphaBlend(
Theme.of(context).colorScheme.surface.withAlpha(70),
AppConfig.gold,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),