Optimise skipping interval setting ui

miru-project · Dec 12, 2023 · d000ea3 · d000ea3
1 parent 8669004
commit d000ea3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/lib/utils/miru_storage.dart b/lib/utils/miru_storage.dart
@@ -113,7 +113,6 @@ class MiruStorage {
     await _initSetting(SettingKey.enableNSFW, false);
     await _initSetting(SettingKey.videoPlayer, 'built-in');
     await _initSetting(SettingKey.listMode, "grid");
-    await _initSetting(SettingKey.skipInterval, "10000");
     await _initSetting(SettingKey.keyI, 10.0);
     await _initSetting(SettingKey.keyJ, -10.0);
     await _initSetting(SettingKey.arrowLeft, -2.0);
@@ -147,7 +146,6 @@ class SettingKey {
   static String videoPlayer = 'VideoPlayer';
   static String databaseVersion = 'DatabaseVersion';
   static String listMode = 'ListMode';
-  static String skipInterval = 'SkipInterval';
   static String keyI = 'KeyI';
   static String keyJ = 'KeyJ';
   static String arrowLeft = 'Arrowleft';

diff --git a/lib/views/pages/settings_page.dart b/lib/views/pages/settings_page.dart
@@ -324,23 +324,18 @@ class _SettingsPageState extends State<SettingsPage> {
         const SizedBox(height: 8),
         if (!Platform.isAndroid)
           fluent.Expander(
-            header: Row(
+            leading: const Icon(fluent.FluentIcons.keyboard_classic, size: 24),
+            header: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                const Icon(fluent.FluentIcons.keyboard_classic, size: 24),
-                const SizedBox(width: 16),
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text("settings.skip-interval".i18n),
-                    const SizedBox(height: 2),
-                    Text(
-                      "settings.skip-interval-subtitle".i18n,
-                      style: const TextStyle(fontSize: 12),
-                    )
-                  ],
+                const SizedBox(height: 10),
+                Text("settings.skip-interval".i18n),
+                const SizedBox(height: 2),
+                Text(
+                  "settings.skip-interval-subtitle".i18n,
+                  style: const TextStyle(fontSize: 12),
                 ),
-                const Spacer(),
-                const SizedBox(),
+                const SizedBox(height: 15)
               ],
             ),
             content: Column(

diff --git a/lib/views/widgets/settings_numberbox_button.dart b/lib/views/widgets/settings_numberbox_button.dart
@@ -44,6 +44,7 @@ class _SettingsIntpuTileState extends fluent.State<SettingNumboxButton> {
                 mode: fluent.SpinButtonPlacementMode.inline,
               ),
             )),
+            const SizedBox(width: 8),
             if (!buttonSwitch)
               fluent.Button(
                 child: Text(widget.button1text),