remove ReorderedListView

Signed-off-by: 21pages <pages21@163.com>

flutter/lib/common/widgets/peer_tab_page.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 import 'dart:ui' as ui;
 
 import 'package:bot_toast/bot_toast.dart';
@@ -22,10 +21,7 @@ const String defaultGroupTabname = 'Group';
 
 class StatePeerTab {
   final RxInt currentTab = 0.obs;
-  static const List<int> tabIndexs = [0, 1, 2, 3, 4];
+  final RxInt tabHiddenFlag = 0.obs;
-  List<int> tabOrder = List.empty(growable: true);
-  final RxList<int> visibleTabOrder = RxList.empty(growable: true);
-  int tabHiddenFlag = 0;
   final RxList<String> tabNames = [
     'Recent Sessions',
     'Favorites',
@@ -35,44 +31,25 @@ class StatePeerTab {
   ].obs;
 
   StatePeerTab._() {
-    tabHiddenFlag = (int.tryParse(
+    tabHiddenFlag.value = (int.tryParse(
             bind.getLocalFlutterConfig(k: 'hidden-peer-card'),
             radix: 2) ??
         0);
+    var tabs = _notHiddenTabs();
     currentTab.value =
         int.tryParse(bind.getLocalFlutterConfig(k: 'peer-tab-index')) ?? 0;
-    if (!tabIndexs.contains(currentTab.value)) {
+    if (!tabs.contains(currentTab.value)) {
-      currentTab.value = tabIndexs[0];
+      currentTab.value = 0;
     }
-    tabOrder = tabIndexs.toList();
-    try {
-      final conf = bind.getLocalFlutterConfig(k: 'peer-tab-order');
-      if (conf.isNotEmpty) {
-        final json = jsonDecode(conf);
-        if (json is List) {
-          final List<int> list =
-              json.map((e) => int.tryParse(e.toString()) ?? -1).toList();
-          if (list.length == tabOrder.length &&
-              tabOrder.every((e) => list.contains(e))) {
-            tabOrder = list;
-          }
-        }
-      }
-    } catch (e) {
-      debugPrintStack(label: '$e');
-    }
-    visibleTabOrder.value = tabOrder.where((e) => !isTabHidden(e)).toList();
-    visibleTabOrder.remove(groupTabIndex);
   }
   static final StatePeerTab instance = StatePeerTab._();
 
   check() {
-    List<int> oldOrder = visibleTabOrder;
+    var tabs = _notHiddenTabs();
     if (filterGroupCard()) {
-      visibleTabOrder.remove(groupTabIndex);
       if (currentTab.value == groupTabIndex) {
         currentTab.value =
-            visibleTabOrder.firstWhereOrNull((e) => e != groupTabIndex) ?? 0;
+            tabs.firstWhereOrNull((e) => e != groupTabIndex) ?? 0;
         bind.setLocalFlutterConfig(
             k: 'peer-tab-index', v: currentTab.value.toString());
       }
@@ -83,26 +60,22 @@ class StatePeerTab {
       } else {
         tabNames[groupTabIndex] = defaultGroupTabname;
       }
-      if (isTabHidden(groupTabIndex)) {
+      if (tabs.contains(groupTabIndex) &&
-        visibleTabOrder.remove(groupTabIndex);
-      } else {
-        if (!visibleTabOrder.contains(groupTabIndex)) {
-          addTabInOrder(visibleTabOrder, groupTabIndex);
-        }
-      }
-      if (visibleTabOrder.contains(groupTabIndex) &&
           int.tryParse(bind.getLocalFlutterConfig(k: 'peer-tab-index')) ==
               groupTabIndex) {
         currentTab.value = groupTabIndex;
       }
     }
-    if (oldOrder != visibleTabOrder) {
-      saveTabOrder();
-    }
   }
 
-  bool isTabHidden(int tabindex) {
+  List<int> currentTabs() {
-    return tabHiddenFlag & (1 << tabindex) != 0;
+    var v = List<int>.empty(growable: true);
+    for (int i = 0; i < tabNames.length; i++) {
+      if (!_isTabHidden(i) && !_isTabFilter(i)) {
+        v.add(i);
+      }
+    }
+    return v;
   }
 
   bool filterGroupCard() {
@@ -114,50 +87,25 @@ class StatePeerTab {
     }
   }
 
-  addTabInOrder(List<int> list, int tabIndex) {
+  bool _isTabHidden(int tabindex) {
-    if (!tabOrder.contains(tabIndex) || list.contains(tabIndex)) {
+    return tabHiddenFlag & (1 << tabindex) != 0;
-      return;
-    }
-    bool sameOrder = true;
-    int lastIndex = -1;
-    for (int i = 0; i < list.length; i++) {
-      var index = tabOrder.lastIndexOf(list[i]);
-      if (index > lastIndex) {
-        lastIndex = index;
-        continue;
-      } else {
-        sameOrder = false;
-        break;
-      }
-    }
-    if (sameOrder) {
-      var indexInTabOrder = tabOrder.indexOf(tabIndex);
-      var left = List.empty(growable: true);
-      for (int i = 0; i < indexInTabOrder; i++) {
-        left.add(tabOrder[i]);
-      }
-      int insertIndex = list.lastIndexWhere((e) => left.contains(e));
-      if (insertIndex < 0) {
-        insertIndex = 0;
-      } else {
-        insertIndex += 1;
-      }
-      list.insert(insertIndex, tabIndex);
-    } else {
-      list.add(tabIndex);
-    }
   }
 
-  saveTabOrder() {
+  bool _isTabFilter(int tabIndex) {
-    var list = statePeerTab.visibleTabOrder.toList();
+    if (tabIndex == groupTabIndex) {
-    var left = tabOrder
+      return filterGroupCard();
-        .where((e) => !statePeerTab.visibleTabOrder.contains(e))
-        .toList();
-    for (var t in left) {
-      addTabInOrder(list, t);
     }
-    statePeerTab.tabOrder = list;
+    return false;
-    bind.setLocalFlutterConfig(k: 'peer-tab-order', v: jsonEncode(list));
+  }
+
+  List<int> _notHiddenTabs() {
+    var v = List<int>.empty(growable: true);
+    for (int i = 0; i < tabNames.length; i++) {
+      if (!_isTabHidden(i)) {
+        v.add(i);
+      }
+    }
+    return v;
   }
 }
 
@@ -266,59 +214,41 @@ class _PeerTabPageState extends State<PeerTabPage>
 
   Widget _createSwitchBar(BuildContext context) {
     final textColor = Theme.of(context).textTheme.titleLarge?.color;
-    statePeerTab.visibleTabOrder
-        .removeWhere((e) => !StatePeerTab.tabIndexs.contains(e));
     return Obx(() {
-      int indexCounter = -1;
+      var tabs = statePeerTab.currentTabs();
-      return ReorderableListView(
+      return ListView(
-          buildDefaultDragHandles: false,
-          onReorder: (oldIndex, newIndex) {
-            var list = statePeerTab.visibleTabOrder.toList();
-            if (oldIndex < newIndex) {
-              newIndex -= 1;
-            }
-            final int item = list.removeAt(oldIndex);
-            list.insert(newIndex, item);
-            statePeerTab.visibleTabOrder.value = list;
-            statePeerTab.saveTabOrder();
-          },
           scrollDirection: Axis.horizontal,
-          shrinkWrap: true,
+          physics: NeverScrollableScrollPhysics(),
-          scrollController: ScrollController(),
+          controller: ScrollController(),
-          children: statePeerTab.visibleTabOrder.map((t) {
+          children: tabs.map((t) {
-            indexCounter++;
+            return InkWell(
-            return ReorderableDragStartListener(
+              child: Container(
-              key: ValueKey(t),
+                  padding: const EdgeInsets.symmetric(horizontal: 8),
-              index: indexCounter,
+                  decoration: BoxDecoration(
-              child: InkWell(
+                    color: statePeerTab.currentTab.value == t
-                child: Container(
+                        ? Theme.of(context).backgroundColor
-                    padding: const EdgeInsets.symmetric(horizontal: 8),
+                        : null,
-                    decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(isDesktop ? 2 : 6),
-                      color: statePeerTab.currentTab.value == t
+                  ),
-                          ? Theme.of(context).backgroundColor
+                  child: Align(
-                          : null,
+                    alignment: Alignment.center,
-                      borderRadius: BorderRadius.circular(isDesktop ? 2 : 6),
+                    child: Text(
+                      translatedTabname(t),
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                          height: 1,
+                          fontSize: 14,
+                          color: statePeerTab.currentTab.value == t
+                              ? textColor
+                              : textColor
+                            ?..withOpacity(0.5)),
                     ),
-                    child: Align(
+                  )),
-                      alignment: Alignment.center,
+              onTap: () async {
-                      child: Text(
+                await handleTabSelection(t);
-                        translatedTabname(t),
+                await bind.setLocalFlutterConfig(
-                        textAlign: TextAlign.center,
+                    k: 'peer-tab-index', v: t.toString());
-                        style: TextStyle(
+              },
-                            height: 1,
-                            fontSize: 14,
-                            color: statePeerTab.currentTab.value == t
-                                ? textColor
-                                : textColor
-                              ?..withOpacity(0.5)),
-                      ),
-                    )),
-                onTap: () async {
-                  await handleTabSelection(t);
-                  await bind.setLocalFlutterConfig(
-                      k: 'peer-tab-index', v: t.toString());
-                },
-              ),
             );
           }).toList());
     });
@@ -343,20 +273,18 @@ class _PeerTabPageState extends State<PeerTabPage>
 
   Widget _createPeersView() {
     final verticalMargin = isDesktop ? 12.0 : 6.0;
-    statePeerTab.visibleTabOrder
-        .removeWhere((e) => !StatePeerTab.tabIndexs.contains(e));
     return Expanded(
         child: Obx(() {
-      if (statePeerTab.visibleTabOrder.isEmpty) {
+      var tabs = statePeerTab.currentTabs();
+      if (tabs.isEmpty) {
         return visibleContextMenuListener(Center(
           child: Text(translate('Right click to select tabs')),
         ));
       } else {
-        if (statePeerTab.visibleTabOrder
+        if (tabs.contains(statePeerTab.currentTab.value)) {
-            .contains(statePeerTab.currentTab.value)) {
           return entries[statePeerTab.currentTab.value].widget;
         } else {
-          statePeerTab.currentTab.value = statePeerTab.visibleTabOrder[0];
+          statePeerTab.currentTab.value = tabs[0];
           return entries[statePeerTab.currentTab.value].widget;
         }
       }
@@ -394,13 +322,9 @@ class _PeerTabPageState extends State<PeerTabPage>
   }
 
   adjustTab() {
-    if (statePeerTab.visibleTabOrder.isNotEmpty) {
+    var tabs = statePeerTab.currentTabs();
-      if (!statePeerTab.visibleTabOrder
+    if (tabs.isNotEmpty && !tabs.contains(statePeerTab.currentTab.value)) {
-          .contains(statePeerTab.currentTab.value)) {
+      statePeerTab.currentTab.value = tabs[0];
-        handleTabSelection(statePeerTab.visibleTabOrder[0]);
-      }
-    } else {
-      statePeerTab.currentTab.value = 0;
     }
   }
 
@@ -438,22 +362,13 @@ class _PeerTabPageState extends State<PeerTabPage>
             },
             setter: (show) async {
               if (show) {
-                statePeerTab.tabHiddenFlag &= ~bitMask;
+                statePeerTab.tabHiddenFlag.value &= ~bitMask;
               } else {
-                statePeerTab.tabHiddenFlag |= bitMask;
+                statePeerTab.tabHiddenFlag.value |= bitMask;
               }
               await bind.setLocalFlutterConfig(
                   k: 'hidden-peer-card',
-                  v: statePeerTab.tabHiddenFlag.toRadixString(2));
+                  v: statePeerTab.tabHiddenFlag.value.toRadixString(2));
-              statePeerTab.visibleTabOrder
-                  .removeWhere((e) => statePeerTab.isTabHidden(e));
-              for (int j = 0; j < statePeerTab.tabNames.length; j++) {
-                if (!statePeerTab.isTabHidden(j) &&
-                    !(j == groupTabIndex && statePeerTab.filterGroupCard())) {
-                  statePeerTab.addTabInOrder(statePeerTab.visibleTabOrder, j);
-                }
-              }
-              statePeerTab.saveTabOrder();
               cancelFunc();
               adjustTab();
             }));