opt play all btn

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

lib/pages/common/play_all_btn_mixin.dart

@@ -0,0 +1,40 @@
+import 'package:PiliPlus/utils/storage.dart';
+import 'package:PiliPlus/utils/storage_key.dart';
+import 'package:PiliPlus/utils/storage_pref.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get_rx/get_rx.dart';
+
+mixin PlayAllBtnMixin {
+  late double dx = 0;
+  late final RxBool isPlayAll = Pref.enablePlayAll.obs;
+
+  void setIsPlayAll(bool isPlayAll) {
+    if (this.isPlayAll.value == isPlayAll) return;
+    this.isPlayAll.value = isPlayAll;
+    GStorage.setting.put(SettingBoxKey.enablePlayAll, isPlayAll);
+  }
+
+  Widget playAllBtn(VoidCallback onPlayAll) {
+    return AnimatedSlide(
+      offset: isPlayAll.value ? Offset.zero : const Offset(0.75, 0),
+      duration: const Duration(milliseconds: 120),
+      child: GestureDetector(
+        onHorizontalDragDown: (details) => dx = details.localPosition.dx,
+        onHorizontalDragStart: (details) => setIsPlayAll(
+          details.localPosition.dx < dx,
+        ),
+        child: FloatingActionButton.extended(
+          onPressed: () {
+            if (isPlayAll.value) {
+              onPlayAll();
+            } else {
+              setIsPlayAll(true);
+            }
+          },
+          label: const Text('播放全部'),
+          icon: const Icon(Icons.playlist_play),
+        ),
+      ),
+    );
+  }
+}

lib/pages/fav_detail/controller.dart

@@ -12,13 +12,11 @@ import 'package:PiliPlus/models_new/video/video_detail/page.dart';
 import 'package:PiliPlus/pages/common/common_list_controller.dart';
 import 'package:PiliPlus/pages/common/multi_select/base.dart';
 import 'package:PiliPlus/pages/common/multi_select/multi_select_controller.dart';
+import 'package:PiliPlus/pages/common/play_all_btn_mixin.dart';
 import 'package:PiliPlus/pages/fav_sort/view.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
-import 'package:PiliPlus/utils/storage.dart';
-import 'package:PiliPlus/utils/storage_key.dart';
-import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart' show Text, ValueChanged;
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -79,7 +77,7 @@ mixin BaseFavController
 
 class FavDetailController
     extends MultiSelectController<FavDetailData, FavDetailItemModel>
-    with BaseFavController {
+    with BaseFavController, PlayAllBtnMixin {
   @override
   late int mediaId;
   final Rx<FavFolderInfo> folderInfo = FavFolderInfo().obs;
@@ -91,15 +89,6 @@ class FavDetailController
 
   late final account = Accounts.main;
 
-  late double dx = 0;
-  late final RxBool isPlayAll = Pref.enablePlayAll.obs;
-
-  void setIsPlayAll(bool isPlayAll) {
-    if (this.isPlayAll.value == isPlayAll) return;
-    this.isPlayAll.value = isPlayAll;
-    GStorage.setting.put(SettingBoxKey.enablePlayAll, isPlayAll);
-  }
-
   @override
   void onInit() {
     super.onInit();

lib/pages/fav_detail/view.dart

@@ -93,32 +93,8 @@ class _FavDetailPageState extends State<FavDetailPage> with GridMixin {
                     padding: const .only(right: kFloatingActionButtonMargin),
                     child: Obx(
                       () => _favDetailController.folderInfo.value.mediaCount > 0
-                          ? AnimatedSlide(
+                          ? _favDetailController.playAllBtn(
-                              offset: _favDetailController.isPlayAll.value
+                              _favDetailController.toViewPlayAll,
-                                  ? Offset.zero
-                                  : const Offset(0.75, 0),
-                              duration: const Duration(milliseconds: 120),
-                              child: GestureDetector(
-                                onHorizontalDragDown: (details) =>
-                                    _favDetailController.dx =
-                                        details.localPosition.dx,
-                                onHorizontalDragStart: (details) =>
-                                    _favDetailController.setIsPlayAll(
-                                      details.localPosition.dx <
-                                          _favDetailController.dx,
-                                    ),
-                                child: FloatingActionButton.extended(
-                                  onPressed: () {
-                                    if (_favDetailController.isPlayAll.value) {
-                                      _favDetailController.toViewPlayAll();
-                                    } else {
-                                      _favDetailController.setIsPlayAll(true);
-                                    }
-                                  },
-                                  label: const Text('播放全部'),
-                                  icon: const Icon(Icons.playlist_play),
-                                ),
-                              ),
                             )
                           : const SizedBox.shrink(),
                     ),

lib/pages/later/base_controller.dart

@@ -1,21 +1,10 @@
 import 'package:PiliPlus/models/common/later_view_type.dart';
-import 'package:PiliPlus/utils/storage.dart';
+import 'package:PiliPlus/pages/common/play_all_btn_mixin.dart';
-import 'package:PiliPlus/utils/storage_key.dart';
-import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:get/get.dart';
 
-class LaterBaseController extends GetxController {
+class LaterBaseController extends GetxController with PlayAllBtnMixin {
   RxBool enableMultiSelect = false.obs;
   RxInt checkedCount = 0.obs;
 
   RxList<int> counts = List.filled(LaterViewType.values.length, -1).obs;
-
-  late double dx = 0;
-  late final RxBool isPlayAll = Pref.enablePlayAll.obs;
-
-  void setIsPlayAll(bool isPlayAll) {
-    if (this.isPlayAll.value == isPlayAll) return;
-    this.isPlayAll.value = isPlayAll;
-    GStorage.setting.put(SettingBoxKey.enablePlayAll, isPlayAll);
-  }
 }

lib/pages/later/view.dart

@@ -126,31 +126,7 @@ class _LaterPageState extends State<LaterPage>
                     padding: const .only(right: kFloatingActionButtonMargin),
                     child: Obx(
                       () => currCtr().loadingState.value.isSuccess
-                          ? AnimatedSlide(
+                          ? _baseCtr.playAllBtn(currCtr().toViewPlayAll)
-                              offset: _baseCtr.isPlayAll.value
-                                  ? Offset.zero
-                                  : const Offset(0.75, 0),
-                              duration: const Duration(milliseconds: 120),
-                              child: GestureDetector(
-                                onHorizontalDragDown: (details) =>
-                                    _baseCtr.dx = details.localPosition.dx,
-                                onHorizontalDragStart: (details) =>
-                                    _baseCtr.setIsPlayAll(
-                                      details.localPosition.dx < _baseCtr.dx,
-                                    ),
-                                child: FloatingActionButton.extended(
-                                  onPressed: () {
-                                    if (_baseCtr.isPlayAll.value) {
-                                      currCtr().toViewPlayAll();
-                                    } else {
-                                      _baseCtr.setIsPlayAll(true);
-                                    }
-                                  },
-                                  label: const Text('播放全部'),
-                                  icon: const Icon(Icons.playlist_play),
-                                ),
-                              ),
-                            )
                           : const SizedBox.shrink(),
                     ),
                   ),

lib/pages/popular_precious/view.dart

@@ -6,6 +6,7 @@ import 'package:PiliPlus/common/widgets/view_sliver_safe_area.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/common/video/source_type.dart';
 import 'package:PiliPlus/models/model_hot_video_item.dart';
+import 'package:PiliPlus/pages/common/play_all_btn_mixin.dart';
 import 'package:PiliPlus/pages/popular_precious/controller.dart';
 import 'package:PiliPlus/utils/grid.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
@@ -20,27 +21,70 @@ class PopularPreciousPage extends StatefulWidget {
 }
 
 class _PopularPreciousPageState extends State<PopularPreciousPage>
-    with GridMixin {
+    with GridMixin, PlayAllBtnMixin {
   final _controller = Get.put(PopularPreciousController());
 
   @override
   Widget build(BuildContext context) {
+    final padding = MediaQuery.viewPaddingOf(context);
     return scaffold(
       appBar: AppBar(title: const Text('入站必刷')),
-      body: refreshIndicator(
+      body: Stack(
-        onRefresh: _controller.onRefresh,
+        clipBehavior: .none,
-        child: CustomScrollView(
+        children: [
-          physics: const AlwaysScrollableScrollPhysics(),
+          refreshIndicator(
-          slivers: [
+            onRefresh: _controller.onRefresh,
-            ViewSliverSafeArea(
+            child: CustomScrollView(
-              sliver: Obx(() => _buildBody(_controller.loadingState.value)),
+              physics: const AlwaysScrollableScrollPhysics(),
+              slivers: [
+                ViewSliverSafeArea(
+                  sliver: Obx(() => _buildBody(_controller.loadingState.value)),
+                ),
+              ],
             ),
-          ],
+          ),
-        ),
+          Positioned(
+            right: padding.right,
+            bottom: padding.bottom + kFloatingActionButtonMargin,
+            child: Padding(
+              padding: const .only(right: kFloatingActionButtonMargin),
+              child: Obx(() {
+                if (_controller.loadingState.value case Success(
+                  :final response,
+                )) {
+                  return playAllBtn(() => toVideoPage(response!.first));
+                }
+                return const SizedBox.shrink();
+              }),
+            ),
+          ),
+        ],
       ),
     );
   }
 
+  void toVideoPage(
+    HotVideoItemModel item, {
+    int index = 0,
+    bool isPlayAll = true,
+  }) {
+    PageUtils.toVideoPage(
+      bvid: item.bvid,
+      cid: item.cid!,
+      dimension: item.dimension,
+      extraArguments: isPlayAll
+          ? {
+              'sourceType': SourceType.playlist,
+              'favTitle': '入站必刷',
+              'mediaId': _controller.mediaId,
+              'desc': true,
+              'oid': item.aid,
+              'isContinuePlaying': index != 0,
+            }
+          : null,
+    );
+  }
+
   Widget _buildBody(LoadingState<List<HotVideoItemModel>?> value) {
     switch (value) {
       case Loading():
@@ -53,21 +97,11 @@ class _PopularPreciousPageState extends State<PopularPreciousPage>
             final item = response[index];
             return VideoCardH(
               videoItem: item,
-              onTap: () {
+              onTap: () => toVideoPage(
-                PageUtils.toVideoPage(
+                item,
-                  bvid: item.bvid,
+                index: index,
-                  cid: item.cid!,
+                isPlayAll: isPlayAll.value,
-                  dimension: item.dimension,
+              ),
-                  extraArguments: {
-                    'sourceType': SourceType.playlist,
-                    'favTitle': '入站必刷',
-                    'mediaId': _controller.mediaId,
-                    'desc': true,
-                    'oid': item.aid,
-                    'isContinuePlaying': index != 0,
-                  },
-                );
-              },
             );
           },
         );

lib/pages/popular_series/view.dart

@@ -11,6 +11,7 @@ import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/common/video/source_type.dart';
 import 'package:PiliPlus/models/model_hot_video_item.dart';
 import 'package:PiliPlus/models_new/popular/popular_series_one/config.dart';
+import 'package:PiliPlus/pages/common/play_all_btn_mixin.dart';
 import 'package:PiliPlus/pages/popular_series/controller.dart';
 import 'package:PiliPlus/utils/grid.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
@@ -24,11 +25,13 @@ class PopularSeriesPage extends StatefulWidget {
   State<PopularSeriesPage> createState() => _PopularSeriesPageState();
 }
 
-class _PopularSeriesPageState extends State<PopularSeriesPage> with GridMixin {
+class _PopularSeriesPageState extends State<PopularSeriesPage>
+    with GridMixin, PlayAllBtnMixin {
   final _controller = Get.put(PopularSeriesController());
 
   @override
   Widget build(BuildContext context) {
+    final padding = MediaQuery.viewPaddingOf(context);
     return scaffold(
       appBar: AppBar(
         title: Obx(() {
@@ -39,20 +42,63 @@ class _PopularSeriesPageState extends State<PopularSeriesPage> with GridMixin {
           return const Text('每周必看');
         }),
       ),
-      body: refreshIndicator(
+      body: Stack(
-        onRefresh: _controller.onRefresh,
+        clipBehavior: .none,
-        child: CustomScrollView(
+        children: [
-          physics: ReloadScrollPhysics(controller: _controller),
+          refreshIndicator(
-          slivers: [
+            onRefresh: _controller.onRefresh,
-            ViewSliverSafeArea(
+            child: CustomScrollView(
-              sliver: Obx(() => _buildBody(_controller.loadingState.value)),
+              physics: ReloadScrollPhysics(controller: _controller),
+              slivers: [
+                ViewSliverSafeArea(
+                  sliver: Obx(() => _buildBody(_controller.loadingState.value)),
+                ),
+              ],
             ),
-          ],
+          ),
-        ),
+          Positioned(
+            right: padding.right,
+            bottom: padding.bottom + kFloatingActionButtonMargin,
+            child: Padding(
+              padding: const .only(right: kFloatingActionButtonMargin),
+              child: Obx(() {
+                if (_controller.loadingState.value case Success(
+                  :final response,
+                )) {
+                  return playAllBtn(() => toVideoPage(response!.first));
+                }
+                return const SizedBox.shrink();
+              }),
+            ),
+          ),
+        ],
       ),
     );
   }
 
+  void toVideoPage(
+    HotVideoItemModel item, {
+    int index = 0,
+    bool isPlayAll = true,
+  }) {
+    final config = _controller.config.value;
+    PageUtils.toVideoPage(
+      bvid: item.bvid,
+      cid: item.cid!,
+      dimension: item.dimension,
+      extraArguments: isPlayAll
+          ? {
+              'sourceType': SourceType.playlist,
+              'favTitle': '每周必看 ${config?.label ?? ''}',
+              'mediaId': config?.mediaId,
+              'desc': true,
+              'oid': item.aid,
+              'isContinuePlaying': index != 0,
+            }
+          : null,
+    );
+  }
+
   Widget _buildBody(LoadingState<List<HotVideoItemModel>?> value) {
     switch (value) {
       case Loading():
@@ -67,22 +113,8 @@ class _PopularSeriesPageState extends State<PopularSeriesPage> with GridMixin {
               final item = response[index];
               return VideoCardH(
                 videoItem: item,
-                onTap: () {
+                onTap: () =>
-                  final config = _controller.config.value;
+                    toVideoPage(item, index: index, isPlayAll: isPlayAll.value),
-                  PageUtils.toVideoPage(
-                    bvid: item.bvid,
-                    cid: item.cid!,
-                    dimension: item.dimension,
-                    extraArguments: {
-                      'sourceType': SourceType.playlist,
-                      'favTitle': '每周必看 ${config?.label ?? ''}',
-                      'mediaId': config?.mediaId,
-                      'desc': true,
-                      'oid': item.aid,
-                      'isContinuePlaying': index != 0,
-                    },
-                  );
-                },
               );
             },
           );