Merge pull request #661 from ErBWs/fix

some fixs
Predidit · Jan 25, 2025 · 1b4c96f · 1b4c96f
2 parents 6a9f46b + 091d933
commit 1b4c96f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/lib/pages/video/video_page.dart b/lib/pages/video/video_page.dart
@@ -390,10 +390,13 @@ class _VideoPageState extends State<VideoPage>
                         position: _rightOffsetAnimation,
                         child: SizedBox(
                           height: MediaQuery.of(context).size.height,
-                          width:
-                              (MediaQuery.of(context).size.width * 1 / 3 > 420
+                          width: videoPageController.isFullscreen
+                              ? (Utils.isTablet()
+                                  ? MediaQuery.of(context).size.width / 3
+                                  : MediaQuery.of(context).size.height)
+                              : (MediaQuery.of(context).size.width / 3 > 420
                                   ? 420
-                                  : MediaQuery.of(context).size.width * 1 / 3),
+                                  : MediaQuery.of(context).size.width / 3),
                           child: Container(
                             color: Theme.of(context).canvasColor,
                             child: GridViewObserver(

diff --git a/pubspec.lock b/pubspec.lock
@@ -22,6 +22,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.11.0"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   archive:
     dependency: transitive
     description:
@@ -465,6 +473,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.3.4"
+  flutter_native_splash:
+    dependency: "direct dev"
+    description:
+      name: flutter_native_splash
+      sha256: "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.4"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -162,7 +162,7 @@ dev_dependencies:
   mobx_codegen: ^2.3.0
   hive_generator: ^2.0.0
   flutter_launcher_icons: "^0.13.1"
-#  flutter_native_splash: ^2.4.3
+  flutter_native_splash: ^2.4.3
   msix: ^3.16.8
 
 
@@ -187,14 +187,14 @@ flutter_launcher_icons:
     image_path: assets/images/logo/logo_rounded.png
     icon_size: 256 # min:48, max:256, default: 48
 
-#flutter_native_splash:
-#  android: false
-#  ios: true
-#  web: false
-#  color_ios: "#ffffff"
-#  color_dark_ios: "#212121"
-#  image_ios: assets/images/logo/logo_ios.png
-#  image_dark_ios: assets/images/logo/logo_ios.png
+flutter_native_splash:
+  android: false
+  ios: true
+  web: false
+  color_ios: "#ffffff"
+  color_dark_ios: "#212121"
+  image_ios: assets/images/logo/logo_ios.png
+  image_dark_ios: assets/images/logo/logo_ios.png
 
 msix_config:
   display_name: Kazumi