poppingmoon · poppingmoon · Oct 23, 2024 · Oct 23, 2024
diff --git a/lib/i18n/aria/aria.i18n.yaml b/lib/i18n/aria/aria.i18n.yaml
@@ -38,6 +38,7 @@ emojiPickerScale: "Emoji picker scale"
 emojiPickerUseDialog: "Display emoji picker as dialog"
 enableEmojiFadeIn: "Enable fade-in animations for custom emojis"
 enableFederation: "Enable federation"
+enablePredictiveBack: "Enable predictive back animations"
 endpoint: "Endpoint"
 expandNote: "Expand note"
 extraMentionsWarning: "This note includes mentions that are not included in the target note of reply"

diff --git a/lib/i18n/strings.g.dart b/lib/i18n/strings.g.dart
@@ -4,7 +4,7 @@
 /// To regenerate, run: `dart run slang`
 ///
 /// Locales: 31
-/// Strings: 54608 (1761 per locale)
+/// Strings: 54609 (1761 per locale)
 
 // coverage:ignore-file
 // ignore_for_file: type=lint, unused_import

diff --git a/lib/i18n/strings_en_US.g.dart b/lib/i18n/strings_en_US.g.dart
@@ -92,6 +92,7 @@ class TranslationsAriaEnUs {
 	String get emojiPickerUseDialog => 'Display emoji picker as dialog';
 	String get enableEmojiFadeIn => 'Enable fade-in animations for custom emojis';
 	String get enableFederation => 'Enable federation';
+	String get enablePredictiveBack => 'Enable predictive back animations';
 	String get endpoint => 'Endpoint';
 	String get expandNote => 'Expand note';
 	String get extraMentionsWarning => 'This note includes mentions that are not included in the target note of reply';

diff --git a/lib/model/general_settings.dart b/lib/model/general_settings.dart
@@ -119,6 +119,7 @@ class GeneralSettings with _$GeneralSettings {
     @Default(true) bool confirmBeforeFollow,
     @Default(false) bool confirmWhenRevealingSensitiveMedia,
     @Default(LaunchMode.externalApplication) LaunchMode launchMode,
+    @Default(false) bool enablePredictiveBack,
 
     // Theme
     @Default(ThemeMode.system) ThemeMode themeMode,

diff --git a/lib/model/general_settings.freezed.dart b/lib/model/general_settings.freezed.dart
diff --git a/lib/model/general_settings.g.dart b/lib/model/general_settings.g.dart
diff --git a/lib/provider/general_settings_notifier_provider.dart b/lib/provider/general_settings_notifier_provider.dart
@@ -485,6 +485,11 @@ class GeneralSettingsNotifier extends _$GeneralSettingsNotifier {
     await _save();
   }
 
+  Future<void> setEnablePredictiveBack(bool enablePredictiveBack) async {
+    state = state.copyWith(enablePredictiveBack: enablePredictiveBack);
+    await _save();
+  }
+
   Future<void> setThemeMode(ThemeMode themeMode) async {
     state = state.copyWith(themeMode: themeMode);
     await _save();

diff --git a/lib/provider/general_settings_notifier_provider.g.dart b/lib/provider/general_settings_notifier_provider.g.dart
diff --git a/lib/provider/theme_data_provider.dart b/lib/provider/theme_data_provider.dart
@@ -20,6 +20,11 @@ ThemeData themeData(Ref ref, Brightness brightness) {
   final height = ref.watch(
     generalSettingsNotifierProvider.select((settings) => settings.lineHeight),
   );
+  final enablePredictiveBack = ref.watch(
+    generalSettingsNotifierProvider
+        .select((settings) => settings.enablePredictiveBack),
+  );
+
   return ThemeData(
     colorScheme: ColorScheme.fromSeed(
       seedColor: colors.accent,
@@ -98,11 +103,13 @@ ThemeData themeData(Ref ref, Brightness brightness) {
     ),
     sliderTheme:
         const SliderThemeData(showValueIndicator: ShowValueIndicator.always),
-    pageTransitionsTheme: const PageTransitionsTheme(
+    pageTransitionsTheme: PageTransitionsTheme(
       builders: {
-        TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
-        TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
-        TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
+        TargetPlatform.android: enablePredictiveBack
+            ? const PredictiveBackPageTransitionsBuilder()
+            : const ZoomPageTransitionsBuilder(),
+        TargetPlatform.iOS: const CupertinoPageTransitionsBuilder(),
+        TargetPlatform.macOS: const CupertinoPageTransitionsBuilder(),
       },
     ),
   );

diff --git a/lib/provider/theme_data_provider.g.dart b/lib/provider/theme_data_provider.g.dart
diff --git a/lib/view/page/settings/behavior_page.dart b/lib/view/page/settings/behavior_page.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -213,6 +214,14 @@ class BehaviorPage extends ConsumerWidget {
               }
             },
           ),
+          if (defaultTargetPlatform == TargetPlatform.android)
+            SwitchListTile(
+              title: Text(t.aria.enablePredictiveBack),
+              value: settings.enablePredictiveBack,
+              onChanged: (value) => ref
+                  .read(generalSettingsNotifierProvider.notifier)
+                  .setEnablePredictiveBack(value),
+            ),
         ],
       ),
       selectedDestination: GeneralSettingsDestination.behavior,