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 59c96915b..510ad6b53 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 @@ -176,7 +176,9 @@ class _ActivityStatsButtonState extends State { ), borderRadius: BorderRadius.circular(12), color: _xpCount > 0 - ? AppConfig.gold.withAlpha(180) + ? (theme.brightness == Brightness.light + ? AppConfig.yellowLight + : Color.lerp(AppConfig.gold, Colors.black, 0.3)!) : theme.colorScheme.surface, depressed: _xpCount <= 0 || widget.controller.showActivityDropdown, child: AnimatedContainer( @@ -186,7 +188,9 @@ class _ActivityStatsButtonState extends State { padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), decoration: BoxDecoration( color: _xpCount > 0 - ? AppConfig.gold.withAlpha(180) + ? theme.brightness == Brightness.light + ? AppConfig.yellowLight + : Color.lerp(AppConfig.gold, Colors.black, 0.3)! : theme.colorScheme.surface, borderRadius: BorderRadius.circular(12), ), @@ -195,8 +199,14 @@ class _ActivityStatsButtonState extends State { : Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - _StatsBadge(icon: Icons.radar, value: "$_xpCount XP"), - _StatsBadge(icon: Symbols.dictionary, value: "$_vocabCount"), + _StatsBadge( + icon: Icons.radar, + value: "$_xpCount XP", + ), + _StatsBadge( + icon: Symbols.dictionary, + value: "$_vocabCount", + ), _StatsBadge( icon: Symbols.toys_and_games, value: "$_grammarCount", @@ -221,8 +231,8 @@ class _StatsBadge extends StatelessWidget { final theme = Theme.of(context); final screenWidth = MediaQuery.of(context).size.width; final baseStyle = theme.textTheme.bodyMedium; - final double fontSize = (screenWidth < 400) ? 10 : 14; - final double iconSize = (screenWidth < 400) ? 14 : 18; + final double fontSize = (screenWidth < 400) ? 14 : 18; + final double iconSize = (screenWidth < 400) ? 18 : 22; return Row( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart index d1371e8a0..58dbbec08 100644 --- a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart +++ b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart @@ -123,12 +123,10 @@ class ButtonControlledCarouselView extends StatelessWidget { margin: const EdgeInsets.only(right: 5.0), padding: const EdgeInsets.all(12.0), decoration: ShapeDecoration( - color: AppConfig.goldLight.withAlpha(100), + color: Theme.of(context).brightness == Brightness.light + ? AppConfig.yellowLight + : Color.lerp(AppConfig.gold, Colors.black, 0.3), shape: RoundedRectangleBorder( - side: const BorderSide( - width: 0.20, - color: AppConfig.gold, - ), borderRadius: BorderRadius.circular(12), ), ),