Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Merge widget cold resume into main

Nathan Poulson6ae0d599f673
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index 35d8e102..045a2d16 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -2,6 +2,7 @@ import Flutter
import UIKit
import AVFoundation
import MediaPlayer
+import just_audio
@main
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
@@ -107,9 +108,54 @@ import MediaPlayer
let eqChannel = FlutterMethodChannel(name: "com.absorb.equalizer",
binaryMessenger: controller.binaryMessenger)
eqChannel.setMethodCallHandler { [weak self] (call, result) in
+ let args = call.arguments as? [String: Any]
switch call.method {
case "isBluetoothAudioConnected":
result(self?.isBluetoothAudioConnected() ?? false)
+
+ case "init":
+ // Return fixed 5-band info (we define the bands since iOS has no system EQ)
+ result([
+ "bands": 5,
+ "frequencies": [60, 230, 910, 3600, 14000],
+ "minLevel": -15.0,
+ "maxLevel": 15.0,
+ ] as [String: Any])
+
+ case "attachSession":
+ // No-op on iOS - tap is already on all player items
+ result(true)
+
+ case "setEnabled":
+ let enabled = args?["enabled"] as? Bool ?? false
+ AudioEQProcessor.shared.setEnabled(enabled)
+ result(true)
+
+ case "setBand":
+ let band = args?["band"] as? Int ?? 0
+ let level = args?["level"] as? Int ?? 0
+ AudioEQProcessor.shared.setBandLevel(Int32(level), forBand: Int32(band))
+ result(true)
+
+ case "setBassBoost":
+ let strength = args?["strength"] as? Int ?? 0
+ AudioEQProcessor.shared.setBassBoostStrength(Int32(strength))
+ result(true)
+
+ case "setVirtualizer":
+ // No iOS equivalent - no-op
+ result(true)
+
+ case "setLoudness":
+ let gain = args?["gain"] as? Int ?? 0
+ AudioEQProcessor.shared.setLoudnessGain(Int32(gain))
+ result(true)
+
+ case "setMono":
+ let enabled = args?["enabled"] as? Bool ?? false
+ AudioEQProcessor.shared.setMonoEnabled(enabled)
+ result(true)
+
default:
result(FlutterMethodNotImplemented)
}
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index c218d27e..230d9c7d 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -595,6 +595,7 @@ class HomeScreenState extends State<HomeScreen> {
final item = clItems[i] as Map<String, dynamic>;
return _ContinueListeningCard(
item: item, lib: lib, player: _player,
+ rectangleCovers: _rectangleCovers,
);
},
),
@@ -684,11 +685,13 @@ class _ContinueListeningCard extends StatefulWidget {
final Map<String, dynamic> item;
final LibraryProvider lib;
final AudioPlayerService player;
+ final bool rectangleCovers;
const _ContinueListeningCard({
required this.item,
required this.lib,
required this.player,
+ required this.rectangleCovers,
});
@override
@@ -785,13 +788,14 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
// Cover with play overlay
ClipRect(
child: AspectRatio(
- aspectRatio: 1,
+ aspectRatio: widget.rectangleCovers ? 2 / 3 : 1.0,
child: Stack(children: [
Positioned.fill(
child: coverUrl != null
? coverUrl.startsWith('/')
? BlurPaddedCover(
- child: Image.file(File(coverUrl), fit: BoxFit.contain,
+ enabled: !widget.rectangleCovers,
+ child: Image.file(File(coverUrl), fit: widget.rectangleCovers ? BoxFit.cover : BoxFit.contain,
errorBuilder: (_, __, ___) => Container(
color: cs.surfaceContainerHighest,
child: Icon(Icons.headphones_rounded,
@@ -799,8 +803,9 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
blurChild: Image.file(File(coverUrl), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => const SizedBox.shrink()))
: BlurPaddedCover(
+ enabled: !widget.rectangleCovers,
child: CachedNetworkImage(
- imageUrl: coverUrl, fit: BoxFit.contain,
+ imageUrl: coverUrl, fit: widget.rectangleCovers ? BoxFit.cover : BoxFit.contain,
httpHeaders: lib.mediaHeaders,
fadeInDuration: const Duration(milliseconds: 300),
placeholder: (_, __) => Container(
diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dart
index 94177f5a..02a6269f 100644
--- a/lib/widgets/absorbing_card.dart
+++ b/lib/widgets/absorbing_card.dart
@@ -516,11 +516,18 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
child: Padding(
padding: EdgeInsets.fromLTRB(24, compact ? 6 : 10, 24, 0),
child: StreamBuilder<Duration>(
- stream: widget.player.absolutePositionStream,
+ stream: _isCastingThis
+ ? cast.castPositionStream
+ : widget.player.absolutePositionStream,
builder: (_, snap) {
final double pos;
- if (_isActive) {
+ final double dur;
+ if (_isCastingThis) {
+ pos = cast.castPosition.inMilliseconds / 1000.0;
+ dur = cast.castingDuration;
+ } else if (_isActive) {
pos = (snap.data?.inMilliseconds ?? 0) / 1000.0;
+ dur = _effectiveDuration;
} else {
// Use exact currentTime from server progress if available,
// otherwise fall back to progress ratio * duration.
@@ -529,10 +536,12 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
: lib.getProgressData(_itemId);
final ct = (pd?['currentTime'] as num?)?.toDouble();
pos = (ct != null && ct > 0) ? ct : bookProgress * _effectiveDuration;
+ dur = _effectiveDuration;
}
final speed = _speedAdjustedTime ? (_isActive ? widget.player.speed : _savedSpeed) : 1.0;
+ final liveBookProgress = dur > 0 ? (pos / dur).clamp(0.0, 1.0) : bookProgress;
final elapsed = pos / speed;
- final remaining = (_effectiveDuration - pos) / speed;
+ final remaining = (dur - pos) / speed;
final timeStyle = tt.labelSmall?.copyWith(
color: isDark ? Colors.white.withValues(alpha: 0.55) : cs.onSurface,
fontWeight: FontWeight.w500, fontSize: compact ? 10 : 11,
@@ -551,7 +560,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
Text('-${fmtTime(remaining)}', style: timeStyle),
],
),
- Text('${(bookProgress * 100).clamp(0, 100).toStringAsFixed(1)}%',
+ Text('${(liveBookProgress * 100).clamp(0, 100).toStringAsFixed(1)}%',
style: timeStyle),
],
);
diff --git a/lib/widgets/equalizer_sheet.dart b/lib/widgets/equalizer_sheet.dart
index bf2e576f..c3e92688 100644
--- a/lib/widgets/equalizer_sheet.dart
+++ b/lib/widgets/equalizer_sheet.dart
@@ -1,3 +1,4 @@
+import 'dart:io' show Platform;
import 'package:flutter/material.dart';
import '../services/equalizer_service.dart';
@@ -445,16 +446,18 @@ class _EqualizerSheetContentState extends State<_EqualizerSheetContent> {
),
const SizedBox(height: 8),
- // Virtualizer
- _EffectRow(
- icon: Icons.surround_sound_rounded,
- label: 'Surround',
- value: _vVirt,
- accent: accent,
- enabled: _vEnabled,
- onChanged: (v) => _setVirt(v),
- ),
- const SizedBox(height: 8),
+ // Virtualizer (Android only - no iOS equivalent)
+ if (Platform.isAndroid) ...[
+ _EffectRow(
+ icon: Icons.surround_sound_rounded,
+ label: 'Surround',
+ value: _vVirt,
+ accent: accent,
+ enabled: _vEnabled,
+ onChanged: (v) => _setVirt(v),
+ ),
+ const SizedBox(height: 8),
+ ],
// Loudness
_EffectRow(
diff --git a/packages/just_audio/darwin/just_audio.podspec b/packages/just_audio/darwin/just_audio.podspec
index 0805c37d..7e61c0cf 100644
--- a/packages/just_audio/darwin/just_audio.podspec
+++ b/packages/just_audio/darwin/just_audio.podspec
@@ -18,5 +18,7 @@ A flutter plugin for playing audio.
s.osx.dependency 'FlutterMacOS'
s.ios.deployment_target = '12.0'
s.osx.deployment_target = '10.14'
+ s.ios.frameworks = 'MediaToolbox', 'Accelerate'
+ s.osx.frameworks = 'MediaToolbox', 'Accelerate'
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
end
diff --git a/packages/just_audio/darwin/just_audio/Sources/just_audio/UriAudioSource.m b/packages/just_audio/darwin/just_audio/Sources/just_audio/UriAudioSource.m
index 6a1ba9e9..60845692 100644
--- a/packages/just_audio/darwin/just_audio/Sources/just_audio/UriAudioSource.m
+++ b/packages/just_audio/darwin/just_audio/Sources/just_audio/UriAudioSource.m
@@ -2,6 +2,7 @@
#import "./include/just_audio/IndexedAudioSource.h"
#import "./include/just_audio/IndexedPlayerItem.h"
#import "./include/just_audio/LoadControl.h"
+#import "./include/just_audio/AudioEQProcessor.h"
#import <AVFoundation/AVFoundation.h>
@implementation UriAudioSource {
@@ -90,6 +91,9 @@
}
}
+ // Attach EQ processing tap
+ [[AudioEQProcessor shared] attachTapToPlayerItem:item];
+
return item;
}