astra/astra-mobile
1
0
Fork 0
mirror of https://github.com/Boof2015/astra-mobile.git synced 2026-08-17 11:12:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix now playing swipe softlock

Browse Source
This commit is contained in:
Boof2015
2026-07-28 14:08:15 -04:00
parent 4c40af970b
commit f00cd0abcd
8 changed files with 328 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/astra-library-scanner/android/src/androidTest/java/expo/modules/astralibraryscanner/data/CatalogMigrationTest.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class CatalogMigrationTest {
).use { cursor ->
assertTrue(cursor.moveToFirst())
assertEquals("jellyfin:2", cursor.getString(0))
assertEquals(CURRENT_ARTIST_CREDIT_VERSION, cursor.getInt(1))
assertEquals(INITIAL_MULTI_ARTIST_CREDIT_VERSION, cursor.getInt(1))
assertTrue(cursor.moveToNext())
assertEquals("local:1", cursor.getString(0))
assertEquals(LEGACY_ARTIST_CREDIT_VERSION, cursor.getInt(1))
modules/astra-library-scanner/android/src/main/java/expo/modules/astralibraryscanner/data/ArtistCredits.kt
+6 -8
View File
@@ -10,8 +10,12 @@ import com.google.android.exoplayer2.metadata.id3.TextInformationFrame
import java.util.concurrent.TimeUnit
import org.json.JSONArray
internal const val CURRENT_ARTIST_CREDIT_VERSION = 2
internal const val LEGACY_ARTIST_CREDIT_VERSION = 1
internal const val INITIAL_MULTI_ARTIST_CREDIT_VERSION = 2
// Version 3 removes synthesized ampersands from stored display strings.
// Keeping this independent of the Room schema version lets existing local
// version-2 catalogs use the normal stale-source full-reindex path.
internal const val CURRENT_ARTIST_CREDIT_VERSION = 3
internal data class ArtistCreditNames(
val artists: List<String> = emptyList(),
@@ -33,13 +37,7 @@ internal fun normalizeArtistNames(values: Iterable<String?>): List<String> {
}
internal fun formatArtistNames(values: Iterable<String?>): String {
val names = normalizeArtistNames(values)
return when (names.size) {
0 -> ""
1 -> names[0]
2 -> "${names[0]} & ${names[1]}"
else -> "${names.dropLast(1).joinToString(", ")} & ${names.last()}"
}
return normalizeArtistNames(values).joinToString(", ")
}
internal fun serializeArtistNames(values: Iterable<String?>): String? {
modules/astra-library-scanner/android/src/test/java/expo/modules/astralibraryscanner/data/ArtistCreditsTest.kt
+3 -2
View File
@@ -16,8 +16,9 @@ class ArtistCreditsTest {
assertEquals(listOf("Earth, Wind & Fire", "The Emotions"), credits.artists)
assertEquals(listOf("Curator One", "Curator Two"), credits.albumArtists)
assertEquals("Earth, Wind & Fire & The Emotions", formatArtistNames(credits.artists))
assertEquals("Curator One & Curator Two", formatArtistNames(credits.albumArtists))
assertEquals("Earth, Wind & Fire, The Emotions", formatArtistNames(credits.artists))
assertEquals("Curator One, Curator Two", formatArtistNames(credits.albumArtists))
assertEquals("1, 2, 3", formatArtistNames(listOf("1", "2", "3")))
}
@Test