diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 01f8c585ab..ce19fdbac8 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -24,7 +24,7 @@ android { defaultConfig { applicationId = "com.simplecityapps.shuttle" // 24: Compose 1.13, which material3 1.5.0-alpha29 brings in, no longer supports API 23. - minSdk = 24 + minSdk = 26 targetSdk = 36 versionName = versionName() versionCode = versionCode() @@ -45,9 +45,22 @@ android { // Last.fm scrobbling (#503): the key and secret ship in the APK (owner decision, 2026-09-27). buildConfigField("String", "LASTFM_API_KEY", "\"${secret("LASTFM_API_KEY", "LASTFM_API_KEY").orEmpty()}\"") buildConfigField("String", "LASTFM_SHARED_SECRET", "\"${secret("LASTFM_SHARED_SECRET", "LASTFM_SHARED_SECRET").orEmpty()}\"") + + // Short commit the APK was built from, shown in Settings > About so dev builds + // (which share one version name) are told apart. Forwarded by k8s/scripts/build-remote.sh. + buildConfigField("String", "GIT_SHA", "\"${findProperty("gitSha")?.toString()?.takeIf { it.isNotBlank() } ?: "unknown"}\"") } signingConfigs { + // A checked-in debug key shared by every builder (local or cluster): without it each + // machine mints its own ~/.android key and new dev APKs refuse to install over old ones. + // Debug keys are not secrets; the release key stays out of the repo. + named("debug") { + storeFile = file("./debug.keystore") + storePassword = "android" + keyAlias = "androiddebugkey" + keyPassword = "android" + } create("release") { if (isCiBuild() && isReleaseBuild()) { val keystore = file("./keystore.ks") @@ -64,6 +77,7 @@ android { buildTypes { getByName("debug") { + signingConfig = signingConfigs.getByName("debug") applicationIdSuffix = ".dev" if (isCiBuild()) { // We want proguard enabled on CI, so our instrumented tests run on obfuscated code @@ -80,7 +94,16 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) - signingConfig = signingConfigs.getByName("release") + // Play releases sign with the upload key (CI). Everywhere else the debug key + // signs release too, under the .dev id, so `assembleRelease` yields an + // installable, minified dev build instead of failing on a missing keystore. + // Same package and key as dev debug: the two swap in place, data intact. + if (isCiBuild() && isReleaseBuild()) { + signingConfig = signingConfigs.getByName("release") + } else { + signingConfig = signingConfigs.getByName("debug") + applicationIdSuffix = ".dev" + } } } @@ -91,8 +114,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 isCoreLibraryDesugaringEnabled = true } @@ -292,7 +315,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) freeCompilerArgs.addAll( "-Xopt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlin.time.ExperimentalTime" diff --git a/android/app/debug.keystore b/android/app/debug.keystore new file mode 100644 index 0000000000..cd78a9a010 Binary files /dev/null and b/android/app/debug.keystore differ diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8baddc4bc2..3d346071ea 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -20,10 +20,11 @@ android:fullBackupContent="@xml/backup_descriptor" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme.DayNight" + android:enableOnBackInvokedCallback="true" + android:localeConfig="@xml/locales_config" tools:ignore="GoogleAppIndexingWarning"> + + + + + + + Media's listener if + * the import finishes while that screen is open (#386). + */ +class LibraryScanReceiver : BroadcastReceiver() { + @ContributesTo(AppScope::class) + interface Injector { + fun inject(receiver: LibraryScanReceiver) + } + + @Inject + lateinit var mediaImporter: MediaImporter + + override fun onReceive( + context: Context, + intent: Intent + ) { + if (intent.action != ACTION_RESCAN_LIBRARY) return + if (!debounce()) return + context.appGraph().inject(this) + val pendingResult = goAsync() + CoroutineScope(Dispatchers.Main).launch { + try { + mediaImporter.import() + } finally { + pendingResult.finish() + } + } + } + + companion object { + const val ACTION_RESCAN_LIBRARY = "com.simplecityapps.shuttle.action.RESCAN_LIBRARY" + + const val DEBOUNCE_MS = 60_000L + + @Volatile + private var lastTriggerUptimeMs = 0L + + internal fun debounce(nowUptimeMs: Long = SystemClock.uptimeMillis()): Boolean { + synchronized(this) { + if (nowUptimeMs - lastTriggerUptimeMs < DEBOUNCE_MS) return false + lastTriggerUptimeMs = nowUptimeMs + return true + } + } + } +} diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/sources/MediaLibraryObserver.kt b/android/app/src/main/java/com/simplecityapps/shuttle/sources/MediaLibraryObserver.kt new file mode 100644 index 0000000000..f000c9621d --- /dev/null +++ b/android/app/src/main/java/com/simplecityapps/shuttle/sources/MediaLibraryObserver.kt @@ -0,0 +1,79 @@ +package com.simplecityapps.shuttle.sources + +import android.content.Context +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler +import android.os.Looper +import android.provider.MediaStore +import com.simplecityapps.mediaprovider.MediaImporter +import com.simplecityapps.shuttle.di.AppCoroutineScope +import com.simplecityapps.shuttle.di.ApplicationContext +import com.simplecityapps.shuttle.ui.screens.sources.MediaSources +import com.simplecityapps.shuttle.ui.screens.sources.MusicPermission +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import timber.log.Timber + +/** + * Re-scans the library when MediaStore's audio changes (new downloads, tag edits from other apps, deletions). + * + * Registered once at startup by [com.simplecityapps.shuttle.appinitializers.MediaProviderInitializer], only when the + * music permission is held and an import has already finished: the first scan comes from the onboarding and + * permission-grant paths instead. Changes are debounced [DEBOUNCE_MS] so a burst of writes (an album syncing track + * by track) imports once. [MediaImporter.import] coalesces overlapping requests through its own importLock, so a + * change that lands mid-import just runs one more pass. + * + * MediaStore only covers indexed files: extra SAF trees have no observable URI (see TaglibMediaProvider's + * findExtraDocuments), so those folders still need a manual or scheduled scan. + */ +@SingleIn(AppScope::class) +class MediaLibraryObserver @Inject constructor( + @ApplicationContext private val context: Context, + private val mediaImporter: MediaImporter, + private val mediaSources: MediaSources, + @AppCoroutineScope private val appCoroutineScope: CoroutineScope +) { + private var debounceJob: Job? = null + + private val observer = + object : ContentObserver(Handler(Looper.getMainLooper())) { + override fun onChange(selfChange: Boolean) = onMediaChanged() + + override fun onChange( + selfChange: Boolean, + uri: Uri? + ) = onMediaChanged() + } + + fun startIfReady() { + if (!MusicPermission.isGranted(context) || !mediaSources.hasScanned) return + context.contentResolver.registerContentObserver( + MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, + true, + observer + ) + } + + private fun onMediaChanged() { + debounceJob?.cancel() + // The app scope runs on Main, like the onboarding scan: MediaImporter notifies its listeners on the + // caller's thread, and an IO caller crashes Settings > Media's listener if the import finishes while + // that screen is open (#386). + debounceJob = + appCoroutineScope.launch { + delay(DEBOUNCE_MS) + Timber.i("MediaStore changed, re-scanning the library") + mediaImporter.import() + } + } + + companion object { + const val DEBOUNCE_MS = 20_000L + } +} diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LoadingStatusIndicator.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LoadingStatusIndicator.kt index 836501df4f..d35e28a694 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LoadingStatusIndicator.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LoadingStatusIndicator.kt @@ -7,9 +7,10 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon +import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text @@ -24,6 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.R +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun LoadingStatusIndicator( state: CircularLoadingState, @@ -41,7 +43,7 @@ fun LoadingStatusIndicator( ) { when (state) { is CircularLoadingState.Loading -> { - CircularProgressIndicator( + LoadingIndicator( color = progressColor, modifier = Modifier ) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt index 3c70295325..a204848bfd 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt @@ -26,10 +26,11 @@ import com.simplecityapps.shuttle.ui.screens.settings.SettingsDestinationRoute import com.simplecityapps.shuttle.ui.screens.settings.WhatsNewRoute import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsDestination import com.simplecityapps.shuttle.ui.screens.sources.ServerTypePickerRoute +import com.simplecityapps.shuttle.model.SmartPlaylistId +import com.simplecityapps.shuttle.ui.screens.library.SmartPlaylistRoute import com.simplecityapps.shuttle.ui.shell.AppNavigator import com.simplecityapps.shuttle.ui.shell.HomeRoute import com.simplecityapps.shuttle.ui.shell.LocalShellSnackbarHostState -import com.simplecityapps.shuttle.ui.shell.SettingsRoute import dev.zacsweers.metrox.viewmodel.metroViewModel fun EntryProviderScope.homeEntries(navigator: AppNavigator) { @@ -69,8 +70,10 @@ private fun HomeDestination( HomeScreen( uiState = uiState, callbacks = HomeCallbacks( - onOpenSettings = { onOpen(SettingsRoute) }, onShuffleAll = { viewModel.shuffleAll()?.let(actions::dispatch) }, + onOpenHistory = { onOpen(SmartPlaylistRoute(SmartPlaylistId.History.id)) }, + onOpenRecentlyAdded = { onOpen(SmartPlaylistRoute(SmartPlaylistId.RecentlyAdded.id)) }, + onOpenFavourites = { onOpen(SmartPlaylistRoute(SmartPlaylistId.Favourites.id)) }, onTogglePlayback = viewModel::onTogglePlayback, onShuffleQueue = { viewModel.shuffleQueue()?.let(actions::dispatch) }, onOpenWhatsNew = { @@ -80,6 +83,8 @@ private fun HomeDestination( onDismissWhatsNew = viewModel::onWhatsNewHandled, onAlbumClick = { onOpen(it.route) }, onArtistClick = { onOpen(it.route) }, + onPlayAlbums = { actions.dispatch(viewModel.playAlbums(it)) }, + onPlayArtists = { actions.dispatch(viewModel.playArtists(it)) }, onShowActions = actions::showActions, ), emptyContent = (emptyState as? LibraryAvailability.Empty)?.let { empty -> diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index 05866c9d0b..42a1137daf 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -1,46 +1,59 @@ package com.simplecityapps.shuttle.ui.screens.home import androidx.annotation.StringRes +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.History +import androidx.compose.material.icons.filled.LibraryAdd +import androidx.compose.material.icons.filled.Shuffle import androidx.compose.material.icons.rounded.Close import androidx.compose.material.icons.rounded.NewReleases import androidx.compose.material.icons.rounded.Pause import androidx.compose.material.icons.rounded.PlayArrow -import androidx.compose.material.icons.rounded.Settings import androidx.compose.material.icons.rounded.Shuffle import androidx.compose.material3.Card import androidx.compose.material3.ElevatedCard -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.graphics.vector.rememberVectorPainter +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.BuildConfig import com.simplecityapps.shuttle.R +import com.simplecityapps.core.R as CoreR import com.simplecityapps.shuttle.designsystem.R as DesignR import com.simplecityapps.shuttle.designsystem.component.ArtworkPlaceholder import com.simplecityapps.shuttle.designsystem.component.ArtworkShape @@ -53,34 +66,43 @@ import com.simplecityapps.shuttle.designsystem.component.S2ButtonGroup import com.simplecityapps.shuttle.designsystem.component.S2ButtonStyle import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.S2IconButton -import com.simplecityapps.shuttle.designsystem.component.S2TopBar import com.simplecityapps.shuttle.designsystem.component.SectionHeader +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.format.formatDuration import com.simplecityapps.shuttle.model.Album import com.simplecityapps.shuttle.model.AlbumArtist +import com.simplecityapps.shuttle.model.SmartPlaylistId import com.simplecityapps.shuttle.ui.actions.MediaSelection import com.simplecityapps.shuttle.ui.common.mediaactions.MediaActionsTarget import com.simplecityapps.shuttle.ui.screens.library.LibraryArtwork -import com.simplecityapps.shuttle.ui.screens.library.pluralString +import com.simplecityapps.shuttle.ui.screens.library.nameKey +import com.simplecityapps.shuttle.ui.text.stringResource as stringResourceKey class HomeCallbacks( - val onOpenSettings: () -> Unit = {}, val onShuffleAll: () -> Unit = {}, + val onOpenHistory: () -> Unit = {}, + val onOpenRecentlyAdded: () -> Unit = {}, + val onOpenFavourites: () -> Unit = {}, val onTogglePlayback: () -> Unit = {}, val onShuffleQueue: () -> Unit = {}, val onOpenWhatsNew: () -> Unit = {}, val onDismissWhatsNew: () -> Unit = {}, val onAlbumClick: (Album) -> Unit = {}, val onArtistClick: (AlbumArtist) -> Unit = {}, + val onPlayAlbums: (List) -> Unit = {}, + val onPlayArtists: (List) -> Unit = {}, val onShowActions: (MediaActionsTarget) -> Unit = {}, ) /** - * Home: a hero to resume the queue over the library's shelves, or the empty state when there's no music yet. There's - * no page title (#490): the bar holds only Shuffle all and the Settings gear, so the first screen is music. Search is - * its own tab. + * Home: the shortcut row over the library's shelves, or the empty state when there's no music yet. + * There's no top bar: the shortcut row holds Shuffle all, and settings and search live in their + * own tabs, so the first screen is music. + * + * Classic restores the old home exactly: a centered logo over "Shuttle Music Player" and dark + * tinted shortcut circles with coloured outline glyphs. Modern keeps a small left-aligned brand + * row and solid bright circles with white glyphs. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun HomeScreen( uiState: HomeUiState, @@ -89,40 +111,31 @@ fun HomeScreen( /** Shown in place of the generic empty state while the library has no songs (#422), so it can offer access. */ emptyContent: (@Composable (Modifier) -> Unit)? = null, ) { - val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() - Scaffold( - modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), - // The shell pads destinations clear of the nav bar and player; the bar takes the status bar. - contentWindowInsets = WindowInsets(0), - topBar = { - S2TopBar( - title = "", - actions = { - if (uiState is HomeUiState.Content) { - S2IconButton(icon = Icons.Rounded.Shuffle, contentDescription = stringResource(R.string.home_shuffle_all), onClick = callbacks.onShuffleAll) - } - S2IconButton(icon = Icons.Rounded.Settings, contentDescription = stringResource(R.string.settings_menu_settings), onClick = callbacks.onOpenSettings) - }, - scrollBehavior = scrollBehavior, - ) - }, - ) { padding -> - val contentModifier = Modifier.fillMaxSize().padding(padding) - when (uiState) { - HomeUiState.Loading -> LoadingState(contentModifier) + // No top bar: the shell pads the nav bar and player, and the list takes the status bar. + HomeBody(uiState, callbacks, modifier.fillMaxSize().statusBarsPadding(), emptyContent) +} - HomeUiState.Empty -> if (emptyContent != null) { - emptyContent(contentModifier) - } else { - EmptyState( - title = stringResource(R.string.home_empty_title), - message = stringResource(R.string.home_empty_message), - modifier = contentModifier, - ) - } +@Composable +private fun HomeBody( + uiState: HomeUiState, + callbacks: HomeCallbacks, + modifier: Modifier, + emptyContent: (@Composable (Modifier) -> Unit)?, +) { + when (uiState) { + HomeUiState.Loading -> LoadingState(modifier) - is HomeUiState.Content -> HomeContent(uiState, callbacks, contentModifier) + HomeUiState.Empty -> if (emptyContent != null) { + emptyContent(modifier) + } else { + EmptyState( + title = stringResource(R.string.home_empty_title), + message = stringResource(R.string.home_empty_message), + modifier = modifier, + ) } + + is HomeUiState.Content -> HomeContent(uiState, callbacks, modifier) } } @@ -132,17 +145,181 @@ private fun HomeContent( callbacks: HomeCallbacks, modifier: Modifier, ) { - LazyColumn(modifier = modifier, contentPadding = PaddingValues(bottom = 16.dp)) { + val compact = LocalCompactMode.current + LazyColumn( + modifier = modifier, + contentPadding = PaddingValues(bottom = if (compact) 8.dp else 16.dp), + ) { + item(key = "brand") { BrandHeader() } + item(key = "shortcuts") { SmartShortcuts(callbacks) } content.resume?.let { resume -> item(key = "resume") { ResumeHero(resume, callbacks) } } if (content.showWhatsNew) { item(key = "whats-new") { WhatsNewCard(callbacks) } } - shelf(R.string.home_recently_played, "recently-played", content.recentlyPlayed) { album -> AlbumTile(album, callbacks, showPlayCount = false) } - shelf(R.string.home_recently_added, "recently-added", content.recentlyAdded) { album -> AlbumTile(album, callbacks, showPlayCount = false) } - shelf(R.string.home_most_played, "most-played", content.mostPlayed) { album -> AlbumTile(album, callbacks, showPlayCount = true) } - shelf(R.string.home_something_different, "something-different", content.somethingDifferent) { artist -> ArtistTile(artist, callbacks) } + shelf(R.string.home_recently_played, if (compact) R.string.home_recently_played_subtitle else null, "recently-played", content.recentlyPlayed, onPlay = { callbacks.onPlayAlbums(content.recentlyPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } + shelf(R.string.home_recently_added, if (compact) R.string.home_recently_added_subtitle else null, "recently-added", content.recentlyAdded, onPlay = { callbacks.onPlayAlbums(content.recentlyAdded) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } + shelf(R.string.home_most_played, if (compact) R.string.home_most_played_subtitle else null, "most-played", content.mostPlayed, onPlay = { callbacks.onPlayAlbums(content.mostPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = compact) } + shelf(R.string.home_something_different, if (compact) R.string.home_something_different_subtitle else null, "something-different", content.somethingDifferent, onPlay = { callbacks.onPlayArtists(content.somethingDifferent) }) { artist -> ArtistTile(artist, callbacks) } + } +} + +/** + * The brand: classic centers a large logo over "Shuttle Music Player" like the old home; modern + * keeps a small left-aligned logo and name row. + */ +@Composable +private fun BrandHeader() { + if (LocalCompactMode.current) { + Column( + modifier = Modifier.fillMaxWidth().padding(top = 16.dp, bottom = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + Image( + painter = painterResource(CoreR.drawable.ic_shuttle_logo), + contentDescription = null, + modifier = Modifier.size(64.dp), + ) + Text( + text = stringResource(R.string.home_brand_full), + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onSurface, + ) + } + } else { + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + Image( + painter = painterResource(CoreR.drawable.ic_shuttle_logo), + contentDescription = null, + modifier = Modifier.size(32.dp), + ) + Text( + text = stringResource(R.string.home_brand), + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface, + ) + } + } +} + +/** + * The old home's shortcut row: the three smart playlists plus Shuffle all. Classic matches the + * reference exactly: dark tinted circles with coloured outline glyphs. Modern uses solid bright + * circles with white filled glyphs. The playlists open their detail screens; the names match the + * Playlists tab's rows. + */ +@Composable +private fun SmartShortcuts(callbacks: HomeCallbacks) { + val compact = LocalCompactMode.current + // Classic circles are smaller (48dp) with a taller top gap under the status bar; breathing + // room under the labels separates them from the first shelf header. + Row( + modifier = Modifier.fillMaxWidth().padding(start = if (compact) 12.dp else 16.dp, end = if (compact) 12.dp else 16.dp, top = if (compact) 12.dp else 16.dp, bottom = if (compact) 8.dp else 12.dp), + horizontalArrangement = Arrangement.SpaceEvenly, + ) { + if (compact) { + // The legacy glyphs, restored from the pre-rewrite resources. + Shortcut( + icon = painterResource(R.drawable.ic_history_black_24dp), + label = stringResourceKey(SmartPlaylistId.History.nameKey), + onClick = callbacks.onOpenHistory, + containerColor = Color(0xFF1E2E28), + glyphColor = Color(0xFF4DB6AC), + ) + Shortcut( + icon = painterResource(R.drawable.ic_playlist_add_black_24dp), + label = stringResourceKey(SmartPlaylistId.RecentlyAdded.nameKey), + onClick = callbacks.onOpenRecentlyAdded, + containerColor = Color(0xFF2E2A18), + glyphColor = Color(0xFFFFB300), + ) + Shortcut( + icon = painterResource(R.drawable.ic_favorite_border_black_24dp), + label = stringResourceKey(SmartPlaylistId.Favourites.nameKey), + onClick = callbacks.onOpenFavourites, + containerColor = Color(0xFF331B1E), + glyphColor = Color(0xFFE53935), + ) + Shortcut( + icon = painterResource(R.drawable.ic_shuffle_black_24dp), + label = stringResource(R.string.btn_shuffle), + onClick = callbacks.onShuffleAll, + containerColor = Color(0xFF182430), + glyphColor = Color(0xFF42A5F5), + ) + } else { + Shortcut( + icon = rememberVectorPainter(Icons.Filled.History), + label = stringResourceKey(SmartPlaylistId.History.nameKey), + onClick = callbacks.onOpenHistory, + containerColor = Color(0xFFEF6C00), + glyphColor = Color.White, + ) + Shortcut( + icon = rememberVectorPainter(Icons.Filled.LibraryAdd), + label = stringResourceKey(SmartPlaylistId.RecentlyAdded.nameKey), + onClick = callbacks.onOpenRecentlyAdded, + containerColor = Color(0xFF43A047), + glyphColor = Color.White, + ) + Shortcut( + icon = rememberVectorPainter(Icons.Filled.Favorite), + label = stringResourceKey(SmartPlaylistId.Favourites.nameKey), + onClick = callbacks.onOpenFavourites, + containerColor = Color(0xFFE53935), + glyphColor = Color.White, + ) + Shortcut( + icon = rememberVectorPainter(Icons.Filled.Shuffle), + label = stringResource(R.string.btn_shuffle), + onClick = callbacks.onShuffleAll, + containerColor = Color(0xFF1E88E5), + glyphColor = Color.White, + ) + } + } +} + +@Composable +private fun RowScope.Shortcut( + icon: Painter, + label: String, + onClick: () -> Unit, + containerColor: Color, + glyphColor: Color, +) { + val compact = LocalCompactMode.current + val circle = if (compact) 48.dp else 56.dp + Column( + modifier = Modifier + .weight(1f) + .clickable(onClick = onClick, onClickLabel = label, role = Role.Button) + .padding(vertical = 4.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + Box( + modifier = Modifier + .size(circle) + .clip(CircleShape) + .background(containerColor), + contentAlignment = Alignment.Center, + ) { + Icon(icon, contentDescription = label, tint = glyphColor, modifier = Modifier.size(if (compact) 24.dp else 28.dp)) + } + Text( + text = label, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) } } @@ -151,16 +328,42 @@ private fun HomeContent( private fun ResumeHero( resume: ResumeQueue, callbacks: HomeCallbacks, +) { + val compact = LocalCompactMode.current + if (compact) { + // Classic has no hero card: a flat row like any other list item. + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp).testTag("resume-hero"), + verticalAlignment = Alignment.CenterVertically, + ) { + ResumeHeroContent(resume, callbacks) + } + } else { + Card(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp).testTag("resume-hero")) { + Row(modifier = Modifier.padding(10.dp), verticalAlignment = Alignment.CenterVertically) { + ResumeHeroContent(resume, callbacks) + } + } + } +} + +@Composable +private fun RowScope.ResumeHeroContent( + resume: ResumeQueue, + callbacks: HomeCallbacks, ) { val song = resume.song val unknown = stringResource(com.simplecityapps.core.R.string.unknown) val timeLeft = stringResource(R.string.home_resume_time_left, formatDuration(resume.timeLeftMs)) - Card(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) { - Row(modifier = Modifier.padding(12.dp), verticalAlignment = Alignment.CenterVertically) { - LibraryArtwork(song, ArtworkPlaceholder.Album, Modifier.size(ResumeArtworkSize), size = ArtworkSize.Grid) - Column(modifier = Modifier.weight(1f).padding(start = 16.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) { + val compact = LocalCompactMode.current + // The artwork slot is a fixed box the art fills: Artwork's own size would override a bare + // size modifier, so the compact value would never apply. + Box(Modifier.size(ResumeArtworkSize)) { + LibraryArtwork(song, ArtworkPlaceholder.Album, Modifier.fillMaxSize(), size = ArtworkSize.Grid) + } + Column(modifier = Modifier.weight(1f).padding(start = if (compact) 8.dp else 12.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) { Text(stringResource(R.string.home_resume_title), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.primary) - Text(song.album ?: unknown, style = MaterialTheme.typography.titleLarge, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(song.album ?: unknown, style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis) Text( text = listOf(song.albumArtist ?: song.friendlyArtistName ?: unknown, timeLeft).joinToString(" · "), style = MaterialTheme.typography.bodyMedium, @@ -168,7 +371,7 @@ private fun ResumeHero( maxLines = 1, overflow = TextOverflow.Ellipsis, ) - Box(Modifier.padding(top = 8.dp)) { + Box(Modifier.padding(top = if (LocalCompactMode.current) 2.dp else 4.dp)) { S2ButtonGroup( primary = if (resume.playing) { S2GroupAction(stringResource(DesignR.string.ds_pause), callbacks.onTogglePlayback, Icons.Rounded.Pause) @@ -178,12 +381,11 @@ private fun ResumeHero( secondary = listOf(S2GroupAction(stringResource(R.string.menu_title_shuffle), callbacks.onShuffleQueue, Icons.Rounded.Shuffle)), ) } - } - } } } -private val ResumeArtworkSize = 112.dp +private val ResumeArtworkSize: Dp + @Composable get() = if (LocalCompactMode.current) 40.dp else 64.dp @Composable private fun WhatsNewCard(callbacks: HomeCallbacks) { @@ -214,19 +416,38 @@ private fun WhatsNewCard(callbacks: HomeCallbacks) { /** * A plain horizontally scrolling row of [GridTile]s, hidden when there are none. The tiles are [ShelfTileWidth] wide so - * about two and a half fit a phone and the cut-off one says the row scrolls (#490); each title and artist sits below + * about three fit a phone (four in compact mode) and the cut-off one says the row scrolls (#490); each title and artist sits below * its cover rather than over it, where they'd clash with text printed on the art (#404). */ private fun LazyListScope.shelf( @StringRes title: Int, + @StringRes subtitle: Int?, key: String, items: List, + onPlay: (() -> Unit)? = null, tile: @Composable (T) -> Unit, ) { if (items.isEmpty()) return - item(key = "$key:header") { SectionHeader(title = stringResource(title)) } + item(key = "$key:header") { + val shelfTitle = stringResource(title) + val compactHeader = LocalCompactMode.current + // The top gap separates shelves; the bottom gap keeps the header off the artwork. + SectionHeader( + title = shelfTitle, + subtitle = subtitle?.let { stringResource(it) }, + iconAction = onPlay?.let { Icons.Rounded.PlayArrow }, + iconActionContentDescription = onPlay?.let { stringResource(R.string.home_play_shelf, shelfTitle) }, + onIconAction = { onPlay?.invoke() }, + modifier = Modifier.padding(top = if (compactHeader) 8.dp else 12.dp, bottom = 4.dp), + ) + } item(key = key) { - LazyRow(contentPadding = PaddingValues(horizontal = 16.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + val compact = LocalCompactMode.current + LazyRow( + contentPadding = PaddingValues(horizontal = if (compact) 12.dp else 16.dp), + horizontalArrangement = Arrangement.spacedBy(if (compact) 6.dp else 8.dp), + modifier = Modifier.padding(bottom = if (compact) 12.dp else 16.dp), + ) { itemsIndexed(items) { _, item -> Box(Modifier.width(ShelfTileWidth)) { tile(item) } } } } @@ -240,11 +461,10 @@ private fun AlbumTile( ) { val title = album.name ?: stringResource(com.simplecityapps.core.R.string.unknown) val artist = album.albumArtist ?: album.friendlyArtistName ?: stringResource(com.simplecityapps.core.R.string.unknown) - // The play count leads, so a long artist name is what gets cut short. - val subtitle = if (showPlayCount) listOf(pluralString(R.plurals.home_play_count, album.playCount), artist).joinToString(" · ") else artist GridTile( title = title, - subtitle = subtitle, + subtitle = artist, + badge = if (showPlayCount) album.playCount.toString() else null, onClick = { callbacks.onAlbumClick(album) }, onLongClick = { callbacks.onShowActions(MediaActionsTarget(title, artist, MediaSelection.Albums(album), ArtworkPlaceholder.Album)) }, artwork = { LibraryArtwork(album, ArtworkPlaceholder.Album, Modifier.fillMaxSize(), size = ArtworkSize.Grid) }, @@ -267,4 +487,5 @@ private fun ArtistTile( ) } -private val ShelfTileWidth = 140.dp +private val ShelfTileWidth: Dp + @Composable get() = if (LocalCompactMode.current) 128.dp else 144.dp diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModel.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModel.kt index d10e168d04..ca2469576b 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModel.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModel.kt @@ -93,6 +93,12 @@ class HomeViewModel @Inject constructor( /** Shuffles the queue the resume hero offers, or null with none. */ fun shuffleQueue(): MediaAction? = (uiState.value as? HomeUiState.Content)?.resume?.let { MediaAction.Shuffle(MediaSelection.Songs(it.songs)) } + /** Plays every song of [albums] in order: a shelf (recently added, most played) as its queue. */ + fun playAlbums(albums: List): MediaAction = MediaAction.Play(MediaSelection.Albums(albums)) + + /** Plays every song of [artists] in order. */ + fun playArtists(artists: List): MediaAction = MediaAction.Play(MediaSelection.AlbumArtists(artists)) + fun onTogglePlayback() = togglePlayback() /** Opening the changelog or dismissing the card marks this version's notes as seen. */ diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryDetailComponents.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryDetailComponents.kt index 9271865101..27122f76b2 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryDetailComponents.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryDetailComponents.kt @@ -30,6 +30,7 @@ import com.simplecityapps.shuttle.designsystem.component.LoadingState import com.simplecityapps.shuttle.designsystem.component.S2ButtonGroup import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.S2IconButton +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.ui.common.components.DetailScaffold // The pieces every library detail screen shares, on DetailScaffold (app-shell.md, section 3): a centred hero, @@ -76,8 +77,13 @@ fun LibraryDetailScaffold( modifier = modifier, listState = listState, hero = { - Box(Modifier.fillMaxWidth().padding(top = 8.dp, bottom = 16.dp), contentAlignment = Alignment.Center) { - LibraryArtwork(model = artwork, placeholder = placeholder, size = ArtworkSize.Hero, shape = artworkShape) + val compact = LocalCompactMode.current + Box( + Modifier.fillMaxWidth().padding(top = if (compact) 4.dp else 8.dp, bottom = if (compact) 8.dp else 16.dp), + contentAlignment = Alignment.Center + ) { + // Compact keeps a smaller hero: the detail still leads with art, just less of it. + LibraryArtwork(model = artwork, placeholder = placeholder, size = if (compact) ArtworkSize.Grid else ArtworkSize.Hero, shape = artworkShape) } }, actions = { @@ -107,12 +113,22 @@ private fun DetailHeader( onShuffle: () -> Unit, extra: @Composable () -> Unit, ) { - Column(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text(title, style = MaterialTheme.typography.headlineSmall, color = MaterialTheme.colorScheme.onSurface) + Column( + Modifier.fillMaxWidth().padding( + horizontal = if (LocalCompactMode.current) 12.dp else 16.dp, + vertical = if (LocalCompactMode.current) 4.dp else 8.dp + ), + verticalArrangement = Arrangement.spacedBy(4.dp) + ) { + Text( + title, + style = if (LocalCompactMode.current) MaterialTheme.typography.titleLarge else MaterialTheme.typography.headlineSmall, + color = MaterialTheme.colorScheme.onSurface + ) if (subtitle != null) { Text(subtitle, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) } - Box(Modifier.padding(top = 12.dp)) { + Box(Modifier.padding(top = if (LocalCompactMode.current) 8.dp else 12.dp)) { S2ButtonGroup( primary = S2GroupAction(stringResource(R.string.menu_title_play), onPlay, Icons.Rounded.PlayArrow), secondary = listOf(S2GroupAction(stringResource(R.string.menu_title_shuffle), onShuffle, Icons.Rounded.Shuffle)), diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryEmptyScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryEmptyScreen.kt index d07373b810..172405c0ef 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryEmptyScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryEmptyScreen.kt @@ -16,8 +16,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.LibraryMusic import androidx.compose.material.icons.rounded.Lock import androidx.compose.material.icons.rounded.Search -import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.LinearWavyProgressIndicator +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -39,7 +38,6 @@ import com.simplecityapps.shuttle.ui.screens.sources.MusicPermission * What the Library shows while it has no songs (#379): the way to let S2 read this device's music, the scan's * progress once it can, or "No music found" when the scan came back empty. "Connect a server" is on offer throughout. */ -@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun LibraryEmptyScreen( state: LibraryAvailability.Empty, @@ -61,9 +59,9 @@ fun LibraryEmptyScreen( val progressModifier = Modifier.widthIn(max = 320.dp).fillMaxWidth().padding(horizontal = 24.dp) val fraction = scan.fraction if (fraction != null) { - LinearWavyProgressIndicator(progress = { fraction }, modifier = progressModifier) + LinearProgressIndicator(progress = { fraction }, modifier = progressModifier) } else { - LinearWavyProgressIndicator(modifier = progressModifier) + LinearProgressIndicator(modifier = progressModifier) } scan.message?.let { message -> Text( diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt index fc18df94b1..e5bf84a366 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.R import com.simplecityapps.shuttle.designsystem.component.AlbumRow @@ -41,10 +42,12 @@ import com.simplecityapps.shuttle.designsystem.component.FolderRow import com.simplecityapps.shuttle.designsystem.component.GenreRow import com.simplecityapps.shuttle.designsystem.component.GridTile import com.simplecityapps.shuttle.designsystem.component.PlaylistRow +import com.simplecityapps.shuttle.designsystem.component.resolvedDp import com.simplecityapps.shuttle.designsystem.component.S2ButtonGroup import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.SectionHeader import com.simplecityapps.shuttle.designsystem.component.SongRow +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.format.formatDuration import com.simplecityapps.shuttle.model.Album import com.simplecityapps.shuttle.model.AlbumArtist @@ -79,13 +82,15 @@ import com.simplecityapps.shuttle.ui.text.stringResource as stringResourceKey // tab ViewModels; LibraryScreen wires them. /** The Play / Shuffle row leading the Songs and Albums pages: the button group's 40dp and its padding. */ -private val PlayShuffleHeaderHeight = 40.dp + 16.dp +private val PlayShuffleHeaderHeight: Dp + @Composable get() = 40.dp + if (LocalCompactMode.current) 8.dp else 16.dp /** * Fills the page so the scroller's track sits at its end edge, as the legacy lists have it. The track starts below the * pages' leading header, so the thumb never covers the header's action, such as Shuffle (#396). */ -private val FastScrollerModifier = Modifier.fillMaxSize().padding(top = PlayShuffleHeaderHeight + 8.dp, bottom = 8.dp).testTag("library-fast-scroller") +private val FastScrollerModifier: Modifier + @Composable get() = Modifier.fillMaxSize().padding(top = PlayShuffleHeaderHeight + 8.dp, bottom = 8.dp).testTag("library-fast-scroller") /** * Play and Shuffle for a whole tab, styled like a detail screen's (#491). The count lives in the top bar's subtitle, so @@ -93,7 +98,10 @@ private val FastScrollerModifier = Modifier.fillMaxSize().padding(top = PlayShuf */ @Composable private fun PlayShuffleHeader(onPlay: () -> Unit, onShuffle: () -> Unit) { - Box(Modifier.fillMaxWidth().height(PlayShuffleHeaderHeight).padding(horizontal = 16.dp, vertical = 8.dp)) { + val compact = LocalCompactMode.current + Box( + Modifier.fillMaxWidth().height(PlayShuffleHeaderHeight).padding(horizontal = if (compact) 12.dp else 16.dp, vertical = if (compact) 4.dp else 8.dp) + ) { S2ButtonGroup( primary = S2GroupAction(stringResource(R.string.menu_title_play), onPlay, Icons.Rounded.PlayArrow), secondary = listOf(S2GroupAction(stringResource(R.string.menu_title_shuffle), onShuffle, Icons.Rounded.Shuffle)), @@ -149,8 +157,9 @@ private fun PlaylistMosaic(covers: List) { LibraryArtwork(covers.firstOrNull(), ArtworkPlaceholder.Playlist) return } - val cell = (ArtworkSize.Medium.dp - MosaicGap) / 2 - Column(Modifier.size(ArtworkSize.Medium.dp), verticalArrangement = Arrangement.spacedBy(MosaicGap)) { + val medium = ArtworkSize.Medium.resolvedDp() + val cell = (medium - MosaicGap) / 2 + Column(Modifier.size(medium), verticalArrangement = Arrangement.spacedBy(MosaicGap)) { covers.take(4).chunked(2).forEach { pair -> Row(horizontalArrangement = Arrangement.spacedBy(MosaicGap)) { pair.forEach { song -> LibraryArtwork(song, ArtworkPlaceholder.Album, Modifier.size(cell), size = ArtworkSize.Small) } @@ -159,8 +168,9 @@ private fun PlaylistMosaic(covers: List) { } } -/** The catalogue's compact grid: two columns of tiles on a phone, more as the width allows. */ -private val LibraryGridColumns = GridCells.Adaptive(minSize = 160.dp) +/** The catalogue's compact grid: two columns of tiles on a phone, more as the width allows (three in classic). */ +private val LibraryGridColumns: GridCells + @Composable get() = GridCells.Adaptive(minSize = if (LocalCompactMode.current) 120.dp else 160.dp) /** Songs: Play / Shuffle, then every song. Tap plays from that row; long-press selects. */ @Composable @@ -246,10 +256,11 @@ private fun songEntries(songs: List, byAlbum: Boolean): List = /** The cover, name and album artist of the album the rows under it belong to. */ @Composable private fun SongAlbumHeader(song: Song) { + val compact = LocalCompactMode.current Row( - modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 4.dp), + modifier = Modifier.fillMaxWidth().padding(start = if (compact) 12.dp else 16.dp, end = if (compact) 12.dp else 16.dp, top = if (compact) 8.dp else 16.dp, bottom = 4.dp), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(16.dp), + horizontalArrangement = Arrangement.spacedBy(if (compact) 12.dp else 16.dp), ) { LibraryArtwork(song, ArtworkPlaceholder.Album, size = ArtworkSize.Medium) Column(Modifier.weight(1f)) { @@ -319,9 +330,9 @@ fun AlbumsPage( LazyVerticalGrid( columns = LibraryGridColumns, state = gridState, - contentPadding = PaddingValues(start = 16.dp, end = 16.dp, bottom = 16.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalArrangement = Arrangement.spacedBy(8.dp), + contentPadding = if (LocalCompactMode.current) PaddingValues(start = 12.dp, end = 12.dp, bottom = 12.dp) else PaddingValues(start = 16.dp, end = 16.dp, bottom = 16.dp), + horizontalArrangement = Arrangement.spacedBy(if (LocalCompactMode.current) 6.dp else 8.dp), + verticalArrangement = Arrangement.spacedBy(if (LocalCompactMode.current) 6.dp else 8.dp), modifier = Modifier.fillMaxSize().testTag("library-albums"), ) { item(key = "header", span = { androidx.compose.foundation.lazy.grid.GridItemSpan(maxLineSpan) }) { header() } @@ -385,9 +396,9 @@ fun ArtistsPage( LazyVerticalGrid( columns = LibraryGridColumns, state = gridState, - contentPadding = PaddingValues(16.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalArrangement = Arrangement.spacedBy(8.dp), + contentPadding = PaddingValues(if (LocalCompactMode.current) 12.dp else 16.dp), + horizontalArrangement = Arrangement.spacedBy(if (LocalCompactMode.current) 6.dp else 8.dp), + verticalArrangement = Arrangement.spacedBy(if (LocalCompactMode.current) 6.dp else 8.dp), modifier = Modifier.fillMaxSize().testTag("library-artists"), ) { items(artists, key = { it.groupKey.toString() }) { artist -> diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt index df928fd867..7da122c6fb 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt @@ -4,7 +4,6 @@ import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -15,25 +14,21 @@ import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.rounded.PlaylistAdd import androidx.compose.material.icons.automirrored.rounded.QueueMusic -import androidx.compose.material.icons.rounded.ArrowDownward -import androidx.compose.material.icons.rounded.ArrowUpward import androidx.compose.material.icons.rounded.Block import androidx.compose.material.icons.rounded.Edit import androidx.compose.material.icons.rounded.MoreVert import androidx.compose.material.icons.rounded.PlayArrow -import androidx.compose.material.icons.rounded.Settings import androidx.compose.material.icons.rounded.Shuffle import androidx.compose.material.icons.rounded.SkipNext import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.LargeFlexibleTopAppBar -import androidx.compose.material3.ListItem -import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.ListItemShapes import androidx.compose.material3.PrimaryScrollableTabRow import androidx.compose.material3.Scaffold -import androidx.compose.material3.Switch import androidx.compose.material3.Tab import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -57,11 +52,15 @@ import com.simplecityapps.mediaprovider.repository.playlists.PlaylistSortOrder import com.simplecityapps.shuttle.R import com.simplecityapps.shuttle.designsystem.component.ArtworkPlaceholder import com.simplecityapps.shuttle.designsystem.component.EmptyState +import com.simplecityapps.shuttle.designsystem.component.ReorderSwitchSetting import com.simplecityapps.shuttle.designsystem.component.S2Action import com.simplecityapps.shuttle.designsystem.component.S2IconButton import com.simplecityapps.shuttle.designsystem.component.S2Menu import com.simplecityapps.shuttle.designsystem.component.S2SelectionToolbar +import com.simplecityapps.shuttle.designsystem.component.S2Sheet +import com.simplecityapps.shuttle.designsystem.component.SettingsGroup import com.simplecityapps.shuttle.designsystem.component.StateAction +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.persistence.LibraryTab import com.simplecityapps.shuttle.sorting.AlbumSortOrder import com.simplecityapps.shuttle.sorting.GenreSortOrder @@ -85,7 +84,6 @@ import com.simplecityapps.shuttle.ui.screens.library.playlists.PlaylistListViewM import com.simplecityapps.shuttle.ui.screens.library.songs.SongListViewModel import com.simplecityapps.shuttle.ui.screens.sources.ServerTypePickerRoute import com.simplecityapps.shuttle.ui.shell.LocalShellSnackbarHostState -import com.simplecityapps.shuttle.ui.shell.SettingsRoute import dev.zacsweers.metrox.viewmodel.metroViewModel import kotlinx.coroutines.launch @@ -111,7 +109,6 @@ fun LibraryScreen( onTabSelected: (LibraryTab) -> Unit, onTabsChanged: (order: List, enabled: Set) -> Unit, onSelectionAction: (MediaActionType) -> Unit, - onOpenSettings: () -> Unit, modifier: Modifier = Modifier, /** Shown in place of the tabs while the library has no songs (#379). */ emptyLibrary: (@Composable (Modifier) -> Unit)? = null, @@ -119,7 +116,10 @@ fun LibraryScreen( ) { val tabs = uiState.tabs var editingTabs by rememberSaveable { mutableStateOf(false) } - val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + // Compact skips the large collapsing bar for a pinned one-row bar; the tab count subtitle + // goes with it, staying visible in the default bar. + val compact = LocalCompactMode.current + val scrollBehavior = if (compact) TopAppBarDefaults.pinnedScrollBehavior() else TopAppBarDefaults.exitUntilCollapsedScrollBehavior() BackHandler(enabled = chrome.selectedCount > 0, onBack = chrome.onClearSelection) Scaffold( @@ -152,13 +152,31 @@ fun LibraryScreen( ), ) } + } else if (compact) { + TopAppBar( + title = { Text(stringResource(R.string.title_library)) }, + actions = { + var menuOpen by remember { mutableStateOf(false) } + S2IconButton( + icon = Icons.Rounded.MoreVert, + contentDescription = stringResource(R.string.library_more_options), + onClick = { menuOpen = true }, + modifier = Modifier.testTag("library-more"), + ) + S2Menu( + expanded = menuOpen, + onDismissRequest = { menuOpen = false }, + groups = chrome.menu + listOf(listOf(S2Action(stringResource(R.string.library_edit_tabs), { editingTabs = true }))), + ) + }, + scrollBehavior = scrollBehavior, + ) } else { LargeFlexibleTopAppBar( title = { Text(stringResource(R.string.title_library)) }, subtitle = chrome.subtitle?.let { { Text(it) } }, actions = { var menuOpen by remember { mutableStateOf(false) } - S2IconButton(icon = Icons.Rounded.Settings, contentDescription = stringResource(R.string.settings_menu_settings), onClick = onOpenSettings) S2IconButton( icon = Icons.Rounded.MoreVert, contentDescription = stringResource(R.string.library_more_options), @@ -214,7 +232,11 @@ private fun LibraryPager( snapshotFlow { pagerState.settledPage }.collect { index -> tabs.getOrNull(index)?.let(onTabSelected) } } Column(modifier.fillMaxSize()) { - PrimaryScrollableTabRow(selectedTabIndex = pagerState.currentPage.coerceIn(0, tabs.lastIndex), modifier = Modifier.testTag("library-tabs")) { + PrimaryScrollableTabRow( + selectedTabIndex = pagerState.currentPage.coerceIn(0, tabs.lastIndex), + modifier = Modifier.testTag("library-tabs"), + edgePadding = if (LocalCompactMode.current) 8.dp else 16.dp, + ) { tabs.forEachIndexed { index, tab -> Tab( selected = pagerState.currentPage == index, @@ -240,48 +262,35 @@ fun LibraryTab.label(): String = stringResource( ) /** Shows, hides and reorders the tabs; every change saves straight away. */ -@OptIn(ExperimentalMaterial3Api::class) +@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable private fun EditTabsSheet( uiState: LibraryUiState, onTabsChanged: (order: List, enabled: Set) -> Unit, onDismissRequest: () -> Unit, ) { - ModalBottomSheet(onDismissRequest = onDismissRequest) { - Text(stringResource(R.string.library_edit_tabs), modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)) - val order = uiState.allTabs - order.forEachIndexed { index, tab -> - val enabled = tab in uiState.enabledTabs - val setEnabled = { checked: Boolean -> onTabsChanged(order, if (checked) uiState.enabledTabs + tab else uiState.enabledTabs - tab) } - ListItem( - onClick = { setEnabled(!enabled) }, - leadingContent = { - Switch( + val order = uiState.allTabs + S2Sheet(title = stringResource(R.string.library_edit_tabs), onDismissRequest = onDismissRequest) { + SettingsGroup( + rows = order.mapIndexed { index, tab -> + @Composable { shapes: ListItemShapes -> + val enabled = tab in uiState.enabledTabs + ReorderSwitchSetting( + title = tab.label(), checked = enabled, - onCheckedChange = setEnabled, - modifier = Modifier.testTag("library-tab-switch-${tab.name}"), + onCheckedChange = { checked -> onTabsChanged(order, if (checked) uiState.enabledTabs + tab else uiState.enabledTabs - tab) }, + onMoveUp = { onTabsChanged(order.move(index, index - 1), uiState.enabledTabs) }, + onMoveDown = { onTabsChanged(order.move(index, index + 1), uiState.enabledTabs) }, + moveUpEnabled = index > 0, + moveDownEnabled = index < order.lastIndex, + moveUpContentDescription = stringResource(R.string.library_tab_move_up), + moveDownContentDescription = stringResource(R.string.library_tab_move_down), + switchModifier = Modifier.testTag("library-tab-switch-${tab.name}"), + shapes = shapes, ) - }, - trailingContent = { - Row { - S2IconButton( - icon = Icons.Rounded.ArrowUpward, - contentDescription = stringResource(R.string.library_tab_move_up), - enabled = index > 0, - onClick = { onTabsChanged(order.move(index, index - 1), uiState.enabledTabs) }, - ) - S2IconButton( - icon = Icons.Rounded.ArrowDownward, - contentDescription = stringResource(R.string.library_tab_move_down), - enabled = index < order.lastIndex, - onClick = { onTabsChanged(order.move(index, index + 1), uiState.enabledTabs) }, - ) - } - }, - ) { - Text(tab.label()) - } - } + } + }, + ) } } @@ -333,7 +342,6 @@ fun LibraryDestination( chrome.selection?.let { actions.perform(type, it) } chrome.onClearSelection() }, - onOpenSettings = { onOpen(SettingsRoute) }, emptyLibrary = (content as? LibraryAvailability.Empty)?.let { empty -> @Composable { modifier: Modifier -> LibraryEmptyScreen( diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchEntries.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchEntries.kt index 2f0184868e..63c0438353 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchEntries.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchEntries.kt @@ -1,9 +1,12 @@ package com.simplecityapps.shuttle.ui.screens.search import androidx.compose.foundation.text.input.rememberTextFieldState +import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi +import androidx.compose.material3.adaptive.currentWindowAdaptiveInfoV2 import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.runtime.snapshotFlow import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation3.runtime.EntryProviderScope @@ -16,12 +19,15 @@ import com.simplecityapps.shuttle.ui.screens.library.openTarget import com.simplecityapps.shuttle.ui.screens.library.route import com.simplecityapps.shuttle.ui.shell.AppNavigator import com.simplecityapps.shuttle.ui.shell.SearchRoute +import com.simplecityapps.shuttle.ui.shell.adaptive.ShellLayout +import com.simplecityapps.shuttle.ui.shell.adaptive.ShellWidth import dev.zacsweers.metrox.viewmodel.metroViewModel fun EntryProviderScope.searchEntries(navigator: AppNavigator) { entry { SearchDestination(onOpen = navigator::open, onNavigate = navigator::openTarget) } } +@OptIn(ExperimentalMaterial3AdaptiveApi::class) @Composable private fun SearchDestination( onOpen: (NavKey) -> Unit, @@ -31,6 +37,9 @@ private fun SearchDestination( val uiState by viewModel.uiState.collectAsStateWithLifecycle() val queryState = rememberTextFieldState() LaunchedEffect(queryState, viewModel) { snapshotFlow { queryState.text.toString() }.collect(viewModel::onQueryChange) } + // The search view is full screen below Expanded, docked under the bar from Expanded. + val windowAdaptiveInfo = currentWindowAdaptiveInfoV2() + val docked = remember(windowAdaptiveInfo) { ShellLayout.from(windowAdaptiveInfo).width >= ShellWidth.Expanded } MediaActionsHost(onNavigate = onNavigate) { actions -> val open = { route: NavKey -> @@ -40,6 +49,7 @@ private fun SearchDestination( SearchScreen( uiState = uiState, queryState = queryState, + docked = docked, callbacks = SearchCallbacks( onSearch = viewModel::onSearch, onSelectAll = viewModel::onSelectAll, diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchScreen.kt index 3a17e2383c..a8c4ca9de2 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchScreen.kt @@ -14,27 +14,17 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.input.TextFieldState -import androidx.compose.foundation.text.input.clearText import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.Close import androidx.compose.material.icons.rounded.Search -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.SearchBarDefaults -import androidx.compose.material3.Surface -import androidx.compose.material3.Text +import androidx.compose.material3.SearchBarState +import androidx.compose.material3.rememberSearchBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.simplecityapps.mediaprovider.search.SearchHit @@ -43,7 +33,7 @@ import com.simplecityapps.shuttle.designsystem.component.ArtworkPlaceholder import com.simplecityapps.shuttle.designsystem.component.EmptyState import com.simplecityapps.shuttle.designsystem.component.LoadingState import com.simplecityapps.shuttle.designsystem.component.S2FilterChip -import com.simplecityapps.shuttle.designsystem.component.S2IconButton +import com.simplecityapps.shuttle.designsystem.component.S2SearchBar import com.simplecityapps.shuttle.designsystem.component.SearchNoResults import com.simplecityapps.shuttle.designsystem.component.SearchRecentRow import com.simplecityapps.shuttle.designsystem.component.SectionHeader @@ -68,75 +58,66 @@ class SearchCallbacks( ) /** - * The Search destination (redesign inventory, section 2): a search field over filter chips, then the recent searches - * while the field is empty, or the results grouped by type. [queryState] holds the field's text; the destination - * feeds it to the ViewModel. + * The Search destination (redesign inventory, section 2): the M3 search bar over filter chips, + * then the recent searches while the field is empty, or the results grouped by type. [queryState] + * holds the field's text; the destination feeds it to the ViewModel. The bar opens expanded, ready + * to type; from the Expanded width class the search view docks under it ([docked]). */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SearchScreen( uiState: SearchUiState, queryState: TextFieldState, callbacks: SearchCallbacks, modifier: Modifier = Modifier, + searchBarState: SearchBarState = rememberSearchBarState(), + docked: Boolean = false, ) { - val focusRequester = remember { FocusRequester() } - val focusManager = LocalFocusManager.current - // Arriving with nothing typed means the user wants to type. - LaunchedEffect(Unit) { if (queryState.text.isEmpty()) focusRequester.requestFocus() } + // A search destination opens ready to type. + LaunchedEffect(Unit) { searchBarState.animateToExpanded() } Column(modifier.fillMaxSize()) { - Surface( - shape = SearchBarDefaults.inputFieldShape, - color = SearchBarDefaults.colors().containerColor, - modifier = Modifier - .statusBarsPadding() - .padding(horizontal = 16.dp, vertical = 8.dp) - .fillMaxWidth(), + S2SearchBar( + state = searchBarState, + textFieldState = queryState, + onSearch = { callbacks.onSearch() }, + placeholder = stringResource(R.string.search_placeholder), + docked = docked, + modifier = Modifier.statusBarsPadding(), ) { - SearchBarDefaults.InputField( - state = queryState, - onSearch = { - callbacks.onSearch() - focusManager.clearFocus() - }, - expanded = false, - onExpandedChange = {}, - modifier = Modifier.fillMaxWidth().focusRequester(focusRequester), - placeholder = { Text(stringResource(R.string.search_placeholder)) }, - leadingIcon = { Icon(Icons.Rounded.Search, contentDescription = null) }, - trailingIcon = if (queryState.text.isNotEmpty()) { - { S2IconButton(Icons.Rounded.Close, stringResource(com.simplecityapps.shuttle.designsystem.R.string.ds_clear_search), { queryState.clearText() }) } - } else { - null - }, - ) + FilterChips(uiState, callbacks) + when (val content = uiState.content) { + is SearchContent.Recent -> RecentSearches(content.searches, onSelect = { queryState.edit { replace(0, length, it) } }, onRemove = callbacks.onRemoveRecentSearch) + SearchContent.Searching -> LoadingState(Modifier.fillMaxSize()) + is SearchContent.NoResults -> SearchNoResults(content.query, Modifier.fillMaxSize()) + is SearchContent.Results -> SearchResultList(content.query, content.results, callbacks) + } } - Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier - .fillMaxWidth() - .horizontalScroll(rememberScrollState()) - .padding(horizontal = 16.dp), - ) { + } +} + +@Composable +private fun FilterChips( + uiState: SearchUiState, + callbacks: SearchCallbacks, +) { + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()) + .padding(horizontal = 16.dp), + ) { + S2FilterChip( + label = stringResource(R.string.search_category_all), + selected = uiState.categories.isEmpty(), + onClick = callbacks.onSelectAll, + ) + SearchCategory.entries.forEach { category -> S2FilterChip( - label = stringResource(R.string.search_category_all), - selected = uiState.categories.isEmpty(), - onClick = callbacks.onSelectAll, + label = category.label(), + selected = category in uiState.categories, + onClick = { callbacks.onToggleCategory(category) }, ) - SearchCategory.entries.forEach { category -> - S2FilterChip( - label = category.label(), - selected = category in uiState.categories, - onClick = { callbacks.onToggleCategory(category) }, - ) - } - } - when (val content = uiState.content) { - is SearchContent.Recent -> RecentSearches(content.searches, onSelect = { queryState.edit { replace(0, length, it) } }, onRemove = callbacks.onRemoveRecentSearch) - SearchContent.Searching -> LoadingState(Modifier.fillMaxSize()) - is SearchContent.NoResults -> SearchNoResults(content.query, Modifier.fillMaxSize()) - is SearchContent.Results -> SearchResultList(content.query, content.results, callbacks) } } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt index 9f8f55060d..9cd6d88add 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt @@ -1,5 +1,7 @@ package com.simplecityapps.shuttle.ui.screens.settings +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.StringRes import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable @@ -115,8 +117,26 @@ private fun SettingsDestinationEntry( val uiState by viewModel.uiState.collectAsStateWithLifecycle() val snackbarHostState = remember { SnackbarHostState() } val context = LocalContext.current + val exportLauncher = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/json")) { uri -> + uri?.let { viewModel.exportBackupTo(it.toString()) } + } + val importLauncher = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> + uri?.let { viewModel.importBackupFrom(it.toString()) } + } ConsumeEvents(uiState.events, viewModel::onEventHandled) { event -> - snackbarHostState.showSnackbar(context.getString(event.message)) + when (event) { + is SettingsUiEvent.BackupExportReady -> exportLauncher.launch(event.suggestedName) + is SettingsUiEvent.BackupImportPickerRequested -> importLauncher.launch(arrayOf("application/json")) + is SettingsUiEvent.BackupImported -> snackbarHostState.showSnackbar( + context.getString( + R.string.settings_backup_import_done, + event.songsMatched, + event.playlistsRestored, + event.songsUnmatched + ) + ) + else -> snackbarHostState.showSnackbar(context.getString(event.message)) + } } LifecycleResumeEffect(viewModel) { viewModel.onResume() @@ -131,7 +151,8 @@ private fun SettingsDestinationEntry( onSliderChange = viewModel::onSliderChange, onAction = viewModel::onAction, onOpenLink = onOpenLink, - versionName = BuildConfig.VERSION_NAME, + // The code and sha disambiguate dev builds, which otherwise share one version name. + versionName = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE}/${BuildConfig.GIT_SHA})", snackbarHostState = snackbarHostState, leadingContent = if (destination == SettingsDestination.Sources) sourcesRows(snackbarHostState) else ({}) ) @@ -142,6 +163,19 @@ private val SettingsUiEvent.message: Int get() = when (this) { SettingsUiEvent.RescanStarted -> R.string.settings_rescan_started + SettingsUiEvent.BackupExportSaved -> R.string.settings_backup_export_saved + + SettingsUiEvent.BackupExportFailed -> R.string.settings_backup_export_failed + + SettingsUiEvent.BackupImportFailed -> R.string.settings_backup_import_failed + + // Handled with launchers/report formatting above, never as plain snackbars. + is SettingsUiEvent.BackupExportReady -> R.string.settings_backup_export_saved + + is SettingsUiEvent.BackupImportPickerRequested -> R.string.settings_backup_import_failed + + is SettingsUiEvent.BackupImported -> R.string.settings_backup_import_done + SettingsUiEvent.ArtworkCacheCleared -> R.string.settings_artwork_cache_cleared SettingsUiEvent.ArtworkDownloadStarted -> R.string.settings_artwork_download_started diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreens.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreens.kt index 7ba06850df..09aaebd864 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreens.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreens.kt @@ -48,6 +48,7 @@ import com.simplecityapps.shuttle.designsystem.component.S2SnackbarHost import com.simplecityapps.shuttle.designsystem.component.S2TopBar import com.simplecityapps.shuttle.designsystem.component.SettingsGroup import com.simplecityapps.shuttle.designsystem.component.SliderSetting +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.designsystem.component.SwitchSetting import com.simplecityapps.shuttle.settings.AppearanceSettings import com.simplecityapps.shuttle.ui.screens.settings.model.SettingItem @@ -74,16 +75,19 @@ internal fun SettingsScaffold( snackbarHostState: SnackbarHostState? = null, actions: @Composable RowScope.() -> Unit = {}, contentPadding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 8.dp), - verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(16.dp), + verticalArrangement: Arrangement.Vertical? = null, content: LazyListScope.() -> Unit ) { - val scrollBehavior = if (root) TopAppBarDefaults.exitUntilCollapsedScrollBehavior() else TopAppBarDefaults.pinnedScrollBehavior() + val compact = LocalCompactMode.current + val gaps = verticalArrangement ?: Arrangement.spacedBy(if (compact) 4.dp else 16.dp) + val scrollBehavior = if (compact || !root) TopAppBarDefaults.pinnedScrollBehavior() else TopAppBarDefaults.exitUntilCollapsedScrollBehavior() Scaffold( modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), // The shell pads destinations clear of the nav bar and player; the bar takes the status bar. contentWindowInsets = WindowInsets(0), topBar = { - if (root) { + // Compact skips the large collapsing bar: one pinned row, like every sub-page. + if (root && !compact) { S2LargeTopBar(title = title, onBack = onNavigateUp, actions = actions, scrollBehavior = scrollBehavior) } else { S2TopBar(title = title, onBack = onNavigateUp, actions = actions, scrollBehavior = scrollBehavior) @@ -93,8 +97,8 @@ internal fun SettingsScaffold( ) { padding -> LazyColumn( modifier = Modifier.fillMaxSize().padding(padding), - contentPadding = contentPadding, - verticalArrangement = verticalArrangement, + contentPadding = if (compact) PaddingValues(horizontal = 12.dp, vertical = 4.dp) else contentPadding, + verticalArrangement = gaps, content = content ) } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt index 86d0e64942..3f8463843e 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt @@ -11,6 +11,7 @@ import com.simplecityapps.shuttle.ui.common.PendingEvents import com.simplecityapps.shuttle.ui.screens.settings.model.SettingItem import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsAction import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsCatalog +import com.simplecityapps.shuttle.ui.screens.settings.backup.LibraryBackupManager import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesIntoMap import dev.zacsweers.metro.Inject @@ -39,6 +40,20 @@ data class SettingsUiState( sealed interface SettingsUiEvent { data object RescanStarted : SettingsUiEvent + /** A freshly built backup is staged in the ViewModel; the UI should open a save picker. */ + data class BackupExportReady(val suggestedName: String) : SettingsUiEvent + + data object BackupExportSaved : SettingsUiEvent + + data object BackupExportFailed : SettingsUiEvent + + /** The UI should open a file picker for a backup to restore. */ + data object BackupImportPickerRequested : SettingsUiEvent + + data class BackupImported(val songsMatched: Int, val playlistsRestored: Int, val songsUnmatched: Int) : SettingsUiEvent + + data object BackupImportFailed : SettingsUiEvent + data object ArtworkCacheCleared : SettingsUiEvent data object ArtworkDownloadStarted : SettingsUiEvent @@ -53,12 +68,16 @@ class SettingsViewModel @Inject constructor( observeSetting: ObserveSetting, private val readSetting: ReadSetting, private val saveSetting: SaveSetting, - private val effects: SettingsEffects + private val effects: SettingsEffects, + private val backupManager: LibraryBackupManager ) : ViewModel() { private val lastScanDate = MutableStateFlow(effects.lastScanDate()) private val events = PendingEvents() + /** The staged backup JSON between ExportBackup and the save-picker result. */ + private var pendingBackupJson: String? = null + val uiState: StateFlow = combine( combine(catalogSettings.map { setting -> observeSetting(setting).map { setting.key to it } }) { it.toMap() }, lastScanDate, @@ -114,6 +133,20 @@ class SettingsViewModel @Inject constructor( events.post(SettingsUiEvent.RescanStarted) } + SettingsAction.ExportBackup -> viewModelScope.launch { + val json = runCatching { backupManager.buildBackupJson() }.getOrNull() + if (json == null) { + events.post(SettingsUiEvent.BackupExportFailed) + } else { + pendingBackupJson = json + events.post(SettingsUiEvent.BackupExportReady(BACKUP_FILE_NAME)) + } + } + + SettingsAction.ImportBackup -> { + events.post(SettingsUiEvent.BackupImportPickerRequested) + } + SettingsAction.ClearArtworkCache -> viewModelScope.launch { effects.clearArtworkCache() events.post(SettingsUiEvent.ArtworkCacheCleared) @@ -132,6 +165,33 @@ class SettingsViewModel @Inject constructor( fun onEventHandled(id: Long) = events.consume(id) + /** Writes the staged backup to the save-picker [destination]; call once per pick. */ + fun exportBackupTo(destination: String) { + val json = pendingBackupJson + pendingBackupJson = null + if (json == null) { + events.post(SettingsUiEvent.BackupExportFailed) + return + } + viewModelScope.launch { + events.post( + if (backupManager.writeBackup(destination, json)) SettingsUiEvent.BackupExportSaved + else SettingsUiEvent.BackupExportFailed + ) + } + } + + /** Reads and restores the backup at the picker [source]. */ + fun importBackupFrom(source: String) { + viewModelScope.launch { + val report = runCatching { backupManager.readAndRestore(source) }.getOrNull() + events.post( + if (report == null) SettingsUiEvent.BackupImportFailed + else SettingsUiEvent.BackupImported(report.songsMatched, report.playlistsRestored, report.songsUnmatched) + ) + } + } + /** Re-reads what isn't observable, such as the last scan date, when the screen comes back into view. */ fun onResume() { lastScanDate.value = effects.lastScanDate() @@ -170,3 +230,5 @@ class SettingsViewModel @Inject constructor( .distinctBy { it.key } } } + +private const val BACKUP_FILE_NAME = "shuttle-library-backup.json" diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackup.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackup.kt new file mode 100644 index 0000000000..34285a70d6 --- /dev/null +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackup.kt @@ -0,0 +1,66 @@ +package com.simplecityapps.shuttle.ui.screens.settings.backup + +import kotlinx.serialization.Serializable + +/** + * Versioned library backup: per-song stats plus playlists, nothing else. + * + * Identity is (provider, path) first, (provider, externalId) for remote items, and a tag + * fingerprint as fallback. Room ids, MediaStore ids-as-primary, credentials, SAF grant URIs and + * absolute volume paths are deliberately NOT part of the format: none of them survive a reinstall. + * Times are epoch millis (stable across kotlinx-datetime/-time versions). + */ +@Serializable +data class LibraryBackup( + val schemaVersion: Int = CURRENT_SCHEMA_VERSION, + val appVersion: String? = null, + /** Epoch millis the backup was written. */ + val exportedAt: Long, + val songs: List, + val playlists: List +) { + companion object { + const val CURRENT_SCHEMA_VERSION = 1 + } +} + +@Serializable +data class SongIdentity( + /** [com.simplecityapps.shuttle.model.MediaProviderType.name]. */ + val provider: String, + val path: String, + val externalId: String? = null, + val title: String? = null, + val album: String? = null, + /** albumArtist ?: artists.joinToString, as displayed. */ + val artist: String? = null, + val duration: Int = 0, + val size: Long = 0 +) + +@Serializable +data class BackedUpSong( + val identity: SongIdentity, + val playCount: Int = 0, + /** Epoch millis, null when never played. */ + val lastPlayed: Long? = null, + val lastCompleted: Long? = null, + val playbackPosition: Int = 0, + val excluded: Boolean = false, + /** Epoch millis, null when not a favourite. */ + val favouritedAt: Long? = null, + /** Epoch millis, null when unknown. */ + val dateAdded: Long? = null +) + +@Serializable +data class BackedUpPlaylist( + val name: String, + /** [com.simplecityapps.shuttle.model.MediaProviderType.name]. */ + val provider: String, + val externalId: String? = null, + /** [com.simplecityapps.shuttle.sorting.PlaylistSongSortOrder.name]. */ + val sortOrder: String = "Position", + val sortDescending: Boolean = false, + val members: List +) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt new file mode 100644 index 0000000000..3d4d45d966 --- /dev/null +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt @@ -0,0 +1,204 @@ +package com.simplecityapps.shuttle.ui.screens.settings.backup + +import android.content.Context +import android.net.Uri +import com.simplecityapps.localmediaprovider.local.data.room.database.MediaDatabase +import com.simplecityapps.mediaprovider.repository.playlists.PlaylistQuery +import com.simplecityapps.mediaprovider.repository.playlists.PlaylistRepository +import com.simplecityapps.mediaprovider.repository.songs.SongRepository +import com.simplecityapps.shuttle.di.ApplicationContext +import com.simplecityapps.shuttle.di.IoDispatcher +import com.simplecityapps.shuttle.model.MediaProviderType +import com.simplecityapps.shuttle.model.Song +import com.simplecityapps.shuttle.query.SongQuery +import com.simplecityapps.shuttle.sorting.PlaylistSongSortOrder +import dev.zacsweers.metro.Inject +import java.io.IOException +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.withContext +import kotlinx.serialization.json.Json +import timber.log.Timber +import kotlin.time.Clock + +data class RestoreReport( + val songsMatched: Int, + val songsUnmatched: Int, + val statsWritten: Int, + val playlistsRestored: Int, + val playlistsUnresolved: List, + val membersSkipped: Int +) + +/** + * Library backup export/import (Settings -> Library). Backs up per-song stats (play counts, + * positions, favourites, exclusions, dates) plus playlists; restore overwrites each matched song + * with the backup's snapshot. + * + * Never backed up: Room ids, credentials/tokens, SAF grant URIs, transient queue/session state, + * artwork caches and aggregates. Restoring favourites writes the DAO directly (no + * `pending_favourites` rows), so a restore never pushes stale states to remote servers. + */ +class LibraryBackupManager @Inject constructor( + @ApplicationContext private val context: Context, + private val database: MediaDatabase, + private val songRepository: SongRepository, + private val playlistRepository: PlaylistRepository, + @IoDispatcher private val ioDispatcher: CoroutineDispatcher +) { + private val json = Json { ignoreUnknownKeys = true; prettyPrint = true } + + suspend fun buildBackupJson(): String = withContext(ioDispatcher) { + val songs = songRepository.loadSongs(SongQuery.All(includeExcluded = true)) + val playlists = playlistRepository.getPlaylists(PlaylistQuery.All(null)).first() + val backedPlaylists = playlists.map { playlist -> + val members = playlistRepository.getSongsForPlaylist(playlist).first() + BackedUpPlaylist( + name = playlist.name, + provider = playlist.mediaProvider.name, + externalId = playlist.externalId, + sortOrder = playlist.sortOrder.name, + sortDescending = playlist.sortDescending, + members = members.map { it.song.toIdentity() } + ) + } + json.encodeToString( + LibraryBackup.serializer(), + LibraryBackup( + exportedAt = Clock.System.now().toEpochMilliseconds(), + songs = songs.map { it.toBackedUp() }, + playlists = backedPlaylists + ) + ) + } + + suspend fun writeBackup(destination: String, backupJson: String): Boolean = withContext(ioDispatcher) { + try { + context.contentResolver.openOutputStream(Uri.parse(destination))?.use { out -> + out.write(backupJson.toByteArray(Charsets.UTF_8)) + true + } ?: run { + Timber.w("Could not open output stream for library backup: $destination") + false + } + } catch (e: IOException) { + Timber.e(e, "Failed to write library backup to $destination") + false + } catch (e: SecurityException) { + Timber.e(e, "Permission denied writing library backup to $destination") + false + } + } + + suspend fun readAndRestore(source: String): RestoreReport? = withContext(ioDispatcher) { + val backup = try { + context.contentResolver.openInputStream(Uri.parse(source))?.use { input -> + json.decodeFromString(input.readBytes().toString(Charsets.UTF_8)) + } + } catch (e: Exception) { + Timber.e(e, "Failed to read library backup from $source") + null + } ?: return@withContext null + if (backup.schemaVersion > LibraryBackup.CURRENT_SCHEMA_VERSION) { + Timber.w("Backup schema ${backup.schemaVersion} newer than supported ${LibraryBackup.CURRENT_SCHEMA_VERSION}") + return@withContext null + } + restore(backup) + } + + private suspend fun restore(backup: LibraryBackup): RestoreReport { + val songDataDao = database.songDataDao() + val library = songRepository.loadSongs(SongQuery.All(includeExcluded = true)) + val matches = LibraryBackupMatcher.matchAll(backup.songs.map { it.identity }, library) + + var statsWritten = 0 + var unmatched = 0 + backup.songs.forEach { backedUp -> + val match = matches[backedUp.identity] + if (match == null) { + unmatched++ + return@forEach + } + val current = match.song + val merged = LibraryBackupMatcher.mergeStats(current, backedUp) + if (!LibraryBackupMatcher.statsEqual(current, merged)) { + songDataDao.restoreStats( + id = current.id, + playCount = merged.playCount, + lastPlayed = merged.lastPlayed, + lastCompleted = merged.lastCompleted, + playbackPosition = merged.playbackPosition, + dateAdded = merged.dateAdded + ) + if (merged.excluded != current.blacklisted) { + songDataDao.setExcluded(listOf(current.id), merged.excluded) + } + if (current.favouritedAt != merged.favouritedAt) { + songDataDao.setFavouritedAt(current.id, merged.favouritedAt) + } + statsWritten++ + } + } + + val existing = playlistRepository.getPlaylists(PlaylistQuery.All(null)).first() + var playlistsRestored = 0 + var membersSkipped = 0 + val unresolved = mutableListOf() + backup.playlists.forEach { backedUp -> + val provider = runCatching { MediaProviderType.valueOf(backedUp.provider) }.getOrNull() + ?: MediaProviderType.Shuttle + val memberSongs = backedUp.members.mapNotNull { ref -> + matches[ref]?.song ?: run { membersSkipped++; null } + } + if (memberSongs.isEmpty()) { + unresolved.add(backedUp.name) + return@forEach + } + val target = if (backedUp.externalId != null) { + existing.firstOrNull { it.mediaProvider == provider && it.externalId == backedUp.externalId } + } else null + ?: existing.firstOrNull { it.mediaProvider == provider && it.name.equals(backedUp.name, ignoreCase = true) } + if (target == null) { + playlistRepository.createPlaylist(backedUp.name, provider, memberSongs, backedUp.externalId) + } else { + playlistRepository.clearPlaylist(target) + playlistRepository.addToPlaylist(target, memberSongs) + runCatching { PlaylistSongSortOrder.valueOf(backedUp.sortOrder) }.getOrNull()?.let { order -> + playlistRepository.updatePlaylistSortOder(target, order, backedUp.sortDescending) + } + } + playlistsRestored++ + } + + return RestoreReport( + songsMatched = backup.songs.size - unmatched, + songsUnmatched = unmatched, + statsWritten = statsWritten, + playlistsRestored = playlistsRestored, + playlistsUnresolved = unresolved, + membersSkipped = membersSkipped + ) + } + + private fun Song.toIdentity(): SongIdentity = SongIdentity( + provider = mediaProvider.name, + path = path, + externalId = externalId, + title = name, + album = album, + artist = albumArtist ?: artists.joinToString(", ").ifEmpty { null }, + duration = duration, + size = size + ) + + private fun Song.toBackedUp(): BackedUpSong = BackedUpSong( + identity = toIdentity(), + playCount = playCount, + lastPlayed = lastPlayed?.toEpochMilliseconds(), + lastCompleted = lastCompleted?.toEpochMilliseconds(), + playbackPosition = playbackPosition, + excluded = blacklisted, + favouritedAt = favouritedAt?.toEpochMilliseconds(), + dateAdded = dateAdded?.toEpochMilliseconds() + ) +} diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt new file mode 100644 index 0000000000..8a510182e5 --- /dev/null +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt @@ -0,0 +1,95 @@ +package com.simplecityapps.shuttle.ui.screens.settings.backup + +import com.simplecityapps.shuttle.model.Song +import kotlin.math.abs +import kotlin.time.Instant + +/** + * Pure library-matching and stats restore for backup restore: no Android, no Room, unit-testable. + * + * Match order per backup identity: exact (provider, path) -> normalized relative path (the SD-card + * volume segment changes across installs) -> (provider, externalId) for remote items -> tag + * fingerprint (normalized title/album/artist + duration within [DURATION_TOLERANCE_S]). + */ +object LibraryBackupMatcher { + + enum class MatchKind { ExactPath, RelativePath, ExternalId, Fuzzy } + + data class SongMatch(val song: Song, val kind: MatchKind) + + fun matchAll( + identities: List, + library: List + ): Map { + val exact = library.associateBy { it.mediaProvider.name to it.path } + val relative = HashMap, Song>() + val byExternalId = HashMap, Song>() + val fuzzy = HashMap>() + for (song in library) { + relative.putIfAbsent(song.mediaProvider.name to relativePath(song.path), song) + song.externalId?.let { byExternalId.putIfAbsent(song.mediaProvider.name to it, song) } + fuzzy.getOrPut(fingerprintKey(song.name, song.album, song.friendlyArtistName)) { mutableListOf() }.add(song) + } + return identities.associateWith { identity -> + exact[identity.provider to identity.path]?.let { return@associateWith SongMatch(it, MatchKind.ExactPath) } + relative[identity.provider to relativePath(identity.path)]?.let { return@associateWith SongMatch(it, MatchKind.RelativePath) } + identity.externalId?.let { byExternalId[identity.provider to it] }?.let { return@associateWith SongMatch(it, MatchKind.ExternalId) } + fuzzy[fingerprintKey(identity.title, identity.album, identity.artist)] + ?.firstOrNull { abs(it.duration - identity.duration) <= DURATION_TOLERANCE_S } + ?.let { SongMatch(it, MatchKind.Fuzzy) } + } + } + + /** + * Snapshot restore: the backup's values overwrite the on-device ones, so restoring a backup + * taken at playCount=1 after playing to 2 sets it back to 1. The only exception is [MergedStats.dateAdded]: + * a null backup (unknown at export) keeps the current value rather than wiping a known date. + */ + data class MergedStats( + val playCount: Int, + val lastPlayed: Instant?, + val lastCompleted: Instant?, + val playbackPosition: Int, + val excluded: Boolean, + val favouritedAt: Instant?, + val dateAdded: Instant? + ) + + fun mergeStats(current: Song, backup: BackedUpSong): MergedStats { + val backupLastPlayed = backup.lastPlayed?.let(Instant::fromEpochMilliseconds) + val backupLastCompleted = backup.lastCompleted?.let(Instant::fromEpochMilliseconds) + val backupFavourite = backup.favouritedAt?.let(Instant::fromEpochMilliseconds) + val backupAdded = backup.dateAdded?.let(Instant::fromEpochMilliseconds) + return MergedStats( + playCount = backup.playCount, + lastPlayed = backupLastPlayed, + lastCompleted = backupLastCompleted, + playbackPosition = backup.playbackPosition, + excluded = backup.excluded, + favouritedAt = backupFavourite, + dateAdded = backupAdded ?: current.dateAdded + ) + } + + fun statsEqual(current: Song, merged: MergedStats): Boolean = + current.playCount == merged.playCount && + current.lastPlayed == merged.lastPlayed && + current.lastCompleted == merged.lastCompleted && + current.playbackPosition == merged.playbackPosition && + current.dateAdded == merged.dateAdded && + current.blacklisted == merged.excluded && + current.favouritedAt == merged.favouritedAt + + /** Strips a `/storage//` prefix so volume id changes don't break matching. Handles both + * physical volumes (`/storage/ABCD-1234/…`) and emulated storage (`/storage/emulated/0/…`). */ + internal fun relativePath(path: String): String { + val lower = path.lowercase() + val storagePrefix = Regex("^/storage/(emulated/\\d+|[^/]+)/") + return storagePrefix.replace(lower, "") + } + + private fun fingerprintKey(title: String?, album: String?, artist: String?): String = + listOf(title, album, artist).joinToString("\u0001") { it?.trim()?.lowercase() ?: "" } + + private const val DURATION_TOLERANCE_S = 2 +} diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingItem.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingItem.kt index e1846a70ed..f0ba9b70c4 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingItem.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingItem.kt @@ -42,6 +42,8 @@ enum class SettingsLink { /** What a [SettingItem.Action] row does. The UI step maps each to a handler. */ enum class SettingsAction { Rescan, + ExportBackup, + ImportBackup, ClearArtworkCache, DownloadAllArtwork, CopyDebugLogs diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt index b2e77e8523..8adbcd99f7 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt @@ -77,6 +77,11 @@ object SettingsCatalog { setting = AppearanceSettings.PureBlack, title = R.string.pref_pure_black_title, summary = R.string.pref_pure_black_summary + ), + SettingItem.Switch( + setting = AppearanceSettings.CompactMode, + title = R.string.pref_compact_mode_title, + summary = R.string.pref_compact_mode_summary ) ) ), @@ -208,6 +213,18 @@ object SettingsCatalog { ChoiceOption(ImportFrequency.Weekly, R.string.pref_rescan_frequency_weekly) ) ), + SettingItem.Action( + action = SettingsAction.ExportBackup, + title = R.string.pref_backup_export_title, + summary = R.string.pref_backup_export_summary, + key = "pref_backup_export" + ), + SettingItem.Action( + action = SettingsAction.ImportBackup, + title = R.string.pref_backup_import_title, + summary = R.string.pref_backup_import_summary, + key = "pref_backup_import" + ), SettingItem.Navigate( target = SettingsLink.ExcludedSongs, title = R.string.pref_exclude_title, diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/SourcesScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/SourcesScreen.kt index dc92b49251..0331ee01fb 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/SourcesScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/SourcesScreen.kt @@ -13,7 +13,7 @@ import androidx.compose.material.icons.rounded.FolderOff import androidx.compose.material.icons.rounded.Refresh import androidx.compose.material.icons.rounded.Smartphone import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.LinearWavyProgressIndicator +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.ListItemShapes import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -101,7 +101,7 @@ fun LazyListScope.sourcesContent(uiState: SourcesUiState, actions: SourcesAction uiState.scan?.let { scan -> val modifier = Modifier.fillMaxWidth().padding(top = 8.dp).testTag("sources-scan-progress") val fraction = scan.fraction - if (fraction != null) LinearWavyProgressIndicator(progress = { fraction }, modifier = modifier) else LinearWavyProgressIndicator(modifier = modifier) + if (fraction != null) LinearProgressIndicator(progress = { fraction }, modifier = modifier) else LinearProgressIndicator(modifier = modifier) } } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt index 712b959ada..62c9d2ad72 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt @@ -14,11 +14,10 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Visibility import androidx.compose.material.icons.rounded.VisibilityOff -import androidx.compose.material3.BasicAlertDialog -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Switch @@ -41,6 +40,7 @@ import com.simplecityapps.mediaprovider.R as MediaProviderR import com.simplecityapps.shuttle.R import com.simplecityapps.shuttle.designsystem.component.S2Button import com.simplecityapps.shuttle.designsystem.component.S2ButtonStyle +import com.simplecityapps.shuttle.designsystem.component.S2Dialog import com.simplecityapps.shuttle.designsystem.component.S2DialogContent import com.simplecityapps.shuttle.designsystem.preview.S2Preview import com.simplecityapps.shuttle.model.MediaProviderType @@ -60,14 +60,20 @@ class ServerSignInActions( ) /** A Jellyfin, Emby or Plex server's sign-in dialog. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ServerSignInDialog( uiState: ServerSignInUiState, actions: ServerSignInActions, ) { - BasicAlertDialog(onDismissRequest = actions.onDismiss) { - ServerSignInForm(uiState, actions) + S2Dialog( + title = stringResource(uiState.type.longTitleRes), + onDismissRequest = actions.onDismiss, + confirmLabel = stringResource(R.string.media_provider_button_authenticate), + onConfirm = actions.onAuthenticate, + dismissLabel = stringResource(R.string.dialog_button_close), + confirmEnabled = uiState.step == ServerSignInStep.Form, + ) { + ServerSignInBody(uiState, actions) } } @@ -88,24 +94,32 @@ internal fun ServerSignInForm( dismissLabel = stringResource(R.string.dialog_button_close), confirmEnabled = uiState.step == ServerSignInStep.Form, ) { - when (val step = uiState.step) { - ServerSignInStep.Form -> SignInFields(uiState, actions) + ServerSignInBody(uiState, actions) + } +} - ServerSignInStep.Authenticating -> Progress(stringResource(R.string.media_provider_authenticating), showSpinner = true) +@Composable +private fun ServerSignInBody( + uiState: ServerSignInUiState, + actions: ServerSignInActions, +) { + when (val step = uiState.step) { + ServerSignInStep.Form -> SignInFields(uiState, actions) - is ServerSignInStep.AwaitingCode -> QuickConnectCode(step.code, actions.onCancelQuickConnect) + ServerSignInStep.Authenticating -> Progress(stringResource(R.string.media_provider_authenticating), showSpinner = true) - ServerSignInStep.Connected -> Progress(stringResource(R.string.media_provider_authentication_success), showSpinner = false) + is ServerSignInStep.AwaitingCode -> QuickConnectCode(step.code, actions.onCancelQuickConnect) - is ServerSignInStep.Failed -> Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { - Text(step.message, textAlign = TextAlign.Center) - S2Button( - text = stringResource(R.string.dialog_button_retry), - onClick = actions.onRetry, - style = S2ButtonStyle.Outlined, - modifier = Modifier.padding(top = 8.dp), - ) - } + ServerSignInStep.Connected -> Progress(stringResource(R.string.media_provider_authentication_success), showSpinner = false) + + is ServerSignInStep.Failed -> Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { + Text(step.message, textAlign = TextAlign.Center) + S2Button( + text = stringResource(R.string.dialog_button_retry), + onClick = actions.onRetry, + style = S2ButtonStyle.Outlined, + modifier = Modifier.padding(top = 8.dp), + ) } } } @@ -185,6 +199,7 @@ private fun SignInFields( } /** Quick Connect's code, up until the user approves it in another Jellyfin client or cancels. */ +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable private fun QuickConnectCode( code: String, @@ -199,7 +214,7 @@ private fun QuickConnectCode( ) { Text(stringResource(R.string.media_provider_quick_connect_instructions), textAlign = TextAlign.Center) Text(code, style = MaterialTheme.typography.headlineMedium, textAlign = TextAlign.Center) - CircularProgressIndicator() + LoadingIndicator() S2Button( text = stringResource(R.string.dialog_button_cancel), onClick = onCancel, @@ -242,6 +257,7 @@ private fun PasswordField( ) } +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable private fun Progress( message: String, @@ -254,7 +270,7 @@ private fun Progress( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(16.dp), ) { - if (showSpinner) CircularProgressIndicator() + if (showSpinner) LoadingIndicator() Text(message, textAlign = TextAlign.Center) } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/AppShell.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/AppShell.kt index 5205c11237..126ff63e0f 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/AppShell.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/AppShell.kt @@ -21,9 +21,11 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Home import androidx.compose.material.icons.outlined.LibraryMusic import androidx.compose.material.icons.outlined.Search +import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.rounded.Home import androidx.compose.material.icons.rounded.LibraryMusic import androidx.compose.material.icons.rounded.Search +import androidx.compose.material.icons.rounded.Settings import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Surface @@ -421,6 +423,7 @@ private val ShellTab.label: Int ShellTab.Home -> R.string.shell_tab_home ShellTab.Library -> R.string.title_library ShellTab.Search -> R.string.shell_tab_search + ShellTab.Settings -> R.string.settings_menu_settings } @Composable @@ -430,6 +433,7 @@ private fun ShellTab.navItem(): S2NavItem { ShellTab.Home -> S2NavItem(label, Icons.Outlined.Home, Icons.Rounded.Home) ShellTab.Library -> S2NavItem(label, Icons.Outlined.LibraryMusic, Icons.Rounded.LibraryMusic) ShellTab.Search -> S2NavItem(label, Icons.Outlined.Search, Icons.Rounded.Search) + ShellTab.Settings -> S2NavItem(label, Icons.Outlined.Settings, Icons.Rounded.Settings) } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/Routes.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/Routes.kt index db2fad5767..d945064074 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/Routes.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/Routes.kt @@ -31,4 +31,5 @@ val ShellTab.root: NavKey ShellTab.Home -> HomeRoute ShellTab.Library -> LibraryRoute ShellTab.Search -> SearchRoute + ShellTab.Settings -> SettingsRoute } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/PlayerContent.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/PlayerContent.kt index 295a45b307..c74d774413 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/PlayerContent.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/PlayerContent.kt @@ -66,7 +66,7 @@ import com.simplecityapps.shuttle.designsystem.component.SongRow import kotlin.math.roundToInt /** Height of the mini player row; the sheet's Mini anchor sits this far above the nav bar. */ -val MiniPlayerHeight = 72.dp +val MiniPlayerHeight = 64.dp /** Height of the seek bar: the slider over its times. */ internal val SeekBarHeight = 60.dp diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt index ddb61f9d84..b825ac005e 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt @@ -11,7 +11,6 @@ import androidx.compose.material.icons.rounded.Edit import androidx.compose.material.icons.rounded.Favorite import androidx.compose.material.icons.rounded.Info import androidx.compose.material.icons.rounded.Person -import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text @@ -30,6 +29,7 @@ import com.simplecityapps.mediaprovider.R as MediaProviderR import com.simplecityapps.shuttle.R import com.simplecityapps.shuttle.designsystem.component.S2Action import com.simplecityapps.shuttle.designsystem.component.S2ActionsSheet +import com.simplecityapps.shuttle.designsystem.component.S2Dialog import com.simplecityapps.shuttle.designsystem.component.S2DialogContent import com.simplecityapps.shuttle.ui.actions.MediaAction import com.simplecityapps.shuttle.ui.actions.MediaActionType @@ -109,14 +109,24 @@ internal fun SongActionsHost( } /** Names a new playlist; any non-blank name will do, duplicates included, as before. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun NewPlaylistDialog( onCreate: (String) -> Unit, onDismiss: () -> Unit, ) { - BasicAlertDialog(onDismissRequest = onDismiss) { - NewPlaylistForm(onCreate, onDismiss) + var name by rememberSaveable { mutableStateOf("") } + S2Dialog( + title = stringResource(R.string.playlist_menu_create_playlist), + onDismissRequest = onDismiss, + confirmLabel = stringResource(R.string.player_create_playlist), + onConfirm = { + onCreate(name.trim()) + onDismiss() + }, + dismissLabel = stringResource(R.string.dialog_button_cancel), + confirmEnabled = name.isNotBlank(), + ) { + NewPlaylistNameField(name, { name = it }) } } @@ -141,16 +151,24 @@ internal fun NewPlaylistForm( dismissLabel = stringResource(R.string.dialog_button_cancel), confirmEnabled = name.isNotBlank(), ) { - OutlinedTextField( - value = name, - onValueChange = { name = it }, - label = { Text(stringResource(R.string.playlist_create_dialog_playlist_name_hint)) }, - singleLine = true, - modifier = Modifier.fillMaxWidth(), - ) + NewPlaylistNameField(name, { name = it }) } } +@Composable +private fun NewPlaylistNameField( + name: String, + onNameChange: (String) -> Unit, +) { + OutlinedTextField( + value = name, + onValueChange = onNameChange, + label = { Text(stringResource(R.string.playlist_create_dialog_playlist_name_hint)) }, + singleLine = true, + modifier = Modifier.fillMaxWidth(), + ) +} + /** The menu label of the shared actions the player offers; null for the rest. */ private val MediaActionType.labelRes: Int? get() = when (this) { diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt index 149aa16f03..15b7bb2913 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt @@ -4,11 +4,13 @@ import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue import androidx.compose.ui.graphics.Color import androidx.lifecycle.ViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewModelScope +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.designsystem.theme.S2Accent import com.simplecityapps.shuttle.designsystem.theme.S2Theme import com.simplecityapps.shuttle.settings.Accent @@ -30,7 +32,8 @@ data class AppThemeState( val theme: ThemeMode = ThemeMode.DayNight, val accent: Accent = Accent.Default, val dynamicColour: Boolean = false, - val pureBlack: Boolean = false + val pureBlack: Boolean = false, + val compactMode: Boolean = false ) /** The Appearance settings the Compose theme follows, live, so a change in Settings restyles the app without a restart. */ @@ -45,6 +48,7 @@ class AppThemeViewModel @Inject constructor( observeSetting(AppearanceSettings.AccentColour), observeSetting(AppearanceSettings.DynamicColour), observeSetting(AppearanceSettings.PureBlack), + observeSetting(AppearanceSettings.CompactMode), ::AppThemeState ).stateIn( scope = viewModelScope, @@ -53,7 +57,8 @@ class AppThemeViewModel @Inject constructor( theme = readSetting(AppearanceSettings.Theme), accent = readSetting(AppearanceSettings.AccentColour), dynamicColour = readSetting(AppearanceSettings.DynamicColour), - pureBlack = readSetting(AppearanceSettings.PureBlack) + pureBlack = readSetting(AppearanceSettings.PureBlack), + compactMode = readSetting(AppearanceSettings.CompactMode) ) ) } @@ -83,17 +88,19 @@ fun S2AppTheme( // Always the same call, so toggling pure black recolours the content instead of moving it to a new // composition branch, which would drop its saved state (the shell's back stacks among it). val colorScheme = MaterialTheme.colorScheme - MaterialTheme( - colorScheme = if (darkTheme && state.pureBlack) { - colorScheme.copy(background = Color.Black, surface = Color.Black, surfaceContainerLowest = Color.Black) - } else { - colorScheme - }, - motionScheme = MaterialTheme.motionScheme, - shapes = MaterialTheme.shapes, - typography = MaterialTheme.typography, - content = content - ) + CompositionLocalProvider(LocalCompactMode provides state.compactMode) { + MaterialTheme( + colorScheme = if (darkTheme && state.pureBlack) { + colorScheme.copy(background = Color.Black, surface = Color.Black, surfaceContainerLowest = Color.Black) + } else { + colorScheme + }, + motionScheme = MaterialTheme.motionScheme, + shapes = MaterialTheme.shapes, + typography = MaterialTheme.typography, + content = content + ) + } } } diff --git a/android/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml b/android/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml new file mode 100644 index 0000000000..0cfbad6452 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_history_black_24dp.xml b/android/app/src/main/res/drawable/ic_history_black_24dp.xml new file mode 100644 index 0000000000..a61de1bc9e --- /dev/null +++ b/android/app/src/main/res/drawable/ic_history_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml b/android/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml new file mode 100644 index 0000000000..d20768cc37 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/values/strings_home.xml b/android/app/src/main/res/values/strings_home.xml index 38a0ab6047..fd854e6f51 100644 --- a/android/app/src/main/res/values/strings_home.xml +++ b/android/app/src/main/res/values/strings_home.xml @@ -4,23 +4,37 @@ Shuffle Shuffle all + + Shuttle + + Shuttle Music Player Continue listening %1$s left Recently played + + Recently played albums Recently added + + Recently added albums Most played + + Your favourite albums Something different + + Artists you haven\'t listened to in a while %1$d play %1$d plays + + Play %1$s What\'s new in S2 diff --git a/android/app/src/main/res/values/strings_settings.xml b/android/app/src/main/res/values/strings_settings.xml index 0d85752f8c..8404285950 100644 --- a/android/app/src/main/res/values/strings_settings.xml +++ b/android/app/src/main/res/values/strings_settings.xml @@ -42,6 +42,14 @@ Rescan Rescan the selected media providers + + Back up library + + Save play counts, favourites, exclusions and playlists to a JSON file + + Restore library backup + + Restore stats and playlists from a backup file, overwriting current values Excluded @@ -127,6 +135,10 @@ About Advanced + + Classic mode + + Dense classic layout: small artwork, flat tiles, icon-only navigation Pure black @@ -165,6 +177,14 @@ Version Scanning your library + + Library backup saved + + Library backup failed + + Could not read that backup file + + Restored %1$d songs and %2$d playlists (%3$d unmatched) Artwork cache cleared diff --git a/android/app/src/main/res/values/strings_sources.xml b/android/app/src/main/res/values/strings_sources.xml index 976b583d8a..c4eaf38ced 100644 --- a/android/app/src/main/res/values/strings_sources.xml +++ b/android/app/src/main/res/values/strings_sources.xml @@ -24,7 +24,7 @@ Every folder is scanned Skip these folders Read these folders directly - For folders Android hides from music apps, or file types it doesn\'t recognise + For folders Android hides from music apps, or file types it doesn\'t recognise. Android can\'t tell S2 when these change, so new music here needs a manual or scheduled scan Add folder Remove this folder? Remove diff --git a/android/app/src/main/res/xml/locales_config.xml b/android/app/src/main/res/xml/locales_config.xml new file mode 100644 index 0000000000..36da632d04 --- /dev/null +++ b/android/app/src/main/res/xml/locales_config.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt index 06b193df33..971402e67a 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt @@ -49,6 +49,7 @@ class SettingKeysTest { "AppearanceSettings.ColourFromArtwork: pref_theme_colour_from_artwork = true", "AppearanceSettings.ShowHomeOnLaunch: pref_show_home_on_launch = false", "AppearanceSettings.WidgetBackgroundOpacity: widget_background_opacity = 100", + "AppearanceSettings.CompactMode: pref_compact_mode = false", "ArtworkSettings.WifiOnly: artwork_wifi_only = true", "ArtworkSettings.LocalOnly: artwork_local_only = false", "ArtworkSettings.MediaSessionArtwork: media_session_artwork = true", diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt index 5653e66cc8..cc1fe6d04c 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt @@ -3,7 +3,9 @@ package com.simplecityapps.shuttle.ui.screens.home import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.hasScrollToIndexAction +import androidx.compose.ui.test.hasTestTag import androidx.compose.ui.test.hasText import androidx.compose.ui.test.junit4.ComposeContentTestRule import androidx.compose.ui.test.longClick @@ -24,10 +26,14 @@ import io.kotest.matchers.shouldBe /** Test robot for [HomeScreen]: records every callback so tests assert on what the screen asked for. */ class HomeRobot(private val rule: ComposeContentTestRule) { - var settingsOpened = 0 - private set var shuffles = 0 private set + var openedHistory = 0 + private set + var openedRecentlyAdded = 0 + private set + var openedFavourites = 0 + private set var playbackToggles = 0 private set var queueShuffles = 0 @@ -38,15 +44,18 @@ class HomeRobot(private val rule: ComposeContentTestRule) { private set val openedAlbums = mutableListOf() val openedArtists = mutableListOf() + val playedAlbums = mutableListOf>() + val playedArtists = mutableListOf>() val shownActions = mutableListOf() fun setContent( uiState: HomeUiState, theme: ThemeMode = ThemeMode.Light, + compact: Boolean = false, emptyContent: (@Composable (Modifier) -> Unit)? = null, ) { rule.setContent { - S2AppTheme(AppThemeState(theme = theme)) { + S2AppTheme(AppThemeState(theme = theme, compactMode = compact)) { HomeScreen( uiState = uiState, callbacks = callbacks(), @@ -58,14 +67,18 @@ class HomeRobot(private val rule: ComposeContentTestRule) { } private fun callbacks() = HomeCallbacks( - onOpenSettings = { settingsOpened++ }, onShuffleAll = { shuffles++ }, + onOpenHistory = { openedHistory++ }, + onOpenRecentlyAdded = { openedRecentlyAdded++ }, + onOpenFavourites = { openedFavourites++ }, onTogglePlayback = { playbackToggles++ }, onShuffleQueue = { queueShuffles++ }, onOpenWhatsNew = { whatsNewOpened++ }, onDismissWhatsNew = { whatsNewDismissed++ }, onAlbumClick = { openedAlbums += it }, onArtistClick = { openedArtists += it }, + onPlayAlbums = { playedAlbums += it }, + onPlayArtists = { playedArtists += it }, onShowActions = { shownActions += it }, ) @@ -79,6 +92,12 @@ class HomeRobot(private val rule: ComposeContentTestRule) { rule.onAllNodesWithText(text)[0].performClick() } + /** Taps a Play/Shuffle/Pause button of the resume hero: the shortcuts row repeats some labels. */ + fun tapHeroAction(label: String) { + scrollTo("Continue listening") + rule.onAllNodes(hasText(label) and hasAnyAncestor(hasTestTag("resume-hero")))[0].performClick() + } + /** Taps text outside Home's own scrolling list, such as content in the empty-state slot (#422). */ fun tapVisibleText(text: String) { rule.onAllNodesWithText(text)[0].performClick() diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt index 3a40e9c553..32944b408b 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt @@ -6,6 +6,7 @@ import com.simplecityapps.shuttle.ui.actions.MediaSelection import com.simplecityapps.shuttle.ui.screens.library.LibraryAvailability import com.simplecityapps.shuttle.ui.screens.library.LibraryEmptyScreen import com.simplecityapps.shuttle.ui.screens.sources.MusicAccess +import io.kotest.matchers.collections.shouldBeEmpty import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.shouldBe import org.junit.Rule @@ -80,8 +81,8 @@ class HomeScreenTest { fun `the resume hero plays and shuffles the queue`() { robot.setContent(HomeScenarios.content) - robot.tapText("Play") - robot.tapText("Shuffle") + robot.tapHeroAction("Play") + robot.tapHeroAction("Shuffle") robot.playbackToggles shouldBe 1 robot.queueShuffles shouldBe 1 @@ -115,12 +116,12 @@ class HomeScreenTest { } @Test - fun `most played albums carry their play count, with its unit, in the subtitle`() { - robot.setContent(HomeScenarios.content) + fun `most played tiles badge their play count instead of repeating it in the subtitle`() { + robot.setContent(HomeScenarios.content, compact = true) robot.scrollTo("Soft Focus") - robot.assertTextDisplayed("14 plays · ${HomeScenarios.softFocus.albumArtist}") - robot.assertTextNotShown("14") + robot.assertTextDisplayed("14") + robot.assertTextNotShown("14 plays") } @Test @@ -144,21 +145,63 @@ class HomeScreenTest { } @Test - fun `shuffle all and settings are wired from the top bar`() { + fun `a shelf header plays its whole shelf, not just one tile`() { + robot.setContent(HomeScenarios.content) + + robot.scrollTo("Recently added") + robot.tapDescription("Play Recently added") + robot.scrollTo("Something different") + robot.tapDescription("Play Something different") + + robot.playedAlbums shouldContainExactly listOf(HomeScenarios.content.recentlyAdded) + robot.playedArtists shouldContainExactly listOf(HomeScenarios.content.somethingDifferent) + robot.openedAlbums.shouldBeEmpty() + } + + @Test + fun `classic home opens with the centered Shuttle Music Player brand over the shortcuts`() { + robot.setContent(HomeScenarios.content, compact = true) + + robot.assertTextDisplayed("Shuttle Music Player") + robot.scrollTo("Recently added") + } + + @Test + fun `modern home shows the small Shuttle brand and the shortcut row`() { + robot.setContent(HomeScenarios.content) + + robot.assertTextDisplayed("Shuttle") + robot.assertTextNotShown("Shuttle Music Player") + robot.assertDescriptionDisplayed("History") + } + + @Test + fun `shortcuts open their smart playlists`() { + robot.setContent(HomeScenarios.content, compact = true) + + robot.tapDescription("History") + robot.tapDescription("Recently Added") + robot.tapDescription("Favorites") + + robot.openedHistory shouldBe 1 + robot.openedRecentlyAdded shouldBe 1 + robot.openedFavourites shouldBe 1 + } + + @Test + fun `shuffle all is wired from the shortcut row, with no settings gear duplicating the tab`() { robot.setContent(HomeScenarios.content) - robot.tapDescription("Shuffle all") - robot.tapDescription("Settings") + robot.tapDescription("Shuffle") robot.shuffles shouldBe 1 - robot.settingsOpened shouldBe 1 + robot.assertDescriptionNotShown("Settings") } @Test - fun `home has no page title and no search button, which the Search tab covers`() { + fun `home has no search button, which the Search tab covers`() { robot.setContent(HomeScenarios.content) - robot.assertTextNotShown("Home") robot.assertDescriptionNotShown("Search") } diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModelTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModelTest.kt index bc0426eb6c..c87289b144 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModelTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModelTest.kt @@ -214,4 +214,12 @@ class HomeViewModelTest { viewModel().shuffleQueue() shouldBe MediaAction.Shuffle(MediaSelection.Songs(listOf(chlorophyllLoop, tidalMoss))) } + + @Test + fun `playing a shelf plays every album in it, in order`() = runTest(mainDispatcherRule.testDispatcher) { + val often = createAlbum("Phase Garden", "Juniper Static", playCount = 5) + val rare = createAlbum("Night Bus", "Juniper Static") + + viewModel().playAlbums(listOf(often, rare)) shouldBe MediaAction.Play(MediaSelection.Albums(listOf(often, rare))) + } } diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenRobot.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenRobot.kt index 63fee0778d..d052f66917 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenRobot.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenRobot.kt @@ -39,6 +39,7 @@ import com.simplecityapps.shuttle.ui.screens.library.folders.FolderListUiState import com.simplecityapps.shuttle.ui.screens.library.genres.GenreListUiState import com.simplecityapps.shuttle.ui.screens.library.playlists.PlaylistListUiState import com.simplecityapps.shuttle.ui.screens.library.songs.SongListUiState +import io.kotest.matchers.shouldBe /** The page states [LibraryScreenRobot] renders under each tab; a tab without one shows a stand-in label. */ data class LibraryPageStates( @@ -88,8 +89,6 @@ class LibraryScreenRobot(private val rule: ComposeContentTestRule) { private set var shuffleClicked = false private set - var settingsOpened = false - private set var newPlaylistClicked = false private set @@ -121,7 +120,6 @@ class LibraryScreenRobot(private val rule: ComposeContentTestRule) { onTabSelected = { lastTabSelected = it }, onTabsChanged = { order, enabled -> lastTabsChanged = order to enabled }, onSelectionAction = { lastSelectionAction = it }, - onOpenSettings = { settingsOpened = true }, ) { tab -> Page(tab, pages) } } } @@ -228,16 +226,15 @@ class LibraryScreenRobot(private val rule: ComposeContentTestRule) { rule.waitForIdle() } - fun openSettings() { - rule.onNodeWithContentDescription("Settings").performClick() - rule.waitForIdle() - } - fun openOverflow() { rule.onNodeWithTag("library-more").performClick() rule.waitForIdle() } + fun assertDescriptionNotShown(description: String) { + rule.onAllNodesWithContentDescription(description).fetchSemanticsNodes().size shouldBe 0 + } + fun clickSelectionAction(label: String) { rule.onNodeWithContentDescription(label).performClick() rule.waitForIdle() diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenTest.kt index f0209f76da..1caab1565a 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenTest.kt @@ -79,12 +79,12 @@ class LibraryScreenTest { } @Test - fun `the settings action opens settings`() { + fun `no settings gear duplicates the bottom tab`() { robot.setContent(libraryState()) - robot.openSettings() - - robot.settingsOpened shouldBe true + robot.assertDescriptionNotShown("Settings") + robot.openOverflow() + robot.assertTextDisplayed("Edit tabs") } @Test diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsIntegrationTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsIntegrationTest.kt index 284b8942da..7297918fc8 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsIntegrationTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsIntegrationTest.kt @@ -11,8 +11,10 @@ import com.simplecityapps.shuttle.settings.SettingsStore import com.simplecityapps.shuttle.settings.ThemeMode import com.simplecityapps.shuttle.settings.defaultSharedPreferences import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsDestination +import com.simplecityapps.shuttle.ui.screens.settings.backup.LibraryBackupManager import com.simplecityapps.testing.MainDispatcherRule import io.kotest.matchers.shouldBe +import io.mockk.mockk import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -36,11 +38,12 @@ class SettingsIntegrationTest { private val store = SettingsStore(SharedPreferencesKeyValueStore(RuntimeEnvironment.getApplication().defaultSharedPreferences().apply { edit().clear().commit() })) private val effects = FakeSettingsEffects() + private val backupManager = mockk(relaxed = true) private val robot = SettingsRobot(composeTestRule) @Test fun `toggling a switch stores it and redraws it`() { - robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects)) + robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager)) robot.assertSwitchOff("Pure black") robot.tapText("Pure black") @@ -51,7 +54,7 @@ class SettingsIntegrationTest { @Test fun `picking a theme stores it and shows it`() { - robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects)) + robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager)) robot.tapText("Theme") robot.tapDialogText("Dark") @@ -64,7 +67,7 @@ class SettingsIntegrationTest { @Test fun `turning dynamic colour off frees the accent to be picked`() { store.preference(AppearanceSettings.DynamicColour).value = true - robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects)) + robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager)) robot.assertNotEnabled("Accent") robot.tapText("Dynamic colour") @@ -77,7 +80,7 @@ class SettingsIntegrationTest { @Test fun `a change made elsewhere shows up`() { - robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects)) + robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager)) store.preference(AppearanceSettings.PureBlack).value = true diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModelTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModelTest.kt index 46e1abfd2b..afdb7e2e25 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModelTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModelTest.kt @@ -14,8 +14,10 @@ import com.simplecityapps.shuttle.settings.ThemeMode import com.simplecityapps.shuttle.ui.screens.settings.model.SettingItem import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsAction import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsCatalog +import com.simplecityapps.shuttle.ui.screens.settings.backup.LibraryBackupManager import com.simplecityapps.testing.MainDispatcherRule import io.kotest.matchers.shouldBe +import io.mockk.mockk import java.util.Date import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch @@ -34,6 +36,7 @@ class SettingsViewModelTest { private val prefs = InMemoryKeyValueStore() private val effects = FakeSettingsEffects() + private val backupManager = mockk(relaxed = true) private lateinit var store: SettingsStore @Before @@ -41,7 +44,7 @@ class SettingsViewModelTest { store = SettingsStore(prefs) } - private fun viewModel() = SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects) + private fun viewModel() = SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager) private inline fun item(key: String): T = SettingsCatalog.items.filterIsInstance().first { it.key == key } diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt new file mode 100644 index 0000000000..f45651813e --- /dev/null +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt @@ -0,0 +1,184 @@ +package com.simplecityapps.shuttle.ui.screens.settings.backup + +import com.simplecityapps.shuttle.model.MediaProviderType +import com.simplecityapps.shuttle.model.Song +import io.kotest.matchers.nulls.shouldBeNull +import io.kotest.matchers.nulls.shouldNotBeNull +import io.kotest.matchers.shouldBe +import kotlinx.serialization.json.Json +import org.junit.Test +import kotlin.time.Instant + +class LibraryBackupMatcherTest { + + private val json = Json { ignoreUnknownKeys = true } + + private fun song( + id: Long = 1, + path: String = "/storage/emulated/0/Music/song.mp3", + provider: MediaProviderType = MediaProviderType.Shuttle, + externalId: String? = null, + name: String? = "Song", + album: String? = "Album", + artists: List = listOf("Artist"), + duration: Int = 200, + size: Long = 1000, + playCount: Int = 0, + lastPlayed: Instant? = null, + lastCompleted: Instant? = null, + playbackPosition: Int = 0, + blacklisted: Boolean = false, + favouritedAt: Instant? = null, + dateAdded: Instant? = null + ) = Song( + id = id, + name = name, + albumArtist = null, + artists = artists, + album = album, + track = 1, + disc = 1, + duration = duration, + date = null, + genres = emptyList(), + path = path, + size = size, + mimeType = "audio/mpeg", + lastModified = null, + lastPlayed = lastPlayed, + lastCompleted = lastCompleted, + playCount = playCount, + playbackPosition = playbackPosition, + blacklisted = blacklisted, + externalId = externalId, + mediaProvider = provider, + lyrics = null, + grouping = null, + bitRate = null, + bitDepth = null, + sampleRate = null, + channelCount = null, + dateAdded = dateAdded, + favouritedAt = favouritedAt + ) + + private fun identityOf(song: Song) = SongIdentity( + provider = song.mediaProvider.name, + path = song.path, + externalId = song.externalId, + title = song.name, + album = song.album, + artist = song.artists.joinToString(", "), + duration = song.duration, + size = song.size + ) + + @Test + fun `exact path match wins`() { + val library = listOf(song()) + val identity = identityOf(song()) + val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] + match.shouldNotBeNull() + match.kind shouldBe LibraryBackupMatcher.MatchKind.ExactPath + } + + @Test + fun `sd-card volume change matches by relative path`() { + val library = listOf(song(path = "/storage/ABCD-1234/Music/song.mp3")) + val identity = identityOf(song(path = "/storage/emulated/0/Music/song.mp3")) + val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] + match.shouldNotBeNull() + match.kind shouldBe LibraryBackupMatcher.MatchKind.RelativePath + } + + @Test + fun `remote items match by external id when paths differ`() { + val library = listOf( + song( + provider = MediaProviderType.Jellyfin, + path = "jellyfin://item/aaa", + externalId = "aaa", + name = "Renamed Since" + ) + ) + val identity = identityOf( + song(provider = MediaProviderType.Jellyfin, path = "jellyfin://item/changed", externalId = "aaa", name = "Original") + ) + val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] + match.shouldNotBeNull() + match.kind shouldBe LibraryBackupMatcher.MatchKind.ExternalId + } + + @Test + fun `retagged file matches fuzzily within duration tolerance`() { + val library = listOf(song(path = "/storage/emulated/0/Other/renamed.mp3")) + val identity = identityOf(song(path = "/storage/emulated/0/Music/song.mp3", duration = 201)) + val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] + match.shouldNotBeNull() + match.kind shouldBe LibraryBackupMatcher.MatchKind.Fuzzy + } + + @Test + fun `unknown file does not match`() { + val library = listOf(song()) + val identity = identityOf(song(name = "Something Else", album = "Other", path = "/x/y.mp3")) + LibraryBackupMatcher.matchAll(listOf(identity), library)[identity].shouldBeNull() + } + + @Test + fun `restore overwrites with backup snapshot`() { + val playedLater = Instant.fromEpochMilliseconds(2_000_000) + val current = song(playCount = 3, lastPlayed = playedLater, playbackPosition = 10, blacklisted = false) + val backup = BackedUpSong( + identity = identityOf(current), + playCount = 1, + lastPlayed = 1_000_000, + playbackPosition = 99, + excluded = true, + favouritedAt = 500_000 + ) + val merged = LibraryBackupMatcher.mergeStats(current, backup) + // Backup wins even when the device has played more since: 1 overwrites 2. + merged.playCount shouldBe 1 + merged.lastPlayed shouldBe Instant.fromEpochMilliseconds(1_000_000) + merged.playbackPosition shouldBe 99 + merged.excluded shouldBe true + merged.favouritedAt shouldBe Instant.fromEpochMilliseconds(500_000) + } + + @Test + fun `restore clears values missing from backup`() { + val current = song( + playCount = 2, + lastPlayed = Instant.fromEpochMilliseconds(2_000_000), + playbackPosition = 10, + blacklisted = true, + favouritedAt = Instant.fromEpochMilliseconds(2_000_000) + ) + val backup = BackedUpSong(identity = identityOf(current), playCount = 0) + val merged = LibraryBackupMatcher.mergeStats(current, backup) + merged.playCount shouldBe 0 + merged.lastPlayed.shouldBeNull() + merged.playbackPosition shouldBe 0 + merged.excluded shouldBe false + merged.favouritedAt.shouldBeNull() + LibraryBackupMatcher.statsEqual(current, merged) shouldBe false + } + + @Test + fun `backup round-trips through json`() { + val backup = LibraryBackup( + exportedAt = 1_700_000_000_000, + songs = listOf( + BackedUpSong(identityOf(song()), playCount = 7, favouritedAt = 123_456) + ), + playlists = listOf( + BackedUpPlaylist(name = "Mix", provider = "Shuttle", members = listOf(identityOf(song()))) + ) + ) + val decoded = json.decodeFromString(json.encodeToString(LibraryBackup.serializer(), backup)) + decoded.songs.single().playCount shouldBe 7 + decoded.playlists.single().members.single().path shouldBe "/storage/emulated/0/Music/song.mp3" + decoded.schemaVersion shouldBe LibraryBackup.CURRENT_SCHEMA_VERSION + } +} diff --git a/android/architecture-tests/build.gradle.kts b/android/architecture-tests/build.gradle.kts index f18df2d94e..c4a5b55b8d 100644 --- a/android/architecture-tests/build.gradle.kts +++ b/android/architecture-tests/build.gradle.kts @@ -8,13 +8,13 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/core/build.gradle.kts b/android/core/build.gradle.kts index e625630a1c..fba5db283d 100644 --- a/android/core/build.gradle.kts +++ b/android/core/build.gradle.kts @@ -20,9 +20,9 @@ kotlin { enable = true } - // As before the conversion: the Android modules that inline core's functions (appGraph()) target 11 + // All Android modules target JVM 21 (unified Sept 2026; was 11 pre-KMP conversion) compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt b/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt index 50336717ab..9f5b98859e 100644 --- a/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt +++ b/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt @@ -32,6 +32,7 @@ class AppearanceSettings @Inject constructor( val colourFromArtwork = store.preference(ColourFromArtwork) val showHomeOnLaunch = store.preference(ShowHomeOnLaunch) val widgetBackgroundOpacity = store.preference(WidgetBackgroundOpacity) + val compactMode = store.preference(CompactMode) companion object { val Theme = Setting.enumOrdinalString("pref_theme", ThemeMode.DayNight, ThemeMode.entries) @@ -53,5 +54,8 @@ class AppearanceSettings @Inject constructor( /** A percentage. The key predates the Glance widgets, so old values carry over. */ val WidgetBackgroundOpacity = Setting.int("widget_background_opacity", 100) + + /** Tighter lists, smaller artwork and shorter headers across Home, Library and Settings. */ + val CompactMode = Setting.boolean("pref_compact_mode", false) } } diff --git a/android/designsystem/build.gradle.kts b/android/designsystem/build.gradle.kts index 6648fee35b..cfd7795e38 100644 --- a/android/designsystem/build.gradle.kts +++ b/android/designsystem/build.gradle.kts @@ -10,12 +10,12 @@ android { compileSdk = 37 defaultConfig { - minSdk = 24 + minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } buildFeatures { @@ -33,7 +33,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/PlayerBoards.kt b/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/PlayerBoards.kt index d4f4d85338..702d0ffd69 100644 --- a/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/PlayerBoards.kt +++ b/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/PlayerBoards.kt @@ -89,8 +89,8 @@ fun SeekBarBoard(width: BoardWidth) { Board( width, listOf( - BoardSection("Playing (wavy)") { S2SeekBar(positionMs = 83_000, durationMs = 383_000, onSeek = {}, playing = true) }, - BoardSection("Paused (flat)") { S2SeekBar(positionMs = 83_000, durationMs = 383_000, onSeek = {}, playing = false) }, + BoardSection("Playing") { S2SeekBar(positionMs = 83_000, durationMs = 383_000, onSeek = {}, playing = true) }, + BoardSection("Paused") { S2SeekBar(positionMs = 83_000, durationMs = 383_000, onSeek = {}, playing = false) }, BoardSection("Dragging") { S2SeekBar( positionMs = 250_000, @@ -110,8 +110,8 @@ fun ProgressBoard(width: BoardWidth) { Board( width, listOf( - BoardSection("Playing (wavy)") { S2PlaybackProgress(progress = { 0.4f }, playing = true, modifier = Modifier.fillMaxWidth()) }, - BoardSection("Paused (flat)") { S2PlaybackProgress(progress = { 0.4f }, playing = false, modifier = Modifier.fillMaxWidth()) }, + BoardSection("Playing") { S2PlaybackProgress(progress = { 0.4f }, playing = true, modifier = Modifier.fillMaxWidth()) }, + BoardSection("Paused") { S2PlaybackProgress(progress = { 0.4f }, playing = false, modifier = Modifier.fillMaxWidth()) }, BoardSection("Indeterminate (loading)") { S2PlaybackProgress(progress = null, playing = true, modifier = Modifier.fillMaxWidth()) }, ), ) diff --git a/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/ThemeBoards.kt b/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/ThemeBoards.kt index 78cbdf1d08..a3878c5b2b 100644 --- a/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/ThemeBoards.kt +++ b/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/ThemeBoards.kt @@ -32,7 +32,6 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.graphics.shapes.Morph import androidx.graphics.shapes.RoundedPolygon -import com.simplecityapps.shuttle.designsystem.component.ArtworkPlaceholder import com.simplecityapps.shuttle.designsystem.theme.LocalS2ThemeSettings import com.simplecityapps.shuttle.designsystem.theme.S2Accent import com.simplecityapps.shuttle.designsystem.theme.S2Contrast @@ -213,12 +212,11 @@ fun ThemeShapeBoard(width: BoardWidth) { }, BoardSection("MaterialShapes S2 uses (non-content only)") { ShapeSamples( - ArtworkPlaceholder.entries.map { it.name to it.polygon.toShape() } + - listOf( - "Playlist mask" to MaterialShapes.Cookie12Sided.toShape(), - "Empty" to MaterialShapes.Cookie9Sided.toShape(), - "Error" to MaterialShapes.Burst.toShape(), - ), + listOf( + "Playlist mask" to MaterialShapes.Cookie12Sided.toShape(), + "Empty" to MaterialShapes.Cookie9Sided.toShape(), + "Error" to MaterialShapes.Burst.toShape(), + ), ) }, BoardSection("Morphs: start, mid, end") { diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/ActionsSheet.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/ActionsSheet.kt index 684b0f412d..b62e42e7b1 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/ActionsSheet.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/ActionsSheet.kt @@ -2,6 +2,7 @@ package com.simplecityapps.shuttle.designsystem.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -54,6 +55,32 @@ fun S2ActionsSheet( } } +/** + * A sheet with a [title] header and custom [content], for sheets whose rows aren't [S2Action]s + * (the Library's tab editor). The content scrolls under the header; a long list keeps the title + * visible the way [ActionsSheetContent] does. + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun S2Sheet( + title: String, + onDismissRequest: () -> Unit, + modifier: Modifier = Modifier, + sheetState: SheetState = rememberModalBottomSheetState(), + content: @Composable ColumnScope.() -> Unit, +) { + ModalBottomSheet(onDismissRequest = onDismissRequest, modifier = modifier, sheetState = sheetState) { + Text(title, style = MaterialTheme.typography.titleMedium, modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + HorizontalDivider(Modifier.padding(top = 8.dp)) + Column( + Modifier + .verticalScroll(rememberScrollState()) + .padding(vertical = 8.dp), + content = content, + ) + } +} + /** The body of an [S2ActionsSheet] without the sheet, for laying one out in place. */ @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt index d09899b8b2..8d96fe0faf 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt @@ -36,8 +36,8 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import androidx.graphics.shapes.RoundedPolygon import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.fixtures.SampleLibrary /** The artwork sizes S2 lays out: list rows, the grid tile, and the detail/player hero. */ @@ -48,6 +48,20 @@ enum class ArtworkSize(val dp: Dp) { Hero(240.dp), } +/** + * [ArtworkSize.dp], with row sizes shrunk in compact mode. Grid and Hero stay full-size: detail + * and player screens keep their presence. + */ +@Composable +fun ArtworkSize.resolvedDp(): Dp { + if (!LocalCompactMode.current) return dp + return when (this) { + ArtworkSize.Small -> 28.dp + ArtworkSize.Medium -> 40.dp + ArtworkSize.Grid, ArtworkSize.Hero -> dp + } +} + /** * Album and song art is a rounded rectangle; artist images are circles. [Scalloped] is the one * `MaterialShapes` mask, an option for playlist art only (a user image or a mosaic, never an album @@ -56,22 +70,23 @@ enum class ArtworkSize(val dp: Dp) { enum class ArtworkShape { Rounded, Circle, Scalloped } /** - * What an artwork stands for, which picks the placeholder shown when there's no image. The smart playlists each have - * their own ([Favorites], [RecentlyAdded], [MostPlayed], [History]); [SmartPlaylist] is the generic one. + * What an artwork stands for, which picks the placeholder icon shown when there's no image. The + * smart playlists each have their own ([Favorites], [RecentlyAdded], [MostPlayed], [History]); + * [SmartPlaylist] is the generic one. The glyph is flat — a bare icon on the tile — never a + * novelty shape. */ -@OptIn(ExperimentalMaterial3ExpressiveApi::class) -enum class ArtworkPlaceholder(internal val icon: ImageVector, internal val polygon: RoundedPolygon) { - Song(Icons.Rounded.MusicNote, MaterialShapes.Cookie9Sided), - Album(Icons.Rounded.Album, MaterialShapes.Cookie12Sided), - Artist(Icons.Rounded.Person, MaterialShapes.Flower), - Playlist(Icons.AutoMirrored.Rounded.QueueMusic, MaterialShapes.Clover4Leaf), - SmartPlaylist(Icons.Rounded.AutoAwesome, MaterialShapes.Sunny), - Favorites(Icons.Rounded.Favorite, MaterialShapes.Heart), - RecentlyAdded(Icons.Rounded.LibraryAdd, MaterialShapes.Sunny), - MostPlayed(Icons.AutoMirrored.Rounded.TrendingUp, MaterialShapes.SoftBurst), - History(Icons.Rounded.History, MaterialShapes.Cookie6Sided), - Genre(Icons.Rounded.LibraryMusic, MaterialShapes.Pentagon), - Folder(Icons.Rounded.Folder, MaterialShapes.Square), +enum class ArtworkPlaceholder(internal val icon: ImageVector) { + Song(Icons.Rounded.MusicNote), + Album(Icons.Rounded.Album), + Artist(Icons.Rounded.Person), + Playlist(Icons.AutoMirrored.Rounded.QueueMusic), + SmartPlaylist(Icons.Rounded.AutoAwesome), + Favorites(Icons.Rounded.Favorite), + RecentlyAdded(Icons.Rounded.LibraryAdd), + MostPlayed(Icons.AutoMirrored.Rounded.TrendingUp), + History(Icons.Rounded.History), + Genre(Icons.Rounded.LibraryMusic), + Folder(Icons.Rounded.Folder), } /** @@ -110,9 +125,10 @@ fun Artwork( ) { val clip = artworkShape(shape, size) val preview = previewArtwork(model) + val resolved = size.resolvedDp() Box( modifier = modifier - .size(size.dp) + .size(resolved) .clip(clip) .background(MaterialTheme.colorScheme.surfaceContainerHighest), contentAlignment = Alignment.Center, @@ -127,26 +143,18 @@ fun Artwork( } /** - * The [placeholder]'s glyph as [Artwork] draws it: the media type's icon in its `MaterialShapes` container. For an - * [Artwork] `image` slot to draw under an image that loads asynchronously, so art that never loads keeps the glyph. + * The [placeholder]'s glyph as [Artwork] draws it: the media type's bare icon, centred on the + * tile's own container. For an [Artwork] `image` slot to draw under an image that loads + * asynchronously, so art that never loads keeps the glyph. */ -@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun ArtworkPlaceholderGlyph(placeholder: ArtworkPlaceholder, size: ArtworkSize) { - Box( - modifier = Modifier - .size(size.dp * 0.7f) - .clip(placeholder.polygon.toShape()) - .background(MaterialTheme.colorScheme.secondaryContainer), - contentAlignment = Alignment.Center, - ) { - Icon( - imageVector = placeholder.icon, - contentDescription = null, - tint = MaterialTheme.colorScheme.onSecondaryContainer, - modifier = Modifier.size(size.dp * 0.35f), - ) - } + Icon( + imageVector = placeholder.icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(size.resolvedDp() * 0.5f), + ) } /** Row artwork gets the small corner, tiles the large, the hero the Expressive large-increased. */ diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt index 2a033daa77..db6e4f0a4c 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt @@ -29,6 +29,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.selected import androidx.compose.ui.semantics.semantics @@ -37,6 +38,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.R import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.fixtures.SampleLibrary /** @@ -46,6 +48,8 @@ import com.simplecityapps.shuttle.fixtures.SampleLibrary * * [selected] moves the card to `secondaryContainer` and badges the artwork with a check; * [playing] marks the album or artist the current song belongs to, like [SongRow] does. + * [badge] pins a small count to the artwork's top end (a most-played tile's play count); the + * selected check takes its place while selected. */ @OptIn(ExperimentalFoundationApi::class) @Composable @@ -57,14 +61,19 @@ fun GridTile( subtitle: String? = null, selected: Boolean = false, playing: Boolean = false, + badge: String? = null, onLongClick: (() -> Unit)? = null, interactionSource: MutableInteractionSource? = null, ) { + val compact = LocalCompactMode.current val colors = if (selected) { CardDefaults.cardColors( containerColor = MaterialTheme.colorScheme.secondaryContainer, contentColor = MaterialTheme.colorScheme.onSecondaryContainer, ) + } else if (compact) { + // Classic tiles are bare artwork + text: no tonal container, no shadow. + CardDefaults.cardColors(containerColor = Color.Transparent) } else { CardDefaults.cardColors() } @@ -79,20 +88,30 @@ fun GridTile( ) .semantics { this.selected = selected }, colors = colors, + elevation = CardDefaults.cardElevation(defaultElevation = if (compact) 0.dp else 1.dp), ) { Box( Modifier - .padding(8.dp) + .padding(if (compact) 0.dp else 8.dp) .fillMaxWidth() .aspectRatio(1f), ) { artwork() - if (selected) SelectedBadge(Modifier.align(Alignment.TopEnd).padding(6.dp)) + if (selected) { + SelectedBadge(Modifier.align(Alignment.TopEnd).padding(6.dp)) + } else if (badge != null) { + CountBadge(badge, Modifier.align(Alignment.TopEnd).padding(6.dp)) + } } Column( modifier = Modifier .fillMaxWidth() - .padding(start = 12.dp, end = 12.dp, bottom = 12.dp), + .padding( + start = if (compact) 4.dp else 12.dp, + end = if (compact) 4.dp else 12.dp, + top = if (compact) 4.dp else 0.dp, + bottom = if (compact) 4.dp else 12.dp + ), verticalArrangement = Arrangement.spacedBy(2.dp), ) { Row(verticalAlignment = Alignment.CenterVertically) { @@ -116,7 +135,7 @@ fun GridTile( if (subtitle != null) { Text( text = subtitle, - style = MaterialTheme.typography.bodyMedium, + style = if (compact) MaterialTheme.typography.bodySmall else MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -139,6 +158,19 @@ private fun SelectedBadge(modifier: Modifier = Modifier) { } } +@Composable +private fun CountBadge(count: String, modifier: Modifier = Modifier) { + Box( + modifier = modifier + .size(24.dp) + .clip(CircleShape) + .background(MaterialTheme.colorScheme.primary), + contentAlignment = Alignment.Center, + ) { + Text(count, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onPrimary, maxLines = 1) + } +} + @Preview @Composable private fun GridTilePreview() { diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/MiniPlayer.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/MiniPlayer.kt index 604a4c5dc8..a09b8ba048 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/MiniPlayer.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/MiniPlayer.kt @@ -20,13 +20,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.R import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.fixtures.SampleLibrary /** * The collapsed player above the nav bar (compact) or docked under the content (expanded): the * song's [artwork], [title] and [subtitle] ("artist • album"), a small morphing - * [S2PlayPauseButton], skip next, and the [S2PlaybackProgress] wave along the bottom edge. - * [buffering] shows the play button's `LoadingIndicator` and an indeterminate wave. Tapping the + * [S2PlayPauseButton], skip next, and the [S2PlaybackProgress] line along the bottom edge. + * [buffering] shows the play button's `LoadingIndicator` and an indeterminate line. Tapping the * rest of the bar ([onClick]) expands the player. */ @Composable @@ -47,12 +48,13 @@ fun S2MiniPlayer( onNextHold: (() -> Unit)? = null, ) { Surface(onClick = onClick, modifier = modifier, color = MaterialTheme.colorScheme.surfaceContainerHigh) { + val compact = LocalCompactMode.current Column { Row( modifier = Modifier .fillMaxWidth() - .padding(start = 12.dp, end = 8.dp, top = 8.dp, bottom = 6.dp), - horizontalArrangement = Arrangement.spacedBy(12.dp), + .padding(start = if (compact) 8.dp else 12.dp, end = 8.dp, top = if (compact) 6.dp else 8.dp, bottom = if (compact) 4.dp else 6.dp), + horizontalArrangement = Arrangement.spacedBy(if (compact) 8.dp else 12.dp), verticalAlignment = Alignment.CenterVertically, ) { artwork?.invoke() @@ -66,7 +68,7 @@ fun S2MiniPlayer( overflow = TextOverflow.Ellipsis, ) } - S2PlayPauseButton(playing, onPlayPause, buffering = buffering, size = 44.dp) + S2PlayPauseButton(playing, onPlayPause, buffering = buffering, size = if (compact) 32.dp else 36.dp) S2TransportButton(nextIcon, nextContentDescription, onNext, onHold = onNextHold) } S2PlaybackProgress( @@ -75,7 +77,7 @@ fun S2MiniPlayer( modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp) - .padding(bottom = 6.dp), + .padding(bottom = if (compact) 2.dp else 6.dp), ) } } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt index 53975a5a83..d099ff4073 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt @@ -11,8 +11,8 @@ import androidx.compose.material.icons.rounded.Menu import androidx.compose.material3.Badge import androidx.compose.material3.BadgedBox import androidx.compose.material3.Icon -import androidx.compose.material3.ShortNavigationBar -import androidx.compose.material3.ShortNavigationBarItem +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem import androidx.compose.material3.Text import androidx.compose.material3.WideNavigationRail import androidx.compose.material3.WideNavigationRailItem @@ -28,6 +28,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.R import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import kotlinx.coroutines.launch /** @@ -42,7 +43,7 @@ data class S2NavItem( val badge: String? = null, ) -/** The compact-width bottom navigation: a `ShortNavigationBar` of [items], [selectedIndex] selected. */ +/** The compact-width bottom navigation: a standard `NavigationBar` of [items], [selectedIndex] selected. */ @Composable fun S2NavigationBar( items: List, @@ -50,14 +51,17 @@ fun S2NavigationBar( onSelect: (Int) -> Unit, modifier: Modifier = Modifier, ) { - ShortNavigationBar(modifier = modifier) { + NavigationBar(modifier = modifier) { + // Classic drops the labels: icons alone, like the old bar. + val showLabels = !LocalCompactMode.current items.forEachIndexed { index, item -> val selected = index == selectedIndex - ShortNavigationBarItem( + NavigationBarItem( selected = selected, onClick = { onSelect(index) }, icon = { NavIcon(item, selected) }, label = { Text(item.label) }, + alwaysShowLabel = showLabels, ) } } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/PlaybackProgress.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/PlaybackProgress.kt index a4b161c902..0818cdb508 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/PlaybackProgress.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/PlaybackProgress.kt @@ -1,21 +1,17 @@ package com.simplecityapps.shuttle.designsystem.component -import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.LinearWavyProgressIndicator -import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import com.simplecityapps.shuttle.designsystem.preview.S2Preview /** - * Playback or download progress as a `LinearWavyProgressIndicator`: wavy while [playing], flattening - * to a straight line when paused. A null [progress] is indeterminate (loading, buffering). + * Playback or download progress as a flat `LinearProgressIndicator`. + * A null [progress] is indeterminate (loading, buffering). [playing] is kept for call-site + * compatibility and has no visual effect. */ -@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun S2PlaybackProgress( progress: (() -> Float)?, @@ -23,12 +19,10 @@ fun S2PlaybackProgress( modifier: Modifier = Modifier, ) { if (progress == null) { - LinearWavyProgressIndicator(modifier = modifier) + LinearProgressIndicator(modifier = modifier) return } - // The wave's height is a colour-like effect, not a position, so it eases without overshoot. - val amplitude by animateFloatAsState(if (playing) 1f else 0f, MaterialTheme.motionScheme.defaultEffectsSpec(), label = "amplitude") - LinearWavyProgressIndicator(progress = progress, modifier = modifier, amplitude = { amplitude }) + LinearProgressIndicator(progress = progress, modifier = modifier) } @Preview diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt index 84947252de..35365052fe 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt @@ -1,6 +1,7 @@ package com.simplecityapps.shuttle.designsystem.component import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn @@ -11,44 +12,69 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode + /** - * A section heading in `titleSmall` on `primary`, with an optional trailing [action] ("See all"). - * It sits on an opaque [containerColor] (`surface`), so it also works as a sticky letter header; - * pass the container's colour when it heads a list on another surface, such as the search view. + * A section heading with an optional [subtitle] under the title (a shelf's "Recently played + * albums"), an optional trailing [action] ("See all") and/or a trailing icon button (a shelf's + * play button). It sits on an opaque [containerColor] (`surface`), so it also works as a sticky + * letter header; pass the container's colour when it heads a list on another surface, such as + * the search view. */ @Composable fun SectionHeader( title: String, modifier: Modifier = Modifier, + subtitle: String? = null, action: String? = null, onAction: () -> Unit = {}, containerColor: Color = MaterialTheme.colorScheme.surface, + iconAction: ImageVector? = null, + iconActionContentDescription: String? = null, + onIconAction: () -> Unit = {}, ) { Row( modifier = modifier .fillMaxWidth() .background(containerColor) - .heightIn(min = 48.dp) - .padding(start = 16.dp, end = 4.dp), + .heightIn(min = if (LocalCompactMode.current) 32.dp else 48.dp) + .padding(start = if (LocalCompactMode.current) 12.dp else 16.dp, end = 4.dp), verticalAlignment = Alignment.CenterVertically, ) { - Text( - text = title, - style = MaterialTheme.typography.titleSmall, - color = MaterialTheme.colorScheme.primary, + Column( modifier = Modifier .weight(1f) .semantics { heading() }, - ) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.primary, + ) + if (subtitle != null) { + Text( + text = subtitle, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + } if (action != null) { S2Button(text = action, onClick = onAction, style = S2ButtonStyle.Text) } + if (iconAction != null) { + S2IconButton(icon = iconAction, contentDescription = iconActionContentDescription, onClick = onIconAction) + } } } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SeekBar.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SeekBar.kt index 631f522f65..61dc697327 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SeekBar.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SeekBar.kt @@ -29,7 +29,7 @@ import com.simplecityapps.shuttle.format.formatDuration /** * The now-playing seek bar: an M3 `Slider` (thumb, drag, semantics) whose track is the - * [S2PlaybackProgress] wave, wavy while [playing] and flat when paused or while dragging. The + * [S2PlaybackProgress] flat progress line. The * elapsed and total times sit underneath; while dragging, the elapsed time follows the thumb in * `primary`. [onSeek] runs once, when the drag ends. */ diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt index 23d831e95a..9506b4a29b 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt @@ -4,10 +4,13 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight +import androidx.compose.material.icons.rounded.ArrowDownward +import androidx.compose.material.icons.rounded.ArrowUpward import androidx.compose.material.icons.rounded.Folder import androidx.compose.material.icons.rounded.Palette import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi @@ -27,10 +30,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode /* * Settings rows are `SegmentedListItem`s. A [SettingsGroup] stacks them with the segmented gap and @@ -39,20 +44,21 @@ import com.simplecityapps.shuttle.designsystem.preview.S2Preview */ /** - * How a settings row draws its leading icon. [Tonal] sets it in a tonal cookie-shaped container and is - * for top-level rows; [Plain] is the bare icon, for the rows under them, so the containers mark the - * hierarchy instead of flattening it (#496). + * How a settings row draws its leading icon. [Plain] is the bare icon and the default everywhere, + * keeping rows slim; [Tonal] sets it in a tonal cookie-shaped container for the odd row that needs + * extra weight. */ enum class SettingIconStyle { Tonal, Plain } /** The title over a [SettingsGroup]. */ @Composable fun SettingsHeader(title: String, modifier: Modifier = Modifier) { + val compact = LocalCompactMode.current Text( text = title, style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.primary, - modifier = modifier.padding(start = 16.dp, top = 16.dp, end = 16.dp, bottom = 8.dp), + modifier = modifier.padding(start = 16.dp, top = if (compact) 8.dp else 16.dp, end = 16.dp, bottom = if (compact) 2.dp else 8.dp), ) } @@ -81,7 +87,7 @@ fun LinkSetting( modifier: Modifier = Modifier, summary: String? = null, icon: ImageVector? = null, - iconStyle: SettingIconStyle = SettingIconStyle.Tonal, + iconStyle: SettingIconStyle = SettingIconStyle.Plain, enabled: Boolean = true, shapes: ListItemShapes = ListItemDefaults.shapes(), ) { @@ -117,12 +123,48 @@ fun SwitchSetting( modifier = modifier, colors = settingColors(), enabled = enabled, - leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Tonal, enabled) } }, + leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Plain, enabled) } }, trailingContent = { Switch(checked = checked, onCheckedChange = null, enabled = enabled) }, supportingContent = summary?.let { { Text(it) } }, ) { Text(title) } } +/** + * An on/off setting with trailing move-up/move-down actions, for an ordered list the user enables + * and reorders in place (the Library's tabs). Tapping the row toggles [checked]; the switch itself + * stays directly operable, and [switchModifier] carries e.g. a test tag for it. + */ +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +fun ReorderSwitchSetting( + title: String, + checked: Boolean, + onCheckedChange: (Boolean) -> Unit, + onMoveUp: () -> Unit, + onMoveDown: () -> Unit, + moveUpEnabled: Boolean, + moveDownEnabled: Boolean, + moveUpContentDescription: String, + moveDownContentDescription: String, + modifier: Modifier = Modifier, + switchModifier: Modifier = Modifier, + shapes: ListItemShapes = ListItemDefaults.shapes(), +) { + SegmentedListItem( + onClick = { onCheckedChange(!checked) }, + shapes = shapes, + modifier = modifier, + colors = settingColors(), + leadingContent = { Switch(checked = checked, onCheckedChange = onCheckedChange, modifier = switchModifier) }, + trailingContent = { + Row { + S2IconButton(icon = Icons.Rounded.ArrowUpward, contentDescription = moveUpContentDescription, onClick = onMoveUp, enabled = moveUpEnabled) + S2IconButton(icon = Icons.Rounded.ArrowDownward, contentDescription = moveDownContentDescription, onClick = onMoveDown, enabled = moveDownEnabled) + } + }, + ) { Text(title) } +} + /** A single-choice setting showing its current [value]; [onClick] opens the choice dialog. */ @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -141,7 +183,7 @@ fun ChoiceSetting( modifier = modifier, colors = settingColors(), enabled = enabled, - leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Tonal, enabled) } }, + leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Plain, enabled) } }, supportingContent = { Text(value) }, ) { Text(title) } } @@ -166,7 +208,7 @@ fun SliderSetting( modifier = modifier, colors = settingColors(), enabled = enabled, - leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Tonal, enabled) } }, + leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Plain, enabled) } }, trailingContent = valueLabel?.let { { Text( @@ -196,22 +238,23 @@ fun InfoSetting( shapes = shapes, modifier = modifier, colors = settingColors(), - leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Tonal, enabled = true) } }, + leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Plain, enabled = true) } }, supportingContent = { Text(summary) }, ) { Text(title) } } /** - * Rows sit in `surfaceContainer` so a group reads as one container on the `surface` screen. A - * checked switch row keeps the same colours: the `Switch` shows the state, not the row. + * Rows are transparent on the `surface` screen, so a group reads as plain rows rather than a + * tonal container. A checked switch row keeps the same colours: the `Switch` shows the state, + * not the row. */ @Composable private fun settingColors(): ListItemColors { val colors = MaterialTheme.colorScheme return ListItemDefaults.segmentedColors( - containerColor = colors.surfaceContainer, - disabledContainerColor = colors.surfaceContainer, - selectedContainerColor = colors.surfaceContainer, + containerColor = Color.Transparent, + disabledContainerColor = Color.Transparent, + selectedContainerColor = Color.Transparent, selectedContentColor = colors.onSurface, selectedLeadingContentColor = colors.onSurfaceVariant, selectedTrailingContentColor = colors.onSurfaceVariant, @@ -256,3 +299,42 @@ private fun SettingsGroupPreview() { ) } } + +@Preview +@Composable +private fun ReorderSwitchSettingPreview() { + S2Preview { + SettingsGroup( + rows = listOf( + { + ReorderSwitchSetting( + title = "Songs", + checked = true, + onCheckedChange = {}, + onMoveUp = {}, + onMoveDown = {}, + moveUpEnabled = false, + moveDownEnabled = true, + moveUpContentDescription = "Move up", + moveDownContentDescription = "Move down", + shapes = it, + ) + }, + { + ReorderSwitchSetting( + title = "Folders", + checked = false, + onCheckedChange = {}, + onMoveUp = {}, + onMoveDown = {}, + moveUpEnabled = true, + moveDownEnabled = false, + moveUpContentDescription = "Move up", + moveDownContentDescription = "Move down", + shapes = it, + ) + }, + ), + ) + } +} diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SongRow.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SongRow.kt index b7df9b6493..e6569622fa 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SongRow.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SongRow.kt @@ -117,7 +117,7 @@ fun SongRow( @Composable private fun TrackNumber(trackNumber: Int, playing: Boolean) { - Box(Modifier.size(ArtworkSize.Small.dp), contentAlignment = Alignment.Center) { + Box(Modifier.size(ArtworkSize.Small.resolvedDp()), contentAlignment = Alignment.Center) { Text( text = trackNumber.toString(), style = MaterialTheme.typography.labelLarge, diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/ArtworkTheme.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/ArtworkTheme.kt index de4ed73118..f3d2e394f7 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/ArtworkTheme.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/ArtworkTheme.kt @@ -1,5 +1,7 @@ package com.simplecityapps.shuttle.designsystem.theme +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.MaterialExpressiveTheme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -12,7 +14,11 @@ import com.simplecityapps.shuttle.ui.theme.ArtworkSeed * A seed too grey to carry a hue, [ArtworkSeed.None], or a first [ArtworkSeed.Loading] fall back to * the root scheme. While a new seed loads the previous one stays, so a change reads old → new, * never old → root → new. Every change crossfades with the motion scheme's slow effects spring. + * + * An expressive theme, not a plain `MaterialTheme`: only the scheme is replaced, motion, shapes + * and type pass straight through, so seeded screens keep the expressive components and motion. */ +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun ArtworkTheme( seed: ArtworkSeed, @@ -31,8 +37,11 @@ fun ArtworkTheme( val seededScheme = remember(effectiveSeed, style, settings.isDark, settings.contrast) { effectiveSeed?.let { artworkColorScheme(it, settings.isDark, style, settings.contrast) } } - MaterialTheme( + MaterialExpressiveTheme( colorScheme = animateSchemeChange(seededScheme ?: rootScheme), + motionScheme = MaterialTheme.motionScheme, + shapes = MaterialTheme.shapes, + typography = MaterialTheme.typography, content = content, ) } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt new file mode 100644 index 0000000000..e669f8fb04 --- /dev/null +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt @@ -0,0 +1,11 @@ +package com.simplecityapps.shuttle.designsystem.theme + +import androidx.compose.runtime.compositionLocalOf + +/** + * Whether the UI lays out compact — the "classic" density: small row artwork, flat tiles with no + * cards, an icon-only nav bar, short section headers and pinned one-row bars in place of the + * large collapsing ones. Off by default; the Appearance setting flips it live, and every reader + * below recomposes on change. + */ +val LocalCompactMode = compositionLocalOf { false } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/S2Theme.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/S2Theme.kt index 28254a9c1e..f1513a0797 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/S2Theme.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/S2Theme.kt @@ -58,6 +58,8 @@ fun S2Theme( val motionScheme = remember { MotionScheme.expressive() } val context = LocalContext.current val targetScheme = if (dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + // M3 builds dynamic schemes from the wallpaper with no contrast-level hook, so they ship as + // the platform makes them; S2Contrast shapes the generated accent and artwork schemes only. if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) } else { remember(accent, darkTheme, contrast) { accentColorScheme(accent, darkTheme, contrast) } diff --git a/android/downloads/build.gradle.kts b/android/downloads/build.gradle.kts index 5df8149f14..e6d9354609 100644 --- a/android/downloads/build.gradle.kts +++ b/android/downloads/build.gradle.kts @@ -9,12 +9,12 @@ android { compileSdk = 37 defaultConfig { - minSdk = 24 + minSdk = 26 consumerProguardFiles("consumer-rules.pro") } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = "com.simplecityapps.shuttle.downloads" @@ -27,7 +27,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/fixtures/build.gradle.kts b/android/fixtures/build.gradle.kts index e05e906441..8b08592d41 100644 --- a/android/fixtures/build.gradle.kts +++ b/android/fixtures/build.gradle.kts @@ -11,12 +11,12 @@ android { compileSdk = 37 defaultConfig { - minSdk = 24 + minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = "com.simplecityapps.shuttle.fixtures" @@ -24,7 +24,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/imageloader/build.gradle b/android/imageloader/build.gradle index 89e7ab7532..a64d34e83f 100644 --- a/android/imageloader/build.gradle +++ b/android/imageloader/build.gradle @@ -7,13 +7,13 @@ android { compileSdk = 37 defaultConfig { - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion 36 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = 'com.simplecityapps.imageloading' @@ -21,7 +21,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 + jvmTarget = JvmTarget.JVM_21 } } diff --git a/android/mediaprovider/core/build.gradle.kts b/android/mediaprovider/core/build.gradle.kts index bd21484024..93910be342 100644 --- a/android/mediaprovider/core/build.gradle.kts +++ b/android/mediaprovider/core/build.gradle.kts @@ -21,9 +21,9 @@ kotlin { enable = true } - // As before the conversion, for the Android modules that depend on it + // All Android modules target JVM 21 (unified Sept 2026) compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/mediaprovider/core/src/androidMain/kotlin/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt b/android/mediaprovider/core/src/androidMain/kotlin/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt index dcc0b0f22a..68bcd14f8d 100644 --- a/android/mediaprovider/core/src/androidMain/kotlin/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt +++ b/android/mediaprovider/core/src/androidMain/kotlin/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt @@ -17,6 +17,7 @@ import dev.zacsweers.metro.AssistedInject import dev.zacsweers.metro.ContributesIntoMap import dev.zacsweers.metro.binding import java.util.concurrent.TimeUnit +import kotlin.random.Random class MediaImportWorker @AssistedInject @@ -39,6 +40,9 @@ constructor( companion object { private const val TAG_MEDIA_IMPORT = "MEDIA_IMPORT" + private const val INITIAL_DELAY_MINUTES = 15L + private const val INITIAL_DELAY_JITTER_MINUTES = 16L + /** * Enqueues or removes work, depending on the [ImportFrequency] */ @@ -54,11 +58,14 @@ constructor( .setConstraints( Constraints.Builder() .setRequiresBatteryNotLow(true) - .setRequiresDeviceIdle(true) + .setRequiresStorageNotLow(true) .build() ) .addTag(TAG_MEDIA_IMPORT) - .setInitialDelay(importFrequency.intervalInDays(), TimeUnit.DAYS) + // A short staggered delay instead of a full interval: the idle constraint is gone (it + // never fires under Doze), so the first run lands soon after the setting changes without + // every install that flips it at once scanning at the same wall-clock time. + .setInitialDelay(INITIAL_DELAY_MINUTES + Random.nextLong(INITIAL_DELAY_JITTER_MINUTES), TimeUnit.MINUTES) .build() WorkManager.getInstance(context).enqueueUniquePeriodicWork( diff --git a/android/mediaprovider/local/src/androidHostTest/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibIncrementalScanTest.kt b/android/mediaprovider/local/src/androidHostTest/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibIncrementalScanTest.kt new file mode 100644 index 0000000000..e4139d4a49 --- /dev/null +++ b/android/mediaprovider/local/src/androidHostTest/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibIncrementalScanTest.kt @@ -0,0 +1,121 @@ +package com.simplecityapps.localmediaprovider.local.provider.taglib + +import com.simplecityapps.shuttle.model.MediaProviderType +import com.simplecityapps.shuttle.model.Song +import io.kotest.matchers.shouldBe +import kotlin.time.Instant +import org.junit.Test + +class TaglibIncrementalScanTest { + @Test + fun `an unchanged file emits its stored song, keeping its id, play count and artwork version`() { + val stored = storedSong() + val file = audioFile() + + file.unchangedSong(mapOf(stored.path to stored)) shouldBe stored + } + + @Test + fun `a file with no stored song is parsed`() { + audioFile().unchangedSong(emptyMap()) shouldBe null + } + + @Test + fun `a file with another path is parsed`() { + val stored = storedSong() + + audioFile(path = "/storage/emulated/0/Music/other.mp3").unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + @Test + fun `a modified file is parsed`() { + val stored = storedSong() + + audioFile(lastModified = stored.lastModified.epochSeconds * 1000 + 60_000) + .unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + @Test + fun `a resized file is parsed`() { + val stored = storedSong() + + audioFile(size = stored.size + 1).unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + @Test + fun `a file whose duration changed is parsed`() { + val stored = storedSong() + + // Same second-granularity date and size, but a different song: the duration catches the swap + audioFile(duration = stored.duration.toLong() + 30_000).unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + @Test + fun `a duration within MediaStore rounding of the stored one still matches`() { + val stored = storedSong() + + audioFile(duration = stored.duration.toLong() + 500).unchangedSong(mapOf(stored.path to stored)) shouldBe stored + } + + @Test + fun `a file MediaStore couldn't read a duration for matches on date and size`() { + val stored = storedSong() + + audioFile(duration = null).unchangedSong(mapOf(stored.path to stored)) shouldBe stored + } + + @Test + fun `a stored song with no modified date is parsed`() { + val stored = storedSong(lastModified = null) + + audioFile().unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + private fun audioFile( + path: String = "/storage/emulated/0/Music/Album/01 Song.flac", + size: Long = 2_048L, + lastModified: Long = 1_700_000_000_000L, + duration: Long? = 185_000L + ) = MediaStoreAudioFile( + id = 7, + path = path, + displayName = "01 Song.flac", + size = size, + lastModified = lastModified, + mimeType = "audio/flac", + duration = duration + ) + + private fun storedSong(lastModified: Instant? = Instant.fromEpochMilliseconds(1_700_000_000_000L)) = Song( + id = 42, + name = "Song", + albumArtist = "Artist", + artists = listOf("Artist"), + album = "Album", + track = 1, + disc = 1, + duration = 185_000, + date = null, + genres = emptyList(), + path = "/storage/emulated/0/Music/Album/01 Song.flac", + size = 2_048L, + mimeType = "audio/flac", + lastModified = lastModified, + lastPlayed = null, + lastCompleted = null, + playCount = 17, + playbackPosition = 0, + blacklisted = false, + externalId = null, + mediaProvider = MediaProviderType.Shuttle, + replayGainTrack = null, + replayGainAlbum = null, + lyrics = null, + grouping = null, + bitRate = null, + bitDepth = null, + sampleRate = null, + channelCount = null, + artworkVersion = "artwork-v1" + ) +} diff --git a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/MediaStoreAudioFiles.kt b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/MediaStoreAudioFiles.kt index 5dac2fa129..3c8fd5821f 100644 --- a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/MediaStoreAudioFiles.kt +++ b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/MediaStoreAudioFiles.kt @@ -6,6 +6,9 @@ import android.net.Uri import android.provider.MediaStore import androidx.core.database.getLongOrNull import androidx.core.database.getStringOrNull +import com.simplecityapps.shuttle.model.Song +import kotlin.math.abs +import kotlin.time.Instant /** * An audio file MediaStore has indexed. The TagLib scanner finds files this way and reads their tags through [contentUri], @@ -69,3 +72,26 @@ internal fun Cursor.readMediaStoreAudioFiles(folderFilter: FolderFilter): List): Song? { + val existing = existingByPath[path] ?: return null + if (existing.lastModified != Instant.fromEpochMilliseconds(lastModified)) return null + if (existing.size != size) return null + val fileDuration = duration ?: return existing + if (abs(existing.duration.toLong() - fileDuration) > DURATION_TOLERANCE_MS) return null + return existing +} + +private const val DURATION_TOLERANCE_MS = 1_000L diff --git a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt index f8f7819eef..7124cbba65 100644 --- a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt +++ b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt @@ -67,13 +67,15 @@ class TaglibMediaProvider( } val files = mediaStoreFiles.orEmpty() val total = files.size + extraDocuments.size + // Songs already in the library, so files that haven't changed since the last import skip TagLib + val existingByPath = existingSongs.associateBy { song -> song.path } val filesWithImages = withContext(Dispatchers.IO) { val folderImageReader = FolderImageReader(sharedStorageListsImages = Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) files.map { file -> file to folderImageReader.imagesNear(file.path) } } val songs = mutableListOf() - merge(getSongs(filesWithImages), getExtraSongs(extraDocuments)) + merge(getSongs(filesWithImages, existingByPath), getExtraSongs(extraDocuments)) .collectIndexed { index, song -> emit( FlowEvent.Progress( @@ -128,6 +130,9 @@ class TaglibMediaProvider( /** * The audio documents in the extra folders that MediaStore didn't already list (by [knownPaths], lowercased), and * that no excluded folder covers. + * + * DocumentsProvider offers no ContentObserver: nothing notifies the app when these folders change, so they are + * only picked up by a manual or scheduled scan, never by the MediaStore observer. */ private suspend fun findExtraDocuments( folders: ScannerFolders, @@ -163,10 +168,15 @@ class TaglibMediaProvider( fileScanner.getAudioFile(context, kTagLib, node.uri)?.toSong(type, emptyList()) }.mapNotNull { it } - private fun getSongs(files: List>>): Flow = files + private fun getSongs( + files: List>>, + existingByPath: Map + ): Flow = files .asFlow() .concurrentMap((Runtime.getRuntime().availableProcessors() - 1).coerceAtLeast(1)) { (file, folderImages) -> - readAudioFile(file)?.toSong(type, folderImages) + // An unchanged file keeps its stored row as-is: no FD open, no TagLib parse. The stored song carries + // the library id, play counts and artwork version, which a fresh parse would zero out before the diff. + file.unchangedSong(existingByPath) ?: readAudioFile(file)?.toSong(type, folderImages) }.mapNotNull { it } private suspend fun readAudioFile(file: MediaStoreAudioFile): AudioFile? = withContext(Dispatchers.IO) { diff --git a/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt b/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt index 7385282297..9e8dc19138 100644 --- a/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt +++ b/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt @@ -134,6 +134,20 @@ abstract class SongDataDao { lastPlayed: Instant = Clock.System.now() ) + /** + * Writes a merged backup row (see LibraryBackupManager): every stat column at once. Used only by + * library-backup restore, never by the scanner, so rescan semantics are untouched. + */ + @Query("UPDATE songs SET playCount = :playCount, lastPlayed = :lastPlayed, lastCompleted = :lastCompleted, playbackPosition = :playbackPosition, dateAdded = :dateAdded WHERE id = :id") + abstract suspend fun restoreStats( + id: Long, + playCount: Int, + lastPlayed: Instant?, + lastCompleted: Instant?, + playbackPosition: Int, + dateAdded: Instant? + ) + /** [updatePlaybackPosition] and incrementing the play count as one write, for a track playing through to its end. */ @Query("UPDATE songs SET playbackPosition = :playbackPosition, lastPlayed = :now, playCount = (SELECT songs.playCount + 1), lastCompleted = :now WHERE id =:id") abstract suspend fun recordPlayedThrough( @@ -166,6 +180,14 @@ abstract class SongDataDao { @Query("UPDATE songs SET favouritedAt = NULL WHERE id IN (:ids)") abstract suspend fun unfavourite(ids: List): Int + /** + * Sets [id]'s favourite time to exactly [favouritedAt] (null clears it). Used only by + * library-backup restore, which overwrites the backup's snapshot; normal favourite flows keep + * their NULL-guarded queries and `pending_favourites` handling. + */ + @Query("UPDATE songs SET favouritedAt = :favouritedAt WHERE id = :id") + abstract suspend fun setFavouritedAt(id: Long, favouritedAt: Instant?) + /** * [favourite] or [unfavourite] [songs], in chunks, as SQLite before 3.32 (below API 31) binds at most 999 variables a * statement. A song that already carries a [Song.favouritedAt] (an Undo restoring one just removed) is set to that diff --git a/android/networking/build.gradle.kts b/android/networking/build.gradle.kts index f5a2626efc..2ee6b360ae 100644 --- a/android/networking/build.gradle.kts +++ b/android/networking/build.gradle.kts @@ -12,9 +12,9 @@ kotlin { namespace = "com.simplecityapps.networking" // OkHttp's Android artifact compiles against 37, which its consumers must match compileSdk = 37 - // :android:trial still builds for JVM 11 and inlines NetworkResult.map, which can't inline JVM 17 bytecode + // All Android modules target JVM 21 (unified Sept 2026) compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/playback/build.gradle b/android/playback/build.gradle index 8c1895d770..211098227e 100644 --- a/android/playback/build.gradle +++ b/android/playback/build.gradle @@ -8,13 +8,13 @@ android { compileSdk = 37 defaultConfig { - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion 36 consumerProguardFiles("consumer-rules.pro") } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = 'com.simplecityapps.playback' @@ -30,7 +30,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 + jvmTarget = JvmTarget.JVM_21 optIn.add('kotlin.time.ExperimentalTime') } } diff --git a/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/shell/ShellTab.kt b/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/shell/ShellTab.kt index cb1afae66f..c51566f259 100644 --- a/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/shell/ShellTab.kt +++ b/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/shell/ShellTab.kt @@ -5,4 +5,5 @@ enum class ShellTab { Home, Library, Search, + Settings, } diff --git a/android/saf/build.gradle b/android/saf/build.gradle index eb72f0d3f1..3cc708a9f2 100644 --- a/android/saf/build.gradle +++ b/android/saf/build.gradle @@ -8,14 +8,14 @@ android { compileSdk = 37 defaultConfig { - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion 36 consumerProguardFiles 'consumer-rules.pro' } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } @@ -24,7 +24,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 + jvmTarget = JvmTarget.JVM_21 } } diff --git a/android/scrobbling/build.gradle.kts b/android/scrobbling/build.gradle.kts index b471e43423..bdf96e37c4 100644 --- a/android/scrobbling/build.gradle.kts +++ b/android/scrobbling/build.gradle.kts @@ -17,12 +17,12 @@ android { compileSdk = 37 defaultConfig { - minSdk = 24 + minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } testOptions { @@ -36,7 +36,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/trial/build.gradle b/android/trial/build.gradle index 220b4e7e2b..aaa2852d06 100644 --- a/android/trial/build.gradle +++ b/android/trial/build.gradle @@ -9,15 +9,15 @@ android { compileSdk = 37 defaultConfig { - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion 36 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = 'com.simplecityapps.trial' @@ -26,7 +26,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 + jvmTarget = JvmTarget.JVM_21 optIn.add('kotlin.time.ExperimentalTime') } } diff --git a/buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts b/buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts index 60ec912022..f473e22d77 100644 --- a/buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts +++ b/buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts @@ -8,7 +8,7 @@ plugins { } kotlin { - jvmToolchain(17) + jvmToolchain(21) compilerOptions { freeCompilerArgs.add("-Xexpect-actual-classes") @@ -16,7 +16,7 @@ kotlin { android { compileSdk = 36 - minSdk = 24 + minSdk = 26 // Runs commonTest (and androidHostTest) on the JVM, as testDebugUnitTest does for Android modules. AGP allows // one host test component, so it's configured here for every module: with the Android resources and assets // Robolectric tests read (the Room migration tests load the exported schemas as assets). diff --git a/docs/design/design-language.md b/docs/design/design-language.md index 7cd049970f..e12196bdb9 100644 --- a/docs/design/design-language.md +++ b/docs/design/design-language.md @@ -75,8 +75,9 @@ screens never see it. - **Shape scale** from `Shapes` with the Expressive tokens (`largeIncreased`, `extraLargeIncreased`, `extraExtraLarge`). Components take their default shape; overrides go through `S2Theme.shapes`, not inline `RoundedCornerShape`s. -- **`MaterialShapes` (the 35 polygon shapes) are for non-content only**: artwork placeholders, - icon containers (settings, empty states), the loading indicator, the favourite toggle. Album +- **`MaterialShapes` (the 35 polygon shapes) are for non-content only**: icon containers + (settings, empty states), the loading indicator, the favourite toggle. Artwork placeholders are + flat — the media type's bare icon on the tile, no novelty container. Album artwork is always a rounded rectangle and artist images a circle: art is square and a novelty mask crops it. The one exception is an option for playlist art (a user image or a mosaic, never an album cover): `ArtworkShape.Scalloped`, a `Cookie12Sided` mask. Text never sits in a novelty shape. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ad7845be30..9b7cb4af38 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ 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 diff --git a/k8s/.gitignore b/k8s/.gitignore new file mode 100644 index 0000000000..a211ec9e95 --- /dev/null +++ b/k8s/.gitignore @@ -0,0 +1,4 @@ +.cache-remote/ +.workspace/ +.cache/ +.artifacts/ diff --git a/k8s/Dockerfile b/k8s/Dockerfile new file mode 100644 index 0000000000..4350eec9d4 --- /dev/null +++ b/k8s/Dockerfile @@ -0,0 +1,49 @@ +# Toolchain image for building Shuttle2 as one-shot Jobs. +# Mirrors the OffBookPlus builder: Temurin JDK 21 + Android SDK (API 37). +# Used only by clusters WITH a container runtime to build images +# (docker/colima). Clusters without one (e.g. remote k3s) should use +# k8s/scripts/build-remote.sh, which bootstraps the SDK at Job runtime +# from eclipse-temurin:21-jdk-noble and needs no image build. +# +# Shuttle2 needs: compileSdk 37, AGP 9.4.1, Gradle 9.7.x, JDK 21. +# No NDK: the KMP iOS targets are not built by :android:app:assembleDebug. + +FROM eclipse-temurin:21-jdk-noble + +ENV ANDROID_HOME=/opt/android-sdk \ + CMDLINE_TOOLS_VERSION=13114758 +ENV PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}" + +RUN apt-get update \ + && apt-get install -y --no-install-recommends unzip curl ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p "${ANDROID_HOME}/cmdline-tools" \ + && curl -fsSL -o /tmp/cmdline-tools.zip \ + "https://dl.google.com/android/repository/commandlinetools-linux-${CMDLINE_TOOLS_VERSION}_latest.zip" \ + && unzip -q /tmp/cmdline-tools.zip -d "${ANDROID_HOME}/cmdline-tools" \ + && mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest" \ + && rm /tmp/cmdline-tools.zip + +RUN yes | sdkmanager --licenses > /dev/null \ + && sdkmanager --install \ + "platform-tools" \ + "platforms;android-37.0" \ + "platforms;android-37.1" \ + "build-tools;37.0.0" \ + > /dev/null \ + && yes | sdkmanager --licenses > /dev/null + +# aapt2 is x86_64-only; on arm64 hosts it runs through qemu-user, which needs +# the amd64 loader/libs. Last heavy layer so refreshes skip SDK downloads. +RUN dpkg --add-architecture amd64 \ + && sed -i 's/^Types: deb$/Types: deb\nArchitectures: arm64/' /etc/apt/sources.list.d/ubuntu.sources \ + && echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble main universe" > /etc/apt/sources.list.d/amd64.list \ + && echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble-updates main universe" >> /etc/apt/sources.list.d/amd64.list \ + && apt-get update \ + && apt-get install -y --no-install-recommends libc6:amd64 libstdc++6:amd64 zlib1g:amd64 \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /workspace + +CMD ["bash"] diff --git a/k8s/README.md b/k8s/README.md new file mode 100644 index 0000000000..82a8a75665 --- /dev/null +++ b/k8s/README.md @@ -0,0 +1,40 @@ +# Shuttle2 k8s builders + +Two flows, same Gradle tasks: + +| Flow | Needs on this host | Cluster needs | Use when | +|---|---|---|---| +| `scripts/build-remote.sh` | `kubectl` + tar only | internet, `local-path` storage | remote k3s without docker (current setup) | +| `Dockerfile` + image | docker (or colima) | image visible to k3s | iterating often; SDK baked, no bootstrap | + +## build-remote.sh (current default) + +```bash +# debug APK (first run bootstraps SDK ~500MB + Gradle dist into the PVC cache) +./k8s/scripts/build-remote.sh --task :android:app:assembleDebug + +# reuse workspace already on the PVC (skip the tar+cp) +./k8s/scripts/build-remote.sh --task :android:app:assembleDebug --no-sync + +# unit tests / lint +./k8s/scripts/build-remote.sh --task :android:app:testDebugUnitTest +./k8s/scripts/build-remote.sh --task :android:app:lintDebug +``` + +State: namespace `shuttle-build`, PVC `shuttle-build-cache` (25Gi, `local-path`) +holding `sdk/`, `gradle/`, `workspace/`. Override via `k8s/config.env` +(`KUBE_CONTEXT`, `NAMESPACE`, `CACHE_SIZE`, task, CPU/mem). APKs land back in +`android/app/build/outputs/`; full log in `k8s/.cache-remote/last-build.log`. + +Ported from OffBookPlus `k8s/` (colima+docker+rsync flow), adapted for a +remote cluster: no colima (`ensure_cluster` dropped), no rsync (tar + +`kubectl cp` via a seed pod), no prebuilt image (SDK bootstraps at runtime +from `eclipse-temurin:21-jdk-noble` — internet confirmed from the cluster). +The image's JDK 21 satisfies the Gradle toolchain (`languageVersion=21`) via auto-detection, so no separate JDK provisioning is needed. + +## Dockerfile + +For docker-capable hosts: `docker build -f k8s/Dockerfile -t +localhost/shuttle-android-builder:jdk21 .` then run the build Job against it +(skips the ~5min SDK bootstrap). Same SDK set as OffBookPlus (API +37.0+37.1, build-tools 37.0.0, JDK 21) matching `compileSdk 37`. diff --git a/k8s/config.env b/k8s/config.env new file mode 100644 index 0000000000..f597691e45 --- /dev/null +++ b/k8s/config.env @@ -0,0 +1,34 @@ +# Shared configuration for the Shuttle2 k8s one-shot builders. +# Sourced by every script in k8s/scripts/. Override per call, e.g.: +# NAMESPACE=shuttle-build ./build-remote.sh --task :android:app:assembleDebug + +# --- cluster --------------------------------------------------------------- +# kubeconfig context. OffBookPlus scripts default to colima; this cluster is +# a standalone k3s, so the default here is the current context (empty = kubectl default). +KUBE_CONTEXT="${KUBE_CONTEXT:-}" +NAMESPACE="${NAMESPACE:-shuttle-build}" +KUBECTL="${KUBECTL:-kubectl}" + +# --- images ---------------------------------------------------------------- +# Prebuilt toolchain (k8s/Dockerfile). Only needed for build.sh (docker flow). +IMAGE="${IMAGE:-localhost/shuttle-android-builder:jdk21}" +# Base image for build-remote.sh (SDK bootstrapped at runtime, no image build). +REMOTE_BASE_IMAGE="${REMOTE_BASE_IMAGE:-eclipse-temurin:21-jdk-noble}" +SEED_IMAGE="${SEED_IMAGE:-alpine:3.21}" + +# --- persistent cache ------------------------------------------------------ +# One RWO PVC (local-path) holds sdk/, gradle/ and workspace/ across builds. +CACHE_PVC="${CACHE_PVC:-shuttle-build-cache}" +CACHE_SIZE="${CACHE_SIZE:-25Gi}" + +# --- build job ------------------------------------------------------------- +# Default builds both: debug for iteration, release (minified, debug-signed on +# this builder) because debug builds can be laggy on device. +GRADLE_TASK="${GRADLE_TASK:-:android:app:assembleDebug :android:app:assembleRelease}" +JOB_CPU_LIMIT="${JOB_CPU_LIMIT:-4}" +JOB_MEM_LIMIT="${JOB_MEM_LIMIT:-10000Mi}" +GRADLE_OPTS_VALUE="${GRADLE_OPTS_VALUE:--Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.compiler.execution.strategy=in-process -Dorg.gradle.workers.max=2}" +JOB_DEADLINE_SECONDS="${JOB_DEADLINE_SECONDS:-3000}" + +# --- app ------------------------------------------------------------------- +APP_ID="${APP_ID:-com.simplecityapps.shuttle}" diff --git a/k8s/scripts/build-remote.sh b/k8s/scripts/build-remote.sh new file mode 100755 index 0000000000..4cd799326e --- /dev/null +++ b/k8s/scripts/build-remote.sh @@ -0,0 +1,169 @@ +#!/usr/bin/env bash +# Build Shuttle2 on a remote k3s cluster (no docker/colima/rsync/java needed +# on this host) as a one-shot Job. +# +# Flow: ensure ns+PVC -> seed pod -> kubectl cp sources in -> delete seed -> +# apply build Job (SDK bootstraps into PVC on first run, Gradle caches) -> +# stream logs -> kubectl cp APKs back. +# +# Usage: ./build-remote.sh [options] [-- extra gradle args] +# -t, --task TASK Gradle task(s) (default: :android:app:assembleDebug) +# --namespace NS Build namespace (default: shuttle-build) +# --keep-job Do not delete the Job after success +# --no-sync Reuse workspace already on the PVC +# -h, --help +set -eo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +K8S_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" +REPO_ROOT="$(cd "$K8S_DIR/.." && pwd)" +# shellcheck disable=SC1091 +source "$K8S_DIR/config.env" + +TASK="$GRADLE_TASK" +NS="$NAMESPACE" +KEEP_JOB=0 +DO_SYNC=1 +EXTRA_ARGS=() + +while [ $# -gt 0 ]; do + case "$1" in + -t | --task) TASK="$2"; shift 2 ;; + --namespace) NS="$2"; shift 2 ;; + --keep-job) KEEP_JOB=1; shift ;; + --no-sync) DO_SYNC=0; shift ;; + --) shift; EXTRA_ARGS=("$@"); break ;; + -h | --help) sed -n '2,12p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;; + *) echo "error: unknown option: $1 (see --help)" >&2; exit 1 ;; + esac +done + +GRADLE_ARGS="$TASK ${EXTRA_ARGS[*]:-}" +GRADLE_ARGS="${GRADLE_ARGS% }" +# Forward the local git tag as version props: the PVC workspace ships without +# .git (714M), so getVersionFromGitTag() would fall back to 1/1.0.0. +if [[ "$GRADLE_ARGS" != *versionCode* ]]; then + VTAG="$(git -C "$REPO_ROOT" describe --tags --abbrev=0 --match 'v[0-9]*' 2>/dev/null || true)" + if [[ "$VTAG" =~ ^v([0-9]+)$ ]]; then + VCODE="${BASH_REMATCH[1]}" + VNAME="20${VCODE:0:2}.${VCODE:2:2}.${VCODE:4:2}" + GRADLE_ARGS="$GRADLE_ARGS -PversionCode=$VCODE -PversionName=$VNAME" + fi +fi +# Forward the local commit sha the same way: Settings > About shows it, so dev +# builds (one shared version name) are told apart on device. +if [[ "$GRADLE_ARGS" != *gitSha* ]]; then + GSHA="$(git -C "$REPO_ROOT" rev-parse --short HEAD 2>/dev/null || true)" + if [ -n "$GSHA" ]; then + GRADLE_ARGS="$GRADLE_ARGS -PGitSha=$GSHA" + fi +fi + +if [ -n "$KUBE_CONTEXT" ]; then CTX=(--context "$KUBE_CONTEXT"); else CTX=(); fi +kc() { "$KUBECTL" "${CTX[@]}" "$@"; } + +CACHE_DIR="$K8S_DIR/.cache-remote" +mkdir -p "$CACHE_DIR" + +render() { # template out KEY=val... + local template="$1" out="$2"; shift 2 + local rendered; rendered="$(cat "$template")" + local pair key val + for pair in "$@"; do key="${pair%%=*}"; val="${pair#*=}" + rendered="${rendered//__${key}__/${val}}"; done + printf '%s\n' "$rendered" > "$out" +} + +echo "==> namespace $NS" +kc get namespace "$NS" >/dev/null 2>&1 || kc create namespace "$NS" >/dev/null + +echo "==> PVC $CACHE_PVC ($CACHE_SIZE)" +if ! kc get pvc "$CACHE_PVC" -n "$NS" >/dev/null 2>&1; then + render "$K8S_DIR/templates/pvc.yaml" "$CACHE_DIR/pvc.yaml" \ + "PVC_NAME=$CACHE_PVC" "NAMESPACE=$NS" "CACHE_SIZE=$CACHE_SIZE" + kc apply -f "$CACHE_DIR/pvc.yaml" +fi + +if [ "$DO_SYNC" -eq 1 ]; then + SEED="seed-$(date +%Y%m%d-%H%M%S)-$RANDOM" + render "$K8S_DIR/templates/pod-seed.yaml" "$CACHE_DIR/$SEED.yaml" \ + "POD_NAME=$SEED" "NAMESPACE=$NS" "SEED_IMAGE=$SEED_IMAGE" "PVC_NAME=$CACHE_PVC" + echo "==> seed pod $SEED" + kc apply -f "$CACHE_DIR/$SEED.yaml" >/dev/null + kc wait --for=condition=Ready "pod/$SEED" -n "$NS" --timeout=180s >/dev/null + echo "==> copying sources (tar via kubectl cp)" + # kubectl cp needs a tar binary in the target; install it first. + kc exec "$SEED" -n "$NS" -- sh -c "apk add --no-cache tar > /dev/null 2>&1 || true; rm -rf /mnt/workspace; mkdir -p /mnt/workspace" + TAR="$CACHE_DIR/sources.tar" + tar -cf "$TAR" \ + --exclude=.git --exclude=.gradle --exclude=.kotlin --exclude=.idea \ + --exclude='*/build' --exclude=k8s/.cache-remote --exclude=k8s/.workspace \ + --exclude=local.properties --exclude=.DS_Store \ + -C "$REPO_ROOT" . + kc cp "$TAR" "$NS/$SEED:/mnt/sources.tar" >/dev/null + kc exec "$SEED" -n "$NS" -- sh -c "tar -xf /mnt/sources.tar -C /mnt/workspace && rm /mnt/sources.tar && echo 'sdk.dir=/mnt/sdk' > /mnt/workspace/local.properties && ls /mnt/workspace | head -5" + kc delete pod "$SEED" -n "$NS" --wait=true >/dev/null + rm -f "$TAR" "$CACHE_DIR/$SEED.yaml" +else + echo "==> reusing workspace on PVC (--no-sync)" +fi + +JOB="shuttle-build-$(date +%Y%m%d-%H%M%S)-$RANDOM" +render "$K8S_DIR/templates/job-build-remote.yaml" "$CACHE_DIR/$JOB.yaml" \ + "JOB_NAME=$JOB" "NAMESPACE=$NS" "DEADLINE=$JOB_DEADLINE_SECONDS" \ + "BASE_IMAGE=$REMOTE_BASE_IMAGE" "GRADLE_ARGS=$GRADLE_ARGS" \ + "GRADLE_OPTS_VALUE=$GRADLE_OPTS_VALUE" "CPU_LIMIT=$JOB_CPU_LIMIT" \ + "MEM_LIMIT=$JOB_MEM_LIMIT" "PVC_NAME=$CACHE_PVC" + +echo "==> job $JOB (task: $GRADLE_ARGS)" +kc apply -f "$CACHE_DIR/$JOB.yaml" >/dev/null + +echo "==> waiting for job completion (deadline ${JOB_DEADLINE_SECONDS}s)" +RC="" +START="$(date +%s)" +while true; do + SUCCEEDED="$(kc get job "$JOB" -n "$NS" -o jsonpath='{.status.succeeded}' 2>/dev/null || true)" + FAILED="$(kc get job "$JOB" -n "$NS" -o jsonpath='{.status.failed}' 2>/dev/null || true)" + if [ "$SUCCEEDED" = "1" ]; then RC=0; break; fi + if [ -n "$FAILED" ] && [ "$FAILED" != "0" ]; then RC=1; break; fi + NOW="$(date +%s)" + if [ $((NOW - START)) -ge "$JOB_DEADLINE_SECONDS" ]; then RC=124; break; fi + sleep 30 +done + +if [ $RC -eq 0 ]; then + echo "==> build succeeded; fetching APKs via seed pod" + OUT="$REPO_ROOT/android/app/build/outputs" + # The temurin build container has no tar, so kubectl cp from it fails: + # copy out through an alpine seed pod mounting the same PVC. + SEED="fetch-$(date +%Y%m%d-%H%M%S)-$RANDOM" + render "$K8S_DIR/templates/pod-seed.yaml" "$CACHE_DIR/$SEED.yaml" \ + "POD_NAME=$SEED" "NAMESPACE=$NS" "SEED_IMAGE=$SEED_IMAGE" "PVC_NAME=$CACHE_PVC" + kc apply -f "$CACHE_DIR/$SEED.yaml" >/dev/null + kc wait --for=condition=Ready "pod/$SEED" -n "$NS" --timeout=180s >/dev/null + kc exec "$SEED" -n "$NS" -- sh -c "apk add --no-cache tar >/dev/null 2>&1 || true" >/dev/null + mkdir -p "$OUT" + kc cp "$NS/$SEED:/mnt/workspace/android/app/build/outputs" "$OUT-tmp" >/dev/null + # Test-only runs produce no APK/AAB: never let an artifact-less fetch + # clobber a previous build's outputs. + if find "$OUT-tmp" -type f \( -name '*.apk' -o -name '*.aab' \) 2>/dev/null | grep -q .; then + rm -rf "$OUT"; mv "$OUT-tmp" "$OUT" + else + echo "warn: no apk/aab in fetched outputs; keeping previous $OUT" + rm -rf "$OUT-tmp" + fi + kc delete pod "$SEED" -n "$NS" --wait=false >/dev/null + rm -f "$CACHE_DIR/$SEED.yaml" + find "$OUT" -type f \( -name '*.apk' -o -name '*.aab' \) 2>/dev/null | head -10 + kc logs -n "$NS" -l job-name="$JOB" > "$CACHE_DIR/last-build.log" 2>/dev/null || true + [ "$KEEP_JOB" -eq 0 ] && kc delete job "$JOB" -n "$NS" >/dev/null + rm -f "$CACHE_DIR/$JOB.yaml" + echo "==> done" +else + if [ "$RC" = "124" ]; then echo "error: timed out after ${JOB_DEADLINE_SECONDS}s; job kept: $JOB" >&2 + else echo "error: build FAILED; job kept: $JOB" >&2; fi + echo "--- last 40 log lines ---" >&2 + kc logs -n "$NS" -l job-name="$JOB" --tail=40 2>/dev/null >&2 || true + echo " full logs: $KUBECTL -n $NS logs -l job-name=$JOB" >&2 + exit 1 +fi diff --git a/k8s/templates/job-build-remote.yaml b/k8s/templates/job-build-remote.yaml new file mode 100644 index 0000000000..65fb0927fa --- /dev/null +++ b/k8s/templates/job-build-remote.yaml @@ -0,0 +1,71 @@ +# One-shot Shuttle2 build. Sources + SDK + Gradle home all live on the cache +# PVC (seeded by build-remote.sh via the seed pod). The SDK bootstraps on +# first run (~500MB download, then cached); Gradle dist + deps cache in +# /mnt/gradle across builds. +apiVersion: batch/v1 +kind: Job +metadata: + name: __JOB_NAME__ + namespace: __NAMESPACE__ +spec: + activeDeadlineSeconds: __DEADLINE__ + backoffLimit: 0 + template: + spec: + restartPolicy: Never + containers: + - name: build + image: __BASE_IMAGE__ + command: + - bash + - -c + - | + set -e + export ANDROID_HOME=/mnt/sdk ANDROID_SDK_ROOT=/mnt/sdk GRADLE_USER_HOME=/mnt/gradle + # Pin HOME on the PVC so builder home-dir state (caches, tool prefs) + # survives one-shot pods. Debug signing does NOT rely on this: the + # debug build type signs with the checked-in android/app/debug.keystore, + # which is what keeps installs updating cleanly across builders. + export HOME=/mnt/home + mkdir -p "$HOME" + export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH" + if [ ! -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then + echo "==> bootstrapping Android SDK into PVC cache" + apt-get update -qq && apt-get install -y -qq --no-install-recommends unzip curl ca-certificates git > /dev/null + mkdir -p "$ANDROID_HOME/cmdline-tools" + curl -fsSL -o /tmp/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" + unzip -q /tmp/cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools" + mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest" + rm /tmp/cmdline-tools.zip + yes | sdkmanager --licenses > /dev/null + sdkmanager --install "platform-tools" "platforms;android-37.0" "platforms;android-37.1" "build-tools;37.0.0" > /dev/null + yes | sdkmanager --licenses > /dev/null + else + # git must exist even for cached SDK runs: app/build.gradle.kts + # shells out to `git describe` for versionCode/Name (falls back + # to 1/1.0.0 when there is no .git, but the binary must exist + # for the configuration cache to store the value). + command -v git >/dev/null || (apt-get update -qq && apt-get install -y -qq --no-install-recommends git > /dev/null) + fi + mkdir -p /mnt/gradle + cd /mnt/workspace + echo "local.properties:"; echo "sdk.dir=/mnt/sdk" > local.properties + echo "==> ./gradlew __GRADLE_ARGS__" + ./gradlew __GRADLE_ARGS__ --console=plain + env: + - name: GRADLE_OPTS + value: "__GRADLE_OPTS_VALUE__" + resources: + limits: + cpu: "__CPU_LIMIT__" + memory: "__MEM_LIMIT__" + requests: + cpu: "__CPU_LIMIT__" + memory: "__MEM_LIMIT__" + volumeMounts: + - name: cache + mountPath: /mnt + volumes: + - name: cache + persistentVolumeClaim: + claimName: __PVC_NAME__ diff --git a/k8s/templates/pod-seed.yaml b/k8s/templates/pod-seed.yaml new file mode 100644 index 0000000000..d0a2ed6875 --- /dev/null +++ b/k8s/templates/pod-seed.yaml @@ -0,0 +1,21 @@ +# Helper pod: a kubectl-cp target for syncing sources into the cache PVC. +# build-remote.sh creates it, copies the repo in, then deletes it before +# applying the build Job (RWO volume, sequential use). +apiVersion: v1 +kind: Pod +metadata: + name: __POD_NAME__ + namespace: __NAMESPACE__ +spec: + restartPolicy: Never + containers: + - name: seed + image: __SEED_IMAGE__ + command: ["sh", "-c", "mkdir -p /mnt/workspace && sleep 3600"] + volumeMounts: + - name: cache + mountPath: /mnt + volumes: + - name: cache + persistentVolumeClaim: + claimName: __PVC_NAME__ diff --git a/k8s/templates/pvc.yaml b/k8s/templates/pvc.yaml new file mode 100644 index 0000000000..8a18898e77 --- /dev/null +++ b/k8s/templates/pvc.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: __PVC_NAME__ + namespace: __NAMESPACE__ +spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: __CACHE_SIZE__