opt: search panel

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

lib/pages/search_panel/view.dart

@@ -1,5 +1,6 @@
 import 'package:PiliPalaX/common/widgets/refresh_indicator.dart';
 import 'package:PiliPalaX/http/loading_state.dart';
+import 'package:PiliPalaX/pages/search_panel/widgets/video_panel.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -14,7 +15,6 @@ import 'widgets/article_panel.dart';
 import 'widgets/live_panel.dart';
 import 'widgets/media_bangumi_panel.dart';
 import 'widgets/user_panel.dart';
-import 'widgets/video_panel.dart';
 
 class SearchPanel extends StatefulWidget {
   final String? keyword;
@@ -112,9 +112,10 @@ class _SearchPanelState extends State<SearchPanel>
     } else {
       switch (widget.searchType) {
         case SearchType.video:
-          return SearchVideoPanel(
+          return searchVideoPanel(
-            ctr: _searchPanelController,
+            context,
-            loadingState: loadingState,
+            _searchPanelController,
+            loadingState,
           );
         case SearchType.media_bangumi:
           return searchBangumiPanel(

lib/pages/search_panel/widgets/article_panel.dart

@@ -1,4 +1,5 @@
 import 'package:PiliPalaX/common/widgets/http_error.dart';
+import 'package:PiliPalaX/common/widgets/loading_widget.dart';
 import 'package:PiliPalaX/http/loading_state.dart';
 import 'package:PiliPalaX/pages/search/widgets/search_text.dart';
 import 'package:PiliPalaX/pages/search_panel/controller.dart';
@@ -13,7 +14,7 @@ import 'package:PiliPalaX/utils/utils.dart';
 
 import '../../../utils/grid.dart';
 
-Widget searchArticlePanel(BuildContext context, searchPanelCtr, loadingState) {
+Widget searchArticlePanel(context, searchPanelCtr, LoadingState loadingState) {
   TextStyle textStyle = TextStyle(
       fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
       color: Theme.of(context).colorScheme.outline);
@@ -73,7 +74,9 @@ Widget searchArticlePanel(BuildContext context, searchPanelCtr, loadingState) {
           ),
         ),
       ),
-      loadingState is Success
+      switch (loadingState) {
+        Loading() => errorWidget(),
+        Success() => (loadingState.response as List?)?.isNotEmpty == true
             ? SliverPadding(
                 padding: EdgeInsets.only(
                   bottom: StyleString.safeSpace +
@@ -111,15 +114,17 @@ Widget searchArticlePanel(BuildContext context, searchPanelCtr, loadingState) {
                                               .scale(1.0)) /
                                   2;
                               return Container(
-                              constraints: const BoxConstraints(minHeight: 88),
+                                constraints:
+                                    const BoxConstraints(minHeight: 88),
                                 height: width / StyleString.aspectRatio,
                                 child: Row(
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: <Widget>[
-                                  if (loadingState.response[index].imageUrls !=
+                                    if (loadingState
+                                                .response[index].imageUrls !=
                                             null &&
-                                      loadingState
+                                        loadingState.response[index].imageUrls
-                                          .response[index].imageUrls.isNotEmpty)
+                                            .isNotEmpty)
                                       AspectRatio(
                                         aspectRatio: StyleString.aspectRatio,
                                         child: LayoutBuilder(
@@ -131,8 +136,8 @@ Widget searchArticlePanel(BuildContext context, searchPanelCtr, loadingState) {
                                           return NetworkImgLayer(
                                             width: maxWidth,
                                             height: maxHeight,
-                                          src: loadingState
+                                            src: loadingState.response[index]
-                                              .response[index].imageUrls.first,
+                                                .imageUrls.first,
                                           );
                                         }),
                                       ),
@@ -150,7 +155,8 @@ Widget searchArticlePanel(BuildContext context, searchPanelCtr, loadingState) {
                                               text: TextSpan(
                                                 children: [
                                                   for (var i in loadingState
-                                                    .response[index].title) ...[
+                                                      .response[index]
+                                                      .title) ...[
                                                     TextSpan(
                                                       text: i['text'],
                                                       style: TextStyle(
@@ -173,8 +179,8 @@ Widget searchArticlePanel(BuildContext context, searchPanelCtr, loadingState) {
                                             const Spacer(),
                                             Text(
                                                 Utils.dateFormat(
-                                                  loadingState
+                                                    loadingState.response[index]
-                                                      .response[index].pubTime,
+                                                        .pubTime,
                                                     formatType: 'detail'),
                                                 style: textStyle),
                                             Row(
@@ -205,9 +211,14 @@ Widget searchArticlePanel(BuildContext context, searchPanelCtr, loadingState) {
                 ),
               )
             : HttpError(
-              errMsg: loadingState is Error ? loadingState.errMsg : '没有相关数据',
                 callback: searchPanelCtr.onReload,
               ),
+        Error() => HttpError(
+            errMsg: loadingState.errMsg,
+            callback: searchPanelCtr.onReload,
+          ),
+        LoadingState() => throw UnimplementedError(),
+      },
     ],
   );
 }

lib/pages/search_panel/widgets/live_panel.dart

@@ -75,15 +75,12 @@ class LiveItem extends StatelessWidget {
                   double maxHeight = boxConstraints.maxHeight;
                   return Stack(
                     children: [
-                      Hero(
+                      NetworkImgLayer(
-                        tag: heroTag,
-                        child: NetworkImgLayer(
                         src: liveItem.cover,
                         type: 'emote',
                         width: maxWidth,
                         height: maxHeight,
                       ),
-                      ),
                       Positioned(
                         left: 0,
                         right: 0,

lib/pages/search_panel/widgets/media_bangumi_panel.dart

@@ -1,4 +1,4 @@
-import 'package:PiliPalaX/common/widgets/http_error.dart';
+import 'package:PiliPalaX/common/widgets/loading_widget.dart';
 import 'package:PiliPalaX/http/loading_state.dart';
 import 'package:flutter/material.dart';
 import 'package:PiliPalaX/common/constants.dart';
@@ -8,14 +8,16 @@ import 'package:PiliPalaX/utils/utils.dart';
 
 import '../../../utils/grid.dart';
 
-Widget searchBangumiPanel(BuildContext context, ctr, loadingState) {
+Widget searchBangumiPanel(context, ctr, LoadingState loadingState) {
   TextStyle style =
       TextStyle(fontSize: Theme.of(context).textTheme.labelMedium!.fontSize);
-  return CustomScrollView(
+  return switch (loadingState) {
+    Loading() => loadingWidget,
+    Success() => (loadingState.response as List?)?.isNotEmpty == true
+        ? CustomScrollView(
             controller: ctr.scrollController,
             slivers: [
-      loadingState is Success
+              SliverPadding(
-          ? SliverPadding(
                 padding: EdgeInsets.only(
                   bottom: StyleString.safeSpace +
                       MediaQuery.of(context).padding.bottom,
@@ -77,7 +79,8 @@ Widget searchBangumiPanel(BuildContext context, ctr, loadingState) {
                                             TextSpan(
                                               text: i['text'],
                                               style: TextStyle(
-                                              fontSize: MediaQuery.textScalerOf(
+                                                fontSize:
+                                                    MediaQuery.textScalerOf(
                                                             context)
                                                         .scale(Theme.of(context)
                                                             .textTheme
@@ -98,7 +101,8 @@ Widget searchBangumiPanel(BuildContext context, ctr, loadingState) {
                                       ),
                                     ),
                                     const SizedBox(height: 12),
-                                  Text('评分:${i.mediaScore['score'].toString()}',
+                                    Text(
+                                        '评分:${i.mediaScore['score'].toString()}',
                                         style: style),
                                     Row(
                                       children: [
@@ -132,11 +136,16 @@ Widget searchBangumiPanel(BuildContext context, ctr, loadingState) {
                     childCount: loadingState.response.length,
                   ),
                 ),
-            )
-          : HttpError(
-              errMsg: loadingState is Error ? loadingState.errMsg : '没有相关数据',
-              callback: ctr.onReload,
               ),
             ],
-  );
+          )
+        : errorWidget(
+            callback: ctr.onReload,
+          ),
+    Error() => errorWidget(
+        errMsg: loadingState.errMsg,
+        callback: ctr.onReload,
+      ),
+    LoadingState() => throw UnimplementedError(),
+  };
 }

lib/pages/search_panel/widgets/user_panel.dart

@@ -1,4 +1,5 @@
 import 'package:PiliPalaX/common/widgets/http_error.dart';
+import 'package:PiliPalaX/common/widgets/loading_widget.dart';
 import 'package:PiliPalaX/http/loading_state.dart';
 import 'package:PiliPalaX/pages/search/widgets/search_text.dart';
 import 'package:PiliPalaX/pages/search_panel/controller.dart';
@@ -13,7 +14,7 @@ import 'package:PiliPalaX/utils/utils.dart';
 import '../../../common/constants.dart';
 import '../../../utils/grid.dart';
 
-Widget searchUserPanel(BuildContext context, searchPanelCtr, loadingState) {
+Widget searchUserPanel(context, searchPanelCtr, LoadingState loadingState) {
   TextStyle style = TextStyle(
       fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
       color: Theme.of(context).colorScheme.outline);
@@ -73,7 +74,9 @@ Widget searchUserPanel(BuildContext context, searchPanelCtr, loadingState) {
           ),
         ),
       ),
-      loadingState is Success
+      switch (loadingState) {
+        Loading() => errorWidget(),
+        Success() => (loadingState.response as List?)?.isNotEmpty == true
             ? SliverPadding(
                 padding: EdgeInsets.only(
                   bottom: StyleString.safeSpace +
@@ -96,15 +99,12 @@ Widget searchUserPanel(BuildContext context, searchPanelCtr, loadingState) {
                         child: Row(
                           children: [
                             const SizedBox(width: 15),
-                          Hero(
+                            NetworkImgLayer(
-                            tag: heroTag,
-                            child: NetworkImgLayer(
                               width: 42,
                               height: 42,
                               src: i.upic,
                               type: 'avatar',
                             ),
-                          ),
                             const SizedBox(width: 10),
                             Column(
                               mainAxisSize: MainAxisSize.max,
@@ -149,9 +149,14 @@ Widget searchUserPanel(BuildContext context, searchPanelCtr, loadingState) {
                 ),
               )
             : HttpError(
-              errMsg: loadingState is Error ? loadingState.errMsg : '没有相关数据',
                 callback: searchPanelCtr.onReload,
-            )
+              ),
+        Error() => HttpError(
+            errMsg: loadingState.errMsg,
+            callback: searchPanelCtr.onReload,
+          ),
+        LoadingState() => throw UnimplementedError(),
+      },
     ],
   );
 }

lib/pages/search_panel/widgets/video_panel.dart

@@ -1,4 +1,5 @@
 import 'package:PiliPalaX/common/widgets/http_error.dart';
+import 'package:PiliPalaX/common/widgets/loading_widget.dart';
 import 'package:PiliPalaX/http/loading_state.dart';
 import 'package:PiliPalaX/pages/search/widgets/search_text.dart';
 import 'package:PiliPalaX/pages/video/detail/reply/view.dart'
@@ -14,20 +15,8 @@ import 'package:intl/intl.dart';
 import '../../../common/constants.dart';
 import '../../../utils/grid.dart';
 
-class SearchVideoPanel extends StatelessWidget {
+Widget searchVideoPanel(context, ctr, LoadingState loadingState) {
-  SearchVideoPanel({
+  final controller = Get.put(VideoPanelController());
-    required this.ctr,
-    required this.loadingState,
-    super.key,
-  });
-
-  final SearchPanelController ctr;
-  final dynamic loadingState;
-
-  final VideoPanelController controller = Get.put(VideoPanelController());
-
-  @override
-  Widget build(BuildContext context) {
   return CustomScrollView(
     controller: ctr.scrollController,
     slivers: [
@@ -36,7 +25,6 @@ class SearchVideoPanel extends StatelessWidget {
         floating: true,
         delegate: MySliverPersistentHeaderDelegate(
           child: Container(
-              width: context.width,
             height: 34,
             color: Theme.of(context).colorScheme.surface,
             padding: const EdgeInsets.symmetric(horizontal: 12),
@@ -94,7 +82,9 @@ class SearchVideoPanel extends StatelessWidget {
           ),
         ),
       ),
-        loadingState is Success
+      switch (loadingState) {
+        Loading() => errorWidget(),
+        Success() => (loadingState.response as List?)?.isNotEmpty == true
             ? SliverPadding(
                 padding: EdgeInsets.only(
                   left: StyleString.safeSpace,
@@ -122,13 +112,17 @@ class SearchVideoPanel extends StatelessWidget {
                 ),
               )
             : HttpError(
-                errMsg: loadingState is Error ? loadingState.errMsg : '没有相关数据',
                 callback: ctr.onReload,
               ),
+        Error() => HttpError(
+            errMsg: loadingState.errMsg,
+            callback: ctr.onReload,
+          ),
+        _ => throw UnimplementedError(),
+      },
     ],
   );
 }
-}
 
 class CustomFilterChip extends StatelessWidget {
   const CustomFilterChip({

lib/pages/video/detail/related/view.dart

@@ -87,9 +87,7 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel>
                 }
               }, childCount: loadingState.response.length + 1),
             )
-          : HttpError(
+          : SliverToBoxAdapter(),
-              callback: _relatedController.onReload,
-            ),
       Error() => HttpError(
           errMsg: loadingState.errMsg,
           callback: _relatedController.onReload,