style: 优化代码

miru-project · Jul 16, 2023 · 9eb4601 · 9eb4601
1 parent 90849b3
commit 9eb4601
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 66 deletions.
diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart
@@ -53,15 +53,13 @@ class _HomePageState extends State<HomePage> {
               children: [
                 if (c.resents.isNotEmpty) ...[
                   HomeRecent(
-                    // ignore: invalid_use_of_protected_member
-                    data: c.resents.value,
+                    data: c.resents,
                   ),
                   const SizedBox(height: 16),
                 ],
                 if (c.favorites.isNotEmpty)
                   HomeFavorites(
-                    // ignore: invalid_use_of_protected_member
-                    data: c.favorites.value,
+                    data: c.favorites,
                   ),
               ],
             );

diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
@@ -71,10 +71,13 @@ class _DesktopMainPageState extends State<DesktopMainPage> {
               );
             }(),
             title: _title(),
-            actions: const SizedBox(
+            actions: SizedBox(
               width: 138,
               height: 50,
-              child: WindowCaption(),
+              child: WindowCaption(
+                backgroundColor: Colors.transparent,
+                brightness: fluent.FluentTheme.of(context).brightness,
+              ),
             ),
             automaticallyImplyLeading: false,
           ),
@@ -85,7 +88,6 @@ class _DesktopMainPageState extends State<DesktopMainPage> {
             size: const fluent.NavigationPaneSize(openMaxWidth: 200),
             selected: c.selectedTab.value,
             onChanged: c.changeTab,
-            displayMode: fluent.PaneDisplayMode.open,
             footerItems: [
               fluent.PaneItemSeparator(),
               fluent.PaneItem(

diff --git a/lib/pages/search/widgets/search_all_tile.dart b/lib/pages/search/widgets/search_all_tile.dart
@@ -42,11 +42,10 @@ class _SearchAllTileState extends State<SearchAllTile> {
           children: [
             Text(
               widget.runtime.extension.name,
-              style: const TextStyle(fontSize: 16),
             ),
             const Spacer(),
             IconButton(
-              icon: const Icon(Icons.arrow_forward),
+              icon: const Icon(Icons.chevron_right),
               onPressed: widget.onClickMore,
             ),
           ],

diff --git a/lib/pages/watch/view.dart b/lib/pages/watch/view.dart
@@ -1,14 +1,11 @@
-import 'dart:io';
-
-import 'package:fluent_ui/fluent_ui.dart' as fluent;
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:get/get.dart';
-import 'package:miru_app/main.dart';
 import 'package:miru_app/models/extension.dart';
-import 'package:miru_app/pages/watch/widgets/video_player.dart';
+import 'package:miru_app/pages/watch/widgets/video/video_player.dart';
 import 'package:miru_app/utils/extension.dart';
 import 'package:miru_app/utils/i18n.dart';
+import 'package:miru_app/widgets/messenger.dart';
 
 class WatchPage extends StatelessWidget {
   const WatchPage({
@@ -31,44 +28,22 @@ class WatchPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final runtime = ExtensionUtils.extensions[package];
     if (runtime == null) {
-      showDialog(
+      showPlatformDialog(
         context: context,
-        builder: (context) {
-          if (Platform.isAndroid) {
-            return AlertDialog(
-              title: Text('common.error'.i18n),
-              content: Text(FlutterI18n.translate(
-                context,
-                'common.extension-missing',
-                translationParams: {
-                  'package': package,
-                },
-              )),
-              actions: [
-                TextButton(
-                  onPressed: () => Get.back(),
-                  child: Text('common.confirm'.i18n),
-                ),
-              ],
-            );
-          }
-          return fluent.ContentDialog(
-            title: Text('common.error'.i18n),
-            content: Text(FlutterI18n.translate(
-              context,
-              'common.extension-missing',
-              translationParams: {
-                'package': package,
-              },
-            )),
-            actions: [
-              fluent.Button(
-                onPressed: () => router.pop(),
-                child: Text('common.confirm'.i18n),
-              ),
-            ],
-          );
-        },
+        title: 'common.error'.i18n,
+        content: Text(FlutterI18n.translate(
+          context,
+          'common.extension-missing',
+          translationParams: {
+            'package': package,
+          },
+        )),
+        actions: [
+          TextButton(
+            onPressed: () => Get.back(),
+            child: Text('common.confirm'.i18n),
+          ),
+        ],
       );
       return const SizedBox.shrink();
     }

diff --git a/lib/pages/watch/widgets/video_player.dart → ...ges/watch/widgets/video/video_player.dart b/lib/pages/watch/widgets/video_player.dart → ...ges/watch/widgets/video/video_player.dart
@@ -18,7 +18,7 @@ import 'package:miru_app/widgets/platform_widget.dart';
 import 'package:miru_app/widgets/progress_ring.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:screenshot/screenshot.dart';
-import 'playlist.dart' as p;
+import '../playlist.dart' as p;
 import 'package:path/path.dart' as path;
 
 class VideoPlayer extends StatefulWidget {
@@ -118,8 +118,10 @@ class _VideoPlayerState extends State<VideoPlayer> {
   void dispose() {
     if (Platform.isAndroid) {
       // 切换回竖屏
-      SystemChrome.setPreferredOrientations(
-          [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
+      SystemChrome.setPreferredOrientations([
+        DeviceOrientation.portraitUp,
+        DeviceOrientation.portraitDown,
+      ]);
       SystemChrome.setEnabledSystemUIMode(
         SystemUiMode.edgeToEdge,
       );

diff --git a/lib/widgets/bangumi_card.dart b/lib/widgets/bangumi_card.dart
@@ -25,7 +25,7 @@ class BangumiCard extends StatefulWidget {
 }
 
 class _BangumiCardState extends State<BangumiCard> {
-  bool isHover = false;
+  bool _isHover = false;
 
   Widget _buildAndroid(BuildContext context) {
     return Hero(
@@ -118,12 +118,12 @@ class _BangumiCardState extends State<BangumiCard> {
       cursor: SystemMouseCursors.click,
       onHover: (event) {
         setState(() {
-          isHover = true;
+          _isHover = true;
         });
       },
       onExit: (event) {
         setState(() {
-          isHover = false;
+          _isHover = false;
         });
       },
       child: Column(
@@ -144,7 +144,7 @@ class _BangumiCardState extends State<BangumiCard> {
                 );
               },
               child: AnimatedScale(
-                scale: isHover ? 1.03 : 1,
+                scale: _isHover ? 1.03 : 1,
                 duration: const Duration(milliseconds: 80),
                 child: Container(
                   decoration: const BoxDecoration(

diff --git a/lib/widgets/settings_radios_tile.dart b/lib/widgets/settings_radios_tile.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:miru_app/widgets/settings_tile.dart';
 import 'package:miru_app/widgets/platform_widget.dart';
 
-class SettingsRadiosTile<T> extends fluent.StatefulWidget {
+class SettingsRadiosTile<T> extends StatefulWidget {
   const SettingsRadiosTile({
     Key? key,
     this.icon,
@@ -23,11 +23,10 @@ class SettingsRadiosTile<T> extends fluent.StatefulWidget {
   final Widget trailing;
 
   @override
-  fluent.State<SettingsRadiosTile<T>> createState() =>
-      _SettingsRadiosTileState<T>();
+  State<SettingsRadiosTile<T>> createState() => _SettingsRadiosTileState<T>();
 }
 
-class _SettingsRadiosTileState<T> extends fluent.State<SettingsRadiosTile<T>> {
+class _SettingsRadiosTileState<T> extends State<SettingsRadiosTile<T>> {
   Widget _buildAndroid(BuildContext context) {
     return SettingsTile(
       icon: widget.icon,

diff --git a/lib/widgets/settings_switch_tile.dart b/lib/widgets/settings_switch_tile.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:miru_app/widgets/settings_tile.dart';
 import 'package:miru_app/widgets/platform_widget.dart';
 
-class SettingsSwitchTile extends fluent.StatefulWidget {
+class SettingsSwitchTile extends StatefulWidget {
   const SettingsSwitchTile({
     Key? key,
     this.icon,
@@ -19,10 +19,10 @@ class SettingsSwitchTile extends fluent.StatefulWidget {
   final Function(bool) onChanged;
 
   @override
-  fluent.State<SettingsSwitchTile> createState() => _SettingsSwitchTileState();
+  State<SettingsSwitchTile> createState() => _SettingsSwitchTileState();
 }
 
-class _SettingsSwitchTileState extends fluent.State<SettingsSwitchTile> {
+class _SettingsSwitchTileState extends State<SettingsSwitchTile> {
   @override
   Widget build(BuildContext context) {
     return SettingsTile(

diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -14,6 +14,7 @@ import package_info_plus
 import path_provider_foundation
 import screen_brightness_macos
 import screen_retriever
+import sqflite
 import system_theme
 import url_launcher_macos
 import wakelock_macos
@@ -29,6 +30,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   ScreenBrightnessMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenBrightnessMacosPlugin"))
   ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
+  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   SystemThemePlugin.register(with: registry.registrar(forPlugin: "SystemThemePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: miru_app
 description: A new Flutter project.
 publish_to: "none"
-version: 1.3.3+10
+version: 1.3.4+11
 
 environment:
   sdk: ">=3.0.3 <4.0.0"