more layout cleanup

lib/chat/views/chat_component_widget.dart

@@ -192,11 +192,7 @@ class ChatComponentWidget extends StatelessWidget {
       chatComponentCubit.scrollOffset = 0;
     }
 
-    return Align(
+    return Column(
-      alignment: AlignmentDirectional.centerEnd,
-      child: Stack(
-        children: [
-          Column(
       children: [
         Container(
           height: 48,
@@ -207,26 +203,23 @@ class ChatComponentWidget extends StatelessWidget {
             Align(
                 alignment: AlignmentDirectional.centerStart,
                 child: Padding(
-                        padding:
+                  padding: const EdgeInsetsDirectional.fromSTEB(16, 0, 16, 0),
-                            const EdgeInsetsDirectional.fromSTEB(16, 0, 16, 0),
                   child: Text(title,
                       textAlign: TextAlign.start,
-                            style: textTheme.titleMedium!.copyWith(
+                      style: textTheme.titleMedium!
-                                color: scale.primaryScale.borderText)),
+                          .copyWith(color: scale.primaryScale.borderText)),
                 )),
             const Spacer(),
             IconButton(
-                      icon: Icon(Icons.close,
+                icon: Icon(Icons.close, color: scale.primaryScale.borderText),
-                          color: scale.primaryScale.borderText),
                 onPressed: () async {
                   context.read<ActiveChatCubit>().setActiveChat(null);
                 }).paddingLTRB(16, 0, 16, 0)
           ]),
         ),
-              Expanded(
+        DecoratedBox(
-                child: DecoratedBox(
+            decoration:
-                    decoration: BoxDecoration(
+                BoxDecoration(color: scale.primaryScale.subtleBackground),
-                        color: scale.primaryScale.subtleBackground),
             child: NotificationListener<ScrollNotification>(
                 onNotification: (notification) {
                   if (chatComponentCubit.scrollOffset != 0) {
@@ -236,13 +229,11 @@ class ChatComponentWidget extends StatelessWidget {
                   if (!isFirstPage &&
                       notification.metrics.pixels <=
                           ((notification.metrics.maxScrollExtent -
-                                              notification
+                                      notification.metrics.minScrollExtent) *
-                                                  .metrics.minScrollExtent) *
                                   (1.0 - onEndReachedThreshold) +
                               notification.metrics.minScrollExtent)) {
                     //
-                            final scrollOffset =
+                    final scrollOffset = (notification.metrics.maxScrollExtent -
-                                (notification.metrics.maxScrollExtent -
                             notification.metrics.minScrollExtent) *
                         (1.0 - onEndReachedThreshold);
 
@@ -250,14 +241,13 @@ class ChatComponentWidget extends StatelessWidget {
 
                     //
                     singleFuture(chatComponentState.chatKey, () async {
-                              await _handlePageForward(chatComponentCubit,
+                      await _handlePageForward(
-                                  messageWindow, notification);
+                          chatComponentCubit, messageWindow, notification);
                     });
                   } else if (!isLastPage &&
                       notification.metrics.pixels >=
                           ((notification.metrics.maxScrollExtent -
-                                              notification
+                                      notification.metrics.minScrollExtent) *
-                                                  .metrics.minScrollExtent) *
                                   onEndReachedThreshold +
                               notification.metrics.minScrollExtent)) {
                     //
@@ -269,26 +259,23 @@ class ChatComponentWidget extends StatelessWidget {
                     chatComponentCubit.scrollOffset = scrollOffset;
                     //
                     singleFuture(chatComponentState.chatKey, () async {
-                              await _handlePageBackward(chatComponentCubit,
+                      await _handlePageBackward(
-                                  messageWindow, notification);
+                          chatComponentCubit, messageWindow, notification);
                     });
                   }
                   return false;
                 },
                 child: ValueListenableBuilder(
-                            valueListenable:
+                    valueListenable: chatComponentState.textEditingController,
-                                chatComponentState.textEditingController,
                     builder: (context, textEditingValue, __) {
-                              final messageIsValid = utf8
+                      final messageIsValid =
-                                      .encode(textEditingValue.text)
+                          utf8.encode(textEditingValue.text).lengthInBytes <
-                                      .lengthInBytes <
                               2048;
 
                       return Chat(
                               key: chatComponentState.chatKey,
-                                      theme: messageIsValid
+                              theme:
-                                          ? chatTheme
+                                  messageIsValid ? chatTheme : errorChatTheme,
-                                          : errorChatTheme,
                               messages: messageWindow.window.toList(),
                               scrollToBottomOnSend: isFirstPage,
                               scrollController:
@@ -298,8 +285,7 @@ class ChatComponentWidget extends StatelessWidget {
                                       ? InputClearMode.always
                                       : InputClearMode.never,
                                   textEditingController:
-                                              chatComponentState
+                                      chatComponentState.textEditingController),
-                                                  .textEditingController),
                               // isLastPage: isLastPage,
                               // onEndReached: () async {
                               //   await _handlePageBackward(
@@ -312,41 +298,29 @@ class ChatComponentWidget extends StatelessWidget {
                               onSendPressed: (pt) {
                                 try {
                                   if (!messageIsValid) {
-                                            showErrorToast(
+                                    showErrorToast(context,
-                                                context,
+                                        translate('chat.message_too_long'));
-                                                translate(
-                                                    'chat.message_too_long'));
                                     return;
                                   }
-                                          _handleSendPressed(
+                                  _handleSendPressed(chatComponentCubit, pt);
-                                              chatComponentCubit, pt);
                                 } on FormatException {
-                                          showErrorToast(
+                                  showErrorToast(context,
-                                              context,
+                                      translate('chat.message_too_long'));
-                                              translate(
-                                                  'chat.message_too_long'));
                                 }
                               },
                               listBottomWidget: messageIsValid
                                   ? null
-                                          : Text(
+                                  : Text(translate('chat.message_too_long'),
-                                                  translate(
-                                                      'chat.message_too_long'),
                                           style: TextStyle(
-                                                      color: scale
+                                              color: scale.errorScale.primary))
-                                                          .errorScale.primary))
                                       .toCenter(),
                               //showUserAvatars: false,
                               //showUserNames: true,
                               user: localUser,
                               emptyState: const EmptyChatWidget())
                           .paddingLTRB(0, 2, 0, 0);
-                            }))),
+                    }))).expanded(),
-              ),
       ],
-          ),
-        ],
-      ),
     );
   }
 }

lib/chat/views/no_conversation_widget.dart

@@ -19,6 +19,7 @@ class NoConversationWidget extends StatelessWidget {
         color: scale.primaryScale.appBackground,
       ),
       child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
           Icon(

lib/layout/home/home.dart

@@ -2,6 +2,6 @@ export 'drawer_menu/drawer_menu.dart';
 export 'home_account_invalid.dart';
 export 'home_account_locked.dart';
 export 'home_account_missing.dart';
-export 'home_account_ready/home_account_ready.dart';
+export 'home_account_ready.dart';
 export 'home_no_active.dart';
 export 'home_screen.dart';

lib/layout/home/home_account_ready.dart

@@ -4,20 +4,20 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_translate/flutter_translate.dart';
 import 'package:flutter_zoom_drawer/flutter_zoom_drawer.dart';
 
-import '../../../account_manager/account_manager.dart';
+import '../../account_manager/account_manager.dart';
-import '../../../chat/chat.dart';
+import '../../chat/chat.dart';
-import '../../../proto/proto.dart' as proto;
+import '../../proto/proto.dart' as proto;
-import '../../../theme/theme.dart';
+import '../../theme/theme.dart';
 import 'main_pager/main_pager.dart';
 
-class HomeAccountReadyMain extends StatefulWidget {
+class HomeAccountReady extends StatefulWidget {
-  const HomeAccountReadyMain({super.key});
+  const HomeAccountReady({super.key});
 
   @override
-  State<HomeAccountReadyMain> createState() => _HomeAccountReadyMainState();
+  State<HomeAccountReady> createState() => _HomeAccountReadyState();
 }
 
-class _HomeAccountReadyMainState extends State<HomeAccountReadyMain> {
+class _HomeAccountReadyState extends State<HomeAccountReady> {
   @override
   void initState() {
     super.initState();
@@ -98,7 +98,6 @@ class _HomeAccountReadyMainState extends State<HomeAccountReadyMain> {
       phone: false,
     );
 
-    final w = MediaQuery.of(context).size.width;
     final theme = Theme.of(context);
     final scale = theme.extension<ScaleScheme>()!;
     final scaleConfig = theme.extension<ScaleConfig>()!;
@@ -111,36 +110,40 @@ class _HomeAccountReadyMainState extends State<HomeAccountReadyMain> {
     //   _chatAnimationController.reset();
     // }
 
-    late final bool offstageLeft;
+    return LayoutBuilder(builder: (context, constraints) {
-    late final bool offstageRight;
+      const leftColumnSize = 300.0;
+
+      late final bool visibleLeft;
+      late final bool visibleRight;
       late final double leftWidth;
       late final double rightWidth;
       if (isLarge) {
-      leftWidth = 300;
+        visibleLeft = true;
-      rightWidth = w - 300 - 2;
+        visibleRight = true;
-      offstageLeft = false;
+        leftWidth = leftColumnSize;
-      offstageRight = false;
+        rightWidth = constraints.maxWidth - leftColumnSize - 2;
       } else {
-      leftWidth = w;
-      rightWidth = w;
         if (hasActiveChat) {
-        offstageLeft = true;
+          visibleLeft = false;
-        offstageRight = false;
+          visibleRight = true;
+          leftWidth = leftColumnSize;
+          rightWidth = constraints.maxWidth;
         } else {
-        offstageLeft = false;
+          visibleLeft = true;
-        offstageRight = true;
+          visibleRight = false;
+          leftWidth = constraints.maxWidth;
+          rightWidth = 400; // whatever
         }
       }
 
       return Row(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
         Offstage(
-          offstage: offstageLeft,
+            offstage: !visibleLeft,
             child: ConstrainedBox(
-              constraints:
+                constraints: BoxConstraints(maxWidth: leftWidth),
-                  BoxConstraints(minWidth: leftWidth, maxWidth: leftWidth),
                 child: buildLeftPane(context))),
         Offstage(
-          offstage: offstageLeft || offstageRight,
+            offstage: !(visibleLeft && visibleRight),
             child: SizedBox(
                 width: 2,
                 height: double.infinity,
@@ -149,13 +152,14 @@ class _HomeAccountReadyMainState extends State<HomeAccountReadyMain> {
                         ? scale.primaryScale.subtleBorder
                         : scale.primaryScale.subtleBackground))),
         Offstage(
-          offstage: offstageRight,
+            offstage: !visibleRight,
             child: ConstrainedBox(
-            constraints:
+              constraints: BoxConstraints(
-                BoxConstraints(minWidth: rightWidth, maxWidth: rightWidth),
+                  maxHeight: constraints.maxHeight, maxWidth: rightWidth),
               child: buildRightPane(context),
             )),
       ]);
+    });
   }
 
   ////////////////////////////////////////////////////////////////////////////

lib/layout/home/home_account_ready/home_account_ready.dart

@@ -1,2 +0,0 @@
-export 'home_account_ready_chat.dart';
-export 'home_account_ready_main.dart';

lib/layout/home/home_account_ready/home_account_ready_chat.dart

@@ -1,40 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../../chat/chat.dart';
-
-class HomeAccountReadyChat extends StatefulWidget {
-  const HomeAccountReadyChat({super.key});
-
-  @override
-  HomeAccountReadyChatState createState() => HomeAccountReadyChatState();
-}
-
-class HomeAccountReadyChatState extends State<HomeAccountReadyChat> {
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  Widget buildChatComponent(BuildContext context) {
-    final activeChatLocalConversationKey =
-        context.watch<ActiveChatCubit>().state;
-    if (activeChatLocalConversationKey == null) {
-      return const NoConversationWidget();
-    }
-    return ChatComponentWidget.builder(
-        localConversationRecordKey: activeChatLocalConversationKey,
-        key: ValueKey(activeChatLocalConversationKey));
-  }
-
-  @override
-  Widget build(BuildContext context) => SafeArea(
-        bottom: false,
-        child: buildChatComponent(context),
-      );
-}

lib/layout/home/home_screen.dart

@@ -13,7 +13,7 @@ import 'drawer_menu/drawer_menu.dart';
 import 'home_account_invalid.dart';
 import 'home_account_locked.dart';
 import 'home_account_missing.dart';
-import 'home_account_ready/home_account_ready.dart';
+import 'home_account_ready.dart';
 import 'home_no_active.dart';
 
 class HomeScreen extends StatefulWidget {
@@ -64,7 +64,7 @@ class HomeScreenState extends State<HomeScreen>
 
         // Re-export all ready blocs to the account display subtree
         return perAccountCollectionState.provide(
-            child: const HomeAccountReadyMain());
+            child: const HomeAccountReady());
     }
   }
 

lib/layout/home/main_pager/account_page.dart

@@ -4,9 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_translate/flutter_translate.dart';
 
-import '../../../../contact_invitation/contact_invitation.dart';
+import '../../../contact_invitation/contact_invitation.dart';
-import '../../../../contacts/contacts.dart';
+import '../../../contacts/contacts.dart';
-import '../../../../theme/theme.dart';
+import '../../../theme/theme.dart';
 
 class AccountPage extends StatefulWidget {
   const AccountPage({

lib/layout/home/main_pager/chats_page.dart

@@ -1,7 +1,7 @@
 import 'package:awesome_extensions/awesome_extensions.dart';
 import 'package:flutter/material.dart';
 
-import '../../../../chat_list/chat_list.dart';
+import '../../../chat_list/chat_list.dart';
 
 class ChatsPage extends StatefulWidget {
   const ChatsPage({super.key});

lib/layout/home/main_pager/main_pager.dart

@@ -10,9 +10,9 @@ import 'package:flutter_translate/flutter_translate.dart';
 import 'package:preload_page_view/preload_page_view.dart';
 import 'package:provider/provider.dart';
 
-import '../../../../chat/chat.dart';
+import '../../../chat/chat.dart';
-import '../../../../contact_invitation/contact_invitation.dart';
+import '../../../contact_invitation/contact_invitation.dart';
-import '../../../../theme/theme.dart';
+import '../../../theme/theme.dart';
 import 'account_page.dart';
 import 'bottom_sheet_action_button.dart';
 import 'chats_page.dart';

lib/layout/layout.dart

@@ -1,4 +1,4 @@
 export 'default_app_bar.dart';
 export 'home/home.dart';
-export 'home/home_account_ready/main_pager/main_pager.dart';
+export 'home/main_pager/main_pager.dart';
 export 'splash.dart';