Merge pull request #1302 from Kingtous/flutter_desktop

opt: optimize cm ui & prepare custom titlebar

flutter/lib/cm_main.dart

@@ -10,8 +10,8 @@ import 'desktop/pages/server_page.dart';
 void main(List<String> args) async {
   WidgetsFlutterBinding.ensureInitialized();
   await windowManager.ensureInitialized();
-  await initEnv(kAppTypeConnectionManager);
-  runApp(GetMaterialApp(theme: getCurrentTheme(), home: DesktopServerPage()));
   await windowManager.setSize(Size(400, 600));
   await windowManager.setAlignment(Alignment.topRight);
+  await initEnv(kAppTypeConnectionManager);
+  runApp(GetMaterialApp(theme: getCurrentTheme(), home: DesktopServerPage()));
 }

flutter/lib/common.dart

@@ -79,6 +79,15 @@ final ButtonStyle flatButtonStyle = TextButton.styleFrom(
   ),
 );
 
+String formatDurationToTime(Duration duration) {
+  var totalTime = duration.inSeconds;
+  final secs = totalTime % 60;
+  totalTime = (totalTime - secs) ~/ 60;
+  final mins = totalTime % 60;
+  totalTime = (totalTime - mins) ~/ 60;
+  return "${totalTime.toString().padLeft(2, "0")}:${mins.toString().padLeft(2, "0")}:${secs.toString().padLeft(2, "0")}";
+}
+
 closeConnection({String? id}) {
   if (isAndroid || isIOS) {
     Navigator.popUntil(globalKey.currentContext!, ModalRoute.withName("/"));
@@ -440,12 +449,18 @@ class PermissionManager {
   }
 
   static Future<bool> check(String type) {
+    if (isDesktop) {
+      return Future.value(true);
+    }
     if (!permissions.contains(type))
       return Future.error("Wrong permission!$type");
     return gFFI.invokeMethod("check_permission", type);
   }
 
   static Future<bool> request(String type) {
+    if (isDesktop) {
+      return Future.value(true);
+    }
     if (!permissions.contains(type))
       return Future.error("Wrong permission!$type");
 

flutter/lib/desktop/pages/server_page.dart

@@ -1,5 +1,8 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+
 // import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:provider/provider.dart';
 
@@ -136,9 +139,9 @@ class ConnectionManager extends StatelessWidget {
   Widget build(BuildContext context) {
     final serverModel = Provider.of<ServerModel>(context);
     // test case:
-    serverModel.clients.clear();
+    // serverModel.clients.clear();
-    serverModel.clients[0] = Client(
+    // serverModel.clients[0] = Client(
-        false, false, "Readmi-M21sdfsdf", "123123123", true, false, false);
+    //     false, false, "Readmi-M21sdfsdf", "123123123", true, false, false);
     return serverModel.clients.isEmpty
         ? Center(
             child: Text(translate("Waiting")),
@@ -170,9 +173,10 @@ class ConnectionManager extends StatelessWidget {
   Widget buildConnectionCard(MapEntry<int, Client> entry) {
     final client = entry.value;
     return Column(
+      key: ValueKey(entry.key),
       children: [
         _CmHeader(client: client),
-        _PrivilegeBoard(client: client),
+        client.isFileTransfer ? Offstage() : _PrivilegeBoard(client: client),
         Expanded(
             child: Align(
           alignment: Alignment.bottomCenter,
@@ -200,13 +204,39 @@ class ConnectionManager extends StatelessWidget {
   }
 }
 
-class _CmHeader extends StatelessWidget {
+class _CmHeader extends StatefulWidget {
   final Client client;
 
   const _CmHeader({Key? key, required this.client}) : super(key: key);
 
+  @override
+  State<_CmHeader> createState() => _CmHeaderState();
+}
+
+class _CmHeaderState extends State<_CmHeader>
+    with AutomaticKeepAliveClientMixin {
+  Client get client => widget.client;
+
+  var _time = 0.obs;
+  Timer? _timer;
+
+  @override
+  void initState() {
+    super.initState();
+    _timer = Timer.periodic(Duration(seconds: 1), (_) {
+      _time.value = _time.value + 1;
+    });
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -242,13 +272,13 @@ class _CmHeader extends StatelessWidget {
               SizedBox(
                 height: 16.0,
               ),
-              Offstage(
+              Row(
-                  offstage: !client.authorized,
-                  child: Row(
                 children: [
-                      Text("${translate("Connected")}"),
+                  Text("${translate("Connected")}").marginOnly(right: 8.0),
+                  Obx(() => Text(
+                      "${formatDurationToTime(Duration(seconds: _time.value))}"))
                 ],
-                  ))
+              )
             ],
           ),
         ),
@@ -264,6 +294,9 @@ class _CmHeader extends StatelessWidget {
   }
 
   void handleSendMsg() {}
+
+  @override
+  bool get wantKeepAlive => true;
 }
 
 class _PrivilegeBoard extends StatelessWidget {

flutter/lib/main.dart

@@ -117,9 +117,23 @@ void runFileTransferScreen(Map<String, dynamic> argument) async {
 }
 
 void runConnectionManagerScreen() async {
-  await initEnv(kAppTypeConnectionManager);
+  // initialize window
-  await windowManager.setSize(Size(400, 600));
+  WindowOptions windowOptions = WindowOptions(
+    size: Size(300, 400),
+    center: true,
+    backgroundColor: Colors.transparent,
+    skipTaskbar: false,
+    titleBarStyle: TitleBarStyle.normal,
+  );
+  await Future.wait([
+    initEnv(kAppTypeConnectionManager),
+    windowManager.waitUntilReadyToShow(windowOptions, () async {
       await windowManager.setAlignment(Alignment.topRight);
+      await windowManager.show();
+      await windowManager.focus();
+    })
+  ]);
+  ;
   runApp(GetMaterialApp(theme: getCurrentTheme(), home: DesktopServerPage()));
 }
 

flutter/lib/models/server_model.dart

@@ -342,6 +342,10 @@ class ServerModel with ChangeNotifier {
     var res = await bind.mainGetClientsState();
     try {
       final List clientsJson = jsonDecode(res);
+      if (isDesktop && clientsJson.isEmpty && _clients.isNotEmpty) {
+        // exit cm when >1 peers to no peers
+        exit(0);
+      }
       _clients.clear();
       for (var clientJson in clientsJson) {
         final client = Client.fromJson(clientJson);

flutter/linux/my_application.cc

@@ -1,7 +1,6 @@
 #include "my_application.h"
 
 #include <flutter_linux/flutter_linux.h>
-// #include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif

flutter/pubspec.yaml

@@ -66,7 +66,6 @@ dependencies:
         git:
             url: https://github.com/Kingtous/rustdesk_desktop_multi_window
             ref: 2b1176d53f195cc55e8d37151bb3d9f6bd52fad3
-    # bitsdojo_window: ^0.1.2
     freezed_annotation: ^2.0.3
     tray_manager: 0.1.7
     get: ^4.6.5