From c1e5229360cd403c4ae0b21b634bec2437386c86 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Sun, 31 Dec 2023 16:38:49 +0800
Subject: [PATCH] =?UTF-8?q?mod:=20=E5=8F=96=E6=B6=88iOS=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/setting/style_setting.dart | 32 ++++++++++++++--------------
 lib/router/app_pages.dart            |  4 +---
 lib/utils/storage.dart               |  1 -
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart
index 277919dd..ed35193e 100644
--- a/lib/pages/setting/style_setting.dart
+++ b/lib/pages/setting/style_setting.dart
@@ -20,7 +20,8 @@ class StyleSetting extends StatefulWidget {
 
 class _StyleSettingState extends State<StyleSetting> {
   final SettingController settingController = Get.put(SettingController());
-  final ColorSelectController colorSelectController = Get.put(ColorSelectController());
+  final ColorSelectController colorSelectController =
+      Get.put(ColorSelectController());
 
   Box setting = GStrorage.setting;
   late int picQuality;
@@ -76,12 +77,6 @@ class _StyleSettingState extends State<StyleSetting> {
               ),
             ),
           ),
-          const SetSwitchItem(
-            title: 'iOS路由切换',
-            subTitle: 'iOS路由切换样式，需重启',
-            setKey: SettingBoxKey.iosTransition,
-            defaultVal: false,
-          ),
           const SetSwitchItem(
             title: 'MD3样式底栏',
             subTitle: '符合Material You设计规范的底栏',
@@ -107,9 +102,12 @@ class _StyleSettingState extends State<StyleSetting> {
               int? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<int>(title: '自定义列数', value: defaultCustomRows, values: [1, 2, 3, 4, 5].map((e) {
-                    return {'title': '$e 列', 'value': e};
-                  }).toList());
+                  return SelectDialog<int>(
+                      title: '自定义列数',
+                      value: defaultCustomRows,
+                      values: [1, 2, 3, 4, 5].map((e) {
+                        return {'title': '$e 列', 'value': e};
+                      }).toList());
                 },
               );
               if (result != null) {
@@ -195,16 +193,18 @@ class _StyleSettingState extends State<StyleSetting> {
               ThemeType? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return SelectDialog<ThemeType>(title: '主题模式', value: _tempThemeValue, values: ThemeType.values.map((e) {
-                    return {'title': e.description, 'value': e};
-                  }).toList());
+                  return SelectDialog<ThemeType>(
+                      title: '主题模式',
+                      value: _tempThemeValue,
+                      values: ThemeType.values.map((e) {
+                        return {'title': e.description, 'value': e};
+                      }).toList());
                 },
               );
               if (result != null) {
                 _tempThemeValue = result;
                 settingController.themeType.value = result;
-                setting.put(
-                    SettingBoxKey.themeMode, result.code);
+                setting.put(SettingBoxKey.themeMode, result.code);
                 Get.forceAppUpdate();
               }
             },
@@ -218,7 +218,7 @@ class _StyleSettingState extends State<StyleSetting> {
             onTap: () => Get.toNamed('/colorSetting'),
             title: Text('应用主题', style: titleStyle),
             subtitle: Obx(() => Text(
-                '当前主题：${colorSelectController.type.value == 0 ? '动态取色': '指定颜色'}',
+                '当前主题：${colorSelectController.type.value == 0 ? '动态取色' : '指定颜色'}',
                 style: subTitleStyle)),
           ),
           ListTile(
diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart
index 9fa926ee..50f6a262 100644
--- a/lib/router/app_pages.dart
+++ b/lib/router/app_pages.dart
@@ -47,8 +47,6 @@ import 'package:pilipala/pages/whisperDetail/index.dart';
 import 'package:pilipala/utils/storage.dart';
 
 Box setting = GStrorage.setting;
-bool iosTransition =
-    setting.get(SettingBoxKey.iosTransition, defaultValue: false);
 
 class Routes {
   static final List<GetPage> getPages = [
@@ -164,7 +162,7 @@ class CustomGetPage extends GetPage {
           name: name,
           page: page,
           curve: Curves.linear,
-          transition: iosTransition ? Transition.cupertino : Transition.native,
+          transition: Transition.native,
           showCupertinoParallax: false,
           popGesture: false,
           transitionDuration: transitionDuration,
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index 44cb162a..9d9192ee 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -135,7 +135,6 @@ class SettingBoxKey {
   static const String defaultTextScale = 'textScale';
   static const String dynamicColor = 'dynamicColor'; // bool
   static const String customColor = 'customColor'; // 自定义主题色
-  static const String iosTransition = 'iosTransition'; // ios路由
   static const String enableSingleRow = 'enableSingleRow'; // 首页单列
   static const String displayMode = 'displayMode';
   static const String customRows = 'customRows'; // 自定义列