diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_stats_button.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_stats_button.dart index ffd026654..49a68f04a 100644 --- a/lib/pangea/activity_sessions/activity_session_chat/activity_stats_button.dart +++ b/lib/pangea/activity_sessions/activity_session_chat/activity_stats_button.dart @@ -203,9 +203,10 @@ class _ActivityStatsButtonState extends State { ), 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 { 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), ), diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart index 9bd8d8431..e0aa8863c 100644 --- a/lib/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart +++ b/lib/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart @@ -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( diff --git a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart index 58dbbec08..3a4e69884 100644 --- a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart +++ b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart @@ -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), ),