refactor: subscription

opt: pages

Closes #58

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

lib/http/user.dart

@@ -374,24 +374,25 @@ class UserHttp {
   }
 
   // 我的订阅
-  static Future userSubFolder({
+  static Future<LoadingState> userSubFolder({
     required int mid,
     required int pn,
     required int ps,
   }) async {
-    var res = await Request().get(Api.userSubFolder, queryParameters: {
+    var res = await Request().get(
+      Api.userSubFolder,
+      queryParameters: {
         'up_mid': mid,
         'ps': ps,
         'pn': pn,
         'platform': 'web',
-    });
+      },
+    );
     if (res.data['code'] == 0 && res.data['data'] is Map) {
-      return {
+      return LoadingState.success(
-        'status': true,
+          SubFolderModelData.fromJson(res.data['data']).list);
-        'data': SubFolderModelData.fromJson(res.data['data'])
-      };
     } else {
-      return {'status': false, 'msg': res.data['message']};
+      return LoadingState.error(res.data['message']);
     }
   }
 

lib/pages/fav/view.dart

@@ -82,13 +82,17 @@ class _FavPageState extends State<FavPage> {
 
   Widget _buildBody(LoadingState loadingState) {
     return switch (loadingState) {
-      Loading() => SliverGrid(
+      Loading() => SliverPadding(
+          padding:
+              const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
+          sliver: SliverGrid(
             gridDelegate: SliverGridDelegateWithExtentAndRatio(
               mainAxisSpacing: StyleString.cardSpace,
               crossAxisSpacing: StyleString.safeSpace,
               maxCrossAxisExtent: Grid.maxRowWidth * 2,
               childAspectRatio: StyleString.aspectRatio * 2.4,
-              mainAxisExtent: 0),
+              mainAxisExtent: 0,
+            ),
             delegate: SliverChildBuilderDelegate(
               (BuildContext context, int index) {
                 return const VideoCardHSkeleton();
@@ -96,6 +100,7 @@ class _FavPageState extends State<FavPage> {
               childCount: 10,
             ),
           ),
+        ),
       Success() => (loadingState.response as List?)?.isNotEmpty == true
           ? SliverPadding(
               padding: EdgeInsets.only(

lib/pages/fav_detail/view.dart

@@ -289,7 +289,10 @@ class _FavDetailPageState extends State<FavDetailPage> {
 
   Widget _buildBody(LoadingState loadingState) {
     return switch (loadingState) {
-      Loading() => SliverGrid(
+      Loading() => SliverPadding(
+          padding:
+              const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
+          sliver: SliverGrid(
             gridDelegate: SliverGridDelegateWithExtentAndRatio(
               mainAxisSpacing: StyleString.cardSpace,
               crossAxisSpacing: StyleString.safeSpace,
@@ -304,6 +307,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
               childCount: 10,
             ),
           ),
+        ),
       Success() => (loadingState.response as List?)?.isNotEmpty == true
           ? SliverPadding(
               padding: EdgeInsets.only(
@@ -356,9 +360,9 @@ class _FavDetailPageState extends State<FavDetailPage> {
                           },
                         ),
                         Positioned(
-                          top: 0,
+                          top: 8,
                           left: 12,
-                          bottom: 0,
+                          bottom: 8,
                           child: IgnorePointer(
                             child: LayoutBuilder(
                               builder: (context, constraints) =>

lib/pages/fav_detail/widget/fav_video_card.dart

@@ -74,11 +74,11 @@ class FavVideoCardH extends StatelessWidget {
         });
       },
       onLongPress: onLongPress,
-      child: Column(
+      child: Padding(
-        children: [
+        padding: const EdgeInsets.symmetric(
-          Padding(
+          horizontal: StyleString.safeSpace,
-            padding:
+          vertical: StyleString.cardSpace,
-                const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
+        ),
         child: LayoutBuilder(
           builder: (context, boxConstraints) {
             double width =
@@ -132,8 +132,6 @@ class FavVideoCardH extends StatelessWidget {
           },
         ),
       ),
-        ],
-      ),
     );
   }
 

lib/pages/history/view.dart

@@ -148,7 +148,11 @@ class _HistoryPageState extends State<HistoryPage> {
 
   Widget _buildBody(LoadingState loadingState) {
     return switch (loadingState) {
-      Loading() => SliverGrid(
+      Loading() => SliverPadding(
+          padding: const EdgeInsets.symmetric(
+            horizontal: StyleString.safeSpace,
+          ),
+          sliver: SliverGrid(
             gridDelegate: SliverGridDelegateWithExtentAndRatio(
               mainAxisSpacing: StyleString.cardSpace,
               crossAxisSpacing: StyleString.safeSpace,
@@ -163,6 +167,7 @@ class _HistoryPageState extends State<HistoryPage> {
               childCount: 10,
             ),
           ),
+        ),
       Success() => (loadingState.response as List?)?.isNotEmpty == true
           ? SliverGrid(
               gridDelegate: SliverGridDelegateWithExtentAndRatio(

lib/pages/history/widgets/item.dart

@@ -160,11 +160,11 @@ class HistoryItem extends StatelessWidget {
           onChoose?.call();
         }
       },
-      child: Column(
+      child: Padding(
-        children: [
+        padding: const EdgeInsets.symmetric(
-          Padding(
+          horizontal: StyleString.safeSpace,
-            padding: const EdgeInsets.fromLTRB(
+          vertical: StyleString.cardSpace,
-                StyleString.safeSpace, 0, StyleString.safeSpace, 0),
+        ),
         child: LayoutBuilder(
           builder: (context, boxConstraints) {
             double width =
@@ -209,8 +209,7 @@ class HistoryItem extends StatelessWidget {
                                   ),
                                 // 右上角
                                 if (BusinessType.showBadge.showBadge
-                                            .contains(
+                                        .contains(videoItem.history.business) ||
-                                                videoItem.history.business) ||
                                     videoItem.history.business ==
                                         BusinessType.live.type)
                                   PBadge(
@@ -275,15 +274,13 @@ class HistoryItem extends StatelessWidget {
                           videoItem.duration != 0 &&
                           videoItem.progress != 0)
                         Positioned(
-                              left: 3,
+                          left: 4,
-                              right: 3,
+                          right: 4,
                           bottom: 0,
                           child: ClipRRect(
                             borderRadius: BorderRadius.only(
-                                  bottomLeft:
+                              bottomLeft: Radius.circular(12),
-                                      Radius.circular(StyleString.imgRadius.x),
+                              bottomRight: Radius.circular(12),
-                                  bottomRight:
-                                      Radius.circular(StyleString.imgRadius.x),
                             ),
                             child: LinearProgressIndicator(
                               value: videoItem.progress == -1
@@ -301,8 +298,6 @@ class HistoryItem extends StatelessWidget {
           },
         ),
       ),
-        ],
-      ),
     );
   }
 

lib/pages/later/view.dart

@@ -112,7 +112,7 @@ class _LaterPageState extends State<LaterPage> {
                 padding: EdgeInsets.only(
                   left: StyleString.safeSpace,
                   right: StyleString.safeSpace,
-                  bottom: MediaQuery.of(context).padding.bottom + 81,
+                  bottom: MediaQuery.of(context).padding.bottom + 85,
                 ),
                 sliver: Obx(
                   () => _buildBody(_laterController.loadingState.value),

lib/pages/subscription/controller.dart

@@ -1,48 +1,30 @@
+import 'package:PiliPalaX/http/loading_state.dart';
+import 'package:PiliPalaX/pages/common/common_controller.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:PiliPalaX/http/user.dart';
-import 'package:PiliPalaX/models/user/info.dart';
 import 'package:PiliPalaX/utils/storage.dart';
 
 import '../../models/user/sub_folder.dart';
 
-class SubController extends GetxController {
+class SubController extends CommonController {
-  final ScrollController scrollController = ScrollController();
+  dynamic mid;
-  Rx<SubFolderModelData> subFolderData = SubFolderModelData().obs;
-  UserInfoData? userInfo;
-  int currentPage = 1;
-  int pageSize = 20;
-  RxBool hasMore = true.obs;
 
-  Future<dynamic> querySubFolder({type = 'init'}) async {
+  @override
-    userInfo = GStorage.userInfo.get('userInfoCache');
+  void onInit() {
-    if (userInfo == null) {
+    super.onInit();
-      return {'status': false, 'msg': '账号未登录'};
+    mid = GStorage.userInfo.get('userInfoCache')?.mid;
-    }
+    queryData();
-    var res = await UserHttp.userSubFolder(
-      pn: currentPage,
-      ps: pageSize,
-      mid: userInfo!.mid!,
-    );
-    if (res['status']) {
-      if (type == 'init') {
-        subFolderData.value = res['data'];
-      } else {
-        if (res['data'].list.isNotEmpty) {
-          subFolderData.value.list!.addAll(res['data'].list);
-          subFolderData.update((val) {});
-        }
-      }
-      currentPage++;
-    } else {
-      SmartDialog.showToast(res['msg']);
-    }
-    return res;
   }
 
-  Future onLoad() async {
+  @override
-    querySubFolder(type: 'onload');
+  Future queryData([bool isRefresh = true]) {
+    if (mid == null) {
+      loadingState.value = LoadingState.error('账号未登录');
+      return Future.value();
+    }
+    return super.queryData(isRefresh);
   }
 
   // 取消订阅
@@ -67,8 +49,9 @@ class SubController extends GetxController {
               var res = await UserHttp.cancelSub(
                   id: subFolderItem.id!, type: subFolderItem.type!);
               if (res['status']) {
-                subFolderData.value.list!.remove(subFolderItem);
+                List list = (loadingState.value as Success).response;
-                subFolderData.update((val) {});
+                list.remove(subFolderItem);
+                loadingState.value = LoadingState.success(list);
                 SmartDialog.showToast('取消订阅成功');
               } else {
                 SmartDialog.showToast(res['msg']);
@@ -83,8 +66,9 @@ class SubController extends GetxController {
   }
 
   @override
-  void onClose() {
+  Future<LoadingState> customGetData() => UserHttp.userSubFolder(
-    scrollController.dispose();
+        pn: currentPage,
-    super.onClose();
+        ps: 20,
-  }
+        mid: mid,
+      );
 }

lib/pages/subscription/view.dart

@@ -1,11 +1,12 @@
-import 'package:easy_debounce/easy_throttle.dart';
+import 'package:PiliPalaX/common/constants.dart';
+import 'package:PiliPalaX/common/skeleton/video_card_h.dart';
+import 'package:PiliPalaX/http/loading_state.dart';
+import 'package:PiliPalaX/pages/subscription/widgets/item.dart';
+import 'package:PiliPalaX/utils/grid.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:PiliPalaX/common/widgets/http_error.dart';
-import '../../common/constants.dart';
-import '../../utils/grid.dart';
 import 'controller.dart';
-import 'widgets/item.dart';
 
 class SubPage extends StatefulWidget {
   const SubPage({super.key});
@@ -16,81 +17,73 @@ class SubPage extends StatefulWidget {
 
 class _SubPageState extends State<SubPage> {
   final SubController _subController = Get.put(SubController());
-  late Future _futureBuilderFuture;
-
-  @override
-  void dispose() {
-    _subController.scrollController.removeListener(() {});
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _futureBuilderFuture = _subController.querySubFolder();
-    _subController.scrollController.addListener(
-      () {
-        if (_subController.scrollController.position.pixels >=
-            _subController.scrollController.position.maxScrollExtent - 300) {
-          EasyThrottle.throttle('history', const Duration(seconds: 1), () {
-            _subController.onLoad();
-          });
-        }
-      },
-    );
-  }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: Text('我的订阅')),
-      body: FutureBuilder(
+      body: CustomScrollView(
-        future: _futureBuilderFuture,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            // TODO: refactor
-            Map? data = snapshot.data;
-            if (data != null && data['status']) {
-              return Obx(() => CustomScrollView(
-                      controller: _subController.scrollController,
-                      physics: const AlwaysScrollableScrollPhysics(),
         slivers: [
-                        SliverGrid(
+          Obx(() => _buildBody(_subController.loadingState.value)),
+          SliverToBoxAdapter(
+            child: SizedBox(
+              height: MediaQuery.of(context).padding.bottom + 10,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildBody(LoadingState loadingState) {
+    return switch (loadingState) {
+      Loading() => SliverPadding(
+          padding:
+              const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
+          sliver: SliverGrid(
             gridDelegate: SliverGridDelegateWithExtentAndRatio(
               mainAxisSpacing: StyleString.cardSpace,
               crossAxisSpacing: StyleString.safeSpace,
               maxCrossAxisExtent: Grid.maxRowWidth * 2,
               childAspectRatio: StyleString.aspectRatio * 2.4,
-                              mainAxisExtent: 0),
+              mainAxisExtent: 0,
+            ),
             delegate: SliverChildBuilderDelegate(
-                            childCount:
+              (context, index) => const VideoCardHSkeleton(),
-                                _subController.subFolderData.value.list!.length,
+              childCount: 10,
+            ),
+          ),
+        ),
+      Success() => (loadingState.response as List?)?.isNotEmpty == true
+          ? SliverGrid(
+              gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                mainAxisSpacing: StyleString.cardSpace,
+                crossAxisSpacing: StyleString.safeSpace,
+                maxCrossAxisExtent: Grid.maxRowWidth * 2,
+                childAspectRatio: StyleString.aspectRatio * 2.4,
+                mainAxisExtent: 0,
+              ),
+              delegate: SliverChildBuilderDelegate(
+                childCount: loadingState.response.length,
                 (BuildContext context, int index) {
+                  if (index == loadingState.response.length - 1) {
+                    _subController.onLoadMore();
+                  }
                   return SubItem(
-                                  subFolderItem: _subController
+                    subFolderItem: loadingState.response[index],
-                                      .subFolderData.value.list![index],
+                    cancelSub: _subController.cancelSub,
-                                  cancelSub: _subController.cancelSub);
+                  );
                 },
               ),
             )
-                      ]));
+          : HttpError(
-            } else {
+              callback: _subController.onReload,
-              return CustomScrollView(
-                physics: const NeverScrollableScrollPhysics(),
-                slivers: [
-                  HttpError(
-                    errMsg: data?['msg'],
-                    callback: () => setState(() {}),
             ),
-                ],
+      Error() => HttpError(
-              );
+          errMsg: loadingState.errMsg,
-            }
+          callback: _subController.onReload,
-          } else {
-            // 骨架屏
-            return const Text('请求中');
-          }
-        },
         ),
-    );
+      LoadingState() => throw UnimplementedError(),
+    };
   }
 }

lib/pages/subscription_detail/view.dart

@@ -1,5 +1,7 @@
 import 'dart:async';
 
+import 'package:PiliPalaX/common/constants.dart';
+import 'package:PiliPalaX/utils/grid.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -225,13 +227,23 @@ class _SubDetailPageState extends State<SubDetailPage> {
                     return Obx(
                       () => subList.isEmpty
                           ? const SliverToBoxAdapter(child: SizedBox())
-                          : SliverList(
+                          : SliverGrid(
-                              delegate:
+                              gridDelegate:
-                                  SliverChildBuilderDelegate((context, index) {
+                                  SliverGridDelegateWithExtentAndRatio(
+                                mainAxisSpacing: StyleString.cardSpace,
+                                crossAxisSpacing: StyleString.safeSpace,
+                                maxCrossAxisExtent: Grid.maxRowWidth * 2,
+                                childAspectRatio: StyleString.aspectRatio * 2.4,
+                                mainAxisExtent: 0,
+                              ),
+                              delegate: SliverChildBuilderDelegate(
+                                childCount: subList.length,
+                                (BuildContext context, int index) {
                                   return SubVideoCardH(
                                     videoItem: subList[index],
                                   );
-                              }, childCount: subList.length),
+                                },
+                              ),
                             ),
                     );
                   }
@@ -246,10 +258,22 @@ class _SubDetailPageState extends State<SubDetailPage> {
                 }
               } else {
                 // 骨架屏
-                return SliverList(
+                return SliverPadding(
-                  delegate: SliverChildBuilderDelegate((context, index) {
+                  padding: const EdgeInsets.symmetric(
-                    return const VideoCardHSkeleton();
+                      horizontal: StyleString.safeSpace),
-                  }, childCount: 10),
+                  sliver: SliverGrid(
+                    gridDelegate: SliverGridDelegateWithExtentAndRatio(
+                      mainAxisSpacing: StyleString.cardSpace,
+                      crossAxisSpacing: StyleString.safeSpace,
+                      maxCrossAxisExtent: Grid.maxRowWidth * 2,
+                      childAspectRatio: StyleString.aspectRatio * 2.4,
+                      mainAxisExtent: 0,
+                    ),
+                    delegate: SliverChildBuilderDelegate(
+                      (context, index) => const VideoCardHSkeleton(),
+                      childCount: 10,
+                    ),
+                  ),
                 );
               }
             },

lib/pages/subscription_detail/widget/sub_video_card.dart

@@ -40,9 +40,7 @@ class SubVideoCardH extends StatelessWidget {
           'videoType': SearchType.video,
         });
       },
-      child: Column(
+      child: Padding(
-        children: [
-          Padding(
         padding: const EdgeInsets.fromLTRB(
             StyleString.safeSpace, 5, StyleString.safeSpace, 5),
         child: LayoutBuilder(
@@ -98,8 +96,6 @@ class SubVideoCardH extends StatelessWidget {
           },
         ),
       ),
-        ],
-      ),
     );
   }
 

pubspec.lock

@@ -5,23 +5,23 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
+    version: "72.0.0"
   _macros:
     dependency: transitive
     description: dart
     source: sdk
-    version: "0.3.3"
+    version: "0.3.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "6.7.0"
   animations:
     dependency: "direct main"
     description:
@@ -317,10 +317,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.0"
+    version: "1.18.0"
   connectivity_plus:
     dependency: "direct main"
     description:
@@ -1042,18 +1042,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.7"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.8"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -1098,10 +1098,10 @@ packages:
     dependency: transitive
     description:
       name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3-main.0"
+    version: "0.1.2-main.4"
   mailer:
     dependency: transitive
     description:
@@ -1659,7 +1659,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.0"
+    version: "0.0.99"
   source_gen:
     dependency: transitive
     description:
@@ -1736,10 +1736,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.11.1"
   status_bar_control:
     dependency: "direct main"
     description:
@@ -1768,10 +1768,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   synchronized:
     dependency: transitive
     description:
@@ -1800,10 +1800,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -1960,10 +1960,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.0"
+    version: "14.2.5"
   volume_controller:
     dependency: transitive
     description: