Merge branch 'design' into alpha

lib/pages/bangumi/view.dart

@@ -201,7 +201,7 @@ class _BangumiPageState extends State<BangumiPage>
               },
             ),
           ),
-          const LoadingMore()
+          LoadingMore()
         ],
       ),
     );

lib/pages/follow/widgets/follow_item.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/follow/result.dart';
+import 'package:pilipala/pages/video/detail/introduction/widgets/group_panel.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/utils.dart';
 
@@ -39,7 +41,28 @@ class FollowItem extends StatelessWidget {
         overflow: TextOverflow.ellipsis,
       ),
       dense: true,
-      trailing: const SizedBox(width: 6),
+      trailing: SizedBox(
+        height: 34,
+        child: TextButton(
+          onPressed: () async {
+            await Get.bottomSheet(
+              GroupPanel(mid: item.mid!),
+              isScrollControlled: true,
+            );
+            SmartDialog.showToast('重进页面查看效果');
+          },
+          style: TextButton.styleFrom(
+            padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
+            foregroundColor: Theme.of(context).colorScheme.outline,
+            backgroundColor:
+                Theme.of(context).colorScheme.onInverseSurface, // 设置按钮背景色
+          ),
+          child: const Text(
+            '已关注',
+            style: TextStyle(fontSize: 12),
+          ),
+        ),
+      ),
     );
   }
 }

lib/pages/live/view.dart

@@ -10,6 +10,7 @@ import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/pages/main/index.dart';
+import 'package:pilipala/pages/rcmd/index.dart';
 
 import 'controller.dart';
 import 'widgets/live_item.dart';
@@ -118,7 +119,7 @@ class _LivePageState extends State<LivePage>
                 },
               ),
             ),
-            const LoadingMore()
+            LoadingMore(ctr: _liveController)
           ],
         ),
       ),
@@ -180,24 +181,3 @@ class _LivePageState extends State<LivePage>
     );
   }
 }
-
-class LoadingMore extends StatelessWidget {
-  const LoadingMore({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverToBoxAdapter(
-      child: Container(
-        height: MediaQuery.of(context).padding.bottom + 80,
-        padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-        child: Center(
-          child: Text(
-            '加载中...',
-            style: TextStyle(
-                color: Theme.of(context).colorScheme.outline, fontSize: 13),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/rcmd/view.dart

@@ -125,7 +125,7 @@ class _RcmdPageState extends State<RcmdPage>
                 },
               ),
             ),
-            const LoadingMore()
+            LoadingMore(ctr: _rcmdController)
           ],
         ),
       ),
@@ -191,7 +191,8 @@ class _RcmdPageState extends State<RcmdPage>
 }
 
 class LoadingMore extends StatelessWidget {
-  const LoadingMore({super.key});
+  dynamic ctr;
+  LoadingMore({super.key, this.ctr});
 
   @override
   Widget build(BuildContext context) {
@@ -199,11 +200,18 @@ class LoadingMore extends StatelessWidget {
       child: Container(
         height: MediaQuery.of(context).padding.bottom + 80,
         padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-        child: Center(
+        child: GestureDetector(
-          child: Text(
+          onTap: () {
-            '加载中...',
+            if (ctr != null) {
-            style: TextStyle(
+              ctr!.onLoad();
-                color: Theme.of(context).colorScheme.outline, fontSize: 13),
+            }
+          },
+          child: Center(
+            child: Text(
+              '加载更多 👇',
+              style: TextStyle(
+                  color: Theme.of(context).colorScheme.outline, fontSize: 13),
+            ),
           ),
         ),
       ),