opt: get theme color

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

lib/pages/search_panel/user/controller.dart

@@ -41,85 +41,90 @@ class SearchUserController
       constraints: BoxConstraints(
         maxWidth: min(640, min(Get.width, Get.height)),
       ),
-      builder: (context) => SingleChildScrollView(
-        child: Container(
-          width: double.infinity,
-          padding: EdgeInsets.only(
-            top: 20,
-            left: 16,
-            right: 16,
-            bottom: 80 + MediaQuery.of(context).padding.bottom,
+      builder: (context) {
+        final theme = Theme.of(context);
+        return SingleChildScrollView(
+          child: Container(
+            width: double.infinity,
+            padding: EdgeInsets.only(
+              top: 20,
+              left: 16,
+              right: 16,
+              bottom: 80 + MediaQuery.of(context).padding.bottom,
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 10),
+                const Text('用户粉丝数及等级排序顺序', style: TextStyle(fontSize: 16)),
+                const SizedBox(height: 10),
+                Wrap(
+                  spacing: 8,
+                  runSpacing: 8,
+                  children: orderFiltersList
+                      .map(
+                        (item) => SearchText(
+                          text: item['label'],
+                          onTap: (_) async {
+                            Get.back();
+                            currentOrderFilterval.value = item['value'];
+                            SmartDialog.dismiss();
+                            SmartDialog.showToast("「${item['label']}」的筛选结果");
+                            orderSort = item['orderSort'];
+                            order.value = item['order'];
+                            SmartDialog.showLoading(msg: 'loading');
+                            await onReload();
+                            SmartDialog.dismiss();
+                          },
+                          bgColor: item['value'] == currentOrderFilterval.value
+                              ? theme.colorScheme.secondaryContainer
+                              : null,
+                          textColor:
+                              item['value'] == currentOrderFilterval.value
+                                  ? theme.colorScheme.onSecondaryContainer
+                                  : null,
+                        ),
+                      )
+                      .toList(),
+                ),
+                const SizedBox(height: 20),
+                const Text('用户分类', style: TextStyle(fontSize: 16)),
+                const SizedBox(height: 10),
+                Wrap(
+                  spacing: 8,
+                  runSpacing: 8,
+                  children: userTypeFiltersList
+                      .map(
+                        (item) => SearchText(
+                          text: item['label'],
+                          onTap: (_) async {
+                            Get.back();
+                            currentUserTypeFilterval.value = item['value'];
+                            SmartDialog.dismiss();
+                            SmartDialog.showToast("「${item['label']}」的筛选结果");
+                            userType = item['userType'];
+                            SmartDialog.showLoading(msg: 'loading');
+                            await onReload();
+                            SmartDialog.dismiss();
+                          },
+                          bgColor:
+                              item['value'] == currentUserTypeFilterval.value
+                                  ? theme.colorScheme.secondaryContainer
+                                  : null,
+                          textColor:
+                              item['value'] == currentUserTypeFilterval.value
+                                  ? theme.colorScheme.onSecondaryContainer
+                                  : null,
+                        ),
+                      )
+                      .toList(),
+                ),
+              ],
+            ),
           ),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              const SizedBox(height: 10),
-              const Text('用户粉丝数及等级排序顺序', style: TextStyle(fontSize: 16)),
-              const SizedBox(height: 10),
-              Wrap(
-                spacing: 8,
-                runSpacing: 8,
-                children: orderFiltersList
-                    .map(
-                      (item) => SearchText(
-                        text: item['label'],
-                        onTap: (_) async {
-                          Get.back();
-                          currentOrderFilterval.value = item['value'];
-                          SmartDialog.dismiss();
-                          SmartDialog.showToast("「${item['label']}」的筛选结果");
-                          orderSort = item['orderSort'];
-                          order.value = item['order'];
-                          SmartDialog.showLoading(msg: 'loading');
-                          await onReload();
-                          SmartDialog.dismiss();
-                        },
-                        bgColor: item['value'] == currentOrderFilterval.value
-                            ? Theme.of(context).colorScheme.secondaryContainer
-                            : null,
-                        textColor: item['value'] == currentOrderFilterval.value
-                            ? Theme.of(context).colorScheme.onSecondaryContainer
-                            : null,
-                      ),
-                    )
-                    .toList(),
-              ),
-              const SizedBox(height: 20),
-              const Text('用户分类', style: TextStyle(fontSize: 16)),
-              const SizedBox(height: 10),
-              Wrap(
-                spacing: 8,
-                runSpacing: 8,
-                children: userTypeFiltersList
-                    .map(
-                      (item) => SearchText(
-                        text: item['label'],
-                        onTap: (_) async {
-                          Get.back();
-                          currentUserTypeFilterval.value = item['value'];
-                          SmartDialog.dismiss();
-                          SmartDialog.showToast("「${item['label']}」的筛选结果");
-                          userType = item['userType'];
-                          SmartDialog.showLoading(msg: 'loading');
-                          await onReload();
-                          SmartDialog.dismiss();
-                        },
-                        bgColor: item['value'] == currentUserTypeFilterval.value
-                            ? Theme.of(context).colorScheme.secondaryContainer
-                            : null,
-                        textColor: item['value'] ==
-                                currentUserTypeFilterval.value
-                            ? Theme.of(context).colorScheme.onSecondaryContainer
-                            : null,
-                      ),
-                    )
-                    .toList(),
-              ),
-            ],
-          ),
-        ),
-      ),
+        );
+      },
     );
   }
 }

lib/pages/search_panel/user/view.dart

@@ -1,5 +1,4 @@
 import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart';
-import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/search/result.dart';
 import 'package:PiliPlus/pages/search_panel/user/controller.dart';
 import 'package:PiliPlus/pages/search_panel/user/widgets/item.dart';
@@ -14,7 +13,6 @@ class SearchUserPanel extends CommonSearchPanel {
     required super.keyword,
     required super.tag,
     required super.searchType,
-    super.hasHeader = true,
   });
 
   @override
@@ -33,98 +31,82 @@ class _SearchUserPanelState extends CommonSearchPanelState<SearchUserPanel,
     tag: widget.searchType.name + widget.tag,
   );
 
-  late TextStyle style;
-
   @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    style = TextStyle(
-      fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-      color: Theme.of(context).colorScheme.outline,
-    );
-  }
-
-  @override
-  Widget buildHeader(LoadingState<List<SearchUserItemModel>?> loadingState) {
-    if (loadingState is Success) {
-      return SliverPersistentHeader(
-        pinned: false,
-        floating: true,
-        delegate: CustomSliverPersistentHeaderDelegate(
-          extent: 40,
-          bgColor: Theme.of(context).colorScheme.surface,
-          child: Container(
-            height: 40,
-            padding: const EdgeInsets.only(left: 25, right: 12),
-            child: Row(
-              children: [
-                Obx(
-                  () => Text(
-                    '排序: ${controller.orderFiltersList[controller.currentOrderFilterval.value]['label']}',
-                    maxLines: 1,
-                    style:
-                        TextStyle(color: Theme.of(context).colorScheme.outline),
-                  ),
-                ),
-                const Spacer(),
-                Obx(
-                  () => Text(
-                    '用户类型: ${controller.userTypeFiltersList[controller.currentUserTypeFilterval.value]['label']}',
-                    maxLines: 1,
-                    style:
-                        TextStyle(color: Theme.of(context).colorScheme.outline),
-                  ),
-                ),
-                const Spacer(),
-                SizedBox(
-                  width: 32,
-                  height: 32,
-                  child: IconButton(
-                    tooltip: '筛选',
-                    style: ButtonStyle(
-                      padding: WidgetStateProperty.all(EdgeInsets.zero),
-                    ),
-                    onPressed: () {
-                      controller.onShowFilterDialog(context);
-                    },
-                    icon: Icon(
-                      Icons.filter_list_outlined,
-                      size: 18,
-                      color: Theme.of(context).colorScheme.primary,
+  Widget buildList(ThemeData theme, List<SearchUserItemModel> list) {
+    return SliverMainAxisGroup(
+      slivers: [
+        SliverPersistentHeader(
+          pinned: false,
+          floating: true,
+          delegate: CustomSliverPersistentHeaderDelegate(
+            extent: 40,
+            bgColor: theme.colorScheme.surface,
+            child: Container(
+              height: 40,
+              padding: const EdgeInsets.only(left: 25, right: 12),
+              child: Row(
+                children: [
+                  Obx(
+                    () => Text(
+                      '排序: ${controller.orderFiltersList[controller.currentOrderFilterval.value]['label']}',
+                      maxLines: 1,
+                      style: TextStyle(color: theme.colorScheme.outline),
                     ),
                   ),
-                ),
-              ],
+                  const Spacer(),
+                  Obx(
+                    () => Text(
+                      '用户类型: ${controller.userTypeFiltersList[controller.currentUserTypeFilterval.value]['label']}',
+                      maxLines: 1,
+                      style: TextStyle(color: theme.colorScheme.outline),
+                    ),
+                  ),
+                  const Spacer(),
+                  SizedBox(
+                    width: 32,
+                    height: 32,
+                    child: IconButton(
+                      tooltip: '筛选',
+                      style: ButtonStyle(
+                        padding: WidgetStateProperty.all(EdgeInsets.zero),
+                      ),
+                      onPressed: () {
+                        controller.onShowFilterDialog(context);
+                      },
+                      icon: Icon(
+                        Icons.filter_list_outlined,
+                        size: 18,
+                        color: theme.colorScheme.primary,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
             ),
           ),
         ),
-      );
-    }
-    return const SliverToBoxAdapter();
-  }
-
-  @override
-  Widget buildList(List<SearchUserItemModel> list) {
-    return SliverPadding(
-      padding: const EdgeInsets.only(bottom: 80),
-      sliver: SliverGrid(
-        gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-          maxCrossAxisExtent: Grid.smallCardWidth * 2,
-          mainAxisExtent: 66,
+        SliverPadding(
+          padding: EdgeInsets.only(
+              bottom: MediaQuery.paddingOf(context).bottom + 80),
+          sliver: SliverGrid(
+            gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+              maxCrossAxisExtent: Grid.smallCardWidth * 2,
+              mainAxisExtent: 66,
+            ),
+            delegate: SliverChildBuilderDelegate(
+              (BuildContext context, int index) {
+                if (index == list.length - 1) {
+                  controller.onLoadMore();
+                }
+                return SearchUserItem(
+                  item: list[index],
+                );
+              },
+              childCount: list.length,
+            ),
+          ),
         ),
-        delegate: SliverChildBuilderDelegate(
-          (BuildContext context, int index) {
-            if (index == list.length - 1) {
-              controller.onLoadMore();
-            }
-            return SearchUserItem(
-              style: style,
-              item: list[index],
-            );
-          },
-          childCount: list.length,
-        ),
-      ),
+      ],
     );
   }
 }

lib/pages/search_panel/user/widgets/item.dart

@@ -7,16 +7,19 @@ import 'package:get/get.dart';
 class SearchUserItem extends StatelessWidget {
   const SearchUserItem({
     super.key,
-    required this.style,
     required this.item,
   });
 
-  final TextStyle style;
   final SearchUserItemModel item;
 
   @override
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(item.mid);
+    final theme = Theme.of(context);
+    final style = TextStyle(
+      fontSize: theme.textTheme.labelSmall!.fontSize,
+      color: theme.colorScheme.outline,
+    );
     return InkWell(
       onTap: () => Get.toNamed(
         '/member?mid=${item.mid}',