Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Scroll-to-hide on home screen, fix chapter bar jump, fix account sheet

Nathan Poulson54e4006d3cb8
diff --git a/lib/providers/_lp_core.dart b/lib/providers/_lp_core.dart
index 65689d40..fc57f10d 100644
--- a/lib/providers/_lp_core.dart
+++ b/lib/providers/_lp_core.dart
@@ -491,8 +491,13 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {
return false;
});
final overridesBefore = _localProgressOverrides.length;
- _localProgressOverrides.removeWhere((key, _) =>
- !_locallyFinishedItems.contains(key));
+ _localProgressOverrides.removeWhere((key, localProgress) {
+ if (_locallyFinishedItems.contains(key)) return false;
+ // Keep the override if local progress is ahead of server
+ final serverProgress = ((_progressMap[key]?['progress'] as num?)?.toDouble()) ?? 0;
+ if (localProgress > serverProgress + 0.001) return false;
+ return true;
+ });
final cleared = overridesBefore - _localProgressOverrides.length;
if (cleared > 0) {
debugPrint('[Progress] Cleared $cleared overrides');
diff --git a/lib/providers/library_provider.dart b/lib/providers/library_provider.dart
index ddc23911..40212705 100644
--- a/lib/providers/library_provider.dart
+++ b/lib/providers/library_provider.dart
@@ -284,7 +284,6 @@ class LibraryProvider extends ChangeNotifier
if (isOffline || _api == null) return;
await ProgressSyncService().flushPendingSync(api: _api!);
await _refreshProgress();
- _localProgressOverrides.clear();
notifyListeners();
}
diff --git a/lib/screens/app_shell.dart b/lib/screens/app_shell.dart
index 101a593c..458a4fb0 100644
--- a/lib/screens/app_shell.dart
+++ b/lib/screens/app_shell.dart
@@ -51,6 +51,7 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver, Ticker
// Tabs: 0=Home, 1=Library, 2=Absorbing (default), 3=Stats, 4=Settings
int _currentIndex = 2; // overridden by user preference in initState
+ final _homeKey = GlobalKey<HomeScreenState>();
final _libraryKey = GlobalKey<LibraryScreenState>();
final _player = AudioPlayerService();
final _cast = ChromecastService();
@@ -108,43 +109,47 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver, Ticker
}
}
- /// Subscribe to library screen's barsVisibleNotifier when on Library tab,
- /// and ensure the nav bar is visible on all other tabs.
+ /// Subscribe to the active screen's barsVisibleNotifier when on Home or
+ /// Library tab, and ensure the nav bar is visible on all other tabs.
void _syncNavBarListener(int index) {
- if (index == 1) {
- // Entering Library tab - listen to its visibility notifier
- final notifier = _libraryKey.currentState?.barsVisibleNotifier;
- if (notifier != null && _navBarListener == null) {
- _navBarListener = () {
- if (notifier.value) {
- _navBarAnimController.forward();
- } else {
- _navBarAnimController.reverse();
- }
- };
- notifier.addListener(_navBarListener!);
- // Sync to current state
- _navBarListener!();
- }
+ _detachNavBarListener();
+ ValueNotifier<bool>? notifier;
+ if (index == 0) {
+ notifier = _homeKey.currentState?.barsVisibleNotifier;
+ } else if (index == 1) {
+ notifier = _libraryKey.currentState?.barsVisibleNotifier;
+ }
+ if (notifier != null) {
+ _activeBarNotifier = notifier;
+ _navBarListener = () {
+ if (notifier!.value) {
+ _navBarAnimController.forward();
+ } else {
+ _navBarAnimController.reverse();
+ }
+ };
+ notifier.addListener(_navBarListener!);
+ _navBarListener!();
} else {
- // Leaving Library tab - detach and show nav bar
- _detachNavBarListener();
_navBarAnimController.forward();
}
}
+ ValueNotifier<bool>? _activeBarNotifier;
+
void _detachNavBarListener() {
- if (_navBarListener != null) {
- _libraryKey.currentState?.barsVisibleNotifier.removeListener(_navBarListener!);
- _navBarListener = null;
+ if (_navBarListener != null && _activeBarNotifier != null) {
+ _activeBarNotifier!.removeListener(_navBarListener!);
}
+ _navBarListener = null;
+ _activeBarNotifier = null;
}
void _ensurePageBuilt(int index) {
if (_pages[index] != null) return;
switch (index) {
case 0:
- _pages[index] = const HomeScreen();
+ _pages[index] = HomeScreen(key: _homeKey);
break;
case 1:
_pages[index] = LibraryScreen(key: _libraryKey);
@@ -480,10 +485,10 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver, Ticker
}
Widget _buildBottomNav(BuildContext context) {
- // Lazily attach listener when on Library tab (handles start-on-library case)
- if (_currentIndex == 1 && _navBarListener == null) {
+ // Lazily attach listener when on Home or Library tab (handles start-on-tab case)
+ if ((_currentIndex == 0 || _currentIndex == 1) && _navBarListener == null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
- if (mounted) _syncNavBarListener(1);
+ if (mounted) _syncNavBarListener(_currentIndex);
});
}
return SizeTransition(
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 95415cf2..94d698ab 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -23,14 +23,24 @@ class HomeScreen extends StatefulWidget {
const HomeScreen({super.key});
@override
- State<HomeScreen> createState() => _HomeScreenState();
+ State<HomeScreen> createState() => HomeScreenState();
}
-class _HomeScreenState extends State<HomeScreen> {
+class HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
final _player = AudioPlayerService();
bool _hideEbookOnly = false;
bool _rectangleCovers = false;
+ // ── Scroll-to-hide bars ──
+ final ValueNotifier<bool> barsVisibleNotifier = ValueNotifier(true);
+ late final AnimationController _headerAnimController = AnimationController(
+ vsync: this,
+ duration: const Duration(milliseconds: 250),
+ value: 1.0,
+ );
+ final _scrollController = ScrollController();
+ double _lastScrollOffset = 0;
+
// Cached filtered sections — invalidated when source data or settings change.
List<Map<String, dynamic>>? _cachedSections;
List<dynamic>? _cachedClItems;
@@ -46,9 +56,34 @@ class _HomeScreenState extends State<HomeScreen> {
String? _lastKnownItemId;
bool _lastKnownPlaying = false;
+ void _onScrollDirection() {
+ if (!_scrollController.hasClients) return;
+ final offset = _scrollController.offset;
+ final delta = offset - _lastScrollOffset;
+ _lastScrollOffset = offset;
+ if (offset <= 0) { _showBars(); return; }
+ if (delta.abs() < 1.0) return;
+ if (delta > 0) { _hideBars(); } else { _showBars(); }
+ }
+
+ void _showBars() {
+ if (!barsVisibleNotifier.value) {
+ barsVisibleNotifier.value = true;
+ _headerAnimController.forward();
+ }
+ }
+
+ void _hideBars() {
+ if (barsVisibleNotifier.value) {
+ barsVisibleNotifier.value = false;
+ _headerAnimController.reverse();
+ }
+ }
+
@override
void initState() {
super.initState();
+ _scrollController.addListener(_onScrollDirection);
_player.addListener(_onPlayerChanged);
PlayerSettings.settingsChanged.addListener(_loadSettings);
_loadSettings();
@@ -139,6 +174,9 @@ class _HomeScreenState extends State<HomeScreen> {
@override
void dispose() {
+ _scrollController.dispose();
+ _headerAnimController.dispose();
+ barsVisibleNotifier.dispose();
_player.removeListener(_onPlayerChanged);
PlayerSettings.settingsChanged.removeListener(_loadSettings);
super.dispose();
@@ -310,10 +348,14 @@ class _HomeScreenState extends State<HomeScreen> {
await lib.refresh();
},
child: CustomScrollView(
+ controller: _scrollController,
slivers: [
// ── Top bar: ABSORB title + page name ──
SliverToBoxAdapter(
- child: AbsorbPageHeader(
+ child: SizeTransition(
+ sizeFactor: _headerAnimController,
+ axisAlignment: -1.0,
+ child: AbsorbPageHeader(
title: 'Home',
trailing: GestureDetector(
onTap: () {
@@ -403,6 +445,7 @@ class _HomeScreenState extends State<HomeScreen> {
),
],
),
+ ),
),
// (Continue Listening is now rendered in the generic sections loop below)
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index dbee1406..030f5549 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -2497,13 +2497,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
showModalBottomSheet(
context: context,
- backgroundColor: Colors.transparent,
- builder: (ctx) => Container(
- decoration: BoxDecoration(
- color: cs.surfaceContainerHigh,
- borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
- ),
- child: Column(mainAxisSize: MainAxisSize.min, children: [
+ useSafeArea: true,
+ backgroundColor: cs.surfaceContainerHigh,
+ shape: const RoundedRectangleBorder(
+ borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+ ),
+ builder: (ctx) => Column(mainAxisSize: MainAxisSize.min, children: [
Center(child: Container(margin: const EdgeInsets.only(top: 12), width: 36, height: 4,
decoration: BoxDecoration(color: cs.onSurface.withValues(alpha: 0.12), borderRadius: BorderRadius.circular(2)))),
const SizedBox(height: 16),
@@ -2601,9 +2600,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
]),
),
),
- SizedBox(height: MediaQuery.of(ctx).padding.bottom + 12),
+ const SizedBox(height: 12),
]),
- ),
);
}
diff --git a/lib/widgets/card_progress_bar.dart b/lib/widgets/card_progress_bar.dart
index 71f74884..24a90027 100644
--- a/lib/widgets/card_progress_bar.dart
+++ b/lib/widgets/card_progress_bar.dart
@@ -174,7 +174,8 @@ class _CardDualProgressBarState extends State<CardDualProgressBar> with WidgetsB
if (_isCastMode) {
if (!_isPlaying) return _lastKnownPos;
final elapsed = DateTime.now().difference(_lastPosTime).inMilliseconds / 1000.0;
- return _lastKnownPos + elapsed * _currentSpeed;
+ final capped = elapsed.clamp(0.0, 1.0);
+ return _lastKnownPos + capped * _currentSpeed;
}
// If a seek just happened, snap to the target immediately
final seekTarget = widget.player.activeSeekTarget;
@@ -182,7 +183,13 @@ class _CardDualProgressBarState extends State<CardDualProgressBar> with WidgetsB
return seekTarget;
}
if (!widget.isActive || !_isPlaying) return _lastKnownPos;
+ // Use the player's real position as the baseline instead of interpolating
+ // from a potentially stale stream event. This prevents overshoot when the
+ // position stream slows down (e.g. tab offstage in IndexedStack).
+ final realPos = widget.player.position.inMilliseconds / 1000.0;
+ // Only interpolate a small amount from the real position for sub-tick smoothing
final elapsed = DateTime.now().difference(_lastPosTime).inMilliseconds / 1000.0;
+ if (elapsed > 1.0) return realPos;
return _lastKnownPos + elapsed * _currentSpeed;
}