Merge pull request #1639 from Kingtous/master

opt: adapt global scroll on mobile & adjust desktop connection page scrollbar

flutter/lib/common/widgets/peer_card.dart

@@ -73,21 +73,34 @@ class _PeerCardState extends State<_PeerCard>
               _menuPos = RelativeRect.fromLTRB(x, y, x, y);
               _showPeerMenu(peer.id);
             },
-            child: ListTile(
+            child: Container(
-              contentPadding: const EdgeInsets.only(left: 12), //
+              padding: EdgeInsets.only(left: 12, top: 8, bottom: 8),
-              subtitle: Text('${peer.username}@${peer.hostname}'),
+              child: Row(
-              title: Row(children: [
+                children: [
-                getOnline(4, peer.online),
+                  Container(
-                Text(peer.alias.isEmpty ? formatID(peer.id) : peer.alias)
+                      width: 50,
-              ]),
+                      height: 50,
-              leading: Container(
                       decoration: BoxDecoration(
                         color: str2color('${peer.id}${peer.platform}', 0x7f),
                         borderRadius: BorderRadius.circular(4),
                       ),
                       padding: const EdgeInsets.all(6),
                       child: getPlatformImage(peer.platform)),
-              trailing: InkWell(
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(children: [
+                          getOnline(4, peer.online),
+                          Text(peer.alias.isEmpty
+                              ? formatID(peer.id)
+                              : peer.alias)
+                        ]),
+                        Text('${peer.username}@${peer.hostname}')
+                      ],
+                    ).paddingOnly(left: 8.0),
+                  ),
+                  InkWell(
                       child: const Padding(
                           padding: EdgeInsets.all(12),
                           child: Icon(Icons.more_vert)),
@@ -98,7 +111,9 @@ class _PeerCardState extends State<_PeerCard>
                       },
                       onTap: () {
                         _showPeerMenu(peer.id);
-                  }),
+                      })
+                ],
+              ),
             )));
   }
 

flutter/lib/desktop/pages/connection_page.dart

@@ -63,6 +63,7 @@ class _ConnectionPageState extends State<ConnectionPage>
             scrollController: _scrollController,
             child: CustomScrollView(
               controller: _scrollController,
+              physics: NeverScrollableScrollPhysics(),
               slivers: [
                 SliverList(
                     delegate: SliverChildListDelegate([
@@ -72,7 +73,7 @@ class _ConnectionPageState extends State<ConnectionPage>
                     ],
                   ).marginOnly(top: 22),
                   SizedBox(height: 12),
-                  Divider(),
+                  Divider().paddingOnly(right: 12),
                 ])),
                 SliverFillRemaining(
                   hasScrollBody: false,
@@ -97,10 +98,10 @@ class _ConnectionPageState extends State<ConnectionPage>
                         menuPadding: EdgeInsets.only(left: 12.0, right: 3.0),
                       ),
                     ],
-                  ),
+                  ).paddingOnly(right: 12.0),
                 )
               ],
-            ).marginSymmetric(horizontal: 12.0),
+            ).paddingOnly(left: 12.0),
           ),
         ),
         const Divider(),

flutter/lib/mobile/pages/connection_page.dart

@@ -66,14 +66,15 @@ class _ConnectionPageState extends State<ConnectionPage> {
   @override
   Widget build(BuildContext context) {
     Provider.of<FfiModel>(context);
-    return Column(
+    return CustomScrollView(
-        mainAxisAlignment: MainAxisAlignment.start,
+      slivers: [
-        mainAxisSize: MainAxisSize.max,
+        SliverList(
-        crossAxisAlignment: CrossAxisAlignment.center,
+            delegate: SliverChildListDelegate([
-        children: <Widget>[
           _buildUpdateUI(),
           _buildRemoteIDTextField(),
-          Expanded(
+        ])),
+        SliverFillRemaining(
+          hasScrollBody: false,
           child: PeerTabPage(
             tabs: [
               translate('Recent Sessions'),
@@ -87,8 +88,10 @@ class _ConnectionPageState extends State<ConnectionPage> {
               DiscoveredPeersView(),
               const AddressBook(),
             ],
-          )),
+          ),
-        ]).marginOnly(top: 2, left: 10, right: 10);
+        )
+      ],
+    ).marginOnly(top: 2, left: 10, right: 10);
   }
 
   /// Callback for the connect button.