update flutter desktop, chat page (in remote page) style

flutter/lib/common/widgets/overlay.dart

@@ -1,15 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
 
+import '../../desktop/widgets/tabbar_widget.dart';
 import '../../mobile/pages/chat_page.dart';
 import '../../models/chat_model.dart';
 
 class DraggableChatWindow extends StatelessWidget {
-  DraggableChatWindow(
+  const DraggableChatWindow(
-      {this.position = Offset.zero,
+      {Key? key,
+      this.position = Offset.zero,
       required this.width,
       required this.height,
-      required this.chatModel});
+      required this.chatModel})
+      : super(key: key);
 
   final Offset position;
   final double width;
@@ -30,17 +33,27 @@ class DraggableChatWindow extends StatelessWidget {
                   resizeToAvoidBottomInset: false,
                   appBar: CustomAppBar(
                     onPanUpdate: onPanUpdate,
-                    appBar: Container(
+                    appBar: isDesktop
+                        ? _buildDesktopAppBar()
+                        : _buildMobileAppBar(),
+                  ),
+                  body: ChatPage(chatModel: chatModel),
+                );
+        });
+  }
+
+  Widget _buildMobileAppBar() {
+    return Container(
       color: MyTheme.accent50,
       height: 50,
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           Padding(
-                              padding: EdgeInsets.symmetric(horizontal: 15),
+              padding: const EdgeInsets.symmetric(horizontal: 15),
               child: Text(
                 translate("Chat"),
-                                style: TextStyle(
+                style: const TextStyle(
                     color: Colors.white,
                     fontFamily: 'WorkSans',
                     fontWeight: FontWeight.bold,
@@ -53,22 +66,50 @@ class DraggableChatWindow extends StatelessWidget {
                   onPressed: () {
                     chatModel.hideChatWindowOverlay();
                   },
-                                  icon: Icon(Icons.keyboard_arrow_down)),
+                  icon: const Icon(Icons.keyboard_arrow_down)),
               IconButton(
                   onPressed: () {
                     chatModel.hideChatWindowOverlay();
                     chatModel.hideChatIconOverlay();
                   },
-                                  icon: Icon(Icons.close))
+                  icon: const Icon(Icons.close))
+            ],
+          )
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDesktopAppBar() {
+    return Container(
+      color: MyTheme.accent50,
+      height: 35,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 15),
+              child: Text(
+                translate("Chat"),
+                style: const TextStyle(
+                    color: Colors.white,
+                    fontFamily: 'WorkSans',
+                    fontWeight: FontWeight.bold),
+              )),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              ActionIcon(
+                message: 'Close',
+                icon: IconFont.close,
+                onTap: chatModel.hideChatWindowOverlay,
+                isClose: true,
+              )
             ],
           )
         ],
       ),
-                    ),
-                  ),
-                  body: ChatPage(chatModel: chatModel),
     );
-        });
   }
 }
 
@@ -86,7 +127,7 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
   }
 
   @override
-  Size get preferredSize => new Size.fromHeight(kToolbarHeight);
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
 }
 
 /// floating buttons of back/home/recent actions for android
@@ -161,13 +202,15 @@ class DraggableMobileActions extends StatelessWidget {
 }
 
 class Draggable extends StatefulWidget {
-  Draggable(
+  const Draggable(
-      {this.checkKeyboard = false,
+      {Key? key,
+      this.checkKeyboard = false,
       this.checkScreenSize = false,
       this.position = Offset.zero,
       required this.width,
       required this.height,
-      required this.builder});
+      required this.builder})
+      : super(key: key);
 
   final bool checkKeyboard;
   final bool checkScreenSize;
@@ -224,7 +267,6 @@ class _DraggableState extends State<Draggable> {
     final bottomHeight = MediaQuery.of(context).viewInsets.bottom;
     final currentVisible = bottomHeight != 0;
 
-    debugPrint(bottomHeight.toString() + currentVisible.toString());
     // save
     if (!_keyboardVisible && currentVisible) {
       _saveHeight = _position.dy;

flutter/lib/models/chat_model.dart

@@ -128,7 +128,10 @@ class ChatModel with ChangeNotifier {
     if (overlayState == null) return;
     final overlay = OverlayEntry(builder: (context) {
       return DraggableChatWindow(
-          position: Offset(20, 80), width: 250, height: 350, chatModel: this);
+          position: const Offset(20, 80),
+          width: 250,
+          height: 350,
+          chatModel: this);
     });
     overlayState.insert(overlay);
     chatWindowOverlayEntry = overlay;