From 9a5dd0b15e4e30b94b1954296a089092d097ffc0 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 11 Jun 2024 10:48:56 -0400 Subject: [PATCH 1/3] Darken message background when open toolbar --- lib/pangea/widgets/chat/overlay_message.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pangea/widgets/chat/overlay_message.dart b/lib/pangea/widgets/chat/overlay_message.dart index e8143b376..af80b9561 100644 --- a/lib/pangea/widgets/chat/overlay_message.dart +++ b/lib/pangea/widgets/chat/overlay_message.dart @@ -46,7 +46,9 @@ class OverlayMessage extends StatelessWidget { return const SizedBox.shrink(); } - var color = Theme.of(context).colorScheme.surfaceVariant; + var color = Theme.of(context).colorScheme.surfaceVariant.withAlpha( + Theme.of(context).brightness == Brightness.light ? 90 : 160, + ); final textColor = ownMessage ? Theme.of(context).colorScheme.onPrimary : Theme.of(context).colorScheme.onBackground; @@ -97,7 +99,9 @@ class OverlayMessage extends StatelessWidget { }.contains(event.messageType); if (ownMessage) { - color = Theme.of(context).colorScheme.primary; + color = Theme.of(context).colorScheme.primary.withAlpha( + Theme.of(context).brightness == Brightness.light ? 30 : 160, + ); } // #Pangea From 36dc6ea25264deafe020e8c5f6769cd5e4a7f736 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 13 Jun 2024 13:33:25 -0400 Subject: [PATCH 2/3] Changed opacity edit to color edit --- lib/pangea/widgets/chat/overlay_message.dart | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/pangea/widgets/chat/overlay_message.dart b/lib/pangea/widgets/chat/overlay_message.dart index af80b9561..bc5356777 100644 --- a/lib/pangea/widgets/chat/overlay_message.dart +++ b/lib/pangea/widgets/chat/overlay_message.dart @@ -46,9 +46,9 @@ class OverlayMessage extends StatelessWidget { return const SizedBox.shrink(); } - var color = Theme.of(context).colorScheme.surfaceVariant.withAlpha( - Theme.of(context).brightness == Brightness.light ? 90 : 160, - ); + var color = Theme.of(context).colorScheme.surfaceVariant; + final isLight = Theme.of(context).brightness == Brightness.light; + var lightness = isLight ? .05 : .85; final textColor = ownMessage ? Theme.of(context).colorScheme.onPrimary : Theme.of(context).colorScheme.onBackground; @@ -99,10 +99,22 @@ class OverlayMessage extends StatelessWidget { }.contains(event.messageType); if (ownMessage) { - color = Theme.of(context).colorScheme.primary.withAlpha( - Theme.of(context).brightness == Brightness.light ? 30 : 160, - ); + color = Theme.of(context).colorScheme.primary; + lightness = isLight ? .15 : .85; } + // Make overlay a little darker/lighter than the message + color = Color.fromARGB( + color.alpha, + isLight + ? (color.red + lightness * (255 - color.red)).round() + : (color.red * lightness).round(), + isLight + ? (color.green + lightness * (255 - color.green)).round() + : (color.green * lightness).round(), + isLight + ? (color.blue + lightness * (255 - color.blue)).round() + : (color.blue * lightness).round(), + ); // #Pangea final pangeaMessageEvent = PangeaMessageEvent( From 3844a3db37d23c6b98aa513a58975213ce81be4f Mon Sep 17 00:00:00 2001 From: Kelrap Date: Fri, 14 Jun 2024 12:11:16 -0400 Subject: [PATCH 3/3] Add #Pangea comments --- lib/pangea/widgets/chat/overlay_message.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/pangea/widgets/chat/overlay_message.dart b/lib/pangea/widgets/chat/overlay_message.dart index bc5356777..bc25ffe14 100644 --- a/lib/pangea/widgets/chat/overlay_message.dart +++ b/lib/pangea/widgets/chat/overlay_message.dart @@ -47,8 +47,10 @@ class OverlayMessage extends StatelessWidget { } var color = Theme.of(context).colorScheme.surfaceVariant; + // #Pangea final isLight = Theme.of(context).brightness == Brightness.light; var lightness = isLight ? .05 : .85; + // Pangea# final textColor = ownMessage ? Theme.of(context).colorScheme.onPrimary : Theme.of(context).colorScheme.onBackground;