diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart index dadb72736..9d7fac030 100644 --- a/lib/config/app_config.dart +++ b/lib/config/app_config.dart @@ -29,7 +29,7 @@ abstract class AppConfig { static const double toolbarButtonsColumnWidth = 50.0; static const double toolbarButtonAndProgressColumnHeight = 200.0; static const double defaultHeaderHeight = 56.0; - static const double defaultFooterHeight = 48.0; + static const double readingAssistanceInputBarHeight = 150; static const double toolbarSpacing = 8.0; static TextStyle messageTextStyle( Event? event, diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart index 3a379fb04..f90c37810 100644 --- a/lib/pages/chat/chat_input_row.dart +++ b/lib/pages/chat/chat_input_row.dart @@ -38,10 +38,7 @@ class ChatInputRow extends StatelessWidget { controller.emojiPickerType == EmojiPickerType.reaction) { return const SizedBox.shrink(); } - // #Pangea - // const height = 48.0; - const height = AppConfig.defaultFooterHeight; - // Pangea# + const height = 48.0; if (!controller.room.otherPartyCanReceiveMessages) { return Center( diff --git a/lib/pangea/toolbar/reading_assistance_input_row/reading_assistance_input_bar.dart b/lib/pangea/toolbar/reading_assistance_input_row/reading_assistance_input_bar.dart index 5c546126c..811051dc5 100644 --- a/lib/pangea/toolbar/reading_assistance_input_row/reading_assistance_input_bar.dart +++ b/lib/pangea/toolbar/reading_assistance_input_row/reading_assistance_input_bar.dart @@ -3,6 +3,7 @@ import 'dart:developer'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pangea/analytics_misc/message_analytics_controller.dart'; import 'package:fluffychat/pangea/analytics_misc/put_analytics_controller.dart'; @@ -16,8 +17,6 @@ import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/practice_act import 'package:fluffychat/pangea/toolbar/widgets/word_zoom/morphs/morphological_center_widget.dart'; import 'message_emoji_choice.dart'; -const double readingAssistanceInputBarHeight = 150; - class ReadingAssistanceInputBar extends StatelessWidget { final ChatController controller; final MessageOverlayController overlayController; @@ -159,7 +158,7 @@ class ReadingAssistanceInputBar extends StatelessWidget { return Flexible( child: Container( - height: readingAssistanceInputBarHeight, + height: AppConfig.readingAssistanceInputBarHeight, decoration: BoxDecoration( color: Theme.of(context).cardColor, borderRadius: const BorderRadius.all( diff --git a/lib/pangea/toolbar/widgets/message_selection_positioner.dart b/lib/pangea/toolbar/widgets/message_selection_positioner.dart index 19af97003..5377f0274 100644 --- a/lib/pangea/toolbar/widgets/message_selection_positioner.dart +++ b/lib/pangea/toolbar/widgets/message_selection_positioner.dart @@ -14,7 +14,6 @@ import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dar import 'package:fluffychat/pangea/events/extensions/pangea_event_extension.dart'; import 'package:fluffychat/pangea/events/models/pangea_token_model.dart'; import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/overlay_footer.dart'; -import 'package:fluffychat/pangea/toolbar/reading_assistance_input_row/reading_assistance_input_bar.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart'; import 'package:fluffychat/pangea/toolbar/widgets/overlay_center_content.dart'; import 'package:fluffychat/pangea/toolbar/widgets/overlay_header.dart'; @@ -294,11 +293,7 @@ class MessageSelectionPositionerState extends State } double get _footerHeight { - return ((widget.overlayController.pangeaMessageEvent - ?.messageDisplayLangIsL2 ?? - false) - ? readingAssistanceInputBarHeight - : AppConfig.defaultFooterHeight) + + return AppConfig.readingAssistanceInputBarHeight + (FluffyThemes.isColumnMode(context) ? 16.0 : 8.0) + (_mediaQuery?.padding.bottom ?? 0); }