From 2ff612dad3eb5604d3558c5171d875eb7a8f5e20 Mon Sep 17 00:00:00 2001 From: Dat PHAM HOANG Date: Wed, 16 Oct 2024 19:19:25 +0700 Subject: [PATCH] change bg color for preview link item --- .../message_content_with_timestamp_builder.dart | 11 ++++++----- lib/pages/chat/events/message_upload_content.dart | 3 ++- lib/widgets/file_widget/base_file_tile_widget.dart | 3 ++- lib/widgets/file_widget/file_tile_widget_style.dart | 7 ++++--- .../twake_preview_link/twake_link_preview_item.dart | 6 ++---- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart b/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart index 8e122d8e51..7bd8a288c4 100644 --- a/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart +++ b/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart @@ -109,11 +109,12 @@ class MessageContentWithTimestampBuilder extends StatelessWidget { color: event.isOwnMessage ? LinagoraRefColors.material().primary[95] : responsiveUtils.isMobile(context) - ? LinagoraSysColors.material().onPrimary - : Theme.of(context) - .colorScheme - .surfaceContainerHighest, - border: !event.isOwnMessage && responsiveUtils.isMobile(context) + ? LinagoraSysColors.material().onPrimary + : Theme.of(context) + .colorScheme + .surfaceContainerHighest, + border: !event.isOwnMessage && + responsiveUtils.isMobile(context) ? Border.all( color: MessageStyle.borderColorReceivedBubble, ) diff --git a/lib/pages/chat/events/message_upload_content.dart b/lib/pages/chat/events/message_upload_content.dart index 3925ba30fd..859a3a1abd 100644 --- a/lib/pages/chat/events/message_upload_content.dart +++ b/lib/pages/chat/events/message_upload_content.dart @@ -32,7 +32,8 @@ class _MessageUploadingContentState extends State return Container( padding: widget.style.paddingFileTileAll, decoration: ShapeDecoration( - color: widget.style.backgroundColor(context, ownMessage: event.isOwnMessage), + color: widget.style + .backgroundColor(context, ownMessage: event.isOwnMessage), shape: RoundedRectangleBorder( borderRadius: widget.style.borderRadius, ), diff --git a/lib/widgets/file_widget/base_file_tile_widget.dart b/lib/widgets/file_widget/base_file_tile_widget.dart index d01f20ddc9..172a4eef19 100644 --- a/lib/widgets/file_widget/base_file_tile_widget.dart +++ b/lib/widgets/file_widget/base_file_tile_widget.dart @@ -39,7 +39,8 @@ class BaseFileTileWidget extends StatelessWidget { return Container( padding: style.paddingFileTileAll, decoration: ShapeDecoration( - color: backgroundColor ?? style.backgroundColor(context, ownMessage: ownMessage), + color: backgroundColor ?? + style.backgroundColor(context, ownMessage: ownMessage), shape: RoundedRectangleBorder( borderRadius: style.borderRadius, ), diff --git a/lib/widgets/file_widget/file_tile_widget_style.dart b/lib/widgets/file_widget/file_tile_widget_style.dart index 8074e6cf75..3e072bc262 100644 --- a/lib/widgets/file_widget/file_tile_widget_style.dart +++ b/lib/widgets/file_widget/file_tile_widget_style.dart @@ -9,9 +9,10 @@ class FileTileWidgetStyle { EdgeInsets get paddingFileTileAll => const EdgeInsets.only(left: 8.0, right: 16.0); - Color backgroundColor(BuildContext context, {bool ownMessage = false}) => ownMessage - ? Theme.of(context).colorScheme.primaryContainer - : Theme.of(context).colorScheme.onSurface.withOpacity(0.08); + Color backgroundColor(BuildContext context, {bool ownMessage = false}) => + ownMessage + ? Theme.of(context).colorScheme.primaryContainer + : Theme.of(context).colorScheme.onSurface.withOpacity(0.08); BorderRadiusGeometry get borderRadius => BorderRadius.circular(12); diff --git a/lib/widgets/twake_components/twake_preview_link/twake_link_preview_item.dart b/lib/widgets/twake_components/twake_preview_link/twake_link_preview_item.dart index bfa57be6fc..7913900929 100644 --- a/lib/widgets/twake_components/twake_preview_link/twake_link_preview_item.dart +++ b/lib/widgets/twake_components/twake_preview_link/twake_link_preview_item.dart @@ -32,10 +32,8 @@ class TwakeLinkPreviewItem extends StatelessWidget { height: TwakeLinkPreviewItemStyle.maxHeightPreviewItem, decoration: ShapeDecoration( color: ownMessage - ? LinagoraRefColors.material().primary[95] - : LinagoraStateLayer( - LinagoraSysColors.material().surfaceTint, - ).opacityLayer1, + ? Theme.of(context).colorScheme.primaryContainer + : Theme.of(context).colorScheme.onSurface.withOpacity(0.08), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular( TwakeLinkPreviewItemStyle.radiusBorder,