opt ui

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

lib/pages/setting/models/extra_settings.dart

@@ -144,24 +144,26 @@ List<SettingsModel> get extraSettings => [
           initialValue: pgcSkipType,
           child: Padding(
             padding: const EdgeInsets.symmetric(vertical: 8),
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Text(
-                  pgcSkipType.title,
-                  style: TextStyle(fontSize: 14, height: 1, color: color),
-                  strutStyle: const StrutStyle(
-                    leading: 0,
-                    height: 1,
-                    fontSize: 14,
+            child: Text.rich(
+              style: TextStyle(fontSize: 14, height: 1, color: color),
+              strutStyle: const StrutStyle(
+                leading: 0,
+                height: 1,
+                fontSize: 14,
+              ),
+              TextSpan(
+                children: [
+                  TextSpan(text: pgcSkipType.title),
+                  WidgetSpan(
+                    alignment: .middle,
+                    child: Icon(
+                      MdiIcons.unfoldMoreHorizontal,
+                      size: 14,
+                      color: color,
+                    ),
                   ),
-                ),
-                Icon(
-                  MdiIcons.unfoldMoreHorizontal,
-                  size: MediaQuery.textScalerOf(context).scale(14),
-                  color: color,
-                ),
-              ],
+                ],
+              ),
             ),
           ),
           onSelected: (value) async {

lib/pages/setting/pages/color_select.dart

@@ -37,15 +37,6 @@ class Item {
   bool isExpanded;
 }
 
-List<Item> generateItems(int count) {
-  return List<Item>.generate(count, (int index) {
-    return Item(
-      headerValue: 'Panel $index',
-      expandedValue: 'This is item number $index',
-    );
-  });
-}
-
 class _ColorSelectPageState extends State<ColorSelectPage> {
   final ctr = Get.put(ColorSelectController());
   FlexSchemeVariant _dynamicSchemeVariant =

lib/pages/setting/pages/font_size_select.dart

@@ -1,4 +1,3 @@
-import 'package:PiliPlus/common/widgets/view_safe_area.dart';
 import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
@@ -44,7 +43,7 @@ class _FontSizeSelectPageState extends State<FontSizeSelectPage> {
           const SizedBox(width: 12),
         ],
       ),
-      body: ViewSafeArea(
+      body: SafeArea(
         child: Column(
           children: [
             Expanded(

lib/pages/setting/view.dart

@@ -290,20 +290,25 @@ class _SettingPageState extends State<SettingPage> {
         onTap: () => Get.toNamed('/settingsSearch'),
         borderRadius: const BorderRadius.all(Radius.circular(50)),
         child: Ink(
-          padding: const EdgeInsets.symmetric(vertical: 6),
+          padding: const EdgeInsets.symmetric(vertical: 8),
           decoration: BoxDecoration(
             borderRadius: const BorderRadius.all(Radius.circular(50)),
             color: theme.colorScheme.onInverseSurface,
           ),
-          child: Center(
+          child: const Center(
             child: Row(
               mainAxisSize: MainAxisSize.min,
               children: [
                 Icon(
-                  size: MediaQuery.textScalerOf(context).scale(18),
+                  size: 18,
+                  applyTextScaling: true,
                   Icons.search,
                 ),
-                const Text(' 搜索'),
+                Text(
+                  ' 搜索',
+                  style: TextStyle(height: 1),
+                  strutStyle: StrutStyle(height: 1, leading: 0),
+                ),
               ],
             ),
           ),