From f5ddfcc71cbee4b273b9d12421e65973a56c3b98 Mon Sep 17 00:00:00 2001 From: Aayush Babu Date: Mon, 28 Sep 2026 17:03:41 +0530 Subject: [PATCH 1/4] feat: improve paused track switching and mini-player gestures Make manual track changes start playback when the player is paused and replace mini-player swipe-to-dismiss behavior with track navigation. - Swipe left on the collapsed mini-player to play the next track. - Swipe right to play the previous track without dismissing or clearing the current queue. - Resume playback after switching tracks from the app controls, widget, and Wear OS controls when a destination track is available. - Preserve previous-track behavior: when the current track has played for more than 10 seconds, restart it without resuming playback. - Add PlaybackStateHolder tests for paused next/previous behavior and restarting the current track while paused. - Reduce Gradle workers from 6 to 2 and configure a 3 GB Kotlin daemon heap to reduce compiler memory pressure. - Remove an unnecessary safe call when reading the non-null album name in AI playlist generation. - Update the Gradle wrapper to 9.7.1. Validation: - PlaybackStateHolderTest passes. - Debug APK build succeeds. --- .../pixelplay/data/ai/AiPlaylistGenerator.kt | 2 +- .../pixelplay/data/service/MusicService.kt | 14 +++- .../data/service/wear/WearCommandReceiver.kt | 24 +++++- .../components/UnifiedPlayerSheetV2.kt | 14 ++-- ...er.kt => MiniPlayerSwipeGestureHandler.kt} | 63 ++++++++------- .../viewmodel/PlaybackStateHolder.kt | 38 +++++++++- .../viewmodel/PlaybackStateHolderTest.kt | 76 +++++++++++++++++++ gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 7 +- 9 files changed, 188 insertions(+), 54 deletions(-) rename app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/{MiniPlayerDismissGestureHandler.kt => MiniPlayerSwipeGestureHandler.kt} (73%) diff --git a/app/src/main/java/com/theveloper/pixelplay/data/ai/AiPlaylistGenerator.kt b/app/src/main/java/com/theveloper/pixelplay/data/ai/AiPlaylistGenerator.kt index 06b91dce44..ac7616200e 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/ai/AiPlaylistGenerator.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/ai/AiPlaylistGenerator.kt @@ -54,7 +54,7 @@ class AiPlaylistGenerator @Inject constructor( val genre = song.genre?.replace("\"", "'")?.take(15) ?: "?" if (index > 0) append(",\n") if (useExtendedFields) { - val album = song.album?.replace("\"", "'")?.take(25) ?: "?" + val album = song.album.replace("\"", "'").take(25) val dur = song.duration val fav = if (song.isFavorite) "1" else "0" append("""{"id":"${song.id}","t":"$title","a":"$artist","g":"$genre","al":"$album","d":$dur,"f":$fav,"s":$score}""") diff --git a/app/src/main/java/com/theveloper/pixelplay/data/service/MusicService.kt b/app/src/main/java/com/theveloper/pixelplay/data/service/MusicService.kt index adab461ca8..49b8124c86 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/service/MusicService.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/service/MusicService.kt @@ -1109,11 +1109,23 @@ class MusicService : MediaLibraryService() { widgetUpdateManager.requestFullUpdate(true) } PlayerActions.NEXT -> { + val shouldResumePlayback = + !player.playWhenReady && !player.isPlaying && player.hasNextMediaItem() player.seekToNext() + if (shouldResumePlayback) player.play() widgetUpdateManager.requestFullUpdate(true) } PlayerActions.PREVIOUS -> { - player.seekToPrevious() + val shouldRestartCurrent = player.currentPosition > 10_000L + val shouldResumePlayback = + !player.playWhenReady && !player.isPlaying && + !shouldRestartCurrent && player.hasPreviousMediaItem() + if (shouldRestartCurrent) { + player.seekTo(0) + } else { + player.seekToPrevious() + } + if (shouldResumePlayback) player.play() widgetUpdateManager.requestFullUpdate(true) } PlayerActions.FAVORITE -> { diff --git a/app/src/main/java/com/theveloper/pixelplay/data/service/wear/WearCommandReceiver.kt b/app/src/main/java/com/theveloper/pixelplay/data/service/wear/WearCommandReceiver.kt index 0b0ce27ee3..afe0c959ea 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/service/wear/WearCommandReceiver.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/service/wear/WearCommandReceiver.kt @@ -124,8 +124,28 @@ class WearCommandReceiver : WearableListenerService() { WearPlaybackCommand.TOGGLE_PLAY_PAUSE -> { if (controller.isPlaying) controller.pause() else controller.play() } - WearPlaybackCommand.NEXT -> controller.seekToNext() - WearPlaybackCommand.PREVIOUS -> controller.seekToPrevious() + WearPlaybackCommand.NEXT -> { + val shouldResumePlayback = + !controller.playWhenReady && + !controller.isPlaying && + controller.hasNextMediaItem() + controller.seekToNext() + if (shouldResumePlayback) controller.play() + } + WearPlaybackCommand.PREVIOUS -> { + val shouldRestartCurrent = controller.currentPosition > 10_000L + val shouldResumePlayback = + !controller.playWhenReady && + !controller.isPlaying && + !shouldRestartCurrent && + controller.hasPreviousMediaItem() + if (shouldRestartCurrent) { + controller.seekTo(0) + } else { + controller.seekToPrevious() + } + if (shouldResumePlayback) controller.play() + } WearPlaybackCommand.PLAY_QUEUE_INDEX -> { val queueIndex = command.queueIndex if (queueIndex == null) { diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt index d692ed9fd8..774d28dc9e 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt @@ -69,12 +69,12 @@ import com.theveloper.pixelplay.presentation.components.scoped.PlayerArtistNavig import com.theveloper.pixelplay.presentation.components.scoped.PlayerSheetPredictiveBackHandler import com.theveloper.pixelplay.presentation.components.scoped.QueueSheetRuntimeEffects import com.theveloper.pixelplay.presentation.components.scoped.SheetMotionController -import com.theveloper.pixelplay.presentation.components.scoped.miniPlayerDismissHorizontalGesture +import com.theveloper.pixelplay.presentation.components.scoped.miniPlayerSwipeHorizontalGesture import com.theveloper.pixelplay.presentation.components.scoped.playerSheetVerticalDragGesture import com.theveloper.pixelplay.presentation.components.scoped.rememberFullPlayerCompositionPolicy import com.theveloper.pixelplay.presentation.components.scoped.rememberCastSheetState import com.theveloper.pixelplay.presentation.components.scoped.rememberFullPlayerVisualState -import com.theveloper.pixelplay.presentation.components.scoped.rememberMiniPlayerDismissGestureHandler +import com.theveloper.pixelplay.presentation.components.scoped.rememberMiniPlayerSwipeGestureHandler import com.theveloper.pixelplay.presentation.components.scoped.rememberPrewarmFullPlayer import com.theveloper.pixelplay.presentation.components.scoped.rememberQueueSheetState import com.theveloper.pixelplay.presentation.components.scoped.rememberSheetActionHandlers @@ -465,14 +465,14 @@ fun UnifiedPlayerSheetV2( ) val hapticFeedback = LocalHapticFeedback.current - val miniDismissGestureHandler = rememberMiniPlayerDismissGestureHandler( + val miniPlayerSwipeGestureHandler = rememberMiniPlayerSwipeGestureHandler( scope = scope, density = density, hapticFeedback = hapticFeedback, offsetAnimatable = offsetAnimatable, screenWidthPx = screenWidthPx, - onDismissPlaylistAndShowUndo = { playerViewModel.dismissPlaylistAndShowUndo() }, - onDismissStarted = { playerViewModel.setMiniPlayerDismissing(true) } + onSwipeToNext = { playerViewModel.nextSong() }, + onSwipeToPrevious = { playerViewModel.previousSong() } ) QueueSheetRuntimeEffects( @@ -726,9 +726,9 @@ fun UnifiedPlayerSheetV2( placeable.placeRelative(xOffset, 0) } } - .miniPlayerDismissHorizontalGesture( + .miniPlayerSwipeHorizontalGesture( enabled = currentSheetContentState == PlayerSheetState.COLLAPSED, - handler = miniDismissGestureHandler + handler = miniPlayerSwipeGestureHandler ) .playerSheetVerticalDragGesture( enabled = sheetInteractionState.canDragSheet, diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerDismissGestureHandler.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt similarity index 73% rename from app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerDismissGestureHandler.kt rename to app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt index a745534cad..ad2285d9f4 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerDismissGestureHandler.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt @@ -23,27 +23,26 @@ import kotlinx.coroutines.launch import kotlin.math.abs import kotlin.math.sign -private enum class MiniDismissDragPhase { IDLE, TENSION, SNAPPING, FREE_DRAG } +private enum class MiniPlayerSwipeDragPhase { IDLE, TENSION, SNAPPING, FREE_DRAG } /** - * Keeps mini-player dismiss gesture behavior isolated from the sheet host. - * Logic is unchanged; this only centralizes gesture transitions and animation dispatch. + * Keeps mini-player track-swipe behavior isolated from the sheet host. */ -internal class MiniPlayerDismissGestureHandler( +internal class MiniPlayerSwipeGestureHandler( private val scope: CoroutineScope, private val density: Density, private val hapticFeedback: HapticFeedback, private val offsetAnimatable: Animatable, private val screenWidthPx: Float, - private val onDismissPlaylistAndShowUndo: () -> Unit, - private val onDismissStarted: () -> Unit = {} + private val onSwipeToNext: () -> Unit, + private val onSwipeToPrevious: () -> Unit ) { - private var dragPhase: MiniDismissDragPhase = MiniDismissDragPhase.IDLE + private var dragPhase: MiniPlayerSwipeDragPhase = MiniPlayerSwipeDragPhase.IDLE private var accumulatedDragX: Float = 0f private var offsetJob: Job? = null fun onDragStart() { - dragPhase = MiniDismissDragPhase.TENSION + dragPhase = MiniPlayerSwipeDragPhase.TENSION accumulatedDragX = 0f offsetJob?.cancel() offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { @@ -55,7 +54,7 @@ internal class MiniPlayerDismissGestureHandler( accumulatedDragX += dragAmount when (dragPhase) { - MiniDismissDragPhase.TENSION -> { + MiniPlayerSwipeDragPhase.TENSION -> { val snapThresholdPx = 100f * density.density if (abs(accumulatedDragX) < snapThresholdPx) { val maxTensionOffsetPx = 30f * density.density @@ -66,11 +65,11 @@ internal class MiniPlayerDismissGestureHandler( offsetAnimatable.snapTo(tensionOffset * accumulatedDragX.sign) } } else { - dragPhase = MiniDismissDragPhase.SNAPPING + dragPhase = MiniPlayerSwipeDragPhase.SNAPPING } } - MiniDismissDragPhase.SNAPPING -> { + MiniPlayerSwipeDragPhase.SNAPPING -> { hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress) offsetJob?.cancel() offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { @@ -82,10 +81,10 @@ internal class MiniPlayerDismissGestureHandler( ) ) } - dragPhase = MiniDismissDragPhase.FREE_DRAG + dragPhase = MiniPlayerSwipeDragPhase.FREE_DRAG } - MiniDismissDragPhase.FREE_DRAG -> { + MiniPlayerSwipeDragPhase.FREE_DRAG -> { offsetJob?.cancel() offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { offsetAnimatable.animateTo( @@ -98,26 +97,26 @@ internal class MiniPlayerDismissGestureHandler( } } - MiniDismissDragPhase.IDLE -> Unit + MiniPlayerSwipeDragPhase.IDLE -> Unit } } fun onDragEnd() { - dragPhase = MiniDismissDragPhase.IDLE + dragPhase = MiniPlayerSwipeDragPhase.IDLE offsetJob?.cancel() - val dismissThreshold = screenWidthPx * 0.4f - if (abs(accumulatedDragX) > dismissThreshold) { - onDismissStarted() - val targetDismissOffset = if (accumulatedDragX < 0) -screenWidthPx else screenWidthPx + val trackSwipeThreshold = screenWidthPx * 0.4f + if (abs(accumulatedDragX) > trackSwipeThreshold) { + val swipedLeft = accumulatedDragX < 0 + val targetOffset = if (swipedLeft) -screenWidthPx else screenWidthPx offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { offsetAnimatable.animateTo( - targetValue = targetDismissOffset, + targetValue = targetOffset, animationSpec = tween( durationMillis = 200, easing = FastOutSlowInEasing ) ) - onDismissPlaylistAndShowUndo() + if (swipedLeft) onSwipeToNext() else onSwipeToPrevious() offsetAnimatable.snapTo(0f) } } else { @@ -135,33 +134,33 @@ internal class MiniPlayerDismissGestureHandler( } @Composable -internal fun rememberMiniPlayerDismissGestureHandler( +internal fun rememberMiniPlayerSwipeGestureHandler( scope: CoroutineScope, density: Density, hapticFeedback: HapticFeedback, offsetAnimatable: Animatable, screenWidthPx: Float, - onDismissPlaylistAndShowUndo: () -> Unit, - onDismissStarted: () -> Unit -): MiniPlayerDismissGestureHandler { - val onDismissPlaylistAndShowUndoState = rememberUpdatedState(onDismissPlaylistAndShowUndo) - val onDismissStartedState = rememberUpdatedState(onDismissStarted) + onSwipeToNext: () -> Unit, + onSwipeToPrevious: () -> Unit +): MiniPlayerSwipeGestureHandler { + val onSwipeToNextState = rememberUpdatedState(onSwipeToNext) + val onSwipeToPreviousState = rememberUpdatedState(onSwipeToPrevious) return remember(scope, density, hapticFeedback, offsetAnimatable, screenWidthPx) { - MiniPlayerDismissGestureHandler( + MiniPlayerSwipeGestureHandler( scope = scope, density = density, hapticFeedback = hapticFeedback, offsetAnimatable = offsetAnimatable, screenWidthPx = screenWidthPx, - onDismissPlaylistAndShowUndo = { onDismissPlaylistAndShowUndoState.value() }, - onDismissStarted = { onDismissStartedState.value() } + onSwipeToNext = { onSwipeToNextState.value() }, + onSwipeToPrevious = { onSwipeToPreviousState.value() } ) } } -internal fun Modifier.miniPlayerDismissHorizontalGesture( +internal fun Modifier.miniPlayerSwipeHorizontalGesture( enabled: Boolean, - handler: MiniPlayerDismissGestureHandler + handler: MiniPlayerSwipeGestureHandler ): Modifier { if (!enabled) return this return this.pointerInput(enabled, handler) { diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolder.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolder.kt index 1ef56cb287..d475829da3 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolder.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolder.kt @@ -489,13 +489,32 @@ class PlaybackStateHolder @Inject constructor( fun previousSong() { val castSession = castStateHolder.castSession.value if (castSession != null && castSession.remoteMediaClient != null) { + val shouldResumePlayback = + !_stablePlayerState.value.playWhenReady && !_stablePlayerState.value.isPlaying && + castSession.remoteMediaClient?.mediaStatus?.let { status -> + val queueItems = status.queueItems ?: emptyList() + val currentIndex = queueItems.indexOfFirst { + it.itemId == status.currentItemId + } + currentIndex > 0 + } == true castStateHolder.castPlayer?.previous() + if (shouldResumePlayback) { + castStateHolder.castPlayer?.play() + } } else { val controller = activeLocalPlayer() - if (controller.currentPosition > 10000) { // 10 seconds - controller.seekTo(0) + val shouldRestartCurrent = controller.currentPosition > 10_000L + val shouldResumePlayback = + !controller.playWhenReady && !controller.isPlaying && + !shouldRestartCurrent && controller.hasPreviousMediaItem() + if (shouldRestartCurrent) { + controller.seekTo(0) } else { - controller.seekToPrevious() + controller.seekToPrevious() + } + if (shouldResumePlayback) { + controller.play() } } } @@ -503,9 +522,20 @@ class PlaybackStateHolder @Inject constructor( fun nextSong() { val castSession = castStateHolder.castSession.value if (castSession != null && castSession.remoteMediaClient != null) { + val shouldResumePlayback = + !_stablePlayerState.value.playWhenReady && !_stablePlayerState.value.isPlaying castStateHolder.castPlayer?.next() + if (shouldResumePlayback) { + castStateHolder.castPlayer?.play() + } } else { - activeLocalPlayer().seekToNext() + val player = activeLocalPlayer() + val shouldResumePlayback = + !player.playWhenReady && !player.isPlaying && player.hasNextMediaItem() + player.seekToNext() + if (shouldResumePlayback) { + player.play() + } } } diff --git a/app/src/test/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolderTest.kt b/app/src/test/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolderTest.kt index bd0bf60471..0b8b85ed21 100644 --- a/app/src/test/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolderTest.kt +++ b/app/src/test/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolderTest.kt @@ -10,7 +10,10 @@ import com.theveloper.pixelplay.data.service.player.DualPlayerEngine import io.mockk.every import io.mockk.coEvery import io.mockk.mockk +import io.mockk.verify +import io.mockk.verifyOrder import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.test.advanceUntilIdle import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Assertions.assertEquals @@ -102,6 +105,79 @@ class PlaybackStateHolderTest { assertSame(mainController, holder.mediaController) } + @Test + fun `next song resumes playback when paused and another item is available`() { + val holder = createHolder() + val controller = mockk(relaxed = true) + every { castStateHolder.castSession } returns MutableStateFlow(null) + every { controller.isConnected } returns true + every { controller.playWhenReady } returns false + every { controller.isPlaying } returns false + every { controller.hasNextMediaItem() } returns true + holder.setMediaController(controller) + + holder.nextSong() + + verifyOrder { + controller.seekToNext() + controller.play() + } + } + + @Test + fun `next song keeps paused playback when there is no next item`() { + val holder = createHolder() + val controller = mockk(relaxed = true) + every { castStateHolder.castSession } returns MutableStateFlow(null) + every { controller.isConnected } returns true + every { controller.playWhenReady } returns false + every { controller.isPlaying } returns false + every { controller.hasNextMediaItem() } returns false + holder.setMediaController(controller) + + holder.nextSong() + + verify(exactly = 0) { controller.play() } + } + + @Test + fun `previous song resumes playback when paused and another item is available`() { + val holder = createHolder() + val controller = mockk(relaxed = true) + every { castStateHolder.castSession } returns MutableStateFlow(null) + every { controller.isConnected } returns true + every { controller.currentPosition } returns 0L + every { controller.playWhenReady } returns false + every { controller.isPlaying } returns false + every { controller.hasPreviousMediaItem() } returns true + holder.setMediaController(controller) + + holder.previousSong() + + verifyOrder { + controller.seekToPrevious() + controller.play() + } + } + + @Test + fun `previous song keeps paused playback when restarting current item`() { + val holder = createHolder() + val controller = mockk(relaxed = true) + every { castStateHolder.castSession } returns MutableStateFlow(null) + every { controller.isConnected } returns true + every { controller.currentPosition } returns 11_000L + every { controller.playWhenReady } returns false + every { controller.isPlaying } returns false + every { controller.hasPreviousMediaItem() } returns true + holder.setMediaController(controller) + + holder.previousSong() + + verify(exactly = 1) { controller.seekTo(0) } + verify(exactly = 0) { controller.play() } + } + @Test fun `cold start snapshot only applies to the first matching occurrence`() = runTest { coEvery { userPreferencesRepository.getPlaybackQueueSnapshotOnce() } returns snapshot() diff --git a/gradle.properties b/gradle.properties index 83b824b752..3df0c043f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,8 +6,9 @@ org.gradle.configuration-cache=true # Adjusted to stay within 3GB limit and avoid thrashing # Increased heap to 4GB and Metaspace to 1024m to prevent memory exhaustion org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+ParallelRefParsingEnabled -org.gradle.workers.max=6 +org.gradle.workers.max=2 org.gradle.parallel=true +kotlin.daemon.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=512m androidx.benchmark.suppressErrors=EMULATOR,LOW-BATTERY,THERMAL @@ -29,4 +30,3 @@ android.builtInKotlin=true android.newDsl=true ksp.useKSP2=true - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 116d9acdb4..cbed6ec0cc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,9 +1,6 @@ +#Mon Sep 28 14:32:43 IST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip -networkTimeout=10000 -retries=0 -retryBackOffMs=500 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From acc497902a8dbc6cecdc30c36d6ce18ac307f906 Mon Sep 17 00:00:00 2001 From: Aayush Babu Date: Mon, 28 Sep 2026 17:55:58 +0530 Subject: [PATCH 2/4] Same as previous --- .../components/UnifiedPlayerSheetV2.kt | 15 +- .../scoped/MiniPlayerSwipeGestureHandler.kt | 128 +++--------------- message.txt | 89 ------------ 3 files changed, 20 insertions(+), 212 deletions(-) delete mode 100644 message.txt diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt index 774d28dc9e..51966278f5 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt @@ -92,7 +92,6 @@ import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import kotlin.math.abs import kotlin.math.roundToInt private data class PlayerUiSheetSliceV2( @@ -222,17 +221,9 @@ fun UnifiedPlayerSheetV2( val configuration = LocalConfiguration.current val scope = rememberCoroutineScope() - val offsetAnimatable = remember { Animatable(0f) } val screenWidthPx = remember(configuration, density) { with(density) { configuration.screenWidthDp.dp.toPx() } } - val dismissThresholdPx = remember(screenWidthPx) { screenWidthPx * 0.4f } - val swipeDismissProgress by remember(dismissThresholdPx) { - derivedStateOf { - if (dismissThresholdPx == 0f) 0f - else (abs(offsetAnimatable.value) / dismissThresholdPx).coerceIn(0f, 1f) - } - } val screenHeightPx = remember(configuration, density) { with(density) { configuration.screenHeightDp.dp.toPx() } @@ -402,7 +393,7 @@ fun UnifiedPlayerSheetV2( isNavBarHidden = isNavBarHidden, isPlaying = infrequentPlayerState.isPlaying, hasCurrentSong = infrequentPlayerState.currentSong != null, - swipeDismissProgress = swipeDismissProgress + swipeDismissProgress = 0f ) val currentBottomPadding = sheetVisualState.currentBottomPadding val baseBottomPadding = sheetVisualState.baseBottomPadding @@ -466,11 +457,8 @@ fun UnifiedPlayerSheetV2( val hapticFeedback = LocalHapticFeedback.current val miniPlayerSwipeGestureHandler = rememberMiniPlayerSwipeGestureHandler( - scope = scope, density = density, hapticFeedback = hapticFeedback, - offsetAnimatable = offsetAnimatable, - screenWidthPx = screenWidthPx, onSwipeToNext = { playerViewModel.nextSong() }, onSwipeToPrevious = { playerViewModel.previousSong() } ) @@ -652,7 +640,6 @@ fun UnifiedPlayerSheetV2( modifier = Modifier .fillMaxWidth() .graphicsLayer { - translationX = offsetAnimatable.value scaleX = miniAppearScale scaleY = visualOvershootScaleY.value * miniAppearScale alpha = miniReadyAlpha diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt index ad2285d9f4..7f7b628b84 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt @@ -1,11 +1,5 @@ package com.theveloper.pixelplay.presentation.components.scoped -import androidx.compose.animation.core.Animatable -import androidx.compose.animation.core.AnimationVector1D -import androidx.compose.animation.core.FastOutSlowInEasing -import androidx.compose.animation.core.Spring -import androidx.compose.animation.core.spring -import androidx.compose.animation.core.tween import androidx.compose.foundation.gestures.detectHorizontalDragGestures import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -15,143 +9,58 @@ import androidx.compose.ui.hapticfeedback.HapticFeedback import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.unit.Density -import androidx.compose.ui.util.lerp -import kotlinx.coroutines.CoroutineStart -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Job -import kotlinx.coroutines.launch +import androidx.compose.ui.unit.dp import kotlin.math.abs -import kotlin.math.sign -private enum class MiniPlayerSwipeDragPhase { IDLE, TENSION, SNAPPING, FREE_DRAG } +private const val TRACK_SWIPE_THRESHOLD_DP = 48f /** - * Keeps mini-player track-swipe behavior isolated from the sheet host. + * Changes tracks as soon as a horizontal swipe crosses the threshold without moving the mini-player. */ internal class MiniPlayerSwipeGestureHandler( - private val scope: CoroutineScope, - private val density: Density, + density: Density, private val hapticFeedback: HapticFeedback, - private val offsetAnimatable: Animatable, - private val screenWidthPx: Float, private val onSwipeToNext: () -> Unit, private val onSwipeToPrevious: () -> Unit ) { - private var dragPhase: MiniPlayerSwipeDragPhase = MiniPlayerSwipeDragPhase.IDLE - private var accumulatedDragX: Float = 0f - private var offsetJob: Job? = null + private val swipeThresholdPx = with(density) { TRACK_SWIPE_THRESHOLD_DP.dp.toPx() } + private var accumulatedDragX = 0f + private var trackChanged = false fun onDragStart() { - dragPhase = MiniPlayerSwipeDragPhase.TENSION accumulatedDragX = 0f - offsetJob?.cancel() - offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { - offsetAnimatable.stop() - } + trackChanged = false } fun onHorizontalDrag(dragAmount: Float) { + if (trackChanged) return accumulatedDragX += dragAmount + if (abs(accumulatedDragX) < swipeThresholdPx) return - when (dragPhase) { - MiniPlayerSwipeDragPhase.TENSION -> { - val snapThresholdPx = 100f * density.density - if (abs(accumulatedDragX) < snapThresholdPx) { - val maxTensionOffsetPx = 30f * density.density - val dragFraction = (abs(accumulatedDragX) / snapThresholdPx).coerceIn(0f, 1f) - val tensionOffset = lerp(0f, maxTensionOffsetPx, dragFraction) - offsetJob?.cancel() - offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { - offsetAnimatable.snapTo(tensionOffset * accumulatedDragX.sign) - } - } else { - dragPhase = MiniPlayerSwipeDragPhase.SNAPPING - } - } - - MiniPlayerSwipeDragPhase.SNAPPING -> { - hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress) - offsetJob?.cancel() - offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { - offsetAnimatable.animateTo( - targetValue = accumulatedDragX, - animationSpec = spring( - dampingRatio = 0.8f, - stiffness = Spring.StiffnessLow - ) - ) - } - dragPhase = MiniPlayerSwipeDragPhase.FREE_DRAG - } - - MiniPlayerSwipeDragPhase.FREE_DRAG -> { - offsetJob?.cancel() - offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { - offsetAnimatable.animateTo( - targetValue = accumulatedDragX, - animationSpec = spring( - dampingRatio = Spring.DampingRatioNoBouncy, - stiffness = Spring.StiffnessHigh - ) - ) - } - } - - MiniPlayerSwipeDragPhase.IDLE -> Unit - } + trackChanged = true + hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress) + if (accumulatedDragX < 0f) onSwipeToNext() else onSwipeToPrevious() } fun onDragEnd() { - dragPhase = MiniPlayerSwipeDragPhase.IDLE - offsetJob?.cancel() - val trackSwipeThreshold = screenWidthPx * 0.4f - if (abs(accumulatedDragX) > trackSwipeThreshold) { - val swipedLeft = accumulatedDragX < 0 - val targetOffset = if (swipedLeft) -screenWidthPx else screenWidthPx - offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { - offsetAnimatable.animateTo( - targetValue = targetOffset, - animationSpec = tween( - durationMillis = 200, - easing = FastOutSlowInEasing - ) - ) - if (swipedLeft) onSwipeToNext() else onSwipeToPrevious() - offsetAnimatable.snapTo(0f) - } - } else { - offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { - offsetAnimatable.animateTo( - targetValue = 0f, - animationSpec = spring( - dampingRatio = Spring.DampingRatioMediumBouncy, - stiffness = Spring.StiffnessMedium - ) - ) - } - } + accumulatedDragX = 0f + trackChanged = false } } @Composable internal fun rememberMiniPlayerSwipeGestureHandler( - scope: CoroutineScope, density: Density, hapticFeedback: HapticFeedback, - offsetAnimatable: Animatable, - screenWidthPx: Float, onSwipeToNext: () -> Unit, onSwipeToPrevious: () -> Unit ): MiniPlayerSwipeGestureHandler { val onSwipeToNextState = rememberUpdatedState(onSwipeToNext) val onSwipeToPreviousState = rememberUpdatedState(onSwipeToPrevious) - return remember(scope, density, hapticFeedback, offsetAnimatable, screenWidthPx) { + return remember(density, hapticFeedback) { MiniPlayerSwipeGestureHandler( - scope = scope, density = density, hapticFeedback = hapticFeedback, - offsetAnimatable = offsetAnimatable, - screenWidthPx = screenWidthPx, onSwipeToNext = { onSwipeToNextState.value() }, onSwipeToPrevious = { onSwipeToPreviousState.value() } ) @@ -163,14 +72,15 @@ internal fun Modifier.miniPlayerSwipeHorizontalGesture( handler: MiniPlayerSwipeGestureHandler ): Modifier { if (!enabled) return this - return this.pointerInput(enabled, handler) { + return pointerInput(enabled, handler) { detectHorizontalDragGestures( onDragStart = { handler.onDragStart() }, onHorizontalDrag = { change, dragAmount -> change.consume() handler.onHorizontalDrag(dragAmount) }, - onDragEnd = { handler.onDragEnd() } + onDragEnd = { handler.onDragEnd() }, + onDragCancel = { handler.onDragEnd() } ) } } diff --git a/message.txt b/message.txt deleted file mode 100644 index 167d87d489..0000000000 --- a/message.txt +++ /dev/null @@ -1,89 +0,0 @@ -PixelPlayer on  master [!] via  v9.5.1 via  v21.0.11 via  v2.4.0 -❯ ./gradlew assembleDebug --no-daemon -To honour the JVM settings for this build a single-use Daemon process will be forked. For more on this, please refer to https://docs.gradle.org/9.5.1/userguide/gradle_daemon.html#sec:disabling_the_daemon in the Gradle documentation. -Daemon will be stopped at the end of the build -Calculating task graph as no cached configuration is available for tasks: assembleDebug - -> Task :app:stripDebugDebugSymbols -Unable to strip the following libraries, packaging them as they are: libandroidx.graphics.path.so, libffmpegJNI.so, libtaglib.so, libtdjni.so. Run with --info option to learn more. - -> Task :wear:stripDebugDebugSymbols -Unable to strip the following libraries, packaging them as they are: libandroidx.graphics.path.so. Run with --info option to learn more. - -> Task :app:compileDebugKotlin -w: The argument '-Xannotation-default-target=param-property' is redundant for the current language version 2.4. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/data/database/PixelPlayDatabase.kt:294:34 The corresponding parameter in the supertype 'Migration' is named 'db'. This may cause problems when calling this function with named arguments. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/data/database/PixelPlayDatabase.kt:305:34 The corresponding parameter in the supertype 'Migration' is named 'db'. This may cause problems when calling this function with named arguments. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/data/network/navidrome/NavidromeApiService.kt:518:64 Expression is unused. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/data/remote/qqmusic/QQSignGenerator.kt:80:29 'var allowFileAccessFromFileURLs: Boolean' is deprecated. Deprecated in Java. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/data/remote/qqmusic/QQSignGenerator.kt:81:29 'var allowUniversalAccessFromFileURLs: Boolean' is deprecated. Deprecated in Java. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/data/repository/MediaStoreSongRepository.kt:385:45 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/data/telegram/TelegramRepository.kt:198:49 'when' expression over a subject of type 'Any?' is not exhaustive. Add a 'null' or 'else' branch. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/data/telegram/TelegramRepository.kt:222:53 'when' expression over a subject of type 'Any?' is not exhaustive. Add a 'null' or 'else' branch. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/AiMetadataSheet.kt:52:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/AiPlaylistSheet.kt:87:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/AlbumMultiSelectionOptionSheet.kt:66:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/CastBottomSheet.kt:336:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/CustomPresetsSheet.kt:54:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/DailyMixMenu.kt:31:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/EditSongSheet.kt:890:30 'fun rememberTransformableState(onTransformation: (Float, Offset, Float) -> Unit): TransformableState' is deprecated. Prefer remembering a TransformableState with a onTransformation lambda that takes the centroid. This centroid (if specified) is the point at which zooming or rotation should happen around which allows for more natural transformations. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/EditSongSheet.kt:1039:37 Condition is always 'true'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/GenreMultiSelectionOptionSheet.kt:68:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/GenreSortBottomSheet.kt:55:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/LibrarySortBottomSheet.kt:80:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt:457:26 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/MultiSelectionBottomSheet.kt:112:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/PlaylistBottomSheet.kt:67:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/PlaylistMultiSelectionBottomSheet.kt:91:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/ReorderTabsSheet.kt:109:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/ReorderTabsSheet.kt:124:41 'static field FLAG_IGNORE_GLOBAL_SETTING: Int' is deprecated. Deprecated in Java. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/RoundedParallaxCarousell.kt:578:59 Redundant call of conversion method. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/RoundedParallaxCarousell.kt:578:82 Redundant call of conversion method. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/SongInfoBottomSheet.kt:332:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/SongInfoBottomSheet.kt:777:61 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/SongPickerBottomSheet.kt:107:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/StreamingProviderSheet.kt:52:30 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/TimerOptionsBottomSheet.kt:78:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt:983:34 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/DeviceCapabilitiesScreen.kt:307:28 'val LocalClipboardManager: ProvidableCompositionLocal' is deprecated. Use LocalClipboard instead which supports suspend functions. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/HomeScreen.kt:255:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/HomeScreen.kt:256:26 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/LibraryMediaTabs.kt:223:39 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/LibraryMediaTabs.kt:534:39 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/LibraryScreen.kt:2657:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/LibrarySongsTab.kt:225:39 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/MashupScreen.kt:69:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/PlaylistDetailScreen.kt:818:26 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt:297:39 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/screens/StatsScreen.kt:220:13 Expression is unused. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/telegram/channel/TelegramChannelSearchSheet.kt:78:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/telegram/dashboard/TelegramDashboardScreen.kt:706:22 'fun rememberModalBottomSheetState(skipPartiallyExpanded: Boolean = ..., confirmValueChange: (SheetValue) -> Boolean = ...): SheetState' is deprecated. Use rememberBottomSheetState with Hidden initial value. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/AccountsViewModel.kt:117:67 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/AccountsViewModel.kt:118:62 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/AccountsViewModel.kt:119:66 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/AccountsViewModel.kt:120:56 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/AccountsViewModel.kt:121:70 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/AccountsViewModel.kt:122:68 No cast needed. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/CastStateHolder.kt:199:22 This declaration overrides a deprecated member but is not marked as deprecated itself. Add the '@Deprecated' annotation or suppress the diagnostic. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/CastTransferStateHolder.kt:1036:34 Unnecessary safe call on a non-null receiver of type 'HttpURLConnection'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/ConnectivityStateHolder.kt:334:49 Unnecessary safe call on a non-null receiver of type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/ConnectivityStateHolder.kt:509:33 'val connectionInfo: WifiInfo!' is deprecated. Deprecated in Java. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/GenreDetailViewModel.kt:161:61 Elvis operator (?:) always returns the left operand of non-nullable type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/GenreDetailViewModel.kt:198:82 Elvis operator (?:) always returns the left operand of non-nullable type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/GenreDetailViewModel.kt:199:80 Elvis operator (?:) always returns the left operand of non-nullable type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/GenreDetailViewModel.kt:281:57 Elvis operator (?:) always returns the left operand of non-nullable type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/GenreDetailViewModel.kt:282:58 Elvis operator (?:) always returns the left operand of non-nullable type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/GenreDetailViewModel.kt:284:65 Elvis operator (?:) always returns the left operand of non-nullable type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/GenreDetailViewModel.kt:296:56 Elvis operator (?:) always returns the left operand of non-nullable type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/GenreDetailViewModel.kt:297:57 Elvis operator (?:) always returns the left operand of non-nullable type 'String'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlaybackStateHolder.kt:701:45 Unnecessary safe call on a non-null receiver of type 'Song'. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt:153:40 'fun set(index: Int, element: Song): PersistentList' is deprecated. Use replacingAt() instead. For more details, read the documentation for this function. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt:159:40 'fun removeAt(index: Int): PersistentList' is deprecated. Use removingAt() instead. For more details, read the documentation for this function. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt:166:10 'fun removeAt(index: Int): PersistentList' is deprecated. Use removingAt() instead. For more details, read the documentation for this function. -w: file:///home/dae/VZ_Dev/work/PixelPlayer/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt:167:10 'fun add(index: Int, element: Song): PersistentList' is deprecated. Use addingAt() instead. For more details, read the documentation for this function. - -[Incubating] Problems report is available at: file:///home/dae/VZ_Dev/work/PixelPlayer/build/reports/problems/problems-report.html - -BUILD SUCCESSFUL in 10m 43s -115 actionable tasks: 114 executed, 1 up-to-date -Configuration cache entry stored. From 765b4c5bf0c171cd472eb87166fd4b8a09e6a718 Mon Sep 17 00:00:00 2001 From: Aayush Babu Date: Sun, 4 Oct 2026 11:37:08 +0530 Subject: [PATCH 3/4] feat: add configurable mini-player gestures and unify player typography MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a Playback setting for ini-player swipe behavior. Track navigation is the default: a horizontal swipe changes to the next or previous track without dismissing the player. Users can enable “Swipe to dismiss mini-player” to restore dismissal gestures. Use the app’s Google Sans Rounded typography consistently across the mini-player, full player, and lyrics view, rather than falling back to the device’s system font in individual player components. Reset lyrics scrolling when the active track or queue occurrence changes, so the lyrics view starts at the beginning for each new track. --- .../preferences/UserPreferencesRepository.kt | 8 + .../presentation/components/LyricsSheet.kt | 27 ++- .../components/UnifiedPlayerSheetLayers.kt | 163 ++++++++++-------- .../components/UnifiedPlayerSheetShared.kt | 3 - .../components/UnifiedPlayerSheetV2.kt | 11 +- .../components/player/FullPlayerContent.kt | 7 +- .../player/PlayerArtistPickerBottomSheet.kt | 3 - .../scoped/MiniPlayerSwipeGestureHandler.kt | 101 ++++++++++- .../screens/SettingsCategoryScreen.kt | 16 ++ .../presentation/viewmodel/PlayerViewModel.kt | 2 + .../viewmodel/SettingsViewModel.kt | 41 +++-- app/src/main/res/values/strings_settings.xml | 3 + gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 48462 -> 47623 bytes gradle/wrapper/gradle-wrapper.properties | 7 +- gradlew | 4 +- gradlew.bat | 56 ++++-- 17 files changed, 321 insertions(+), 133 deletions(-) diff --git a/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt b/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt index 4598f1a86f..e3e19b7ba6 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt @@ -149,6 +149,7 @@ class UserPreferencesRepository @Inject constructor( val DISABLE_CAST_AUTOPLAY = booleanPreferencesKey("disable_cast_autoplay") val RESUME_ON_HEADSET_RECONNECT = booleanPreferencesKey("resume_on_headset_reconnect") val SHOW_QUEUE_HISTORY = booleanPreferencesKey("show_queue_history") + val DISMISS_MINI_PLAYER_ON_SWIPE = booleanPreferencesKey("dismiss_mini_player_on_swipe") val PLAYBACK_QUEUE_SNAPSHOT = stringPreferencesKey("playback_queue_snapshot_v1") val FULL_PLAYER_SHOW_FILE_INFO = booleanPreferencesKey("full_player_show_file_info") val FULL_PLAYER_DELAY_ALBUM = booleanPreferencesKey("full_player_delay_album") @@ -377,6 +378,13 @@ class UserPreferencesRepository @Inject constructor( dataStore.edit { it[PreferencesKeys.SHOW_QUEUE_HISTORY] = show } } + val dismissMiniPlayerOnSwipeFlow: Flow = + pref { it[PreferencesKeys.DISMISS_MINI_PLAYER_ON_SWIPE] ?: false } + + suspend fun setDismissMiniPlayerOnSwipe(enabled: Boolean) { + dataStore.edit { it[PreferencesKeys.DISMISS_MINI_PLAYER_ON_SWIPE] = enabled } + } + val playbackQueueSnapshotFlow: Flow = pref { preferences -> preferences[PreferencesKeys.PLAYBACK_QUEUE_SNAPSHOT]?.let { raw -> diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt index 9787826e8f..96475176f6 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/LyricsSheet.kt @@ -107,7 +107,6 @@ import com.theveloper.pixelplay.presentation.components.subcomps.FetchLyricsDial import com.theveloper.pixelplay.presentation.components.subcomps.PlayerSeekBar import com.theveloper.pixelplay.presentation.viewmodel.LyricsSearchUiState import com.theveloper.pixelplay.presentation.viewmodel.StablePlayerState -import com.theveloper.pixelplay.ui.theme.GoogleSansRounded import com.theveloper.pixelplay.utils.BubblesLine import com.theveloper.pixelplay.utils.ProviderText import com.theveloper.pixelplay.presentation.components.snapping.ExperimentalSnapperApi @@ -686,7 +685,7 @@ fun LyricsSheet( resetImmersiveTimer() } ) { - val initialSyncedLineIndex = remember(lyrics, playbackPositionFlow, lyricsSyncOffset) { + val initialSyncedLineIndex = remember(currentSong?.id, lyrics, playbackPositionFlow, lyricsSyncOffset) { resolveCurrentLineIndex( lines = lyrics?.synced.orEmpty(), position = (playbackPositionFlow.value + lyricsSyncOffset).coerceAtLeast(0L) @@ -696,6 +695,10 @@ fun LyricsSheet( initialFirstVisibleItemIndex = initialSyncedLineIndex ) val staticListState = rememberLazyListState() + LaunchedEffect(currentSong?.id, stablePlayerState.currentMediaItemIndex) { + syncedListState.scrollToItem(0) + staticListState.scrollToItem(0) + } // Lyrics Content (Weight 1) Box( @@ -776,6 +779,7 @@ fun LyricsSheet( .padding(horizontal = 24.dp), contentPadding = PaddingValues(top = 130.dp, bottom = 100.dp), lines = synced, + currentTrackKey = currentSong?.id to stablePlayerState.currentMediaItemIndex, listState = syncedListState, playbackPositionFlow = playbackPositionFlow, lyricsSyncOffset = lyricsSyncOffset, @@ -1191,6 +1195,7 @@ private fun LyricsPlaybackSeekBar( @Composable fun SyncedLyricsList( lines: List, + currentTrackKey: Pair, listState: LazyListState, playbackPositionFlow: StateFlow, lyricsSyncOffset: Int, @@ -1225,6 +1230,18 @@ fun SyncedLyricsList( } var hasAlignedInitialLine by remember(lines) { mutableStateOf(false) } var lastAutoScrolledLineIndex by remember(lines) { mutableIntStateOf(-1) } + var activeTrackKey by remember { mutableStateOf(currentTrackKey) } + var skipAutoScrollAfterTrackChange by remember { mutableStateOf(false) } + + LaunchedEffect(currentTrackKey) { + if (activeTrackKey != currentTrackKey) { + activeTrackKey = currentTrackKey + hasAlignedInitialLine = true + lastAutoScrolledLineIndex = 0 + skipAutoScrollAfterTrackChange = true + listState.scrollToItem(0) + } + } BoxWithConstraints(modifier = modifier) { val metrics = remember(maxHeight, highlightZoneFraction, highlightOffsetDp) { @@ -1241,10 +1258,14 @@ fun SyncedLyricsList( ) val flingBehavior = rememberSnapperFlingBehavior(layoutInfo = snapperLayoutInfo) - LaunchedEffect(currentLineIndex, lines.size, metrics, isPreviewSeeking) { + LaunchedEffect(currentTrackKey, currentLineIndex, lines.size, metrics, isPreviewSeeking) { if (lines.isEmpty()) return@LaunchedEffect if (currentLineIndex !in lines.indices) return@LaunchedEffect if (listState.layoutInfo.totalItemsCount == 0) return@LaunchedEffect + if (skipAutoScrollAfterTrackChange) { + skipAutoScrollAfterTrackChange = false + return@LaunchedEffect + } if (!hasAlignedInitialLine) { listState.scrollToItem(currentLineIndex) diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetLayers.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetLayers.kt index 2aed352222..81b01ecf5f 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetLayers.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetLayers.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.requiredHeight import androidx.compose.material3.ColorScheme +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.derivedStateOf @@ -219,44 +220,50 @@ internal fun BoxScope.UnifiedPlayerMiniAndFullLayers( val onRepeatToggle = remember(playerViewModel) { playerViewModel::cycleRepeatMode } val onFavoriteToggle = remember(playerViewModel) { playerViewModel::toggleFavorite } - FullPlayerContent( - currentSong = currentSongNonNull, - currentPlaybackQueue = currentPlaybackQueue, - currentQueueSourceName = currentQueueSourceName, - currentMediaItemIndex = infrequentPlayerState.currentMediaItemIndex, - isShuffleEnabled = infrequentPlayerState.isShuffleEnabled, - shuffleTransitionInProgress = infrequentPlayerState.isShuffleTransitionInProgress, - repeatMode = infrequentPlayerState.repeatMode, - allowRealtimeUpdates = fullPlayerRuntimePolicy.allowRealtimeUpdates, - expansionFractionProvider = expansionFractionProvider, - currentSheetState = currentSheetContentState, - carouselStyle = carouselStyle, - loadingTweaks = fullPlayerLoadingTweaks, - isSheetDragGestureActive = isSheetDragGestureActive, - playerViewModel = playerViewModel, - currentPositionProvider = currentPositionProvider, - isPlayingProvider = isPlayingProvider, - playWhenReadyProvider = playWhenReadyProvider, - repeatModeProvider = repeatModeProvider, - isShuffleEnabledProvider = isShuffleEnabledProvider, - totalDurationProvider = totalDurationProvider, - lyricsProvider = lyricsProvider, - isCastConnecting = isCastConnecting, - isFavoriteProvider = isFavoriteProvider, - onPlayPause = onPlayPause, - onSeek = onSeek, - onNext = onNext, - onPrevious = onPrevious, - onCollapse = onCollapse, - onShowQueueClicked = onShowQueueClicked, - onQueueDragStart = onQueueDragStart, - onQueueDrag = onQueueDrag, - onQueueRelease = onQueueRelease, - onShowCastClicked = onShowCastClicked, - onShuffleToggle = onShuffleToggle, - onRepeatToggle = onRepeatToggle, - onFavoriteToggle = onFavoriteToggle - ) + MaterialTheme( + colorScheme = MaterialTheme.colorScheme, + typography = MaterialTheme.typography, + shapes = MaterialTheme.shapes + ) { + FullPlayerContent( + currentSong = currentSongNonNull, + currentPlaybackQueue = currentPlaybackQueue, + currentQueueSourceName = currentQueueSourceName, + currentMediaItemIndex = infrequentPlayerState.currentMediaItemIndex, + isShuffleEnabled = infrequentPlayerState.isShuffleEnabled, + shuffleTransitionInProgress = infrequentPlayerState.isShuffleTransitionInProgress, + repeatMode = infrequentPlayerState.repeatMode, + allowRealtimeUpdates = fullPlayerRuntimePolicy.allowRealtimeUpdates, + expansionFractionProvider = expansionFractionProvider, + currentSheetState = currentSheetContentState, + carouselStyle = carouselStyle, + loadingTweaks = fullPlayerLoadingTweaks, + isSheetDragGestureActive = isSheetDragGestureActive, + playerViewModel = playerViewModel, + currentPositionProvider = currentPositionProvider, + isPlayingProvider = isPlayingProvider, + playWhenReadyProvider = playWhenReadyProvider, + repeatModeProvider = repeatModeProvider, + isShuffleEnabledProvider = isShuffleEnabledProvider, + totalDurationProvider = totalDurationProvider, + lyricsProvider = lyricsProvider, + isCastConnecting = isCastConnecting, + isFavoriteProvider = isFavoriteProvider, + onPlayPause = onPlayPause, + onSeek = onSeek, + onNext = onNext, + onPrevious = onPrevious, + onCollapse = onCollapse, + onShowQueueClicked = onShowQueueClicked, + onQueueDragStart = onQueueDragStart, + onQueueDrag = onQueueDrag, + onQueueRelease = onQueueRelease, + onShowCastClicked = onShowCastClicked, + onShuffleToggle = onShuffleToggle, + onRepeatToggle = onRepeatToggle, + onFavoriteToggle = onFavoriteToggle + ) + } } } } @@ -317,43 +324,49 @@ internal fun UnifiedPlayerPrewarmLayer( val onRepeatToggle = remember(playerViewModel) { playerViewModel::cycleRepeatMode } val onFavoriteToggle = remember(playerViewModel) { playerViewModel::toggleFavorite } - FullPlayerContent( - currentSong = currentSong, - currentPlaybackQueue = currentPlaybackQueue, - currentQueueSourceName = currentQueueSourceName, - currentMediaItemIndex = infrequentPlayerState.currentMediaItemIndex, - isShuffleEnabled = infrequentPlayerState.isShuffleEnabled, - shuffleTransitionInProgress = infrequentPlayerState.isShuffleTransitionInProgress, - repeatMode = infrequentPlayerState.repeatMode, - allowRealtimeUpdates = false, - expansionFractionProvider = { 1f }, - currentSheetState = PlayerSheetState.EXPANDED, - carouselStyle = carouselStyle, - loadingTweaks = fullPlayerLoadingTweaks, - playerViewModel = playerViewModel, - currentPositionProvider = currentPositionProvider, - isPlayingProvider = isPlayingProvider, - playWhenReadyProvider = playWhenReadyProvider, - repeatModeProvider = repeatModeProvider, - isShuffleEnabledProvider = isShuffleEnabledProvider, - totalDurationProvider = totalDurationProvider, - lyricsProvider = lyricsProvider, - isCastConnecting = isCastConnecting, - isFavoriteProvider = isFavoriteProvider, - onShowQueueClicked = onShowQueueClicked, - onQueueDragStart = onQueueDragStart, - onQueueDrag = onQueueDrag, - onQueueRelease = onQueueRelease, - onPlayPause = onPlayPause, - onSeek = onSeek, - onNext = onNext, - onPrevious = onPrevious, - onCollapse = {}, - onShowCastClicked = {}, - onShuffleToggle = onShuffleToggle, - onRepeatToggle = onRepeatToggle, - onFavoriteToggle = onFavoriteToggle - ) + MaterialTheme( + colorScheme = MaterialTheme.colorScheme, + typography = MaterialTheme.typography, + shapes = MaterialTheme.shapes + ) { + FullPlayerContent( + currentSong = currentSong, + currentPlaybackQueue = currentPlaybackQueue, + currentQueueSourceName = currentQueueSourceName, + currentMediaItemIndex = infrequentPlayerState.currentMediaItemIndex, + isShuffleEnabled = infrequentPlayerState.isShuffleEnabled, + shuffleTransitionInProgress = infrequentPlayerState.isShuffleTransitionInProgress, + repeatMode = infrequentPlayerState.repeatMode, + allowRealtimeUpdates = false, + expansionFractionProvider = { 1f }, + currentSheetState = PlayerSheetState.EXPANDED, + carouselStyle = carouselStyle, + loadingTweaks = fullPlayerLoadingTweaks, + playerViewModel = playerViewModel, + currentPositionProvider = currentPositionProvider, + isPlayingProvider = isPlayingProvider, + playWhenReadyProvider = playWhenReadyProvider, + repeatModeProvider = repeatModeProvider, + isShuffleEnabledProvider = isShuffleEnabledProvider, + totalDurationProvider = totalDurationProvider, + lyricsProvider = lyricsProvider, + isCastConnecting = isCastConnecting, + isFavoriteProvider = isFavoriteProvider, + onShowQueueClicked = onShowQueueClicked, + onQueueDragStart = onQueueDragStart, + onQueueDrag = onQueueDrag, + onQueueRelease = onQueueRelease, + onPlayPause = onPlayPause, + onSeek = onSeek, + onNext = onNext, + onPrevious = onPrevious, + onCollapse = {}, + onShowCastClicked = {}, + onShuffleToggle = onShuffleToggle, + onRepeatToggle = onRepeatToggle, + onFavoriteToggle = onFavoriteToggle + ) + } } } } diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetShared.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetShared.kt index 59ae7c316d..0e40badc30 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetShared.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetShared.kt @@ -46,7 +46,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.size.Size import com.theveloper.pixelplay.data.model.Song -import com.theveloper.pixelplay.ui.theme.GoogleSansRounded internal val LocalMaterialTheme = compositionLocalOf { error("No ColorScheme provided") } @@ -120,13 +119,11 @@ internal fun MiniPlayerContentInternal( fontSize = 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = (-0.2).sp, - fontFamily = GoogleSansRounded, color = LocalMaterialTheme.current.onPrimaryContainer ) val artistStyle = MaterialTheme.typography.bodySmall.copy( fontSize = 13.sp, letterSpacing = 0.sp, - fontFamily = GoogleSansRounded, color = LocalMaterialTheme.current.onPrimaryContainer.copy(alpha = 0.7f) ) diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt index 51966278f5..296500e34a 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/UnifiedPlayerSheetV2.kt @@ -204,6 +204,7 @@ fun UnifiedPlayerSheetV2( val preparingSongId = playerUiSheetSlice.preparingSongId val currentSheetContentState by playerViewModel.sheetState.collectAsStateWithLifecycle() + val dismissMiniPlayerOnSwipe by playerViewModel.dismissMiniPlayerOnSwipe.collectAsStateWithLifecycle() val predictiveBackCollapseProgress by playerViewModel.predictiveBackCollapseFraction.collectAsStateWithLifecycle() val predictiveBackSwipeEdge by playerViewModel.predictiveBackSwipeEdge.collectAsStateWithLifecycle() val prewarmFullPlayer = rememberPrewarmFullPlayer(infrequentPlayerState.currentSong?.id) @@ -220,6 +221,7 @@ fun UnifiedPlayerSheetV2( val density = LocalDensity.current val configuration = LocalConfiguration.current val scope = rememberCoroutineScope() + val miniPlayerSwipeOffset = remember { Animatable(0f) } val screenWidthPx = remember(configuration, density) { with(density) { configuration.screenWidthDp.dp.toPx() } @@ -457,10 +459,16 @@ fun UnifiedPlayerSheetV2( val hapticFeedback = LocalHapticFeedback.current val miniPlayerSwipeGestureHandler = rememberMiniPlayerSwipeGestureHandler( + scope = scope, density = density, hapticFeedback = hapticFeedback, + offsetAnimatable = miniPlayerSwipeOffset, + screenWidthPx = screenWidthPx, + dismissEnabled = dismissMiniPlayerOnSwipe, onSwipeToNext = { playerViewModel.nextSong() }, - onSwipeToPrevious = { playerViewModel.previousSong() } + onSwipeToPrevious = { playerViewModel.previousSong() }, + onDismiss = { playerViewModel.dismissPlaylistAndShowUndo() }, + onDismissStarted = { playerViewModel.setMiniPlayerDismissing(true) } ) QueueSheetRuntimeEffects( @@ -640,6 +648,7 @@ fun UnifiedPlayerSheetV2( modifier = Modifier .fillMaxWidth() .graphicsLayer { + translationX = miniPlayerSwipeOffset.value scaleX = miniAppearScale scaleY = visualOvershootScaleY.value * miniAppearScale alpha = miniReadyAlpha diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt index 8a30f6f41d..ad9c5209bf 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt @@ -128,7 +128,6 @@ import com.theveloper.pixelplay.presentation.components.subcomps.FetchLyricsDial import com.theveloper.pixelplay.presentation.viewmodel.LyricsSearchUiState import com.theveloper.pixelplay.presentation.viewmodel.PlayerSheetState import com.theveloper.pixelplay.presentation.viewmodel.PlayerViewModel -import com.theveloper.pixelplay.ui.theme.GoogleSansRounded import com.theveloper.pixelplay.utils.AudioMetaUtils.mimeTypeToFormat import com.theveloper.pixelplay.utils.LyricsImportFailureReason import com.theveloper.pixelplay.utils.LyricsImportSecurity @@ -956,10 +955,7 @@ fun FullPlayerContent( onDismissLyricsSearch = { playerViewModel.resetLyricsSearchState() }, lyricsSyncOffset = lyricsSyncOffset, onLyricsSyncOffsetChange = { currentSong?.id?.let { songId -> playerViewModel.setLyricsSyncOffset(songId, it) } }, - // Use the platform default font (fontFamily = null) for lyrics so extended - // Unicode glyphs (e.g. Icelandic æ ð þ) render instead of tofu. The bundled - // Google Sans Rounded variable font drops these codepoints at runtime. (#2427) - lyricsTextStyle = MaterialTheme.typography.titleLarge.copy(fontFamily = null), + lyricsTextStyle = MaterialTheme.typography.titleLarge, colorScheme = LocalMaterialTheme.current, onBackClick = { showLyricsSheet = false }, onSaveLyricsToFile = playerViewModel::saveLyricsToFile, @@ -2151,7 +2147,6 @@ private fun PlayerSongInfo( } val titleStyle = MaterialTheme.typography.headlineSmall.copy( fontWeight = FontWeight.Bold, - fontFamily = GoogleSansRounded, color = textColor ) diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/PlayerArtistPickerBottomSheet.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/PlayerArtistPickerBottomSheet.kt index 162f894b8e..3eb0c716ca 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/PlayerArtistPickerBottomSheet.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/player/PlayerArtistPickerBottomSheet.kt @@ -41,7 +41,6 @@ import com.theveloper.pixelplay.R import com.theveloper.pixelplay.data.model.Artist import com.theveloper.pixelplay.data.model.Song import com.theveloper.pixelplay.presentation.components.SmartImage -import com.theveloper.pixelplay.ui.theme.GoogleSansRounded import racra.compose.smooth_corner_rect_library.AbsoluteSmoothCornerShape private data class PlayerArtistShortcutItem( @@ -110,7 +109,6 @@ internal fun PlayerArtistPickerBottomSheet( Text( text = stringResource(R.string.artist_picker_title), style = MaterialTheme.typography.headlineMedium, - fontFamily = GoogleSansRounded, fontWeight = FontWeight.Bold, color = colorScheme.onSurface ) @@ -216,7 +214,6 @@ private fun PlayerArtistShortcutCard( Text( text = artist.name, style = MaterialTheme.typography.titleMedium, - fontFamily = GoogleSansRounded, fontWeight = FontWeight.SemiBold, color = contentColor, maxLines = 1, diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt index 7f7b628b84..0bcbd83fd8 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/components/scoped/MiniPlayerSwipeGestureHandler.kt @@ -1,5 +1,11 @@ package com.theveloper.pixelplay.presentation.components.scoped +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.AnimationVector1D +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween import androidx.compose.foundation.gestures.detectHorizontalDragGestures import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -10,59 +16,136 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.dp +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.CoroutineStart +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch import kotlin.math.abs private const val TRACK_SWIPE_THRESHOLD_DP = 48f +private const val DISMISS_SCREEN_WIDTH_FRACTION = 0.4f /** - * Changes tracks as soon as a horizontal swipe crosses the threshold without moving the mini-player. + * Track changes are the default; optional dismiss mode restores swipe-away queue dismissal. */ internal class MiniPlayerSwipeGestureHandler( + private val scope: CoroutineScope, density: Density, private val hapticFeedback: HapticFeedback, + private val offsetAnimatable: Animatable, + private val screenWidthPx: Float, + private val dismissEnabled: Boolean, private val onSwipeToNext: () -> Unit, - private val onSwipeToPrevious: () -> Unit + private val onSwipeToPrevious: () -> Unit, + private val onDismiss: () -> Unit, + private val onDismissStarted: () -> Unit ) { - private val swipeThresholdPx = with(density) { TRACK_SWIPE_THRESHOLD_DP.dp.toPx() } + private val trackSwipeThresholdPx = with(density) { TRACK_SWIPE_THRESHOLD_DP.dp.toPx() } private var accumulatedDragX = 0f private var trackChanged = false + private var offsetJob: Job? = null fun onDragStart() { accumulatedDragX = 0f trackChanged = false + offsetJob?.cancel() + offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { + offsetAnimatable.stop() + } } fun onHorizontalDrag(dragAmount: Float) { - if (trackChanged) return accumulatedDragX += dragAmount - if (abs(accumulatedDragX) < swipeThresholdPx) return + if (dismissEnabled) { + offsetJob?.cancel() + offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { + offsetAnimatable.snapTo(accumulatedDragX) + } + return + } + if (trackChanged || abs(accumulatedDragX) < trackSwipeThresholdPx) return trackChanged = true hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress) if (accumulatedDragX < 0f) onSwipeToNext() else onSwipeToPrevious() } fun onDragEnd() { + val dismissalThresholdPx = screenWidthPx * DISMISS_SCREEN_WIDTH_FRACTION + val shouldDismiss = dismissEnabled && abs(accumulatedDragX) > dismissalThresholdPx + val targetOffset = if (accumulatedDragX < 0f) -screenWidthPx else screenWidthPx + offsetJob?.cancel() + + offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { + if (shouldDismiss) { + hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress) + onDismissStarted() + offsetAnimatable.animateTo( + targetValue = targetOffset, + animationSpec = tween( + durationMillis = 200, + easing = FastOutSlowInEasing + ) + ) + onDismiss() + } + offsetAnimatable.animateTo( + targetValue = 0f, + animationSpec = spring( + dampingRatio = Spring.DampingRatioMediumBouncy, + stiffness = Spring.StiffnessMedium + ) + ) + } + accumulatedDragX = 0f + trackChanged = false + } + + fun onDragCancel() { accumulatedDragX = 0f trackChanged = false + offsetJob?.cancel() + offsetJob = scope.launch(start = CoroutineStart.UNDISPATCHED) { + offsetAnimatable.animateTo( + targetValue = 0f, + animationSpec = spring( + dampingRatio = Spring.DampingRatioMediumBouncy, + stiffness = Spring.StiffnessMedium + ) + ) + } } } @Composable internal fun rememberMiniPlayerSwipeGestureHandler( + scope: CoroutineScope, density: Density, hapticFeedback: HapticFeedback, + offsetAnimatable: Animatable, + screenWidthPx: Float, + dismissEnabled: Boolean, onSwipeToNext: () -> Unit, - onSwipeToPrevious: () -> Unit + onSwipeToPrevious: () -> Unit, + onDismiss: () -> Unit, + onDismissStarted: () -> Unit ): MiniPlayerSwipeGestureHandler { val onSwipeToNextState = rememberUpdatedState(onSwipeToNext) val onSwipeToPreviousState = rememberUpdatedState(onSwipeToPrevious) - return remember(density, hapticFeedback) { + val onDismissState = rememberUpdatedState(onDismiss) + val onDismissStartedState = rememberUpdatedState(onDismissStarted) + return remember(scope, density, hapticFeedback, offsetAnimatable, screenWidthPx, dismissEnabled) { MiniPlayerSwipeGestureHandler( + scope = scope, density = density, hapticFeedback = hapticFeedback, + offsetAnimatable = offsetAnimatable, + screenWidthPx = screenWidthPx, + dismissEnabled = dismissEnabled, onSwipeToNext = { onSwipeToNextState.value() }, - onSwipeToPrevious = { onSwipeToPreviousState.value() } + onSwipeToPrevious = { onSwipeToPreviousState.value() }, + onDismiss = { onDismissState.value() }, + onDismissStarted = { onDismissStartedState.value() } ) } } @@ -80,7 +163,7 @@ internal fun Modifier.miniPlayerSwipeHorizontalGesture( handler.onHorizontalDrag(dragAmount) }, onDragEnd = { handler.onDragEnd() }, - onDragCancel = { handler.onDragEnd() } + onDragCancel = { handler.onDragCancel() } ) } } diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt index dd1672dbc6..7e8a5cef87 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/SettingsCategoryScreen.kt @@ -771,6 +771,22 @@ fun SettingsCategoryScreen( ) } + SettingsSubsection(title = stringResource(R.string.settings_miniplayer_swipe_section)) { + SwitchSettingItem( + title = stringResource(R.string.settings_miniplayer_swipe_dismiss_title), + subtitle = stringResource(R.string.settings_miniplayer_swipe_dismiss_subtitle), + checked = uiState.dismissMiniPlayerOnSwipe, + onCheckedChange = settingsViewModel::setDismissMiniPlayerOnSwipe, + leadingIcon = { + Icon( + painterResource(R.drawable.rounded_touch_app_24), + null, + tint = MaterialTheme.colorScheme.secondary + ) + } + ) + } + SettingsSubsection(title = stringResource(R.string.settings_replaygain_section)) { SwitchSettingItem( title = stringResource(R.string.settings_replaygain_enable_title), diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt index 4ddadbedea..e9960dafd5 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/PlayerViewModel.kt @@ -432,6 +432,8 @@ class PlayerViewModel @Inject constructor( private val _isMiniPlayerDismissing = MutableStateFlow(false) val isMiniPlayerDismissing: StateFlow = _isMiniPlayerDismissing.asStateFlow() + val dismissMiniPlayerOnSwipe: StateFlow = userPreferencesRepository.dismissMiniPlayerOnSwipeFlow + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false) fun setMiniPlayerDismissing(dismissing: Boolean) { _isMiniPlayerDismissing.value = dismissing diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/SettingsViewModel.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/SettingsViewModel.kt index abba7eaceb..a2f74d90af 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/SettingsViewModel.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/SettingsViewModel.kt @@ -71,6 +71,7 @@ data class SettingsUiState( val pauseOnVolumeZero: Boolean = false, val resumeOnHeadsetReconnect: Boolean = false, val showQueueHistory: Boolean = true, + val dismissMiniPlayerOnSwipe: Boolean = false, val isCrossfadeEnabled: Boolean = false, val hiFiModeEnabled: Boolean = false, val hiFiModeDeviceSupported: Boolean = true, @@ -158,6 +159,7 @@ private sealed interface SettingsUiUpdate { val pauseOnVolumeZero: Boolean, val resumeOnHeadsetReconnect: Boolean, val showQueueHistory: Boolean, + val dismissMiniPlayerOnSwipe: Boolean, val isCrossfadeEnabled: Boolean, val hiFiModeEnabled: Boolean, val crossfadeDuration: Int, @@ -651,6 +653,7 @@ class SettingsViewModel @Inject constructor( userPreferencesRepository.pauseOnVolumeZeroFlow, userPreferencesRepository.resumeOnHeadsetReconnectFlow, userPreferencesRepository.showQueueHistoryFlow, + userPreferencesRepository.dismissMiniPlayerOnSwipeFlow, userPreferencesRepository.isCrossfadeEnabledFlow, userPreferencesRepository.hiFiModeEnabledFlow, userPreferencesRepository.crossfadeDurationFlow, @@ -673,21 +676,22 @@ class SettingsViewModel @Inject constructor( pauseOnVolumeZero = values[2] as Boolean, resumeOnHeadsetReconnect = values[3] as Boolean, showQueueHistory = values[4] as Boolean, - isCrossfadeEnabled = values[5] as Boolean, - hiFiModeEnabled = values[6] as Boolean, - crossfadeDuration = values[7] as Int, - persistentShuffleEnabled = values[8] as Boolean, - folderBackGestureNavigation = values[9] as Boolean, - lyricsSourcePreference = values[10] as LyricsSourcePreference, - autoScanLrcFiles = values[11] as Boolean, - blockedDirectories = @Suppress("UNCHECKED_CAST") (values[12] as Set), - hapticsEnabled = values[13] as Boolean, - immersiveLyricsEnabled = values[14] as Boolean, - immersiveLyricsTimeout = values[15] as Long, - animatedLyricsBlurEnabled = values[16] as Boolean, - animatedLyricsBlurStrength = values[17] as Float, - disableBlurAllOver = values[18] as Boolean, - showScrollbar = values[19] as Boolean + dismissMiniPlayerOnSwipe = values[5] as Boolean, + isCrossfadeEnabled = values[6] as Boolean, + hiFiModeEnabled = values[7] as Boolean, + crossfadeDuration = values[8] as Int, + persistentShuffleEnabled = values[9] as Boolean, + folderBackGestureNavigation = values[10] as Boolean, + lyricsSourcePreference = values[11] as LyricsSourcePreference, + autoScanLrcFiles = values[12] as Boolean, + blockedDirectories = @Suppress("UNCHECKED_CAST") (values[13] as Set), + hapticsEnabled = values[14] as Boolean, + immersiveLyricsEnabled = values[15] as Boolean, + immersiveLyricsTimeout = values[16] as Long, + animatedLyricsBlurEnabled = values[17] as Boolean, + animatedLyricsBlurStrength = values[18] as Float, + disableBlurAllOver = values[19] as Boolean, + showScrollbar = values[20] as Boolean ) }.collect { update -> _uiState.update { state -> @@ -697,6 +701,7 @@ class SettingsViewModel @Inject constructor( pauseOnVolumeZero = update.pauseOnVolumeZero, resumeOnHeadsetReconnect = update.resumeOnHeadsetReconnect, showQueueHistory = update.showQueueHistory, + dismissMiniPlayerOnSwipe = update.dismissMiniPlayerOnSwipe, isCrossfadeEnabled = update.isCrossfadeEnabled, hiFiModeEnabled = update.hiFiModeEnabled, crossfadeDuration = update.crossfadeDuration, @@ -994,6 +999,12 @@ class SettingsViewModel @Inject constructor( } } + fun setDismissMiniPlayerOnSwipe(enabled: Boolean) { + viewModelScope.launch { + userPreferencesRepository.setDismissMiniPlayerOnSwipe(enabled) + } + } + fun setCrossfadeEnabled(enabled: Boolean) { viewModelScope.launch { userPreferencesRepository.setCrossfadeEnabled(enabled) diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml index 1c6ae4e284..a868ffc696 100644 --- a/app/src/main/res/values/strings_settings.xml +++ b/app/src/main/res/values/strings_settings.xml @@ -261,6 +261,9 @@ Background Playback + Mini-player gestures + Swipe to dismiss mini-player + When off, swipe left or right to change tracks. When on, swipe the mini-player away to dismiss the current queue. Keep playing after closing If off, removing the app from recents will stop playback. Battery Optimization diff --git a/gradle.properties b/gradle.properties index 3df0c043f4..b327aa3918 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.configuration-cache=true org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+ParallelRefParsingEnabled org.gradle.workers.max=2 org.gradle.parallel=true -kotlin.daemon.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=512m +kotlin.daemon.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -XX:+UseG1GC -XX:-UseGCOverheadLimit androidx.benchmark.suppressErrors=EMULATOR,LOW-BATTERY,THERMAL diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b44f16b14dc800fa8103a6d89abb526f..5097068a8d375f5bf0d15693fb5b3615c972a801 100644 GIT binary patch delta 39417 zcmXtf^MBlb*K`|WV{L5PP8!>`Z9Cg&W1EegGXj3#;dz3$iZ%l-lH&&-)Q zb7rSsA;Rw=>gwPeGfcu+G697fjlTqIyux9kHiPF!LM~B0rsMv7lV| z?>;_%CTV&B$v93zh#ZDB{bgiWc|su9Y0UWgRir|2H+XH zQ`$9MA5J)r^&WD#66f)#hEO$wXxnTx(J>5VIaoNTEV$yzFJHbuC94DyCZkB8BqP(H zBuCegfD{xJ<~rEvnhDZ)|7oLcRw%M2RYxm6sVKwla^gyMzr3QdPa=ze1|?DV zg$VZ&Q!0L&!}Y!qI%54{bWQxl`D-V@kSp8ge$b3m%Nj#ym+erD$xV%hkuG(k_W(ZW zO1X$8ak7L4vR%BL&Q9%ChR!`w%+NdtO(H)l4z$1#o7|Yu!1UU!WLG1jT|{4z8fwi! zlpFuzh602HC9Wv$<<5^9Cv-AQ=16mZRjZt{@X77j)UciOHSwF4E{g^WeSRVm!i1xk zGKwUSAe9`*flLhAe-;>?dVSy}E^^`C~ zFh9U)Ob+RC6B0MUZHCqbB_#P+G0cOAGGEQ$q4p=-y*db2@wfzkfU?3 z3cd0F#psE!!bwCow4CO>%f05moBI3r?t%Y1F9TcG#)h9}V9`=r4>^ID-t2vc=B)dQ zqii(nyhl`v9bBbfKl&z)`zq*npo$Y*z=+dYPmA(#8Z(0K0>gTjP73LWd$%FGrETcL zIQ9EOnuUsqmbXy7YJmW!Fem@d?n?+WX^pM4vS_J!bbwi{RhoP}ej3eb8Utf{%M@V| z8Daf0z)BU>>SW`nv&-CNgrR1sC5(thnuW$O^al5p9xWeBy6QgkEf!P>chW=mG?~Vj zWBl%sT+EiLmPQ%N*Ob6Xl5yXI5Sytu0n;NvlLP)d)RduU=!^12 zMz>XyVM*o!HRjwlc|el;d0b4e{rjA9G_$}C^9<r+b2wN4k zr*r5>6Fcu8tM)Wd4bI!6;N?pbrGmh2g}1%%UK^dLcbKxIj<1tdgq;1WkVXNn zS=mJ900StKwf@7-yNFkgfjqAdiRFCG@yiT+aV&Aj(76b>K|8=9h$RdPf_QL*#OkWi zf0%rbW{z-$g81?!C;2;u5yK4fCE3&ygO}8KCwYwc3|8x@mA|M{OyT7{| zed{-Hps6Okq0L#{p~AwjW5>&cLTH37xPyJ5)sH2B+SEP~QrJuns;spNzjl{Y4Qv>8O=WZ^z#5j_-6u(J{hJ!1hs8Hk00JLD6c;bxU#qv5Y z0C-K_BL4a=X~LpN9VwL@-)@Z%Ol$NJvVj|nkM5(n`x12z2YV(e<7l@8I(VF*ft50 z4t&4*nchLj=V)U<8>s9O?93RHoe{qegAKF05@a9BFm|MH4;m9S9=7}00+iaGt8y$N4S@DQX0KMQ#T zw@fN?WE;viT=Q3JGa%rex?Zu<%zUKtls^Sc90d6vx@=vC|!rRy;t9^CZs(krn`Z^4M2`#0yjK;QAg z1}V?DF+eH4>x$6eMP^HzPQNR+>42;D8Q!Ojr}!UVa(WfO>CA?kcz&gr?Oe>0No=*& z7L-NSnl-ifn@fypH9C|co_fGw{$Q%AO^`}+jWQEou-p{HIoPFzd zeFj2$^kt&ALnB8Z3@#DkMnSnb5FZa0k4Pm?suy^`TV-Omm*fZsR+*?Zr{`kEC9A^q z^&GEUYSS4%FKz2{kXntDQE9Ok-H78~p=mjybZ5;0Jml8+ZDeWx_MBilcGZ$T0a>1S zR&^xvjOQN=^dGaFO7J#l*5v*qfd-%bQwv zesu!BLB2@+Wu3v>tTsQ^*W;#d_na`MDbXZLJN*7w{86M;7ZnN=yWM%-e0XfqkQ8oV z9UMqYtP3$|Jp6emFN74#at|AX52|%E|LI)DH+9}l<7wiB;%SN^X0*{18UV<}+GQiq zQFL#4mbPXpshGkX`Z{QFG1BMZ1LKq69HH$pP=|e$aaY=G4C5Idv=zU{66Zac1Sk{5 z=hx72$-1Owol|SxxKmpVjvPD$# zPkR^&O{(5GCL^}N$w*r?K72fVbw5+Hyy@X9MO^lRc=pENByn46>W9A1XT+f86xtp> z@Okhgc}D;=tCf5vcbjnb0Af|ar)ij}>7W2Q5S^oX{fhFPH=TRa`5l&G~6s*$fUTVTe7`i)8H)NEE zTV^r5yNY-W?rTc3PM9aXi8gkMo&+B)u?ze~3R&KThGw!Zt zQ-Ki`VlauyQOu~*S$ZNGpG=Q&SUsH3($k#}-7r@C{SBvz$IM=1XI@~s_fMXKR6s6~ zS>%BUC33gi88=8m$H1>#Xe&S;LW)NjJa$k#;mKe4|ComWMdN4y`Q^(jY;q6=K{6Gd zEGSje#tTCO80eVI<^W7=`mQcA4A(L>AB?cvAYGBa+9VOZXpB`l=D_F9hG9j;=+PH2 z6fgqq%6nGo5^MG;!3;KTCM$pvbWvOba#`vBvnd`Unws{<|eK`FD0zGhk zpZG&N&@C0WIU6YDEv*piN=|qMR|X!a2RV;V9&s3Wa4bYvO>va@M4#(7^D@SjdkS#& zs}*?)*@g3iHMWlGotZFZD%;zrSe8*xP)fJ~i8V`x>%uuJ9$CQsG=*}Gx$TbnhlbeQ zPTM|U@Vn)<>>q=yY1~?t8hO28)dfB$xl>)e^vtPBNxlMH|9IQAP2CNLjD1NXkmAjq zpE+86czL0z6#V|F>(nL9pKC)4lX_5%ri~8}SW}B$NFo%zwcLe(> z!hKD0UDXV+0Z?Zs>iSB`8J9~FMo zu9zpvYkdYCwj0?N9RGAhA%ca0x3O(zaUR_i5Y#;;$ZyevP{gwiOq&LkGMPXQ=^aZB z+f`Z<2AP* zP9u@&P9=Ta;g=&__2C%`h^;l{acYs`zs<@!N()s4KPrmtuH~>7q@<`1Yv_&X9A%^( z*;uSLVg9<=<0CBa=Bxs7EEU?N?UYD&Mz*j=5Uxt}SF{r}%YdKt(KRj}D-s7*Ok2OV z#T8UmG-F5Vz_HsrfZ)0z3gQcvS>+6Db=(fI8@h?O;Wj=1;HTlepSz zfTcw|XEa*sW|Dk+J{TpLWc?&IkBX%A*@7up+-4wU^C3n+_R&-@(Ns%h zVft<8QR@!m;@wQg-QP~!h?8;=fZm$%eo240*XdL>b1Qt z0A?nt%P&qhV5lJ!C)iuXSx6P`I4lyY%Z^6mGhscHwUVPBO9!GPUCD0K|uew){C zd;-ZorOEUBA!Oqvt?(rf81B^;GDY?Lv@^x$M5Q+ zZEpK}M(Bb3mPr55dLb{_*fvQ`wO_-jETo?-G=e4FaTjPPYE7SHaO&TR?N$Tkn=f@$ zooBy&63=aDt{aHWcqAVD{*9@b(?4$hgo#I<+(yC|xl}Jx9jUZeINVFY^pOL=6)OFd zxChKKhc;^;ixE;oXxwv=f^aoLJz6k0LNGOOLN(AS!sfR@DjS$V-+cyfToTOcRJ?W8#3|k%r*W86#Za zYyhCwRXuA(W9}3)xu9e?b&x;^1$;xnWnPv@7DGYUpvD!c#*#7#EziZUYjFW?8n;9e zg$g%qO1=lF>I|m$SKWpu{>7m^(PC*fNj@KhM{(0J>uMoA)wz51O?G9FUS=K?C^2IB z48lGLUr>2aoNYJP_jnoNs&u3>wWv@8xzuc(!a_Gk8E#|$#f^S{d_kLfchtsQ z8lC7J5+_eG0S08k_%1j48JB_I|E{f)=xk>LikWxCm~vNjIj9h#rdgGutyWU?=#hQ! z$zf1Z4)_pVdZCB@zkFbFY@TR-CH_zB)SO;Z#$djDu|ocz*gccV zfv%Mnz5z#mwf1$SDz==e{|(ceeK#-9M+C;A2XOZBgd}>cTyfD|df4!zn^FAv{1ZmO zhhg*#`z(d~BW?P-PVlVURqe{m)0_SezpIsNV&Sh01;aNsPS+ZDA&$;&QloJ_h1mw( zrP;L$t@cFPwblHNQnMY@_I&{&#I5Z{+@RL5_I(rrBcoH-4IIwyohtq=qgK)QA;*=I zP1cBqEb;&^_cu7*nlU4pDQOmU1rf>8@*W0 z6_>V)CI(tV*BPAcO~i>O#H^8RP^<)@@9_ZCStQJL2Ut zaMZA34NG)r(%dzapYqQKzlw6kHWt6(s3=nm?tab9`MC>$KsUWlCbpa^bW2&M? z#BfNCa`_F1Yuy(1!gA!m7i0ZIe#pLNlA&Fs*T+K0RE6{{mV#!?-c zBfGdgiuR2DzLZ=9Ntxd1*S`D%zUv#BL5Yxr8JX&lO2o@rhE`>mo7kkkkQ78CTxrbU z4IpXpyZs@(tJr4wGPvypdN+B5;K-~R=w~Tf%_nXXno{sCA$koYE#rPe>nD4IN&C}|Cg@T|3)*ZFCZ6DyrV=F@)gHM0L@zTUGh2h>4ww zg(`h&FA?>$jx}oXhc#-x)4Zl5WpFM@i6&Wj_-4 z=UdjIsqgv{PC;o!ahZqrnbsa)6)YvAeNbQafR&;(A{gPmFIQy8Pe_ zL}=i`e@pc)+_Sjr{H0;0Q94~d8=A!#yZ8f{$I)&e@7OV47mYag1dugfi=-Mh3*02_ zJV%8NfvRtlGw>1xih@wRT;l1p8X76zlKvh#93WxTI>9d4wt-Y$5x}^7g9Y?Hy4dt- zbq3++RqeHH;7obBv3NG{K2vD^p39ebmi}2c#BY5VbR;VecBwiO*YHy%IDZff~Igx`B=&*k%%nHS8D=2_90!8MUi1i3`RYIEhW{3ivIWfntih zSa5{pI}6CoqtmOu6+QCa#=O7RwT1|y3hgF^>geCjNE(Ede7tPx$=^WDl7VoKb8s3_ zob!phdZzXL)%VtaBK8S=L#o0#S3B4NJMH|5NQj$et>RF!^)}%BEgz3ZEQiS3-2M%! zn;ICKOWNWQJbj(9$v1GZtTgEmpLj+PZS=|dpf<_qj-24Y&w8(F52+FPGb{3%`9EMQ zu`?L-{sT5W^#3O1C$%)_e_3sFbB)HvtH(XMfO`G#Pf;6**tF&U0JXaOcZ!)McQ60+m(`?8NRBT&h(w<4S7_ zBR7H>X**h?ZD?Y6s9nk^M)3%#65bW+mP!&ha_O;M-gzS`1SC1S4<6<44A}YeNN~1P z9tQ|&fp(|&1F}a8bvR&!Fj{$A0kLv~XFA(NUPGtI*q0@u_#=BDq1Avk$N)LEWSHDrLC1P4^w>rKtVsVnmFbLiGRnd z&M=`e8&ml`PI@ujO?e%?#WU~x%iltF-^a$Hm-RG`hZCJU&eCk}7dvd*TC8*hSPY~Z zw`xiB5#*eWl%0D6rhssu{ZZoeo{pvcH0HC)l@g}#;g16x7PxeV9X?d3)34QY-^{_WsD0XHXo~-a5w5c`I}X& zoh_R?S{Hx!7L8_+h2_ z8M)jbs;O42Y7;?_y^B;IdYahJ$=(w~4e%f`QXVPJKZ07Hi}oD&@@(7l=dV1*_{|ad zpfgC!uu2lq$`}eQvWfy-)JGj>Yh!pANwm)0rxQ1L#Cih3dse}~GxOy8_=R+ocKIj( z#VDk1v)Tb-37VsS@3>aAr>zr0iCcLYO`Nk==(to0l{59F(zBYl7Ts?sBV;BV*f{R4xj>=^5iA>i%`d-&_mm?u8Em=b8tjnNkn(}ag z%4l`7nI}T09nxAG|Km4ET6kb#q)h7f;j6i;zQhN0sNwv@CCL4~u!Pb4QUzmJuphdE z7D8vqKmz?wModE&jG{GyPRD)>hF*pc*?5$8#&(1Yxw3Fa)$al!e z$tKhDzfcy2|LqfzjYV)`B^{raPXE5JhdPw@%c9iWUQ(1jN8+Da=5}Xzbn~f_<95 zFi`o=eLjCp4vr-L`}Kone^Vu2Bnhnl&rDe6S>@$+zu!HrIDJ839l3FEx_;=#X`X%{ z+{HU9tmIxys`OJ_Xz(%iaa{WY5OJaX&wP$CUZsN`7z?hS8Ar5m@HZbNWE`?A!nr3j zM_E^_7i0ZADpL_ho+T$*XzS>Um8vnd%O|ynCaa8Kdx5IwhH__n?G}jOkvtAgHP->` zEJwZdsAHZ@&dM};Lzh!T-n->3m+ts0U3PVEOg$8DlB5Xs&1-mJ*p-=t8?p2P)k~RK zXakUGgo_OuK&$nI>E8s&TK6SkTq#~m2#m5&o?(*`ki-!ddHtbXizQ%z`tphEhoLX; zZxV8FjEIjg-L+TLq8~Q1|WX&}cU;IV^!HXx*KFLaqSz+-8%;*Pc@&7xFuuQRD=(Kl1(7@JigSoUeI4CF;&y*o zXy8QUT+?`My&>hV+tO_aB{X}RV1!=VKmvamNu>XCG!O>OJ=&uk|fH7_F22hA(JZ;=lZG|1E|4z&63C=A^~Yt zcYj9iu0h76AhT!+^$wySuv<4hCdbZY4`JzFepxWbUF&)FA}Ra@9#dr67^92|Z>!&t zQQEiE>bSP|J%f6uIfIVDv1{fUHf&*4wco!A7fab`W~~R2(JO?B9au#$;slu%kPLo& z{SSLTisSLE{|$vUs4xG#D%-j+n(IYnFPMQ!Ng-bbHEw% z$+h*V5Js@R1tZn*#mjW-)5oKb-^btUR;@2_yY%326e9i8U-)Bg9+JSY(Qo36lD=e> zIu*8jATN#uY4yoql1@tZJ_ixziA}|Fi-PIZ<|sm38rLms!9-hHmEEOKDqduq=$HOP z0h5}KqZd;U{ZVC67#V=Xafoj1G&;E z*)aStv?|X=PeB82Q^?w-)Kzs--Y)$d8O33jRu9=G`%8mk@yu9v| z1E_c|eVkGY$!Ro^?FT$w1SYs4?t3Jyk!nY_Mzi*LD-uCL23D&kng-`DFYqJtG3X{* zH~M>?J}Fw1kSiW;kCm)u8I8l*`+$LEwSTFf6;PnQ*6!;?uc9z!6Khk=zVhtV2vZX@ z2(|Z7v&k4G{O zYoQ%DIxt^debJJV0js#6r2SL|2Uphx<^jE{Z87?+=lj1&p4T0IB)}Oal4tbJhIE`d z{tv{*52%;pfsKh($kjd5jSxnUuJeFQa_;JWM}4%F z;28=DiM+%Jvy$H^ASw7aIf>?e{aEdx-VJoddThJM`~2VBtnY3013-WI0)YSDD)e6+ z-7VQv))VvQidC*Q`gNiY}dV&cY(|H6pU(;+v1VC6M>R?)$?vaUhg4 zc06v6@9n|keUY>XQ?0W>Nau~NCtfQEwpfl&)P+l>n*I?sfF|m;T#q_5GV+a&lI6dNMa6 z2*rCY?cc>PT?MPWCi(*DdS^OX_rLyV~8XRCI$QIAc;yp5q6TBK$ z@P#522<~u}UB&NZ5fyo!+ld#txV|j}nWIZW@X&NY08tH{pwaAYoYV{if6KtZI*W^6 z4CdePkN?(ka2#(jK^WX8O!(RP=qAz?vcFf10VufIp^Rad<{;3qO;p?3A~B6XA&G(t zQSzGf+i2&HD4LYX!3-?x7`x8zmIw}I2aJ3=h_Ck~f0d6slD*Q0VrA5I!@hO^W#=!~ zNt5h#E#d9v5S@e998Ps6eDqPPyJt}KYjC-KET!UuE7^0dazfXFB|_AjjsXfqJpC<< zdWfifYoDc;rV2}#ikEqazmsSf@7D)*3-jlo+u6QX1=A=AT#R_&Nww>iAWkO$&xK0f zjGs^|Es1Pg6v08cH~UmbQ4UR@pUa+XTjnDE5gTL_ID-sKFxFi{rYBx+!eY+Yr_1-E zyPM!HxNbR(p@EH`SrPiK7aP~bbvs26dax|TzSz$@M-sC}N8+D#I=>f^WaHtV z<_FO*PUzyl9)?R?#hFFEuJF;xZ|Ro?xRO=ldus1eLKMh9{~`I_Q2xsZq`8TJd-Xtb zIu+Gn_d+b;#gM9Lkp?xe7Ffl(bf6is&nWX8LYnm-;WjLIhiXr|>m+kuKttUQf_= zj{|fhEd$4dlzBWC?hs!=kL(f;iT-%eM|W}_7dFN`KWfd4F8m0rf9KDlBnqt;5Ig>k zm?bYJ-ssondxXFM?EDs>EyFe3vxiiBkte)%GzAkhM5c+|Jz4iZNKZX;xfl=P?DWG% z&t!r8rGNt7;xhv`T#3Qq&N59GH#q(1rP2=bY}g>9dC>P9obphRz*wM5(57ooDU7#_ zWg(LO_{@sSTDotL9U!wU`p;s4H@@hr9#mlgzTPO4>YoBV(a1hzPaOK)Fm$W6pdLfa8j3&GrPa-US>jlmN)hDoPAVB|d& za`GtL=!?BTVmu}2c24|cpHIkT)}Jmf&huAIdpT6q4-rq4Hibz)>AXl)y9(5gB<+k( z=zzIcm~o%PKw3}X;+DJGw#>8Hz(SUzls1g&NYulEq@2H4CypPO&6*tCn~9&i48BPw z9E$qCdOKjF@f91m6yBtXNyl=uQMx|=7kO^9l$)GGeS!R<^MCWOlb;`CAP4bZ8z`&F z@?C{704lI{NWV3jDLzl6NBgq`)ElZ4P zOFqQrg{O+eu0skD{$h}fUNu`>0O%q&CRXd=O$xwyyXr>+`0Z7SfRjGo7;#C~}1Yq(Hh@skVjokcqdodG~$?07Rx8M}4t0y3qNz6-gB{4pY%LL9?hTc_$YwJh~uv4}~)Ws{vzWamsQ+29AnuST= zhqBD<&c;e-8MCJXv{}SKPL@?faw#Rym*8g(onM!AWQq-Je`9+pT_T-F7Hn!GQ98+{ z>;yq*nK7=|F{RM78g}bMg<6fNyaQB;1u(MI zEUL`xC+jSfaa~!==DDla#S?*au!HQ)*DKaURzu}6-+5-^-hsy2*fSi-yqF@y$Z8n! zdr8&3!S4OenL4~BcMygtS5n7?LZw;>|9r=1_+TnY6o&R%+&+&?fjv4)btH4OesVhY&;&7+Qec@m(#J@wz~ltP$H% zjg*iPT&|qP5qqotWedA|pE#rwx)?YFQrNb0RcCPRGx}r}bWvHlavBkq4?x0M<#jku z`lei~RwIm%VRWug>I$T6vT*cl1li3}OkZSRd9q!Q-Q&m~H0{w&;eLgS<)(jvIi9^p zsN@yt*`eTG|9)RYwBpaFeN+;guHIu74-iW5d=#1pbAYdegA7+!PsP& zWJ|njCKHmK@(^l+lM8P&R5p0X!DzpZGYDm7pU`RLBf@l;s=8##QT#=R6*S4&DQXMIic0DgXc`9`vGk8oyS3$^S9Eq zXZDJ2QepgG;pwfVbq|jFD}yWSZ5cmANOw3ZvC2r#Sk6Ih9I>q9-FS48=tWr=wp}KS z30Bt1eyC~3hVrBVl{=OBAy@7YNcPCTun4rQtB-%NzBL0F6&P=D9y!aW z8+ue5zcPsTrr)<_Uf7UXo3zf}+702lc1cXVLet+QxYG@@&e@~8H;_VA&r$svc<_6! zi&JWvDHp@vF@50vwz|E{^0W;4->95Y9yI;WlykxT&y>H3DuWc1Fhx)UrUC&B{7i_? zE`QjlSL*R-{8L18{u78!(U&HLwg|P8N&nnhaQ2TvC>RR2t z53eP!M~@>)Upl=hZXRxL-w)hSWjKrM@h)KLkXs;9%fh%C7JaxB?`T;a#}eEJr`S)2 z&teuQH7XDv%|JE;4$u;8iWaQP&BKZWQVY~*ZkGqw{`$BBy*brp8ZcBFej7?p!OYR9 z5Z%dL4N-=6Vi2(H3jKrQ6$Q#xlxy-?EJvEwuAB=x=smB+@`v|bxZV|*yj~3KnF$ZG z*xJ15Zn$`3ldW^S74u?R`EUAG9sZ=V>#G8nW@vJP-k=kBfSM25T)`M&cNItKk?8Nf zVHNViyE>cE(b>Ku+T_m=!A*>l@{S8LXt@cXF-_g$4Ae$RpSF}tr? z3ECP;bIf;;>Mb|HL}3N1c=-F0)z`w7i9bSG@h{l^UXm-?J$s>Bt`}T&#=68Ggb!EMd*njlv}xp*Q>^Z^lsT;A&1x_MLw@cs z=+a%!xlg0A)+DY*l$g5{(XVF_Eda9hz=b1Fhb&Wi2%gYKXq zVB|x|jLTA5T~eP}wmTKr*i~`MNiU1l^}C6NF0J*Magd%1xgA@zKsjz!Kt=&?*P?$# z@gYSB{if@Dyl(ZaNWZOcS9wJc>{ns`LyZKJW`|hf-A9)Riq%J+f!}Ij%yK!6R?%R( zGt~162IMAnekJ32`F>xRu{|FHl}OOS!)|RYU0k4juOu;EoefoJGKWoN)HJ2NiSv(> zbNmcSm%KFpAAOCSt5K3*-3|FHoC>x@GJwKv$+AXr_)U&h5e zjMZ`JKg4v_ORZj6to{|&NUi(9m-hX9-|g?z`3ZCzJ(=*jOFlO99!ahaCz3`z&I^;D z<*i^$I@A+0`y#!B-(pkK#B?w5Ap&6%9h(~g>bW%N$Z^dLdfooaK~`e)6N}X&ZQLwe zH7TsB-hagdQ*%uE1&!?m2j?7Z0)i7DBxtdzP9z7^ZN5RI~xGXHBF#8yCI;8vOix-H&@b(iZ5 zmn*5A69LC_iGajzrliN!xC6s#6eHNhe2#@ly5c2ah}RY-ut!>PA_F<~<$699B6E>B zgG5Ri6PINODch<%y9iWH@EyTXkP|~J@T4w)CSO|T6bt{d5RdoCJLig*)EPlzi1TWM zhY4|oKGgM;-hC*#iUSH3_7#1rJG|RF8%&{e!knd9%4!$Y-lpg~HF_f#pd*VN7oBmv z8!)Fx%(93XRd|$Y7&%h)IF95`F)56#&t&zdqV757nfPl!JnA(tpHut^--1*HB)-HKo?ki$RDLACv{SdlxPbw*X!E@(A@sPuICVQ!HhfSrXNYPNjkB_0Zl1zB12#1v`!|oS% z#S4*kg!G}SQUbIXh(%>24rI)!h{&=L;uK9UP{NtMT7n?;l~Bnj7OeXbU{xS*GM=A< znyTPSvcC_Fb^KWNSnO*@m=#Ha&%aEhy(mh~L-7TJhGm23Z{di71Vw*6x$II`W3*Xo zU0+ZJeeWPXCQ>B!^z!EK9r6{9O4gQ;)w?k5*%GAC?c={{8 z)scUw3Ii0czZSlPZj3VKI2xR8exsY&OuGoRLpt9^E`;sBg0@oT`x%;^=x@a_YuF!N zF~D8+iM@7apeOe%Uc7lGq}PAk9X#aON%={3F?I0vkquPt9`^zYi-PwSy1-%gzy~Ks_caszc#e#55G2MrIP+b2@xD+~ z1Ob!GfcQ`@x%*Ik`tZQ(9rnKiMp;h{I>Ep8mK);#G(S&X=%41}vtklpjF#Gbr@(|* zVGM_|Xw1i^m8~R-TEr+vPxLMK^>OKn4tWwY3@1WOd|JL{NSs^Z@uX7XR>6AWX`q-Bj9(hZTO+jK?c$^u>a zWC=L3hS-h8Hy~KFOi_<_0c7-X$nH^|n8H5?)|0v$pU3f*!z?Z(_I(xd_kJVYS|c9{ z(4zT#Y?Iqi?{oF zkoW7&@TgAi@W3>6&~m_7?<~V%>}tN(O*=QGp2+(z-6w1mg|Ez{BlDuho$u<_NX&Hx zL)e~Bno8at*2b|D@B;hHdL{=g{#Um(eKf!o@rP0&A0hyI_YzlowG?-au&8@9tGhqN(+V$}?s7Bqo@$dUWQZW}3F z%H?i8x5}TY#6bU zjkU6yKn;Z@H4e zF8@o|S)T~R+oN^*mPP_1(eD!zNf#v2oXlfs?QbK-n=rTnn@$5)Q-z4t2{O$JHZHZT z_(G9vnfE*E&y&pbphzt!r5plXJ}wIXJfH$YmT&iaF|`P_SQg)VYuCTF>Z@$QKO2(- zpJ9PU+yWePJIFc&Jd4sFt%96j$pG1kKzJo6x_J+BQXjfHvHhA z2L(`@TEVoYO7{ShMpHHWh{x*t6W)A!idMuSL)2eByF8;v&L$WR_TnwhK##Z;#sd|x zcjlFCLP#|j98Q2DiXl;~gkqzX1;+Z}V6Wn|l>#$uTPfVzF;5&i|`Lb1|ZO-#S=Pvk2R>q9H z`NJwhV0B~4@b@)E`;W$l0x(`$q7?v6en!CxJk6WBj#ev5T7JY;Dgq%i}&k45--#QFG!a;X^o}VSXVC?8SAf19)85b zLYA&sew{0ZszmvcZDU=xkd=pBqOanHYag_Du;qk=tlWIJ%Txk>{kpl5mk@`cvWP0whK5##j z7m}qvph(6IiW7S>9s3{i?W_?C3kQ64hCu`{8+DB;3M|}h`cvct3sq!G1ZZ<_ z$u2dtJGCn|>|sNVmDE8$LD5cZ%4J!Y2;JIZDS>`4xNcw!_%^3h-`LJ0_{U)WJIz|> z)w!BZ^k_FapbMbQlmDd1kd7@I9)37RV}bD)tC3Ng)NV1BZf{6ok}<54@YT4r)fl~R z>O5OzVg@kDKAo$uM+sTZ81EJ2MP7`qjK%hHn5u$ZQ;`W-N^d>U`aJ zD;0#6F{W{5mB*CVfV5@w6O~Lbjd;F-(H@XahzwEzTO&GP#-K5lW80d!ZSuc_gZl6F z_8g-)V)pG(Vz+tEbo?|Crr9r6rOl#g(NOs#Y}0{pA0d(mwaQij+-gUzva&tHvnGSr zRvhxXSy3|P<;fdO$AOk1D=QlMLor~36C@(Xv`Kc3&b~VBxHf~TgRriNyS`A#bpKZq zWmr6~h7$_N?{kr*!HT4ORVM`xAnYyoj&N%&jCPL;;OqC*4H)0JWu|p8B)O>0NKhDZ zs7-n#-(&Yc!3qtPs|P_9hTabOBd(<5Ngv;y2Zi54)1u2OIhE*h)YxV}caBn12vbYY zQBP6T)9t2}{*+3@sY(Bqce3`#6nAXbk&WQ@S!RK6+6BYV#DSy;rOG8=QOP#TS^why zCqg%s8~kvP$ve~}$wL~fpzr!t8Xt;mjZaq>9B&x{d@}2bEwoz~><-e&it8!%>-H^~ z_VX8x^D>aTR~K7bGDl1N>^@B#$|R$DVXDQqn4HjP8(EW%9n!(F!4Xj!k=n!&2y|o- z8X}PAURSwmxd9v`M=qbAIiH_1pzY(ocSFR2pE_TDru@JX2s~Tt0Zqkoq3A>wd0Mvd zuIB)49Gw)+7uwCo=_ndA)0skZCYT2fovc`OhA)yh5hta~!1xuvA4)wdm;rei&e zYxJd5ZK{cJaq)T_BK&fvQt!xz)T1KIT9T5FE;DyUsy57;O?!W75ldn<=28W zbgY`}7VE)ko+~aRpz%Zdvh(eWKk{^TNccDKcyZbz)wL<9xR>kf?t_Y$fJHb>X6I_J zqa50D84D>Xhj8ve>{Wa>oK`qMe}HCI4#$wC;~6v0*d$Flr2h7Gq==@gqUU1$-HSGx zQ60PN->a|)t!Hh&pMs`XYGDXnUehk~PNP2#1g5Zv7$`2gK>6GIMcUG(9iDo;j=D+p zh$D^Db3x|o)7Xd*rzQSglA@g2G%m8llqG-lu9X@G9DtX4qw)45C~2Zo_te3R=i|Jk6zBcGV#6 z!;Sz9^l&ea@3&G#JBVJ7!2M)0r=GL9Wj;&uF$?k?!)~=?pI)*yhydzp;l~3(1aY0t z`h!^F%?5*LM3c@A2)6t`0>nUEaO1W7+jFsp0yv06LDZu`Z+%S=AuQF|YZ*Lag+i{A zk$d9gVBU623{e+a4MOQBxKs6~IxXxy9YU(C?aaJj=9{w+m(6F~OB-&D-h{d>BpuIWU-wyftDEI!RZh z(=fP!E(Y~Z+{mMZIKB}mh$PO7J!z$2Pj?844}Y`zf0>pa|J9&T^e@#3O4 zh}Yu{y7G8=#VU*i@g{Hgn>}BBplCaE_P2P*pApm%xx=wW(-b9$w|V%t3vw;<9sei6 z^!{|mJbS!TFMk)+T&5`wojGZ#YuO zMsk*uw^BYql&i^u7SzgD0uF;j)vtHDHznJt&#&(jvP>Ye29X zW8kTBuD2Yj*sH`1m9$bh7Q_efp#XjnA7(~MA019Q`5-=uI~DaY!PDvzZKYg4+$OoFl``8l@S>L;xk6CpXsca8*>gN7pTAuK9G7r%8N9 zmG@hJEJO(_l_;`Pvo-Z>8+C)@f(C~l7nu_j+u@>3{C0Kzm_^jU?~)Yr$3FYvqMfgl z`;&rOf1>D8o-W~X0H4PfC>;rvX-{`2zLs9y^hNx>Zu$~c=iX)wmv;p5hu+d3Rbob& z+{w&3htWS~!X4G4o=a_~M+NaGnoeH8pH|9$C+*mqsd9j?R4?qQioib?te7iJcQKh7 z);jYSf@KSc?>WU^2Jj;Oib0^cJ;QKYO$q01F4Lm%{{~;v6MsvaL`Jd><2c}rGHRL-!hnNiLC|Dgu_JpNO#=%H={->1Xy7`5te zd8k_p#((2~0=R;!vl=ooY-?x#BPOmy(b2T!q2~5O9(GHRovs8hC5w01)z-w*xM0MPiAT-sl-3dQ_?_A!#OU7qg0pH3jP5@3%Zb-Zn%>|w}t+c3mYG~Rn|4Yp4EM8i!beU(t(lsTIrnAO1-RK zZ)p%V;mtGXWae1*sNEH_(nG`6Zo6QOSPAwmCk7Q%Ak`ny^Km0dKt-1=?zGa+^@O(vd&_aZf;>JhV;?>$^yD=zU-xj z%ZR;JKF`NgZs!Z z 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 delta 40319 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 *Rszm@0OCMt^C=pO4I@GN$>j+x| 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cbed6ec0cc..9b7cb4af38 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,9 @@ -#Mon Sep 28 14:32:43 IST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b9bb139f79..249efbb032 100755 --- a/gradlew +++ b/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/gradlew.bat b/gradlew.bat index aa5f10b069..03754c4c3d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,13 +19,40 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,24 +87,26 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command -endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :exitWithErrorLevel @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts "%COMSPEC%" /c exit %ERRORLEVEL% From c90aa3a39fc85ab7f9dc12c53821d7dd6295af1c Mon Sep 17 00:00:00 2001 From: Aayush Babu Date: Sun, 18 Oct 2026 00:48:27 +0530 Subject: [PATCH 4/4] feat: add local database schema, sync worker, and music data access layer --- .idea/codeStyles/Project.xml | 1 - .../43.json | 2749 +++++++++++++++++ .../pixelplay/data/database/MusicDaoTest.kt | 153 + .../pixelplay/data/database/MusicDao.kt | 24 + .../data/database/PixelPlayDatabase.kt | 205 +- .../data/media/SongMetadataEditor.kt | 29 +- .../data/worker/AlbumGroupingUtils.kt | 15 +- .../pixelplay/data/worker/SyncWorker.kt | 63 +- .../com/theveloper/pixelplay/di/AppModule.kt | 3 +- .../pixelplay/utils/ArtistNameKey.kt | 41 + .../data/worker/AlbumGroupingUtilsTest.kt | 42 + .../pixelplay/utils/ArtistNameKeyTest.kt | 74 + 12 files changed, 3370 insertions(+), 29 deletions(-) create mode 100644 app/schemas/com.theveloper.pixelplay.data.database.PixelPlayDatabase/43.json create mode 100644 app/src/main/java/com/theveloper/pixelplay/utils/ArtistNameKey.kt create mode 100644 app/src/test/java/com/theveloper/pixelplay/utils/ArtistNameKeyTest.kt diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 7643783a82..6db4707229 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -98,7 +98,6 @@ http://schemas.android.com/apk/res/android - ANDROID_ATTRIBUTE_ORDER

diff --git a/app/schemas/com.theveloper.pixelplay.data.database.PixelPlayDatabase/43.json b/app/schemas/com.theveloper.pixelplay.data.database.PixelPlayDatabase/43.json new file mode 100644 index 0000000000..b199158dbf --- /dev/null +++ b/app/schemas/com.theveloper.pixelplay.data.database.PixelPlayDatabase/43.json @@ -0,0 +1,2749 @@ +{ + "formatVersion": 1, + "database": { + "version": 43, + "identityHash": "e6c4f6c20d810ef8cb2cf2856151cc0f", + "entities": [ + { + "tableName": "album_art_themes", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`albumArtUriString` TEXT NOT NULL, `paletteStyle` TEXT NOT NULL, `light_primary` TEXT NOT NULL, `light_onPrimary` TEXT NOT NULL, `light_primaryContainer` TEXT NOT NULL, `light_onPrimaryContainer` TEXT NOT NULL, `light_secondary` TEXT NOT NULL, `light_onSecondary` TEXT NOT NULL, `light_secondaryContainer` TEXT NOT NULL, `light_onSecondaryContainer` TEXT NOT NULL, `light_tertiary` TEXT NOT NULL, `light_onTertiary` TEXT NOT NULL, `light_tertiaryContainer` TEXT NOT NULL, `light_onTertiaryContainer` TEXT NOT NULL, `light_background` TEXT NOT NULL, `light_onBackground` TEXT NOT NULL, `light_surface` TEXT NOT NULL, `light_onSurface` TEXT NOT NULL, `light_surfaceVariant` TEXT NOT NULL, `light_onSurfaceVariant` TEXT NOT NULL, `light_error` TEXT NOT NULL, `light_onError` TEXT NOT NULL, `light_outline` TEXT NOT NULL, `light_errorContainer` TEXT NOT NULL, `light_onErrorContainer` TEXT NOT NULL, `light_inversePrimary` TEXT NOT NULL, `light_inverseSurface` TEXT NOT NULL, `light_inverseOnSurface` TEXT NOT NULL, `light_surfaceTint` TEXT NOT NULL, `light_outlineVariant` TEXT NOT NULL, `light_scrim` TEXT NOT NULL, `light_surfaceBright` TEXT NOT NULL, `light_surfaceDim` TEXT NOT NULL, `light_surfaceContainer` TEXT NOT NULL, `light_surfaceContainerHigh` TEXT NOT NULL, `light_surfaceContainerHighest` TEXT NOT NULL, `light_surfaceContainerLow` TEXT NOT NULL, `light_surfaceContainerLowest` TEXT NOT NULL, `light_primaryFixed` TEXT NOT NULL, `light_primaryFixedDim` TEXT NOT NULL, `light_onPrimaryFixed` TEXT NOT NULL, `light_onPrimaryFixedVariant` TEXT NOT NULL, `light_secondaryFixed` TEXT NOT NULL, `light_secondaryFixedDim` TEXT NOT NULL, `light_onSecondaryFixed` TEXT NOT NULL, `light_onSecondaryFixedVariant` TEXT NOT NULL, `light_tertiaryFixed` TEXT NOT NULL, `light_tertiaryFixedDim` TEXT NOT NULL, `light_onTertiaryFixed` TEXT NOT NULL, `light_onTertiaryFixedVariant` TEXT NOT NULL, `dark_primary` TEXT NOT NULL, `dark_onPrimary` TEXT NOT NULL, `dark_primaryContainer` TEXT NOT NULL, `dark_onPrimaryContainer` TEXT NOT NULL, `dark_secondary` TEXT NOT NULL, `dark_onSecondary` TEXT NOT NULL, `dark_secondaryContainer` TEXT NOT NULL, `dark_onSecondaryContainer` TEXT NOT NULL, `dark_tertiary` TEXT NOT NULL, `dark_onTertiary` TEXT NOT NULL, `dark_tertiaryContainer` TEXT NOT NULL, `dark_onTertiaryContainer` TEXT NOT NULL, `dark_background` TEXT NOT NULL, `dark_onBackground` TEXT NOT NULL, `dark_surface` TEXT NOT NULL, `dark_onSurface` TEXT NOT NULL, `dark_surfaceVariant` TEXT NOT NULL, `dark_onSurfaceVariant` TEXT NOT NULL, `dark_error` TEXT NOT NULL, `dark_onError` TEXT NOT NULL, `dark_outline` TEXT NOT NULL, `dark_errorContainer` TEXT NOT NULL, `dark_onErrorContainer` TEXT NOT NULL, `dark_inversePrimary` TEXT NOT NULL, `dark_inverseSurface` TEXT NOT NULL, `dark_inverseOnSurface` TEXT NOT NULL, `dark_surfaceTint` TEXT NOT NULL, `dark_outlineVariant` TEXT NOT NULL, `dark_scrim` TEXT NOT NULL, `dark_surfaceBright` TEXT NOT NULL, `dark_surfaceDim` TEXT NOT NULL, `dark_surfaceContainer` TEXT NOT NULL, `dark_surfaceContainerHigh` TEXT NOT NULL, `dark_surfaceContainerHighest` TEXT NOT NULL, `dark_surfaceContainerLow` TEXT NOT NULL, `dark_surfaceContainerLowest` TEXT NOT NULL, `dark_primaryFixed` TEXT NOT NULL, `dark_primaryFixedDim` TEXT NOT NULL, `dark_onPrimaryFixed` TEXT NOT NULL, `dark_onPrimaryFixedVariant` TEXT NOT NULL, `dark_secondaryFixed` TEXT NOT NULL, `dark_secondaryFixedDim` TEXT NOT NULL, `dark_onSecondaryFixed` TEXT NOT NULL, `dark_onSecondaryFixedVariant` TEXT NOT NULL, `dark_tertiaryFixed` TEXT NOT NULL, `dark_tertiaryFixedDim` TEXT NOT NULL, `dark_onTertiaryFixed` TEXT NOT NULL, `dark_onTertiaryFixedVariant` TEXT NOT NULL, PRIMARY KEY(`albumArtUriString`))", + "fields": [ + { + "fieldPath": "albumArtUriString", + "columnName": "albumArtUriString", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "paletteStyle", + "columnName": "paletteStyle", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.primary", + "columnName": "light_primary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onPrimary", + "columnName": "light_onPrimary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.primaryContainer", + "columnName": "light_primaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onPrimaryContainer", + "columnName": "light_onPrimaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.secondary", + "columnName": "light_secondary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onSecondary", + "columnName": "light_onSecondary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.secondaryContainer", + "columnName": "light_secondaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onSecondaryContainer", + "columnName": "light_onSecondaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.tertiary", + "columnName": "light_tertiary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onTertiary", + "columnName": "light_onTertiary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.tertiaryContainer", + "columnName": "light_tertiaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onTertiaryContainer", + "columnName": "light_onTertiaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.background", + "columnName": "light_background", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onBackground", + "columnName": "light_onBackground", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surface", + "columnName": "light_surface", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onSurface", + "columnName": "light_onSurface", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceVariant", + "columnName": "light_surfaceVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onSurfaceVariant", + "columnName": "light_onSurfaceVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.error", + "columnName": "light_error", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onError", + "columnName": "light_onError", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.outline", + "columnName": "light_outline", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.errorContainer", + "columnName": "light_errorContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onErrorContainer", + "columnName": "light_onErrorContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.inversePrimary", + "columnName": "light_inversePrimary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.inverseSurface", + "columnName": "light_inverseSurface", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.inverseOnSurface", + "columnName": "light_inverseOnSurface", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceTint", + "columnName": "light_surfaceTint", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.outlineVariant", + "columnName": "light_outlineVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.scrim", + "columnName": "light_scrim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceBright", + "columnName": "light_surfaceBright", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceDim", + "columnName": "light_surfaceDim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceContainer", + "columnName": "light_surfaceContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceContainerHigh", + "columnName": "light_surfaceContainerHigh", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceContainerHighest", + "columnName": "light_surfaceContainerHighest", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceContainerLow", + "columnName": "light_surfaceContainerLow", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.surfaceContainerLowest", + "columnName": "light_surfaceContainerLowest", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.primaryFixed", + "columnName": "light_primaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.primaryFixedDim", + "columnName": "light_primaryFixedDim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onPrimaryFixed", + "columnName": "light_onPrimaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onPrimaryFixedVariant", + "columnName": "light_onPrimaryFixedVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.secondaryFixed", + "columnName": "light_secondaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.secondaryFixedDim", + "columnName": "light_secondaryFixedDim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onSecondaryFixed", + "columnName": "light_onSecondaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onSecondaryFixedVariant", + "columnName": "light_onSecondaryFixedVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.tertiaryFixed", + "columnName": "light_tertiaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.tertiaryFixedDim", + "columnName": "light_tertiaryFixedDim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onTertiaryFixed", + "columnName": "light_onTertiaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "lightThemeValues.onTertiaryFixedVariant", + "columnName": "light_onTertiaryFixedVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.primary", + "columnName": "dark_primary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onPrimary", + "columnName": "dark_onPrimary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.primaryContainer", + "columnName": "dark_primaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onPrimaryContainer", + "columnName": "dark_onPrimaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.secondary", + "columnName": "dark_secondary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onSecondary", + "columnName": "dark_onSecondary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.secondaryContainer", + "columnName": "dark_secondaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onSecondaryContainer", + "columnName": "dark_onSecondaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.tertiary", + "columnName": "dark_tertiary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onTertiary", + "columnName": "dark_onTertiary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.tertiaryContainer", + "columnName": "dark_tertiaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onTertiaryContainer", + "columnName": "dark_onTertiaryContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.background", + "columnName": "dark_background", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onBackground", + "columnName": "dark_onBackground", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surface", + "columnName": "dark_surface", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onSurface", + "columnName": "dark_onSurface", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceVariant", + "columnName": "dark_surfaceVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onSurfaceVariant", + "columnName": "dark_onSurfaceVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.error", + "columnName": "dark_error", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onError", + "columnName": "dark_onError", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.outline", + "columnName": "dark_outline", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.errorContainer", + "columnName": "dark_errorContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onErrorContainer", + "columnName": "dark_onErrorContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.inversePrimary", + "columnName": "dark_inversePrimary", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.inverseSurface", + "columnName": "dark_inverseSurface", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.inverseOnSurface", + "columnName": "dark_inverseOnSurface", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceTint", + "columnName": "dark_surfaceTint", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.outlineVariant", + "columnName": "dark_outlineVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.scrim", + "columnName": "dark_scrim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceBright", + "columnName": "dark_surfaceBright", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceDim", + "columnName": "dark_surfaceDim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceContainer", + "columnName": "dark_surfaceContainer", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceContainerHigh", + "columnName": "dark_surfaceContainerHigh", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceContainerHighest", + "columnName": "dark_surfaceContainerHighest", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceContainerLow", + "columnName": "dark_surfaceContainerLow", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.surfaceContainerLowest", + "columnName": "dark_surfaceContainerLowest", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.primaryFixed", + "columnName": "dark_primaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.primaryFixedDim", + "columnName": "dark_primaryFixedDim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onPrimaryFixed", + "columnName": "dark_onPrimaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onPrimaryFixedVariant", + "columnName": "dark_onPrimaryFixedVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.secondaryFixed", + "columnName": "dark_secondaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.secondaryFixedDim", + "columnName": "dark_secondaryFixedDim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onSecondaryFixed", + "columnName": "dark_onSecondaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onSecondaryFixedVariant", + "columnName": "dark_onSecondaryFixedVariant", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.tertiaryFixed", + "columnName": "dark_tertiaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.tertiaryFixedDim", + "columnName": "dark_tertiaryFixedDim", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onTertiaryFixed", + "columnName": "dark_onTertiaryFixed", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "darkThemeValues.onTertiaryFixedVariant", + "columnName": "dark_onTertiaryFixedVariant", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "albumArtUriString" + ] + }, + "indices": [ + { + "name": "index_album_art_themes_albumArtUriString_paletteStyle", + "unique": false, + "columnNames": [ + "albumArtUriString", + "paletteStyle" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_album_art_themes_albumArtUriString_paletteStyle` ON `${TABLE_NAME}` (`albumArtUriString`, `paletteStyle`)" + } + ] + }, + { + "tableName": "search_history", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `query` TEXT NOT NULL, `timestamp` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "query", + "columnName": "query", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "timestamp", + "columnName": "timestamp", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "songs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `artist_name` TEXT NOT NULL, `artist_id` INTEGER NOT NULL, `album_artist` TEXT, `album_name` TEXT NOT NULL, `album_id` INTEGER NOT NULL, `content_uri_string` TEXT NOT NULL, `album_art_uri_string` TEXT, `duration` INTEGER NOT NULL, `genre` TEXT, `file_path` TEXT NOT NULL, `parent_directory_path` TEXT NOT NULL, `is_favorite` INTEGER NOT NULL DEFAULT 0, `lyrics` TEXT DEFAULT null, `track_number` INTEGER NOT NULL DEFAULT 0, `disc_number` INTEGER DEFAULT null, `year` INTEGER NOT NULL DEFAULT 0, `date_added` INTEGER NOT NULL DEFAULT 0, `mime_type` TEXT, `bitrate` INTEGER, `sample_rate` INTEGER, `telegram_chat_id` INTEGER, `telegram_file_id` INTEGER, `artists_json` TEXT, `source_type` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`), FOREIGN KEY(`album_id`) REFERENCES `albums`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`artist_id`) REFERENCES `artists`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL )", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artistName", + "columnName": "artist_name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artistId", + "columnName": "artist_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "albumArtist", + "columnName": "album_artist", + "affinity": "TEXT" + }, + { + "fieldPath": "albumName", + "columnName": "album_name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "albumId", + "columnName": "album_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "contentUriString", + "columnName": "content_uri_string", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "albumArtUriString", + "columnName": "album_art_uri_string", + "affinity": "TEXT" + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "genre", + "columnName": "genre", + "affinity": "TEXT" + }, + { + "fieldPath": "filePath", + "columnName": "file_path", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "parentDirectoryPath", + "columnName": "parent_directory_path", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "isFavorite", + "columnName": "is_favorite", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" + }, + { + "fieldPath": "lyrics", + "columnName": "lyrics", + "affinity": "TEXT", + "defaultValue": "null" + }, + { + "fieldPath": "trackNumber", + "columnName": "track_number", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" + }, + { + "fieldPath": "discNumber", + "columnName": "disc_number", + "affinity": "INTEGER", + "defaultValue": "null" + }, + { + "fieldPath": "year", + "columnName": "year", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" + }, + { + "fieldPath": "dateAdded", + "columnName": "date_added", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" + }, + { + "fieldPath": "mimeType", + "columnName": "mime_type", + "affinity": "TEXT" + }, + { + "fieldPath": "bitrate", + "columnName": "bitrate", + "affinity": "INTEGER" + }, + { + "fieldPath": "sampleRate", + "columnName": "sample_rate", + "affinity": "INTEGER" + }, + { + "fieldPath": "telegramChatId", + "columnName": "telegram_chat_id", + "affinity": "INTEGER" + }, + { + "fieldPath": "telegramFileId", + "columnName": "telegram_file_id", + "affinity": "INTEGER" + }, + { + "fieldPath": "artistsJson", + "columnName": "artists_json", + "affinity": "TEXT" + }, + { + "fieldPath": "sourceType", + "columnName": "source_type", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_songs_title", + "unique": false, + "columnNames": [ + "title" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_title` ON `${TABLE_NAME}` (`title`)" + }, + { + "name": "index_songs_album_id", + "unique": false, + "columnNames": [ + "album_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_album_id` ON `${TABLE_NAME}` (`album_id`)" + }, + { + "name": "index_songs_artist_id", + "unique": false, + "columnNames": [ + "artist_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_artist_id` ON `${TABLE_NAME}` (`artist_id`)" + }, + { + "name": "index_songs_artist_name", + "unique": false, + "columnNames": [ + "artist_name" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_artist_name` ON `${TABLE_NAME}` (`artist_name`)" + }, + { + "name": "index_songs_genre", + "unique": false, + "columnNames": [ + "genre" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_genre` ON `${TABLE_NAME}` (`genre`)" + }, + { + "name": "index_songs_parent_directory_path", + "unique": false, + "columnNames": [ + "parent_directory_path" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_parent_directory_path` ON `${TABLE_NAME}` (`parent_directory_path`)" + }, + { + "name": "index_songs_file_path", + "unique": false, + "columnNames": [ + "file_path" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_file_path` ON `${TABLE_NAME}` (`file_path`)" + }, + { + "name": "index_songs_content_uri_string", + "unique": false, + "columnNames": [ + "content_uri_string" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_content_uri_string` ON `${TABLE_NAME}` (`content_uri_string`)" + }, + { + "name": "index_songs_date_added", + "unique": false, + "columnNames": [ + "date_added" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_date_added` ON `${TABLE_NAME}` (`date_added`)" + }, + { + "name": "index_songs_duration", + "unique": false, + "columnNames": [ + "duration" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_duration` ON `${TABLE_NAME}` (`duration`)" + }, + { + "name": "index_songs_source_type", + "unique": false, + "columnNames": [ + "source_type" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_source_type` ON `${TABLE_NAME}` (`source_type`)" + }, + { + "name": "index_songs_parent_directory_path_source_type_album_id", + "unique": false, + "columnNames": [ + "parent_directory_path", + "source_type", + "album_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_parent_directory_path_source_type_album_id` ON `${TABLE_NAME}` (`parent_directory_path`, `source_type`, `album_id`)" + }, + { + "name": "index_songs_parent_directory_path_source_type_id", + "unique": false, + "columnNames": [ + "parent_directory_path", + "source_type", + "id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_songs_parent_directory_path_source_type_id` ON `${TABLE_NAME}` (`parent_directory_path`, `source_type`, `id`)" + } + ], + "foreignKeys": [ + { + "table": "albums", + "onDelete": "CASCADE", + "onUpdate": "NO ACTION", + "columns": [ + "album_id" + ], + "referencedColumns": [ + "id" + ] + }, + { + "table": "artists", + "onDelete": "SET NULL", + "onUpdate": "NO ACTION", + "columns": [ + "artist_id" + ], + "referencedColumns": [ + "id" + ] + } + ] + }, + { + "tableName": "songs_fts", + "createSql": "CREATE VIRTUAL TABLE IF NOT EXISTS `${TABLE_NAME}` USING FTS4(`title` TEXT NOT NULL, `artist_name` TEXT NOT NULL, tokenize=unicode61)", + "fields": [ + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artistName", + "columnName": "artist_name", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "rowid" + ] + }, + "ftsVersion": "FTS4", + "ftsOptions": { + "tokenizer": "unicode61", + "tokenizerArgs": [], + "contentTable": "", + "languageIdColumnName": "", + "matchInfo": "FTS4", + "notIndexedColumns": [], + "prefixSizes": [], + "preferredOrder": "ASC" + }, + "contentSyncTriggers": [] + }, + { + "tableName": "albums", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `artist_name` TEXT NOT NULL, `artist_id` INTEGER NOT NULL, `album_art_uri_string` TEXT, `song_count` INTEGER NOT NULL, `date_added` INTEGER NOT NULL, `year` INTEGER NOT NULL, `album_artist` TEXT, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artistName", + "columnName": "artist_name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artistId", + "columnName": "artist_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "albumArtUriString", + "columnName": "album_art_uri_string", + "affinity": "TEXT" + }, + { + "fieldPath": "songCount", + "columnName": "song_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "dateAdded", + "columnName": "date_added", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "year", + "columnName": "year", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "albumArtist", + "columnName": "album_artist", + "affinity": "TEXT" + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_albums_title", + "unique": false, + "columnNames": [ + "title" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_albums_title` ON `${TABLE_NAME}` (`title`)" + }, + { + "name": "index_albums_artist_id", + "unique": false, + "columnNames": [ + "artist_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_albums_artist_id` ON `${TABLE_NAME}` (`artist_id`)" + }, + { + "name": "index_albums_artist_name", + "unique": false, + "columnNames": [ + "artist_name" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_albums_artist_name` ON `${TABLE_NAME}` (`artist_name`)" + }, + { + "name": "index_albums_album_artist", + "unique": false, + "columnNames": [ + "album_artist" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_albums_album_artist` ON `${TABLE_NAME}` (`album_artist`)" + } + ] + }, + { + "tableName": "artists", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `track_count` INTEGER NOT NULL, `image_url` TEXT, `custom_image_uri` TEXT, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "trackCount", + "columnName": "track_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "imageUrl", + "columnName": "image_url", + "affinity": "TEXT" + }, + { + "fieldPath": "customImageUri", + "columnName": "custom_image_uri", + "affinity": "TEXT" + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_artists_name", + "unique": false, + "columnNames": [ + "name" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_artists_name` ON `${TABLE_NAME}` (`name`)" + } + ] + }, + { + "tableName": "transition_rules", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `playlistId` TEXT NOT NULL, `fromTrackId` TEXT, `toTrackId` TEXT, `mode` TEXT NOT NULL, `durationMs` INTEGER NOT NULL, `curveIn` TEXT NOT NULL, `curveOut` TEXT NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "playlistId", + "columnName": "playlistId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "fromTrackId", + "columnName": "fromTrackId", + "affinity": "TEXT" + }, + { + "fieldPath": "toTrackId", + "columnName": "toTrackId", + "affinity": "TEXT" + }, + { + "fieldPath": "settings.mode", + "columnName": "mode", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "settings.durationMs", + "columnName": "durationMs", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "settings.curveIn", + "columnName": "curveIn", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "settings.curveOut", + "columnName": "curveOut", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_transition_rules_playlistId_fromTrackId_toTrackId", + "unique": true, + "columnNames": [ + "playlistId", + "fromTrackId", + "toTrackId" + ], + "orders": [], + "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_transition_rules_playlistId_fromTrackId_toTrackId` ON `${TABLE_NAME}` (`playlistId`, `fromTrackId`, `toTrackId`)" + } + ] + }, + { + "tableName": "song_artist_cross_ref", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`song_id` INTEGER NOT NULL, `artist_id` INTEGER NOT NULL, `is_primary` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`song_id`, `artist_id`), FOREIGN KEY(`song_id`) REFERENCES `songs`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`artist_id`) REFERENCES `artists`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )", + "fields": [ + { + "fieldPath": "songId", + "columnName": "song_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "artistId", + "columnName": "artist_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isPrimary", + "columnName": "is_primary", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "song_id", + "artist_id" + ] + }, + "indices": [ + { + "name": "index_song_artist_cross_ref_song_id", + "unique": false, + "columnNames": [ + "song_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_song_artist_cross_ref_song_id` ON `${TABLE_NAME}` (`song_id`)" + }, + { + "name": "index_song_artist_cross_ref_artist_id", + "unique": false, + "columnNames": [ + "artist_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_song_artist_cross_ref_artist_id` ON `${TABLE_NAME}` (`artist_id`)" + }, + { + "name": "index_song_artist_cross_ref_is_primary", + "unique": false, + "columnNames": [ + "is_primary" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_song_artist_cross_ref_is_primary` ON `${TABLE_NAME}` (`is_primary`)" + } + ], + "foreignKeys": [ + { + "table": "songs", + "onDelete": "CASCADE", + "onUpdate": "NO ACTION", + "columns": [ + "song_id" + ], + "referencedColumns": [ + "id" + ] + }, + { + "table": "artists", + "onDelete": "CASCADE", + "onUpdate": "NO ACTION", + "columns": [ + "artist_id" + ], + "referencedColumns": [ + "id" + ] + } + ] + }, + { + "tableName": "telegram_songs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `chat_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `file_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `artist` TEXT NOT NULL, `duration` INTEGER NOT NULL, `file_path` TEXT NOT NULL, `mime_type` TEXT NOT NULL, `date_added` INTEGER NOT NULL, `album_art_uri` TEXT, `thread_id` INTEGER, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "chatId", + "columnName": "chat_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "messageId", + "columnName": "message_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "fileId", + "columnName": "file_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artist", + "columnName": "artist", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "filePath", + "columnName": "file_path", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "mimeType", + "columnName": "mime_type", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dateAdded", + "columnName": "date_added", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "albumArtUriString", + "columnName": "album_art_uri", + "affinity": "TEXT" + }, + { + "fieldPath": "threadId", + "columnName": "thread_id", + "affinity": "INTEGER" + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_telegram_songs_chat_id", + "unique": false, + "columnNames": [ + "chat_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_telegram_songs_chat_id` ON `${TABLE_NAME}` (`chat_id`)" + }, + { + "name": "index_telegram_songs_message_id", + "unique": false, + "columnNames": [ + "message_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_telegram_songs_message_id` ON `${TABLE_NAME}` (`message_id`)" + }, + { + "name": "index_telegram_songs_file_id", + "unique": false, + "columnNames": [ + "file_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_telegram_songs_file_id` ON `${TABLE_NAME}` (`file_id`)" + }, + { + "name": "index_telegram_songs_chat_id_message_id", + "unique": false, + "columnNames": [ + "chat_id", + "message_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_telegram_songs_chat_id_message_id` ON `${TABLE_NAME}` (`chat_id`, `message_id`)" + }, + { + "name": "index_telegram_songs_thread_id", + "unique": false, + "columnNames": [ + "thread_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_telegram_songs_thread_id` ON `${TABLE_NAME}` (`thread_id`)" + } + ] + }, + { + "tableName": "telegram_channels", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`chat_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `username` TEXT, `song_count` INTEGER NOT NULL, `last_sync_time` INTEGER NOT NULL, `photo_path` TEXT, PRIMARY KEY(`chat_id`))", + "fields": [ + { + "fieldPath": "chatId", + "columnName": "chat_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "username", + "columnName": "username", + "affinity": "TEXT" + }, + { + "fieldPath": "songCount", + "columnName": "song_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastSyncTime", + "columnName": "last_sync_time", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "photoPath", + "columnName": "photo_path", + "affinity": "TEXT" + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "chat_id" + ] + } + }, + { + "tableName": "song_engagements", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`song_id` TEXT NOT NULL, `play_count` INTEGER NOT NULL, `total_play_duration_ms` INTEGER NOT NULL, `last_played_timestamp` INTEGER NOT NULL, PRIMARY KEY(`song_id`))", + "fields": [ + { + "fieldPath": "songId", + "columnName": "song_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "playCount", + "columnName": "play_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "totalPlayDurationMs", + "columnName": "total_play_duration_ms", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastPlayedTimestamp", + "columnName": "last_played_timestamp", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "song_id" + ] + }, + "indices": [ + { + "name": "index_song_engagements_play_count", + "unique": false, + "columnNames": [ + "play_count" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_song_engagements_play_count` ON `${TABLE_NAME}` (`play_count`)" + } + ] + }, + { + "tableName": "favorites", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`songId` INTEGER NOT NULL, `isFavorite` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`songId`))", + "fields": [ + { + "fieldPath": "songId", + "columnName": "songId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isFavorite", + "columnName": "isFavorite", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "timestamp", + "columnName": "timestamp", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "songId" + ] + }, + "indices": [ + { + "name": "index_favorites_timestamp", + "unique": false, + "columnNames": [ + "timestamp" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_favorites_timestamp` ON `${TABLE_NAME}` (`timestamp`)" + } + ] + }, + { + "tableName": "lyrics", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`songId` INTEGER NOT NULL, `content` TEXT NOT NULL, `isSynced` INTEGER NOT NULL, `source` TEXT, PRIMARY KEY(`songId`))", + "fields": [ + { + "fieldPath": "songId", + "columnName": "songId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "content", + "columnName": "content", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "isSynced", + "columnName": "isSynced", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "source", + "columnName": "source", + "affinity": "TEXT" + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "songId" + ] + } + }, + { + "tableName": "netease_songs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `netease_id` INTEGER NOT NULL, `playlist_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `artist` TEXT NOT NULL, `album` TEXT NOT NULL, `album_id` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `album_art_url` TEXT, `mime_type` TEXT NOT NULL, `bitrate` INTEGER, `date_added` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "neteaseId", + "columnName": "netease_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "playlistId", + "columnName": "playlist_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artist", + "columnName": "artist", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "album", + "columnName": "album", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "albumId", + "columnName": "album_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "albumArtUrl", + "columnName": "album_art_url", + "affinity": "TEXT" + }, + { + "fieldPath": "mimeType", + "columnName": "mime_type", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "bitrate", + "columnName": "bitrate", + "affinity": "INTEGER" + }, + { + "fieldPath": "dateAdded", + "columnName": "date_added", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_netease_songs_netease_id", + "unique": false, + "columnNames": [ + "netease_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_netease_songs_netease_id` ON `${TABLE_NAME}` (`netease_id`)" + }, + { + "name": "index_netease_songs_playlist_id", + "unique": false, + "columnNames": [ + "playlist_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_netease_songs_playlist_id` ON `${TABLE_NAME}` (`playlist_id`)" + }, + { + "name": "index_netease_songs_playlist_id_date_added", + "unique": false, + "columnNames": [ + "playlist_id", + "date_added" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_netease_songs_playlist_id_date_added` ON `${TABLE_NAME}` (`playlist_id`, `date_added`)" + } + ] + }, + { + "tableName": "netease_playlists", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `cover_url` TEXT, `song_count` INTEGER NOT NULL, `last_sync_time` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "coverUrl", + "columnName": "cover_url", + "affinity": "TEXT" + }, + { + "fieldPath": "songCount", + "columnName": "song_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastSyncTime", + "columnName": "last_sync_time", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "gdrive_songs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `drive_file_id` TEXT NOT NULL, `folder_id` TEXT NOT NULL, `title` TEXT NOT NULL, `artist` TEXT NOT NULL, `album` TEXT NOT NULL, `album_id` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `album_art_url` TEXT, `mime_type` TEXT NOT NULL, `bitrate` INTEGER, `file_size` INTEGER NOT NULL, `date_added` INTEGER NOT NULL, `date_modified` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "driveFileId", + "columnName": "drive_file_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "folderId", + "columnName": "folder_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artist", + "columnName": "artist", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "album", + "columnName": "album", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "albumId", + "columnName": "album_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "albumArtUrl", + "columnName": "album_art_url", + "affinity": "TEXT" + }, + { + "fieldPath": "mimeType", + "columnName": "mime_type", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "bitrate", + "columnName": "bitrate", + "affinity": "INTEGER" + }, + { + "fieldPath": "fileSize", + "columnName": "file_size", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "dateAdded", + "columnName": "date_added", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "dateModified", + "columnName": "date_modified", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_gdrive_songs_drive_file_id", + "unique": false, + "columnNames": [ + "drive_file_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_gdrive_songs_drive_file_id` ON `${TABLE_NAME}` (`drive_file_id`)" + }, + { + "name": "index_gdrive_songs_folder_id", + "unique": false, + "columnNames": [ + "folder_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_gdrive_songs_folder_id` ON `${TABLE_NAME}` (`folder_id`)" + }, + { + "name": "index_gdrive_songs_folder_id_date_added", + "unique": false, + "columnNames": [ + "folder_id", + "date_added" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_gdrive_songs_folder_id_date_added` ON `${TABLE_NAME}` (`folder_id`, `date_added`)" + } + ] + }, + { + "tableName": "gdrive_folders", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `song_count` INTEGER NOT NULL, `last_sync_time` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "songCount", + "columnName": "song_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastSyncTime", + "columnName": "last_sync_time", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "playlists", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `created_at` INTEGER NOT NULL, `last_modified` INTEGER NOT NULL, `is_ai_generated` INTEGER NOT NULL, `is_queue_generated` INTEGER NOT NULL, `cover_image_uri` TEXT, `cover_color_argb` INTEGER, `cover_icon_name` TEXT, `cover_shape_type` TEXT, `cover_shape_detail_1` REAL, `cover_shape_detail_2` REAL, `cover_shape_detail_3` REAL, `cover_shape_detail_4` REAL, `source` TEXT NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "createdAt", + "columnName": "created_at", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastModified", + "columnName": "last_modified", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isAiGenerated", + "columnName": "is_ai_generated", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isQueueGenerated", + "columnName": "is_queue_generated", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "coverImageUri", + "columnName": "cover_image_uri", + "affinity": "TEXT" + }, + { + "fieldPath": "coverColorArgb", + "columnName": "cover_color_argb", + "affinity": "INTEGER" + }, + { + "fieldPath": "coverIconName", + "columnName": "cover_icon_name", + "affinity": "TEXT" + }, + { + "fieldPath": "coverShapeType", + "columnName": "cover_shape_type", + "affinity": "TEXT" + }, + { + "fieldPath": "coverShapeDetail1", + "columnName": "cover_shape_detail_1", + "affinity": "REAL" + }, + { + "fieldPath": "coverShapeDetail2", + "columnName": "cover_shape_detail_2", + "affinity": "REAL" + }, + { + "fieldPath": "coverShapeDetail3", + "columnName": "cover_shape_detail_3", + "affinity": "REAL" + }, + { + "fieldPath": "coverShapeDetail4", + "columnName": "cover_shape_detail_4", + "affinity": "REAL" + }, + { + "fieldPath": "source", + "columnName": "source", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_playlists_last_modified", + "unique": false, + "columnNames": [ + "last_modified" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_playlists_last_modified` ON `${TABLE_NAME}` (`last_modified`)" + } + ] + }, + { + "tableName": "playlist_songs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`playlist_id` TEXT NOT NULL, `song_id` TEXT NOT NULL, `sort_order` INTEGER NOT NULL, PRIMARY KEY(`playlist_id`, `song_id`))", + "fields": [ + { + "fieldPath": "playlistId", + "columnName": "playlist_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "songId", + "columnName": "song_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "sortOrder", + "columnName": "sort_order", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "playlist_id", + "song_id" + ] + }, + "indices": [ + { + "name": "index_playlist_songs_playlist_id_sort_order", + "unique": false, + "columnNames": [ + "playlist_id", + "sort_order" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_playlist_songs_playlist_id_sort_order` ON `${TABLE_NAME}` (`playlist_id`, `sort_order`)" + }, + { + "name": "index_playlist_songs_song_id", + "unique": false, + "columnNames": [ + "song_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_playlist_songs_song_id` ON `${TABLE_NAME}` (`song_id`)" + } + ] + }, + { + "tableName": "qqmusic_songs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `song_mid` TEXT NOT NULL, `playlist_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `artist` TEXT NOT NULL, `album` TEXT NOT NULL, `album_mid` TEXT, `duration` INTEGER NOT NULL, `album_art_url` TEXT, `mime_type` TEXT NOT NULL, `bitrate` INTEGER, `date_added` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "songMid", + "columnName": "song_mid", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "playlistId", + "columnName": "playlist_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artist", + "columnName": "artist", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "album", + "columnName": "album", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "albumMid", + "columnName": "album_mid", + "affinity": "TEXT" + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "albumArtUrl", + "columnName": "album_art_url", + "affinity": "TEXT" + }, + { + "fieldPath": "mimeType", + "columnName": "mime_type", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "bitrate", + "columnName": "bitrate", + "affinity": "INTEGER" + }, + { + "fieldPath": "dateAdded", + "columnName": "date_added", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "qqmusic_playlists", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `cover_url` TEXT, `song_count` INTEGER NOT NULL, `last_sync_time` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "coverUrl", + "columnName": "cover_url", + "affinity": "TEXT" + }, + { + "fieldPath": "songCount", + "columnName": "song_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastSyncTime", + "columnName": "last_sync_time", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "navidrome_songs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `navidrome_id` TEXT NOT NULL, `playlist_id` TEXT NOT NULL, `title` TEXT NOT NULL, `artist` TEXT NOT NULL, `artist_id` TEXT, `album` TEXT NOT NULL, `album_id` TEXT, `cover_art_id` TEXT, `duration` INTEGER NOT NULL, `track_number` INTEGER NOT NULL, `disc_number` INTEGER NOT NULL, `year` INTEGER NOT NULL, `genre` TEXT, `bitRate` INTEGER, `mime_type` TEXT, `suffix` TEXT, `path` TEXT NOT NULL, `date_added` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "navidromeId", + "columnName": "navidrome_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "playlistId", + "columnName": "playlist_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artist", + "columnName": "artist", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artistId", + "columnName": "artist_id", + "affinity": "TEXT" + }, + { + "fieldPath": "album", + "columnName": "album", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "albumId", + "columnName": "album_id", + "affinity": "TEXT" + }, + { + "fieldPath": "coverArtId", + "columnName": "cover_art_id", + "affinity": "TEXT" + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "trackNumber", + "columnName": "track_number", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "discNumber", + "columnName": "disc_number", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "year", + "columnName": "year", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "genre", + "columnName": "genre", + "affinity": "TEXT" + }, + { + "fieldPath": "bitRate", + "columnName": "bitRate", + "affinity": "INTEGER" + }, + { + "fieldPath": "mimeType", + "columnName": "mime_type", + "affinity": "TEXT" + }, + { + "fieldPath": "suffix", + "columnName": "suffix", + "affinity": "TEXT" + }, + { + "fieldPath": "path", + "columnName": "path", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dateAdded", + "columnName": "date_added", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_navidrome_songs_navidrome_id", + "unique": false, + "columnNames": [ + "navidrome_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_navidrome_songs_navidrome_id` ON `${TABLE_NAME}` (`navidrome_id`)" + }, + { + "name": "index_navidrome_songs_playlist_id", + "unique": false, + "columnNames": [ + "playlist_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_navidrome_songs_playlist_id` ON `${TABLE_NAME}` (`playlist_id`)" + }, + { + "name": "index_navidrome_songs_playlist_id_date_added", + "unique": false, + "columnNames": [ + "playlist_id", + "date_added" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_navidrome_songs_playlist_id_date_added` ON `${TABLE_NAME}` (`playlist_id`, `date_added`)" + } + ] + }, + { + "tableName": "navidrome_playlists", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `comment` TEXT, `owner` TEXT, `cover_art_id` TEXT, `song_count` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `public` INTEGER NOT NULL, `last_sync_time` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "comment", + "columnName": "comment", + "affinity": "TEXT" + }, + { + "fieldPath": "owner", + "columnName": "owner", + "affinity": "TEXT" + }, + { + "fieldPath": "coverArtId", + "columnName": "cover_art_id", + "affinity": "TEXT" + }, + { + "fieldPath": "songCount", + "columnName": "song_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "public", + "columnName": "public", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastSyncTime", + "columnName": "last_sync_time", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "telegram_topics", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `chat_id` INTEGER NOT NULL, `thread_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `song_count` INTEGER NOT NULL, `last_sync_time` INTEGER NOT NULL, `icon_emoji` TEXT, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "chatId", + "columnName": "chat_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "threadId", + "columnName": "thread_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "songCount", + "columnName": "song_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastSyncTime", + "columnName": "last_sync_time", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "iconEmoji", + "columnName": "icon_emoji", + "affinity": "TEXT" + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_telegram_topics_chat_id", + "unique": false, + "columnNames": [ + "chat_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_telegram_topics_chat_id` ON `${TABLE_NAME}` (`chat_id`)" + } + ] + }, + { + "tableName": "jellyfin_songs", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `jellyfin_id` TEXT NOT NULL, `playlist_id` TEXT NOT NULL, `title` TEXT NOT NULL, `artist` TEXT NOT NULL, `artist_id` TEXT, `album` TEXT NOT NULL, `album_id` TEXT, `duration` INTEGER NOT NULL, `track_number` INTEGER NOT NULL, `disc_number` INTEGER NOT NULL, `year` INTEGER NOT NULL, `genre` TEXT, `bitRate` INTEGER, `mime_type` TEXT, `path` TEXT NOT NULL, `date_added` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "jellyfinId", + "columnName": "jellyfin_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "playlistId", + "columnName": "playlist_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artist", + "columnName": "artist", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "artistId", + "columnName": "artist_id", + "affinity": "TEXT" + }, + { + "fieldPath": "album", + "columnName": "album", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "albumId", + "columnName": "album_id", + "affinity": "TEXT" + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "trackNumber", + "columnName": "track_number", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "discNumber", + "columnName": "disc_number", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "year", + "columnName": "year", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "genre", + "columnName": "genre", + "affinity": "TEXT" + }, + { + "fieldPath": "bitRate", + "columnName": "bitRate", + "affinity": "INTEGER" + }, + { + "fieldPath": "mimeType", + "columnName": "mime_type", + "affinity": "TEXT" + }, + { + "fieldPath": "path", + "columnName": "path", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dateAdded", + "columnName": "date_added", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [ + { + "name": "index_jellyfin_songs_jellyfin_id", + "unique": false, + "columnNames": [ + "jellyfin_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_jellyfin_songs_jellyfin_id` ON `${TABLE_NAME}` (`jellyfin_id`)" + }, + { + "name": "index_jellyfin_songs_playlist_id", + "unique": false, + "columnNames": [ + "playlist_id" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_jellyfin_songs_playlist_id` ON `${TABLE_NAME}` (`playlist_id`)" + }, + { + "name": "index_jellyfin_songs_playlist_id_date_added", + "unique": false, + "columnNames": [ + "playlist_id", + "date_added" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_jellyfin_songs_playlist_id_date_added` ON `${TABLE_NAME}` (`playlist_id`, `date_added`)" + } + ] + }, + { + "tableName": "jellyfin_playlists", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `song_count` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `last_sync_time` INTEGER NOT NULL, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "songCount", + "columnName": "song_count", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "duration", + "columnName": "duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastSyncTime", + "columnName": "last_sync_time", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "ai_cache", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`promptHash` TEXT NOT NULL, `responseJson` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`promptHash`))", + "fields": [ + { + "fieldPath": "promptHash", + "columnName": "promptHash", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "responseJson", + "columnName": "responseJson", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "timestamp", + "columnName": "timestamp", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "promptHash" + ] + } + }, + { + "tableName": "ai_usage", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `provider` TEXT NOT NULL, `model` TEXT NOT NULL, `promptType` TEXT NOT NULL, `promptTokens` INTEGER NOT NULL, `outputTokens` INTEGER NOT NULL, `thoughtTokens` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "timestamp", + "columnName": "timestamp", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "provider", + "columnName": "provider", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "model", + "columnName": "model", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "promptType", + "columnName": "promptType", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "promptTokens", + "columnName": "promptTokens", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "outputTokens", + "columnName": "outputTokens", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "thoughtTokens", + "columnName": "thoughtTokens", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + } + ], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e6c4f6c20d810ef8cb2cf2856151cc0f')" + ] + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/theveloper/pixelplay/data/database/MusicDaoTest.kt b/app/src/androidTest/java/com/theveloper/pixelplay/data/database/MusicDaoTest.kt index b9045e6fe5..e9aa935700 100644 --- a/app/src/androidTest/java/com/theveloper/pixelplay/data/database/MusicDaoTest.kt +++ b/app/src/androidTest/java/com/theveloper/pixelplay/data/database/MusicDaoTest.kt @@ -74,6 +74,159 @@ class MusicDaoTest { return ArtistEntity(id = id, name = name, trackCount = 10, imageUrl = null) } + // --- Artist de-duplication (case / whitespace variants) --- + + @Test + @Throws(Exception::class) + fun mergeDuplicateArtistsCollapsesCaseVariantsAndKeepsSongs() = runTest { + // Three rows for one human, which is exactly what the old raw-name + // lookup in SyncWorker produced over successive scans. + musicDao.insertArtists( + listOf( + createArtistEntity(1L, "Beyoncé"), + createArtistEntity(2L, "beyonce"), + createArtistEntity(3L, " BEYONCE ") + ) + ) + musicDao.insertSongs( + listOf( + createSongEntity(11L, "Halo", "Beyoncé", "I Am", "/music/a/halo.mp3"), + createSongEntity(12L, "Irreplaceable", "beyonce", "I Am", "/music/a/irreplaceable.mp3") + ) + ) + musicDao.insertSongArtistCrossRefs( + listOf( + SongArtistCrossRef(11L, 1L, isPrimary = true), + SongArtistCrossRef(12L, 2L, isPrimary = true) + ) + ) + + db.mergeDuplicateArtists() + + val artists = db.musicDao().getAllArtistsListRaw() + assertEquals(1, artists.size) + // Lowest id survives. + assertEquals(1L, artists.first().id) + + // Both songs survive and now point at the surviving artist. + val songs = musicDao.getSongsForArtistList(1L) + assertEquals(setOf(11L, 12L), songs.map { it.id }.toSet()) + assertEquals(1L, songs.first().artistId) + } + + @Test + @Throws(Exception::class) + fun mergeDuplicateArtistsPreservesArtworkFromTheDuplicate() = runTest { + // The survivor has no image but a duplicate does; the merge must not cost + // the user their artist artwork. + musicDao.insertArtists( + listOf( + createArtistEntity(1L, "Radiohead"), + ArtistEntity(id = 2L, name = "radiohead", trackCount = 4, imageUrl = "https://img/radiohead.jpg") + ) + ) + + db.mergeDuplicateArtists() + + val survivor = musicDao.getArtistsByIds(listOf(1L)).single() + assertEquals("https://img/radiohead.jpg", survivor.imageUrl) + } + + @Test + @Throws(Exception::class) + fun mergeDuplicateArtistsIsIdempotent() = runTest { + musicDao.insertArtists( + listOf( + createArtistEntity(1L, "Aphex Twin"), + createArtistEntity(2L, "aphex twin") + ) + ) + musicDao.insertSongs( + listOf(createSongEntity(21L, "Xtal", "Aphex Twin", "SAW", "/music/a/xtal.mp3")) + ) + musicDao.insertSongArtistCrossRefs(listOf(SongArtistCrossRef(21L, 2L, isPrimary = true))) + + db.mergeDuplicateArtists() + val afterFirst = musicDao.getAllArtistsListRaw() + val refsAfterFirst = musicDao.getCrossRefsForSong(21L) + + db.mergeDuplicateArtists() + val afterSecond = musicDao.getAllArtistsListRaw() + val refsAfterSecond = musicDao.getCrossRefsForSong(21L) + + assertEquals(afterFirst.map { it.id }, afterSecond.map { it.id }) + assertEquals(refsAfterFirst, refsAfterSecond) + assertEquals(1, afterSecond.size) + } + + @Test + @Throws(Exception::class) + fun mergeDuplicateArtistsLeavesDistinctNamesAlone() = runTest { + // "The Beatles" and "Beatles" are different artists and must not merge. + musicDao.insertArtists( + listOf( + createArtistEntity(1L, "The Beatles"), + createArtistEntity(2L, "Beatles") + ) + ) + + db.mergeDuplicateArtists() + + assertEquals(2, musicDao.getAllArtistsListRaw().size) + } + + @Test + @Throws(Exception::class) + fun mergeDuplicateArtistsDropsRedundantCrossRefWhenSongIsCreditedToBothDuplicates() = runTest { + // (song_id, artist_id) is a composite primary key, so re-pointing the + // loser's ref must not create a duplicate for the survivor. + musicDao.insertArtists( + listOf( + createArtistEntity(1L, "Portishead"), + createArtistEntity(2L, "PORTISHEAD") + ) + ) + musicDao.insertSongs( + listOf(createSongEntity(31L, "Roads", "Portishead", "Dummy", "/music/a/roads.mp3")) + ) + musicDao.insertSongArtistCrossRefs( + listOf( + SongArtistCrossRef(31L, 1L, isPrimary = true), + SongArtistCrossRef(31L, 2L, isPrimary = false) + ) + ) + + db.mergeDuplicateArtists() + + val refs = musicDao.getCrossRefsForSong(31L) + assertEquals(1, refs.size) + assertEquals(1L, refs.first().artistId) + } + + @Test + @Throws(Exception::class) + fun recomputeAllArtistTrackCountsReflectsCrossRefs() = runTest { + musicDao.insertArtists(listOf(createArtistEntity(1L, "Massive Attack"))) + musicDao.insertSongs( + listOf( + createSongEntity(41L, "Teardrop", "Massive Attack", "Mezzanine", "/music/a/teardrop.mp3"), + createSongEntity(42L, "Angel", "Massive Attack", "Mezzanine", "/music/a/angel.mp3") + ) + ) + musicDao.insertSongArtistCrossRefs( + listOf( + SongArtistCrossRef(41L, 1L, isPrimary = true), + SongArtistCrossRef(42L, 1L, isPrimary = true) + ) + ) + // The helper seeds a deliberately wrong count. + musicDao.insertArtists(listOf(createArtistEntity(1L, "Massive Attack").copy(trackCount = 99))) + + musicDao.recomputeAllArtistTrackCounts() + + assertEquals(2, musicDao.getArtistsByIds(listOf(1L)).single().trackCount) + } + @Test @Throws(Exception::class) fun insertAndGetSongs() = runTest { diff --git a/app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt b/app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt index 8a141e350e..5c300a84ba 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt @@ -1630,6 +1630,30 @@ interface MusicDao { @Query("DELETE FROM artists WHERE NOT EXISTS (SELECT 1 FROM song_artist_cross_ref WHERE song_artist_cross_ref.artist_id = artists.id)") suspend fun deleteOrphanedArtists() + /** + * Recomputes the denormalised `artists.track_count` from the cross-reference + * table for every artist. + * + * `track_count` is a cache of `COUNT(DISTINCT song_id)` per artist. Sync + * recomputes it only for artists touched by the current batch, so artists + * outside that batch keep whatever value they had — which goes stale after + * songs are deleted or after [PixelPlayDatabase.mergeDuplicateArtists] + * collapses duplicate rows. The artist list queries compute the count live, + * so this column is not load-bearing; it is kept correct so diagnostics and + * any future query that reads it directly are not misled. + */ + @Query( + """ + UPDATE artists + SET track_count = ( + SELECT COUNT(DISTINCT song_artist_cross_ref.song_id) + FROM song_artist_cross_ref + WHERE song_artist_cross_ref.artist_id = artists.id + ) + """ + ) + suspend fun recomputeAllArtistTrackCounts() + // --- Favorite Operations --- @Query("UPDATE songs SET is_favorite = :isFavorite WHERE id = :songId") suspend fun setFavoriteStatus(songId: Long, isFavorite: Boolean) diff --git a/app/src/main/java/com/theveloper/pixelplay/data/database/PixelPlayDatabase.kt b/app/src/main/java/com/theveloper/pixelplay/data/database/PixelPlayDatabase.kt index 094929dd9f..5975857226 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/database/PixelPlayDatabase.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/database/PixelPlayDatabase.kt @@ -3,6 +3,7 @@ package com.theveloper.pixelplay.data.database import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.migration.Migration +import androidx.room.withTransaction import androidx.sqlite.db.SupportSQLiteDatabase @Database( @@ -36,7 +37,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase AiCacheEntity::class, AiUsageEntity::class ], - version = 42, + version = 43, exportSchema = true ) abstract class PixelPlayDatabase : RoomDatabase() { @@ -57,6 +58,26 @@ abstract class PixelPlayDatabase : RoomDatabase() { abstract fun aiCacheDao(): AiCacheDao abstract fun aiUsageDao(): AiUsageDao + /** + * Collapses artist rows that differ only by letter case or whitespace, and + * repairs the denormalised track counts. + * + * This is the re-runnable counterpart to [MIGRATION_42_43]: the migration + * runs it once on upgrade, and this exposes the exact same SQL for a + * database that is already at the current version (for example after + * restoring a backup, or once further artist-normalisation work lands). + * Idempotent — a second call finds no duplicate groups and returns. + * + * Exposed on the database rather than on [MusicDao] because it needs the + * raw [SupportSQLiteDatabase] to run multi-statement DDL/DML. + */ + suspend fun mergeDuplicateArtists() { + withTransaction { + mergeDuplicateArtistsIn(openHelper.writableDatabase) + musicDao().recomputeAllArtistTrackCounts() + } + } + companion object { // Gap-bridging no-op migrations for missing version ranges. // These versions predate Telegram features; affected tables have since been @@ -747,6 +768,188 @@ abstract class PixelPlayDatabase : RoomDatabase() { } } + /** + * Collapses artist rows that differ only by letter case / surrounding or + * internal whitespace into a single row per canonical name. + * + * Why this is needed: [com.theveloper.pixelplay.data.worker.SyncWorker] + * keyed its existing-artist map on the raw `name`, so a song tagged + * "beyonce" never matched a row stored as "Beyoncé" and minted a second + * row on every scan. Real libraries ended up with several rows per human. + * + * Merge rules: + * - The surviving row is the LOWEST id (matches the deterministic + * "first row wins" that the sync now uses when rebuilding its map). + * - A surviving row that has no artwork adopts the artwork of the + * duplicate with the largest track count, so merging never costs a + * user their artist image or custom photo. + * - Cross-references are re-pointed to the survivor. When a song was + * credited to two duplicates at once (possible: one via + * `songs.artist_id`, another via a cross-ref), the duplicate row is + * dropped rather than violating the (song_id, artist_id) primary key. + * - Track counts are recomputed from the cross-refs afterwards, since + * the stored `track_count` is denormalised and would otherwise be + * left half-merged. + * + * `LOWER(TRIM(name))` is the SQL counterpart of + * [com.theveloper.pixelplay.utils.artistNameKey]. It does not collapse + * internal whitespace runs (SQLite has no regexp by default), which is + * why the sync resolves names in memory instead of via SQL. + */ + val MIGRATION_42_43 = object : Migration(42, 43) { + override fun migrate(db: SupportSQLiteDatabase) { + mergeDuplicateArtistsIn(db) + } + } + + /** + * Collapses case/whitespace-variant artist rows in place. + * + * The single implementation behind both [MIGRATION_42_43] and + * [mergeDuplicateArtists], so the upgrade path and the re-runnable path + * cannot drift apart. Idempotent: a second run finds no duplicate groups + * and returns without writing anything. + */ + fun mergeDuplicateArtistsIn(db: SupportSQLiteDatabase) { + if (!tableExists(db, "artists")) return + + // loser_id -> survivor_id, materialised once so every statement below + // agrees on the mapping and no statement has to re-derive it. + db.execSQL("DROP TABLE IF EXISTS temp.artist_merge_map") + db.execSQL( + """ + CREATE TEMP TABLE artist_merge_map ( + loser_id INTEGER PRIMARY KEY, + survivor_id INTEGER NOT NULL + ) + """.trimIndent() + ) + + db.execSQL( + """ + INSERT INTO artist_merge_map (loser_id, survivor_id) + SELECT a.id, ( + SELECT MIN(b.id) + FROM artists b + WHERE LOWER(TRIM(b.name)) = LOWER(TRIM(a.name)) + ) + FROM artists a + WHERE TRIM(a.name) != '' + AND EXISTS ( + SELECT 1 FROM artists b + WHERE LOWER(TRIM(b.name)) = LOWER(TRIM(a.name)) + ) + AND a.id != ( + SELECT MIN(b.id) + FROM artists b + WHERE LOWER(TRIM(b.name)) = LOWER(TRIM(a.name)) + ) + """.trimIndent() + ) + + val loserCount = db.query("SELECT COUNT(*) FROM artist_merge_map") + .use { if (it.moveToFirst()) it.getInt(0) else 0 } + if (loserCount == 0) { + db.execSQL("DROP TABLE IF EXISTS temp.artist_merge_map") + return + } + + // Adopt artwork from a duplicate when the survivor has none. Ordered by + // track count so the most-established duplicate wins, which keeps + // Deezer art and user-uploaded photos from being lost by a merge. + db.execSQL( + """ + UPDATE artists + SET image_url = COALESCE( + artists.image_url, + ( + SELECT src.image_url + FROM artists src + INNER JOIN artist_merge_map m ON src.id = m.loser_id + WHERE m.survivor_id = artists.id + AND src.image_url IS NOT NULL + AND TRIM(src.image_url) != '' + ORDER BY src.track_count DESC, src.id ASC + LIMIT 1 + ) + ) + WHERE id IN (SELECT DISTINCT survivor_id FROM artist_merge_map) + """.trimIndent() + ) + db.execSQL( + """ + UPDATE artists + SET custom_image_uri = COALESCE( + artists.custom_image_uri, + ( + SELECT src.custom_image_uri + FROM artists src + INNER JOIN artist_merge_map m ON src.id = m.loser_id + WHERE m.survivor_id = artists.id + AND src.custom_image_uri IS NOT NULL + AND TRIM(src.custom_image_uri) != '' + ORDER BY src.track_count DESC, src.id ASC + LIMIT 1 + ) + ) + WHERE id IN (SELECT DISTINCT survivor_id FROM artist_merge_map) + """.trimIndent() + ) + + // Re-point cross-refs to the survivor. OR IGNORE because + // (song_id, artist_id) is the composite primary key: a song already + // credited to the survivor would otherwise raise a constraint + // violation, and the loser's ref for that song is redundant anyway. + db.execSQL( + """ + UPDATE OR IGNORE song_artist_cross_ref + SET artist_id = ( + SELECT m.survivor_id FROM artist_merge_map m + WHERE m.loser_id = song_artist_cross_ref.artist_id + ) + WHERE artist_id IN (SELECT loser_id FROM artist_merge_map) + """.trimIndent() + ) + + // Sweep up refs that still point at a doomed row: those IGNORE skipped + // because the song already had a ref to the survivor. + db.execSQL( + """ + DELETE FROM song_artist_cross_ref + WHERE artist_id IN (SELECT loser_id FROM artist_merge_map) + """.trimIndent() + ) + + db.execSQL( + """ + UPDATE songs + SET artist_id = ( + SELECT m.survivor_id FROM artist_merge_map m + WHERE m.loser_id = songs.artist_id + ) + WHERE artist_id IN (SELECT loser_id FROM artist_merge_map) + """.trimIndent() + ) + + // Cross-refs carry ON DELETE CASCADE, so this is also a safety net. + db.execSQL("DELETE FROM artists WHERE id IN (SELECT loser_id FROM artist_merge_map)") + + // Recompute the denormalised track counts from the surviving cross-refs. + db.execSQL( + """ + UPDATE artists + SET track_count = ( + SELECT COUNT(DISTINCT r.song_id) + FROM song_artist_cross_ref r + WHERE r.artist_id = artists.id + ) + WHERE id IN (SELECT DISTINCT survivor_id FROM artist_merge_map) + """.trimIndent() + ) + + db.execSQL("DROP TABLE IF EXISTS temp.artist_merge_map") + } + private fun ensureSongsTableHasDateAdded(db: SupportSQLiteDatabase) { if (!tableExists(db, "songs")) { recreateSongsTable(db) diff --git a/app/src/main/java/com/theveloper/pixelplay/data/media/SongMetadataEditor.kt b/app/src/main/java/com/theveloper/pixelplay/data/media/SongMetadataEditor.kt index e1f7c41eb6..350a43fa8e 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/media/SongMetadataEditor.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/media/SongMetadataEditor.kt @@ -24,6 +24,7 @@ import com.theveloper.pixelplay.data.preferences.UserPreferencesRepository import com.theveloper.pixelplay.data.worker.collectArtistNames import com.theveloper.pixelplay.utils.AlbumArtUtils import com.theveloper.pixelplay.utils.LocalArtworkUri +import com.theveloper.pixelplay.utils.artistNameKey import com.theveloper.pixelplay.utils.MediaStorePermissionHelper import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.first // Added @@ -158,8 +159,19 @@ class SongMetadataEditor( discNumber: Int? ) { val existingArtists = musicDao.getAllArtistsListRaw() + // Keyed by artistNameKey(), the same canonical key SyncWorker uses. This + // method used to normalise inline (trim().lowercase()) while SyncWorker + // used the raw name, so the two disagreed and a resync would create a + // second row for an artist a tag edit had just merged. val existingByNormalizedName = - existingArtists.associateBy { it.name.trim().lowercase(Locale.ROOT) }.toMutableMap() + LinkedHashMap(existingArtists.size) + val displayNameByKey = HashMap(existingArtists.size) + existingArtists.sortedBy { it.id }.forEach { artist -> + val key = artistNameKey(artist.name) + if (key.isEmpty()) return@forEach + existingByNormalizedName.putIfAbsent(key, artist) + displayNameByKey.putIfAbsent(key, artist.name) + } var nextArtistId = (musicDao.getMaxArtistId() ?: 0L) + 1L val artistDelimiters = userPreferencesRepository.artistDelimitersFlow.first() @@ -179,9 +191,9 @@ class SongMetadataEditor( val artistsToEnsure = mutableListOf() val artistRefs = artistNames.mapIndexed { index, rawName -> - val normalizedName = rawName.trim() - val normalizedKey = normalizedName.lowercase(Locale.ROOT) - val existingArtist = existingByNormalizedName[normalizedKey] + val incomingName = rawName.trim() + val key = artistNameKey(incomingName) + val existingArtist = existingByNormalizedName[key] val artistId = if (existingArtist != null) { existingArtist.id @@ -189,19 +201,22 @@ class SongMetadataEditor( val newId = nextArtistId++ val newArtist = ArtistEntity( id = newId, - name = normalizedName, + name = incomingName, trackCount = 0, imageUrl = null, customImageUri = null ) - existingByNormalizedName[normalizedKey] = newArtist + existingByNormalizedName[key] = newArtist + displayNameByKey.putIfAbsent(key, incomingName) artistsToEnsure += newArtist newId } ArtistRef( id = artistId, - name = normalizedName, + // Preserve the artist's existing display casing rather than + // rewriting it from this tag. + name = displayNameByKey[key] ?: incomingName, isPrimary = index == 0 ) }.filter { it.name.isNotEmpty() } diff --git a/app/src/main/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtils.kt b/app/src/main/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtils.kt index 2e017b99b8..36682e0647 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtils.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtils.kt @@ -3,6 +3,7 @@ package com.theveloper.pixelplay.data.worker import com.theveloper.pixelplay.data.database.AlbumEntity import com.theveloper.pixelplay.data.database.SongEntity import com.theveloper.pixelplay.utils.LocalArtworkUri +import com.theveloper.pixelplay.utils.artistNameKey import com.theveloper.pixelplay.utils.normalizeMetadataText import com.theveloper.pixelplay.utils.normalizeMetadataTextOrEmpty import com.theveloper.pixelplay.utils.splitArtistsByDelimiters @@ -98,6 +99,15 @@ internal fun chooseAlbumDisplayArtist( } } +/** + * Resolves the artist id for an album's display artist. + * + * [artistNameToId] is keyed by [artistNameKey], not by the raw name, so every + * lookup here goes through the same canonical key the sync used to build it. + * Before this, a lookup miss here silently fell through to the first song's + * artist, which attributed compilations and collaborations to an arbitrary + * artist. + */ internal fun resolveAlbumDisplayArtistId( displayArtist: String, songs: List, @@ -105,14 +115,13 @@ internal fun resolveAlbumDisplayArtistId( artistDelimiters: List, wordDelimiters: List = emptyList() ): Long { - artistNameToId[displayArtist.trim()]?.let { return it } + artistNameToId[artistNameKey(displayArtist)]?.let { return it } val primaryArtistName = displayArtist .splitArtistsByDelimiters(artistDelimiters, wordDelimiters) .firstOrNull() - ?.trim() if (!primaryArtistName.isNullOrEmpty()) { - artistNameToId[primaryArtistName]?.let { return it } + artistNameToId[artistNameKey(primaryArtistName)]?.let { return it } } return songs.firstOrNull()?.artistId ?: 0L diff --git a/app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt b/app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt index 46ed856982..a3b85d4d76 100644 --- a/app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt +++ b/app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt @@ -40,6 +40,7 @@ import com.theveloper.pixelplay.utils.AlbumArtUtils import com.theveloper.pixelplay.utils.AudioMetaUtils.getAudioMetadata import com.theveloper.pixelplay.utils.DirectoryRuleResolver import com.theveloper.pixelplay.utils.buildLocalAudioSelection +import com.theveloper.pixelplay.utils.artistNameKey import com.theveloper.pixelplay.utils.normalizeMetadataTextOrEmpty import com.theveloper.pixelplay.utils.splitArtistsByDelimiters import dagger.assisted.Assisted @@ -259,8 +260,24 @@ constructor( val existingArtistMetadata = allExistingArtists.associate { it.id to (it.imageUrl to it.customImageUri) } - // Load all existing artist IDs to ensure stability across incremental syncs - val existingArtistIdMap = allExistingArtists.associate { it.name to it.id }.toMutableMap() + // Load all existing artist IDs to ensure stability across incremental syncs. + // Keyed by artistNameKey() (case/whitespace-insensitive) so a tag + // written as "beyonce" resolves to the row stored as "Beyoncé" + // instead of creating a second one. + // + // associateBy keeps the FIRST row for a given key, and the input is + // ordered by id so the lowest id wins deterministically. (The old + // `associate { it.name to it.id }` kept the LAST and silently dropped + // every earlier duplicate, leaving orphaned cross-refs behind.) + val orderedExistingArtists = allExistingArtists.sortedBy { it.id } + val existingArtistIdMap = LinkedHashMap(orderedExistingArtists.size) + val existingArtistDisplayNames = HashMap(orderedExistingArtists.size) + orderedExistingArtists.forEach { artist -> + val key = artistNameKey(artist.name) + if (key.isEmpty()) return@forEach + existingArtistIdMap.putIfAbsent(key, artist.id) + existingArtistDisplayNames.putIfAbsent(key, artist.name) + } val maxArtistId = musicDao.getMaxArtistId() ?: 0L Timber.tag(TAG) @@ -276,6 +293,7 @@ constructor( existingArtistMetadata = existingArtistMetadata, existingAlbums = allExistingAlbums, existingArtistIdMap = existingArtistIdMap, + existingArtistDisplayNames = existingArtistDisplayNames, initialMaxArtistId = maxArtistId ) @@ -514,11 +532,21 @@ constructor( existingArtistMetadata: Map>, existingAlbums: List, existingArtistIdMap: MutableMap, + existingArtistDisplayNames: Map, initialMaxArtistId: Long ): MultiArtistProcessResult { val nextArtistId = AtomicLong(initialMaxArtistId + 1) + // Keyed by artistNameKey(), NOT by the raw name. See ArtistNameKey.kt: keying + // on the raw name minted a brand new artist row for every case/whitespace + // variant of an artist that already existed, inflating the artist list on + // every scan. val artistNameToId = existingArtistIdMap // Re-use the map passed in + + // The name already stored in the DB wins over the incoming file tag, so a + // song tagged "beyonce" cannot degrade the display name of an artist stored + // as "Beyoncé" (which would also break the Deezer image lookup). + val artistDisplayName = HashMap(existingArtistDisplayNames) val allCrossRefs = mutableListOf() val artistTrackCounts = mutableMapOf() @@ -551,21 +579,23 @@ constructor( } allArtistsForSong.forEach { artistName -> - val normalizedName = artistName.trim() - if (normalizedName.isNotEmpty() && !artistNameToId.containsKey(normalizedName)) { + val displayName = artistName.trim() + val key = artistNameKey(displayName) + if (key.isNotEmpty() && !artistNameToId.containsKey(key)) { val id = nextArtistId.getAndIncrement() - artistNameToId[normalizedName] = id + artistNameToId[key] = id + artistDisplayName.putIfAbsent(key, displayName) } } - val primaryArtistName = - allArtistsForSong.firstOrNull()?.trim()?.takeIf { it.isNotEmpty() } - ?: songArtistNameTrimmed - val primaryArtistId = artistNameToId[primaryArtistName] ?: song.artistId + val primaryArtistKey = + allArtistsForSong.firstOrNull()?.let { artistNameKey(it) }?.takeIf { it.isNotEmpty() } + ?: artistNameKey(songArtistNameTrimmed) + val primaryArtistId = artistNameToId[primaryArtistKey] ?: song.artistId allArtistsForSong.forEachIndexed { index, artistName -> - val normalizedName = artistName.trim() - val artistId = artistNameToId[normalizedName] + val key = artistNameKey(artistName) + val artistId = artistNameToId[key] if (artistId != null) { val isPrimary = (index == 0) // First artist is primary allCrossRefs.add( @@ -585,9 +615,10 @@ constructor( // Build serialized artists JSON for efficient loading without JOINs val artistRefsForJson = allArtistsForSong.mapIndexed { index, name -> - val normalizedName = name.trim() - val artistId = artistNameToId[normalizedName] ?: 0L - ArtistRef(id = artistId, name = normalizedName, isPrimary = index == 0) + val key = artistNameKey(name) + val artistId = artistNameToId[key] ?: 0L + val displayName = artistDisplayName[key] ?: name.trim() + ArtistRef(id = artistId, name = displayName, isPrimary = index == 0) }.filter { it.name.isNotEmpty() } correctedSongs.add( @@ -601,12 +632,12 @@ constructor( } // Build Entities - val artistEntities = artistNameToId.map { (name, id) -> + val artistEntities = artistNameToId.map { (key, id) -> val count = artistTrackCounts[id] ?: 0 val metadata = existingArtistMetadata[id] ArtistEntity( id = id, - name = name, + name = artistDisplayName[key] ?: key, trackCount = count, imageUrl = metadata?.first, customImageUri = metadata?.second diff --git a/app/src/main/java/com/theveloper/pixelplay/di/AppModule.kt b/app/src/main/java/com/theveloper/pixelplay/di/AppModule.kt index 7f1d935994..5965f95dcb 100644 --- a/app/src/main/java/com/theveloper/pixelplay/di/AppModule.kt +++ b/app/src/main/java/com/theveloper/pixelplay/di/AppModule.kt @@ -165,7 +165,8 @@ object AppModule { PixelPlayDatabase.MIGRATION_38_39, PixelPlayDatabase.MIGRATION_39_40, PixelPlayDatabase.MIGRATION_40_41, - PixelPlayDatabase.MIGRATION_41_42 + PixelPlayDatabase.MIGRATION_41_42, + PixelPlayDatabase.MIGRATION_42_43 ) .addCallback(PixelPlayDatabase.createRuntimeArtifactsCallback()) .setJournalMode(RoomDatabase.JournalMode.WRITE_AHEAD_LOGGING) diff --git a/app/src/main/java/com/theveloper/pixelplay/utils/ArtistNameKey.kt b/app/src/main/java/com/theveloper/pixelplay/utils/ArtistNameKey.kt new file mode 100644 index 0000000000..c8124bfde3 --- /dev/null +++ b/app/src/main/java/com/theveloper/pixelplay/utils/ArtistNameKey.kt @@ -0,0 +1,41 @@ +package com.theveloper.pixelplay.utils + +import java.util.Locale + +/** + * Canonical identity key for an artist name. + * + * Two artist strings that produce the same key are treated as the *same artist* + * everywhere in the app: they resolve to one [com.theveloper.pixelplay.data.model.Artist] + * row, share one album image, and accumulate one track count. + * + * The key intentionally only normalises things that are never meaningful in an + * artist name: + * - leading/trailing whitespace + * - runs of internal whitespace ("AC DC" -> "ac dc") + * - letter case ("Beyonce" -> "beyonce") + * + * It deliberately does **not** strip noise words such as "feat.", "- Remastered" + * or "The": those can legitimately be part of a real artist's name, and merging + * on them would fold genuinely different artists into one row. + * + * All code that creates or resolves artist rows MUST go through this function. + * Previously [com.theveloper.pixelplay.data.worker.SyncWorker] keyed its + * existing-artist map on the raw name while + * [com.theveloper.pixelplay.data.media.SongMetadataEditor] keyed on + * `trim().lowercase()`. The two disagreed, so a resync minted a fresh row for + * every case variant of a name that already existed, inflating the artist list + * on every scan. + * + * Note: the SQL-side equivalent used by the DAO/migrations is + * `LOWER(TRIM(name))`, which agrees with this function for every real-world case + * (case and edge whitespace). It does not collapse *internal* whitespace runs; + * in-memory callers must therefore use this function rather than rebuilding the + * key by hand. + */ +fun artistNameKey(name: String): String = + name.trim() + .replace(WHITESPACE_RUN, " ") + .lowercase(Locale.ROOT) + +private val WHITESPACE_RUN = Regex("\\s+") \ No newline at end of file diff --git a/app/src/test/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtilsTest.kt b/app/src/test/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtilsTest.kt index fee88c5978..0f7f8b21f7 100644 --- a/app/src/test/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtilsTest.kt +++ b/app/src/test/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtilsTest.kt @@ -146,6 +146,48 @@ class AlbumGroupingUtilsTest { assertThat(displayArtist).isEqualTo("The Weeknd & Justice") } + @Test + fun `resolveAlbumDisplayArtistId resolves names that differ only by case`() { + // The map handed to this function is keyed by artistNameKey(), so a lookup + // using the raw display-artist string used to miss and silently attribute + // the album to the first song's artist instead. + val resolved = resolveAlbumDisplayArtistId( + displayArtist = "Beyoncé", + songs = listOf(testSong(artistName = "Some Other Artist", albumArtist = null)), + artistNameToId = mapOf("beyoncé" to 7L), + artistDelimiters = listOf(";"), + wordDelimiters = listOf("feat.") + ) + + assertThat(resolved).isEqualTo(7L) + } + + @Test + fun `resolveAlbumDisplayArtistId resolves names with differing whitespace`() { + val resolved = resolveAlbumDisplayArtistId( + displayArtist = " Radiohead ", + songs = listOf(testSong(artistName = "Some Other Artist", albumArtist = null)), + artistNameToId = mapOf("radiohead" to 11L), + artistDelimiters = listOf(";"), + wordDelimiters = listOf("feat.") + ) + + assertThat(resolved).isEqualTo(11L) + } + + @Test + fun `resolveAlbumDisplayArtistId falls back to the first split artist`() { + val resolved = resolveAlbumDisplayArtistId( + displayArtist = "Justice feat. Dua Lipa", + songs = listOf(testSong(artistName = "Some Other Artist", albumArtist = null)), + artistNameToId = mapOf("justice" to 5L, "dua lipa" to 6L), + artistDelimiters = listOf(";"), + wordDelimiters = listOf("feat.") + ) + + assertThat(resolved).isEqualTo(5L) + } + private fun testSong( artistName: String, albumArtist: String?, diff --git a/app/src/test/java/com/theveloper/pixelplay/utils/ArtistNameKeyTest.kt b/app/src/test/java/com/theveloper/pixelplay/utils/ArtistNameKeyTest.kt new file mode 100644 index 0000000000..5fdc2617c8 --- /dev/null +++ b/app/src/test/java/com/theveloper/pixelplay/utils/ArtistNameKeyTest.kt @@ -0,0 +1,74 @@ +package com.theveloper.pixelplay.utils + +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertNotEquals +import org.junit.jupiter.api.Test + +/** + * Guards the canonical artist-identity rule. + * + * Regression context: SyncWorker keyed its existing-artist map on the raw + * `name` while SongMetadataEditor keyed on `trim().lowercase()`. The two + * disagreed, so a resync of a library whose tags differ in case from the stored + * rows minted a new artist row every scan and the artist list grew without + * bound. These tests pin the normalisation that both writers now share. + */ +class ArtistNameKeyTest { + + @Test + fun `case variants resolve to one key`() { + assertEquals(artistNameKey("Beyoncé"), artistNameKey("beyoncé")) + assertEquals(artistNameKey("BEYONCÉ"), artistNameKey("beyoncé")) + } + + @Test + fun `surrounding and internal whitespace is ignored`() { + assertEquals(artistNameKey("Radiohead"), artistNameKey(" Radiohead ")) + assertEquals(artistNameKey("Radiohead"), artistNameKey("Radiohead")) + assertEquals(artistNameKey("AC DC"), artistNameKey("AC DC")) + assertEquals(artistNameKey("AC DC"), artistNameKey("\tAC \n DC \r")) + } + + @Test + fun `tabs and newlines are treated as whitespace not as name content`() { + assertEquals(artistNameKey("Sigur Rós"), artistNameKey("Sigur\tRós")) + assertEquals(artistNameKey("Sigur Rós"), artistNameKey("Sigur\nRós")) + } + + @Test + fun `key is already lowercase and trimmed`() { + assertEquals("radiohead", artistNameKey(" RadioHead ")) + } + + @Test + fun `blank names collapse to the empty key`() { + assertEquals("", artistNameKey("")) + assertEquals("", artistNameKey(" ")) + assertEquals("", artistNameKey("\t\n")) + } + + @Test + fun `distinct artists keep distinct keys`() { + assertNotEquals(artistNameKey("The Beatles"), artistNameKey("Beatles")) + assertNotEquals(artistNameKey("Radiohead"), artistNameKey("Radiohead Live")) + } + + @Test + fun `artist names that contain delimiter characters are not collapsed`() { + // These must remain separate artists: the app's default delimiters do not + // include "&" or "/" precisely so names like these survive. + assertNotEquals(artistNameKey("W&W"), artistNameKey("WandW")) + assertNotEquals(artistNameKey("AC/DC"), artistNameKey("ACDC")) + assertNotEquals(artistNameKey("Black Country, New Road"), artistNameKey("Black Country New Road")) + } + + @Test + fun `the same key is produced regardless of which surface normalises first`() { + // The bug only manifested because two call sites normalised differently. + // Feed both a "stored" and an "incoming" spelling through the same helper + // and they must agree, which is what keeps a resync from forking a row. + val stored = "Beyoncé" + val incoming = " beyoncé " + assertEquals(artistNameKey(stored), artistNameKey(incoming)) + } +} \ No newline at end of file