Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

chore: better widescreen sensor

Predidit8448931e57a6
diff --git a/lib/pages/init_page.dart b/lib/pages/init_page.dart
index d0dfe9e4..eeceecbf 100644
--- a/lib/pages/init_page.dart
+++ b/lib/pages/init_page.dart
@@ -224,18 +224,6 @@ class _InitPageState extends State<InitPage> {
@override
Widget build(BuildContext context) {
- /// 适配平板设备
- Box setting = GStorage.setting;
- bool isWideScreen = MediaQuery.of(context).size.shortestSide >= 600 &&
- (MediaQuery.of(context).size.shortestSide /
- MediaQuery.of(context).size.longestSide >=
- 9 / 16);
- if (isWideScreen) {
- KazumiLogger().log(Level.info, '当前设备宽屏');
- } else {
- KazumiLogger().log(Level.info, '当前设备非宽屏');
- }
- setting.put(SettingBoxKey.isWideScreen, isWideScreen);
return const LoadingWidget();
}
}
diff --git a/lib/pages/video/video_page.dart b/lib/pages/video/video_page.dart
index 20a0aed2..006c3700 100644
--- a/lib/pages/video/video_page.dart
+++ b/lib/pages/video/video_page.dart
@@ -381,7 +381,7 @@ class _VideoPageState extends State<VideoPage>
@override
Widget build(BuildContext context) {
- final bool isWideScreen =
+ final bool islandScape =
MediaQuery.sizeOf(context).width > MediaQuery.sizeOf(context).height;
WidgetsBinding.instance.addPostFrameCallback((_) {
openTabBodyAnimated();
@@ -425,10 +425,10 @@ class _VideoPageState extends State<VideoPage>
children: [
Flexible(
// make it unflexible when not wideScreen.
- flex: (isWideScreen) ? 1 : 0,
+ flex: (islandScape) ? 1 : 0,
child: Container(
color: Colors.black,
- height: (isWideScreen)
+ height: (islandScape)
? MediaQuery.sizeOf(context).height
: MediaQuery.sizeOf(context).width * 9 / 16,
width: MediaQuery.sizeOf(context).width,
@@ -436,12 +436,12 @@ class _VideoPageState extends State<VideoPage>
),
),
// when not wideScreen, show tabBody on the bottom
- if (!isWideScreen) Expanded(child: tabBody),
+ if (!islandScape) Expanded(child: tabBody),
],
),
// when is wideScreen, show tabBody on the right side with SlideTransition or direct visibility
- if (isWideScreen && videoPageController.showTabBody) ...[
+ if (islandScape && videoPageController.showTabBody) ...[
if (disableAnimations) ...[
sideTabMask,
sideTabBody,
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index 1ecb51ee..85ea6bad 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -241,6 +241,7 @@ class SettingBoxKey {
displayMode = 'displayMode',
enableGitProxy = 'enableGitProxy',
enableSystemProxy = 'enableSystemProxy',
+ /// Deprecated
isWideScreen = 'isWideScreen',
webDavEnable = 'webDavEnable',
webDavEnableHistory = 'webDavEnableHistory',
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index afb12fc2..4b465875 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -9,12 +9,10 @@ import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:hive/hive.dart';
import 'package:kazumi/request/api.dart';
import 'package:kazumi/utils/constants.dart';
import 'package:kazumi/utils/logger.dart';
import 'package:kazumi/utils/mortis.dart';
-import 'package:kazumi/utils/storage.dart';
import 'package:logger/logger.dart';
import 'package:path/path.dart' as path;
import 'package:path_provider/path_provider.dart';
@@ -324,9 +322,10 @@ class Utils {
/// 判断设备是否为宽屏
static bool isWideScreen() {
- Box setting = GStorage.setting;
- bool isWideScreen =
- setting.get(SettingBoxKey.isWideScreen, defaultValue: false);
+ final MediaQueryData mediaQuery = MediaQueryData.fromView(
+ WidgetsBinding.instance.platformDispatcher.views.first);
+ final bool isWideScreen = mediaQuery.size.shortestSide >= 600 &&
+ mediaQuery.size.shortestSide / mediaQuery.size.longestSide >= 9 / 16;
return isWideScreen;
}