refact: init values from initState to Constractor (#8817)

* refact: init values from initState to Constractor Signed-off-by: dignow <linlong1265@gmail.com> * fix: move RxBool init into Constructor Signed-off-by: dignow <linlong1265@gmail.com> * peer sort option Signed-off-by: dignow <linlong1265@gmail.com> * Remove empty initState() Signed-off-by: dignow <linlong1265@gmail.com> --------- Signed-off-by: dignow <linlong1265@gmail.com>
2026-04-15 09:31:28 +03:00 · 2024-07-25 10:45:51 +08:00
parent 2aef79688b
commit b967d496cc
24 changed files with 120 additions and 174 deletions
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@@ -212,14 +212,14 @@ class _ConnectionPageState extends State<ConnectionPage>
  void initState() {
    super.initState();
    if (_idController.text.isEmpty) {
-      () async {
+      WidgetsBinding.instance.addPostFrameCallback((_) async {
        final lastRemoteId = await bind.mainGetLastRemoteId();
        if (lastRemoteId != _idController.id) {
          setState(() {
            _idController.id = lastRemoteId;
          });
        }
-      }();
+      });
    }
    Get.put<IDTextEditingController>(_idController);
    windowManager.addListener(this);
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -78,7 +78,8 @@ class DesktopSettingPage extends StatefulWidget {
  DesktopSettingPage({Key? key, required this.initialTabkey}) : super(key: key);

  @override
-  State<DesktopSettingPage> createState() => _DesktopSettingPageState();
+  State<DesktopSettingPage> createState() =>
+      _DesktopSettingPageState(initialTabkey);

  static void switch2page(SettingsTabKey page) {
    try {
@@ -111,10 +112,8 @@ class _DesktopSettingPageState extends State<DesktopSettingPage>
  @override
  bool get wantKeepAlive => true;

-  @override
-  void initState() {
-    super.initState();
-    var initialIndex = DesktopSettingPage.tabKeys.indexOf(widget.initialTabkey);
+  _DesktopSettingPageState(SettingsTabKey initialTabkey) {
+    var initialIndex = DesktopSettingPage.tabKeys.indexOf(initialTabkey);
    if (initialIndex == -1) {
      initialIndex = 0;
    }
--- a/flutter/lib/desktop/pages/desktop_tab_page.dart
+++ b/flutter/lib/desktop/pages/desktop_tab_page.dart
@@ -44,21 +44,9 @@ class _DesktopTabPageState extends State<DesktopTabPage>
  final RxBool _block = false.obs;
  // bool mouseIn = false;

-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    super.didChangeAppLifecycleState(state);
-    if (state == AppLifecycleState.resumed) {
-      shouldBeBlocked(_block, canBeBlocked);
-    } else if (state == AppLifecycleState.inactive) {}
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    // HardwareKeyboard.instance.addHandler(_handleKeyEvent);
-    WidgetsBinding.instance.addObserver(this);
-    Get.put<DesktopTabController>(tabController);
+  _DesktopTabPageState() {
    RemoteCountState.init();
+    Get.put<DesktopTabController>(tabController);
    tabController.add(TabInfo(
        key: kTabLabelHomePage,
        label: kTabLabelHomePage,
@@ -81,6 +69,21 @@ class _DesktopTabPageState extends State<DesktopTabPage>
    }
  }

+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    if (state == AppLifecycleState.resumed) {
+      shouldBeBlocked(_block, canBeBlocked);
+    } else if (state == AppLifecycleState.inactive) {}
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    // HardwareKeyboard.instance.addHandler(_handleKeyEvent);
+    WidgetsBinding.instance.addObserver(this);
+  }
+
  /*
  bool _handleKeyEvent(KeyEvent event) {
    if (!mouseIn && event is KeyDownEvent) {
--- a/flutter/lib/desktop/pages/file_manager_tab_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart
@@ -34,6 +34,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
      WindowController.fromWindowId(windowId())
          .setTitle(getWindowNameWithId(id));
    };
+    tabController.onRemoved = (_, id) => onRemoveId(id);
    tabController.add(TabInfo(
        key: params['id'],
        label: params['id'],
@@ -54,8 +55,6 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
  void initState() {
    super.initState();

-    tabController.onRemoved = (_, id) => onRemoveId(id);
-
    rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
      print(
          "[FileTransfer] call ${call.method} with args ${call.arguments} from window $fromWindowId to ${windowId()}");
--- a/flutter/lib/desktop/pages/install_page.dart
+++ b/flutter/lib/desktop/pages/install_page.dart
@@ -19,9 +19,7 @@ class InstallPage extends StatefulWidget {
 class _InstallPageState extends State<InstallPage> {
  final tabController = DesktopTabController(tabType: DesktopTabType.main);

-  @override
-  void initState() {
-    super.initState();
+  _InstallPageState() {
    Get.put<DesktopTabController>(tabController);
    const label = "install";
    tabController.add(TabInfo(
@@ -73,10 +71,13 @@ class _InstallPageBodyState extends State<_InstallPageBody>
    padding: EdgeInsets.symmetric(vertical: 15, horizontal: 12),
  );

+  _InstallPageBodyState() {
+    controller = TextEditingController(text: bind.installInstallPath());
+  }
+
  @override
  void initState() {
    windowManager.addListener(this);
-    controller = TextEditingController(text: bind.installInstallPath());
    super.initState();
  }

--- a/flutter/lib/desktop/pages/port_forward_tab_page.dart
+++ b/flutter/lib/desktop/pages/port_forward_tab_page.dart
@@ -34,6 +34,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
      WindowController.fromWindowId(windowId())
          .setTitle(getWindowNameWithId(id));
    };
+    tabController.onRemoved = (_, id) => onRemoveId(id);
    tabController.add(TabInfo(
        key: params['id'],
        label: params['id'],
@@ -54,8 +55,6 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
  void initState() {
    super.initState();

-    tabController.onRemoved = (_, id) => onRemoveId(id);
-
    rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
      debugPrint(
          "[Port Forward] call ${call.method} with args ${call.arguments} from window $fromWindowId");
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@@ -64,7 +64,7 @@ class RemotePage extends StatefulWidget {

  @override
  State<RemotePage> createState() {
-    final state = _RemotePageState();
+    final state = _RemotePageState(id);
    _lastState.value = state;
    return state;
  }
@@ -94,6 +94,10 @@ class _RemotePageState extends State<RemotePage>

  SessionID get sessionId => _ffi.sessionId;

+  _RemotePageState(String id) {
+    _initStates(id);
+  }
+
  void _initStates(String id) {
    initSharedStates(id);
    _zoomCursor = PeerBoolOption.find(id, kOptionZoomCursor);
@@ -105,7 +109,6 @@ class _RemotePageState extends State<RemotePage>
  @override
  void initState() {
    super.initState();
-    _initStates(widget.id);
    _ffi = FFI(widget.sessionId);
    Get.put<FFI>(_ffi, tag: widget.id);
    _ffi.imageModel.addCallbackOnFirstImage((String peerId) {
@@ -570,11 +573,6 @@ class _ImagePaintState extends State<ImagePaint> {
  RxBool get remoteCursorMoved => widget.remoteCursorMoved;
  Widget Function(Widget)? get listenerBuilder => widget.listenerBuilder;

-  @override
-  void initState() {
-    super.initState();
-  }
-
  @override
  Widget build(BuildContext context) {
    final m = Provider.of<ImageModel>(context);
--- a/flutter/lib/desktop/pages/remote_tab_page.dart
+++ b/flutter/lib/desktop/pages/remote_tab_page.dart
@@ -71,7 +71,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
          final ffi = remotePage.ffi;
          bind.setCurSessionId(sessionId: ffi.sessionId);
        }
-        WindowController.fromWindowId(windowId())
+        WindowController.fromWindowId(params['windowId'])
            .setTitle(getWindowNameWithId(id));
        UnreadChatCountState.find(id).value = 0;
      };
@@ -98,15 +98,14 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
      ));
      _update_remote_count();
    }
+    tabController.onRemoved = (_, id) => onRemoveId(id);
+    rustDeskWinManager.setMethodHandler(_remoteMethodHandler);
  }

  @override
  void initState() {
    super.initState();

-    tabController.onRemoved = (_, id) => onRemoveId(id);
-
-    rustDeskWinManager.setMethodHandler(_remoteMethodHandler);
    if (!_isScreenRectSet) {
      Future.delayed(Duration.zero, () {
        restoreWindowPosition(
@@ -121,11 +120,6 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
    }
  }

-  @override
-  void dispose() {
-    super.dispose();
-  }
-
  @override
  Widget build(BuildContext context) {
    final child = Scaffold(
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -32,14 +32,18 @@ class DesktopServerPage extends StatefulWidget {
 class _DesktopServerPageState extends State<DesktopServerPage>
    with WindowListener, AutomaticKeepAliveClientMixin {
  final tabController = gFFI.serverModel.tabController;
-  @override
-  void initState() {
+
+  _DesktopServerPageState() {
    gFFI.ffiModel.updateEventListener(gFFI.sessionId, "");
-    windowManager.addListener(this);
    Get.put<DesktopTabController>(tabController);
    tabController.onRemoved = (_, id) {
      onRemoveId(id);
    };
+  }
+
+  @override
+  void initState() {
+    windowManager.addListener(this);
    super.initState();
  }

@@ -108,19 +112,7 @@ class ConnectionManagerState extends State<ConnectionManager>
    with WidgetsBindingObserver {
  final RxBool _block = false.obs;

-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    super.didChangeAppLifecycleState(state);
-    if (state == AppLifecycleState.resumed) {
-      if (!allowRemoteCMModification()) {
-        shouldBeBlocked(_block, null);
-      }
-    }
-  }
-
-  @override
-  void initState() {
-    gFFI.serverModel.updateClientState();
+  ConnectionManagerState() {
    gFFI.serverModel.tabController.onSelected = (client_id_str) {
      final client_id = int.tryParse(client_id_str);
      if (client_id != null) {
@@ -140,6 +132,21 @@ class ConnectionManagerState extends State<ConnectionManager>
      }
    };
    gFFI.chatModel.isConnManager = true;
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    if (state == AppLifecycleState.resumed) {
+      if (!allowRemoteCMModification()) {
+        shouldBeBlocked(_block, null);
+      }
+    }
+  }
+
+  @override
+  void initState() {
+    gFFI.serverModel.updateClientState();
    WidgetsBinding.instance.addObserver(this);
    super.initState();
  }
--- a/flutter/lib/desktop/widgets/popup_menu.dart
+++ b/flutter/lib/desktop/widgets/popup_menu.dart
@@ -38,24 +38,16 @@ class PopupMenuChildrenItem<T> extends mod_menu.PopupMenuEntry<T> {

  @override
  MyPopupMenuItemState<T, PopupMenuChildrenItem<T>> createState() =>
-      MyPopupMenuItemState<T, PopupMenuChildrenItem<T>>();
+      MyPopupMenuItemState<T, PopupMenuChildrenItem<T>>(enabled?.value);
 }

 class MyPopupMenuItemState<T, W extends PopupMenuChildrenItem<T>>
    extends State<W> {
  RxBool enabled = true.obs;

-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _initEnabled();
-    });
-  }
-
-  Future<void> _initEnabled() async {
-    if (widget.enabled != null) {
-      enabled.value = widget.enabled!.value;
+  MyPopupMenuItemState(bool? e) {
+    if (e != null) {
+      enabled.value = e;
    }
  }

--- a/flutter/lib/desktop/widgets/remote_toolbar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -1032,11 +1032,6 @@ class _DisplayMenuState extends State<_DisplayMenu> {
  FFI get ffi => widget.ffi;
  String get id => widget.id;

-  @override
-  void initState() {
-    super.initState();
-  }
-
  @override
  Widget build(BuildContext context) {
    _screenAdjustor.updateScreen();
--- a/flutter/lib/desktop/widgets/tabbar_widget.dart
+++ b/flutter/lib/desktop/widgets/tabbar_widget.dart
@@ -227,8 +227,7 @@ typedef TabMenuBuilder = Widget Function(String key);
 typedef LabelGetter = Rx<String> Function(String key);

 /// [_lastClickTime], help to handle double click
-int _lastClickTime =
-    DateTime.now().millisecondsSinceEpoch - bind.getDoubleClickTime() - 1000;
+int _lastClickTime = 0;

 class DesktopTab extends StatefulWidget {
  final bool showLogo;
@@ -727,16 +726,6 @@ class WindowActionPanel extends StatefulWidget {
 }

 class WindowActionPanelState extends State<WindowActionPanel> {
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
  bool showTabDowndown() {
    return widget.tabController.state.value.tabs.length > 1 &&
        (widget.tabController.tabType == DesktopTabType.remoteScreen ||
@@ -1273,14 +1262,6 @@ class ActionIcon extends StatefulWidget {
 class _ActionIconState extends State<ActionIcon> {
  final hover = false.obs;

-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      hover.value = false;
-    });
-  }
-
  @override
  Widget build(BuildContext context) {
    return Tooltip(