Merge pull request #5808 from 21pages/mobile

mobile scrollable peers view

flutter/lib/common/widgets/address_book.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:dynamic_layouts/dynamic_layouts.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common/formatter/id_formatter.dart';
@@ -170,16 +172,18 @@ class _AddressBookState extends State<AddressBook> {
             });
       }
 
+      final gridView = DynamicGridView.builder(
+          shrinkWrap: isMobile,
+          gridDelegate: SliverGridDelegateWithWrapping(),
+          itemCount: tags.length,
+          itemBuilder: (BuildContext context, int index) {
+            final e = tags[index];
+            return tagBuilder(e);
+          });
+      final maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
       return isDesktop
-          ? DynamicGridView.builder(
+          ? gridView
-              gridDelegate: SliverGridDelegateWithWrapping(
+          : LimitedBox(maxHeight: maxHeight, child: gridView);
-                  mainAxisSpacing: 0, crossAxisSpacing: 0),
-              itemCount: tags.length,
-              itemBuilder: (BuildContext context, int index) {
-                final e = tags[index];
-                return tagBuilder(e);
-              })
-          : Wrap(children: tags.map((e) => tagBuilder(e)).toList());
     });
   }
 

flutter/lib/common/widgets/my_group.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common/hbbs/hbbs.dart';
 import 'package:flutter_hbb/common/widgets/login.dart';
@@ -157,11 +159,14 @@ class _MyGroupState extends State<MyGroup> {
         }
         return true;
       }).toList();
+      final listView = ListView.builder(
+          shrinkWrap: isMobile,
+          itemCount: items.length,
+          itemBuilder: (context, index) => _buildUserItem(items[index]));
+      var maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
       return isDesktop
-          ? ListView.builder(
+          ? listView
-              itemCount: items.length,
+          : LimitedBox(maxHeight: maxHeight, child: listView);
-              itemBuilder: (context, index) => _buildUserItem(items[index]))
-          : Column(children: items.map((e) => _buildUserItem(e)).toList());
     });
   }
 

flutter/lib/common/widgets/peers_view.dart

@@ -176,7 +176,8 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
       return FutureBuilder<List<Peer>>(
         builder: (context, snapshot) {
           if (snapshot.hasData) {
-            final peers = snapshot.data!;
+            var peers = snapshot.data!;
+            if (peers.length > 1000) peers = peers.sublist(0, 1000);
             gFFI.peerTabModel.setCurrentTabCachedPeers(peers);
             buildOnePeer(Peer peer) {
               final visibilityChild = VisibilityDetector(
@@ -196,23 +197,14 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
                   : SizedBox(width: mobileWidth, child: visibilityChild);
             }
 
-            final Widget child;
+            final child = DynamicGridView.builder(
-            if (isDesktop) {
+              gridDelegate: SliverGridDelegateWithWrapping(
-              child = DynamicGridView.builder(
+                  mainAxisSpacing: space / 2, crossAxisSpacing: space),
-                gridDelegate: SliverGridDelegateWithWrapping(
+              itemCount: peers.length,
-                    mainAxisSpacing: space / 2, crossAxisSpacing: space),
+              itemBuilder: (BuildContext context, int index) {
-                itemCount: peers.length,
+                return buildOnePeer(peers[index]);
-                itemBuilder: (BuildContext context, int index) {
+              },
-                  return buildOnePeer(peers[index]);
+            );
-                },
-              );
-            } else {
-              child = Wrap(
-                  spacing: space,
-                  runSpacing: space,
-                  children: peers.map((e) => buildOnePeer(e)).toList());
-            }
-
             if (updateEvent == UpdateEvent.load) {
               _curPeers.clear();
               _curPeers.addAll(peers.map((e) => e.id));

flutter/lib/main.dart

@@ -125,8 +125,7 @@ void runMainApp(bool startService) async {
     bind.pluginSyncUi(syncTo: kAppTypeMain);
     bind.pluginListReload();
   }
-  gFFI.abModel.loadCache();
+  await Future.wait([gFFI.abModel.loadCache(), gFFI.groupModel.loadCache()]);
-  gFFI.groupModel.loadCache();
   gFFI.userModel.refreshCurrentUser();
   runApp(App());
   // Set window option.
@@ -154,8 +153,7 @@ void runMobileApp() async {
   await initEnv(kAppTypeMain);
   if (isAndroid) androidChannelInit();
   platformFFI.syncAndroidServiceAppDirConfigPath();
-  gFFI.abModel.loadCache();
+  await Future.wait([gFFI.abModel.loadCache(), gFFI.groupModel.loadCache()]);
-  gFFI.groupModel.loadCache();
   gFFI.userModel.refreshCurrentUser();
   runApp(App());
 }

flutter/lib/mobile/pages/connection_page.dart

@@ -80,7 +80,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
           _buildRemoteIDTextField(),
         ])),
         SliverFillRemaining(
-          hasScrollBody: false,
+          hasScrollBody: true,
           child: PeerTabPage(),
         )
       ],

flutter/lib/models/ab_model.dart

@@ -478,7 +478,7 @@ class AbModel {
     }
   }
 
-  loadCache() async {
+  Future<void> loadCache() async {
     try {
       if (_cacheLoadOnceFlag || abLoading.value || initialized) return;
       _cacheLoadOnceFlag = true;

flutter/lib/models/group_model.dart

@@ -173,9 +173,6 @@ class GroupModel {
         }
         if (json.containsKey('total')) {
           if (total == 0) total = json['total'];
-          if (total > 1000) {
-            total = 1000;
-          }
           if (json.containsKey('data')) {
             final data = json['data'];
             if (data is List) {
@@ -188,9 +185,6 @@ class GroupModel {
                 } else {
                   tmpPeers[index] = peer;
                 }
-                if (tmpPeers.length >= 1000) {
-                  break;
-                }
               }
             }
           }
@@ -231,7 +225,7 @@ class GroupModel {
     }
   }
 
-  loadCache() async {
+  Future<void> loadCache() async {
     try {
       if (_cacheLoadOnceFlag || groupLoading.value || initialized) return;
       _cacheLoadOnceFlag = true;

flutter/pubspec.lock

@@ -400,11 +400,11 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/dynamic_layouts"
-      ref: "0023d01996576e494094793a6552463f01c5627a"
+      ref: "74cc4b495dcf3a4cb8df38d9ecc89f53f074a2c6"
-      resolved-ref: "0023d01996576e494094793a6552463f01c5627a"
+      resolved-ref: "74cc4b495dcf3a4cb8df38d9ecc89f53f074a2c6"
-      url: "https://github.com/flutter/packages.git"
+      url: "https://github.com/21pages/packages.git"
     source: git
-    version: "0.0.1+1"
+    version: "0.0.1+2"
   event_bus:
     dependency: transitive
     description:

flutter/pubspec.yaml

@@ -102,9 +102,9 @@ dependencies:
   flex_color_picker: ^3.3.0
   dynamic_layouts:
     git:
-      url: https://github.com/flutter/packages.git
+      url: https://github.com/21pages/packages.git
       path: packages/dynamic_layouts
-      ref: 0023d01996576e494094793a6552463f01c5627a
+      ref: 74cc4b495dcf3a4cb8df38d9ecc89f53f074a2c6
 
 dev_dependencies:
   icons_launcher: ^2.0.4