Skip to content

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

fix missing page transitions (#718)

Predidit00431baab1bd
diff --git a/lib/app_widget.dart b/lib/app_widget.dart
index 98cd6cf1..3d4b58f8 100644
--- a/lib/app_widget.dart
+++ b/lib/app_widget.dart
@@ -244,19 +244,19 @@ class _AppWidgetState extends State<AppWidget>
themeProvider.setThemeMode(ThemeMode.system, notify: false);
}
var defaultDarkTheme = ThemeData(
- useMaterial3: true,
- brightness: Brightness.dark,
- colorSchemeSeed: color,
- progressIndicatorTheme: progressIndicatorTheme2024,
- );
- var oledDarkTheme = Utils.oledDarkTheme(defaultDarkTheme);
- themeProvider.setTheme(
- ThemeData(
useMaterial3: true,
- brightness: Brightness.light,
+ brightness: Brightness.dark,
colorSchemeSeed: color,
progressIndicatorTheme: progressIndicatorTheme2024,
- ),
+ pageTransitionsTheme: pageTransitionsTheme2024);
+ var oledDarkTheme = Utils.oledDarkTheme(defaultDarkTheme);
+ themeProvider.setTheme(
+ ThemeData(
+ useMaterial3: true,
+ brightness: Brightness.light,
+ colorSchemeSeed: color,
+ progressIndicatorTheme: progressIndicatorTheme2024,
+ pageTransitionsTheme: pageTransitionsTheme2024),
oledEnhance ? oledDarkTheme : defaultDarkTheme,
notify: false,
);
@@ -264,12 +264,22 @@ class _AppWidgetState extends State<AppWidget>
builder: (theme, darkTheme) {
if (themeProvider.useDynamicColor) {
themeProvider.setTheme(
- ThemeData(colorScheme: theme, brightness: Brightness.light),
+ ThemeData(
+ colorScheme: theme,
+ brightness: Brightness.light,
+ progressIndicatorTheme: progressIndicatorTheme2024,
+ pageTransitionsTheme: pageTransitionsTheme2024),
oledEnhance
? Utils.oledDarkTheme(ThemeData(
- colorScheme: darkTheme, brightness: Brightness.dark))
+ colorScheme: darkTheme,
+ brightness: Brightness.dark,
+ progressIndicatorTheme: progressIndicatorTheme2024,
+ pageTransitionsTheme: pageTransitionsTheme2024))
: ThemeData(
- colorScheme: darkTheme, brightness: Brightness.dark),
+ colorScheme: darkTheme,
+ brightness: Brightness.dark,
+ progressIndicatorTheme: progressIndicatorTheme2024,
+ pageTransitionsTheme: pageTransitionsTheme2024),
notify: false,
);
}
diff --git a/lib/pages/settings/theme_settings_page.dart b/lib/pages/settings/theme_settings_page.dart
index f72cdd73..fe72606a 100644
--- a/lib/pages/settings/theme_settings_page.dart
+++ b/lib/pages/settings/theme_settings_page.dart
@@ -55,6 +55,7 @@ class _ThemeSettingsPageState extends State<ThemeSettingsPage> {
brightness: Brightness.dark,
colorSchemeSeed: color,
progressIndicatorTheme: progressIndicatorTheme2024,
+ pageTransitionsTheme: pageTransitionsTheme2024
);
var oledDarkTheme = Utils.oledDarkTheme(defaultDarkTheme);
themeProvider.setTheme(
@@ -63,6 +64,7 @@ class _ThemeSettingsPageState extends State<ThemeSettingsPage> {
brightness: Brightness.light,
colorSchemeSeed: color,
progressIndicatorTheme: progressIndicatorTheme2024,
+ pageTransitionsTheme: pageTransitionsTheme2024
),
oledEnhance ? oledDarkTheme : defaultDarkTheme,
);
@@ -76,6 +78,7 @@ class _ThemeSettingsPageState extends State<ThemeSettingsPage> {
brightness: Brightness.dark,
colorSchemeSeed: Colors.green,
progressIndicatorTheme: progressIndicatorTheme2024,
+ pageTransitionsTheme: pageTransitionsTheme2024
);
var oledDarkTheme = Utils.oledDarkTheme(defaultDarkTheme);
themeProvider.setTheme(
@@ -84,6 +87,7 @@ class _ThemeSettingsPageState extends State<ThemeSettingsPage> {
brightness: Brightness.light,
colorSchemeSeed: Colors.green,
progressIndicatorTheme: progressIndicatorTheme2024,
+ pageTransitionsTheme: pageTransitionsTheme2024
),
oledEnhance ? oledDarkTheme : defaultDarkTheme,
);
diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart
index bfe2d241..9ba50a77 100644
--- a/lib/utils/constants.dart
+++ b/lib/utils/constants.dart
@@ -18,6 +18,19 @@ const ProgressIndicatorThemeData progressIndicatorTheme2024 =
year2023: false,
);
+/// The page transition method defined here is managed by flutter, and the native transition method of flutter is set here.
+/// Transition method here will be overridden by the transition method of modular, and do not set the transition method in modular to prevent
+/// the native transition method from failing
+const PageTransitionsTheme pageTransitionsTheme2024 = PageTransitionsTheme(
+ builders: {
+ TargetPlatform.android: ZoomPageTransitionsBuilder(),
+ TargetPlatform.iOS: ZoomPageTransitionsBuilder(),
+ TargetPlatform.linux: FadeUpwardsPageTransitionsBuilder(),
+ TargetPlatform.macOS: FadeUpwardsPageTransitionsBuilder(),
+ TargetPlatform.windows: FadeUpwardsPageTransitionsBuilder(),
+ },
+);
+
/// Layout breakpoint according to google:
/// https://developer.android.com/develop/ui/compose/layouts/adaptive/use-window-size-classes.
///