Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Fix account sheet scrolling and safe area, sleep timer on inactive cards

Nathan Poulson32c988cdc10a
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 030f5549..ff172114 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -2497,15 +2497,18 @@ class _SettingsScreenState extends State<SettingsScreen> {
showModalBottomSheet(
context: context,
+ isScrollControlled: true,
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),
+ builder: (ctx) => SafeArea(
+ child: SingleChildScrollView(
+ child: 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),
// Current user info
Padding(
padding: const EdgeInsets.symmetric(horizontal: 20),
@@ -2602,6 +2605,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
),
const SizedBox(height: 12),
]),
+ ),
+ ),
);
}
diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dart
index 2592bdf0..9f71db3b 100644
--- a/lib/widgets/absorbing_card.dart
+++ b/lib/widgets/absorbing_card.dart
@@ -995,7 +995,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
return CardWideButton(
icon: Icons.bedtime_outlined, label: short ? 'Sleep' : 'Sleep Timer',
accent: accent, isActive: true, alwaysEnabled: true, large: large, compact: compact,
- child: CardSleepButtonInline(accent: accent, isActive: true, large: large, compact: compact),
+ child: CardSleepButtonInline(accent: accent, isActive: _isPlaybackActive, large: large, compact: compact),
);
case 'bookmarks':
return CardWideButton(
diff --git a/pubspec.yaml b/pubspec.yaml
index 8f6fd477..c54ba887 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: absorb
description: An Audiobookshelf Client
publish_to: 'none'
-version: 1.8.56+74
+version: 1.8.57+75
# v1.8.41: JWT auth (accessToken + refreshToken), MANAGE_EXTERNAL_STORAGE removed from playstore flavor
# Build scripts (run from Git Bash):
# . ./build_bundle.sh - Play Store AAB (no MANAGE_EXTERNAL_STORAGE)