Merge pull request #4499 from 21pages/chatbox

Chatbox

flutter/lib/common.dart

@@ -526,6 +526,7 @@ String formatDurationToTime(Duration duration) {
 
 closeConnection({String? id}) {
   if (isAndroid || isIOS) {
+    gFFI.chatModel.hideChatOverlay();
     Navigator.popUntil(globalKey.currentContext!, ModalRoute.withName("/"));
   } else {
     final controller = Get.find<DesktopTabController>();

flutter/lib/common/widgets/chat_page.dart

@@ -47,7 +47,6 @@ class ChatPage extends StatelessWidget implements PageShape {
       value: chatModel,
       child: Container(
         color: Theme.of(context).scaffoldBackgroundColor,
-        padding: EdgeInsets.all(14.0),
         child: Consumer<ChatModel>(
           builder: (context, chatModel, child) {
             final currentUser = chatModel.currentUser;
@@ -76,13 +75,11 @@ class ChatPage extends StatelessWidget implements PageShape {
                             fontSize: 14,
                             color:
                                 Theme.of(context).textTheme.titleLarge?.color),
-                        inputDecoration: isDesktop
+                        inputDecoration: InputDecoration(
-                            ? InputDecoration(
                           isDense: true,
                           hintText: translate('Write a message'),
                           filled: true,
-                                fillColor:
+                          fillColor: Theme.of(context).colorScheme.background,
-                                    Theme.of(context).colorScheme.background,
                           contentPadding: EdgeInsets.all(10),
                           border: OutlineInputBorder(
                             borderRadius: BorderRadius.circular(10.0),
@@ -91,11 +88,6 @@ class ChatPage extends StatelessWidget implements PageShape {
                               style: BorderStyle.solid,
                             ),
                           ),
-                              )
-                            : defaultInputDecoration(
-                                hintText: translate('Write a message'),
-                                fillColor:
-                                    Theme.of(context).colorScheme.background,
                         ),
                         sendButtonBuilder: defaultSendButton(
                           padding:

flutter/lib/common/widgets/overlay.dart

@@ -71,13 +71,19 @@ class DraggableChatWindow extends StatelessWidget {
                   onPressed: () {
                     chatModel.hideChatWindowOverlay();
                   },
-                  icon: const Icon(Icons.keyboard_arrow_down)),
+                  icon: const Icon(
+                    Icons.keyboard_arrow_down,
+                    color: Colors.white,
+                  )),
               IconButton(
                   onPressed: () {
                     chatModel.hideChatWindowOverlay();
                     chatModel.hideChatIconOverlay();
                   },
-                  icon: const Icon(Icons.close))
+                  icon: const Icon(
+                    Icons.close,
+                    color: Colors.white,
+                  ))
             ],
           )
         ],

flutter/lib/models/chat_model.dart

@@ -7,7 +7,7 @@ import 'package:flutter_hbb/models/platform_model.dart';
 import 'package:get/get_rx/src/rx_types/rx_types.dart';
 import 'package:get/get.dart';
 import 'package:window_manager/window_manager.dart';
- import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 
 import '../consts.dart';
 import '../common.dart';
@@ -185,6 +185,13 @@ class ChatModel with ChangeNotifier {
     }
   }
 
+  hideChatOverlay() {
+    if (!_isChatOverlayHide()) {
+      hideChatIconOverlay();
+      hideChatWindowOverlay();
+    }
+  }
+
   showChatPage(int id) async {
     if (isConnManager) {
       if (!_isShowCMChatPage) {