From 9161a346ed654196e06c907680df3346c5eabe13 Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Mon, 7 Apr 2025 11:55:03 -0400 Subject: [PATCH] chore: constrain width of unsubscribed card (#2373) --- .../widgets/message_unsubscribed_card.dart | 6 ++- .../widgets/reading_assistance_content.dart | 47 ++++++++++--------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/lib/pangea/toolbar/widgets/message_unsubscribed_card.dart b/lib/pangea/toolbar/widgets/message_unsubscribed_card.dart index 496d164c7..506baf8a4 100644 --- a/lib/pangea/toolbar/widgets/message_unsubscribed_card.dart +++ b/lib/pangea/toolbar/widgets/message_unsubscribed_card.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/bot/utils/bot_style.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart'; import 'package:fluffychat/widgets/matrix.dart'; @@ -19,7 +20,10 @@ class MessageUnsubscribedCard extends StatelessWidget { final bool inTrialWindow = MatrixState.pangeaController.userController.inTrialWindow(); - return Padding( + return Container( + constraints: const BoxConstraints( + maxWidth: AppConfig.toolbarMinWidth, + ), padding: const EdgeInsets.all(16), child: Column( children: [ diff --git a/lib/pangea/toolbar/widgets/reading_assistance_content.dart b/lib/pangea/toolbar/widgets/reading_assistance_content.dart index a74c43c06..b672b2ec3 100644 --- a/lib/pangea/toolbar/widgets/reading_assistance_content.dart +++ b/lib/pangea/toolbar/widgets/reading_assistance_content.dart @@ -135,29 +135,32 @@ class ReadingAssistanceContentState extends State { return const SizedBox(); } - return SelectionArea( - child: Container( - decoration: BoxDecoration( - color: Theme.of(context).cardColor, - borderRadius: const BorderRadius.all( - Radius.circular(AppConfig.borderRadius), - ), - ), - constraints: const BoxConstraints( - maxHeight: AppConfig.toolbarMaxHeight, - minWidth: AppConfig.toolbarMinWidth, - minHeight: AppConfig.toolbarMinHeight, - // maxWidth is set by MessageSelectionOverlay - ), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - AnimatedSize( - duration: widget.animationDuration, - child: toolbarContent(context), + return Material( + type: MaterialType.transparency, + child: SelectionArea( + child: Container( + decoration: BoxDecoration( + color: Theme.of(context).cardColor, + borderRadius: const BorderRadius.all( + Radius.circular(AppConfig.borderRadius), ), - ], + ), + constraints: BoxConstraints( + maxHeight: AppConfig.toolbarMaxHeight, + minWidth: AppConfig.toolbarMinWidth, + minHeight: AppConfig.toolbarMinHeight, + maxWidth: widget.overlayController.maxWidth, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + AnimatedSize( + duration: widget.animationDuration, + child: toolbarContent(context), + ), + ], + ), ), ), );