Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6ff9ba7
fix: dismiss keyboard when selecting search result
SiddartthVS Sep 26, 2026
a289c76
feat(downloads): swipe a song left in Library's Downloaded list to re…
cuong-tran Oct 19, 2026
c46199b
fix(downloads): remove downloads from the Downloaded list off the mai…
cuong-tran Oct 19, 2026
74e691c
fix(ui): spring a song row back when its swipe detector restarts mid-…
cuong-tran Oct 19, 2026
683957f
fix(rtl): make a swiped song row follow the finger in right-to-left l…
cuong-tran Oct 19, 2026
f8d8715
fix(downloads): name the song menu's download row by what a tap does
cuong-tran Oct 19, 2026
15266ec
chore(core): bump for the FOSS build keeping its foreground service p…
maxrave-dev Nov 2, 2026
b6dd3eb
fix(search): keep the focus clear only on the suggestion tap, the one…
maxrave-dev Nov 2, 2026
5d709a3
Merge pull request #2556 from SiddartthVS/fix/keyboard-not-dismissing…
maxrave-dev Nov 2, 2026
53cb9cc
chore(core): bump for removed and cancelled downloads going back to n…
maxrave-dev Nov 2, 2026
5e0cdbc
refactor(downloads): drop the swipe-to-remove and draw Remove downloa…
maxrave-dev Nov 2, 2026
0920c20
fix(desktop): let macOS drag the window across displays natively and …
maxrave-dev Nov 2, 2026
c947576
Merge pull request #2709 from cuong-tran/delete-download
maxrave-dev Nov 3, 2026
15cbe70
Merge remote-tracking branch 'origin/dev' into dev
maxrave-dev Nov 3, 2026
1b72974
feat(discord): log in to Discord over OAuth on Full builds and keep k…
maxrave-dev Nov 3, 2026
aae9ba1
chore(core): bump for the discord module ignoring its build directory
maxrave-dev Nov 3, 2026
013db77
Merge pull request #2809 from maxrave-dev/feature/discord-oauth
maxrave-dev Nov 3, 2026
2f1460c
chore(core): bump for the Discord OAuth merge into multiplatform
maxrave-dev Nov 6, 2026
55ebef8
feat(player): add the SoundCloud Now Playing style
maxrave-dev Nov 6, 2026
ed23580
feat(player): refine the SoundCloud style and add music app color pre…
maxrave-dev Nov 6, 2026
87f38a4
feat(automix): place crossfades by the loudness-labelled parts of eac…
maxrave-dev Nov 6, 2026
91ec84b
chore(core): bump for the precache retry and leak fix merge into mult…
maxrave-dev Nov 8, 2026
51104c1
feat(login): import YouTube and Spotify sign-ins from browsers
maxrave-dev Nov 8, 2026
092575e
fix(artist): scale desktop logos with the content panel
maxrave-dev Nov 9, 2026
fbdba0d
feat(lyrics): enable LRCLIB word-synced lyrics
maxrave-dev Nov 9, 2026
b7dd4d6
fix(player): complete SoundCloud controls and waveform previews
maxrave-dev Nov 10, 2026
e2be20e
feat(audio): add 8D audio effect
maxrave-dev Nov 11, 2026
c11ee6a
fix(player): show the comment time only once the SoundCloud draft opens
maxrave-dev Nov 11, 2026
357c521
feat(sync): add library sync between phone and desktop
maxrave-dev Nov 12, 2026
609369f
feat(ui): add desktop vertical scrollbars, unify artwork corners and …
maxrave-dev Nov 12, 2026
7ccf644
Merge pull request #2872 from maxrave-dev/feat/data_sync
maxrave-dev Nov 12, 2026
51c8836
chore(core): bump for the library sync merge into multiplatform
maxrave-dev Nov 12, 2026
44c197e
chore(release): add the 2.6.0 changelogs and bump the version and the…
maxrave-dev Nov 13, 2026
f78a4fd
docs(changelog): state the 2.6.0 playback fix after a network drop wi…
maxrave-dev Nov 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/android-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ jobs:
env:
LASTFM_API_KEY: ${{ secrets.LASTFM_API_KEY }}
LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
run: |
echo "LASTFM_API_KEY=${{ secrets.LASTFM_API_KEY }}" >> ./local.properties
echo "LASTFM_SECRET=${{ secrets.LASTFM_SECRET }}" >> ./local.properties
echo "DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }}" >> ./local.properties

- name: Update environment variables
env:
Expand Down Expand Up @@ -107,9 +109,11 @@ jobs:
env:
LASTFM_API_KEY: ${{ secrets.LASTFM_API_KEY }}
LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
run: |
echo "LASTFM_API_KEY=${{ secrets.LASTFM_API_KEY }}" >> ./local.properties
echo "LASTFM_SECRET=${{ secrets.LASTFM_SECRET }}" >> ./local.properties
echo "DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }}" >> ./local.properties

- name: Update environment variables
env:
Expand Down Expand Up @@ -220,9 +224,11 @@ jobs:
env:
LASTFM_API_KEY: ${{ secrets.LASTFM_API_KEY }}
LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
run: |
echo "LASTFM_API_KEY=${{ secrets.LASTFM_API_KEY }}" >> ./local.properties
echo "LASTFM_SECRET=${{ secrets.LASTFM_SECRET }}" >> ./local.properties
echo "DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }}" >> ./local.properties

- name: Generate aboutLibraries.json
run: ./gradlew exportLibraryDefinitions
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ jobs:
env:
LASTFM_API_KEY: ${{ secrets.LASTFM_API_KEY }}
LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
run: |
echo "LASTFM_API_KEY=${{ secrets.LASTFM_API_KEY }}" >> ./local.properties
echo "LASTFM_SECRET=${{ secrets.LASTFM_SECRET }}" >> ./local.properties
echo "DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }}" >> ./local.properties

- name: Generate aboutLibraries.json
run: ./gradlew exportLibraryDefinitions
Expand Down Expand Up @@ -123,9 +125,11 @@ jobs:
env:
LASTFM_API_KEY: ${{ secrets.LASTFM_API_KEY }}
LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
run: |
echo "LASTFM_API_KEY=${{ secrets.LASTFM_API_KEY }}" >> ./local.properties
echo "LASTFM_SECRET=${{ secrets.LASTFM_SECRET }}" >> ./local.properties
echo "DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }}" >> ./local.properties

- name: Generate aboutLibraries.json
run: ./gradlew exportLibraryDefinitions
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/desktop-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@ jobs:
env:
LASTFM_API_KEY: ${{ secrets.LASTFM_API_KEY }}
LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
run: |
echo "LASTFM_API_KEY=${{ secrets.LASTFM_API_KEY }}" >> ./local.properties
echo "LASTFM_SECRET=${{ secrets.LASTFM_SECRET }}" >> ./local.properties
echo "DISCORD_CLIENT_ID=${{ secrets.DISCORD_CLIENT_ID }}" >> ./local.properties

- name: Generate aboutLibraries.json
run: ./gradlew exportLibraryDefinitions
Expand Down
83 changes: 76 additions & 7 deletions CLAUDE.md

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions androidApp/src/main/java/com/maxrave/simpmusic/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.content.res.Configuration
import android.os.Build
import android.os.Bundle
import android.os.IBinder
import android.os.SystemClock
import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
Expand All @@ -34,6 +35,7 @@ import com.maxrave.domain.data.model.intent.GenericIntent
import com.maxrave.domain.manager.DataStoreManager
import com.maxrave.domain.mediaservice.handler.MediaPlayerHandler
import com.maxrave.domain.mediaservice.handler.ToastType
import com.maxrave.domain.repository.LibrarySyncPhoneRepository
import com.maxrave.logger.Logger
import com.maxrave.media3.di.setServiceActivitySession
import com.maxrave.simpmusic.di.viewModelModule
Expand All @@ -53,11 +55,15 @@ import pub.devrel.easypermissions.EasyPermissions
import java.util.Locale
import java.util.concurrent.TimeUnit

// Process-wide, so a recreated activity (rotation, theme change) does not count as opening the app.
private var lastLibrarySyncAt = 0L

@Suppress("DEPRECATION")
class MainActivity : AppCompatActivity() {
val viewModel: SharedViewModel by inject()
val mediaPlayerHandler by inject<MediaPlayerHandler>()
val dataStoreManager: DataStoreManager by inject()
private val librarySync: LibrarySyncPhoneRepository by inject()

private var mBound = false
private var shouldUnbind = false
Expand All @@ -84,6 +90,16 @@ class MainActivity : AppCompatActivity() {
startMusicService()
// Every return to the screen asks; the pass itself runs at most once a day.
viewModel.runSmartDownloadsIfDue()
syncLibraryIfDue()
}

// ponytail: a fixed 5-minute gap between app-open rounds, since a computer that is off costs a
// LAN sweep each time; WorkManager covers the rest every 15 minutes, and "Sync now" ignores it.
private fun syncLibraryIfDue() {
val now = SystemClock.elapsedRealtime()
if (lastLibrarySyncAt != 0L && now - lastLibrarySyncAt < 5 * 60_000L) return
lastLibrarySyncAt = now
lifecycleScope.launch { librarySync.syncNow() }
}

override fun onStop() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ import coil3.request.crossfade
import com.maxrave.common.AppIdentity
import com.maxrave.data.di.loader.loadAllModules
import com.maxrave.domain.manager.DataStoreManager
import com.maxrave.domain.repository.LibrarySyncPhoneRepository
import com.maxrave.logger.Logger
import com.maxrave.simpmusic.di.viewModelModule
import com.maxrave.simpmusic.service.backup.AutoBackupScheduler
import com.maxrave.simpmusic.service.sync.LibrarySyncScheduler
import com.maxrave.simpmusic.utils.NetworkFirstInterceptor
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand All @@ -34,11 +36,13 @@ import okio.FileSystem
import org.koin.android.ext.koin.androidContext
import org.koin.android.ext.koin.androidLogger
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import org.koin.core.component.inject
import org.koin.core.context.loadKoinModules
import org.koin.core.context.startKoin
import org.koin.core.logger.Level
import org.simpmusic.crashlytics.configCrashlytics
import org.simpmusic.discord.configDiscord
import org.simpmusic.lastfm.configLastfm
import java.io.File
import java.lang.reflect.Field
Expand All @@ -58,6 +62,8 @@ class SimpMusicApplication :
Logger.enableFileLogging(File(filesDir, "logs").path)
configCrashlytics(this, BuildKonfig.sentryDsn)
configLastfm(BuildKonfig.lastfmApiKey, BuildKonfig.lastfmSecret)
// Before Koin: DiscordRepository is created at start and reads which login this build uses.
configDiscord(BuildKonfig.discordClientId)
startKoin {
androidLogger(level = Level.DEBUG)
androidContext(this@SimpMusicApplication)
Expand Down Expand Up @@ -87,6 +93,11 @@ class SimpMusicApplication :
autoBackupScheduler.observeAndSchedule()
}

val librarySyncScheduler = LibrarySyncScheduler(this, get<LibrarySyncPhoneRepository>())
applicationScope.launch {
librarySyncScheduler.observeAndSchedule()
}

CaocConfig.Builder
.create()
.backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT) // default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package com.maxrave.simpmusic.service.sync

import android.content.Context
import androidx.work.Constraints
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.NetworkType
import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import com.maxrave.domain.repository.LibrarySyncPhoneRepository
import com.maxrave.logger.Logger
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.map
import java.util.concurrent.TimeUnit

/**
* Runs a library sync round in the background while this phone is paired with a computer (#2663).
* Fifteen minutes is the shortest interval WorkManager allows; opening the app and "Sync now" fill in
* between.
*/
class LibrarySyncScheduler(
private val context: Context,
private val repository: LibrarySyncPhoneRepository,
) {
/** Call from a scope that lives as long as the application. */
suspend fun observeAndSchedule() {
var wasPaired = false
repository.state
.map { it.isPaired }
.distinctUntilChanged()
.collect { paired ->
val workManager = WorkManager.getInstance(context)
if (paired) {
val request =
PeriodicWorkRequestBuilder<LibrarySyncWorker>(15, TimeUnit.MINUTES)
.setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
.build()
// KEEP: a launch must not restart the period, or cancel the job that woke the process.
workManager.enqueueUniquePeriodicWork(WORK_NAME, ExistingPeriodicWorkPolicy.KEEP, request)
Logger.i(TAG, "background sync scheduled")
} else if (wasPaired) {
// Only a real unpairing cancels it. The first value is "not paired" until the
// pairing file has been read, and acting on it would cancel a job that is running.
workManager.cancelUniqueWork(WORK_NAME)
Logger.i(TAG, "background sync cancelled")
}
wasPaired = paired
}
}

private companion object {
const val TAG = "LibrarySync"
const val WORK_NAME = "LibrarySyncWorker"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.maxrave.simpmusic.service.sync

import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
import com.maxrave.domain.repository.LibrarySyncPhoneRepository
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject

/** One round; a computer that is away is simply tried again on the next run. */
class LibrarySyncWorker(
context: Context,
params: WorkerParameters,
) : CoroutineWorker(context, params),
KoinComponent {
private val repository: LibrarySyncPhoneRepository by inject()

override suspend fun doWork(): Result {
repository.syncNow()
return Result.success()
}
}
13 changes: 12 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@ subprojects {
configurations.all {
resolutionStrategy {
force("com.github.TeamNewPipe:nanojson:c7a6c1c08d16b6d5ecded34758e6415e07be2166")

// Kotaml retains Kaml's com.charleskorn.kaml package. Different Maven coordinates
// otherwise let both copies reach DEX. Align root and platform-specific modules.
eachDependency {
if (requested.group == "com.charleskorn.kaml" &&
(requested.name == "kaml" || requested.name.startsWith("kaml-"))
) {
useTarget("io.heapy.kotaml:${requested.name.replaceFirst("kaml", "kotaml")}:${libs.versions.kotaml.get()}")
because("Kotaml and Kaml provide the same classes; use one YAML implementation")
}
}
}
}
}
}
28 changes: 28 additions & 0 deletions changelogs/2.6.0/en-US.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# SimpMusic 2.6.0

## New
- **Library sync between your phone and your computer**: pair the Android app with the Desktop app once by scanning a QR code under Settings → Library sync. Likes, followed artists, saved albums and podcasts, playlists and the last year of listening history then stay the same on both: by themselves when SimpMusic opens on the phone, every 15 minutes while it is open on the computer, and on Sync now. It runs over your own Wi-Fi or Tailscale, downloads and device settings stay on each device, and once paired the phone can send its sign-ins to the computer without scanning a code again. ([#2663](https://github.com/maxrave-dev/SimpMusic/issues/2663))
- **SoundCloud Now Playing style**: a fourth style under Settings → Interface → Now Playing style. The artwork fills a card, the song's waveform scrolls past the playhead and is the seek bar, comments that name a moment appear over it, and a comment box with quick reactions sits underneath. ([#2847](https://github.com/maxrave-dev/SimpMusic/issues/2847))
- **8D audio**: a switch under Settings → Playback moves the song around your head, with the rotation direction and the time per revolution (3 to 30 seconds) of your choice, on Android and Desktop. ([#2846](https://github.com/maxrave-dev/SimpMusic/issues/2846))
- **Import sign-ins from a browser** (Desktop): Log in to YouTube and Log in to Spotify can take the sign-in from a browser profile on the same computer instead of pasting cookies by hand. Only that service's cookies are read and the browser is not changed. It reads Chromium-based and Firefox-based browsers on macOS and Linux, Safari on macOS, and Firefox-based browsers on Windows. ([#2850](https://github.com/maxrave-dev/SimpMusic/issues/2850))
- **Word-by-word lyrics from LRCLIB**: lyrics from LRCLIB light up word by word when LRCLIB has word timing for the song. ([#2851](https://github.com/maxrave-dev/SimpMusic/issues/2851))
- **Music app colours**: the app colour picker in Settings offers the colours of Spotify, SoundCloud, Apple Music and YouTube Music as presets. ([#2848](https://github.com/maxrave-dev/SimpMusic/issues/2848))

## Improved
- **AutoMix**: with crossfade on Auto, a fade now ends where the outgoing song's last chorus ends, and the next song comes in at the end of its intro. Both are read from the songs' own loudness. ([#2849](https://github.com/maxrave-dev/SimpMusic/issues/2849))
- **Downloads**: a downloaded song's menu now says Remove download, and one still downloading says Cancel download. Several downloads can be removed at once from the Downloaded list's multi-select, and a removed or cancelled download goes back to not downloaded right away. ([#2176](https://github.com/maxrave-dev/SimpMusic/issues/2176), [#2709](https://github.com/maxrave-dev/SimpMusic/pull/2709), [core#43](https://github.com/maxrave-dev/core/pull/43))
- **Discord login on the Full build**: you now log in on Discord's own page in your browser, and SimpMusic no longer reads your account token. If you used Discord Rich Presence before, log in again once. FOSS builds keep the token login. ([#2852](https://github.com/maxrave-dev/SimpMusic/issues/2852))
- **Scrollbars on Desktop**: every scrolling page, the sidebar, the queues and the comments sheet have a vertical scrollbar you can drag. ([#2873](https://github.com/maxrave-dev/SimpMusic/issues/2873))
- **Home on Android** fits more on screen, and rounded artwork uses the same corner everywhere in the app. ([#2873](https://github.com/maxrave-dev/SimpMusic/issues/2873))
- **Artist page on Desktop**: the artist's name logo scales with the page. ([#2853](https://github.com/maxrave-dev/SimpMusic/issues/2853))
- **Playback after YouTube updates**: both stream extractors were updated to their latest versions, with fixes for songs that failed to play when YouTube's client version could not be read or the current player could not be identified on the device. ([PipePipe bba8d844](https://github.com/maxrave-dev/PipePipeExtractor/commit/bba8d84453bb2beab4182e5d16721e25c739b777), [BravePipe 991b158f](https://github.com/maxrave-dev/BravePipeExtractor/commit/991b158fee64c95f340803d26dc5b938b4b1cd01))
- **Skipping through a queue**: only the songs Next will play are prepared ahead, and the ones you skipped past are released. ([core ab5f1ab](https://github.com/maxrave-dev/core/commit/ab5f1abffbf693a1c12e7b27beb81ed37a3fbad8))

## Fixed
- Playback stopping at 00:00 / NA:NA when the next song had failed to load during a brief network drop. A failed preload is now retried with a fresh link, and dropped instead of played. ([#2239](https://github.com/maxrave-dev/SimpMusic/issues/2239), [core#12](https://github.com/maxrave-dev/core/pull/12), [core 029c420](https://github.com/maxrave-dev/core/commit/029c42060bfe7624e7c3c297b3063ff653ae60cc))
- FOSS build: Android stopping the player about 10 minutes after a track change. ([#2233](https://github.com/maxrave-dev/SimpMusic/issues/2233))
- macOS: the window could not be dragged to another display, and the title bar could crash the app. ([#2743](https://github.com/maxrave-dev/SimpMusic/issues/2743))
- The keyboard staying open after picking a search suggestion. ([#2507](https://github.com/maxrave-dev/SimpMusic/issues/2507), [#2556](https://github.com/maxrave-dev/SimpMusic/pull/2556))
- Right-to-left languages: a swiped song row moving away from your finger. It now follows it. ([683957fc](https://github.com/maxrave-dev/SimpMusic/commit/683957fc30f16b6d1cd526975360e889142e59d0))
- The Login Sync sheet's buttons using a fixed cyan instead of your theme colour, and the title and artist on Your daily discover cards being drawn in a dim grey. ([#2873](https://github.com/maxrave-dev/SimpMusic/issues/2873))
- A song row left pushed aside when it started or stopped playing in the middle of a swipe. ([74e691c8](https://github.com/maxrave-dev/SimpMusic/commit/74e691c88cef5bfc7bfbb99cdd6468a3889bcf05))
Loading
Loading