Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
Chaphasilor committed Dec 12, 2024
2 parents 804196e + 107d336 commit 122cb0e
Show file tree
Hide file tree
Showing 33 changed files with 2,339 additions and 484 deletions.
13 changes: 0 additions & 13 deletions .github/FUNDING.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ app.*.symbols
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
!/dev/ci/**/Gemfile.lock
!.vscode/settings.json
!.vscode/settings.json
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/43.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
New features and bug fixes. Full changelog at https://github.com/jmshrv/finamp/releases/tag/0.6.21
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/44.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed a bug where the artist screen would show albums from the whole library instead of the specific artist.
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/45.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed a bug where the artist screen would show albums from the whole library instead of the specific artist.
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/46.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Reverted to Android API 33 since 34 seems to break background playback
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/47.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated translations, rebuilt with a newer version of Flutter. Changes are now only happening on the redesign beta, check it out on GitHub!
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/49.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated dependencies, fixed F-Droid build. Changes are now only happening on the redesign beta, check it out on GitHub!
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ PODS:
- SDWebImage/Core (5.18.2)
- share_plus (0.0.1):
- Flutter
- sqflite (0.0.3):
- sqflite_darwin (0.0.4):
- Flutter
- FlutterMacOS
- SwiftyGif (5.4.4)
Expand Down
1 change: 1 addition & 0 deletions lib/components/MusicScreen/music_screen_drawer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
import 'package:get_it/get_it.dart';
import 'package:url_launcher/url_launcher.dart';

import '../../screens/downloads_screen.dart';
import '../../screens/logs_screen.dart';
Expand Down
61 changes: 60 additions & 1 deletion lib/l10n/app_cs.arb
Original file line number Diff line number Diff line change
Expand Up @@ -527,5 +527,64 @@
"confirm": "Potvrdit",
"@confirm": {},
"noMusicLibrariesBody": "Finamp nenalezl žádné hudební knihovny. Ujistěte se prosím, že váš server Jellyfin obsahuje alespoň jednu knihovnu s typem obsahu nastaveným na „Hudba“.",
"@noMusicLibrariesBody": {}
"@noMusicLibrariesBody": {},
"swipeInsertQueueNextSubtitle": "Zapněte pro vložení skladby jako další položku do fronty po posunutí prstem na skladbě v seznamu skladeb, místo jejího přiřazení na konec.",
"@swipeInsertQueueNextSubtitle": {},
"interactions": "Interakce",
"@interactions": {},
"swipeInsertQueueNext": "Přehrát posunutou skladbu jako další",
"@swipeInsertQueueNext": {},
"redesignBeta": "Vyzkoušejte beta verzi",
"@redesignBeta": {},
"playbackOrderShuffledTooltip": "Náhodně. Klepnutím přepnete.",
"@playbackOrderShuffledTooltip": {},
"playbackOrderLinearTooltip": "Přehrávání v pořadí. Klepnutím přepnete.",
"@playbackOrderLinearTooltip": {},
"loopModeAllTooltip": "Opakování všeho. Klepnutím přepnete.",
"@loopModeAllTooltip": {},
"loopModeOneTooltip": "Opakování jedné. Klepnutím přepnete.",
"@loopModeOneTooltip": {},
"loopModeNoneTooltip": "Bez opakování. Klepnutím přepnete.",
"@loopModeNoneTooltip": {},
"skipToPrevious": "Přeskočit na předchozí skladbu",
"@skipToPrevious": {},
"skipToNext": "Přeskočit na další skladbu",
"@skipToNext": {},
"togglePlayback": "Přepnout přehrávání",
"@togglePlayback": {},
"downloadArtist": "Stáhnout všechna alba umělce {artist}",
"@downloadArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"shuffleArtist": "Přehrát náhodně všechna alba umělce {artist}",
"@shuffleArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"playArtist": "Přehrát všechna alba umělce {artist}",
"@playArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"deleteFromDevice": "Smazat ze zařízení",
"@deleteFromDevice": {},
"download": "Stáhnout",
"@download": {},
"sync": "Synchronizovat se serverem",
"@sync": {},
"about": "O aplikaci Finamp",
"@about": {}
}
93 changes: 80 additions & 13 deletions lib/l10n/app_de.arb
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
"@artist": {},
"bitrate": "Bitrate",
"@bitrate": {},
"emptyServerUrl": "Server Webadresse darf nicht leer sein",
"emptyServerUrl": "Server-URL darf nicht leer sein",
"@emptyServerUrl": {
"description": "Error message that shows when the user submits a login without a server URL"
},
"urlStartWithHttps": "Webadresse muss mit http:// oder https:// beginnen",
"urlStartWithHttps": "URL muss mit http:// oder https:// beginnen",
"@urlStartWithHttps": {
"description": "Error message that shows when the user submits a server URL that doesn't start with http:// or https:// (for example, ftp://0.0.0.0"
},
"urlTrailingSlash": "Webadresse darf keinen Schrägstrich am Ende enthalten",
"urlTrailingSlash": "URL darf keinen Schrägstrich am Ende enthalten",
"@urlTrailingSlash": {
"description": "Error message that shows when the user submits a server URL that ends with a trailing slash (for example, http://0.0.0.0/)"
},
Expand All @@ -39,7 +39,7 @@
},
"clear": "Entfernen",
"@clear": {},
"internalExternalIpExplanation": "Wenn du deinen Jellyfin Server aus der Ferne erreichen möchtest, benötigst du eine externe IP.\n\nWenn dein Server einen HTTP Port (80/443) benutzt, musst du keinen Port festlegen. Dies ist vermutlich der Fall wenn dein Server sich hinter einem Reverse Proxy befindet.",
"internalExternalIpExplanation": "Wenn du deinen Jellyfin Server aus der Ferne erreichen möchtest, benötigst du eine externe IP.\n\nWenn dein Server einen HTTP Port (80/443) benutzt, musst du keinen Port festlegen. Dies ist vermutlich der Fall wenn dein Server sich hinter einer Reverse Proxy befindet.",
"@internalExternalIpExplanation": {
"description": "Extra info for which IP to use for remote access, and info on whether or not the user needs to specify a port."
},
Expand Down Expand Up @@ -135,7 +135,7 @@
"@selectMusicLibraries": {
"description": "App bar title for library select screen"
},
"startupError": "Während dem Starten der App ist etwas schief gelaufen. Der Fehler war: {error}\n\nBitte öffne einen Issue auf github.com/UnicornsOnLSD/finamp mit einem Bildschirmfoto von dieser Seite. Wenn dieses Problem weiterhin besteht, kannst du deine App-Daten löschen, um die App zurückzusetzen.",
"startupError": "Während dem Starten der App ist etwas schief gelaufen. Der Fehler war: {error}\n\nBitte öffne ein Issue auf github.com/UnicornsOnLSD/finamp mit einem Bildschirmfoto von dieser Seite. Wenn dieses Problem weiterhin besteht, kannst du deine App-Daten löschen, um die App zurückzusetzen.",
"@startupError": {
"description": "The error message that shows when startup fails.",
"placeholders": {
Expand All @@ -145,7 +145,7 @@
}
}
},
"serverUrl": "Server Webadresse",
"serverUrl": "Server-URL",
"@serverUrl": {},
"shuffleAll": "Alle mischen",
"@shuffleAll": {},
Expand All @@ -167,7 +167,7 @@
"@runtime": {},
"downloadMissingImages": "Fehlende Bilder herunterladen",
"@downloadMissingImages": {},
"downloadErrors": "Downloadfehler",
"downloadErrors": "Download-Fehler",
"@downloadErrors": {},
"downloadCount": "{count,plural, =1{{count} Download} other{{count} Downloads}}",
"@downloadCount": {
Expand Down Expand Up @@ -209,7 +209,7 @@
}
}
},
"downloadErrorsTitle": "Downloadfehler",
"downloadErrorsTitle": "Download-Fehler",
"@downloadErrorsTitle": {},
"downloadedItemsImagesCount": "{downloadedItems}, {downloadedImages}",
"@downloadedItemsImagesCount": {
Expand Down Expand Up @@ -490,13 +490,13 @@
"@playCountInline": {},
"couldNotLoad": "{source, select, album{album} playlist{playlist} songMix{song mix} artistMix{artist mix} albumMix{album mix} favorites{favorites} allSongs{all songs} filteredList{songs} genre{genre} artist{artist} nextUpAlbum{album in next up} nextUpPlaylist{playlist in next up} nextUpArtist{artist in next up} other{}} konnte nicht geladen werden",
"@couldNotLoad": {},
"bufferDurationSubtitle": "Wie viele Sekunden der Player vorladen soll. Benötigt einen Neustart.",
"bufferDurationSubtitle": "Wie viel gepuffert werden soll, in Sekunden. Neustart erforderlich.",
"@bufferDurationSubtitle": {},
"language": "Sprache",
"@language": {},
"confirm": "Bestätigen",
"@confirm": {},
"showUncensoredLogMessage": "Dieses Protokoll enthält Ihre Anmeldeinformationen. Anzeigen?",
"showUncensoredLogMessage": "Dieses Protokoll enthält deine Anmeldedaten. Anzeigen?",
"@showUncensoredLogMessage": {},
"resetTabs": "Tabs zurücksetzen",
"@resetTabs": {},
Expand Down Expand Up @@ -528,8 +528,75 @@
"@syncDownloadedPlaylists": {},
"showFastScroller": "Schnellen Scroller anzeigen",
"@showFastScroller": {},
"swipeInsertQueueNext": "Gewischtes Lied als nächstes abspielen.",
"swipeInsertQueueNext": "Gewischtes Lied als Nächstes abspielen",
"@swipeInsertQueueNext": {},
"swipeInsertQueueNextSubtitle": "Aktivieren um das in der Liste nach links/rechts gewischte Lied als nächstes abzuspielen.",
"@swipeInsertQueueNextSubtitle": {}
"swipeInsertQueueNextSubtitle": "Aktivieren, um das in der Liste nach links/rechts gewischte Lied als Nächstes abzuspielen, statt es am Ende der Warteschlange einzufügen.",
"@swipeInsertQueueNextSubtitle": {},
"playNext": "Als Nächstes wiedergeben",
"@playNext": {
"description": "Popup menu item title for inserting an item into the play queue after the currently-playing item."
},
"noMusicLibrariesTitle": "Keine Musik-Bibliotheken",
"@noMusicLibrariesTitle": {
"description": "Title for message that shows on the views screen when no music libraries could be found."
},
"refresh": "AKTUALISIEREN",
"@refresh": {},
"noMusicLibrariesBody": "Finamp konnte keine Musikbibliotheken finden. Bitte stelle sicher, dass dein Jellyfin-Server mindestens eine Bibliothek mit dem Medientyp \"Musik\" enthält.",
"@noMusicLibrariesBody": {},
"interactions": "Interaktionen",
"@interactions": {},
"redesignBeta": "Teste die Beta",
"@redesignBeta": {},
"playbackOrderShuffledTooltip": "Mischen. Zum Umschalten tippen.",
"@playbackOrderShuffledTooltip": {},
"togglePlayback": "Wiedergabe umschalten",
"@togglePlayback": {},
"playbackOrderLinearTooltip": "Abspielen in Reihenfolge. Zum umschalten tippen.",
"@playbackOrderLinearTooltip": {},
"loopModeAllTooltip": "Wiederhole alle. Zum umschalten tippen.",
"@loopModeAllTooltip": {},
"loopModeOneTooltip": "Wiederhole einen. Zum umschalten tippen.",
"@loopModeOneTooltip": {},
"skipToNext": "Springe zum nächsten Lied",
"@skipToNext": {},
"skipToPrevious": "Springe zum vorherigen Lied",
"@skipToPrevious": {},
"playArtist": "Spiele alle Alben von {artist}",
"@playArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"shuffleArtist": "Spiele alle Alben von {artist} in zufälliger Reihenfolge",
"@shuffleArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"download": "Herunterladen",
"@download": {},
"about": "Über Finamp",
"@about": {},
"downloadArtist": "Lade alle Alben von {artist} herunter",
"@downloadArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"loopModeNoneTooltip": "Wiederholt nicht. Zum umschalten tippen.",
"@loopModeNoneTooltip": {},
"deleteFromDevice": "Vom Gerät Löschen",
"@deleteFromDevice": {},
"sync": "Mit Server synchronisieren",
"@sync": {}
}
61 changes: 60 additions & 1 deletion lib/l10n/app_es.arb
Original file line number Diff line number Diff line change
Expand Up @@ -527,5 +527,64 @@
"showFastScroller": "Mostrar desplazamiento rápido",
"@showFastScroller": {},
"syncDownloadedPlaylists": "Sincroniza las listas de reproducción descargadas",
"@syncDownloadedPlaylists": {}
"@syncDownloadedPlaylists": {},
"swipeInsertQueueNextSubtitle": "Permite insertar una canción como siguiente elemento en la cola cuando se desliza en la lista de reproducción en lugar de añadirla al final.",
"@swipeInsertQueueNextSubtitle": {},
"interactions": "Interacciones",
"@interactions": {},
"swipeInsertQueueNext": "Reproducir la siguiente canción al deslizarla",
"@swipeInsertQueueNext": {},
"redesignBeta": "Prueba la versión Beta",
"@redesignBeta": {},
"playbackOrderShuffledTooltip": "Mezclando. Toca para alternar.",
"@playbackOrderShuffledTooltip": {},
"playbackOrderLinearTooltip": "Reproducción en orden. Toca para alternar.",
"@playbackOrderLinearTooltip": {},
"loopModeAllTooltip": "Repitiendo todo. Toca para alternar.",
"@loopModeAllTooltip": {},
"loopModeOneTooltip": "En bucle. Toca para alternar.",
"@loopModeOneTooltip": {},
"loopModeNoneTooltip": "No se reproduce en bucle. Toca para alternar.",
"@loopModeNoneTooltip": {},
"skipToPrevious": "Saltar a la canción anterior",
"@skipToPrevious": {},
"skipToNext": "Saltar a la siguiente canción",
"@skipToNext": {},
"togglePlayback": "Alternar reproducción",
"@togglePlayback": {},
"playArtist": "Reproducir todos los álbumes de {artist}",
"@playArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"shuffleArtist": "Reproducir aleatoriamente todos los álbumes de {artist}",
"@shuffleArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"downloadArtist": "Descargar todos los álbumes de {artist}",
"@downloadArtist": {
"placeholders": {
"artist": {
"type": "String",
"example": "The Beatles"
}
}
},
"deleteFromDevice": "Eliminar del dispositivo",
"@deleteFromDevice": {},
"download": "Descargar",
"@download": {},
"sync": "Sincronizar con el servidor",
"@sync": {},
"about": "Acerca de Finamp",
"@about": {}
}
Loading

0 comments on commit 122cb0e

Please sign in to comment.