Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Add disable page fade setting, fix header action spacing

Nathan Poulsond215c175c9b0
diff --git a/lib/main.dart b/lib/main.dart
index fe08ee8f..03b4064d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -34,7 +34,7 @@ final ValueNotifier<ThemeMode> themeNotifier = ValueNotifier(ThemeMode.dark);
/// Whether OLED (pure black) dark theme is active.
final ValueNotifier<bool> oledNotifier = ValueNotifier(false);
-/// Whether to use instant page transitions instead of slide animations.
+/// Whether to disable the fade animation when switching bottom nav tabs.
final ValueNotifier<bool> snappyTransitionsNotifier = ValueNotifier(false);
/// Global key so non-widget code (e.g. providers) can show snackbars.
@@ -134,9 +134,6 @@ class AbsorbApp extends StatelessWidget {
systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
));
- return ValueListenableBuilder<bool>(
- valueListenable: snappyTransitionsNotifier,
- builder: (context, snappy, _) {
return DynamicColorBuilder(
builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
// Absorb is dark-first — use dynamic dark colors or our custom palette
@@ -173,13 +170,7 @@ class AbsorbApp extends StatelessWidget {
);
}
- // Page transition theme
- final pageTransition = snappy
- ? const PageTransitionsTheme(builders: {
- TargetPlatform.android: _InstantPageTransitionsBuilder(),
- TargetPlatform.iOS: _InstantPageTransitionsBuilder(),
- })
- : const PageTransitionsTheme(builders: {
+ const pageTransition = PageTransitionsTheme(builders: {
TargetPlatform.android: CupertinoPageTransitionsBuilder(),
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
});
@@ -305,27 +296,11 @@ class AbsorbApp extends StatelessWidget {
);
},
);
- },
- );
},
);
}
}
-/// Instant page transitions (no animation) for snappy mode.
-class _InstantPageTransitionsBuilder extends PageTransitionsBuilder {
- const _InstantPageTransitionsBuilder();
-
- @override
- Widget buildTransitions<T>(
- PageRoute<T> route,
- BuildContext context,
- Animation<double> animation,
- Animation<double> secondaryAnimation,
- Widget child,
- ) => child;
-}
-
class AuthGate extends StatefulWidget {
const AuthGate({super.key});
diff --git a/lib/screens/app_shell.dart b/lib/screens/app_shell.dart
index ab57cebb..bda82cb0 100644
--- a/lib/screens/app_shell.dart
+++ b/lib/screens/app_shell.dart
@@ -7,6 +7,7 @@ import '../providers/library_provider.dart';
import '../services/audio_player_service.dart';
import '../services/chromecast_service.dart';
import '../services/sleep_timer_service.dart';
+import '../main.dart' show snappyTransitionsNotifier;
import '../services/android_auto_service.dart';
import '../widgets/expanded_card.dart';
import 'absorbing_screen.dart';
@@ -77,13 +78,17 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver, Ticker
return;
}
_ensurePageBuilt(index);
- _fadeController.reverse().then((_) {
- if (!mounted) return;
- setState(() {
- _currentIndex = index;
+ if (snappyTransitionsNotifier.value) {
+ setState(() => _currentIndex = index);
+ } else {
+ _fadeController.reverse().then((_) {
+ if (!mounted) return;
+ setState(() {
+ _currentIndex = index;
+ });
+ _fadeController.forward();
});
- _fadeController.forward();
- });
+ }
}
void _ensurePageBuilt(int index) {
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 23309b3f..eceef858 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -529,9 +529,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
),
const Divider(height: 1, indent: 16, endIndent: 16),
SwitchListTile(
- title: const Text('Snappy transitions'),
+ title: const Text('Disable page fade'),
subtitle: Text(
- _snappyTransitions ? 'On - instant page transitions' : 'Off - smooth slide animations',
+ _snappyTransitions ? 'Pages switch instantly' : 'Pages fade when switching tabs',
style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),
value: _snappyTransitions,
onChanged: _loaded ? (v) {
diff --git a/lib/widgets/absorb_page_header.dart b/lib/widgets/absorb_page_header.dart
index 3f173ddd..e772c897 100644
--- a/lib/widgets/absorb_page_header.dart
+++ b/lib/widgets/absorb_page_header.dart
@@ -56,7 +56,11 @@ class AbsorbPageHeader extends StatelessWidget {
child: FittedBox(
fit: BoxFit.scaleDown,
alignment: Alignment.centerRight,
- child: Row(mainAxisSize: MainAxisSize.min, children: actions!),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ spacing: 8,
+ children: actions!,
+ ),
),
),
],