Carplay Homescreen and Now Playing Updates

ios/Runner/AppDelegate.swift

@@ -1,7 +1,6 @@
 import app_links
 import UIKit
 import Flutter
-import MediaPlayer
 import Intents
 import AVFoundation
 
@@ -18,11 +17,6 @@ let flutterEngine = FlutterEngine(name: "SharedEngine", project: nil, allowHeadl
         flutterEngine.run()
         GeneratedPluginRegistrant.register(with: flutterEngine)
 
-        // Set up method channel for playback state sync to MPNowPlayingInfoCenter
-        // TODO: This is a workaround because audio_service doesn't set playbackState on iOS.
-        // Consider contributing a fix to audio_service to set MPNowPlayingInfoCenter.playbackState on iOS.
-        setupPlaybackStateChannel()
-
         // Set up method channel for Siri media intent handling
         setupSiriIntentChannel()
 
@@ -91,40 +85,6 @@ private func setExcludeFromiCloudBackup(_ dir: URL, isExcluded: Bool) throws {
     try mutableDir.setResourceValues(values)
 }
 
-// TODO: This is a workaround because audio_service doesn't set MPNowPlayingInfoCenter.playbackState on iOS.
-// The audio_service plugin only sets playbackState on macOS (see AudioServicePlugin.m line 293-295).
-// This causes CarPlay's Now Playing screen to not reflect the correct play/pause state when
-// playback is started from the phone. Consider contributing a fix upstream to audio_service.
-
-extension AppDelegate {
-    func setupPlaybackStateChannel() {
-        let channel = FlutterMethodChannel(
-            name: "\(Bundle.main.bundleIdentifier!)/playback_state",
-            binaryMessenger: flutterEngine.binaryMessenger
-        )
-
-        channel.setMethodCallHandler { [weak self] (call, result) in
-            switch call.method {
-            case "setPlaybackState":
-                guard let args = call.arguments as? [String: Any],
-                      let isPlaying = args["isPlaying"] as? Bool else {
-                    result(FlutterError(code: "INVALID_ARGS", message: "Missing isPlaying argument", details: nil))
-                    return
-                }
-
-                if #available(iOS 13.0, *) {
-                    let center = MPNowPlayingInfoCenter.default()
-                    center.playbackState = isPlaying ? .playing : .paused
-                }
-                result(nil)
-
-            default:
-                result(FlutterMethodNotImplemented)
-            }
-        }
-    }
-}
-
 // Handles voice commands like "Hey Siri, play [track/artist] on Finamp"
 
 private var siriIntentChannel: FlutterMethodChannel?

lib/components/MusicScreen/sort_and_filter_row.dart

@@ -90,6 +90,16 @@ extension type const ResolvedSortConfig._(SortAndFilterConfiguration config) imp
     return ResolvedSortConfig._(config.copyWith(genreFilter: genre));
   }
 
+  /// Replaces any existing letter filter with [letter] ("A".."Z" or "#") and forces ascending sort-name order.
+  ResolvedSortConfig copyWithLetter(String letter) {
+    final processedFilters = config.filters.toSet();
+    processedFilters.removeWhere((x) => x.type == ItemFilterType.startsWithCharacter);
+    processedFilters.add(ItemFilter(type: ItemFilterType.startsWithCharacter, extras: letter));
+    return ResolvedSortConfig._(
+      config.copyWith(sortBy: SortBy.sortName, sortOrder: SortOrder.ascending, filters: processedFilters),
+    );
+  }
+
   ResolvedSortConfig.skipResolving(this.config);
 
   static const defaultSort = ResolvedSortConfig._(

lib/main.dart

@@ -446,6 +446,13 @@ Future<void> _setupPlaybackServices() async {
       // notificationColor: TODO use the theme color for older versions of Android,
       // We will handle preloading artwork ourselves
       preloadArtwork: false,
+      // Keep iOS now playing info + remote command handlers registered when
+      // the service stops, so Finamp stays the system's resume candidate for
+      // CarPlay/Bluetooth reconnects instead of losing now-playing status to
+      // whichever app had it before. Requires the audio_service fork
+      // overrides in pubspec.yaml (the flag spans audio_service and
+      // audio_service_platform_interface).
+      iosKeepNowPlayingOnStop: true,
       androidBrowsableRootExtras: <String, dynamic>{
         // support showing search button on Android Auto as well as alternative search results on the player screen after voice search
         "android.media.browse.SEARCH_SUPPORTED": true,

lib/screens/queue_restore_screen.dart

@@ -1,10 +1,10 @@
 import 'package:finamp/components/finamp_app_bar_back_button.dart';
 import 'package:finamp/l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
-import 'package:hive_ce/hive.dart';
+import 'package:get_it/get_it.dart';
 
 import '../components/QueueRestoreScreen/queue_restore_tile.dart';
-import '../models/finamp_models.dart';
+import '../services/queue_service.dart';
 
 class QueueRestoreScreen extends StatelessWidget {
   const QueueRestoreScreen({super.key});
@@ -13,11 +13,7 @@ class QueueRestoreScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final queuesBox = Hive.box<FinampStorableQueueInfo>("Queues");
-    var queueMap = queuesBox.toMap();
-    queueMap.remove("latest");
-    var queueList = queueMap.values.toList();
-    queueList.sort((x, y) => y.creation - x.creation);
+    final queueList = GetIt.instance<QueueService>().getRecentQueueHistory();
 
     return Scaffold(
       appBar: AppBar(title: Text(AppLocalizations.of(context)!.queuesScreen), leading: FinampAppBarBackButton()),