Compare commits
8
Commits
v2.9.1-beta
...
stash-5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
44a1674c28 | ||
|
|
91494f7d25 | ||
|
|
d7b7bbcf0d | ||
|
|
3503978185 | ||
|
|
020ed250f4 | ||
|
|
e5be64a6cd | ||
|
|
b85fadc551 | ||
|
|
3b8339f94f |
@@ -36,7 +36,8 @@ This application was built with AI-assisted development using **Claude Code** an
|
||||
### Queue Management
|
||||
- **View & Manage Queue** - See upcoming tracks in the playback queue
|
||||
- **Drag to Reorder** - Instant drag handles for reordering tracks
|
||||
- **Swipe to Delete** - Remove tracks with a simple swipe gesture
|
||||
- **Swipe left to Delete** - Remove tracks with a simple swipe gesture
|
||||
- **Swipe right to play next** - Move tracks with a simple swipe gesture
|
||||
|
||||
### Home Screen
|
||||
- **Customizable Rows** - Toggle and reorder: Recently Played, Discover Artists, Discover Albums
|
||||
@@ -50,7 +51,9 @@ This application was built with AI-assisted development using **Claude Code** an
|
||||
- **Podcasts** - Browse podcasts, view episodes with descriptions and publish dates
|
||||
- **Audiobooks** - Browse by title, series, or author with progress tracking
|
||||
- **Favorites Filter** - Toggle to show only your favorite items
|
||||
- **Providers Filter** - Toggle to show only specific provider items
|
||||
- **Letter Scrollbar** - Fast navigation through long lists
|
||||
- **Provider Icons** - Provider icons on library covers
|
||||
|
||||
### Search
|
||||
- **Universal Search** - Find music, podcasts, radio stations, playlists, and audiobooks
|
||||
@@ -86,16 +89,18 @@ This application was built with AI-assisted development using **Claude Code** an
|
||||
## Screenshots
|
||||
|
||||
<div align="center">
|
||||
<img src="assets/screenshots/1.png?v=3" alt="Screenshot 1" width="150">
|
||||
<img src="assets/screenshots/2.png?v=3" alt="Screenshot 2" width="150">
|
||||
<img src="assets/screenshots/3.png?v=3" alt="Screenshot 3" width="150">
|
||||
<img src="assets/screenshots/4.png?v=3" alt="Screenshot 4" width="150">
|
||||
<img src="assets/screenshots/5.png?v=3" alt="Screenshot 5" width="150">
|
||||
<img src="assets/screenshots/6.png?v=3" alt="Screenshot 6" width="150">
|
||||
<img src="assets/screenshots/7.png?v=3" alt="Screenshot 7" width="150">
|
||||
<img src="assets/screenshots/8.png?v=3" alt="Screenshot 8" width="150">
|
||||
<img src="assets/screenshots/9.png?v=3" alt="Screenshot 9" width="150">
|
||||
<img src="assets/screenshots/10.png?v=3" alt="Screenshot 10" width="150">
|
||||
<img src="assets/screenshots/1.png?v=4" alt="Screenshot 1" width="150">
|
||||
<img src="assets/screenshots/2.png?v=4" alt="Screenshot 2" width="150">
|
||||
<img src="assets/screenshots/3.png?v=4" alt="Screenshot 3" width="150">
|
||||
<img src="assets/screenshots/4.png?v=4" alt="Screenshot 4" width="150">
|
||||
<img src="assets/screenshots/5.png?v=4" alt="Screenshot 5" width="150">
|
||||
<img src="assets/screenshots/6.png?v=4" alt="Screenshot 6" width="150">
|
||||
<img src="assets/screenshots/7.png?v=4" alt="Screenshot 7" width="150">
|
||||
<img src="assets/screenshots/8.png?v=4" alt="Screenshot 8" width="150">
|
||||
<img src="assets/screenshots/9.png?v=4" alt="Screenshot 9" width="150">
|
||||
<img src="assets/screenshots/10.png?v=4" alt="Screenshot 10" width="150">
|
||||
<img src="assets/screenshots/11.png?v=4" alt="Screenshot 11" width="150">
|
||||
<img src="assets/screenshots/12.png?v=4" alt="Screenshot 12" width="150">
|
||||
</div>
|
||||
|
||||
## Download
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
# Release Notes Draft
|
||||
|
||||
## v2.9.2-beta (TBD)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
#### Audiobooks
|
||||
- **Fixed audiobooks not loading after provider re-add**: When removing and re-adding an AudiobookShelf provider, the app would show 0 audiobooks because saved library paths referenced the old provider instance ID. Now automatically clears stale settings and falls back to the library_items API.
|
||||
|
||||
- **Fixed duplicate provider filter options**: After re-adding a provider, two entries for the same provider could appear in the library filter menu. Now deduplicates providers by name, keeping the one with more items.
|
||||
|
||||
- **Fixed multiple accounts of same service not showing**: When you have multiple accounts of the same service (e.g., two Spotify accounts for different family members), only one would appear in the library menu provider toggles. Now all accounts with distinct names are shown.
|
||||
|
||||
- **Fixed audiobook year sorting**: Sort by year now works correctly for audiobooks. Fixed two issues:
|
||||
- Year data is now properly extracted from ABS's `metadata.release_date` field (handles both "2024" and "2024-01-15" formats)
|
||||
- Sort handler now properly supports ascending and descending year sorts
|
||||
|
||||
#### Library Sorting
|
||||
- **Fixed letter scrollbar showing irrelevant letters**: When sorting by date or play count, the scrollbar popup now hides instead of showing meaningless letters. Shows contextual info based on sort type (letters for alphabetical, years for year sort, hidden for date/count sorts).
|
||||
|
||||
- **Fixed sorting not working for date added, last played, play count**: These sort options now correctly preserve server-side sorting instead of re-sorting alphabetically on the client. Affected albums, artists, and tracks tabs.
|
||||
|
||||
- **Fixed playlists sorting**: Modified, last played, and play count sorting now works for playlists by properly requesting sorted data from the server.
|
||||
|
||||
- **Fixed ascending/descending not working**: Sort direction now properly applies for all sort types across albums, artists, playlists, and audiobooks.
|
||||
|
||||
- **Fixed list not updating when sort order changes**: Added sort order to ListView/GridView keys to force UI rebuilds when changing sort direction.
|
||||
|
||||
#### Provider Management
|
||||
- **Fixed stale provider IDs persisting in settings**: When toggling providers, stale provider instance IDs (from removed providers) are now automatically cleaned up from saved settings.
|
||||
|
||||
### Technical Changes
|
||||
- Added `ScrollbarDisplayMode` enum (`letter`, `year`, `count`, `none`) for contextual scrollbar popups
|
||||
- Added `updateCachedAlbums()`, `updateCachedArtists()`, `updateCachedPlaylists()` methods to SyncService for proper cache synchronization with sorted data
|
||||
- Provider filter now validates against available providers when toggling, not just on initial load
|
||||
- Removed Selector caching from albums and artists tabs to ensure proper rebuilds when source tracking updates
|
||||
- Options menu provider toggles now use Consumer to watch Provider state directly
|
||||
@@ -30,16 +30,16 @@ if (keystorePropertiesFile.exists()) {
|
||||
|
||||
android {
|
||||
namespace "com.musicassistant.music_assistant"
|
||||
compileSdk 35
|
||||
compileSdk 36
|
||||
ndkVersion flutter.ndkVersion
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = '1.8'
|
||||
jvmTarget = '17'
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
@@ -59,7 +59,7 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.musicassistant.music_assistant"
|
||||
minSdk 21
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
targetSdk 35
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.9.10'
|
||||
ext.kotlin_version = '2.1.0'
|
||||
repositories {
|
||||
google()
|
||||
// Use Maven Central mirrors as fallback for 403 errors
|
||||
@@ -9,7 +9,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.1.0'
|
||||
classpath 'com.android.tools.build:gradle:8.7.0'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
|
||||
|
||||
@@ -22,8 +22,8 @@ pluginManagement {
|
||||
|
||||
plugins {
|
||||
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
||||
id "com.android.application" version "8.1.0" apply false
|
||||
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
|
||||
id "com.android.application" version "8.7.0" apply false
|
||||
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
|
||||
}
|
||||
|
||||
include ":app"
|
||||
|
||||
Binary file not shown.
@@ -64,7 +64,8 @@ import 'app_localizations_fr.dart';
|
||||
/// be consistent with the languages listed in the S.supportedLocales
|
||||
/// property.
|
||||
abstract class S {
|
||||
S(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
|
||||
S(String locale)
|
||||
: localeName = intl.Intl.canonicalizedLocale(locale.toString());
|
||||
|
||||
final String localeName;
|
||||
|
||||
@@ -84,7 +85,8 @@ abstract class S {
|
||||
/// Additional delegates can be added by appending to this list in
|
||||
/// MaterialApp. This list does not have to be used at all if a custom list
|
||||
/// of delegates is preferred or required.
|
||||
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
|
||||
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
|
||||
<LocalizationsDelegate<dynamic>>[
|
||||
delegate,
|
||||
GlobalMaterialLocalizations.delegate,
|
||||
GlobalCupertinoLocalizations.delegate,
|
||||
@@ -2131,27 +2133,29 @@ class _SDelegate extends LocalizationsDelegate<S> {
|
||||
}
|
||||
|
||||
@override
|
||||
bool isSupported(Locale locale) => <String>['de', 'en', 'es', 'fr'].contains(locale.languageCode);
|
||||
bool isSupported(Locale locale) =>
|
||||
<String>['de', 'en', 'es', 'fr'].contains(locale.languageCode);
|
||||
|
||||
@override
|
||||
bool shouldReload(_SDelegate old) => false;
|
||||
}
|
||||
|
||||
S lookupS(Locale locale) {
|
||||
|
||||
|
||||
// Lookup logic when only language code is specified.
|
||||
switch (locale.languageCode) {
|
||||
case 'de': return SDe();
|
||||
case 'en': return SEn();
|
||||
case 'es': return SEs();
|
||||
case 'fr': return SFr();
|
||||
case 'de':
|
||||
return SDe();
|
||||
case 'en':
|
||||
return SEn();
|
||||
case 'es':
|
||||
return SEs();
|
||||
case 'fr':
|
||||
return SFr();
|
||||
}
|
||||
|
||||
throw FlutterError(
|
||||
'S.delegate failed to load unsupported locale "$locale". This is likely '
|
||||
'an issue with the localizations generation tool. Please file an issue '
|
||||
'on GitHub with a reproducible sample app and the gen-l10n configuration '
|
||||
'that was used.'
|
||||
);
|
||||
'S.delegate failed to load unsupported locale "$locale". This is likely '
|
||||
'an issue with the localizations generation tool. Please file an issue '
|
||||
'on GitHub with a reproducible sample app and the gen-l10n configuration '
|
||||
'that was used.');
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// ignore: unused_import
|
||||
import 'package:intl/intl.dart' as intl;
|
||||
|
||||
import 'app_localizations.dart';
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
@@ -39,7 +39,8 @@ class SDe extends S {
|
||||
String get portHint => 'z.B. 8095 oder leer lassen';
|
||||
|
||||
@override
|
||||
String get portDescription => 'Leer lassen bei Reverse Proxy oder Standardports. 8095 eingeben bei Direktverbindung.';
|
||||
String get portDescription =>
|
||||
'Leer lassen bei Reverse Proxy oder Standardports. 8095 eingeben bei Direktverbindung.';
|
||||
|
||||
@override
|
||||
String get username => 'Benutzername';
|
||||
@@ -60,10 +61,12 @@ class SDe extends S {
|
||||
String get authServerUrlOptional => 'Auth-Server URL (Optional)';
|
||||
|
||||
@override
|
||||
String get authServerUrlHint => 'z.B. auth.example.com (wenn abweichend vom Server)';
|
||||
String get authServerUrlHint =>
|
||||
'z.B. auth.example.com (wenn abweichend vom Server)';
|
||||
|
||||
@override
|
||||
String get authServerUrlDescription => 'Leer lassen, wenn Authentifizierung auf demselben Server';
|
||||
String get authServerUrlDescription =>
|
||||
'Leer lassen, wenn Authentifizierung auf demselben Server';
|
||||
|
||||
@override
|
||||
String detectedAuthType(String authType) {
|
||||
@@ -80,40 +83,49 @@ class SDe extends S {
|
||||
String get unencryptedConnection => 'Unverschlusselte Verbindung';
|
||||
|
||||
@override
|
||||
String get usingHttpOverTailscale => 'HTTP uber Tailscale (verschlusselter Tunnel)';
|
||||
String get usingHttpOverTailscale =>
|
||||
'HTTP uber Tailscale (verschlusselter Tunnel)';
|
||||
|
||||
@override
|
||||
String get httpsFailedUsingHttp => 'HTTPS fehlgeschlagen, verwende HTTP';
|
||||
|
||||
@override
|
||||
String get httpNotEncrypted => 'HTTP-Verbindung - Daten sind nicht verschlusselt';
|
||||
String get httpNotEncrypted =>
|
||||
'HTTP-Verbindung - Daten sind nicht verschlusselt';
|
||||
|
||||
@override
|
||||
String get pleaseEnterServerAddress => 'Bitte gib deine Music Assistant Serveradresse ein';
|
||||
String get pleaseEnterServerAddress =>
|
||||
'Bitte gib deine Music Assistant Serveradresse ein';
|
||||
|
||||
@override
|
||||
String get pleaseEnterName => 'Bitte gib deinen Namen ein';
|
||||
|
||||
@override
|
||||
String get pleaseEnterValidPort => 'Bitte gib eine gultige Portnummer ein (1-65535)';
|
||||
String get pleaseEnterValidPort =>
|
||||
'Bitte gib eine gultige Portnummer ein (1-65535)';
|
||||
|
||||
@override
|
||||
String get pleaseEnterCredentials => 'Bitte gib Benutzername und Passwort ein';
|
||||
String get pleaseEnterCredentials =>
|
||||
'Bitte gib Benutzername und Passwort ein';
|
||||
|
||||
@override
|
||||
String get authFailed => 'Authentifizierung fehlgeschlagen. Bitte uberprufe deine Anmeldedaten.';
|
||||
String get authFailed =>
|
||||
'Authentifizierung fehlgeschlagen. Bitte uberprufe deine Anmeldedaten.';
|
||||
|
||||
@override
|
||||
String get maLoginFailed => 'Music Assistant Anmeldung fehlgeschlagen. Bitte uberprufe deine Anmeldedaten.';
|
||||
String get maLoginFailed =>
|
||||
'Music Assistant Anmeldung fehlgeschlagen. Bitte uberprufe deine Anmeldedaten.';
|
||||
|
||||
@override
|
||||
String get connectionFailed => 'Verbindung zum Server fehlgeschlagen. Bitte uberprufe die Adresse und versuche es erneut.';
|
||||
String get connectionFailed =>
|
||||
'Verbindung zum Server fehlgeschlagen. Bitte uberprufe die Adresse und versuche es erneut.';
|
||||
|
||||
@override
|
||||
String get detectingAuth => 'Erkenne Authentifizierung...';
|
||||
|
||||
@override
|
||||
String get cannotDetermineAuth => 'Authentifizierungsanforderungen konnten nicht ermittelt werden. Bitte uberprufe die Server-URL.';
|
||||
String get cannotDetermineAuth =>
|
||||
'Authentifizierungsanforderungen konnten nicht ermittelt werden. Bitte uberprufe die Server-URL.';
|
||||
|
||||
@override
|
||||
String get noAuthentication => 'Keine Authentifizierung';
|
||||
@@ -221,10 +233,12 @@ class SDe extends S {
|
||||
String get noRadioStations => 'Keine Radiosender';
|
||||
|
||||
@override
|
||||
String get addRadioStationsHint => 'Füge Radiosender in Music Assistant hinzu';
|
||||
String get addRadioStationsHint =>
|
||||
'Füge Radiosender in Music Assistant hinzu';
|
||||
|
||||
@override
|
||||
String get searchFailed => 'Suche fehlgeschlagen. Bitte überprüfe deine Verbindung.';
|
||||
String get searchFailed =>
|
||||
'Suche fehlgeschlagen. Bitte überprüfe deine Verbindung.';
|
||||
|
||||
@override
|
||||
String get queue => 'Warteschlange';
|
||||
@@ -471,37 +485,43 @@ class SDe extends S {
|
||||
String get noFavoriteAudiobooks => 'Keine Lieblingshörbücher';
|
||||
|
||||
@override
|
||||
String get tapHeartAudiobook => 'Tippe auf das Herz bei einem Hörbuch, um es zu Favoriten hinzuzufügen';
|
||||
String get tapHeartAudiobook =>
|
||||
'Tippe auf das Herz bei einem Hörbuch, um es zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get noAudiobooks => 'Keine Hörbücher';
|
||||
|
||||
@override
|
||||
String get addAudiobooksHint => 'Füge Hörbücher zu deiner Bibliothek hinzu, um sie hier zu sehen';
|
||||
String get addAudiobooksHint =>
|
||||
'Füge Hörbücher zu deiner Bibliothek hinzu, um sie hier zu sehen';
|
||||
|
||||
@override
|
||||
String get noFavoriteArtists => 'Keine Lieblingskünstler';
|
||||
|
||||
@override
|
||||
String get tapHeartArtist => 'Tippe auf das Herz bei einem Künstler, um ihn zu Favoriten hinzuzufügen';
|
||||
String get tapHeartArtist =>
|
||||
'Tippe auf das Herz bei einem Künstler, um ihn zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get noFavoriteAlbums => 'Keine Lieblingsalben';
|
||||
|
||||
@override
|
||||
String get tapHeartAlbum => 'Tippe auf das Herz bei einem Album, um es zu Favoriten hinzuzufügen';
|
||||
String get tapHeartAlbum =>
|
||||
'Tippe auf das Herz bei einem Album, um es zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get noFavoritePlaylists => 'Keine Lieblings-Wiedergabelisten';
|
||||
|
||||
@override
|
||||
String get tapHeartPlaylist => 'Tippe auf das Herz bei einer Wiedergabeliste, um sie zu Favoriten hinzuzufügen';
|
||||
String get tapHeartPlaylist =>
|
||||
'Tippe auf das Herz bei einer Wiedergabeliste, um sie zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get noFavoriteTracks => 'Keine Lieblingssongs';
|
||||
|
||||
@override
|
||||
String get longPressTrackHint => 'Halte einen Song gedrückt und tippe auf das Herz, um ihn zu Favoriten hinzuzufügen';
|
||||
String get longPressTrackHint =>
|
||||
'Halte einen Song gedrückt und tippe auf das Herz, um ihn zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get loadSeries => 'Serien laden';
|
||||
@@ -513,7 +533,8 @@ class SDe extends S {
|
||||
String get notConnectedTitle => 'Nicht verbunden';
|
||||
|
||||
@override
|
||||
String get connectHint => 'Verbinde dich mit deinem Music Assistant Server, um Musik zu hören';
|
||||
String get connectHint =>
|
||||
'Verbinde dich mit deinem Music Assistant Server, um Musik zu hören';
|
||||
|
||||
@override
|
||||
String get configureServer => 'Server konfigurieren';
|
||||
@@ -549,7 +570,8 @@ class SDe extends S {
|
||||
String get noLogsToCopy => 'Keine Protokolle zum Kopieren';
|
||||
|
||||
@override
|
||||
String get noDebugLogsYet => 'Noch keine Debug-Protokolle. Versuche Authentifizierung zu erkennen.';
|
||||
String get noDebugLogsYet =>
|
||||
'Noch keine Debug-Protokolle. Versuche Authentifizierung zu erkennen.';
|
||||
|
||||
@override
|
||||
String get showDebug => 'Debug anzeigen';
|
||||
@@ -649,10 +671,12 @@ class SDe extends S {
|
||||
String get showAudiobooksInProgress => 'Hörbücher in Bearbeitung anzeigen';
|
||||
|
||||
@override
|
||||
String get showRandomAudiobooks => 'Zufällige Hörbücher zum Entdecken anzeigen';
|
||||
String get showRandomAudiobooks =>
|
||||
'Zufällige Hörbücher zum Entdecken anzeigen';
|
||||
|
||||
@override
|
||||
String get showRandomSeries => 'Zufällige Hörbuchserien zum Entdecken anzeigen';
|
||||
String get showRandomSeries =>
|
||||
'Zufällige Hörbuchserien zum Entdecken anzeigen';
|
||||
|
||||
@override
|
||||
String get showFavoriteAlbums => 'Lieblingsalben anzeigen';
|
||||
@@ -667,16 +691,19 @@ class SDe extends S {
|
||||
String get showFavoritePlaylists => 'Show a row of your favorite playlists';
|
||||
|
||||
@override
|
||||
String get showFavoriteRadioStations => 'Show a row of your favorite radio stations';
|
||||
String get showFavoriteRadioStations =>
|
||||
'Show a row of your favorite radio stations';
|
||||
|
||||
@override
|
||||
String get showFavoritePodcasts => 'Show a row of your favorite podcasts';
|
||||
|
||||
@override
|
||||
String get extractColorsFromArtwork => 'Farben aus Album- und Künstlercover extrahieren';
|
||||
String get extractColorsFromArtwork =>
|
||||
'Farben aus Album- und Künstlercover extrahieren';
|
||||
|
||||
@override
|
||||
String get chooseHomeScreenRows => 'Wähle welche Zeilen auf dem Startbildschirm angezeigt werden';
|
||||
String get chooseHomeScreenRows =>
|
||||
'Wähle welche Zeilen auf dem Startbildschirm angezeigt werden';
|
||||
|
||||
@override
|
||||
String get addedToFavorites => 'Zu Favoriten hinzugefügt';
|
||||
@@ -785,13 +812,15 @@ class SDe extends S {
|
||||
String get theAudioDbApiKey => 'TheAudioDB API-Schlüssel';
|
||||
|
||||
@override
|
||||
String get theAudioDbApiKeyHint => '\"2\" für kostenlosen Zugang oder Premium-Schlüssel';
|
||||
String get theAudioDbApiKeyHint =>
|
||||
'\"2\" für kostenlosen Zugang oder Premium-Schlüssel';
|
||||
|
||||
@override
|
||||
String get audiobookLibraries => 'Hörbuch-Bibliotheken';
|
||||
|
||||
@override
|
||||
String get chooseAudiobookLibraries => 'Wähle welche Audiobookshelf-Bibliotheken einbezogen werden';
|
||||
String get chooseAudiobookLibraries =>
|
||||
'Wähle welche Audiobookshelf-Bibliotheken einbezogen werden';
|
||||
|
||||
@override
|
||||
String get unknownLibrary => 'Unbekannte Bibliothek';
|
||||
@@ -800,7 +829,8 @@ class SDe extends S {
|
||||
String get musicProviders => 'Music Providers';
|
||||
|
||||
@override
|
||||
String get musicProvidersDescription => 'Choose which accounts to show in your library';
|
||||
String get musicProvidersDescription =>
|
||||
'Choose which accounts to show in your library';
|
||||
|
||||
@override
|
||||
String get libraryRefreshing => 'Refreshing library...';
|
||||
@@ -820,16 +850,19 @@ class SDe extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get noSeriesAvailable => 'Keine Serien in deiner Hörbuch-Bibliothek verfügbar.\nZiehe zum Aktualisieren.';
|
||||
String get noSeriesAvailable =>
|
||||
'Keine Serien in deiner Hörbuch-Bibliothek verfügbar.\nZiehe zum Aktualisieren.';
|
||||
|
||||
@override
|
||||
String get pullToLoadSeries => 'Ziehe nach unten um Serien\nvon Music Assistant zu laden';
|
||||
String get pullToLoadSeries =>
|
||||
'Ziehe nach unten um Serien\nvon Music Assistant zu laden';
|
||||
|
||||
@override
|
||||
String get search => 'Suche';
|
||||
|
||||
@override
|
||||
String get metadataApisDescription => 'Künstlerbilder werden automatisch von Deezer abgerufen. Füge unten API-Schlüssel für Künstlerbiografien und Albenbeschreibungen hinzu.';
|
||||
String get metadataApisDescription =>
|
||||
'Künstlerbilder werden automatisch von Deezer abgerufen. Füge unten API-Schlüssel für Künstlerbiografien und Albenbeschreibungen hinzu.';
|
||||
|
||||
@override
|
||||
String get lastFmApiKey => 'Last.fm API-Schlüssel';
|
||||
@@ -901,19 +934,22 @@ class SDe extends S {
|
||||
String get preferLocalPlayer => 'Lokales Gerät bevorzugen';
|
||||
|
||||
@override
|
||||
String get preferLocalPlayerDescription => 'Dieses Gerät immer zuerst auswählen, wenn verfügbar';
|
||||
String get preferLocalPlayerDescription =>
|
||||
'Dieses Gerät immer zuerst auswählen, wenn verfügbar';
|
||||
|
||||
@override
|
||||
String get smartSortPlayers => 'Intelligente Sortierung';
|
||||
|
||||
@override
|
||||
String get smartSortPlayersDescription => 'Nach Status sortieren (spielt, an, aus) statt alphabetisch';
|
||||
String get smartSortPlayersDescription =>
|
||||
'Nach Status sortieren (spielt, an, aus) statt alphabetisch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitch => 'Disable Auto-Switch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitchDescription => 'Never automatically switch to a different player';
|
||||
String get disableAutoSwitchDescription =>
|
||||
'Never automatically switch to a different player';
|
||||
|
||||
@override
|
||||
String get playerStateUnavailable => 'Nicht verfügbar';
|
||||
@@ -945,7 +981,8 @@ class SDe extends S {
|
||||
String get showHints => 'Hinweise anzeigen';
|
||||
|
||||
@override
|
||||
String get showHintsDescription => 'Hilfreiche Tipps zum Entdecken von Funktionen anzeigen';
|
||||
String get showHintsDescription =>
|
||||
'Hilfreiche Tipps zum Entdecken von Funktionen anzeigen';
|
||||
|
||||
@override
|
||||
String get display => 'Display';
|
||||
@@ -954,7 +991,8 @@ class SDe extends S {
|
||||
String get showProviderIcons => 'Show Provider Icons';
|
||||
|
||||
@override
|
||||
String get showProviderIconsDescription => 'Display provider logos on album art';
|
||||
String get showProviderIconsDescription =>
|
||||
'Display provider logos on album art';
|
||||
|
||||
@override
|
||||
String get pullToSelectPlayers => 'Ziehen um Geräte auszuwählen';
|
||||
@@ -972,13 +1010,15 @@ class SDe extends S {
|
||||
String get welcomeToEnsemble => 'Welcome to Ensemble';
|
||||
|
||||
@override
|
||||
String get welcomeMessage => 'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
String get welcomeMessage =>
|
||||
'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
|
||||
@override
|
||||
String get skip => 'Skip';
|
||||
|
||||
@override
|
||||
String get dismissPlayerHint => 'Swipe down, tap outside, or press back to return';
|
||||
String get dismissPlayerHint =>
|
||||
'Swipe down, tap outside, or press back to return';
|
||||
|
||||
@override
|
||||
String playingAlbum(String albumName) {
|
||||
@@ -994,19 +1034,22 @@ class SDe extends S {
|
||||
String get noTracks => 'No tracks';
|
||||
|
||||
@override
|
||||
String get addTracksHint => 'Add some music to your library to see tracks here';
|
||||
String get addTracksHint =>
|
||||
'Add some music to your library to see tracks here';
|
||||
|
||||
@override
|
||||
String get noFavoriteRadioStations => 'No favorite radio stations';
|
||||
|
||||
@override
|
||||
String get longPressRadioHint => 'Long-press a station and tap the heart to add it to favorites';
|
||||
String get longPressRadioHint =>
|
||||
'Long-press a station and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePodcasts => 'No favorite podcasts';
|
||||
|
||||
@override
|
||||
String get longPressPodcastHint => 'Long-press a podcast and tap the heart to add it to favorites';
|
||||
String get longPressPodcastHint =>
|
||||
'Long-press a podcast and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String failedToPlayRadioStation(String error) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// ignore: unused_import
|
||||
import 'package:intl/intl.dart' as intl;
|
||||
|
||||
import 'app_localizations.dart';
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
@@ -39,7 +39,8 @@ class SEn extends S {
|
||||
String get portHint => 'e.g., 8095 or leave blank';
|
||||
|
||||
@override
|
||||
String get portDescription => 'Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.';
|
||||
String get portDescription =>
|
||||
'Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.';
|
||||
|
||||
@override
|
||||
String get username => 'Username';
|
||||
@@ -60,10 +61,12 @@ class SEn extends S {
|
||||
String get authServerUrlOptional => 'Auth Server URL (Optional)';
|
||||
|
||||
@override
|
||||
String get authServerUrlHint => 'e.g., auth.example.com (if different from server)';
|
||||
String get authServerUrlHint =>
|
||||
'e.g., auth.example.com (if different from server)';
|
||||
|
||||
@override
|
||||
String get authServerUrlDescription => 'Leave empty if authentication is on the same server';
|
||||
String get authServerUrlDescription =>
|
||||
'Leave empty if authentication is on the same server';
|
||||
|
||||
@override
|
||||
String detectedAuthType(String authType) {
|
||||
@@ -80,7 +83,8 @@ class SEn extends S {
|
||||
String get unencryptedConnection => 'Unencrypted Connection';
|
||||
|
||||
@override
|
||||
String get usingHttpOverTailscale => 'Using HTTP over Tailscale (encrypted tunnel)';
|
||||
String get usingHttpOverTailscale =>
|
||||
'Using HTTP over Tailscale (encrypted tunnel)';
|
||||
|
||||
@override
|
||||
String get httpsFailedUsingHttp => 'HTTPS failed, using HTTP fallback';
|
||||
@@ -89,31 +93,37 @@ class SEn extends S {
|
||||
String get httpNotEncrypted => 'HTTP connection - data is not encrypted';
|
||||
|
||||
@override
|
||||
String get pleaseEnterServerAddress => 'Please enter your Music Assistant server address';
|
||||
String get pleaseEnterServerAddress =>
|
||||
'Please enter your Music Assistant server address';
|
||||
|
||||
@override
|
||||
String get pleaseEnterName => 'Please enter your name';
|
||||
|
||||
@override
|
||||
String get pleaseEnterValidPort => 'Please enter a valid port number (1-65535)';
|
||||
String get pleaseEnterValidPort =>
|
||||
'Please enter a valid port number (1-65535)';
|
||||
|
||||
@override
|
||||
String get pleaseEnterCredentials => 'Please enter username and password';
|
||||
|
||||
@override
|
||||
String get authFailed => 'Authentication failed. Please check your credentials.';
|
||||
String get authFailed =>
|
||||
'Authentication failed. Please check your credentials.';
|
||||
|
||||
@override
|
||||
String get maLoginFailed => 'Music Assistant login failed. Please check your credentials.';
|
||||
String get maLoginFailed =>
|
||||
'Music Assistant login failed. Please check your credentials.';
|
||||
|
||||
@override
|
||||
String get connectionFailed => 'Could not connect to server. Please check the address and try again.';
|
||||
String get connectionFailed =>
|
||||
'Could not connect to server. Please check the address and try again.';
|
||||
|
||||
@override
|
||||
String get detectingAuth => 'Detecting authentication...';
|
||||
|
||||
@override
|
||||
String get cannotDetermineAuth => 'Cannot determine authentication requirements. Please check server URL.';
|
||||
String get cannotDetermineAuth =>
|
||||
'Cannot determine authentication requirements. Please check server URL.';
|
||||
|
||||
@override
|
||||
String get noAuthentication => 'No Authentication';
|
||||
@@ -471,37 +481,43 @@ class SEn extends S {
|
||||
String get noFavoriteAudiobooks => 'No favorite audiobooks';
|
||||
|
||||
@override
|
||||
String get tapHeartAudiobook => 'Tap the heart on an audiobook to add it to favorites';
|
||||
String get tapHeartAudiobook =>
|
||||
'Tap the heart on an audiobook to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noAudiobooks => 'No audiobooks';
|
||||
|
||||
@override
|
||||
String get addAudiobooksHint => 'Add audiobooks to your library to see them here';
|
||||
String get addAudiobooksHint =>
|
||||
'Add audiobooks to your library to see them here';
|
||||
|
||||
@override
|
||||
String get noFavoriteArtists => 'No favorite artists';
|
||||
|
||||
@override
|
||||
String get tapHeartArtist => 'Tap the heart on an artist to add them to favorites';
|
||||
String get tapHeartArtist =>
|
||||
'Tap the heart on an artist to add them to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoriteAlbums => 'No favorite albums';
|
||||
|
||||
@override
|
||||
String get tapHeartAlbum => 'Tap the heart on an album to add it to favorites';
|
||||
String get tapHeartAlbum =>
|
||||
'Tap the heart on an album to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePlaylists => 'No favorite playlists';
|
||||
|
||||
@override
|
||||
String get tapHeartPlaylist => 'Tap the heart on a playlist to add it to favorites';
|
||||
String get tapHeartPlaylist =>
|
||||
'Tap the heart on a playlist to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoriteTracks => 'No favorite tracks';
|
||||
|
||||
@override
|
||||
String get longPressTrackHint => 'Long-press a track and tap the heart to add it to favorites';
|
||||
String get longPressTrackHint =>
|
||||
'Long-press a track and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get loadSeries => 'Load Series';
|
||||
@@ -513,7 +529,8 @@ class SEn extends S {
|
||||
String get notConnectedTitle => 'Not Connected';
|
||||
|
||||
@override
|
||||
String get connectHint => 'Connect to your Music Assistant server to start listening';
|
||||
String get connectHint =>
|
||||
'Connect to your Music Assistant server to start listening';
|
||||
|
||||
@override
|
||||
String get configureServer => 'Configure Server';
|
||||
@@ -667,16 +684,19 @@ class SEn extends S {
|
||||
String get showFavoritePlaylists => 'Show a row of your favorite playlists';
|
||||
|
||||
@override
|
||||
String get showFavoriteRadioStations => 'Show a row of your favorite radio stations';
|
||||
String get showFavoriteRadioStations =>
|
||||
'Show a row of your favorite radio stations';
|
||||
|
||||
@override
|
||||
String get showFavoritePodcasts => 'Show a row of your favorite podcasts';
|
||||
|
||||
@override
|
||||
String get extractColorsFromArtwork => 'Extract colors from album and artist artwork';
|
||||
String get extractColorsFromArtwork =>
|
||||
'Extract colors from album and artist artwork';
|
||||
|
||||
@override
|
||||
String get chooseHomeScreenRows => 'Choose which rows to display on the home screen';
|
||||
String get chooseHomeScreenRows =>
|
||||
'Choose which rows to display on the home screen';
|
||||
|
||||
@override
|
||||
String get addedToFavorites => 'Added to favorites';
|
||||
@@ -791,7 +811,8 @@ class SEn extends S {
|
||||
String get audiobookLibraries => 'Audiobook Libraries';
|
||||
|
||||
@override
|
||||
String get chooseAudiobookLibraries => 'Choose which Audiobookshelf libraries to include';
|
||||
String get chooseAudiobookLibraries =>
|
||||
'Choose which Audiobookshelf libraries to include';
|
||||
|
||||
@override
|
||||
String get unknownLibrary => 'Unknown Library';
|
||||
@@ -800,7 +821,8 @@ class SEn extends S {
|
||||
String get musicProviders => 'Music Providers';
|
||||
|
||||
@override
|
||||
String get musicProvidersDescription => 'Choose which accounts to show in your library';
|
||||
String get musicProvidersDescription =>
|
||||
'Choose which accounts to show in your library';
|
||||
|
||||
@override
|
||||
String get libraryRefreshing => 'Refreshing library...';
|
||||
@@ -820,16 +842,19 @@ class SEn extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get noSeriesAvailable => 'No series available from your audiobook library.\nPull to refresh.';
|
||||
String get noSeriesAvailable =>
|
||||
'No series available from your audiobook library.\nPull to refresh.';
|
||||
|
||||
@override
|
||||
String get pullToLoadSeries => 'Pull down to load series\nfrom Music Assistant';
|
||||
String get pullToLoadSeries =>
|
||||
'Pull down to load series\nfrom Music Assistant';
|
||||
|
||||
@override
|
||||
String get search => 'Search';
|
||||
|
||||
@override
|
||||
String get metadataApisDescription => 'Artist images are automatically fetched from Deezer. Add API keys below for artist biographies and album descriptions.';
|
||||
String get metadataApisDescription =>
|
||||
'Artist images are automatically fetched from Deezer. Add API keys below for artist biographies and album descriptions.';
|
||||
|
||||
@override
|
||||
String get lastFmApiKey => 'Last.fm API Key';
|
||||
@@ -901,19 +926,22 @@ class SEn extends S {
|
||||
String get preferLocalPlayer => 'Prefer Local Player';
|
||||
|
||||
@override
|
||||
String get preferLocalPlayerDescription => 'Always select this device first when available';
|
||||
String get preferLocalPlayerDescription =>
|
||||
'Always select this device first when available';
|
||||
|
||||
@override
|
||||
String get smartSortPlayers => 'Smart Sort';
|
||||
|
||||
@override
|
||||
String get smartSortPlayersDescription => 'Sort by status (playing, on, off) instead of alphabetically';
|
||||
String get smartSortPlayersDescription =>
|
||||
'Sort by status (playing, on, off) instead of alphabetically';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitch => 'Disable Auto-Switch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitchDescription => 'Never automatically switch to a different player';
|
||||
String get disableAutoSwitchDescription =>
|
||||
'Never automatically switch to a different player';
|
||||
|
||||
@override
|
||||
String get playerStateUnavailable => 'Unavailable';
|
||||
@@ -945,7 +973,8 @@ class SEn extends S {
|
||||
String get showHints => 'Show Hints';
|
||||
|
||||
@override
|
||||
String get showHintsDescription => 'Display helpful tips for discovering features';
|
||||
String get showHintsDescription =>
|
||||
'Display helpful tips for discovering features';
|
||||
|
||||
@override
|
||||
String get display => 'Display';
|
||||
@@ -954,7 +983,8 @@ class SEn extends S {
|
||||
String get showProviderIcons => 'Show Provider Icons';
|
||||
|
||||
@override
|
||||
String get showProviderIconsDescription => 'Display provider logos on album art';
|
||||
String get showProviderIconsDescription =>
|
||||
'Display provider logos on album art';
|
||||
|
||||
@override
|
||||
String get pullToSelectPlayers => 'Pull to select players';
|
||||
@@ -972,13 +1002,15 @@ class SEn extends S {
|
||||
String get welcomeToEnsemble => 'Welcome to Ensemble';
|
||||
|
||||
@override
|
||||
String get welcomeMessage => 'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
String get welcomeMessage =>
|
||||
'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
|
||||
@override
|
||||
String get skip => 'Skip';
|
||||
|
||||
@override
|
||||
String get dismissPlayerHint => 'Swipe down, tap outside, or press back to return';
|
||||
String get dismissPlayerHint =>
|
||||
'Swipe down, tap outside, or press back to return';
|
||||
|
||||
@override
|
||||
String playingAlbum(String albumName) {
|
||||
@@ -994,19 +1026,22 @@ class SEn extends S {
|
||||
String get noTracks => 'No tracks';
|
||||
|
||||
@override
|
||||
String get addTracksHint => 'Add some music to your library to see tracks here';
|
||||
String get addTracksHint =>
|
||||
'Add some music to your library to see tracks here';
|
||||
|
||||
@override
|
||||
String get noFavoriteRadioStations => 'No favorite radio stations';
|
||||
|
||||
@override
|
||||
String get longPressRadioHint => 'Long-press a station and tap the heart to add it to favorites';
|
||||
String get longPressRadioHint =>
|
||||
'Long-press a station and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePodcasts => 'No favorite podcasts';
|
||||
|
||||
@override
|
||||
String get longPressPodcastHint => 'Long-press a podcast and tap the heart to add it to favorites';
|
||||
String get longPressPodcastHint =>
|
||||
'Long-press a podcast and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String failedToPlayRadioStation(String error) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// ignore: unused_import
|
||||
import 'package:intl/intl.dart' as intl;
|
||||
|
||||
import 'app_localizations.dart';
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
@@ -39,7 +39,8 @@ class SEs extends S {
|
||||
String get portHint => 'ej., 8095 o dejar en blanco';
|
||||
|
||||
@override
|
||||
String get portDescription => 'Dejar en blanco para proxy inverso o puertos estándar. Introduce 8095 para conexión directa.';
|
||||
String get portDescription =>
|
||||
'Dejar en blanco para proxy inverso o puertos estándar. Introduce 8095 para conexión directa.';
|
||||
|
||||
@override
|
||||
String get username => 'Usuario';
|
||||
@@ -57,13 +58,16 @@ class SEs extends S {
|
||||
String get disconnect => 'Desconectar';
|
||||
|
||||
@override
|
||||
String get authServerUrlOptional => 'URL del servidor de autenticación (Opcional)';
|
||||
String get authServerUrlOptional =>
|
||||
'URL del servidor de autenticación (Opcional)';
|
||||
|
||||
@override
|
||||
String get authServerUrlHint => 'ej., auth.example.com (si es diferente del servidor)';
|
||||
String get authServerUrlHint =>
|
||||
'ej., auth.example.com (si es diferente del servidor)';
|
||||
|
||||
@override
|
||||
String get authServerUrlDescription => 'Dejar vacío si la autenticación está en el mismo servidor';
|
||||
String get authServerUrlDescription =>
|
||||
'Dejar vacío si la autenticación está en el mismo servidor';
|
||||
|
||||
@override
|
||||
String detectedAuthType(String authType) {
|
||||
@@ -80,40 +84,49 @@ class SEs extends S {
|
||||
String get unencryptedConnection => 'Conexión sin cifrar';
|
||||
|
||||
@override
|
||||
String get usingHttpOverTailscale => 'Usando HTTP sobre Tailscale (túnel cifrado)';
|
||||
String get usingHttpOverTailscale =>
|
||||
'Usando HTTP sobre Tailscale (túnel cifrado)';
|
||||
|
||||
@override
|
||||
String get httpsFailedUsingHttp => 'HTTPS falló, usando HTTP como alternativa';
|
||||
String get httpsFailedUsingHttp =>
|
||||
'HTTPS falló, usando HTTP como alternativa';
|
||||
|
||||
@override
|
||||
String get httpNotEncrypted => 'Conexión HTTP - los datos no están cifrados';
|
||||
|
||||
@override
|
||||
String get pleaseEnterServerAddress => 'Por favor, introduce la dirección de tu servidor Music Assistant';
|
||||
String get pleaseEnterServerAddress =>
|
||||
'Por favor, introduce la dirección de tu servidor Music Assistant';
|
||||
|
||||
@override
|
||||
String get pleaseEnterName => 'Por favor, introduce tu nombre';
|
||||
|
||||
@override
|
||||
String get pleaseEnterValidPort => 'Por favor, introduce un número de puerto válido (1-65535)';
|
||||
String get pleaseEnterValidPort =>
|
||||
'Por favor, introduce un número de puerto válido (1-65535)';
|
||||
|
||||
@override
|
||||
String get pleaseEnterCredentials => 'Por favor, introduce usuario y contraseña';
|
||||
String get pleaseEnterCredentials =>
|
||||
'Por favor, introduce usuario y contraseña';
|
||||
|
||||
@override
|
||||
String get authFailed => 'Autenticación fallida. Por favor, verifica tus credenciales.';
|
||||
String get authFailed =>
|
||||
'Autenticación fallida. Por favor, verifica tus credenciales.';
|
||||
|
||||
@override
|
||||
String get maLoginFailed => 'Inicio de sesión en Music Assistant fallido. Por favor, verifica tus credenciales.';
|
||||
String get maLoginFailed =>
|
||||
'Inicio de sesión en Music Assistant fallido. Por favor, verifica tus credenciales.';
|
||||
|
||||
@override
|
||||
String get connectionFailed => 'No se pudo conectar al servidor. Por favor, verifica la dirección e inténtalo de nuevo.';
|
||||
String get connectionFailed =>
|
||||
'No se pudo conectar al servidor. Por favor, verifica la dirección e inténtalo de nuevo.';
|
||||
|
||||
@override
|
||||
String get detectingAuth => 'Detectando autenticación...';
|
||||
|
||||
@override
|
||||
String get cannotDetermineAuth => 'No se pueden determinar los requisitos de autenticación. Por favor, verifica la URL del servidor.';
|
||||
String get cannotDetermineAuth =>
|
||||
'No se pueden determinar los requisitos de autenticación. Por favor, verifica la URL del servidor.';
|
||||
|
||||
@override
|
||||
String get noAuthentication => 'Sin autenticación';
|
||||
@@ -221,10 +234,12 @@ class SEs extends S {
|
||||
String get noRadioStations => 'No hay emisoras de radio';
|
||||
|
||||
@override
|
||||
String get addRadioStationsHint => 'Añade emisoras de radio en Music Assistant';
|
||||
String get addRadioStationsHint =>
|
||||
'Añade emisoras de radio en Music Assistant';
|
||||
|
||||
@override
|
||||
String get searchFailed => 'Búsqueda fallida. Por favor, verifica tu conexión.';
|
||||
String get searchFailed =>
|
||||
'Búsqueda fallida. Por favor, verifica tu conexión.';
|
||||
|
||||
@override
|
||||
String get queue => 'Cola';
|
||||
@@ -264,7 +279,8 @@ class SEs extends S {
|
||||
String get system => 'Sistema';
|
||||
|
||||
@override
|
||||
String get pullToRefresh => 'Desliza hacia abajo para actualizar la biblioteca y aplicar los cambios';
|
||||
String get pullToRefresh =>
|
||||
'Desliza hacia abajo para actualizar la biblioteca y aplicar los cambios';
|
||||
|
||||
@override
|
||||
String get viewDebugLogs => 'Ver registros de depuración';
|
||||
@@ -301,7 +317,8 @@ class SEs extends S {
|
||||
String get logsCleared => 'Registros borrados';
|
||||
|
||||
@override
|
||||
String get playerListCopied => 'Lista de reproductores copiada al portapapeles';
|
||||
String get playerListCopied =>
|
||||
'Lista de reproductores copiada al portapapeles';
|
||||
|
||||
@override
|
||||
String get noLogsYet => 'Aún no hay registros';
|
||||
@@ -471,37 +488,43 @@ class SEs extends S {
|
||||
String get noFavoriteAudiobooks => 'No hay audiolibros favoritos';
|
||||
|
||||
@override
|
||||
String get tapHeartAudiobook => 'Toca el corazón en un audiolibro para añadirlo a favoritos';
|
||||
String get tapHeartAudiobook =>
|
||||
'Toca el corazón en un audiolibro para añadirlo a favoritos';
|
||||
|
||||
@override
|
||||
String get noAudiobooks => 'No hay audiolibros';
|
||||
|
||||
@override
|
||||
String get addAudiobooksHint => 'Añade audiolibros a tu biblioteca para verlos aquí';
|
||||
String get addAudiobooksHint =>
|
||||
'Añade audiolibros a tu biblioteca para verlos aquí';
|
||||
|
||||
@override
|
||||
String get noFavoriteArtists => 'No hay artistas favoritos';
|
||||
|
||||
@override
|
||||
String get tapHeartArtist => 'Toca el corazón en un artista para añadirlo a favoritos';
|
||||
String get tapHeartArtist =>
|
||||
'Toca el corazón en un artista para añadirlo a favoritos';
|
||||
|
||||
@override
|
||||
String get noFavoriteAlbums => 'No hay álbumes favoritos';
|
||||
|
||||
@override
|
||||
String get tapHeartAlbum => 'Toca el corazón en un álbum para añadirlo a favoritos';
|
||||
String get tapHeartAlbum =>
|
||||
'Toca el corazón en un álbum para añadirlo a favoritos';
|
||||
|
||||
@override
|
||||
String get noFavoritePlaylists => 'No hay listas de reproducción favoritas';
|
||||
|
||||
@override
|
||||
String get tapHeartPlaylist => 'Toca el corazón en una lista para añadirla a favoritos';
|
||||
String get tapHeartPlaylist =>
|
||||
'Toca el corazón en una lista para añadirla a favoritos';
|
||||
|
||||
@override
|
||||
String get noFavoriteTracks => 'No hay canciones favoritas';
|
||||
|
||||
@override
|
||||
String get longPressTrackHint => 'Mantén presionada una canción y toca el corazón para añadirla a favoritos';
|
||||
String get longPressTrackHint =>
|
||||
'Mantén presionada una canción y toca el corazón para añadirla a favoritos';
|
||||
|
||||
@override
|
||||
String get loadSeries => 'Cargar series';
|
||||
@@ -513,7 +536,8 @@ class SEs extends S {
|
||||
String get notConnectedTitle => 'No conectado';
|
||||
|
||||
@override
|
||||
String get connectHint => 'Conéctate a tu servidor Music Assistant para empezar a escuchar';
|
||||
String get connectHint =>
|
||||
'Conéctate a tu servidor Music Assistant para empezar a escuchar';
|
||||
|
||||
@override
|
||||
String get configureServer => 'Configurar servidor';
|
||||
@@ -549,7 +573,8 @@ class SEs extends S {
|
||||
String get noLogsToCopy => 'No hay registros para copiar';
|
||||
|
||||
@override
|
||||
String get noDebugLogsYet => 'Aún no hay registros de depuración. Intenta detectar autenticación.';
|
||||
String get noDebugLogsYet =>
|
||||
'Aún no hay registros de depuración. Intenta detectar autenticación.';
|
||||
|
||||
@override
|
||||
String get showDebug => 'Mostrar depuración';
|
||||
@@ -564,7 +589,8 @@ class SEs extends S {
|
||||
String get noChapters => 'Sin capítulos';
|
||||
|
||||
@override
|
||||
String get noChapterInfo => 'Este audiolibro no tiene información de capítulos';
|
||||
String get noChapterInfo =>
|
||||
'Este audiolibro no tiene información de capítulos';
|
||||
|
||||
@override
|
||||
String errorSeeking(String error) {
|
||||
@@ -637,7 +663,8 @@ class SEs extends S {
|
||||
String get artist => 'Artista';
|
||||
|
||||
@override
|
||||
String get showRecentlyPlayedAlbums => 'Mostrar álbumes reproducidos recientemente';
|
||||
String get showRecentlyPlayedAlbums =>
|
||||
'Mostrar álbumes reproducidos recientemente';
|
||||
|
||||
@override
|
||||
String get showRandomArtists => 'Mostrar artistas aleatorios para descubrir';
|
||||
@@ -649,34 +676,41 @@ class SEs extends S {
|
||||
String get showAudiobooksInProgress => 'Mostrar audiolibros en progreso';
|
||||
|
||||
@override
|
||||
String get showRandomAudiobooks => 'Mostrar audiolibros aleatorios para descubrir';
|
||||
String get showRandomAudiobooks =>
|
||||
'Mostrar audiolibros aleatorios para descubrir';
|
||||
|
||||
@override
|
||||
String get showRandomSeries => 'Mostrar series de audiolibros aleatorias para descubrir';
|
||||
String get showRandomSeries =>
|
||||
'Mostrar series de audiolibros aleatorias para descubrir';
|
||||
|
||||
@override
|
||||
String get showFavoriteAlbums => 'Mostrar una fila de tus álbumes favoritos';
|
||||
|
||||
@override
|
||||
String get showFavoriteArtists => 'Mostrar una fila de tus artistas favoritos';
|
||||
String get showFavoriteArtists =>
|
||||
'Mostrar una fila de tus artistas favoritos';
|
||||
|
||||
@override
|
||||
String get showFavoriteTracks => 'Mostrar una fila de tus canciones favoritas';
|
||||
String get showFavoriteTracks =>
|
||||
'Mostrar una fila de tus canciones favoritas';
|
||||
|
||||
@override
|
||||
String get showFavoritePlaylists => 'Show a row of your favorite playlists';
|
||||
|
||||
@override
|
||||
String get showFavoriteRadioStations => 'Show a row of your favorite radio stations';
|
||||
String get showFavoriteRadioStations =>
|
||||
'Show a row of your favorite radio stations';
|
||||
|
||||
@override
|
||||
String get showFavoritePodcasts => 'Show a row of your favorite podcasts';
|
||||
|
||||
@override
|
||||
String get extractColorsFromArtwork => 'Extraer colores de las portadas de álbumes y artistas';
|
||||
String get extractColorsFromArtwork =>
|
||||
'Extraer colores de las portadas de álbumes y artistas';
|
||||
|
||||
@override
|
||||
String get chooseHomeScreenRows => 'Elige qué filas mostrar en la pantalla de inicio';
|
||||
String get chooseHomeScreenRows =>
|
||||
'Elige qué filas mostrar en la pantalla de inicio';
|
||||
|
||||
@override
|
||||
String get addedToFavorites => 'Añadido a favoritos';
|
||||
@@ -774,7 +808,8 @@ class SEs extends S {
|
||||
String get loadingChapters => 'Cargando capítulos...';
|
||||
|
||||
@override
|
||||
String get noChapterInfoAvailable => 'No hay información de capítulos disponible';
|
||||
String get noChapterInfoAvailable =>
|
||||
'No hay información de capítulos disponible';
|
||||
|
||||
@override
|
||||
String percentComplete(int percent) {
|
||||
@@ -785,13 +820,15 @@ class SEs extends S {
|
||||
String get theAudioDbApiKey => 'Clave API de TheAudioDB';
|
||||
|
||||
@override
|
||||
String get theAudioDbApiKeyHint => 'Usa \"2\" para nivel gratuito o clave premium';
|
||||
String get theAudioDbApiKeyHint =>
|
||||
'Usa \"2\" para nivel gratuito o clave premium';
|
||||
|
||||
@override
|
||||
String get audiobookLibraries => 'Bibliotecas de audiolibros';
|
||||
|
||||
@override
|
||||
String get chooseAudiobookLibraries => 'Elige qué bibliotecas de Audiobookshelf incluir';
|
||||
String get chooseAudiobookLibraries =>
|
||||
'Elige qué bibliotecas de Audiobookshelf incluir';
|
||||
|
||||
@override
|
||||
String get unknownLibrary => 'Biblioteca desconocida';
|
||||
@@ -800,7 +837,8 @@ class SEs extends S {
|
||||
String get musicProviders => 'Music Providers';
|
||||
|
||||
@override
|
||||
String get musicProvidersDescription => 'Choose which accounts to show in your library';
|
||||
String get musicProvidersDescription =>
|
||||
'Choose which accounts to show in your library';
|
||||
|
||||
@override
|
||||
String get libraryRefreshing => 'Refreshing library...';
|
||||
@@ -820,16 +858,19 @@ class SEs extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get noSeriesAvailable => 'No hay series disponibles en tu biblioteca de audiolibros.\nDesliza para actualizar.';
|
||||
String get noSeriesAvailable =>
|
||||
'No hay series disponibles en tu biblioteca de audiolibros.\nDesliza para actualizar.';
|
||||
|
||||
@override
|
||||
String get pullToLoadSeries => 'Desliza hacia abajo para cargar series\ndesde Music Assistant';
|
||||
String get pullToLoadSeries =>
|
||||
'Desliza hacia abajo para cargar series\ndesde Music Assistant';
|
||||
|
||||
@override
|
||||
String get search => 'Buscar';
|
||||
|
||||
@override
|
||||
String get metadataApisDescription => 'Las imágenes de artistas se obtienen automáticamente de Deezer. Añade claves API a continuación para biografías de artistas y descripciones de álbumes.';
|
||||
String get metadataApisDescription =>
|
||||
'Las imágenes de artistas se obtienen automáticamente de Deezer. Añade claves API a continuación para biografías de artistas y descripciones de álbumes.';
|
||||
|
||||
@override
|
||||
String get lastFmApiKey => 'Clave API de Last.fm';
|
||||
@@ -901,19 +942,22 @@ class SEs extends S {
|
||||
String get preferLocalPlayer => 'Preferir dispositivo local';
|
||||
|
||||
@override
|
||||
String get preferLocalPlayerDescription => 'Seleccionar siempre este dispositivo primero cuando esté disponible';
|
||||
String get preferLocalPlayerDescription =>
|
||||
'Seleccionar siempre este dispositivo primero cuando esté disponible';
|
||||
|
||||
@override
|
||||
String get smartSortPlayers => 'Orden inteligente';
|
||||
|
||||
@override
|
||||
String get smartSortPlayersDescription => 'Ordenar por estado (reproduciendo, encendido, apagado) en lugar de alfabéticamente';
|
||||
String get smartSortPlayersDescription =>
|
||||
'Ordenar por estado (reproduciendo, encendido, apagado) en lugar de alfabéticamente';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitch => 'Disable Auto-Switch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitchDescription => 'Never automatically switch to a different player';
|
||||
String get disableAutoSwitchDescription =>
|
||||
'Never automatically switch to a different player';
|
||||
|
||||
@override
|
||||
String get playerStateUnavailable => 'No disponible';
|
||||
@@ -945,7 +989,8 @@ class SEs extends S {
|
||||
String get showHints => 'Mostrar Sugerencias';
|
||||
|
||||
@override
|
||||
String get showHintsDescription => 'Mostrar consejos útiles para descubrir funciones';
|
||||
String get showHintsDescription =>
|
||||
'Mostrar consejos útiles para descubrir funciones';
|
||||
|
||||
@override
|
||||
String get display => 'Display';
|
||||
@@ -954,7 +999,8 @@ class SEs extends S {
|
||||
String get showProviderIcons => 'Show Provider Icons';
|
||||
|
||||
@override
|
||||
String get showProviderIconsDescription => 'Display provider logos on album art';
|
||||
String get showProviderIconsDescription =>
|
||||
'Display provider logos on album art';
|
||||
|
||||
@override
|
||||
String get pullToSelectPlayers => 'Desliza para seleccionar dispositivos';
|
||||
@@ -972,13 +1018,15 @@ class SEs extends S {
|
||||
String get welcomeToEnsemble => 'Welcome to Ensemble';
|
||||
|
||||
@override
|
||||
String get welcomeMessage => 'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
String get welcomeMessage =>
|
||||
'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
|
||||
@override
|
||||
String get skip => 'Skip';
|
||||
|
||||
@override
|
||||
String get dismissPlayerHint => 'Swipe down, tap outside, or press back to return';
|
||||
String get dismissPlayerHint =>
|
||||
'Swipe down, tap outside, or press back to return';
|
||||
|
||||
@override
|
||||
String playingAlbum(String albumName) {
|
||||
@@ -994,19 +1042,22 @@ class SEs extends S {
|
||||
String get noTracks => 'No tracks';
|
||||
|
||||
@override
|
||||
String get addTracksHint => 'Add some music to your library to see tracks here';
|
||||
String get addTracksHint =>
|
||||
'Add some music to your library to see tracks here';
|
||||
|
||||
@override
|
||||
String get noFavoriteRadioStations => 'No favorite radio stations';
|
||||
|
||||
@override
|
||||
String get longPressRadioHint => 'Long-press a station and tap the heart to add it to favorites';
|
||||
String get longPressRadioHint =>
|
||||
'Long-press a station and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePodcasts => 'No favorite podcasts';
|
||||
|
||||
@override
|
||||
String get longPressPodcastHint => 'Long-press a podcast and tap the heart to add it to favorites';
|
||||
String get longPressPodcastHint =>
|
||||
'Long-press a podcast and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String failedToPlayRadioStation(String error) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// ignore: unused_import
|
||||
import 'package:intl/intl.dart' as intl;
|
||||
|
||||
import 'app_localizations.dart';
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
@@ -39,7 +39,8 @@ class SFr extends S {
|
||||
String get portHint => 'ex., 8095 ou laisser vide';
|
||||
|
||||
@override
|
||||
String get portDescription => 'Laisser vide pour les proxys inverses ou les ports standards. Entrer 8095 pour une connexion directe.';
|
||||
String get portDescription =>
|
||||
'Laisser vide pour les proxys inverses ou les ports standards. Entrer 8095 pour une connexion directe.';
|
||||
|
||||
@override
|
||||
String get username => 'Nom d\'utilisateur';
|
||||
@@ -60,10 +61,12 @@ class SFr extends S {
|
||||
String get authServerUrlOptional => 'URL du serveur d\'auth (Facultatif)';
|
||||
|
||||
@override
|
||||
String get authServerUrlHint => 'ex., auth.example.com (si different du serveur)';
|
||||
String get authServerUrlHint =>
|
||||
'ex., auth.example.com (si different du serveur)';
|
||||
|
||||
@override
|
||||
String get authServerUrlDescription => 'Laisser vide si l\'authentification est sur le meme serveur';
|
||||
String get authServerUrlDescription =>
|
||||
'Laisser vide si l\'authentification est sur le meme serveur';
|
||||
|
||||
@override
|
||||
String detectedAuthType(String authType) {
|
||||
@@ -80,40 +83,50 @@ class SFr extends S {
|
||||
String get unencryptedConnection => 'Connexion non chiffrée';
|
||||
|
||||
@override
|
||||
String get usingHttpOverTailscale => 'Utilisation de HTTP via Tailscale (tunnel chiffre)';
|
||||
String get usingHttpOverTailscale =>
|
||||
'Utilisation de HTTP via Tailscale (tunnel chiffre)';
|
||||
|
||||
@override
|
||||
String get httpsFailedUsingHttp => 'HTTPS a échoué, utilisation de HTTP en repli';
|
||||
String get httpsFailedUsingHttp =>
|
||||
'HTTPS a échoué, utilisation de HTTP en repli';
|
||||
|
||||
@override
|
||||
String get httpNotEncrypted => 'Connexion HTTP - les donnees ne sont pas chiffrées';
|
||||
String get httpNotEncrypted =>
|
||||
'Connexion HTTP - les donnees ne sont pas chiffrées';
|
||||
|
||||
@override
|
||||
String get pleaseEnterServerAddress => 'Veuillez entrer l\'adresse de votre serveur Music Assistant';
|
||||
String get pleaseEnterServerAddress =>
|
||||
'Veuillez entrer l\'adresse de votre serveur Music Assistant';
|
||||
|
||||
@override
|
||||
String get pleaseEnterName => 'Veuillez entrer votre nom';
|
||||
|
||||
@override
|
||||
String get pleaseEnterValidPort => 'Veuillez entrer un numero de port valide (1-65535)';
|
||||
String get pleaseEnterValidPort =>
|
||||
'Veuillez entrer un numero de port valide (1-65535)';
|
||||
|
||||
@override
|
||||
String get pleaseEnterCredentials => 'Veuillez entrer le nom d\'utilisateur et le mot de passe';
|
||||
String get pleaseEnterCredentials =>
|
||||
'Veuillez entrer le nom d\'utilisateur et le mot de passe';
|
||||
|
||||
@override
|
||||
String get authFailed => 'Echec de l\'authentification. Veuillez verifier vos identifiants.';
|
||||
String get authFailed =>
|
||||
'Echec de l\'authentification. Veuillez verifier vos identifiants.';
|
||||
|
||||
@override
|
||||
String get maLoginFailed => 'Echec de la connexion a Music Assistant. Veuillez verifier vos identifiants.';
|
||||
String get maLoginFailed =>
|
||||
'Echec de la connexion a Music Assistant. Veuillez verifier vos identifiants.';
|
||||
|
||||
@override
|
||||
String get connectionFailed => 'Impossible de se connecter au serveur. Veuillez verifier l\'adresse et reessayer.';
|
||||
String get connectionFailed =>
|
||||
'Impossible de se connecter au serveur. Veuillez verifier l\'adresse et reessayer.';
|
||||
|
||||
@override
|
||||
String get detectingAuth => 'Detection de l\'authentification...';
|
||||
|
||||
@override
|
||||
String get cannotDetermineAuth => 'Impossible de determiner les exigences d\'authentification. Veuillez verifier l\'URL du serveur.';
|
||||
String get cannotDetermineAuth =>
|
||||
'Impossible de determiner les exigences d\'authentification. Veuillez verifier l\'URL du serveur.';
|
||||
|
||||
@override
|
||||
String get noAuthentication => 'Pas d\'authentification';
|
||||
@@ -128,7 +141,8 @@ class SFr extends S {
|
||||
String get musicAssistantLogin => 'Connexion Music Assistant';
|
||||
|
||||
@override
|
||||
String get pressBackToMinimize => 'Appuyez a nouveau sur retour pour minimiser';
|
||||
String get pressBackToMinimize =>
|
||||
'Appuyez a nouveau sur retour pour minimiser';
|
||||
|
||||
@override
|
||||
String get recentlyPlayed => 'Ecoutes recemment';
|
||||
@@ -221,10 +235,12 @@ class SFr extends S {
|
||||
String get noRadioStations => 'Aucune station de radio';
|
||||
|
||||
@override
|
||||
String get addRadioStationsHint => 'Ajouter des stations de radio dans Music Assistant';
|
||||
String get addRadioStationsHint =>
|
||||
'Ajouter des stations de radio dans Music Assistant';
|
||||
|
||||
@override
|
||||
String get searchFailed => 'La recherche a échoué. Veuillez verifier votre connexion.';
|
||||
String get searchFailed =>
|
||||
'La recherche a échoué. Veuillez verifier votre connexion.';
|
||||
|
||||
@override
|
||||
String get queue => 'File d\'attente';
|
||||
@@ -264,7 +280,8 @@ class SFr extends S {
|
||||
String get system => 'Système';
|
||||
|
||||
@override
|
||||
String get pullToRefresh => 'Tirez pour rafraichir la bibliothèque et appliquer les modifications';
|
||||
String get pullToRefresh =>
|
||||
'Tirez pour rafraichir la bibliothèque et appliquer les modifications';
|
||||
|
||||
@override
|
||||
String get viewDebugLogs => 'Voir les journaux de debogage';
|
||||
@@ -301,7 +318,8 @@ class SFr extends S {
|
||||
String get logsCleared => 'Journaux effaces';
|
||||
|
||||
@override
|
||||
String get playerListCopied => 'Liste des lecteurs copiee dans le presse-papiers !';
|
||||
String get playerListCopied =>
|
||||
'Liste des lecteurs copiee dans le presse-papiers !';
|
||||
|
||||
@override
|
||||
String get noLogsYet => 'Pas encore de journaux';
|
||||
@@ -471,37 +489,43 @@ class SFr extends S {
|
||||
String get noFavoriteAudiobooks => 'Aucun livre audio favori';
|
||||
|
||||
@override
|
||||
String get tapHeartAudiobook => 'Appuyez sur le coeur d\'un livre audio pour l\'ajoutér aux favoris';
|
||||
String get tapHeartAudiobook =>
|
||||
'Appuyez sur le coeur d\'un livre audio pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get noAudiobooks => 'Aucun livre audio';
|
||||
|
||||
@override
|
||||
String get addAudiobooksHint => 'Ajoutez des livres audio a votre bibliothèque pour les voir ici';
|
||||
String get addAudiobooksHint =>
|
||||
'Ajoutez des livres audio a votre bibliothèque pour les voir ici';
|
||||
|
||||
@override
|
||||
String get noFavoriteArtists => 'Aucun artiste favori';
|
||||
|
||||
@override
|
||||
String get tapHeartArtist => 'Appuyez sur le coeur d\'un artiste pour l\'ajoutér aux favoris';
|
||||
String get tapHeartArtist =>
|
||||
'Appuyez sur le coeur d\'un artiste pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get noFavoriteAlbums => 'Aucun album favori';
|
||||
|
||||
@override
|
||||
String get tapHeartAlbum => 'Appuyez sur le coeur d\'un album pour l\'ajoutér aux favoris';
|
||||
String get tapHeartAlbum =>
|
||||
'Appuyez sur le coeur d\'un album pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get noFavoritePlaylists => 'Aucune playlist favorite';
|
||||
|
||||
@override
|
||||
String get tapHeartPlaylist => 'Appuyez sur le coeur d\'une playlist pour l\'ajoutér aux favoris';
|
||||
String get tapHeartPlaylist =>
|
||||
'Appuyez sur le coeur d\'une playlist pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get noFavoriteTracks => 'Aucune piste favorite';
|
||||
|
||||
@override
|
||||
String get longPressTrackHint => 'Appuyez longuement sur une piste et touchez le coeur pour l\'ajoutér aux favoris';
|
||||
String get longPressTrackHint =>
|
||||
'Appuyez longuement sur une piste et touchez le coeur pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get loadSeries => 'Charger les séries';
|
||||
@@ -513,7 +537,8 @@ class SFr extends S {
|
||||
String get notConnectedTitle => 'Not Connected';
|
||||
|
||||
@override
|
||||
String get connectHint => 'Connectéz-vous a votre serveur Music Assistant pour commencer a écouter';
|
||||
String get connectHint =>
|
||||
'Connectéz-vous a votre serveur Music Assistant pour commencer a écouter';
|
||||
|
||||
@override
|
||||
String get configureServer => 'Configurer le serveur';
|
||||
@@ -549,7 +574,8 @@ class SFr extends S {
|
||||
String get noLogsToCopy => 'Aucun journal a copier';
|
||||
|
||||
@override
|
||||
String get noDebugLogsYet => 'Pas encore de journaux de debogage. Essayez de détectér l\'authentification.';
|
||||
String get noDebugLogsYet =>
|
||||
'Pas encore de journaux de debogage. Essayez de détectér l\'authentification.';
|
||||
|
||||
@override
|
||||
String get showDebug => 'Afficher le debogage';
|
||||
@@ -564,7 +590,8 @@ class SFr extends S {
|
||||
String get noChapters => 'Aucun chapitre';
|
||||
|
||||
@override
|
||||
String get noChapterInfo => 'Ce livre audio n\'a pas d\'informations de chapitre';
|
||||
String get noChapterInfo =>
|
||||
'Ce livre audio n\'a pas d\'informations de chapitre';
|
||||
|
||||
@override
|
||||
String errorSeeking(String error) {
|
||||
@@ -637,10 +664,12 @@ class SFr extends S {
|
||||
String get artist => 'Artiste';
|
||||
|
||||
@override
|
||||
String get showRecentlyPlayedAlbums => 'Afficher les albums écoutes recemment';
|
||||
String get showRecentlyPlayedAlbums =>
|
||||
'Afficher les albums écoutes recemment';
|
||||
|
||||
@override
|
||||
String get showRandomArtists => 'Afficher des artistes aléatoires a découvrir';
|
||||
String get showRandomArtists =>
|
||||
'Afficher des artistes aléatoires a découvrir';
|
||||
|
||||
@override
|
||||
String get showRandomAlbums => 'Afficher des albums aléatoires a découvrir';
|
||||
@@ -649,34 +678,43 @@ class SFr extends S {
|
||||
String get showAudiobooksInProgress => 'Afficher les livres audio en cours';
|
||||
|
||||
@override
|
||||
String get showRandomAudiobooks => 'Afficher des livres audio aléatoires a découvrir';
|
||||
String get showRandomAudiobooks =>
|
||||
'Afficher des livres audio aléatoires a découvrir';
|
||||
|
||||
@override
|
||||
String get showRandomSeries => 'Afficher des séries de livres audio aléatoires a découvrir';
|
||||
String get showRandomSeries =>
|
||||
'Afficher des séries de livres audio aléatoires a découvrir';
|
||||
|
||||
@override
|
||||
String get showFavoriteAlbums => 'Afficher une rangee de vos albums favoris';
|
||||
|
||||
@override
|
||||
String get showFavoriteArtists => 'Afficher une rangee de vos artistes favoris';
|
||||
String get showFavoriteArtists =>
|
||||
'Afficher une rangee de vos artistes favoris';
|
||||
|
||||
@override
|
||||
String get showFavoriteTracks => 'Afficher une rangee de vos pistes favorites';
|
||||
String get showFavoriteTracks =>
|
||||
'Afficher une rangee de vos pistes favorites';
|
||||
|
||||
@override
|
||||
String get showFavoritePlaylists => 'Afficher une rangee de vos playlists favorites';
|
||||
String get showFavoritePlaylists =>
|
||||
'Afficher une rangee de vos playlists favorites';
|
||||
|
||||
@override
|
||||
String get showFavoriteRadioStations => 'Afficher une rangee de vos stations de radio favorites';
|
||||
String get showFavoriteRadioStations =>
|
||||
'Afficher une rangee de vos stations de radio favorites';
|
||||
|
||||
@override
|
||||
String get showFavoritePodcasts => 'Afficher une rangee de vos podcasts favoris';
|
||||
String get showFavoritePodcasts =>
|
||||
'Afficher une rangee de vos podcasts favoris';
|
||||
|
||||
@override
|
||||
String get extractColorsFromArtwork => 'Extraire les couleurs des pochettes d\'albums et d\'artistes';
|
||||
String get extractColorsFromArtwork =>
|
||||
'Extraire les couleurs des pochettes d\'albums et d\'artistes';
|
||||
|
||||
@override
|
||||
String get chooseHomeScreenRows => 'Choisir les rangees a afficher sur l\'ecran d\'accueil';
|
||||
String get chooseHomeScreenRows =>
|
||||
'Choisir les rangees a afficher sur l\'ecran d\'accueil';
|
||||
|
||||
@override
|
||||
String get addedToFavorites => 'Ajoute aux favoris';
|
||||
@@ -721,13 +759,15 @@ class SFr extends S {
|
||||
String get podcasts => 'Podcasts';
|
||||
|
||||
@override
|
||||
String get podcastSupportComingSoon => 'Prise en charge des podcasts bientot disponible';
|
||||
String get podcastSupportComingSoon =>
|
||||
'Prise en charge des podcasts bientot disponible';
|
||||
|
||||
@override
|
||||
String get noPodcasts => 'Aucun podcast';
|
||||
|
||||
@override
|
||||
String get addPodcastsHint => 'Abonnez-vous a des podcasts dans Music Assistant';
|
||||
String get addPodcastsHint =>
|
||||
'Abonnez-vous a des podcasts dans Music Assistant';
|
||||
|
||||
@override
|
||||
String get episodes => 'Episodes';
|
||||
@@ -774,7 +814,8 @@ class SFr extends S {
|
||||
String get loadingChapters => 'Chargement des chapitres...';
|
||||
|
||||
@override
|
||||
String get noChapterInfoAvailable => 'Aucune information de chapitre disponible';
|
||||
String get noChapterInfoAvailable =>
|
||||
'Aucune information de chapitre disponible';
|
||||
|
||||
@override
|
||||
String percentComplete(int percent) {
|
||||
@@ -785,13 +826,15 @@ class SFr extends S {
|
||||
String get theAudioDbApiKey => 'Cle API TheAudioDB';
|
||||
|
||||
@override
|
||||
String get theAudioDbApiKeyHint => 'Utilisez \"2\" pour le niveau gratuit ou une cle premium';
|
||||
String get theAudioDbApiKeyHint =>
|
||||
'Utilisez \"2\" pour le niveau gratuit ou une cle premium';
|
||||
|
||||
@override
|
||||
String get audiobookLibraries => 'Bibliothèques de livres audio';
|
||||
|
||||
@override
|
||||
String get chooseAudiobookLibraries => 'Choisir quelles bibliothèques Audiobookshelf inclure';
|
||||
String get chooseAudiobookLibraries =>
|
||||
'Choisir quelles bibliothèques Audiobookshelf inclure';
|
||||
|
||||
@override
|
||||
String get unknownLibrary => 'Bibliothèque inconnue';
|
||||
@@ -800,7 +843,8 @@ class SFr extends S {
|
||||
String get musicProviders => 'Music Providers';
|
||||
|
||||
@override
|
||||
String get musicProvidersDescription => 'Choose which accounts to show in your library';
|
||||
String get musicProvidersDescription =>
|
||||
'Choose which accounts to show in your library';
|
||||
|
||||
@override
|
||||
String get libraryRefreshing => 'Refreshing library...';
|
||||
@@ -820,16 +864,19 @@ class SFr extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get noSeriesAvailable => 'Aucune série disponible dans votre bibliothèque de livres audio.\nTirez pour rafraichir.';
|
||||
String get noSeriesAvailable =>
|
||||
'Aucune série disponible dans votre bibliothèque de livres audio.\nTirez pour rafraichir.';
|
||||
|
||||
@override
|
||||
String get pullToLoadSeries => 'Tirez vers le bas pour charger les séries\ndepuis Music Assistant';
|
||||
String get pullToLoadSeries =>
|
||||
'Tirez vers le bas pour charger les séries\ndepuis Music Assistant';
|
||||
|
||||
@override
|
||||
String get search => 'Rechercher';
|
||||
|
||||
@override
|
||||
String get metadataApisDescription => 'Les images d\'artistes sont automatiquement recuperees depuis Deezer. Ajoutez les cles API ci-dessous pour les biographies d\'artistes et les descriptions d\'albums.';
|
||||
String get metadataApisDescription =>
|
||||
'Les images d\'artistes sont automatiquement recuperees depuis Deezer. Ajoutez les cles API ci-dessous pour les biographies d\'artistes et les descriptions d\'albums.';
|
||||
|
||||
@override
|
||||
String get lastFmApiKey => 'Cle API Last.fm';
|
||||
@@ -852,7 +899,8 @@ class SFr extends S {
|
||||
String get playOn => 'Lire sur...';
|
||||
|
||||
@override
|
||||
String get addAlbumToQueueOn => 'Ajouter l\'album a la file d\'attente sur...';
|
||||
String get addAlbumToQueueOn =>
|
||||
'Ajouter l\'album a la file d\'attente sur...';
|
||||
|
||||
@override
|
||||
String get addToQueueOn => 'Ajouter a la file d\'attente sur...';
|
||||
@@ -889,7 +937,8 @@ class SFr extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get materialYouDescription => 'Utiliser les couleurs systeme (Android 12+)';
|
||||
String get materialYouDescription =>
|
||||
'Utiliser les couleurs systeme (Android 12+)';
|
||||
|
||||
@override
|
||||
String get accentColor => 'Couleur d\'accentuation';
|
||||
@@ -901,19 +950,22 @@ class SFr extends S {
|
||||
String get preferLocalPlayer => 'Préférer le lecteur local';
|
||||
|
||||
@override
|
||||
String get preferLocalPlayerDescription => 'Toujours sélectionner cet appareil en premier si disponible';
|
||||
String get preferLocalPlayerDescription =>
|
||||
'Toujours sélectionner cet appareil en premier si disponible';
|
||||
|
||||
@override
|
||||
String get smartSortPlayers => 'Tri intelligent';
|
||||
|
||||
@override
|
||||
String get smartSortPlayersDescription => 'Trier par statut (en lecture, allume, eteint) au lieu d\'alphabétiquement';
|
||||
String get smartSortPlayersDescription =>
|
||||
'Trier par statut (en lecture, allume, eteint) au lieu d\'alphabétiquement';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitch => 'Disable Auto-Switch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitchDescription => 'Never automatically switch to a different player';
|
||||
String get disableAutoSwitchDescription =>
|
||||
'Never automatically switch to a different player';
|
||||
|
||||
@override
|
||||
String get playerStateUnavailable => 'Indisponible';
|
||||
@@ -945,7 +997,8 @@ class SFr extends S {
|
||||
String get showHints => 'Afficher les astuces';
|
||||
|
||||
@override
|
||||
String get showHintsDescription => 'Afficher des conseils utiles pour découvrir les fonctionnalites';
|
||||
String get showHintsDescription =>
|
||||
'Afficher des conseils utiles pour découvrir les fonctionnalites';
|
||||
|
||||
@override
|
||||
String get display => 'Display';
|
||||
@@ -954,7 +1007,8 @@ class SFr extends S {
|
||||
String get showProviderIcons => 'Show Provider Icons';
|
||||
|
||||
@override
|
||||
String get showProviderIconsDescription => 'Display provider logos on album art';
|
||||
String get showProviderIconsDescription =>
|
||||
'Display provider logos on album art';
|
||||
|
||||
@override
|
||||
String get pullToSelectPlayers => 'Tirez pour sélectionner les lecteurs';
|
||||
@@ -966,19 +1020,22 @@ class SFr extends S {
|
||||
String get swipeToAdjustVolume => 'Balayez pour ajuster le volume';
|
||||
|
||||
@override
|
||||
String get selectPlayerHint => 'Choisissez un lecteur ou fermez en balayant vers le bas';
|
||||
String get selectPlayerHint =>
|
||||
'Choisissez un lecteur ou fermez en balayant vers le bas';
|
||||
|
||||
@override
|
||||
String get welcomeToEnsemble => 'Bienvenue dans Ensemble';
|
||||
|
||||
@override
|
||||
String get welcomeMessage => 'Par defaut, votre telephone est le lecteur selectionne.\nTirez le mini-lecteur vers le bas pour sélectionner un autre lecteur.';
|
||||
String get welcomeMessage =>
|
||||
'Par defaut, votre telephone est le lecteur selectionne.\nTirez le mini-lecteur vers le bas pour sélectionner un autre lecteur.';
|
||||
|
||||
@override
|
||||
String get skip => 'Passer';
|
||||
|
||||
@override
|
||||
String get dismissPlayerHint => 'Balayez vers le bas, touchez a l\'exterieur ou appuyez sur retour pour revenir';
|
||||
String get dismissPlayerHint =>
|
||||
'Balayez vers le bas, touchez a l\'exterieur ou appuyez sur retour pour revenir';
|
||||
|
||||
@override
|
||||
String playingAlbum(String albumName) {
|
||||
@@ -994,19 +1051,22 @@ class SFr extends S {
|
||||
String get noTracks => 'No tracks';
|
||||
|
||||
@override
|
||||
String get addTracksHint => 'Add some music to your library to see tracks here';
|
||||
String get addTracksHint =>
|
||||
'Add some music to your library to see tracks here';
|
||||
|
||||
@override
|
||||
String get noFavoriteRadioStations => 'No favorite radio stations';
|
||||
|
||||
@override
|
||||
String get longPressRadioHint => 'Long-press a station and tap the heart to add it to favorites';
|
||||
String get longPressRadioHint =>
|
||||
'Long-press a station and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePodcasts => 'No favorite podcasts';
|
||||
|
||||
@override
|
||||
String get longPressPodcastHint => 'Long-press a podcast and tap the heart to add it to favorites';
|
||||
String get longPressPodcastHint =>
|
||||
'Long-press a podcast and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String failedToPlayRadioStation(String error) {
|
||||
|
||||
@@ -440,9 +440,20 @@ class Audiobook extends MediaItem {
|
||||
factory Audiobook.fromJson(Map<String, dynamic> json) {
|
||||
final item = MediaItem.fromJson(json);
|
||||
|
||||
// Parse year
|
||||
// Parse year - check top level first, then metadata.release_date (ABS format)
|
||||
int? year;
|
||||
final yearValue = json['year'];
|
||||
final metadata = json['metadata'] as Map<String, dynamic>?;
|
||||
dynamic yearValue = json['year'];
|
||||
if (yearValue == null && metadata != null) {
|
||||
// ABS stores year in metadata.release_date (can be "2024" or "2024-01-15")
|
||||
final releaseDate = metadata['release_date'];
|
||||
if (releaseDate is String && releaseDate.isNotEmpty) {
|
||||
// Extract year from date string (handles both "2024" and "2024-01-15" formats)
|
||||
yearValue = releaseDate.split('-').first;
|
||||
} else if (releaseDate is int) {
|
||||
yearValue = releaseDate;
|
||||
}
|
||||
}
|
||||
if (yearValue is int) {
|
||||
year = yearValue;
|
||||
} else if (yearValue is String) {
|
||||
@@ -472,8 +483,6 @@ class Audiobook extends MediaItem {
|
||||
|
||||
// Parse chapters - check top level first, then metadata
|
||||
List<Chapter>? chapters;
|
||||
final metadata = json['metadata'] as Map<String, dynamic>?;
|
||||
|
||||
dynamic chaptersData = json['chapters'];
|
||||
if (chaptersData == null && metadata != null) {
|
||||
chaptersData = metadata['chapters'];
|
||||
|
||||
@@ -24,6 +24,7 @@ import '../services/position_tracker.dart';
|
||||
import '../services/sendspin_service.dart';
|
||||
import '../services/pcm_audio_player.dart';
|
||||
import '../services/offline_action_queue.dart';
|
||||
import '../services/remote/remote_bridge.dart';
|
||||
import '../constants/timings.dart';
|
||||
import '../services/database_service.dart';
|
||||
import '../main.dart' show audioHandler;
|
||||
@@ -79,6 +80,10 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
int? _sleepTimerMinutes; // null = off, -1 = end of track, positive = minutes
|
||||
Timer? _sleepTimerDisplayTimer; // Updates remaining time display every second
|
||||
|
||||
// Idle service timeout - stops foreground service after 30 min of no playback
|
||||
Timer? _idleServiceTimer;
|
||||
static const _idleServiceTimeout = Duration(minutes: 30);
|
||||
|
||||
// Local player state
|
||||
bool _isLocalPlayerPowered = true;
|
||||
int _localPlayerVolume = 100; // Tracked MA volume for builtin player (0-100)
|
||||
@@ -101,6 +106,10 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
SendspinService? _sendspinService;
|
||||
bool _sendspinConnected = false;
|
||||
|
||||
// Remote connection (WebRTC-to-WS bridge for remote access)
|
||||
RemoteBridge? _remoteBridge;
|
||||
bool get isRemoteConnection => _remoteBridge != null && _remoteBridge!.isRunning;
|
||||
|
||||
// PCM audio player for raw Sendspin audio streaming
|
||||
PcmAudioPlayer? _pcmAudioPlayer;
|
||||
|
||||
@@ -371,22 +380,40 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
|
||||
// Build list of providers that support this category, with their item counts
|
||||
// Only include providers that have at least 1 item (hides providers not synced to library)
|
||||
// Multiple instances of the same domain are allowed (e.g., two Spotify accounts)
|
||||
// but we dedupe if names match exactly (same account re-added with new instance ID)
|
||||
final result = <(ProviderInstance, int)>[];
|
||||
final addedInstanceIds = <String>{};
|
||||
final addedNames = <String, int>{}; // Track name -> count to dedupe same-name providers
|
||||
|
||||
for (final provider in _availableMusicProviders) {
|
||||
// Only include providers that support this content type AND have items
|
||||
if (provider.supportsContentType(category)) {
|
||||
final count = counts[provider.instanceId] ?? 0;
|
||||
if (count > 0) {
|
||||
result.add((provider, count));
|
||||
addedInstanceIds.add(provider.instanceId);
|
||||
final existingCount = addedNames[provider.name];
|
||||
if (existingCount == null) {
|
||||
// First provider with this name
|
||||
result.add((provider, count));
|
||||
addedInstanceIds.add(provider.instanceId);
|
||||
addedNames[provider.name] = count;
|
||||
} else if (count > existingCount) {
|
||||
// Same name but more items - likely same account re-added, keep better one
|
||||
result.removeWhere((r) => r.$1.name == provider.name);
|
||||
result.add((provider, count));
|
||||
addedInstanceIds.add(provider.instanceId);
|
||||
addedNames[provider.name] = count;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Also include providers that have items but aren't in _availableMusicProviders
|
||||
// (e.g., search-only providers like iTunes)
|
||||
// (e.g., search-only providers like iTunes, or orphaned items from removed providers)
|
||||
// For these synthetic providers, dedupe by domain since we don't have account-specific names
|
||||
final addedRealDomains = result.map((r) => r.$1.domain).toSet();
|
||||
final addedSyntheticDomains = <String>{};
|
||||
|
||||
for (final entry in counts.entries) {
|
||||
if (!addedInstanceIds.contains(entry.key) && entry.value > 0) {
|
||||
// Create a synthetic ProviderInstance from the instance ID
|
||||
@@ -395,6 +422,11 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
final domain = instanceId.contains('--')
|
||||
? instanceId.split('--').first
|
||||
: instanceId;
|
||||
|
||||
// Skip if this domain is already represented by a real provider or synthetic
|
||||
if (addedRealDomains.contains(domain)) continue;
|
||||
if (addedSyntheticDomains.contains(domain)) continue;
|
||||
|
||||
// Only add if this domain supports the category
|
||||
final capabilities = ProviderInstance.providerCapabilities[domain];
|
||||
if (capabilities != null && capabilities.contains(category)) {
|
||||
@@ -407,6 +439,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
),
|
||||
entry.value,
|
||||
));
|
||||
addedSyntheticDomains.add(domain);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1097,6 +1130,61 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
/// Connect to a remote MA server via WebRTC using Remote Access ID.
|
||||
/// Uses a WebRTC-to-WebSocket bridge so MusicAssistantAPI works unchanged.
|
||||
Future<bool> connectRemote(String remoteId, String username, String password) async {
|
||||
_logger.log('🌐 Attempting remote connection to: $remoteId');
|
||||
|
||||
try {
|
||||
_error = null;
|
||||
_connectionState = MAConnectionState.connecting;
|
||||
notifyListeners();
|
||||
|
||||
// Start the WebRTC-to-WS bridge
|
||||
_remoteBridge = RemoteBridge();
|
||||
final port = await _remoteBridge!.start(remoteId, username, password);
|
||||
|
||||
if (port == null) {
|
||||
_logger.log('❌ Remote bridge failed to start');
|
||||
_remoteBridge = null;
|
||||
_connectionState = MAConnectionState.error;
|
||||
_error = 'Remote connection failed';
|
||||
notifyListeners();
|
||||
return false;
|
||||
}
|
||||
|
||||
_logger.log('✅ Remote bridge started on port $port');
|
||||
|
||||
// Connect via normal API - it will hit the local bridge
|
||||
// The bridge already authenticated, so we use the same credentials
|
||||
await SettingsService.setUsername(username);
|
||||
await SettingsService.setPassword(password);
|
||||
|
||||
await connectToServer('ws://localhost:$port');
|
||||
|
||||
// Wait a moment for connection to establish
|
||||
await Future.delayed(const Duration(milliseconds: 500));
|
||||
|
||||
if (isConnected) {
|
||||
_logger.log('✅ Remote connection via bridge successful!');
|
||||
return true;
|
||||
} else {
|
||||
_logger.log('❌ Connection to bridge failed, stopping bridge');
|
||||
await _remoteBridge?.stop();
|
||||
_remoteBridge = null;
|
||||
return false;
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('❌ Remote connection error: $e');
|
||||
await _remoteBridge?.stop();
|
||||
_remoteBridge = null;
|
||||
_error = e.toString();
|
||||
_connectionState = MAConnectionState.error;
|
||||
notifyListeners();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> _handleMaAuthentication() async {
|
||||
if (_api == null) return false;
|
||||
|
||||
@@ -1252,11 +1340,23 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
return false;
|
||||
}
|
||||
|
||||
await SettingsService.toggleMusicProvider(instanceId, enabled, allIds);
|
||||
// Update local state directly for immediate UI response
|
||||
// If currently "all enabled" (empty list) and disabling one, need to switch to explicit mode
|
||||
if (_enabledProviderIds.isEmpty && !enabled) {
|
||||
// Initialize with all providers except the one being disabled
|
||||
_enabledProviderIds = allIds.where((id) => id != instanceId).toList();
|
||||
} else if (enabled) {
|
||||
// Add to list if not present
|
||||
if (!_enabledProviderIds.contains(instanceId)) {
|
||||
_enabledProviderIds = [..._enabledProviderIds, instanceId];
|
||||
}
|
||||
} else {
|
||||
// Remove from list
|
||||
_enabledProviderIds = _enabledProviderIds.where((id) => id != instanceId).toList();
|
||||
}
|
||||
|
||||
// Reload the enabled providers
|
||||
final savedEnabled = await SettingsService.getEnabledMusicProviders();
|
||||
_enabledProviderIds = savedEnabled ?? [];
|
||||
// Persist to settings (async, but don't wait for UI update)
|
||||
SettingsService.toggleMusicProvider(instanceId, enabled, allIds);
|
||||
|
||||
_logger.log('🔄 Provider filter updated: ${_enabledProviderIds.isEmpty ? "all enabled" : "${_enabledProviderIds.length} enabled"}');
|
||||
|
||||
@@ -1776,6 +1876,11 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
_sendspinConnected = false;
|
||||
}
|
||||
await _api?.disconnect();
|
||||
// Stop remote bridge if running
|
||||
if (_remoteBridge != null) {
|
||||
await _remoteBridge!.stop();
|
||||
_remoteBridge = null;
|
||||
}
|
||||
_connectionState = MAConnectionState.disconnected;
|
||||
// DON'T clear caches or player state - keep for instant reconnect
|
||||
_logger.log('📡 Explicit disconnect - keeping cached data for instant resume');
|
||||
@@ -1962,24 +2067,21 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
return beta >= 20;
|
||||
}
|
||||
|
||||
/// Check if server version is >= 2.8.0 (has built-in /sendspin proxy endpoint)
|
||||
/// The /sendspin proxy was added in MA 2.8.0 (PR #2840)
|
||||
/// MA 2.7.x does NOT have this proxy - users must expose port 8927 directly
|
||||
/// or manually configure reverse proxy routing to port 8927
|
||||
/// Check if server has built-in Sendspin proxy (added in MA 2.7.1)
|
||||
bool _serverHasSendspinProxy() {
|
||||
final version = _parseServerVersion();
|
||||
if (version == null) return false;
|
||||
|
||||
final (:major, :minor, :patch, :beta) = version;
|
||||
|
||||
// Compare with 2.8.0
|
||||
// Compare with 2.7.1
|
||||
if (major > 2) return true;
|
||||
if (major < 2) return false;
|
||||
// major == 2
|
||||
if (minor > 8) return true;
|
||||
if (minor < 8) return false;
|
||||
// minor == 8, any 2.8.x version has the proxy
|
||||
return true;
|
||||
if (minor > 7) return true;
|
||||
if (minor < 7) return false;
|
||||
// minor == 7, need patch >= 1
|
||||
return patch >= 1;
|
||||
}
|
||||
|
||||
/// Get the server version string for logging
|
||||
@@ -2092,7 +2194,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
/// This is the replacement for builtin_player when that API is not available.
|
||||
///
|
||||
/// Connection strategy depends on MA version and network:
|
||||
/// - MA 2.8.0+: Has built-in /sendspin proxy, works with any reverse proxy setup
|
||||
/// - MA 2.7.1+: Has built-in /sendspin proxy, works with any reverse proxy setup
|
||||
/// - MA 2.7.x: NO proxy, must either:
|
||||
/// - Use local IP with port 8927 exposed, OR
|
||||
/// - Manually configure reverse proxy to route /sendspin to port 8927
|
||||
@@ -2108,7 +2210,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
_sendspinService?.dispose();
|
||||
_sendspinService = SendspinService(_serverUrl!);
|
||||
|
||||
// Set auth token for proxy authentication (MA 2.8.0+ or manually configured proxy)
|
||||
// Set auth token for proxy authentication (MA 2.7.1+ or manually configured proxy)
|
||||
final authToken = await SettingsService.getMaAuthToken();
|
||||
if (authToken != null) {
|
||||
_sendspinService!.setAuthToken(authToken);
|
||||
@@ -2159,10 +2261,10 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
}
|
||||
_logger.log('⚠️ Sendspin: Local connection to port 8927 failed');
|
||||
|
||||
// For local IPs, also try the proxy path in case user has a local reverse proxy
|
||||
// For local IPs, also try the proxy path (MA 2.7.1+ has built-in /sendspin proxy)
|
||||
_logger.log('Sendspin: Trying local proxy fallback...');
|
||||
final localProxyUrl = 'ws://${serverUri.host}:${serverUri.hasPort ? serverUri.port : 8095}/sendspin';
|
||||
final proxyConnected = await _sendspinService!.connectWithUrl(localProxyUrl);
|
||||
final proxyConnected = await _sendspinService!.connectWithUrl(localProxyUrl, useProxyAuth: true);
|
||||
if (proxyConnected) {
|
||||
_sendspinConnected = true;
|
||||
_logger.log('✅ Sendspin: Connected via local proxy');
|
||||
@@ -2173,7 +2275,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
// Strategy 2: For external/HTTPS servers, use the proxy at /sendspin
|
||||
if (isHttps || !isLocalIp) {
|
||||
if (hasProxy) {
|
||||
_logger.log('Sendspin: MA 2.8.0+ detected, using built-in /sendspin proxy');
|
||||
_logger.log('Sendspin: MA 2.7.1+ detected, using built-in /sendspin proxy');
|
||||
} else {
|
||||
_logger.log('Sendspin: MA 2.7.x detected, trying /sendspin (requires manual proxy config)');
|
||||
}
|
||||
@@ -2214,7 +2316,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
_logger.log(' Traefik: PathPrefix(`/sendspin`) → service port 8927');
|
||||
_logger.log(' Nginx: location /sendspin { proxy_pass http://ma:8927; }');
|
||||
} else {
|
||||
// MA 2.8.0+ but still failing
|
||||
// MA 2.7.1+ but still failing
|
||||
_logger.log('ℹ️ MA $serverVersion should have /sendspin proxy');
|
||||
_logger.log('ℹ️ Check that your reverse proxy forwards WebSocket connections');
|
||||
_logger.log(' Ensure Upgrade and Connection headers are passed through');
|
||||
@@ -2363,6 +2465,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
);
|
||||
|
||||
// Initialize notification with position 0
|
||||
_cancelIdleServiceTimer();
|
||||
audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: true,
|
||||
@@ -2403,6 +2506,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
);
|
||||
|
||||
// Show paused state with preserved position
|
||||
_cancelIdleServiceTimer();
|
||||
audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: false,
|
||||
@@ -3973,6 +4077,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
} else {
|
||||
// Builtin player is idle - clear notification (fixes issue #42)
|
||||
audioHandler.clearRemotePlaybackState();
|
||||
_startIdleServiceTimer();
|
||||
}
|
||||
} else {
|
||||
// For remote players, immediately show notification if we have cached track info
|
||||
@@ -3994,6 +4099,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
);
|
||||
// Use position tracker for consistent position
|
||||
final position = _positionTracker.currentPosition;
|
||||
_cancelIdleServiceTimer();
|
||||
audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: player.state == 'playing',
|
||||
@@ -4009,6 +4115,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
artist: 'Loading...',
|
||||
);
|
||||
final position = _positionTracker.currentPosition;
|
||||
_cancelIdleServiceTimer();
|
||||
audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: player.state == 'playing',
|
||||
@@ -4019,6 +4126,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
// Player is idle - clear the notification to prevent stale metadata
|
||||
// from previous player showing (fixes issue #42)
|
||||
audioHandler.clearRemotePlaybackState();
|
||||
_startIdleServiceTimer();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4172,6 +4280,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
artUri: artworkUrl != null ? Uri.tryParse(artworkUrl) : null,
|
||||
);
|
||||
|
||||
_cancelIdleServiceTimer();
|
||||
audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: isPlaying,
|
||||
@@ -4356,6 +4465,26 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
_updatePlayerState();
|
||||
}
|
||||
|
||||
/// Start the idle service timer - stops foreground service after 30 min of no playback
|
||||
/// Called when playback stops (player state becomes idle)
|
||||
void _startIdleServiceTimer() {
|
||||
_idleServiceTimer?.cancel();
|
||||
_logger.log('⏱️ Starting idle service timer (${_idleServiceTimeout.inMinutes} min)');
|
||||
_idleServiceTimer = Timer(_idleServiceTimeout, () {
|
||||
_logger.log('⏱️ Idle service timeout reached - stopping foreground service');
|
||||
audioHandler.stopService();
|
||||
});
|
||||
}
|
||||
|
||||
/// Cancel the idle service timer - called when playback starts
|
||||
void _cancelIdleServiceTimer() {
|
||||
if (_idleServiceTimer?.isActive == true) {
|
||||
_logger.log('⏱️ Cancelling idle service timer (playback resumed)');
|
||||
_idleServiceTimer?.cancel();
|
||||
_idleServiceTimer = null;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _updatePlayerState() async {
|
||||
if (_selectedPlayer == null || _api == null) return;
|
||||
|
||||
@@ -4444,6 +4573,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
}
|
||||
// Clear notification for external source
|
||||
audioHandler.clearRemotePlaybackState();
|
||||
_startIdleServiceTimer();
|
||||
if (stateChanged) {
|
||||
notifyListeners();
|
||||
}
|
||||
@@ -4630,6 +4760,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
);
|
||||
// Use position tracker for consistent position (single source of truth)
|
||||
final position = _positionTracker.currentPosition;
|
||||
_cancelIdleServiceTimer();
|
||||
audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: _selectedPlayer!.state == 'playing',
|
||||
@@ -4664,6 +4795,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
);
|
||||
} else {
|
||||
final position = _positionTracker.currentPosition;
|
||||
_cancelIdleServiceTimer();
|
||||
audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: _selectedPlayer!.state == 'playing',
|
||||
@@ -4673,6 +4805,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
}
|
||||
} else {
|
||||
audioHandler.clearRemotePlaybackState();
|
||||
_startIdleServiceTimer();
|
||||
_positionTracker.clear();
|
||||
}
|
||||
}
|
||||
@@ -4900,6 +5033,9 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
orderBy: orderBy,
|
||||
);
|
||||
|
||||
// Update SyncService cache with sorted data so UI sees the new order
|
||||
SyncService.instance.updateCachedArtists(_artists);
|
||||
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
@@ -4932,6 +5068,9 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
orderBy: orderBy,
|
||||
);
|
||||
|
||||
// Update SyncService cache with sorted data so UI sees the new order
|
||||
SyncService.instance.updateCachedAlbums(_albums);
|
||||
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
@@ -5877,6 +6016,7 @@ class MusicAssistantProvider with ChangeNotifier {
|
||||
_localPlayerStateReportTimer?.cancel();
|
||||
_sleepTimer?.cancel();
|
||||
_sleepTimerDisplayTimer?.cancel();
|
||||
_idleServiceTimer?.cancel();
|
||||
_connectionStateSubscription?.cancel();
|
||||
_localPlayerEventSubscription?.cancel();
|
||||
_playerUpdatedEventSubscription?.cancel();
|
||||
|
||||
@@ -5,11 +5,12 @@ import '../services/settings_service.dart';
|
||||
import '../services/database_service.dart';
|
||||
import '../services/profile_service.dart';
|
||||
import '../services/auth/auth_strategy.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../widgets/debug/debug_console.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import 'home_screen.dart';
|
||||
|
||||
enum ConnectionMode { local, remote }
|
||||
|
||||
class LoginScreen extends StatefulWidget {
|
||||
const LoginScreen({super.key});
|
||||
|
||||
@@ -24,8 +25,10 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
final TextEditingController _authServerUrlController = TextEditingController(); // For separate auth server (Authelia)
|
||||
final TextEditingController _usernameController = TextEditingController();
|
||||
final TextEditingController _passwordController = TextEditingController();
|
||||
final TextEditingController _remoteIdController = TextEditingController(); // Remote Access ID
|
||||
final FocusNode _usernameFocusNode = FocusNode();
|
||||
|
||||
ConnectionMode _connectionMode = ConnectionMode.local;
|
||||
bool _isConnecting = false;
|
||||
bool _isDetectingAuth = false;
|
||||
AuthStrategy? _detectedAuthStrategy;
|
||||
@@ -74,6 +77,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
_authServerUrlController.dispose();
|
||||
_usernameController.dispose();
|
||||
_passwordController.dispose();
|
||||
_remoteIdController.dispose();
|
||||
_usernameFocusNode.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
@@ -477,6 +481,68 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _connectRemote() async {
|
||||
final remoteId = _remoteIdController.text.trim();
|
||||
if (remoteId.isEmpty) {
|
||||
setState(() {
|
||||
_error = 'Please enter a Remote Access ID';
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
final username = _usernameController.text.trim();
|
||||
final password = _passwordController.text.trim();
|
||||
|
||||
if (username.isEmpty || password.isEmpty) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.pleaseEnterCredentials;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() {
|
||||
_isConnecting = true;
|
||||
_error = null;
|
||||
});
|
||||
|
||||
_addDebugLog('Connecting to remote server: $remoteId');
|
||||
|
||||
try {
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
|
||||
// Connect via remote access
|
||||
final success = await provider.connectRemote(remoteId, username, password);
|
||||
|
||||
if (success) {
|
||||
_addDebugLog('Remote connection successful');
|
||||
|
||||
// Save credentials for future use
|
||||
await SettingsService.setRemoteAccessId(remoteId);
|
||||
await SettingsService.setUsername(username);
|
||||
await SettingsService.setPassword(password);
|
||||
|
||||
// Navigate to home screen
|
||||
if (mounted) {
|
||||
FocusScope.of(context).unfocus();
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (context) => const HomeScreen()),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
setState(() {
|
||||
_error = 'Remote connection failed. Check your credentials and Remote Access ID.';
|
||||
_isConnecting = false;
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
_addDebugLog('Remote connection error: $e');
|
||||
setState(() {
|
||||
_error = 'Connection failed: ${e.toString()}';
|
||||
_isConnecting = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
@@ -509,8 +575,160 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
},
|
||||
),
|
||||
|
||||
const SizedBox(height: 48),
|
||||
const SizedBox(height: 32),
|
||||
|
||||
// Connection mode selector
|
||||
SegmentedButton<ConnectionMode>(
|
||||
segments: [
|
||||
ButtonSegment<ConnectionMode>(
|
||||
value: ConnectionMode.local,
|
||||
label: Text('Local'),
|
||||
icon: Icon(Icons.home_rounded),
|
||||
),
|
||||
ButtonSegment<ConnectionMode>(
|
||||
value: ConnectionMode.remote,
|
||||
label: Text('Remote'),
|
||||
icon: Icon(Icons.cloud_rounded),
|
||||
),
|
||||
],
|
||||
selected: {_connectionMode},
|
||||
onSelectionChanged: _isConnecting || _isDetectingAuth
|
||||
? null
|
||||
: (Set<ConnectionMode> selection) {
|
||||
setState(() {
|
||||
_connectionMode = selection.first;
|
||||
_error = null;
|
||||
_detectedAuthStrategy = null;
|
||||
_detectedAuthType = null;
|
||||
});
|
||||
},
|
||||
style: ButtonStyle(
|
||||
backgroundColor: WidgetStateProperty.resolveWith((states) {
|
||||
if (states.contains(WidgetState.selected)) {
|
||||
return colorScheme.primaryContainer;
|
||||
}
|
||||
return colorScheme.surfaceVariant.withOpacity(0.3);
|
||||
}),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 32),
|
||||
|
||||
// Remote Access UI
|
||||
if (_connectionMode == ConnectionMode.remote) ...[
|
||||
Text(
|
||||
'Remote Access ID',
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Find this in Music Assistant Settings → Remote Access',
|
||||
style: TextStyle(
|
||||
color: colorScheme.onBackground.withOpacity(0.6),
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _remoteIdController,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'XXXX-XXXX-XXXX-XXXX',
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.vpn_key_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
enabled: !_isConnecting,
|
||||
textCapitalization: TextCapitalization.characters,
|
||||
textInputAction: TextInputAction.next,
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Username
|
||||
Text(
|
||||
S.of(context)!.username,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _usernameController,
|
||||
focusNode: _usernameFocusNode,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: S.of(context)!.username,
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.person_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
enabled: !_isConnecting,
|
||||
textInputAction: TextInputAction.next,
|
||||
),
|
||||
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// Password
|
||||
Text(
|
||||
S.of(context)!.password,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _passwordController,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: S.of(context)!.password,
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.lock_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
obscureText: true,
|
||||
enabled: !_isConnecting,
|
||||
textInputAction: TextInputAction.done,
|
||||
onSubmitted: (_) => _connectRemote(),
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
],
|
||||
|
||||
// Local connection UI
|
||||
if (_connectionMode == ConnectionMode.local) ...[
|
||||
// Server URL
|
||||
Text(
|
||||
S.of(context)!.serverAddress,
|
||||
@@ -856,6 +1074,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
], // End of local connection UI
|
||||
|
||||
const SizedBox(height: 16),
|
||||
|
||||
@@ -898,11 +1117,13 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
|
||||
// Connect button (changes based on state)
|
||||
// Connect button (changes based on state and mode)
|
||||
ElevatedButton(
|
||||
onPressed: (_isConnecting || _isDetectingAuth)
|
||||
? null
|
||||
: (_detectedAuthStrategy == null ? _detectAuthRequirements : _connect),
|
||||
: _connectionMode == ConnectionMode.remote
|
||||
? _connectRemote
|
||||
: (_detectedAuthStrategy == null ? _detectAuthRequirements : _connect),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: colorScheme.primary,
|
||||
foregroundColor: colorScheme.onPrimary,
|
||||
@@ -944,7 +1165,9 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
),
|
||||
)
|
||||
: Text(
|
||||
_detectedAuthStrategy == null ? S.of(context)!.detectAndConnect : S.of(context)!.connect,
|
||||
_connectionMode == ConnectionMode.remote
|
||||
? S.of(context)!.connect
|
||||
: (_detectedAuthStrategy == null ? S.of(context)!.detectAndConnect : S.of(context)!.connect),
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
|
||||
+431
-320
@@ -431,15 +431,28 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
/// Sort audiobooks based on current sort order
|
||||
void _sortAudiobooks() {
|
||||
final sorted = List<Audiobook>.from(_audiobooks);
|
||||
if (_audiobooksSortOrder == 'year') {
|
||||
sorted.sort((a, b) {
|
||||
if (a.year == null && b.year == null) return a.name.compareTo(b.name);
|
||||
if (a.year == null) return 1;
|
||||
if (b.year == null) return -1;
|
||||
return a.year!.compareTo(b.year!);
|
||||
});
|
||||
} else {
|
||||
sorted.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
|
||||
switch (_audiobooksSortOrder) {
|
||||
case 'year':
|
||||
sorted.sort((a, b) {
|
||||
if (a.year == null && b.year == null) return a.name.compareTo(b.name);
|
||||
if (a.year == null) return 1;
|
||||
if (b.year == null) return -1;
|
||||
return a.year!.compareTo(b.year!);
|
||||
});
|
||||
break;
|
||||
case 'year_desc':
|
||||
sorted.sort((a, b) {
|
||||
if (a.year == null && b.year == null) return a.name.compareTo(b.name);
|
||||
if (a.year == null) return 1;
|
||||
if (b.year == null) return -1;
|
||||
return b.year!.compareTo(a.year!);
|
||||
});
|
||||
break;
|
||||
case 'alpha_desc':
|
||||
sorted.sort((a, b) => b.name.toLowerCase().compareTo(a.name.toLowerCase()));
|
||||
break;
|
||||
default: // 'alpha' or any other
|
||||
sorted.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
|
||||
}
|
||||
_sortedAudiobooks = sorted;
|
||||
_audiobookNames = sorted.map((a) => a.name).toList();
|
||||
@@ -480,9 +493,24 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
case 'artist_name_desc':
|
||||
sortedAlbums.sort((a, b) => (b.artistsString).toLowerCase().compareTo((a.artistsString).toLowerCase()));
|
||||
break;
|
||||
default:
|
||||
// Default: name ascending
|
||||
case 'name':
|
||||
// Explicit name ascending
|
||||
sortedAlbums.sort((a, b) => (a.sortName ?? a.name ?? '').toLowerCase().compareTo((b.sortName ?? b.name ?? '').toLowerCase()));
|
||||
break;
|
||||
// Server-handled sort orders - preserve server order, don't re-sort
|
||||
case 'timestamp_added':
|
||||
case 'timestamp_added_desc':
|
||||
case 'timestamp_modified':
|
||||
case 'timestamp_modified_desc':
|
||||
case 'last_played':
|
||||
case 'last_played_desc':
|
||||
case 'play_count':
|
||||
case 'play_count_desc':
|
||||
// Server already sorted, keep the order
|
||||
break;
|
||||
default:
|
||||
// Unknown sort order - preserve server order
|
||||
break;
|
||||
}
|
||||
|
||||
_albumsCacheKey = cacheKey;
|
||||
@@ -499,11 +527,27 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
}
|
||||
|
||||
final sortedArtists = List<Artist>.from(artists);
|
||||
if (_artistsSortOrder == 'name_desc') {
|
||||
sortedArtists.sort((a, b) => (b.sortName ?? b.name ?? '').toLowerCase().compareTo((a.sortName ?? a.name ?? '').toLowerCase()));
|
||||
} else {
|
||||
// Default: name ascending
|
||||
sortedArtists.sort((a, b) => (a.sortName ?? a.name ?? '').toLowerCase().compareTo((b.sortName ?? b.name ?? '').toLowerCase()));
|
||||
switch (_artistsSortOrder) {
|
||||
case 'name':
|
||||
sortedArtists.sort((a, b) => (a.sortName ?? a.name ?? '').toLowerCase().compareTo((b.sortName ?? b.name ?? '').toLowerCase()));
|
||||
break;
|
||||
case 'name_desc':
|
||||
sortedArtists.sort((a, b) => (b.sortName ?? b.name ?? '').toLowerCase().compareTo((a.sortName ?? a.name ?? '').toLowerCase()));
|
||||
break;
|
||||
// Server-handled sort orders - preserve server order, don't re-sort
|
||||
case 'timestamp_added':
|
||||
case 'timestamp_added_desc':
|
||||
case 'timestamp_modified':
|
||||
case 'timestamp_modified_desc':
|
||||
case 'last_played':
|
||||
case 'last_played_desc':
|
||||
case 'play_count':
|
||||
case 'play_count_desc':
|
||||
// Server already sorted, keep the order
|
||||
break;
|
||||
default:
|
||||
// Unknown sort order - preserve server order
|
||||
break;
|
||||
}
|
||||
|
||||
_artistsCacheKey = cacheKey;
|
||||
@@ -829,6 +873,41 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
return false;
|
||||
}
|
||||
|
||||
/// Map sort order to scrollbar display mode
|
||||
ScrollbarDisplayMode _getScrollbarDisplayMode(String sortOrder) {
|
||||
switch (sortOrder) {
|
||||
// Alphabetical sorts -> show letter
|
||||
case 'name':
|
||||
case 'name_desc':
|
||||
case 'sort_name':
|
||||
case 'sort_name_desc':
|
||||
case 'artist_name':
|
||||
case 'artist_name_desc':
|
||||
case 'alpha':
|
||||
case 'alpha_desc':
|
||||
case 'books': // Series sorted by book count - show letter as fallback
|
||||
return ScrollbarDisplayMode.letter;
|
||||
// Year sorts -> show year
|
||||
case 'year':
|
||||
case 'year_desc':
|
||||
return ScrollbarDisplayMode.year;
|
||||
// Sorts without displayable values -> hide popup
|
||||
case 'timestamp_added':
|
||||
case 'timestamp_added_desc':
|
||||
case 'timestamp_modified':
|
||||
case 'timestamp_modified_desc':
|
||||
case 'last_played':
|
||||
case 'last_played_desc':
|
||||
case 'play_count':
|
||||
case 'play_count_desc':
|
||||
case 'duration':
|
||||
case 'duration_desc':
|
||||
return ScrollbarDisplayMode.none;
|
||||
default:
|
||||
return ScrollbarDisplayMode.letter;
|
||||
}
|
||||
}
|
||||
|
||||
void _onLetterScrollbarDragChanged(bool isDragging) {
|
||||
setState(() {
|
||||
_isLetterScrollbarDragging = isDragging;
|
||||
@@ -880,19 +959,32 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
final syncService = SyncService.instance;
|
||||
final enabledProviders = maProvider.enabledProviderIds.toSet();
|
||||
|
||||
// Use SyncService's client-side filtering for instant updates with source tracking
|
||||
// Fetch playlists with sort order from server
|
||||
final serverPlaylists = await maProvider.getPlaylists(
|
||||
favoriteOnly: favoriteOnly,
|
||||
orderBy: _playlistsSortOrder,
|
||||
);
|
||||
|
||||
// Update SyncService cache with sorted data
|
||||
if (serverPlaylists.isNotEmpty) {
|
||||
syncService.updateCachedPlaylists(serverPlaylists);
|
||||
}
|
||||
|
||||
// Apply provider filtering client-side
|
||||
List<Playlist> playlists;
|
||||
if (enabledProviders.isNotEmpty) {
|
||||
// Client-side filtering using source tracking (instant, differentiates same-type providers)
|
||||
playlists = syncService.getPlaylistsFilteredByProviders(enabledProviders);
|
||||
// Apply favorite filter client-side
|
||||
if (favoriteOnly == true) {
|
||||
playlists = playlists.where((p) => p.favorite == true).toList();
|
||||
}
|
||||
if (enabledProviders.isNotEmpty && serverPlaylists.isNotEmpty) {
|
||||
playlists = serverPlaylists.where((p) {
|
||||
final sources = syncService.playlistSourceProviders[p.itemId];
|
||||
if (sources == null || sources.isEmpty) return true; // Show if no tracking
|
||||
return sources.any((s) => enabledProviders.contains(s));
|
||||
}).toList();
|
||||
} else if (serverPlaylists.isNotEmpty) {
|
||||
playlists = serverPlaylists;
|
||||
} else {
|
||||
// No provider filter active - use cached playlists
|
||||
playlists = syncService.cachedPlaylists;
|
||||
// Apply favorite filter client-side
|
||||
// Fallback to cached data if server returned nothing
|
||||
playlists = enabledProviders.isNotEmpty
|
||||
? syncService.getPlaylistsFilteredByProviders(enabledProviders)
|
||||
: syncService.cachedPlaylists;
|
||||
if (favoriteOnly == true) {
|
||||
playlists = playlists.where((p) => p.favorite == true).toList();
|
||||
}
|
||||
@@ -901,7 +993,6 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_playlists = playlists;
|
||||
// Server returns pre-sorted data, but keep client sort for fallback
|
||||
_sortPlaylists();
|
||||
_isLoadingPlaylists = false;
|
||||
});
|
||||
@@ -2294,6 +2385,7 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
child: LetterScrollbar(
|
||||
controller: _authorsScrollController,
|
||||
items: sortedAuthorNames,
|
||||
displayMode: _getScrollbarDisplayMode(_authorsSortOrder),
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _authorsViewMode == 'list'
|
||||
@@ -2606,23 +2698,36 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
// Client-side filtering using SyncService source tracking for instant updates
|
||||
var audiobooks = enabledProviders.isNotEmpty
|
||||
? syncService.getAudiobooksFilteredByProviders(enabledProviders)
|
||||
: syncService.cachedAudiobooks;
|
||||
: List<Audiobook>.from(syncService.cachedAudiobooks);
|
||||
|
||||
// Filter by favorites if enabled
|
||||
if (_showFavoritesOnly) {
|
||||
audiobooks = audiobooks.where((a) => a.favorite == true).toList();
|
||||
}
|
||||
|
||||
// Apply sort order
|
||||
if (_audiobooksSortOrder == 'year') {
|
||||
audiobooks.sort((a, b) {
|
||||
if (a.year == null && b.year == null) return a.name.compareTo(b.name);
|
||||
if (a.year == null) return 1;
|
||||
if (b.year == null) return -1;
|
||||
return a.year!.compareTo(b.year!);
|
||||
});
|
||||
} else {
|
||||
audiobooks.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
|
||||
// Apply sort order (client-side for audiobooks)
|
||||
switch (_audiobooksSortOrder) {
|
||||
case 'year':
|
||||
audiobooks.sort((a, b) {
|
||||
if (a.year == null && b.year == null) return a.name.compareTo(b.name);
|
||||
if (a.year == null) return 1;
|
||||
if (b.year == null) return -1;
|
||||
return a.year!.compareTo(b.year!);
|
||||
});
|
||||
break;
|
||||
case 'year_desc':
|
||||
audiobooks.sort((a, b) {
|
||||
if (a.year == null && b.year == null) return a.name.compareTo(b.name);
|
||||
if (a.year == null) return 1;
|
||||
if (b.year == null) return -1;
|
||||
return b.year!.compareTo(a.year!);
|
||||
});
|
||||
break;
|
||||
case 'alpha_desc':
|
||||
audiobooks.sort((a, b) => b.name.toLowerCase().compareTo(a.name.toLowerCase()));
|
||||
break;
|
||||
default: // 'alpha' or any other
|
||||
audiobooks.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
|
||||
}
|
||||
|
||||
if (audiobooks.isEmpty) {
|
||||
@@ -2644,6 +2749,10 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
}
|
||||
|
||||
final audiobookNames = audiobooks.map((a) => a.name).toList();
|
||||
// Generate year labels for year sort mode
|
||||
final audiobookYears = (_audiobooksSortOrder == 'year' || _audiobooksSortOrder == 'year_desc')
|
||||
? audiobooks.map((a) => a.year?.toString() ?? '?').toList()
|
||||
: null;
|
||||
|
||||
// Match music albums tab layout - no header, direct list/grid
|
||||
return RefreshIndicator(
|
||||
@@ -2653,12 +2762,14 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
child: LetterScrollbar(
|
||||
controller: _audiobooksScrollController,
|
||||
items: audiobookNames,
|
||||
displayMode: _getScrollbarDisplayMode(_audiobooksSortOrder),
|
||||
displayLabels: audiobookYears,
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _audiobooksViewMode == 'list'
|
||||
? ListView.builder(
|
||||
controller: _audiobooksScrollController,
|
||||
key: PageStorageKey<String>('all_books_list_${_showFavoritesOnly ? 'fav' : 'all'}_${enabledProviders.length}'),
|
||||
key: PageStorageKey<String>('all_books_list_${_showFavoritesOnly ? 'fav' : 'all'}_${enabledProviders.length}_$_audiobooksSortOrder'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
@@ -2670,7 +2781,7 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
)
|
||||
: GridView.builder(
|
||||
controller: _audiobooksScrollController,
|
||||
key: PageStorageKey<String>('all_books_grid_${_showFavoritesOnly ? 'fav' : 'all'}_$_audiobooksViewMode\_${enabledProviders.length}'),
|
||||
key: PageStorageKey<String>('all_books_grid_${_showFavoritesOnly ? 'fav' : 'all'}_$_audiobooksViewMode\_${enabledProviders.length}_$_audiobooksSortOrder'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
@@ -2904,6 +3015,7 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
child: LetterScrollbar(
|
||||
controller: _seriesScrollController,
|
||||
items: seriesNames,
|
||||
displayMode: _getScrollbarDisplayMode(_seriesSortOrder),
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _seriesViewMode == 'list'
|
||||
@@ -3333,6 +3445,7 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
child: LetterScrollbar(
|
||||
controller: _podcastsScrollController,
|
||||
items: podcastNames,
|
||||
displayMode: _getScrollbarDisplayMode(_podcastsSortOrder),
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _podcastsViewMode == 'list'
|
||||
@@ -3603,6 +3716,7 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
child: LetterScrollbar(
|
||||
controller: _radioScrollController,
|
||||
items: radioNames,
|
||||
displayMode: _getScrollbarDisplayMode(_radioSortOrder),
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _radioViewMode == 'list'
|
||||
@@ -3761,98 +3875,97 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
|
||||
// ============ ARTISTS TAB ============
|
||||
Widget _buildArtistsTab(BuildContext context, S l10n) {
|
||||
// Use Selector for targeted rebuilds - only rebuild when loading state or providers change
|
||||
// Always use SyncService data for consistency (it has the complete library)
|
||||
return Selector<MusicAssistantProvider, (bool, Set<String>)>(
|
||||
selector: (_, provider) => (provider.isLoading, provider.enabledProviderIds.toSet()),
|
||||
builder: (context, data, _) {
|
||||
final (isLoading, enabledProviders) = data;
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final syncService = SyncService.instance;
|
||||
// Note: We don't use Selector here because we need to react to both
|
||||
// MusicAssistantProvider changes AND SyncService changes (source tracking).
|
||||
// The parent's _onSyncServiceChanged listener triggers setState() for SyncService updates.
|
||||
final maProvider = context.watch<MusicAssistantProvider>();
|
||||
final isLoading = maProvider.isLoading;
|
||||
final enabledProviders = maProvider.enabledProviderIds.toSet();
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final syncService = SyncService.instance;
|
||||
|
||||
// Show loading only if actually loading AND no cached data available
|
||||
if (isLoading && syncService.cachedArtists.isEmpty) {
|
||||
return Center(child: CircularProgressIndicator(color: colorScheme.primary));
|
||||
}
|
||||
// Show loading only if actually loading AND no cached data available
|
||||
if (isLoading && syncService.cachedArtists.isEmpty) {
|
||||
return Center(child: CircularProgressIndicator(color: colorScheme.primary));
|
||||
}
|
||||
|
||||
// Always use SyncService data - it has the complete library with source tracking
|
||||
final filteredArtists = enabledProviders.isNotEmpty
|
||||
? syncService.getArtistsFilteredByProviders(enabledProviders)
|
||||
: syncService.cachedArtists;
|
||||
// Always use SyncService data - it has the complete library with source tracking
|
||||
final filteredArtists = enabledProviders.isNotEmpty
|
||||
? syncService.getArtistsFilteredByProviders(enabledProviders)
|
||||
: syncService.cachedArtists;
|
||||
|
||||
// Filter by favorites if enabled
|
||||
final artists = _showFavoritesOnly
|
||||
? filteredArtists.where((a) => a.favorite == true).toList()
|
||||
: filteredArtists;
|
||||
// Filter by favorites if enabled
|
||||
final artists = _showFavoritesOnly
|
||||
? filteredArtists.where((a) => a.favorite == true).toList()
|
||||
: filteredArtists;
|
||||
|
||||
if (artists.isEmpty) {
|
||||
if (_showFavoritesOnly) {
|
||||
return EmptyState.custom(
|
||||
context: context,
|
||||
icon: Icons.favorite_border,
|
||||
title: l10n.noFavoriteArtists,
|
||||
subtitle: l10n.tapHeartArtist,
|
||||
);
|
||||
}
|
||||
return EmptyState.artists(
|
||||
context: context,
|
||||
onRefresh: () => context.read<MusicAssistantProvider>().loadLibrary(),
|
||||
);
|
||||
}
|
||||
if (artists.isEmpty) {
|
||||
if (_showFavoritesOnly) {
|
||||
return EmptyState.custom(
|
||||
context: context,
|
||||
icon: Icons.favorite_border,
|
||||
title: l10n.noFavoriteArtists,
|
||||
subtitle: l10n.tapHeartArtist,
|
||||
);
|
||||
}
|
||||
return EmptyState.artists(
|
||||
context: context,
|
||||
onRefresh: () => context.read<MusicAssistantProvider>().loadLibrary(),
|
||||
);
|
||||
}
|
||||
|
||||
// PERF: Use cached sorting - only re-sorts when data or sort order changes
|
||||
final sortedArtists = _getSortedArtists(artists);
|
||||
final artistNames = _cachedArtistNames;
|
||||
// PERF: Use cached sorting - only re-sorts when data or sort order changes
|
||||
final sortedArtists = _getSortedArtists(artists);
|
||||
final artistNames = _cachedArtistNames;
|
||||
|
||||
return RefreshIndicator(
|
||||
color: colorScheme.primary,
|
||||
backgroundColor: colorScheme.background,
|
||||
onRefresh: () async => context.read<MusicAssistantProvider>().loadLibrary(),
|
||||
child: LetterScrollbar(
|
||||
return RefreshIndicator(
|
||||
color: colorScheme.primary,
|
||||
backgroundColor: colorScheme.background,
|
||||
onRefresh: () async => context.read<MusicAssistantProvider>().loadLibrary(),
|
||||
child: LetterScrollbar(
|
||||
controller: _artistsScrollController,
|
||||
items: artistNames,
|
||||
displayMode: _getScrollbarDisplayMode(_artistsSortOrder),
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _artistsViewMode == 'list'
|
||||
? ListView.builder(
|
||||
controller: _artistsScrollController,
|
||||
items: artistNames,
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _artistsViewMode == 'list'
|
||||
? ListView.builder(
|
||||
controller: _artistsScrollController,
|
||||
key: PageStorageKey<String>('library_artists_list_${_showFavoritesOnly ? 'fav' : 'all'}_$_artistsViewMode'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
itemCount: sortedArtists.length,
|
||||
padding: EdgeInsets.only(left: 8, right: 8, top: 16, bottom: BottomSpacing.withMiniPlayer),
|
||||
itemBuilder: (context, index) {
|
||||
final artist = sortedArtists[index];
|
||||
return _buildArtistTile(
|
||||
context,
|
||||
artist,
|
||||
key: ValueKey(artist.uri ?? artist.itemId),
|
||||
);
|
||||
},
|
||||
)
|
||||
: GridView.builder(
|
||||
controller: _artistsScrollController,
|
||||
key: PageStorageKey<String>('library_artists_grid_${_showFavoritesOnly ? 'fav' : 'all'}_$_artistsViewMode'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
padding: EdgeInsets.only(left: 16, right: 16, top: 16, bottom: BottomSpacing.withMiniPlayer),
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: _artistsViewMode == 'grid3' ? 3 : 2,
|
||||
childAspectRatio: _artistsViewMode == 'grid3' ? 0.75 : 0.80,
|
||||
crossAxisSpacing: 16,
|
||||
mainAxisSpacing: 16,
|
||||
),
|
||||
itemCount: sortedArtists.length,
|
||||
itemBuilder: (context, index) {
|
||||
final artist = sortedArtists[index];
|
||||
return _buildArtistGridCard(context, artist);
|
||||
},
|
||||
),
|
||||
key: PageStorageKey<String>('library_artists_list_${_showFavoritesOnly ? 'fav' : 'all'}_$_artistsViewMode'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
itemCount: sortedArtists.length,
|
||||
padding: EdgeInsets.only(left: 8, right: 8, top: 16, bottom: BottomSpacing.withMiniPlayer),
|
||||
itemBuilder: (context, index) {
|
||||
final artist = sortedArtists[index];
|
||||
return _buildArtistTile(
|
||||
context,
|
||||
artist,
|
||||
key: ValueKey(artist.uri ?? artist.itemId),
|
||||
);
|
||||
},
|
||||
)
|
||||
: GridView.builder(
|
||||
controller: _artistsScrollController,
|
||||
key: PageStorageKey<String>('library_artists_grid_${_showFavoritesOnly ? 'fav' : 'all'}_$_artistsViewMode'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
padding: EdgeInsets.only(left: 16, right: 16, top: 16, bottom: BottomSpacing.withMiniPlayer),
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: _artistsViewMode == 'grid3' ? 3 : 2,
|
||||
childAspectRatio: _artistsViewMode == 'grid3' ? 0.75 : 0.80,
|
||||
crossAxisSpacing: 16,
|
||||
mainAxisSpacing: 16,
|
||||
),
|
||||
itemCount: sortedArtists.length,
|
||||
itemBuilder: (context, index) {
|
||||
final artist = sortedArtists[index];
|
||||
return _buildArtistGridCard(context, artist);
|
||||
},
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3971,100 +4084,104 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
|
||||
// ============ ALBUMS TAB ============
|
||||
Widget _buildAlbumsTab(BuildContext context, S l10n) {
|
||||
// Use Selector for targeted rebuilds - only rebuild when loading state or providers change
|
||||
// Always use SyncService data for consistency (it has the complete library)
|
||||
return Selector<MusicAssistantProvider, (bool, Set<String>)>(
|
||||
selector: (_, provider) => (provider.isLoading, provider.enabledProviderIds.toSet()),
|
||||
builder: (context, data, _) {
|
||||
final (isLoading, enabledProviders) = data;
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final syncService = SyncService.instance;
|
||||
// Note: We don't use Selector here because we need to react to both
|
||||
// MusicAssistantProvider changes AND SyncService changes (source tracking).
|
||||
// The parent's _onSyncServiceChanged listener triggers setState() for SyncService updates.
|
||||
final maProvider = context.watch<MusicAssistantProvider>();
|
||||
final isLoading = maProvider.isLoading;
|
||||
final enabledProviders = maProvider.enabledProviderIds.toSet();
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final syncService = SyncService.instance;
|
||||
|
||||
// Show loading only if actually loading AND no cached data available
|
||||
if (isLoading && syncService.cachedAlbums.isEmpty) {
|
||||
return Center(child: CircularProgressIndicator(color: colorScheme.primary));
|
||||
}
|
||||
// Show loading only if actually loading AND no cached data available
|
||||
if (isLoading && syncService.cachedAlbums.isEmpty) {
|
||||
return Center(child: CircularProgressIndicator(color: colorScheme.primary));
|
||||
}
|
||||
|
||||
// Always use SyncService data - it has the complete library with source tracking
|
||||
final filteredAlbums = enabledProviders.isNotEmpty
|
||||
? syncService.getAlbumsFilteredByProviders(enabledProviders)
|
||||
: syncService.cachedAlbums;
|
||||
// Always use SyncService data - it has the complete library with source tracking
|
||||
final filteredAlbums = enabledProviders.isNotEmpty
|
||||
? syncService.getAlbumsFilteredByProviders(enabledProviders)
|
||||
: syncService.cachedAlbums;
|
||||
|
||||
// Filter by favorites if enabled
|
||||
final albums = _showFavoritesOnly
|
||||
? filteredAlbums.where((a) => a.favorite == true).toList()
|
||||
: filteredAlbums;
|
||||
// Filter by favorites if enabled
|
||||
final albums = _showFavoritesOnly
|
||||
? filteredAlbums.where((a) => a.favorite == true).toList()
|
||||
: filteredAlbums;
|
||||
|
||||
if (albums.isEmpty) {
|
||||
if (_showFavoritesOnly) {
|
||||
return EmptyState.custom(
|
||||
context: context,
|
||||
icon: Icons.favorite_border,
|
||||
title: l10n.noFavoriteAlbums,
|
||||
subtitle: l10n.tapHeartAlbum,
|
||||
);
|
||||
}
|
||||
return EmptyState.albums(
|
||||
context: context,
|
||||
onRefresh: () => context.read<MusicAssistantProvider>().loadLibrary(),
|
||||
);
|
||||
}
|
||||
|
||||
// PERF: Use cached sorting - only re-sorts when data or sort order changes
|
||||
final sortedAlbums = _getSortedAlbums(albums);
|
||||
final albumNames = _cachedAlbumNames;
|
||||
|
||||
return RefreshIndicator(
|
||||
color: colorScheme.primary,
|
||||
backgroundColor: colorScheme.background,
|
||||
onRefresh: () async => context.read<MusicAssistantProvider>().loadLibrary(),
|
||||
child: LetterScrollbar(
|
||||
controller: _albumsScrollController,
|
||||
items: albumNames,
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _albumsViewMode == 'list'
|
||||
? ListView.builder(
|
||||
controller: _albumsScrollController,
|
||||
key: PageStorageKey<String>('library_albums_list_${_showFavoritesOnly ? 'fav' : 'all'}_$_albumsViewMode'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
padding: EdgeInsets.only(left: 8, right: 8, top: 16, bottom: BottomSpacing.withMiniPlayer),
|
||||
itemCount: sortedAlbums.length,
|
||||
itemBuilder: (context, index) {
|
||||
final album = sortedAlbums[index];
|
||||
return _buildAlbumListTile(context, album);
|
||||
},
|
||||
)
|
||||
: GridView.builder(
|
||||
controller: _albumsScrollController,
|
||||
key: PageStorageKey<String>('library_albums_grid_${_showFavoritesOnly ? 'fav' : 'all'}_$_albumsViewMode'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
padding: EdgeInsets.only(left: 16, right: 16, top: 16, bottom: BottomSpacing.withMiniPlayer),
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: _albumsViewMode == 'grid3' ? 3 : 2,
|
||||
childAspectRatio: _albumsViewMode == 'grid3' ? 0.70 : 0.75,
|
||||
crossAxisSpacing: 16,
|
||||
mainAxisSpacing: 16,
|
||||
),
|
||||
itemCount: sortedAlbums.length,
|
||||
itemBuilder: (context, index) {
|
||||
final album = sortedAlbums[index];
|
||||
return AlbumCard(
|
||||
key: ValueKey(album.uri ?? album.itemId),
|
||||
album: album,
|
||||
heroTagSuffix: 'library_grid',
|
||||
// Use 256 to match detail screen for smooth Hero animation
|
||||
imageCacheSize: 256,
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
if (albums.isEmpty) {
|
||||
if (_showFavoritesOnly) {
|
||||
return EmptyState.custom(
|
||||
context: context,
|
||||
icon: Icons.favorite_border,
|
||||
title: l10n.noFavoriteAlbums,
|
||||
subtitle: l10n.tapHeartAlbum,
|
||||
);
|
||||
},
|
||||
}
|
||||
return EmptyState.albums(
|
||||
context: context,
|
||||
onRefresh: () => context.read<MusicAssistantProvider>().loadLibrary(),
|
||||
);
|
||||
}
|
||||
|
||||
// PERF: Use cached sorting - only re-sorts when data or sort order changes
|
||||
final sortedAlbums = _getSortedAlbums(albums);
|
||||
final albumNames = _cachedAlbumNames;
|
||||
// Generate year labels for year sort mode
|
||||
final albumYears = (_albumsSortOrder == 'year' || _albumsSortOrder == 'year_desc')
|
||||
? sortedAlbums.map((a) => a.year?.toString() ?? '?').toList()
|
||||
: null;
|
||||
|
||||
return RefreshIndicator(
|
||||
color: colorScheme.primary,
|
||||
backgroundColor: colorScheme.background,
|
||||
onRefresh: () async => context.read<MusicAssistantProvider>().loadLibrary(),
|
||||
child: LetterScrollbar(
|
||||
controller: _albumsScrollController,
|
||||
items: albumNames,
|
||||
displayMode: _getScrollbarDisplayMode(_albumsSortOrder),
|
||||
displayLabels: albumYears,
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _albumsViewMode == 'list'
|
||||
? ListView.builder(
|
||||
controller: _albumsScrollController,
|
||||
key: PageStorageKey<String>('library_albums_list_${_showFavoritesOnly ? 'fav' : 'all'}_$_albumsViewMode'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
padding: EdgeInsets.only(left: 8, right: 8, top: 16, bottom: BottomSpacing.withMiniPlayer),
|
||||
itemCount: sortedAlbums.length,
|
||||
itemBuilder: (context, index) {
|
||||
final album = sortedAlbums[index];
|
||||
return _buildAlbumListTile(context, album);
|
||||
},
|
||||
)
|
||||
: GridView.builder(
|
||||
controller: _albumsScrollController,
|
||||
key: PageStorageKey<String>('library_albums_grid_${_showFavoritesOnly ? 'fav' : 'all'}_$_albumsViewMode'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
padding: EdgeInsets.only(left: 16, right: 16, top: 16, bottom: BottomSpacing.withMiniPlayer),
|
||||
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: _albumsViewMode == 'grid3' ? 3 : 2,
|
||||
childAspectRatio: _albumsViewMode == 'grid3' ? 0.70 : 0.75,
|
||||
crossAxisSpacing: 16,
|
||||
mainAxisSpacing: 16,
|
||||
),
|
||||
itemCount: sortedAlbums.length,
|
||||
itemBuilder: (context, index) {
|
||||
final album = sortedAlbums[index];
|
||||
return AlbumCard(
|
||||
key: ValueKey(album.uri ?? album.itemId),
|
||||
album: album,
|
||||
heroTagSuffix: 'library_grid',
|
||||
// Use 256 to match detail screen for smooth Hero animation
|
||||
imageCacheSize: 256,
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4161,12 +4278,13 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
child: LetterScrollbar(
|
||||
controller: _playlistsScrollController,
|
||||
items: _playlistNames,
|
||||
displayMode: _getScrollbarDisplayMode(_playlistsSortOrder),
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: _playlistsViewMode == 'list'
|
||||
? ListView.builder(
|
||||
controller: _playlistsScrollController,
|
||||
key: PageStorageKey<String>('library_playlists_list_${_showFavoritesOnly ? 'fav' : 'all'}_$_playlistsViewMode'),
|
||||
key: PageStorageKey<String>('library_playlists_list_${_showFavoritesOnly ? 'fav' : 'all'}_$_playlistsViewMode\_$_playlistsSortOrder'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
@@ -4179,7 +4297,7 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
)
|
||||
: GridView.builder(
|
||||
controller: _playlistsScrollController,
|
||||
key: PageStorageKey<String>('library_playlists_grid_${_showFavoritesOnly ? 'fav' : 'all'}_$_playlistsViewMode'),
|
||||
key: PageStorageKey<String>('library_playlists_grid_${_showFavoritesOnly ? 'fav' : 'all'}_$_playlistsViewMode\_$_playlistsSortOrder'),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
addRepaintBoundaries: false,
|
||||
@@ -4449,6 +4567,7 @@ class _NewLibraryScreenState extends State<NewLibraryScreen>
|
||||
child: LetterScrollbar(
|
||||
controller: _tracksScrollController,
|
||||
items: trackSortKeys,
|
||||
displayMode: _getScrollbarDisplayMode(_tracksSortOrder),
|
||||
onDragStateChanged: _onLetterScrollbarDragChanged,
|
||||
bottomPadding: BottomSpacing.withMiniPlayer,
|
||||
child: ListView.builder(
|
||||
@@ -4661,7 +4780,8 @@ class _OptionsMenuOverlayState extends State<_OptionsMenuOverlay>
|
||||
late String _currentViewMode;
|
||||
late bool _showFavoritesOnly;
|
||||
late bool _showOnlyArtistsWithAlbums;
|
||||
late Set<String> _localEnabledProviders;
|
||||
// Note: We don't use local state for enabledProviders anymore - the Selector
|
||||
// watches the Provider directly and rebuilds when it changes
|
||||
late Map<String, bool> _localAbsLibraryEnabled;
|
||||
late AnimationController _animController;
|
||||
late Animation<double> _scaleAnimation;
|
||||
@@ -4674,7 +4794,6 @@ class _OptionsMenuOverlayState extends State<_OptionsMenuOverlay>
|
||||
_currentViewMode = widget.currentViewMode;
|
||||
_showFavoritesOnly = widget.showFavoritesOnly;
|
||||
_showOnlyArtistsWithAlbums = widget.showOnlyArtistsWithAlbums;
|
||||
_localEnabledProviders = Set.from(widget.enabledProviderIds);
|
||||
_localAbsLibraryEnabled = Map.from(widget.absLibraryEnabled);
|
||||
|
||||
_animController = AnimationController(
|
||||
@@ -4702,6 +4821,8 @@ class _OptionsMenuOverlayState extends State<_OptionsMenuOverlay>
|
||||
if (oldWidget.currentSort != widget.currentSort) {
|
||||
_currentSort = widget.currentSort;
|
||||
}
|
||||
// Note: We don't sync enabledProviders here anymore - the Selector watches
|
||||
// the Provider directly and handles rebuilds when the state changes
|
||||
}
|
||||
|
||||
void _handleSortTap(String baseField, bool defaultDesc) {
|
||||
@@ -4744,42 +4865,21 @@ class _OptionsMenuOverlayState extends State<_OptionsMenuOverlay>
|
||||
}
|
||||
|
||||
void _handleProviderTap(String providerId) {
|
||||
final isCurrentlyEnabled = _localEnabledProviders.isEmpty ||
|
||||
_localEnabledProviders.contains(providerId);
|
||||
// Read directly from Provider to get current state (not stale props)
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final currentEnabled = maProvider.enabledProviderIds;
|
||||
final isCurrentlyEnabled = currentEnabled.isEmpty || currentEnabled.contains(providerId);
|
||||
|
||||
// Don't allow disabling the last provider
|
||||
if (isCurrentlyEnabled) {
|
||||
// If all are enabled (empty set), we're switching to selective mode
|
||||
if (_localEnabledProviders.isEmpty) {
|
||||
// Enable all except this one
|
||||
final allIds = widget.relevantProviders.map((p) => p.$1.instanceId).toSet();
|
||||
if (allIds.length <= 1) return; // Can't disable the only provider
|
||||
_localEnabledProviders = allIds..remove(providerId);
|
||||
} else {
|
||||
// Already in selective mode - disable this one
|
||||
if (_localEnabledProviders.length <= 1) return; // Can't disable the last one
|
||||
_localEnabledProviders.remove(providerId);
|
||||
}
|
||||
} else {
|
||||
// Enable this provider
|
||||
_localEnabledProviders.add(providerId);
|
||||
// If all providers are now enabled, clear the set (means "all")
|
||||
final allIds = widget.relevantProviders.map((p) => p.$1.instanceId).toSet();
|
||||
if (_localEnabledProviders.containsAll(allIds)) {
|
||||
_localEnabledProviders.clear();
|
||||
}
|
||||
if (isCurrentlyEnabled && currentEnabled.isNotEmpty && currentEnabled.length <= 1) {
|
||||
return; // Can't disable the last one
|
||||
}
|
||||
|
||||
setState(() {});
|
||||
// Let the callback handle the actual toggle - no local state needed
|
||||
// The Provider will notifyListeners and trigger a rebuild
|
||||
widget.onProviderToggled(providerId, !isCurrentlyEnabled);
|
||||
}
|
||||
|
||||
bool _isProviderEnabled(String providerId) {
|
||||
// Empty set means all are enabled
|
||||
if (_localEnabledProviders.isEmpty) return true;
|
||||
return _localEnabledProviders.contains(providerId);
|
||||
}
|
||||
|
||||
void _handleAbsLibraryTap(String libraryPath) {
|
||||
final isEnabled = _localAbsLibraryEnabled[libraryPath] ?? true;
|
||||
|
||||
@@ -5010,82 +5110,93 @@ class _OptionsMenuOverlayState extends State<_OptionsMenuOverlay>
|
||||
|
||||
// Providers section - only shown if multiple providers support this category
|
||||
// relevantProviders is pre-filtered by capability (e.g., radio providers won't appear in Artists)
|
||||
if (widget.relevantProviders.length > 1) ...[
|
||||
const Divider(height: 1),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 16, right: 16, top: 12, bottom: 4),
|
||||
child: Text(
|
||||
'Providers',
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
),
|
||||
// Show all providers that support this category (allows toggling any on/off)
|
||||
...widget.relevantProviders.map((providerData) {
|
||||
final (provider, itemCount) = providerData;
|
||||
final isEnabled = _isProviderEnabled(provider.instanceId);
|
||||
// Use Consumer to rebuild when provider changes (Selector had issues with List equality)
|
||||
if (widget.relevantProviders.length > 1)
|
||||
Consumer<MusicAssistantProvider>(
|
||||
builder: (context, maProvider, _) {
|
||||
final enabledSet = maProvider.enabledProviderIds.toSet();
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Divider(height: 1),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 16, right: 16, top: 12, bottom: 4),
|
||||
child: Text(
|
||||
'Providers',
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
),
|
||||
// Show all providers that support this category (allows toggling any on/off)
|
||||
...widget.relevantProviders.map((providerData) {
|
||||
final (provider, itemCount) = providerData;
|
||||
// Empty set means all enabled
|
||||
final isEnabled = enabledSet.isEmpty || enabledSet.contains(provider.instanceId);
|
||||
|
||||
return InkWell(
|
||||
onTap: () => _handleProviderTap(provider.instanceId),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
|
||||
child: Row(
|
||||
children: [
|
||||
// Checkmark on left - fixed width
|
||||
SizedBox(
|
||||
width: 24,
|
||||
child: isEnabled
|
||||
? Icon(Icons.check, size: 18, color: colorScheme.primary)
|
||||
: null,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Icon(
|
||||
isEnabled ? Icons.cloud : Icons.cloud_outlined,
|
||||
size: 18,
|
||||
color: isEnabled
|
||||
? colorScheme.primary
|
||||
: colorScheme.onSurface.withOpacity(0.7),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Text(
|
||||
provider.name,
|
||||
style: TextStyle(
|
||||
color: isEnabled ? colorScheme.primary : null,
|
||||
fontWeight: isEnabled ? FontWeight.w600 : FontWeight.normal,
|
||||
),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
// Item count badge
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
|
||||
decoration: BoxDecoration(
|
||||
color: isEnabled
|
||||
? colorScheme.primary.withOpacity(0.1)
|
||||
: colorScheme.surfaceVariant.withOpacity(0.5),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
child: Text(
|
||||
itemCount.toString(),
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: isEnabled
|
||||
? colorScheme.primary
|
||||
: colorScheme.onSurface.withOpacity(0.5),
|
||||
return InkWell(
|
||||
onTap: () => _handleProviderTap(provider.instanceId),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
|
||||
child: Row(
|
||||
children: [
|
||||
// Checkmark on left - fixed width
|
||||
SizedBox(
|
||||
width: 24,
|
||||
child: isEnabled
|
||||
? Icon(Icons.check, size: 18, color: colorScheme.primary)
|
||||
: null,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Icon(
|
||||
isEnabled ? Icons.cloud : Icons.cloud_outlined,
|
||||
size: 18,
|
||||
color: isEnabled
|
||||
? colorScheme.primary
|
||||
: colorScheme.onSurface.withOpacity(0.7),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Text(
|
||||
provider.name,
|
||||
style: TextStyle(
|
||||
color: isEnabled ? colorScheme.primary : null,
|
||||
fontWeight: isEnabled ? FontWeight.w600 : FontWeight.normal,
|
||||
),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
// Item count badge
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
|
||||
decoration: BoxDecoration(
|
||||
color: isEnabled
|
||||
? colorScheme.primary.withOpacity(0.1)
|
||||
: colorScheme.surfaceVariant.withOpacity(0.5),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
child: Text(
|
||||
itemCount.toString(),
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: isEnabled
|
||||
? colorScheme.primary
|
||||
: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}),
|
||||
],
|
||||
);
|
||||
}),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
// ABS Libraries section - only for Books tab with multiple libraries
|
||||
if (widget.selectedMediaType == LibraryMediaType.books &&
|
||||
|
||||
@@ -157,6 +157,17 @@ class MassivAudioHandler extends BaseAudioHandler with SeekHandler {
|
||||
// Note: We don't actually stop playback - this button is repurposed for player switching
|
||||
}
|
||||
|
||||
/// Fully stop the foreground service and release resources
|
||||
/// Called after idle timeout to save battery
|
||||
Future<void> stopService() async {
|
||||
_logger.log('MassivAudioHandler: Stopping foreground service (idle timeout)');
|
||||
_isRemoteMode = false;
|
||||
_currentMediaItem = null;
|
||||
await _player.stop();
|
||||
// Call the base stop() to properly stop the foreground service
|
||||
await super.stop();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> seek(Duration position) => _player.seek(position);
|
||||
|
||||
|
||||
@@ -809,6 +809,15 @@ class MusicAssistantAPI {
|
||||
}
|
||||
}
|
||||
_logger.log('📚 Got ${browseBooks.length} audiobooks from ABS browse API');
|
||||
|
||||
// If browse returned nothing, the saved library paths may be stale
|
||||
// (e.g., after provider was removed and re-added with new instance ID)
|
||||
// Clear the stale settings so we fall back to library_items API
|
||||
if (browseBooks.isEmpty) {
|
||||
_logger.log('📚 Browse returned 0 books - clearing stale library settings');
|
||||
await SettingsService.clearEnabledAbsLibraries();
|
||||
await SettingsService.setDiscoveredAbsLibraries([]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -826,11 +835,13 @@ class MusicAssistantAPI {
|
||||
|
||||
// Only call library_items API if:
|
||||
// 1. No ABS libraries configured (traditional mode), OR
|
||||
// 2. We have specific non-ABS providers to query
|
||||
// 2. We have specific non-ABS providers to query, OR
|
||||
// 3. ABS browse returned 0 items (stale paths were cleared above)
|
||||
// NOTE: Do NOT call when ABS filtering is active but no non-ABS providers exist,
|
||||
// as library_items API would return all audiobooks bypassing the library filter
|
||||
final shouldFetchFromApi = enabledLibraries == null ||
|
||||
enabledLibraries.isEmpty ||
|
||||
allAudiobooks.isEmpty || // Fall back if browse got nothing
|
||||
(nonAbsProviders != null && nonAbsProviders.isNotEmpty);
|
||||
|
||||
if (shouldFetchFromApi) {
|
||||
|
||||
@@ -154,7 +154,8 @@ class SendspinService {
|
||||
}
|
||||
|
||||
/// Connect with a specific WebSocket URL (called by provider with local_ws_url)
|
||||
Future<bool> connectWithUrl(String wsUrl) async {
|
||||
/// If useProxyAuth is true, will authenticate with MA token (needed for proxy connections)
|
||||
Future<bool> connectWithUrl(String wsUrl, {bool useProxyAuth = false}) async {
|
||||
if (_isDisposed) return false;
|
||||
if (_state == SendspinConnectionState.connected) return true;
|
||||
|
||||
@@ -173,7 +174,7 @@ class SendspinService {
|
||||
|
||||
_logger.log('Sendspin: Connecting with URL: $wsUrl');
|
||||
|
||||
final connected = await _tryConnect(wsUrl, timeout: const Duration(seconds: 5));
|
||||
final connected = await _tryConnect(wsUrl, timeout: const Duration(seconds: 5), useProxyAuth: useProxyAuth);
|
||||
|
||||
if (!connected) {
|
||||
_updateState(SendspinConnectionState.error);
|
||||
|
||||
@@ -178,6 +178,9 @@ class SettingsService {
|
||||
// Podcast Cover Cache (iTunes URLs for high-res artwork)
|
||||
static const String _keyPodcastCoverCache = 'podcast_cover_cache';
|
||||
|
||||
// Remote Access Settings
|
||||
static const String _keyRemoteAccessId = 'remote_access_id';
|
||||
|
||||
static Future<String?> getServerUrl() async {
|
||||
final prefs = await _getPrefs();
|
||||
return prefs.getString(_keyServerUrl);
|
||||
@@ -265,6 +268,22 @@ class SettingsService {
|
||||
await SecureStorageService.clearAuthCredentials();
|
||||
}
|
||||
|
||||
// Get Remote Access ID for remote connections
|
||||
static Future<String?> getRemoteAccessId() async {
|
||||
final prefs = await _getPrefs();
|
||||
return prefs.getString(_keyRemoteAccessId);
|
||||
}
|
||||
|
||||
// Set Remote Access ID for remote connections
|
||||
static Future<void> setRemoteAccessId(String? id) async {
|
||||
final prefs = await _getPrefs();
|
||||
if (id == null || id.isEmpty) {
|
||||
await prefs.remove(_keyRemoteAccessId);
|
||||
} else {
|
||||
await prefs.setString(_keyRemoteAccessId, id);
|
||||
}
|
||||
}
|
||||
|
||||
// Get username for authentication
|
||||
static Future<String?> getUsername() async {
|
||||
final prefs = await _getPrefs();
|
||||
|
||||
@@ -505,13 +505,11 @@ class SyncService with ChangeNotifier {
|
||||
/// Empty enabledProviderIds = all providers enabled, show everything
|
||||
/// Items without source tracking are HIDDEN (strict mode) to ensure accurate filtering
|
||||
List<Album> getAlbumsFilteredByProviders(Set<String> enabledProviderIds) {
|
||||
// Empty set = all providers enabled, show everything
|
||||
if (enabledProviderIds.isEmpty) {
|
||||
return _cachedAlbums;
|
||||
}
|
||||
return _cachedAlbums.where((album) {
|
||||
final sources = _albumSourceProviders[album.itemId];
|
||||
// STRICT MODE: Hide items without tracking to ensure accurate filtering
|
||||
if (sources == null || sources.isEmpty) return false;
|
||||
return sources.any((s) => enabledProviderIds.contains(s));
|
||||
}).toList();
|
||||
@@ -524,7 +522,6 @@ class SyncService with ChangeNotifier {
|
||||
}
|
||||
return _cachedArtists.where((artist) {
|
||||
final sources = _artistSourceProviders[artist.itemId];
|
||||
// STRICT MODE: Hide items without tracking
|
||||
if (sources == null || sources.isEmpty) return false;
|
||||
return sources.any((s) => enabledProviderIds.contains(s));
|
||||
}).toList();
|
||||
@@ -578,4 +575,25 @@ class SyncService with ChangeNotifier {
|
||||
/// Check if we have data available (from cache or sync)
|
||||
bool get hasData => _cachedAlbums.isNotEmpty || _cachedArtists.isNotEmpty ||
|
||||
_cachedAudiobooks.isNotEmpty || _cachedPlaylists.isNotEmpty;
|
||||
|
||||
/// Update cached albums with sorted data from provider
|
||||
/// Used when sort order changes - preserves source provider tracking
|
||||
void updateCachedAlbums(List<Album> albums) {
|
||||
_cachedAlbums = albums;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Update cached artists with sorted data from provider
|
||||
/// Used when sort order changes - preserves source provider tracking
|
||||
void updateCachedArtists(List<Artist> artists) {
|
||||
_cachedArtists = artists;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Update cached playlists with sorted data from provider
|
||||
/// Used when sort order changes - preserves source provider tracking
|
||||
void updateCachedPlaylists(List<Playlist> playlists) {
|
||||
_cachedPlaylists = playlists;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ class AppTheme {
|
||||
foregroundColor: scheme.onBackground,
|
||||
iconTheme: IconThemeData(color: scheme.onBackground),
|
||||
),
|
||||
cardTheme: CardTheme(
|
||||
cardTheme: CardThemeData(
|
||||
color: scheme.surface,
|
||||
elevation: 2,
|
||||
),
|
||||
@@ -91,7 +91,7 @@ class AppTheme {
|
||||
foregroundColor: scheme.onBackground,
|
||||
iconTheme: IconThemeData(color: scheme.onBackground),
|
||||
),
|
||||
cardTheme: CardTheme(
|
||||
cardTheme: CardThemeData(
|
||||
color: scheme.surface,
|
||||
elevation: 2,
|
||||
),
|
||||
|
||||
@@ -530,10 +530,9 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
child: widget.child,
|
||||
),
|
||||
// Global persistent bottom navigation bar - positioned at bottom
|
||||
// Hide when: not connected, no player selected, OR showing welcome screen
|
||||
// For first-time users, selectedPlayer becomes non-null at the same time
|
||||
// as shouldShowWelcomeBackdrop becomes true, preventing any gap.
|
||||
if (isConnected && hasSelectedPlayer && !shouldShowWelcomeBackdrop)
|
||||
// Hide when: not connected OR showing welcome screen
|
||||
// Always show when connected so users can access Settings/Library even without a player
|
||||
if (isConnected && !shouldShowWelcomeBackdrop)
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
|
||||
@@ -1,10 +1,24 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// A scrollbar that shows a letter popup when dragging, for fast navigation
|
||||
/// through alphabetically sorted lists.
|
||||
/// Display mode for the scrollbar popup indicator
|
||||
enum ScrollbarDisplayMode {
|
||||
/// Show first letter of item name (A, B, C, #)
|
||||
letter,
|
||||
/// Show year (2024, 2023, etc.)
|
||||
year,
|
||||
/// Show count number
|
||||
count,
|
||||
/// Hide the popup (just show scrollbar thumb)
|
||||
none,
|
||||
}
|
||||
|
||||
/// A scrollbar that shows a contextual popup when dragging, for fast navigation
|
||||
/// through sorted lists.
|
||||
///
|
||||
/// Scrolls PROPORTIONALLY (like a normal scrollbar) and shows which letter
|
||||
/// section you're currently in via a popup indicator.
|
||||
/// Scrolls PROPORTIONALLY (like a normal scrollbar) and shows contextual info
|
||||
/// about the current position via a popup indicator. The popup content adapts
|
||||
/// based on the display mode (letters for alphabetical, years for date sorts,
|
||||
/// counts for play count sorts).
|
||||
class LetterScrollbar extends StatefulWidget {
|
||||
/// The scrollable child widget (ListView, GridView, etc.)
|
||||
final Widget child;
|
||||
@@ -16,6 +30,14 @@ class LetterScrollbar extends StatefulWidget {
|
||||
/// Each item's first character is used to determine the letter shown in the popup.
|
||||
final List<String> items;
|
||||
|
||||
/// Display mode for the popup indicator
|
||||
final ScrollbarDisplayMode displayMode;
|
||||
|
||||
/// Custom display labels for each item (optional).
|
||||
/// When provided, these are shown in the popup instead of extracting letters.
|
||||
/// Length must match [items] if provided.
|
||||
final List<String>? displayLabels;
|
||||
|
||||
/// Callback when user taps/drags to a specific index.
|
||||
final void Function(int index)? onScrollToIndex;
|
||||
|
||||
@@ -45,6 +67,8 @@ class LetterScrollbar extends StatefulWidget {
|
||||
required this.child,
|
||||
required this.controller,
|
||||
required this.items,
|
||||
this.displayMode = ScrollbarDisplayMode.letter,
|
||||
this.displayLabels,
|
||||
this.onScrollToIndex,
|
||||
this.onDragStateChanged,
|
||||
this.itemExtent,
|
||||
@@ -85,7 +109,7 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
if ((newFraction - _scrollFraction).abs() > 0.01) {
|
||||
setState(() {
|
||||
_scrollFraction = newFraction;
|
||||
_currentLetter = _getLetterAtFraction(newFraction);
|
||||
_currentLetter = _getLabelAtFraction(newFraction);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -102,15 +126,32 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
return '#';
|
||||
}
|
||||
|
||||
/// Get the letter at a given scroll fraction (0.0 to 1.0)
|
||||
String _getLetterAtFraction(double fraction) {
|
||||
/// Get the display label at a given scroll fraction (0.0 to 1.0)
|
||||
String _getLabelAtFraction(double fraction) {
|
||||
if (widget.items.isEmpty) return '';
|
||||
|
||||
final index = (fraction * (widget.items.length - 1)).round().clamp(0, widget.items.length - 1);
|
||||
|
||||
// Use custom display labels if provided
|
||||
if (widget.displayLabels != null && index < widget.displayLabels!.length) {
|
||||
return widget.displayLabels![index];
|
||||
}
|
||||
|
||||
// Otherwise extract from items based on display mode
|
||||
if (index < widget.items.length) {
|
||||
final item = widget.items[index];
|
||||
if (item.isNotEmpty) {
|
||||
return _normalizeToLetter(item[0]);
|
||||
switch (widget.displayMode) {
|
||||
case ScrollbarDisplayMode.letter:
|
||||
return _normalizeToLetter(item[0]);
|
||||
case ScrollbarDisplayMode.year:
|
||||
case ScrollbarDisplayMode.count:
|
||||
// For year/count modes, the item itself should be the display value
|
||||
return item;
|
||||
case ScrollbarDisplayMode.none:
|
||||
// No popup shown, return empty
|
||||
return '';
|
||||
}
|
||||
}
|
||||
}
|
||||
return '';
|
||||
@@ -154,7 +195,7 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
final fraction = clampedPosition / effectiveHeight;
|
||||
|
||||
// Get letter for display
|
||||
final letter = _getLetterAtFraction(fraction);
|
||||
final letter = _getLabelAtFraction(fraction);
|
||||
|
||||
// Scroll proportionally
|
||||
final maxScroll = widget.controller.position.maxScrollExtent;
|
||||
@@ -170,6 +211,54 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
widget.controller.jumpTo(targetScroll);
|
||||
}
|
||||
|
||||
/// Build the popup bubble with appropriate size and styling based on display mode
|
||||
Widget _buildPopupBubble(ColorScheme colorScheme) {
|
||||
// Determine size and font based on content length and display mode
|
||||
final double width;
|
||||
final double height;
|
||||
final double fontSize;
|
||||
|
||||
switch (widget.displayMode) {
|
||||
case ScrollbarDisplayMode.letter:
|
||||
case ScrollbarDisplayMode.none: // Fallback (none won't actually reach here)
|
||||
width = 56;
|
||||
height = 56;
|
||||
fontSize = 28;
|
||||
break;
|
||||
case ScrollbarDisplayMode.year:
|
||||
width = 72;
|
||||
height = 48;
|
||||
fontSize = 22;
|
||||
break;
|
||||
case ScrollbarDisplayMode.count:
|
||||
// Dynamic width based on count length
|
||||
final labelLength = _currentLetter.length;
|
||||
width = labelLength <= 2 ? 56 : (labelLength <= 4 ? 72 : 88);
|
||||
height = 48;
|
||||
fontSize = labelLength <= 3 ? 22 : 18;
|
||||
break;
|
||||
}
|
||||
|
||||
return Material(
|
||||
elevation: 4,
|
||||
color: colorScheme.primaryContainer,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Container(
|
||||
width: width,
|
||||
height: height,
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
_currentLetter,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onPrimaryContainer,
|
||||
fontSize: fontSize,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
@@ -236,32 +325,15 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
),
|
||||
),
|
||||
|
||||
// The letter popup bubble
|
||||
if (_isDragging && _currentLetter.isNotEmpty)
|
||||
// The popup bubble (letter, year, or count) - hidden when displayMode is none
|
||||
if (_isDragging && _currentLetter.isNotEmpty && widget.displayMode != ScrollbarDisplayMode.none)
|
||||
Positioned(
|
||||
right: 48,
|
||||
top: (_dragPosition - 28).clamp(
|
||||
0.0,
|
||||
(context.findRenderObject() as RenderBox?)?.size.height ?? 500 - 56 - widget.bottomPadding,
|
||||
),
|
||||
child: Material(
|
||||
elevation: 4,
|
||||
color: colorScheme.primaryContainer,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Container(
|
||||
width: 56,
|
||||
height: 56,
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
_currentLetter,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onPrimaryContainer,
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
child: _buildPopupBubble(colorScheme),
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
+86
-67
@@ -5,23 +5,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: _fe_analyzer_shared
|
||||
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
|
||||
sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "72.0.0"
|
||||
_macros:
|
||||
dependency: transitive
|
||||
description: dart
|
||||
source: sdk
|
||||
version: "0.3.2"
|
||||
version: "91.0.0"
|
||||
analyzer:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: analyzer
|
||||
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
|
||||
sha256: f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.7.0"
|
||||
version: "8.4.1"
|
||||
archive:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -90,10 +85,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: build
|
||||
sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
|
||||
sha256: "7174c5d84b0fed00a1f5e7543597b35d67560465ae3d909f0889b8b20419d5e3"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.1"
|
||||
version: "3.0.1"
|
||||
build_config:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -114,26 +109,26 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: build_resolvers
|
||||
sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
|
||||
sha256: "82730bf3d9043366ba8c02e4add05842a10739899520a6a22ddbd22d333bd5bb"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.2"
|
||||
version: "3.0.1"
|
||||
build_runner:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: build_runner
|
||||
sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
|
||||
sha256: "32c6b3d172f1f46b7c4df6bc4a47b8d88afb9e505dd4ace4af80b3c37e89832b"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.13"
|
||||
version: "2.6.1"
|
||||
build_runner_core:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: build_runner_core
|
||||
sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
|
||||
sha256: "4b188774b369104ad96c0e4ca2471e5162f0566ce277771b179bed5eabf2d048"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "7.3.2"
|
||||
version: "9.2.1"
|
||||
built_collection:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -178,10 +173,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: characters
|
||||
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
|
||||
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.0"
|
||||
version: "1.4.0"
|
||||
charcode:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -210,10 +205,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: clock
|
||||
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
|
||||
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
version: "1.1.2"
|
||||
code_builder:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -226,10 +221,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: collection
|
||||
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
|
||||
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.18.0"
|
||||
version: "1.19.1"
|
||||
convert:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -258,10 +253,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: dart_style
|
||||
sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
|
||||
sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.3.7"
|
||||
version: "3.1.3"
|
||||
dart_webrtc:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: dart_webrtc
|
||||
sha256: "51bcda4ba5d7dd9e65a309244ce3ac0b58025e6e1f6d7442cee4cd02134ef65f"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.6.0"
|
||||
device_info_plus:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -282,18 +285,18 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: drift
|
||||
sha256: af3941e4d544727b2eb80590eb64e9cb8d77cd68c7690265502ea6a2427aa621
|
||||
sha256: "5ea2f718558c0b31d4b8c36a3d8e5b7016f1265f46ceb5a5920e16117f0c0d6a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.23.1"
|
||||
version: "2.30.1"
|
||||
drift_dev:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: drift_dev
|
||||
sha256: fa98fdbb7303a1b5b2dc110cb516eda2253a5d291680f8cbc72b1af24099f7f9
|
||||
sha256: "892dfb5d69d9e604bdcd102a9376de8b41768cf7be93fd26b63cfc4d8f91ad5f"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.23.1"
|
||||
version: "2.30.1"
|
||||
drift_flutter:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -314,10 +317,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: fake_async
|
||||
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
|
||||
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.1"
|
||||
version: "1.3.3"
|
||||
ffi:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -466,6 +469,14 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_webrtc:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_webrtc
|
||||
sha256: "71a38363a5b50603e405c275f30de2eb90f980b0cc94b0e1e9d8b9d6a6b03bf0"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
frontend_server_client:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -526,10 +537,10 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: intl
|
||||
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
|
||||
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.19.0"
|
||||
version: "0.20.2"
|
||||
io:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -582,26 +593,26 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker
|
||||
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
|
||||
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "10.0.5"
|
||||
version: "11.0.2"
|
||||
leak_tracker_flutter_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_flutter_testing
|
||||
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
|
||||
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.5"
|
||||
version: "3.0.10"
|
||||
leak_tracker_testing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: leak_tracker_testing
|
||||
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
|
||||
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
version: "3.0.2"
|
||||
lints:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -610,6 +621,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.0"
|
||||
logger:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: logger
|
||||
sha256: a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.6.2"
|
||||
logging:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -618,22 +637,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.0"
|
||||
macros:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: macros
|
||||
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.1.2-main.4"
|
||||
matcher:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: matcher
|
||||
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
|
||||
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.12.16+1"
|
||||
version: "0.12.17"
|
||||
material_color_utilities:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -654,10 +665,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: meta
|
||||
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
|
||||
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.15.0"
|
||||
version: "1.17.0"
|
||||
mime:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -718,10 +729,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path
|
||||
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
|
||||
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.9.0"
|
||||
version: "1.9.1"
|
||||
path_parsing:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -950,15 +961,15 @@ packages:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.99"
|
||||
version: "0.0.0"
|
||||
source_gen:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: source_gen
|
||||
sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
|
||||
sha256: "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.5.0"
|
||||
version: "4.2.0"
|
||||
source_span:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -1027,26 +1038,26 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: sqlparser
|
||||
sha256: "4cad4b2c5f63dc9ea1a8dcffb58cf762322bea5dd8836870164a65e913bdae41"
|
||||
sha256: f52f5d5649dcc13ed198c4176ddef74bf6851c30f4f31603f1b37788695b93e2
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.40.0"
|
||||
version: "0.43.0"
|
||||
stack_trace:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stack_trace
|
||||
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
|
||||
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.11.1"
|
||||
version: "1.12.1"
|
||||
stream_channel:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stream_channel
|
||||
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
|
||||
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.2"
|
||||
version: "2.1.4"
|
||||
stream_transform:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -1083,10 +1094,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
|
||||
sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.7.2"
|
||||
version: "0.7.7"
|
||||
timing:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -1171,10 +1182,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vector_math
|
||||
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
|
||||
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.4"
|
||||
version: "2.2.0"
|
||||
vm_service:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -1207,6 +1218,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.0"
|
||||
webrtc_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: webrtc_interface
|
||||
sha256: "2e604a31703ad26781782fb14fa8a4ee621154ee2c513d2b9938e486fa695233"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.0"
|
||||
win32:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -1248,5 +1267,5 @@ packages:
|
||||
source: hosted
|
||||
version: "3.1.3"
|
||||
sdks:
|
||||
dart: ">=3.5.0 <4.0.0"
|
||||
dart: ">=3.9.0 <4.0.0"
|
||||
flutter: ">=3.24.0"
|
||||
|
||||
+4
-1
@@ -11,7 +11,7 @@ dependencies:
|
||||
sdk: flutter
|
||||
flutter_localizations:
|
||||
sdk: flutter
|
||||
intl: ^0.19.0
|
||||
intl: ^0.20.2
|
||||
|
||||
# UI
|
||||
material_design_icons_flutter: ^7.0.7296
|
||||
@@ -27,6 +27,9 @@ dependencies:
|
||||
http: ^1.1.0
|
||||
cached_network_image: ^3.3.1
|
||||
|
||||
# WebRTC (for remote access)
|
||||
flutter_webrtc: ^1.2.1
|
||||
|
||||
# Storage
|
||||
shared_preferences: ^2.2.2
|
||||
flutter_secure_storage: ^9.2.2
|
||||
|
||||
Reference in New Issue
Block a user