refa: follow page

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/http/follow.dart

@@ -1,3 +1,5 @@
+import 'package:PiliPlus/http/loading_state.dart';
+
 import '../models/follow/result.dart';
 import 'index.dart';
 
@@ -20,4 +22,22 @@ class FollowHttp {
       return {'status': false, 'msg': res.data['message']};
     }
   }
+
+  static Future<LoadingState<List<FollowItemModel>?>> followingsNew(
+      {int? vmid, int? pn, int? ps, String? orderType}) async {
+    var res = await Request().get(Api.followings, queryParameters: {
+      'vmid': vmid,
+      'pn': pn,
+      'ps': ps,
+      'order': 'desc',
+      'order_type': orderType,
+    });
+
+    if (res.data['code'] == 0) {
+      return LoadingState.success(
+          FollowDataModel.fromJson(res.data['data']).list);
+    } else {
+      return LoadingState.error(res.data['message']);
+    }
+  }
 }

lib/http/member.dart

@@ -470,8 +470,8 @@ class MemberHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': res.data['data']
+        'data': (res.data['data'] as List?)
-            .map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
+            ?.map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
             .toList()
       };
     } else {
@@ -525,28 +525,27 @@ class MemberHttp {
   }
 
   // 获取某分组下的up
-  static Future followUpGroup(
+  static Future<LoadingState<List<FollowItemModel>?>> followUpGroup(
     int? mid,
     int? tagid,
     int? pn,
     int? ps,
   ) async {
-    var res = await Request().get(Api.followUpGroup, queryParameters: {
+    var res = await Request().get(
+      Api.followUpGroup,
+      queryParameters: {
         'mid': mid,
         'tagid': tagid,
         'pn': pn,
         'ps': ps,
-    });
+      },
+    );
     if (res.data['code'] == 0) {
-      // FollowItemModel
+      return LoadingState.success((res.data['data'] as List?)
-      return {
+          ?.map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
-        'status': true,
+          .toList());
-        'data': res.data['data']
-            .map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
-            .toList()
-      };
     } else {
-      return {'status': false, 'msg': res.data['message']};
+      return LoadingState.error(res.data['message']);
     }
   }
 

lib/pages/follow/child_controller.dart

@@ -0,0 +1,28 @@
+import 'package:PiliPlus/http/follow.dart';
+import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/http/member.dart';
+import 'package:PiliPlus/models/follow/result.dart';
+import 'package:PiliPlus/pages/common/common_list_controller.dart';
+
+class FollowChildController
+    extends CommonListController<List<FollowItemModel>?, FollowItemModel> {
+  FollowChildController(this.mid, this.tagid);
+  final int? tagid;
+  final int mid;
+
+  @override
+  void onInit() {
+    super.onInit();
+    queryData();
+  }
+
+  @override
+  Future<LoadingState<List<FollowItemModel>?>> customGetData() {
+    if (tagid != null) {
+      return MemberHttp.followUpGroup(mid, tagid, currentPage, 20);
+    }
+
+    return FollowHttp.followingsNew(
+        vmid: mid, pn: currentPage, ps: 20, orderType: 'attention');
+  }
+}

lib/pages/follow/child_view.dart

@@ -0,0 +1,90 @@
+import 'package:PiliPlus/common/skeleton/msg_feed_top.dart';
+import 'package:PiliPlus/common/widgets/http_error.dart';
+import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
+import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/follow/result.dart';
+import 'package:PiliPlus/pages/follow/child_controller.dart';
+import 'package:PiliPlus/pages/follow/widgets/follow_item.dart';
+import 'package:PiliPlus/utils/utils.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+class FollowChildPage extends StatefulWidget {
+  const FollowChildPage({super.key, required this.mid, this.tagid});
+
+  final int mid;
+  final int? tagid;
+
+  @override
+  State<FollowChildPage> createState() => _FollowChildPageState();
+}
+
+class _FollowChildPageState extends State<FollowChildPage>
+    with AutomaticKeepAliveClientMixin {
+  late final _followController = Get.put(
+      FollowChildController(widget.mid, widget.tagid),
+      tag: Utils.generateRandomString(8));
+  late final _isOwner = widget.tagid != null;
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return refreshIndicator(
+      onRefresh: () async {
+        await _followController.onRefresh();
+      },
+      child: CustomScrollView(
+        physics: const AlwaysScrollableScrollPhysics(),
+        slivers: [
+          SliverPadding(
+            padding: EdgeInsets.only(
+                bottom: MediaQuery.paddingOf(context).bottom + 80),
+            sliver: Obx(() => _buildBody(_followController.loadingState.value)),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildBody(LoadingState<List<FollowItemModel>?> loadingState) {
+    return switch (loadingState) {
+      Loading() => SliverList.builder(
+          itemCount: 12,
+          itemBuilder: (context, index) {
+            return MsgFeedTopSkeleton();
+          },
+        ),
+      Success() => loadingState.response?.isNotEmpty == true
+          ? SliverList.builder(
+              itemCount: loadingState.response!.length,
+              itemBuilder: (context, index) {
+                if (index == loadingState.response!.length - 1) {
+                  _followController.onLoadMore();
+                }
+                return FollowItem(
+                  item: loadingState.response![index],
+                  isOwner: _isOwner,
+                  callback: (attr) {
+                    List<FollowItemModel> list =
+                        (_followController.loadingState.value as Success)
+                            .response;
+                    list[index].attribute = attr == 0 ? -1 : 0;
+                    _followController.loadingState.refresh();
+                  },
+                );
+              },
+            )
+          : HttpError(
+              callback: _followController.onReload,
+            ),
+      Error() => HttpError(
+          errMsg: loadingState.errMsg,
+          callback: _followController.onReload,
+        ),
+      _ => throw UnimplementedError(),
+    };
+  }
+
+  @override
+  bool get wantKeepAlive => widget.tagid != null;
+}

lib/pages/follow/controller.dart

@@ -1,83 +1,52 @@
-import 'package:flutter/material.dart';
+import 'package:PiliPlus/http/loading_state.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:get/get.dart';
-import 'package:PiliPlus/http/follow.dart';
 import 'package:PiliPlus/http/member.dart';
-import 'package:PiliPlus/models/follow/result.dart';
 import 'package:PiliPlus/models/member/tags.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:PiliPlus/utils/storage.dart';
 
-/// 查看自己的关注时，可以查看分类
-/// 查看其他人的关注时，只可以看全部
 class FollowController extends GetxController
     with GetSingleTickerProviderStateMixin {
-  int pn = 1;
+  late int mid;
-  int ps = 20;
+  String? name;
-  int total = 0;
+  late bool isOwner;
-  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
+
-  late int? mid;
+  late final Rx<LoadingState<List<MemberTagItemModel>?>> followState =
-  late String? name;
+      LoadingState<List<MemberTagItemModel>?>.loading().obs;
-  dynamic userInfo;
+  TabController? tabController;
-  RxString loadingText = '加载中...'.obs;
-  RxBool isOwner = false.obs;
-  late List<MemberTagItemModel> followTags;
-  late TabController tabController;
 
   @override
   void onInit() {
     super.onInit();
-    userInfo = GStorage.userInfo.get('userInfoCache');
+    int ownerMid = Accounts.main.mid;
     mid = Get.parameters['mid'] != null
         ? int.parse(Get.parameters['mid']!)
-        : userInfo?.mid;
+        : ownerMid;
-    isOwner.value = mid == userInfo?.mid;
+    isOwner = ownerMid == mid;
-    name = Get.parameters['name'] ?? userInfo?.uname;
+    name =
+        Get.parameters['name'] ?? GStorage.userInfo.get('userInfoCache')?.uname;
+    if (isOwner) {
+      queryFollowUpTags();
+    }
   }
 
-  Future queryFollowings(type) async {
+  Future queryFollowUpTags() async {
-    if (type == 'init') {
-      pn = 1;
-      loadingText.value == '加载中...';
-    }
-    if (loadingText.value == '没有更多了') {
-      return;
-    }
-    var res = await FollowHttp.followings(
-      vmid: mid,
-      pn: pn,
-      ps: ps,
-      orderType: 'attention',
-    );
-    if (res['status']) {
-      if (type == 'init') {
-        followList.value = res['data'].list;
-        total = res['data'].total;
-      } else if (type == 'onLoad') {
-        followList.addAll(res['data'].list);
-      }
-      if ((pn == 1 && total < ps) || res['data'].list.isEmpty) {
-        loadingText.value = '没有更多了';
-      }
-      pn += 1;
-    } else {
-      SmartDialog.showToast(res['msg']);
-    }
-    return res;
-  }
-
-  // 当查看当前用户的关注时，请求关注分组
-  Future followUpTags() async {
-    if (userInfo != null && mid == userInfo.mid) {
     var res = await MemberHttp.followUpTags();
     if (res['status']) {
-        followTags = res['data'];
       tabController = TabController(
         initialIndex: 0,
         length: res['data'].length,
         vsync: this,
       );
-      }
+      followState.value = LoadingState.success(res['data']);
-      return res;
+    } else {
+      followState.value = LoadingState.error(res['msg']);
     }
   }
+
+  @override
+  void onClose() {
+    tabController?.dispose();
+    super.onClose();
+  }
 }

lib/pages/follow/view.dart

@@ -1,12 +1,13 @@
+import 'package:PiliPlus/common/widgets/loading_widget.dart';
+import 'package:PiliPlus/common/widgets/scroll_physics.dart';
+import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/member/tags.dart';
+import 'package:PiliPlus/pages/follow/child_view.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'controller.dart';
-import 'widgets/follow_list.dart';
-import 'widgets/owner_follow_list.dart';
-import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 
-// TODO: refactor
 class FollowPage extends StatefulWidget {
   const FollowPage({super.key});
 
@@ -15,32 +16,23 @@ class FollowPage extends StatefulWidget {
 }
 
 class _FollowPageState extends State<FollowPage> {
-  late String mid;
+  final FollowController _followController =
-  late FollowController _followController;
+      Get.put(FollowController(), tag: Utils.generateRandomString(8));
-
-  @override
-  void initState() {
-    super.initState();
-    mid = Get.parameters['mid']!;
-    _followController =
-        Get.put(FollowController(), tag: Utils.makeHeroTag(mid));
-  }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          _followController.isOwner.value
+          _followController.isOwner ? '我的关注' : '${_followController.name}的关注',
-              ? '我的关注'
-              : '${_followController.name}的关注',
         ),
-        actions: [
+        actions: _followController.isOwner
+            ? [
                 IconButton(
                   onPressed: () => Get.toNamed(
                     '/followSearch',
                     arguments: {
-                'mid': int.parse(mid),
+                      'mid': _followController.mid,
                     },
                   ),
                   icon: const Icon(Icons.search_outlined),
@@ -48,7 +40,7 @@ class _FollowPageState extends State<FollowPage> {
                 ),
                 PopupMenuButton(
                   icon: const Icon(Icons.more_vert),
-            itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+                  itemBuilder: (context) => [
                     PopupMenuItem(
                       onTap: () => Get.toNamed('/blackListPage'),
                       child: const Row(
@@ -63,31 +55,32 @@ class _FollowPageState extends State<FollowPage> {
                   ],
                 ),
                 const SizedBox(width: 6),
-        ],
+              ]
+            : null,
       ),
-      body: Obx(
+      body: _followController.isOwner
-        () => !_followController.isOwner.value
+          ? Obx(() => _buildBody(_followController.followState.value))
-            ? FollowList(ctr: _followController)
+          : FollowChildPage(mid: _followController.mid),
-            : FutureBuilder(
+    );
-                future: _followController.followUpTags(),
+  }
-                builder: (context, snapshot) {
+
-                  if (snapshot.connectionState == ConnectionState.done) {
+  Widget _buildBody(LoadingState<List<MemberTagItemModel>?> loadingState) {
-                    var data = snapshot.data;
+    return switch (loadingState) {
-                    if (data['status']) {
+      Loading() => loadingWidget,
-                      return Column(
+      Success() => loadingState.response?.isNotEmpty == true
+          ? Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 SafeArea(
                   top: false,
                   bottom: false,
                   child: TabBar(
-                              controller: _followController.tabController,
                     isScrollable: true,
                     tabAlignment: TabAlignment.start,
-                              tabs: [
+                    controller: _followController.tabController,
-                                for (var i in data['data']) ...[
+                    tabs: loadingState.response!
-                                  Tab(text: i.name),
+                        .map((item) => Tab(text: item.name))
-                                ]
+                        .toList(),
-                              ],
                   ),
                 ),
                 Expanded(
@@ -95,32 +88,22 @@ class _FollowPageState extends State<FollowPage> {
                     color: Colors.transparent,
                     child: tabBarView(
                       controller: _followController.tabController,
-                                children: [
+                      children: loadingState.response!
-                                  for (var i = 0;
+                          .map(
-                                      i <
+                            (item) => FollowChildPage(
-                                          _followController
+                              mid: _followController.mid,
-                                              .tabController.length;
+                              tagid: item.tagid,
-                                      i++) ...[
+                            ),
-                                    OwnerFollowList(
-                                      ctr: _followController,
-                                      tagItem: _followController.followTags[i],
                           )
-                                  ]
+                          .toList(),
-                                ],
                     ),
                   ),
                 ),
               ],
-                      );
+            )
-                    } else {
+          : FollowChildPage(mid: _followController.mid),
-                      return const SizedBox();
+      Error() => FollowChildPage(mid: _followController.mid),
-                    }
+      _ => throw UnimplementedError(),
-                  } else {
+    };
-                    return const SizedBox();
-                  }
-                },
-              ),
-      ),
-    );
   }
 }

lib/pages/follow/widgets/follow_item.dart

@@ -3,20 +3,19 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:PiliPlus/common/widgets/network_img_layer.dart';
 import 'package:PiliPlus/models/follow/result.dart';
-import 'package:PiliPlus/pages/follow/index.dart';
 import 'package:PiliPlus/utils/feed_back.dart';
 import 'package:PiliPlus/utils/utils.dart';
 
 class FollowItem extends StatelessWidget {
   final FollowItemModel item;
-  final FollowController? ctr;
+  final bool? isOwner;
   final ValueChanged? callback;
 
   const FollowItem({
     super.key,
     required this.item,
     this.callback,
-    this.ctr,
+    this.isOwner,
   });
 
   @override
@@ -73,7 +72,7 @@ class FollowItem extends StatelessWidget {
         overflow: TextOverflow.ellipsis,
       ),
       dense: true,
-      trailing: ctr?.isOwner.value == true
+      trailing: isOwner == true
           ? SizedBox(
               height: 34,
               child: FilledButton.tonal(

lib/pages/follow/widgets/follow_list.dart

@@ -1,113 +0,0 @@
-import 'package:PiliPlus/common/widgets/loading_widget.dart';
-import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
-import 'package:easy_debounce/easy_throttle.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:PiliPlus/models/follow/result.dart';
-import 'package:PiliPlus/pages/follow/index.dart';
-
-import 'follow_item.dart';
-
-// TODO: refactor
-class FollowList extends StatefulWidget {
-  final FollowController ctr;
-  const FollowList({
-    super.key,
-    required this.ctr,
-  });
-
-  @override
-  State<FollowList> createState() => _FollowListState();
-}
-
-class _FollowListState extends State<FollowList> {
-  late Future _futureBuilderFuture;
-  final ScrollController scrollController = ScrollController();
-
-  @override
-  void initState() {
-    super.initState();
-    _futureBuilderFuture = widget.ctr.queryFollowings('init');
-    scrollController.addListener(listener);
-  }
-
-  void listener() {
-    if (scrollController.position.pixels >=
-        scrollController.position.maxScrollExtent - 200) {
-      EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
-        widget.ctr.queryFollowings('onLoad');
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    scrollController.removeListener(listener);
-    scrollController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return refreshIndicator(
-      onRefresh: () async => await widget.ctr.queryFollowings('init'),
-      child: FutureBuilder(
-        future: _futureBuilderFuture,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            var data = snapshot.data;
-            if (data['status']) {
-              List<FollowItemModel> list = widget.ctr.followList;
-              return Obx(
-                () => list.isNotEmpty
-                    ? ListView.builder(
-                        controller: scrollController,
-                        itemCount: list.length + 1,
-                        itemBuilder: (BuildContext context, int index) {
-                          if (index == list.length) {
-                            return Container(
-                              height:
-                                  MediaQuery.of(context).padding.bottom + 80,
-                              padding: EdgeInsets.only(
-                                  bottom:
-                                      MediaQuery.of(context).padding.bottom),
-                              child: Center(
-                                child: Obx(
-                                  () => Text(
-                                    widget.ctr.loadingText.value,
-                                    style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .outline,
-                                        fontSize: 13),
-                                  ),
-                                ),
-                              ),
-                            );
-                          } else {
-                            return FollowItem(
-                              item: list[index],
-                              ctr: widget.ctr,
-                            );
-                          }
-                        },
-                      )
-                    : scrollErrorWidget(
-                        callback: () => widget.ctr.queryFollowings('init'),
-                      ),
-              );
-            } else {
-              return scrollErrorWidget(
-                errMsg: data['msg'],
-                callback: () => widget.ctr.queryFollowings('init'),
-              );
-            }
-          } else {
-            // 骨架屏
-            return const SizedBox();
-          }
-        },
-      ),
-    );
-  }
-}

lib/pages/follow/widgets/owner_follow_list.dart

@@ -1,128 +0,0 @@
-import 'package:PiliPlus/common/widgets/loading_widget.dart';
-import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
-import 'package:easy_debounce/easy_throttle.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:PiliPlus/http/member.dart';
-import 'package:PiliPlus/models/follow/result.dart';
-import 'package:PiliPlus/models/member/tags.dart';
-import 'package:PiliPlus/pages/follow/index.dart';
-import 'follow_item.dart';
-
-// TODO: refactor
-class OwnerFollowList extends StatefulWidget {
-  final FollowController ctr;
-  final MemberTagItemModel? tagItem;
-  const OwnerFollowList({super.key, required this.ctr, this.tagItem});
-
-  @override
-  State<OwnerFollowList> createState() => _OwnerFollowListState();
-}
-
-class _OwnerFollowListState extends State<OwnerFollowList>
-    with AutomaticKeepAliveClientMixin {
-  late int? mid;
-  late Future _futureBuilderFuture;
-  final ScrollController scrollController = ScrollController();
-  int pn = 1;
-  int ps = 20;
-  late MemberTagItemModel tagItem;
-  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  void initState() {
-    super.initState();
-    mid = widget.ctr.mid;
-    tagItem = widget.tagItem!;
-    _futureBuilderFuture = followUpGroup('init');
-    scrollController.addListener(listener);
-  }
-
-  void listener() {
-    if (scrollController.position.pixels >=
-        scrollController.position.maxScrollExtent - 200) {
-      EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
-        followUpGroup('onLoad');
-      });
-    }
-  }
-
-  // 获取分组下up
-  Future followUpGroup(type) async {
-    if (type == 'init') {
-      pn = 1;
-    }
-    var res = await MemberHttp.followUpGroup(mid, tagItem.tagid, pn, ps);
-    if (res['status']) {
-      if (res['data'].isNotEmpty) {
-        if (type == 'init') {
-          followList.value = res['data'];
-        } else {
-          followList.addAll(res['data']);
-        }
-        pn += 1;
-      }
-    }
-    return res;
-  }
-
-  @override
-  void dispose() {
-    scrollController.removeListener(listener);
-    scrollController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return refreshIndicator(
-      onRefresh: () async => await followUpGroup('init'),
-      child: FutureBuilder(
-        future: _futureBuilderFuture,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            var data = snapshot.data;
-            if (data['status']) {
-              return Obx(
-                () => followList.isNotEmpty
-                    ? ListView.builder(
-                        physics: const AlwaysScrollableScrollPhysics(),
-                        controller: scrollController,
-                        itemCount: followList.length,
-                        padding: EdgeInsets.only(
-                          bottom: MediaQuery.of(context).padding.bottom + 80,
-                        ),
-                        itemBuilder: (BuildContext context, int index) {
-                          return FollowItem(
-                            item: followList[index],
-                            ctr: widget.ctr,
-                            callback: (attr) {
-                              followList[index].attribute = attr == 0 ? -1 : 0;
-                              followList.refresh();
-                            },
-                          );
-                        },
-                      )
-                    : scrollErrorWidget(
-                        callback: () => widget.ctr.queryFollowings('init'),
-                      ),
-              );
-            } else {
-              return scrollErrorWidget(
-                errMsg: data['msg'],
-                callback: () => widget.ctr.queryFollowings('init'),
-              );
-            }
-          } else {
-            // 骨架屏
-            return const SizedBox();
-          }
-        },
-      ),
-    );
-  }
-}