Disable overscroll effect on Android when reduce animations setting i…

…s enabled (#839) * disables overscroll effects on Android when reduce animations setting is on
thunder-app · Oct 19, 2023 · a9e1505 · a9e1505
1 parent 712c3ae
commit a9e1505
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Show up to 99 before adding + in the unread count - contribution from @micahmo
 - Migrate from old BottomNavigationBar to NavigationBar - contribution from @ggichure
 - Adjusted logic to allow for instant switching of sort types, refreshing feed, and switching communities/pages in drawer
+- Removed overscroll effect on Android when reduce animation setting is enabled
 
 ### Fixed
 - Handle issue where failing to retrieve image dimensions blocks post loading - contribution from @Fmstrat

diff --git a/lib/community/widgets/post_card_list.dart b/lib/community/widgets/post_card_list.dart
@@ -118,7 +118,6 @@ class _PostCardListState extends State<PostCardList> {
           }
         },
         child: MasonryGridView.builder(
-          physics: reduceAnimations ? const BouncingScrollPhysics() : null,
           gridDelegate: tabletMode ? tabletGridDelegate : phoneGridDelegate,
           crossAxisSpacing: 40,
           mainAxisSpacing: 0,

diff --git a/lib/core/theme/bloc/theme_bloc.dart b/lib/core/theme/bloc/theme_bloc.dart
@@ -40,6 +40,9 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
 
       bool useMaterialYouTheme = prefs.getBool(LocalSettings.useMaterialYouTheme.name) ?? false;
 
+      // Fetch reduce animations preferences to remove overscrolling effects
+      bool reduceAnimations = prefs.getBool(LocalSettings.reduceAnimations.name) ?? false;
+
       // Check what the system theme is (light/dark)
       Brightness brightness = SchedulerBinding.instance.platformDispatcher.platformBrightness;
       bool useDarkTheme = themeType != ThemeType.light;
@@ -54,6 +57,7 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
           selectedTheme: selectedTheme,
           useMaterialYouTheme: useMaterialYouTheme,
           useDarkTheme: useDarkTheme,
+          reduceAnimations: reduceAnimations,
         ),
       );
     } catch (e) {

diff --git a/lib/core/theme/bloc/theme_state.dart b/lib/core/theme/bloc/theme_state.dart
@@ -9,6 +9,7 @@ class ThemeState extends Equatable {
     this.selectedTheme = CustomThemeType.deepBlue,
     this.useDarkTheme = false,
     this.useMaterialYouTheme = false,
+    this.reduceAnimations = false,
   });
 
   final ThemeStatus status;
@@ -18,24 +19,26 @@ class ThemeState extends Equatable {
   final CustomThemeType selectedTheme;
   final bool useDarkTheme;
   final bool useMaterialYouTheme;
+  final bool reduceAnimations;
 
   ThemeState copyWith({
     required ThemeStatus status,
     ThemeType? themeType,
     CustomThemeType? selectedTheme,
     bool? useDarkTheme,
     bool? useMaterialYouTheme,
-    ThemeData? darkTheme,
+    bool? reduceAnimations,
   }) {
     return ThemeState(
       status: status,
       themeType: themeType ?? ThemeType.system,
       selectedTheme: selectedTheme ?? this.selectedTheme,
       useDarkTheme: useDarkTheme ?? false,
       useMaterialYouTheme: useMaterialYouTheme ?? false,
+      reduceAnimations: reduceAnimations ?? false,
     );
   }
 
   @override
-  List<Object?> get props => [status, themeType, selectedTheme, useDarkTheme, useMaterialYouTheme];
+  List<Object?> get props => [status, themeType, selectedTheme, useDarkTheme, useMaterialYouTheme, reduceAnimations];
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -117,6 +117,7 @@ class ThunderApp extends StatelessWidget {
                   darkTheme: darkTheme,
                   debugShowCheckedModeBanner: false,
                   scaffoldMessengerKey: GlobalContext.scaffoldMessengerKey,
+                  scrollBehavior: (state.reduceAnimations && Platform.isAndroid) ? const ScrollBehavior().copyWith(overscroll: false) : null,
                 ),
               );
             },

diff --git a/lib/post/widgets/comment_view.dart b/lib/post/widgets/comment_view.dart
@@ -124,7 +124,6 @@ class _CommentSubviewState extends State<CommentSubview> with SingleTickerProvid
         }
       },
       child: ScrollablePositionedList.builder(
-        physics: reduceAnimations ? const BouncingScrollPhysics() : null,
         addSemanticIndexes: false,
         itemScrollController: widget.itemScrollController,
         itemPositionsListener: widget.itemPositionsListener,

diff --git a/lib/settings/pages/accessibility_settings_page.dart b/lib/settings/pages/accessibility_settings_page.dart
@@ -5,6 +5,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'package:thunder/core/enums/local_settings.dart';
 import 'package:thunder/core/singletons/preferences.dart';
+import 'package:thunder/core/theme/bloc/theme_bloc.dart';
 import 'package:thunder/settings/widgets/accessibility_profile.dart';
 import 'package:thunder/settings/widgets/toggle_option.dart';
 import 'package:thunder/thunder/bloc/thunder_bloc.dart';
@@ -27,6 +28,7 @@ class _AccessibilitySettingsPageState extends State<AccessibilitySettingsPage> w
       case LocalSettings.reduceAnimations:
         await prefs.setBool(LocalSettings.reduceAnimations.name, value);
         setState(() => reduceAnimations = value);
+        if (context.mounted) context.read<ThemeBloc>().add(ThemeChangeEvent());
         break;
     }