tweak

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

lib/http/search.dart

@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:PiliPlus/http/api.dart';
 import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/search_type.dart';
+import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/models/search/suggest.dart';
 import 'package:PiliPlus/models_new/dynamic/dyn_topic_pub_search/data.dart';

lib/models/common/search/search_type.dart

@@ -26,18 +26,3 @@ enum SearchType {
   final String label;
   const SearchType(this.label, {this.hasHeader = false});
 }
-
-// 搜索类型为视频、专栏及相簿时
-enum ArchiveFilterType {
-  totalrank('默认排序'),
-  click('播放多'),
-  pubdate('新发布'),
-  dm('弹幕多'),
-  stow('收藏多'),
-  scores('评论多');
-  // 专栏
-  // attention('最多喜欢'),
-
-  final String desc;
-  const ArchiveFilterType(this.desc);
-}

lib/models/common/search/video_search_type.dart

@@ -47,3 +47,18 @@ enum VideoZoneType {
   final int? tids;
   const VideoZoneType(this.label, {this.tids});
 }
+
+// 搜索类型为视频、专栏及相簿时
+enum ArchiveFilterType {
+  totalrank('默认排序'),
+  click('播放多'),
+  pubdate('新发布'),
+  dm('弹幕多'),
+  stow('收藏多'),
+  scores('评论多');
+  // 专栏
+  // attention('最多喜欢'),
+
+  final String desc;
+  const ArchiveFilterType(this.desc);
+}

lib/pages/search_panel/all/controller.dart

@@ -1,6 +1,6 @@
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/search_type.dart';
+import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/pages/search_panel/controller.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';

lib/pages/search_panel/controller.dart

@@ -1,9 +1,9 @@
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/models/common/search/article_search_type.dart';
+import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:PiliPlus/models/common/search/user_search_type.dart';
 import 'package:PiliPlus/models/common/search/video_search_type.dart';
-import 'package:PiliPlus/models/common/search_type.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/pages/common/common_list_controller.dart';
 import 'package:PiliPlus/pages/search_result/controller.dart';

lib/pages/search_panel/video/controller.dart

@@ -1,8 +1,8 @@
 import 'dart:math';
 
 import 'package:PiliPlus/http/loading_state.dart';
+import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:PiliPlus/models/common/search/video_search_type.dart';
-import 'package:PiliPlus/models/common/search_type.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/pages/search/widgets/search_text.dart';
 import 'package:PiliPlus/pages/search_panel/controller.dart';

lib/pages/search_panel/video/view.dart

@@ -1,6 +1,6 @@
 import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart';
 import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart';
-import 'package:PiliPlus/models/common/search_type.dart';
+import 'package:PiliPlus/models/common/search/video_search_type.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/pages/search/widgets/search_text.dart';
 import 'package:PiliPlus/pages/search_panel/video/controller.dart';

lib/pages/search_panel/view.dart

@@ -6,7 +6,7 @@ import 'package:PiliPlus/common/skeleton/video_card_v.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/common/search_type.dart';
+import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/pages/search_panel/controller.dart';
 import 'package:PiliPlus/utils/grid.dart';

lib/pages/search_result/controller.dart

@@ -1,4 +1,4 @@
-import 'package:PiliPlus/models/common/search_type.dart';
+import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:get/get.dart';
 
 class SearchResultController extends GetxController {

lib/pages/search_result/view.dart

@@ -1,5 +1,5 @@
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
-import 'package:PiliPlus/models/common/search_type.dart';
+import 'package:PiliPlus/models/common/search/search_type.dart';
 import 'package:PiliPlus/pages/search/controller.dart';
 import 'package:PiliPlus/pages/search_panel/article/view.dart';
 import 'package:PiliPlus/pages/search_panel/live/view.dart';
@@ -44,8 +44,8 @@ class _SearchResultPageState extends State<SearchResultPage>
         sSearchController = Get.find<SSearchController>(
           tag: Get.parameters['tag'],
         );
-      } catch (_) {}
         _tabController.addListener(listener);
+      } catch (_) {}
     }
   }