restore jobTable state mode

flutter/lib/desktop/pages/file_manager_page.dart

@@ -157,35 +157,7 @@ class _FileManagerPageState extends State<FileManagerPage>
   /// transfer status list
   /// watch transfer status
   Widget statusList() {
-    return PreferredSize(
+    statusListView() => Obx(() => ListView.builder(
-      preferredSize: const Size(200, double.infinity),
-      child: Container(
-        margin: const EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-        padding: const EdgeInsets.all(8.0),
-        child: jobController.jobTable.isEmpty
-            ? generateCard(
-                Center(
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      SvgPicture.asset(
-                        "assets/transfer.svg",
-                        color: Theme.of(context).tabBarTheme.labelColor,
-                        height: 40,
-                      ).paddingOnly(bottom: 10),
-                      Text(
-                        translate("No transfers in progress"),
-                        textAlign: TextAlign.center,
-                        textScaleFactor: 1.20,
-                        style: TextStyle(
-                            color: Theme.of(context).tabBarTheme.labelColor),
-                      ),
-                    ],
-                  ),
-                ),
-              )
-            : Obx(
-                () => ListView.builder(
           controller: ScrollController(),
           itemBuilder: (BuildContext context, int index) {
             final item = jobController.jobTable[index];
@@ -202,9 +174,7 @@ class _FileManagerPageState extends State<FileManagerPage>
                           angle: item.isRemoteToLocal ? pi : 0,
                           child: SvgPicture.asset(
                             "assets/arrow.svg",
-                                    color: Theme.of(context)
+                            color: Theme.of(context).tabBarTheme.labelColor,
-                                        .tabBarTheme
-                                        .labelColor,
                           ),
                         ).paddingOnly(left: 15),
                         const SizedBox(
@@ -213,12 +183,10 @@ class _FileManagerPageState extends State<FileManagerPage>
                         Expanded(
                           child: Column(
                             mainAxisSize: MainAxisSize.min,
-                                    crossAxisAlignment:
+                            crossAxisAlignment: CrossAxisAlignment.start,
-                                        CrossAxisAlignment.start,
                             children: [
                               Tooltip(
-                                        waitDuration:
+                                waitDuration: Duration(milliseconds: 500),
-                                            Duration(milliseconds: 500),
                                 message: item.jobName,
                                 child: Text(
                                   item.fileName,
@@ -234,8 +202,7 @@ class _FileManagerPageState extends State<FileManagerPage>
                                 ),
                               ),
                               Offstage(
-                                        offstage:
+                                offstage: item.state != JobState.inProgress,
-                                            item.state != JobState.inProgress,
                                 child: Text(
                                   '${translate("Speed")} ${readableFileSize(item.speed)}/s',
                                   style: TextStyle(
@@ -245,8 +212,7 @@ class _FileManagerPageState extends State<FileManagerPage>
                                 ),
                               ),
                               Offstage(
-                                        offstage:
+                                offstage: item.state == JobState.inProgress,
-                                            item.state == JobState.inProgress,
                                 child: Text(
                                   translate(
                                     item.display(),
@@ -258,8 +224,7 @@ class _FileManagerPageState extends State<FileManagerPage>
                                 ),
                               ),
                               Offstage(
-                                        offstage:
+                                offstage: item.state != JobState.inProgress,
-                                            item.state != JobState.inProgress,
                                 child: LinearPercentIndicator(
                                   padding: EdgeInsets.only(right: 15),
                                   animateFromLastPercent: true,
@@ -267,13 +232,10 @@ class _FileManagerPageState extends State<FileManagerPage>
                                     '${(item.finishedSize / item.totalSize * 100).toStringAsFixed(0)}%',
                                   ),
                                   barRadius: Radius.circular(15),
-                                          percent: item.finishedSize /
+                                  percent: item.finishedSize / item.totalSize,
-                                              item.totalSize,
                                   progressColor: MyTheme.accent,
-                                          backgroundColor:
+                                  backgroundColor: Theme.of(context).hoverColor,
-                                              Theme.of(context).hoverColor,
+                                  lineHeight: kDesktopFileTransferRowHeight,
-                                          lineHeight:
-                                              kDesktopFileTransferRowHeight,
                                 ).paddingSymmetric(vertical: 15),
                               ),
                             ],
@@ -319,9 +281,39 @@ class _FileManagerPageState extends State<FileManagerPage>
             );
           },
           itemCount: jobController.jobTable.length,
+        ));
+
+    return PreferredSize(
+      preferredSize: const Size(200, double.infinity),
+      child: Container(
+          margin: const EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
+          padding: const EdgeInsets.all(8.0),
+          child: Obx(
+            () => jobController.jobTable.isEmpty
+                ? generateCard(
+                    Center(
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          SvgPicture.asset(
+                            "assets/transfer.svg",
+                            color: Theme.of(context).tabBarTheme.labelColor,
+                            height: 40,
+                          ).paddingOnly(bottom: 10),
+                          Text(
+                            translate("No transfers in progress"),
+                            textAlign: TextAlign.center,
+                            textScaleFactor: 1.20,
+                            style: TextStyle(
+                                color:
+                                    Theme.of(context).tabBarTheme.labelColor),
+                          ),
+                        ],
                       ),
                     ),
-      ),
+                  )
+                : statusListView(),
+          )),
     );
   }
 
@@ -418,8 +410,7 @@ class _FileManagerViewState extends State<FileManagerView> {
                   },
                   onExit: (evt) =>
                       widget._mouseFocusScope.value = MouseFocusScope.none,
-                  child: _buildFileList(
+                  child: _buildFileList(context, _fileListScrollController),
-                      context, isLocal, _fileListScrollController),
                 ))
               ],
             ),
@@ -864,7 +855,7 @@ class _FileManagerViewState extends State<FileManagerView> {
   }
 
   Widget _buildFileList(
-      BuildContext context, bool isLocal, ScrollController scrollController) {
+      BuildContext context, ScrollController scrollController) {
     final fd = controller.directory.value;
     final entries = fd.entries;
 
@@ -1044,7 +1035,7 @@ class _FileManagerViewState extends State<FileManagerView> {
             // Header
             Row(
               children: [
-                Expanded(child: _buildFileBrowserHeader(context, isLocal)),
+                Expanded(child: _buildFileBrowserHeader(context)),
               ],
             ),
             // Body
@@ -1139,7 +1130,7 @@ class _FileManagerViewState extends State<FileManagerView> {
     return false;
   }
 
-  Widget _buildFileBrowserHeader(BuildContext context, bool isLocal) {
+  Widget _buildFileBrowserHeader(BuildContext context) {
     final padding = EdgeInsets.all(1.0);
     return SizedBox(
       height: kDesktopFileTransferHeaderHeight,
@@ -1147,7 +1138,7 @@ class _FileManagerViewState extends State<FileManagerView> {
         children: [
           Obx(
             () => headerItemFunc(
-                _nameColWidth.value, SortBy.name, translate("Name"), isLocal),
+                _nameColWidth.value, SortBy.name, translate("Name")),
           ),
           DraggableDivider(
             axis: Axis.vertical,
@@ -1160,7 +1151,7 @@ class _FileManagerViewState extends State<FileManagerView> {
           ),
           Obx(
             () => headerItemFunc(_modifiedColWidth.value, SortBy.modified,
-                translate("Modified"), isLocal),
+                translate("Modified")),
           ),
           DraggableDivider(
               axis: Axis.vertical,
@@ -1172,16 +1163,13 @@ class _FileManagerViewState extends State<FileManagerView> {
                         _modifiedColWidth.value));
               },
               padding: padding),
-          Expanded(
+          Expanded(child: headerItemFunc(null, SortBy.size, translate("Size")))
-              child:
-                  headerItemFunc(null, SortBy.size, translate("Size"), isLocal))
         ],
       ),
     );
   }
 
-  Widget headerItemFunc(
+  Widget headerItemFunc(double? width, SortBy sortBy, String name) {
-      double? width, SortBy sortBy, String name, bool isLocal) {
     final headerTextStyle =
         Theme.of(context).dataTableTheme.headingTextStyle ?? TextStyle();
     return ObxValue<Rx<bool?>>(
@@ -1222,7 +1210,7 @@ class _FileManagerViewState extends State<FileManagerView> {
               ),
             ), () {
       if (controller.sortBy.value == sortBy) {
-        return controller.sortAscending;
+        return controller.sortAscending.obs;
       } else {
         return Rx<bool?>(null);
       }

flutter/lib/models/file_model.dart

@@ -208,7 +208,7 @@ class FileController {
 
   final history = RxList<String>.empty(growable: true);
   final sortBy = SortBy.name.obs;
-  final sortAscending = true.obs;
+  var sortAscending = true;
   final JobController jobController;
   final OverlayDialogManager? dialogManager;
 
@@ -285,7 +285,7 @@ class FileController {
 
   void changeSortStyle(SortBy sort, {bool? isLocal, bool ascending = true}) {
     sortBy.value = sort;
-    sortAscending.value = ascending;
+    sortAscending = ascending;
     directory.value.changeSortStyle(sort, ascending: ascending);
   }
 
@@ -592,7 +592,7 @@ class FileController {
 
 class JobController {
   static final JobID jobID = JobID();
-  final jobTable = RxList<JobProgress>.empty(growable: true);
+  final jobTable = List<JobProgress>.empty(growable: true).obs;
   final jobResultListener = JobResultListener<Map<String, dynamic>>();
   final GetSessionID getSessionID;
   String get sessionID => getSessionID();