From 33423fbbc0b108d4f3677cd852d2e642b0d8bcbd Mon Sep 17 00:00:00 2001 From: kalarina Date: Tue, 10 Nov 2026 16:06:36 +0200 Subject: [PATCH] Redesign UI: genre cards, search, station disc player and track history --- README.md | 3 +- .../fogwave/data/model/RadioStation.kt | 27 +- .../data/repository/RadioRepository.kt | 36 - .../fogwave/player/RadioPlayerManager.kt | 15 + .../fogwave/ui/components/EqualizerSheet.kt | 2 +- .../fogwave/ui/components/FavoritesPanel.kt | 87 +- .../fogwave/ui/components/GenreCards.kt | 193 ++++ .../fogwave/ui/components/MiniPlayer.kt | 125 +-- .../ui/components/MistyMountainBackground.kt | 53 - .../fogwave/ui/components/NowPlayingSheet.kt | 958 +++++++++--------- .../fogwave/ui/components/StationDisc.kt | 130 +++ .../fogwave/ui/components/StationItem.kt | 462 --------- .../fogwave/ui/components/StationRow.kt | 226 +++++ .../fogwave/ui/components/TopBrandBar.kt | 173 +++- .../ui/components/ViewOptionsPopover.kt | 292 ------ .../fogwave/ui/screens/HomeScreen.kt | 265 +++-- .../cc/skysparkle/fogwave/ui/theme/Color.kt | 47 +- .../fogwave/ui/viewmodel/RadioViewModel.kt | 89 +- .../res/drawable-nodpi/bg_misty_mountain.webp | Bin 64242 -> 0 bytes app/src/main/res/drawable-nodpi/ic_grid.webp | Bin 952 -> 0 bytes .../res/drawable-nodpi/ic_layout_columns.webp | Bin 678 -> 0 bytes .../res/drawable-nodpi/ic_layout_rows.webp | Bin 680 -> 0 bytes app/src/main/res/drawable-nodpi/ic_list.webp | Bin 922 -> 0 bytes app/src/main/res/drawable-nodpi/ic_table.webp | Bin 644 -> 0 bytes app/src/main/res/drawable/ic_close.xml | 12 + app/src/main/res/drawable/ic_music_note.xml | 13 + app/src/main/res/drawable/ic_search.xml | 12 + app/src/main/res/drawable/ic_share.xml | 12 + app/src/main/res/values-de/strings.xml | 28 +- app/src/main/res/values-ja/strings.xml | 27 +- app/src/main/res/values-lt/strings.xml | 30 +- app/src/main/res/values-ru/strings.xml | 30 +- app/src/main/res/values-zh/strings.xml | 27 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 28 +- ...hotTest.kt => StationRowScreenshotTest.kt} | 14 +- .../metadata/android/de/full_description.txt | 2 +- .../android/en-US/full_description.txt | 2 +- .../metadata/android/ja/full_description.txt | 2 +- .../metadata/android/lt/full_description.txt | 2 +- .../metadata/android/ru/full_description.txt | 2 +- .../android/zh-CN/full_description.txt | 2 +- 42 files changed, 1635 insertions(+), 1795 deletions(-) create mode 100644 app/src/main/java/cc/skysparkle/fogwave/ui/components/GenreCards.kt delete mode 100644 app/src/main/java/cc/skysparkle/fogwave/ui/components/MistyMountainBackground.kt create mode 100644 app/src/main/java/cc/skysparkle/fogwave/ui/components/StationDisc.kt delete mode 100644 app/src/main/java/cc/skysparkle/fogwave/ui/components/StationItem.kt create mode 100644 app/src/main/java/cc/skysparkle/fogwave/ui/components/StationRow.kt delete mode 100644 app/src/main/java/cc/skysparkle/fogwave/ui/components/ViewOptionsPopover.kt delete mode 100644 app/src/main/res/drawable-nodpi/bg_misty_mountain.webp delete mode 100644 app/src/main/res/drawable-nodpi/ic_grid.webp delete mode 100644 app/src/main/res/drawable-nodpi/ic_layout_columns.webp delete mode 100644 app/src/main/res/drawable-nodpi/ic_layout_rows.webp delete mode 100644 app/src/main/res/drawable-nodpi/ic_list.webp delete mode 100644 app/src/main/res/drawable-nodpi/ic_table.webp create mode 100644 app/src/main/res/drawable/ic_close.xml create mode 100644 app/src/main/res/drawable/ic_music_note.xml create mode 100644 app/src/main/res/drawable/ic_search.xml create mode 100644 app/src/main/res/drawable/ic_share.xml rename app/src/test/java/cc/skysparkle/fogwave/{StationItemScreenshotTest.kt => StationRowScreenshotTest.kt} (79%) diff --git a/README.md b/README.md index 1aa2a7a..91455dc 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,8 @@ - 🔄 **Auto-reconnect** when the stream drops or the network comes back - 🎚️ **Equalizer** with presets, loudness boost and dynamics processing - ❤️ **Favorites, recently played and similar stations** matched by genre -- 🗂️ **Four layouts** — list, table, tiles or icons, with adjustable size +- 🗂️ **Genre cards and search** to find a station in a tap +- 🎵 **Song titles and track history** for stations that broadcast them - 🌙 **Dark theme** - 🌍 **Six languages** — English, Russian, German, Japanese, Lithuanian and Chinese - 🔓 **No ads, no tracking, no accounts** diff --git a/app/src/main/java/cc/skysparkle/fogwave/data/model/RadioStation.kt b/app/src/main/java/cc/skysparkle/fogwave/data/model/RadioStation.kt index dd3e058..1f569bc 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/data/model/RadioStation.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/data/model/RadioStation.kt @@ -29,20 +29,6 @@ enum class Genre(@param:StringRes val labelRes: Int) { LATVIAN(R.string.genre_latvian) } -enum class ViewMode { - ICONS, - TILES, - LIST, - DETAILS -} - -enum class IconSizeStep(val sizeDp: Int) { - S(64), - M(96), - L(132), - XL(176) -} - enum class AppTab(@param:StringRes val titleRes: Int) { RADIO(R.string.tab_radio), FAVORITES(R.string.tab_favorites), @@ -50,7 +36,20 @@ enum class AppTab(@param:StringRes val titleRes: Int) { } enum class ExtraPlayerTab(@param:StringRes val titleRes: Int) { + HISTORY(R.string.extra_tab_history), RECENT(R.string.extra_tab_recent), SIMILAR(R.string.extra_tab_similar), INFO(R.string.extra_tab_info) } + +/** A song the station announced while it was playing during this session. */ +@Immutable +data class TrackEntry( + val stationId: String, + val title: String, + val startedAtMillis: Long +) { + /** Streams usually send "Artist - Title"; the halves are shown on separate lines. */ + val song: String get() = title.substringAfter(" - ", title).trim() + val artist: String? get() = title.substringBefore(" - ", "").trim().ifEmpty { null } +} diff --git a/app/src/main/java/cc/skysparkle/fogwave/data/repository/RadioRepository.kt b/app/src/main/java/cc/skysparkle/fogwave/data/repository/RadioRepository.kt index ac55edc..08c6954 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/data/repository/RadioRepository.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/data/repository/RadioRepository.kt @@ -4,9 +4,7 @@ import android.content.Context import androidx.core.content.edit import cc.skysparkle.fogwave.R import cc.skysparkle.fogwave.data.model.Genre -import cc.skysparkle.fogwave.data.model.IconSizeStep import cc.skysparkle.fogwave.data.model.RadioStation -import cc.skysparkle.fogwave.data.model.ViewMode import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow @@ -158,12 +156,6 @@ class RadioRepository(context: Context) { private val _recentsFlow = MutableStateFlow>(loadRecents()) val recentsFlow: StateFlow> = _recentsFlow.asStateFlow() - private val _viewModeFlow = MutableStateFlow(loadViewMode()) - val viewModeFlow: StateFlow = _viewModeFlow.asStateFlow() - - private val _sizeStepFlow = MutableStateFlow(loadSizeStep()) - val sizeStepFlow: StateFlow = _sizeStepFlow.asStateFlow() - private val _seenFavoritesFlow = MutableStateFlow(loadSeenFavorites()) val seenFavoritesFlow: StateFlow> = _seenFavoritesFlow.asStateFlow() @@ -262,34 +254,6 @@ class RadioRepository(context: Context) { prefs.edit { putString("recents", arr.toString()) } } - private fun loadViewMode(): ViewMode { - val mode = prefs.getString("view_mode", ViewMode.ICONS.name) ?: ViewMode.ICONS.name - return try { - ViewMode.valueOf(mode) - } catch (_: Exception) { - ViewMode.ICONS - } - } - - fun setViewMode(mode: ViewMode) { - _viewModeFlow.value = mode - prefs.edit { putString("view_mode", mode.name) } - } - - private fun loadSizeStep(): IconSizeStep { - val step = prefs.getString("size_step", IconSizeStep.M.name) ?: IconSizeStep.M.name - return try { - IconSizeStep.valueOf(step) - } catch (_: Exception) { - IconSizeStep.M - } - } - - fun setSizeStep(step: IconSizeStep) { - _sizeStepFlow.value = step - prefs.edit { putString("size_step", step.name) } - } - fun hasSeenBatteryOptimizationPrompt(): Boolean { return prefs.getBoolean("seen_battery_optimization_prompt", false) } diff --git a/app/src/main/java/cc/skysparkle/fogwave/player/RadioPlayerManager.kt b/app/src/main/java/cc/skysparkle/fogwave/player/RadioPlayerManager.kt index 98ab258..53ed063 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/player/RadioPlayerManager.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/player/RadioPlayerManager.kt @@ -30,6 +30,10 @@ class RadioPlayerManager(private val context: Context) { private val _currentMediaId = MutableStateFlow(null) val currentMediaId: StateFlow = _currentMediaId.asStateFlow() + /** Song announced by the stream (ICY / ID3 metadata), or null when the station sends none. */ + private val _nowPlayingTitle = MutableStateFlow(null) + val nowPlayingTitle: StateFlow = _nowPlayingTitle.asStateFlow() + private var currentStation: RadioStation? = null private var pendingStation: RadioStation? = null @@ -41,6 +45,7 @@ class RadioPlayerManager(private val context: Context) { override fun onEvents(player: Player, events: Player.Events) { _playerState.value = deriveState(player) _currentMediaId.value = player.currentMediaItem?.mediaId + _nowPlayingTitle.value = streamTitle(player) } override fun onPlayerError(error: PlaybackException) { @@ -85,6 +90,7 @@ class RadioPlayerManager(private val context: Context) { } else { _playerState.value = deriveState(c) _currentMediaId.value = c.currentMediaItem?.mediaId + _nowPlayingTitle.value = streamTitle(c) } } catch (e: Exception) { Log.e(TAG, "Failed to connect to FogwavePlaybackService", e) @@ -125,6 +131,14 @@ class RadioPlayerManager(private val context: Context) { } } + // Stream metadata replaces the item's own title; the station name itself is not a song. + private fun streamTitle(p: Player): String? { + val title = p.mediaMetadata.title?.toString()?.trim() + if (title.isNullOrEmpty()) return null + if (title == p.currentMediaItem?.mediaMetadata?.title?.toString()?.trim()) return null + return title + } + private fun errorMessage(error: PlaybackException): String = context.getString( when (error.errorCode) { PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED, @@ -144,6 +158,7 @@ class RadioPlayerManager(private val context: Context) { return } _playerState.value = PlayerState.Connecting + _nowPlayingTitle.value = null try { c.setMediaItem(station.toMediaItem(context)) c.prepare() diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/EqualizerSheet.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/EqualizerSheet.kt index c9fb381..07df835 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/EqualizerSheet.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/EqualizerSheet.kt @@ -101,7 +101,7 @@ fun EqualizerSheet( text = if (audioEffects.equalizerEnabled) stringResource(R.string.equalizer_on) else stringResource(R.string.equalizer_off), style = MaterialTheme.typography.labelMedium.copy( fontWeight = FontWeight.Bold, - color = if (audioEffects.equalizerEnabled) LocalGeoColors.current.liveGreen else LocalGeoColors.current.onSurfaceVariant + color = if (audioEffects.equalizerEnabled) LocalGeoColors.current.primary else LocalGeoColors.current.onSurfaceVariant ), modifier = Modifier.padding(end = 6.dp) ) diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/FavoritesPanel.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/FavoritesPanel.kt index 295ba23..5309707 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/FavoritesPanel.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/FavoritesPanel.kt @@ -15,9 +15,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.grid.GridCells -import androidx.compose.foundation.lazy.grid.LazyVerticalGrid -import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape @@ -33,6 +30,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.shadow import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign @@ -40,9 +38,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import cc.skysparkle.fogwave.R -import cc.skysparkle.fogwave.data.model.IconSizeStep import cc.skysparkle.fogwave.data.model.RadioStation -import cc.skysparkle.fogwave.data.model.ViewMode import cc.skysparkle.fogwave.ui.theme.LocalGeoColors @Composable @@ -50,8 +46,6 @@ fun FavoritesPanel( favorites: List, currentStation: RadioStation?, isPlaying: Boolean, - viewMode: ViewMode, - sizeStep: IconSizeStep, onSelectStation: (RadioStation) -> Unit, onBrowseStations: () -> Unit, modifier: Modifier = Modifier, @@ -66,68 +60,27 @@ fun FavoritesPanel( return } - StationCollection( - stations = favorites, - currentStation = currentStation, - isPlaying = isPlaying, - viewMode = viewMode, - sizeStep = sizeStep, - onSelectStation = onSelectStation, - bottomContentPadding = bottomContentPadding, + LazyColumn( + contentPadding = PaddingValues(start = 10.dp, end = 10.dp, top = 8.dp, bottom = bottomContentPadding), + verticalArrangement = Arrangement.spacedBy(2.dp), modifier = modifier - ) -} - -/** The station grid (Icons mode) or list (other modes), shared by the Radio and Favorites tabs. */ -@Composable -fun StationCollection( - stations: List, - currentStation: RadioStation?, - isPlaying: Boolean, - viewMode: ViewMode, - sizeStep: IconSizeStep, - onSelectStation: (RadioStation) -> Unit, - bottomContentPadding: Dp, - modifier: Modifier = Modifier -) { - val contentPadding = PaddingValues(start = 20.dp, end = 20.dp, top = 8.dp, bottom = bottomContentPadding) - when (viewMode) { - ViewMode.ICONS -> LazyVerticalGrid( - columns = GridCells.Adaptive((sizeStep.sizeDp + 16).dp), - horizontalArrangement = Arrangement.spacedBy(12.dp), - verticalArrangement = Arrangement.spacedBy(14.dp), - contentPadding = contentPadding, - modifier = modifier - ) { - items(stations, key = { it.id }) { station -> - val isCur = station.id == currentStation?.id - StationItem( - station = station, - isCurrent = isCur, - isPlaying = isCur && isPlaying, - viewMode = viewMode, - sizeStep = sizeStep, - onClick = { onSelectStation(station) } - ) - } + ) { + item(key = "header") { + SectionHeader( + title = stringResource(R.string.tab_favorites), + trailing = pluralStringResource(R.plurals.station_count, favorites.size, favorites.size), + modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 8.dp) + ) } - - ViewMode.TILES, ViewMode.LIST, ViewMode.DETAILS -> LazyColumn( - contentPadding = contentPadding, - verticalArrangement = Arrangement.spacedBy(8.dp), - modifier = modifier - ) { - items(stations, key = { it.id }) { station -> - val isCur = station.id == currentStation?.id - StationItem( - station = station, - isCurrent = isCur, - isPlaying = isCur && isPlaying, - viewMode = viewMode, - sizeStep = sizeStep, - onClick = { onSelectStation(station) } - ) - } + items(favorites, key = { it.id }) { station -> + val isCur = station.id == currentStation?.id + StationRow( + station = station, + isCurrent = isCur, + isPlaying = isCur && isPlaying, + onClick = { onSelectStation(station) }, + modifier = Modifier.animateItem() + ) } } } diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/GenreCards.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/GenreCards.kt new file mode 100644 index 0000000..cd1837c --- /dev/null +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/GenreCards.kt @@ -0,0 +1,193 @@ +package cc.skysparkle.fogwave.ui.components + +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.border +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.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shadow +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.selected +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import cc.skysparkle.fogwave.R +import cc.skysparkle.fogwave.data.model.Genre +import cc.skysparkle.fogwave.data.model.RadioStation +import cc.skysparkle.fogwave.ui.theme.LocalGeoColors + +/** Two glow colors per card; null is the "All stations" card. */ +private fun genrePalette(genre: Genre?): Pair = when (genre) { + null -> Color(0xFF3466F6) to Color(0xFF8E5CFF) + Genre.HITS -> Color(0xFFFF3D8B) to Color(0xFF7A3CFF) + Genre.POP -> Color(0xFFB04DFF) to Color(0xFF3FA9FF) + Genre.DANCE -> Color(0xFF00D1FF) to Color(0xFFB13CFF) + Genre.OLDIES -> Color(0xFFFFB13D) to Color(0xFFD9488A) + Genre.ROCK -> Color(0xFFFF5640) to Color(0xFF5B1FA8) + Genre.EASY_LISTENING -> Color(0xFF3DDCB0) to Color(0xFF3466F6) + Genre.LITHUANIAN -> Color(0xFFFDB913) to Color(0xFF006A44) + Genre.NEWS_TALK -> Color(0xFF8FA6C8) to Color(0xFF2F4B8C) + Genre.LATVIAN -> Color(0xFFC8102E) to Color(0xFFE8E8F0) +} + +/** + * Horizontal row of genre cards in the spirit of the design's smoky category art. + * The first card shows every station; tapping the selected genre again clears the filter. + */ +@Composable +fun GenreCarousel( + stations: List, + selectedGenre: Genre?, + onSelectGenre: (Genre?) -> Unit, + modifier: Modifier = Modifier +) { + val genres = Genre.entries.filter { g -> stations.any { g in it.genres } } + + LazyRow( + modifier = modifier.testTag("genre_carousel"), + contentPadding = PaddingValues(horizontal = 20.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp) + ) { + item(key = "all") { + GenreCard( + genre = null, + title = stringResource(R.string.genre_all), + count = stations.size, + selected = selectedGenre == null, + onClick = { onSelectGenre(null) } + ) + } + items(genres, key = { it.name }) { genre -> + GenreCard( + genre = genre, + title = stringResource(genre.labelRes), + count = stations.count { genre in it.genres }, + selected = selectedGenre == genre, + onClick = { onSelectGenre(if (selectedGenre == genre) null else genre) } + ) + } + } +} + +@Composable +private fun GenreCard( + genre: Genre?, + title: String, + count: Int, + selected: Boolean, + onClick: () -> Unit +) { + val colors = LocalGeoColors.current + val (glowA, glowB) = genrePalette(genre) + val borderWidth by animateDpAsState(if (selected) 2.dp else 1.dp, label = "genre_border") + val dim by animateFloatAsState(if (selected) 1f else 0.82f, label = "genre_dim") + val shape = RoundedCornerShape(20.dp) + + Box( + modifier = Modifier + .size(width = 124.dp, height = 156.dp) + .clip(shape) + .border(borderWidth, if (selected) colors.primary else colors.outlineVariant, shape) + .clickable(role = Role.Tab, onClick = onClick) + .semantics { this.selected = selected } + .testTag("genre_${genre?.name?.lowercase() ?: "all"}") + ) { + Canvas( + modifier = Modifier + .matchParentSize() + .graphicsLayer { alpha = dim } + ) { + drawRect(Color(0xFF0B0D14)) + // Soft overlapping glows read as colored smoke on the dark card. + drawCircle( + brush = Brush.radialGradient( + colors = listOf(glowA.copy(alpha = 0.9f), Color.Transparent), + center = Offset(size.width * 0.25f, size.height * 0.3f), + radius = size.width * 0.85f + ), + radius = size.width * 0.85f, + center = Offset(size.width * 0.25f, size.height * 0.3f) + ) + drawCircle( + brush = Brush.radialGradient( + colors = listOf(glowB.copy(alpha = 0.85f), Color.Transparent), + center = Offset(size.width * 0.85f, size.height * 0.62f), + radius = size.width * 0.75f + ), + radius = size.width * 0.75f, + center = Offset(size.width * 0.85f, size.height * 0.62f) + ) + drawCircle( + brush = Brush.radialGradient( + colors = listOf(Color.White.copy(alpha = 0.22f), Color.Transparent), + center = Offset(size.width * 0.55f, size.height * 0.42f), + radius = size.width * 0.35f + ), + radius = size.width * 0.35f, + center = Offset(size.width * 0.55f, size.height * 0.42f) + ) + drawRect( + brush = Brush.verticalGradient( + colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.7f)), + startY = size.height * 0.45f, + endY = size.height + ) + ) + } + + Column( + modifier = Modifier + .align(Alignment.BottomStart) + .padding(12.dp), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + val shadow = Shadow(color = Color.Black.copy(alpha = 0.6f), blurRadius = 8f) + Text( + text = title, + style = MaterialTheme.typography.titleSmall.copy( + fontWeight = FontWeight.Bold, + fontSize = 14.sp, + lineHeight = 17.sp, + color = Color.White, + shadow = shadow + ), + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + Text( + text = pluralStringResource(R.plurals.station_count, count, count), + style = MaterialTheme.typography.labelSmall.copy( + fontSize = 11.sp, + color = Color.White.copy(alpha = 0.75f), + shadow = shadow + ), + maxLines = 1 + ) + } + } +} diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/MiniPlayer.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/MiniPlayer.kt index b2089fa..b2ca3ad 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/MiniPlayer.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/MiniPlayer.kt @@ -5,7 +5,6 @@ import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animate import androidx.compose.animation.core.spring import androidx.compose.animation.core.tween -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -26,7 +25,6 @@ import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.ripple @@ -40,10 +38,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.testTag -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow @@ -63,15 +59,15 @@ private val TABLET_MINI_PLAYER_MAX_WIDTH_DP = 640.dp fun MiniPlayer( station: RadioStation?, playerState: PlayerState, + trackTitle: String?, onTogglePlay: () -> Unit, - onPrevious: () -> Unit, - onNext: () -> Unit, onOpenNowPlaying: () -> Unit, onHide: () -> Unit, modifier: Modifier = Modifier ) { if (station == null) return + val colors = LocalGeoColors.current val isPlaying = playerState is PlayerState.Playing val isConnecting = playerState is PlayerState.Connecting val isError = playerState is PlayerState.Error @@ -79,7 +75,7 @@ fun MiniPlayer( val subText = when { isError -> playerState.message isConnecting -> stringResource(R.string.player_connecting) - isPlaying -> stringResource(R.string.player_on_air) + isPlaying && trackTitle != null -> trackTitle else -> stationDescription(station) } @@ -107,10 +103,10 @@ fun MiniPlayer( Row( modifier = Modifier .fillMaxWidth() - .shadow(6.dp, RoundedCornerShape(32.dp)) - .clip(RoundedCornerShape(32.dp)) - .background(LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(32.dp)) + .shadow(12.dp, RoundedCornerShape(28.dp)) + .clip(RoundedCornerShape(28.dp)) + .background(colors.surfaceContainerHigh) + .border(1.dp, colors.outlineVariant, RoundedCornerShape(28.dp)) .clickable( interactionSource = remember { MutableInteractionSource() }, indication = ripple(bounded = true) @@ -150,107 +146,68 @@ fun MiniPlayer( } } ) - .padding(start = 10.dp, end = 12.dp, top = 8.dp, bottom = 8.dp) + .padding(start = 8.dp, end = 12.dp, top = 8.dp, bottom = 8.dp) .testTag("mini_player"), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp) ) { - Box( - modifier = Modifier - .size(46.dp) - .clip(RoundedCornerShape(14.dp)) - .background(stationTileColor(station)) - .border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(14.dp)) - ) { - Image( - painter = painterResource(id = station.iconResId), - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - ) - } + StationDisc( + station = station, + isPlaying = isPlaying, + ringWidth = 2.dp, + ringGap = 3.dp, + glow = false, + modifier = Modifier.size(56.dp) + ) Column( modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.Center + verticalArrangement = Arrangement.spacedBy(1.dp) ) { + LiveLabel(active = isPlaying) Text( text = station.name, style = MaterialTheme.typography.bodyMedium.copy( fontWeight = FontWeight.Bold, - fontSize = 14.5.sp, - color = LocalGeoColors.current.deepPurple + fontSize = 15.sp, + color = colors.deepPurple ), maxLines = 1, overflow = TextOverflow.Ellipsis ) - Text( text = subText, style = MaterialTheme.typography.bodySmall.copy( - fontSize = 11.5.sp, - color = if (isError) LocalGeoColors.current.redFavorite else (if (isPlaying) LocalGeoColors.current.liveGreen else LocalGeoColors.current.onSurfaceVariant) + fontSize = 12.sp, + color = if (isError) colors.redFavorite else colors.onSurfaceVariant ), maxLines = 1, overflow = TextOverflow.Ellipsis ) } - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(2.dp) + Box( + modifier = Modifier + .size(48.dp) + .shadow(6.dp, CircleShape) + .clip(CircleShape) + .background(colors.accentLavender) + .clickable { onTogglePlay() } + .testTag("mini_play_btn"), + contentAlignment = Alignment.Center ) { - IconButton( - onClick = onPrevious, - modifier = Modifier - .size(36.dp) - .testTag("mini_prev_btn") - ) { - AppIcon( - resId = R.drawable.ic_chevron_left, - contentDescription = stringResource(R.string.previous_station_content_desc), - tint = LocalGeoColors.current.onSurfaceVariant, - size = 24.dp + if (isConnecting) { + CircularProgressIndicator( + modifier = Modifier.size(22.dp), + color = colors.onAccentLavender, + strokeWidth = 2.dp ) - } - - Box( - modifier = Modifier - .size(42.dp) - .shadow(2.dp, CircleShape) - .clip(CircleShape) - .background(LocalGeoColors.current.accentLavender) - .clickable { onTogglePlay() } - .testTag("mini_play_btn"), - contentAlignment = Alignment.Center - ) { - if (isConnecting) { - CircularProgressIndicator( - modifier = Modifier.size(20.dp), - color = LocalGeoColors.current.onAccentLavender, - strokeWidth = 2.dp - ) - } else { - AppIcon( - resId = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play, - contentDescription = if (isPlaying) stringResource(R.string.pause_content_desc) else stringResource(R.string.play_content_desc), - tint = LocalGeoColors.current.onAccentLavender, - size = 22.dp - ) - } - } - - IconButton( - onClick = onNext, - modifier = Modifier - .size(36.dp) - .testTag("mini_next_btn") - ) { + } else { AppIcon( - resId = R.drawable.ic_chevron_right, - contentDescription = stringResource(R.string.next_station_content_desc), - tint = LocalGeoColors.current.onSurfaceVariant, - size = 24.dp + resId = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play, + contentDescription = if (isPlaying) stringResource(R.string.pause_content_desc) else stringResource(R.string.play_content_desc), + tint = colors.onAccentLavender, + size = 22.dp ) } } diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/MistyMountainBackground.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/MistyMountainBackground.kt deleted file mode 100644 index 498fee6..0000000 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/MistyMountainBackground.kt +++ /dev/null @@ -1,53 +0,0 @@ -package cc.skysparkle.fogwave.ui.components - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Brush -import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.platform.LocalContext -import coil.compose.AsyncImage -import coil.request.ImageRequest -import coil.size.Scale -import cc.skysparkle.fogwave.R -import cc.skysparkle.fogwave.ui.theme.LocalGeoColors - -@Composable -fun MistyMountainBackground(modifier: Modifier = Modifier) { - val context = LocalContext.current - val request = remember(context) { - ImageRequest.Builder(context) - .data(R.drawable.bg_misty_mountain) - .scale(Scale.FILL) - .crossfade(200) - .build() - } - - Box(modifier = modifier.fillMaxSize().background(LocalGeoColors.current.background)) { - AsyncImage( - model = request, - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.fillMaxSize() - ) - - val scrimBase = LocalGeoColors.current.background - Box( - modifier = Modifier - .fillMaxSize() - .background( - Brush.verticalGradient( - colors = listOf( - scrimBase.copy(alpha = 0.62f), - scrimBase.copy(alpha = 0.48f), - scrimBase.copy(alpha = 0.52f), - scrimBase.copy(alpha = 0.78f) - ) - ) - ) - ) - } -} diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/NowPlayingSheet.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/NowPlayingSheet.kt index b31abf3..bd060b9 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/NowPlayingSheet.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/NowPlayingSheet.kt @@ -1,5 +1,8 @@ package cc.skysparkle.fogwave.ui.components +import android.content.Context +import android.content.Intent +import android.text.format.DateFormat import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.FastOutLinearInEasing import androidx.compose.animation.core.Spring @@ -7,34 +10,33 @@ import androidx.compose.animation.core.animate import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.spring import androidx.compose.animation.core.tween -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.gestures.detectTapGestures -import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.aspectRatio -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -56,10 +58,9 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.NestedScrollSource import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.pointer.pointerInput -import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.testTag -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics @@ -73,15 +74,19 @@ import androidx.compose.ui.unit.sp import cc.skysparkle.fogwave.R import cc.skysparkle.fogwave.data.model.ExtraPlayerTab import cc.skysparkle.fogwave.data.model.RadioStation +import cc.skysparkle.fogwave.data.model.TrackEntry import cc.skysparkle.fogwave.player.AudioEffectsState import cc.skysparkle.fogwave.player.PlayerState import cc.skysparkle.fogwave.ui.theme.LocalGeoColors +import java.util.Date import kotlin.math.roundToInt @Composable fun NowPlayingSheet( station: RadioStation?, playerState: PlayerState, + trackTitle: String?, + trackHistory: List, isFavorite: Boolean, onToggleFavorite: () -> Unit, onTogglePlay: () -> Unit, @@ -100,6 +105,8 @@ fun NowPlayingSheet( ) { if (station == null) return + val colors = LocalGeoColors.current + val context = LocalContext.current val isPlaying = playerState is PlayerState.Playing val isConnecting = playerState is PlayerState.Connecting val isError = playerState is PlayerState.Error @@ -110,539 +117,417 @@ fun NowPlayingSheet( SheetDragState( dismissThresholdPx = with(density) { 110.dp.toPx() }, flingThresholdPx = with(density) { 1400.dp.toPx() }, - offscreenPx = with(density) { 900.dp.toPx() }, + offscreenPx = with(density) { 1200.dp.toPx() }, onDismiss = { currentOnClose() } ) } - val artScale by animateFloatAsState( - targetValue = if (isPlaying) 1.02f else 0.98f, + val discScale by animateFloatAsState( + targetValue = if (isPlaying) 1f else 0.94f, animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy), - label = "art_scale" + label = "disc_scale" ) Box( modifier = modifier .fillMaxSize() - // Read in the draw phase so pulling the sheet does not recompose the whole player. + // Read in the draw phase so pulling the page does not recompose the whole player. .drawBehind { val progress = (drag.offsetPx / drag.dismissThresholdPx).coerceIn(0f, 1f) drawRect(Color.Black.copy(alpha = 0.55f * (1f - progress))) } - .clickable( - interactionSource = remember { MutableInteractionSource() }, - indication = null - ) { - onClose() - } ) { BoxWithConstraints(modifier = Modifier.fillMaxSize()) { val isTablet = maxWidth > 600.dp - val sheetWidthModifier = if (isTablet) Modifier.widthIn(max = 560.dp) else Modifier.fillMaxWidth() + val pageWidth = if (isTablet) Modifier.widthIn(max = 560.dp) else Modifier.fillMaxWidth() Column( modifier = Modifier - .align(Alignment.BottomCenter) + .align(Alignment.TopCenter) .then(sheetModifier) .offset { IntOffset(0, drag.offsetPx.roundToInt()) } - .then(sheetWidthModifier) - .fillMaxHeight(0.94f) - .shadow(16.dp, RoundedCornerShape(topStart = 36.dp, topEnd = 36.dp)) - .clip(RoundedCornerShape(topStart = 36.dp, topEnd = 36.dp)) - .background(LocalGeoColors.current.background) - .border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(topStart = 36.dp, topEnd = 36.dp)) - // Swallow taps so they do not fall through to the scrim (which closes the sheet), - // without exposing the sheet itself as a button to accessibility services. + .then(pageWidth) + .fillMaxSize() + .background(colors.background) + // Swallow taps so nothing underneath reacts to them. .pointerInput(Unit) { detectTapGestures { } } - // The whole sheet scrolls; drags that the content cannot use pull the sheet down. + // The page scrolls; drags the content cannot use pull it down to close. .nestedScroll(drag.nestedScrollConnection) - .navigationBarsPadding() .verticalScroll(rememberScrollState()) - .padding(bottom = 28.dp) + .statusBarsPadding() + .navigationBarsPadding() + .padding(bottom = 24.dp) .testTag("now_playing_sheet"), horizontalAlignment = Alignment.CenterHorizontally ) { - Box( - modifier = Modifier - .padding(top = 12.dp, bottom = 4.dp) - .size(width = 48.dp, height = 5.dp) - .clip(CircleShape) - .background(LocalGeoColors.current.outlineVariant) - ) - - // The sheet closes by swiping down, tapping outside it or pressing Back. - Text( - text = stringResource(R.string.now_playing_label), - style = MaterialTheme.typography.labelSmall.copy( - fontWeight = FontWeight.Bold, - fontSize = 11.5.sp, - letterSpacing = 1.2.sp, - color = LocalGeoColors.current.primary - ), - modifier = Modifier.padding(horizontal = 24.dp, vertical = 12.dp) - ) - - Box( - modifier = Modifier - .padding(horizontal = 44.dp, vertical = 10.dp) - .fillMaxWidth() - .aspectRatio(1f) - .scale(artScale) - .shadow(8.dp, RoundedCornerShape(32.dp)) - .clip(RoundedCornerShape(32.dp)) - .background(stationTileColor(station)) - .border(1.5.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(32.dp)) - ) { - Image( - painter = painterResource(id = station.iconResId), - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - ) - } - - Column( + Row( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 24.dp, vertical = 6.dp), - horizontalAlignment = Alignment.CenterHorizontally + .padding(horizontal = 8.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically ) { - Text( - text = station.name, - style = MaterialTheme.typography.headlineMedium.copy( - fontWeight = FontWeight.ExtraBold, - fontSize = 25.sp, - letterSpacing = (-0.5).sp, - color = LocalGeoColors.current.deepPurple, - textAlign = TextAlign.Center - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - - Spacer(modifier = Modifier.height(4.dp)) - - Text( - text = stationDescription(station), - style = MaterialTheme.typography.bodyMedium.copy( - fontSize = 14.sp, - color = LocalGeoColors.current.onSurfaceVariant, - textAlign = TextAlign.Center - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - - Spacer(modifier = Modifier.height(10.dp)) - - Row( - modifier = Modifier - .clip(CircleShape) - .background(if (isPlaying) LocalGeoColors.current.primaryContainer else LocalGeoColors.current.surfaceContainer) - .border( - width = 1.dp, - color = if (isPlaying) LocalGeoColors.current.primary.copy(alpha = 0.4f) else LocalGeoColors.current.outlineVariant, - shape = CircleShape - ) - .padding(horizontal = 14.dp, vertical = 6.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp) - ) { - when { - isPlaying -> LiveOnAirDot() - isError -> AppIcon( - resId = R.drawable.ic_alert, - tint = LocalGeoColors.current.redFavorite, - size = 12.dp - ) - !isConnecting -> AppIcon( - resId = R.drawable.ic_sleep, - tint = LocalGeoColors.current.onSurfaceVariant, - size = 12.dp - ) - else -> Box( - modifier = Modifier - .size(6.dp) - .clip(CircleShape) - .background(LocalGeoColors.current.onSurfaceVariant) - ) - } - Text( - text = when { - isError -> playerState.message - isConnecting -> stringResource(R.string.player_connecting) - isPlaying -> stringResource(R.string.now_playing_live) - else -> stringResource(R.string.player_stopped) - }, - style = MaterialTheme.typography.labelSmall.copy( - fontWeight = FontWeight.SemiBold, - fontSize = 12.sp, - color = if (isPlaying) LocalGeoColors.current.deepPurple else (if (isError) LocalGeoColors.current.redFavorite else LocalGeoColors.current.onSurfaceVariant) - ) + IconButton(onClick = onClose, modifier = Modifier.testTag("np_close_btn")) { + AppIcon( + resId = R.drawable.ic_chevron_left, + contentDescription = stringResource(R.string.back_content_desc), + tint = colors.onSurface, + size = 26.dp + ) + } + Spacer(modifier = Modifier.weight(1f)) + IconButton(onClick = onOpenEqualizer, modifier = Modifier.testTag("np_equalizer_toggle")) { + AppIcon( + resId = R.drawable.ic_equalizer, + contentDescription = stringResource(R.string.equalizer_content_desc), + tint = if (audioEffects.equalizerEnabled) colors.primary else colors.onSurface, + size = 22.dp ) } } - LiveBars( - active = isPlaying, - color = LocalGeoColors.current.primary, + StationDisc( + station = station, + isPlaying = isPlaying, modifier = Modifier - .align(Alignment.CenterHorizontally) - .padding(vertical = 10.dp) + .padding(top = 12.dp, bottom = 20.dp) + .fillMaxWidth(if (isTablet) 0.6f else 0.74f) + .scale(discScale) ) - Box( + Row( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 18.dp, vertical = 8.dp), + .padding(horizontal = 24.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp) + ) { + Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { + LiveLabel(active = isPlaying) + Text( + text = station.name, + style = MaterialTheme.typography.headlineSmall.copy( + fontWeight = FontWeight.ExtraBold, + fontSize = 22.sp, + letterSpacing = (-0.4).sp, + color = colors.deepPurple + ), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = "${station.bitrate} • ${stationGenres(station)}", + style = MaterialTheme.typography.bodySmall.copy( + fontSize = 12.sp, + color = colors.onSurfaceVariant + ), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + + IconButton( + onClick = { context.shareStation(station, trackTitle) }, + modifier = Modifier.testTag("np_share_btn") + ) { + AppIcon( + resId = R.drawable.ic_share, + contentDescription = stringResource(R.string.share_content_desc), + tint = colors.onSurface, + size = 21.dp + ) + } + + val favScale by animateFloatAsState( + targetValue = if (isFavorite) 1.15f else 1f, + animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy), + label = "fav_scale" + ) + IconButton( + onClick = onToggleFavorite, + modifier = Modifier + .scale(favScale) + .testTag("np_favorite_toggle") + ) { + AppIcon( + resId = if (isFavorite) R.drawable.ic_heart_fill else R.drawable.ic_heart_outline, + contentDescription = stringResource( + if (isFavorite) R.string.remove_from_favorites else R.string.add_to_favorites + ), + tint = if (isFavorite) colors.redFavorite else colors.onSurface, + size = 22.dp + ) + } + } + + Spacer(modifier = Modifier.height(22.dp)) + + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(6.dp) + ) { + AppIcon(resId = R.drawable.ic_music_note, tint = colors.onSurfaceVariant, size = 13.dp) + Text( + text = stringResource(R.string.now_playing_label), + style = MaterialTheme.typography.labelSmall.copy( + fontWeight = FontWeight.SemiBold, + fontSize = 10.5.sp, + letterSpacing = 1.2.sp, + color = colors.onSurfaceVariant + ) + ) + } + + Spacer(modifier = Modifier.height(6.dp)) + + Text( + text = when { + isError -> playerState.message + isConnecting -> stringResource(R.string.player_connecting) + !isPlaying -> stringResource(R.string.player_stopped) + else -> trackTitle ?: stationDescription(station) + }, + style = MaterialTheme.typography.titleMedium.copy( + fontWeight = FontWeight.SemiBold, + fontSize = 16.sp, + lineHeight = 21.sp, + textAlign = TextAlign.Center, + color = if (isError) colors.redFavorite else colors.onSurface + ), + maxLines = 2, + overflow = TextOverflow.Ellipsis, + modifier = Modifier + .padding(horizontal = 32.dp) + .heightIn(min = 42.dp) + .testTag("np_track_title") + ) + + Spacer(modifier = Modifier.height(18.dp)) + + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(28.dp) + ) { + IconButton( + onClick = onPrevious, + modifier = Modifier + .size(52.dp) + .testTag("np_prev_btn") + ) { + AppIcon( + resId = R.drawable.ic_skip_previous, + contentDescription = stringResource(R.string.previous_station_content_desc), + tint = colors.onSurface, + size = 28.dp + ) + } + + Box( + modifier = Modifier + .size(76.dp) + .shadow(14.dp, CircleShape, ambientColor = colors.accentLavender, spotColor = colors.accentLavender) + .clip(CircleShape) + .background(colors.accentLavender) + .clickable { onTogglePlay() } + .testTag("np_play_btn"), + contentAlignment = Alignment.Center + ) { + if (isConnecting) { + val connecting = stringResource(R.string.player_connecting) + CircularProgressIndicator( + modifier = Modifier + .size(32.dp) + .semantics { contentDescription = connecting }, + color = colors.onAccentLavender, + strokeWidth = 3.dp + ) + } else { + AppIcon( + resId = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play, + contentDescription = stringResource( + if (isPlaying) R.string.pause_content_desc else R.string.play_content_desc + ), + tint = colors.onAccentLavender, + size = 32.dp + ) + } + } + + IconButton( + onClick = onNext, + modifier = Modifier + .size(52.dp) + .testTag("np_next_btn") + ) { + AppIcon( + resId = R.drawable.ic_skip_next, + contentDescription = stringResource(R.string.next_station_content_desc), + tint = colors.onSurface, + size = 28.dp + ) + } + } + + Spacer(modifier = Modifier.height(28.dp)) + + ExtraPanel( + station = station, + playerState = playerState, + trackTitle = trackTitle, + trackHistory = trackHistory, + activeExtraTab = activeExtraTab, + onSelectExtraTab = onSelectExtraTab, + recents = recents, + similarStations = similarStations, + onSelectStation = onSelectStation + ) + } + } + } +} + +/** Lower card of the player: track history, recent and similar stations, station info. */ +@Composable +private fun ExtraPanel( + station: RadioStation, + playerState: PlayerState, + trackTitle: String?, + trackHistory: List, + activeExtraTab: ExtraPlayerTab, + onSelectExtraTab: (ExtraPlayerTab) -> Unit, + recents: List, + similarStations: List, + onSelectStation: (RadioStation) -> Unit +) { + val colors = LocalGeoColors.current + val isPlaying = playerState is PlayerState.Playing + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp) + .clip(RoundedCornerShape(28.dp)) + .background(colors.surfaceContainer) + .border(1.dp, colors.outlineVariant, RoundedCornerShape(28.dp)) + .padding(vertical = 10.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Box( + modifier = Modifier + .size(width = 40.dp, height = 4.dp) + .clip(CircleShape) + .background(colors.outlineVariant) + ) + + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()) + .padding(horizontal = 12.dp, vertical = 12.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + ExtraPlayerTab.entries.forEach { tab -> + val isSelected = tab == activeExtraTab + val bg by animateColorAsState( + targetValue = if (isSelected) colors.accentLavender else colors.surfaceContainerHigh, + label = "extra_tab_bg" + ) + val fg by animateColorAsState( + targetValue = if (isSelected) colors.onAccentLavender else colors.onSurfaceVariant, + label = "extra_tab_fg" + ) + Box( + modifier = Modifier + .clip(CircleShape) + .background(bg) + .clickable { onSelectExtraTab(tab) } + .padding(horizontal = 14.dp, vertical = 8.dp) + .testTag("extra_tab_${tab.name.lowercase()}"), contentAlignment = Alignment.Center ) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(14.dp) - ) { - Box( - modifier = Modifier - .size(50.dp) - .clip(CircleShape) - .background(LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, CircleShape) - .clickable { onOpenEqualizer() } - .testTag("np_equalizer_toggle"), - contentAlignment = Alignment.Center - ) { - AppIcon( - resId = R.drawable.ic_equalizer, - contentDescription = stringResource(R.string.equalizer_content_desc), - tint = if (audioEffects.equalizerEnabled) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurfaceVariant.copy(alpha = 0.5f), - size = 20.dp - ) - } + Text( + text = stringResource(tab.titleRes), + style = MaterialTheme.typography.labelMedium.copy( + fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium, + fontSize = 12.5.sp, + color = fg + ), + maxLines = 1 + ) + } + } + } - Box( - modifier = Modifier - .size(50.dp) - .clip(CircleShape) - .background(LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, CircleShape) - .clickable { onPrevious() } - .testTag("np_prev_btn"), - contentAlignment = Alignment.Center - ) { - AppIcon( - resId = R.drawable.ic_skip_previous, - contentDescription = stringResource(R.string.previous_station_content_desc), - tint = LocalGeoColors.current.deepPurple, - size = 24.dp - ) - } - - Box( - modifier = Modifier - .size(72.dp) - .shadow(4.dp, RoundedCornerShape(26.dp)) - .clip(RoundedCornerShape(26.dp)) - .background(LocalGeoColors.current.accentLavender) - .clickable { onTogglePlay() } - .testTag("np_play_btn"), - contentAlignment = Alignment.Center - ) { - if (isConnecting) { - val connecting = stringResource(R.string.player_connecting) - CircularProgressIndicator( - modifier = Modifier - .size(32.dp) - .semantics { contentDescription = connecting }, - color = LocalGeoColors.current.onAccentLavender, - strokeWidth = 3.dp - ) - } else { - AppIcon( - resId = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play, - contentDescription = if (isPlaying) stringResource(R.string.pause_content_desc) else stringResource(R.string.play_content_desc), - tint = LocalGeoColors.current.onAccentLavender, - size = 34.dp - ) - } - } - - Box( - modifier = Modifier - .size(50.dp) - .clip(CircleShape) - .background(LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, CircleShape) - .clickable { onNext() } - .testTag("np_next_btn"), - contentAlignment = Alignment.Center - ) { - AppIcon( - resId = R.drawable.ic_skip_next, - contentDescription = stringResource(R.string.next_station_content_desc), - tint = LocalGeoColors.current.deepPurple, - size = 24.dp - ) - } - - val favScale by animateFloatAsState( - targetValue = if (isFavorite) 1.12f else 1.0f, - animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy), - label = "fav_scale" - ) - Box( - modifier = Modifier - .size(50.dp) - .clip(CircleShape) - .background(if (isFavorite) LocalGeoColors.current.redFavorite.copy(alpha = 0.15f) else LocalGeoColors.current.surfaceContainer) - .border( - width = 1.2.dp, - color = if (isFavorite) LocalGeoColors.current.redFavorite else LocalGeoColors.current.outlineVariant, - shape = CircleShape - ) - .scale(favScale) - .clickable { onToggleFavorite() } - .testTag("np_favorite_toggle"), - contentAlignment = Alignment.Center - ) { - AppIcon( - resId = if (isFavorite) R.drawable.ic_heart_fill else R.drawable.ic_heart_outline, - contentDescription = if (isFavorite) stringResource(R.string.remove_from_favorites) else stringResource(R.string.add_to_favorites), - tint = if (isFavorite) LocalGeoColors.current.redFavorite else LocalGeoColors.current.deepPurple, - size = 22.dp + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 8.dp), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + when (activeExtraTab) { + ExtraPlayerTab.HISTORY -> { + val entries = trackHistory.filter { it.stationId == station.id } + if (entries.isEmpty()) { + EmptyHint(stringResource(R.string.history_empty)) + } else { + entries.forEachIndexed { index, entry -> + TrackRow( + entry = entry, + isNowPlaying = index == 0 && isPlaying && entry.title == trackTitle ) } } } - Spacer(modifier = Modifier.height(16.dp)) - - Column( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 20.dp), - verticalArrangement = Arrangement.spacedBy(12.dp) - ) { - Row( - modifier = Modifier - .fillMaxWidth() - .clip(RoundedCornerShape(14.dp)) - .background(LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(14.dp)) - .padding(4.dp), - horizontalArrangement = Arrangement.spacedBy(4.dp) - ) { - ExtraPlayerTab.entries.forEach { tab -> - val isSelected = tab == activeExtraTab - val bg by animateColorAsState( - targetValue = if (isSelected) LocalGeoColors.current.primaryContainer else Color.Transparent, - label = "extra_tab_bg" + ExtraPlayerTab.RECENT -> { + if (recents.isEmpty()) { + EmptyHint(stringResource(R.string.recent_empty)) + } else { + recents.forEach { s -> + StationRow( + station = s, + isCurrent = false, + isPlaying = false, + onClick = { onSelectStation(s) } ) - val textColor by animateColorAsState( - targetValue = if (isSelected) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurfaceVariant, - label = "extra_tab_text" - ) - - Box( - modifier = Modifier - .weight(1f) - .clip(RoundedCornerShape(10.dp)) - .background(bg) - .clickable { onSelectExtraTab(tab) } - .padding(vertical = 8.dp), - contentAlignment = Alignment.Center - ) { - Text( - text = stringResource(tab.titleRes), - style = MaterialTheme.typography.labelSmall.copy( - fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium, - fontSize = 12.sp, - color = textColor - ) - ) - } } } + } - when (activeExtraTab) { - ExtraPlayerTab.RECENT -> { - if (recents.isEmpty()) { - Text( - text = stringResource(R.string.recent_empty), - style = MaterialTheme.typography.bodySmall.copy( - color = LocalGeoColors.current.onSurfaceVariant, - textAlign = TextAlign.Center - ), - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 16.dp) - ) - } else { - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - recents.forEach { s -> - val isCur = s.id == station.id - Row( - modifier = Modifier - .fillMaxWidth() - .clip(RoundedCornerShape(14.dp)) - .background(if (isCur) LocalGeoColors.current.primaryContainer.copy(alpha = 0.6f) else LocalGeoColors.current.surfaceContainer) - .border(0.8.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(14.dp)) - .clickable { onSelectStation(s) } - .padding(8.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(10.dp) - ) { - Box( - modifier = Modifier - .size(40.dp) - .clip(RoundedCornerShape(10.dp)) - .background(stationTileColor(s)) - ) { - Image( - painter = painterResource(id = s.iconResId), - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - ) - } - - Column(modifier = Modifier.weight(1f)) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp) - ) { - if (isCur && isPlaying) { - LiveOnAirDot() - } - Text( - text = s.name, - style = MaterialTheme.typography.bodyMedium.copy( - fontWeight = FontWeight.Bold, - color = if (isCur) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurface - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - Text( - text = stationDescription(s), - style = MaterialTheme.typography.bodySmall.copy( - fontSize = 11.5.sp, - color = LocalGeoColors.current.onSurfaceVariant - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - - AppIcon( - resId = R.drawable.ic_play, - contentDescription = stringResource(R.string.play_content_desc), - tint = LocalGeoColors.current.deepPurple, - size = 18.dp - ) - } - } - } - } + ExtraPlayerTab.SIMILAR -> { + if (similarStations.isEmpty()) { + EmptyHint(stringResource(R.string.similar_empty)) + } else { + similarStations.forEach { s -> + StationRow( + station = s, + isCurrent = false, + isPlaying = false, + onClick = { onSelectStation(s) }, + subtitle = "${stationDescription(s)} • ${stationGenres(s)}" + ) } + } + } - ExtraPlayerTab.SIMILAR -> { - if (similarStations.isEmpty()) { - Text( - text = stringResource(R.string.similar_empty), - style = MaterialTheme.typography.bodySmall.copy( - color = LocalGeoColors.current.onSurfaceVariant, - textAlign = TextAlign.Center - ), - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 16.dp) - ) - } else { - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - similarStations.forEach { s -> - Row( - modifier = Modifier - .fillMaxWidth() - .clip(RoundedCornerShape(14.dp)) - .background(LocalGeoColors.current.surfaceContainer) - .border(0.8.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(14.dp)) - .clickable { onSelectStation(s) } - .padding(8.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(10.dp) - ) { - Box( - modifier = Modifier - .size(40.dp) - .clip(RoundedCornerShape(10.dp)) - .background(stationTileColor(s)) - ) { - Image( - painter = painterResource(id = s.iconResId), - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - ) - } - - Column(modifier = Modifier.weight(1f)) { - Text( - text = s.name, - style = MaterialTheme.typography.bodyMedium.copy( - fontWeight = FontWeight.Bold, - color = LocalGeoColors.current.deepPurple - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - Text( - text = "${stationDescription(s)} • ${stationGenres(s)}", - style = MaterialTheme.typography.bodySmall.copy( - fontSize = 11.5.sp, - color = LocalGeoColors.current.onSurfaceVariant - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - - AppIcon( - resId = R.drawable.ic_play, - contentDescription = stringResource(R.string.play_content_desc), - tint = LocalGeoColors.current.deepPurple, - size = 18.dp - ) - } - } - } + ExtraPlayerTab.INFO -> { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 10.dp, vertical = 4.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + InfoRow(key = stringResource(R.string.info_station), value = station.name) + InfoRow(key = stringResource(R.string.info_description), value = stationDescription(station)) + InfoRow(key = stringResource(R.string.info_genre), value = stationGenres(station)) + InfoRow(key = stringResource(R.string.info_quality), value = station.bitrate) + InfoRow( + key = stringResource(R.string.info_status), + value = when (playerState) { + is PlayerState.Playing -> stringResource(R.string.status_live) + is PlayerState.Connecting -> stringResource(R.string.player_connecting) + is PlayerState.Error -> playerState.message + else -> stringResource(R.string.player_stopped) } - } - - ExtraPlayerTab.INFO -> { - Column( - modifier = Modifier - .fillMaxWidth() - .clip(RoundedCornerShape(16.dp)) - .background(LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(16.dp)) - .padding(14.dp), - verticalArrangement = Arrangement.spacedBy(10.dp) - ) { - InfoRow(key = stringResource(R.string.info_station), value = station.name) - InfoRow(key = stringResource(R.string.info_description), value = stationDescription(station)) - InfoRow(key = stringResource(R.string.info_genre), value = stationGenres(station)) - InfoRow(key = stringResource(R.string.info_quality), value = station.bitrate) - InfoRow( - key = stringResource(R.string.info_status), - value = when (playerState) { - is PlayerState.Playing -> stringResource(R.string.status_live) - is PlayerState.Connecting -> stringResource(R.string.player_connecting) - is PlayerState.Error -> playerState.message - else -> stringResource(R.string.player_stopped) - } - ) - } - } + ) } } } @@ -650,6 +535,91 @@ fun NowPlayingSheet( } } +@Composable +private fun TrackRow(entry: TrackEntry, isNowPlaying: Boolean) { + val colors = LocalGeoColors.current + val context = LocalContext.current + val time = remember(entry.startedAtMillis) { + DateFormat.getTimeFormat(context).format(Date(entry.startedAtMillis)) + } + + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 10.dp, vertical = 9.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp) + ) { + Column(modifier = Modifier.weight(1f)) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Text( + text = entry.song, + style = MaterialTheme.typography.bodyMedium.copy( + fontWeight = FontWeight.Bold, + color = if (isNowPlaying) colors.deepPurple else colors.onSurface + ), + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f, fill = false) + ) + if (isNowPlaying) { + Text( + text = stringResource(R.string.history_now_playing_tag), + style = MaterialTheme.typography.labelSmall.copy( + fontWeight = FontWeight.SemiBold, + fontSize = 10.sp, + color = colors.primary + ), + maxLines = 1 + ) + } + } + entry.artist?.let { artist -> + Text( + text = artist, + style = MaterialTheme.typography.bodySmall.copy( + fontSize = 12.sp, + color = colors.onSurfaceVariant + ), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + } + + Text( + text = time, + style = MaterialTheme.typography.labelMedium.copy( + color = if (isNowPlaying) colors.primary else colors.onSurfaceVariant + ) + ) + + Box( + modifier = Modifier + .size(width = 3.dp, height = 28.dp) + .clip(CircleShape) + .background(if (isNowPlaying) colors.accentLavender else Color.Transparent) + ) + } +} + +@Composable +private fun EmptyHint(text: String) { + Text( + text = text, + style = MaterialTheme.typography.bodySmall.copy( + color = LocalGeoColors.current.onSurfaceVariant, + textAlign = TextAlign.Center + ), + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 20.dp) + ) +} + @Composable private fun InfoRow(key: String, value: String) { Row( @@ -677,6 +647,22 @@ private fun InfoRow(key: String, value: String) { } } +private fun Context.shareStation(station: RadioStation, trackTitle: String?) { + val text = if (trackTitle != null) { + getString(R.string.share_text_track, trackTitle, station.name) + } else { + getString(R.string.share_text, station.name) + } + val send = Intent(Intent.ACTION_SEND).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, text) + } + try { + startActivity(Intent.createChooser(send, null).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } catch (_: android.content.ActivityNotFoundException) { + } +} + /** * Offset of the now-playing sheet while it is being pulled down. Driven through nested scroll so * the gesture works anywhere on the (scrollable) sheet once its content is scrolled to the top. diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationDisc.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationDisc.kt new file mode 100644 index 0000000..9261f86 --- /dev/null +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationDisc.kt @@ -0,0 +1,130 @@ +package cc.skysparkle.fogwave.ui.components + +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.tween +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import cc.skysparkle.fogwave.data.model.RadioStation +import cc.skysparkle.fogwave.ui.theme.LocalGeoColors +import kotlin.math.cos +import kotlin.math.min +import kotlin.math.sin + +private const val ARC_SWEEP = 280f +private const val TURN_MILLIS = 14_000 + +/** + * Round station artwork wrapped in a ring. Live radio has no track progress, so the arc slowly + * circles while the station plays and rests where it was when playback stops. + */ +@Composable +fun StationDisc( + station: RadioStation, + isPlaying: Boolean, + modifier: Modifier = Modifier, + ringWidth: Dp = 4.dp, + ringGap: Dp = 10.dp, + glow: Boolean = true +) { + val colors = LocalGeoColors.current + val rotation = remember { Animatable(0f) } + + LaunchedEffect(isPlaying) { + while (isPlaying) { + rotation.snapTo(rotation.value % 360f) + rotation.animateTo( + targetValue = rotation.value + 360f, + animationSpec = tween(TURN_MILLIS, easing = LinearEasing) + ) + } + } + + Box(modifier = modifier.aspectRatio(1f), contentAlignment = Alignment.Center) { + Canvas(modifier = Modifier.fillMaxSize()) { + val stroke = ringWidth.toPx() + val radius = min(size.width, size.height) / 2f - stroke + val topLeft = Offset(center.x - radius, center.y - radius) + val arcSize = Size(radius * 2, radius * 2) + + if (glow) { + drawCircle( + brush = Brush.radialGradient( + colors = listOf(colors.accentLavender.copy(alpha = 0.28f), Color.Transparent), + center = center, + radius = radius * 1.25f + ), + radius = radius * 1.25f, + center = center + ) + } + + drawCircle( + color = colors.outlineVariant, + radius = radius, + center = center, + style = Stroke(width = stroke) + ) + + val start = -90f + rotation.value + drawArc( + color = colors.primary, + startAngle = start, + sweepAngle = ARC_SWEEP, + useCenter = false, + topLeft = topLeft, + size = arcSize, + style = Stroke(width = stroke, cap = StrokeCap.Round) + ) + + val end = Math.toRadians((start + ARC_SWEEP).toDouble()) + val knob = Offset( + center.x + radius * cos(end).toFloat(), + center.y + radius * sin(end).toFloat() + ) + drawCircle(color = colors.accentLavender, radius = stroke * 1.9f, center = knob) + drawCircle(color = Color.White, radius = stroke * 0.8f, center = knob) + } + + Box( + modifier = Modifier + .fillMaxSize() + .padding(ringWidth * 2 + ringGap) + .clip(CircleShape) + .background(stationTileColor(station)) + .border(1.dp, colors.outlineVariant, CircleShape), + contentAlignment = Alignment.Center + ) { + // Slightly larger than the inscribed square, so only the logo's corners get clipped. + Image( + painter = painterResource(id = station.iconResId), + contentDescription = null, + contentScale = ContentScale.Fit, + modifier = Modifier.fillMaxSize(0.78f) + ) + } + } +} diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationItem.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationItem.kt deleted file mode 100644 index e8fea0f..0000000 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationItem.kt +++ /dev/null @@ -1,462 +0,0 @@ -package cc.skysparkle.fogwave.ui.components - -import androidx.compose.animation.core.FastOutSlowInEasing -import androidx.compose.animation.core.RepeatMode -import androidx.compose.animation.core.Spring -import androidx.compose.animation.core.animateFloat -import androidx.compose.animation.core.animateFloatAsState -import androidx.compose.animation.core.infiniteRepeatable -import androidx.compose.animation.core.rememberInfiniteTransition -import androidx.compose.animation.core.spring -import androidx.compose.animation.core.tween -import androidx.compose.foundation.LocalIndication -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.interaction.collectIsPressedAsState -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.Spacer -import androidx.compose.foundation.layout.aspectRatio -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.draw.shadow -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.Shadow -import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import cc.skysparkle.fogwave.data.model.IconSizeStep -import cc.skysparkle.fogwave.data.model.RadioStation -import cc.skysparkle.fogwave.data.model.ViewMode -import cc.skysparkle.fogwave.ui.theme.LocalGeoColors -import coil.compose.AsyncImage - -@Composable -fun LiveOnAirDot(modifier: Modifier = Modifier) { - val infiniteTransition = rememberInfiniteTransition(label = "pulse") - val scale by infiniteTransition.animateFloat( - initialValue = 0.8f, - targetValue = 1.25f, - animationSpec = infiniteRepeatable( - animation = tween(900, easing = FastOutSlowInEasing), - repeatMode = RepeatMode.Reverse - ), - label = "live_pulse" - ) - - Box( - modifier = modifier - .size(7.dp) - .graphicsLayer { - scaleX = scale - scaleY = scale - } - .clip(CircleShape) - .background(LocalGeoColors.current.liveGreen) - ) -} - -private val GridTextShadow = Shadow(color = Color.Black.copy(alpha = 0.55f), blurRadius = 8f) - -@Composable -fun StationItem( - station: RadioStation, - isCurrent: Boolean, - isPlaying: Boolean, - viewMode: ViewMode, - sizeStep: IconSizeStep, - onClick: () -> Unit, - modifier: Modifier = Modifier -) { - val interactionSource = remember { MutableInteractionSource() } - val pressed by interactionSource.collectIsPressedAsState() - val pressScale by animateFloatAsState( - targetValue = if (pressed) 0.96f else 1f, - animationSpec = spring(dampingRatio = 0.6f, stiffness = Spring.StiffnessMediumLow), - label = "station_press" - ) - val cardModifier = modifier.graphicsLayer { - scaleX = pressScale - scaleY = pressScale - } - - when (viewMode) { - ViewMode.ICONS -> { - StationIconsCard( - station = station, - isCurrent = isCurrent, - isPlaying = isPlaying, - sizeDp = sizeStep.sizeDp.dp, - onClick = onClick, - interactionSource = interactionSource, - modifier = cardModifier - ) - } - ViewMode.TILES -> { - StationTilesCard( - station = station, - isCurrent = isCurrent, - isPlaying = isPlaying, - sizeDp = (sizeStep.sizeDp * 0.7f).dp, - onClick = onClick, - interactionSource = interactionSource, - modifier = cardModifier - ) - } - ViewMode.LIST -> { - StationListRow( - station = station, - isCurrent = isCurrent, - isPlaying = isPlaying, - sizeDp = (sizeStep.sizeDp * 0.45f).coerceAtLeast(36f).dp, - onClick = onClick, - interactionSource = interactionSource, - modifier = cardModifier - ) - } - ViewMode.DETAILS -> { - StationDetailsRow( - station = station, - isCurrent = isCurrent, - isPlaying = isPlaying, - sizeDp = (sizeStep.sizeDp * 0.45f).coerceAtLeast(36f).dp, - onClick = onClick, - interactionSource = interactionSource, - modifier = cardModifier - ) - } - } -} - -@Composable -private fun StationIconsCard( - station: RadioStation, - isCurrent: Boolean, - isPlaying: Boolean, - sizeDp: Dp, - onClick: () -> Unit, - interactionSource: MutableInteractionSource, - modifier: Modifier = Modifier -) { - Column( - modifier = modifier - .width(sizeDp) - .clip(RoundedCornerShape(20.dp)) - .clickable( - interactionSource = interactionSource, - indication = LocalIndication.current, - role = Role.Button, - onClick = onClick - ) - .padding(4.dp) - .testTag("station_${station.id}"), - horizontalAlignment = Alignment.Start - ) { - Box( - modifier = Modifier - .fillMaxWidth() - .aspectRatio(1f) - .shadow(if (isCurrent) 4.dp else 1.dp, RoundedCornerShape(22.dp)) - .clip(RoundedCornerShape(22.dp)) - .background(stationTileColor(station)) - .border( - width = if (isCurrent) 2.dp else 1.dp, - color = if (isCurrent) LocalGeoColors.current.primary else LocalGeoColors.current.outlineVariant, - shape = RoundedCornerShape(22.dp) - ) - ) { - AsyncImage( - model = station.iconResId, - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - ) - } - - Spacer(modifier = Modifier.height(8.dp)) - - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp) - ) { - if (isCurrent && isPlaying) { - LiveOnAirDot() - } - Text( - text = station.name, - style = MaterialTheme.typography.titleSmall.copy( - fontWeight = FontWeight.Bold, - fontSize = 14.5.sp, - lineHeight = 17.sp, - color = if (isCurrent) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurface, - shadow = GridTextShadow - ), - maxLines = 2, - overflow = TextOverflow.Ellipsis - ) - } - - Text( - text = stationDescription(station), - style = MaterialTheme.typography.bodySmall.copy( - fontSize = 11.5.sp, - color = LocalGeoColors.current.onSurface.copy(alpha = 0.82f), - shadow = GridTextShadow - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } -} - -@Composable -private fun StationTilesCard( - station: RadioStation, - isCurrent: Boolean, - isPlaying: Boolean, - sizeDp: Dp, - onClick: () -> Unit, - interactionSource: MutableInteractionSource, - modifier: Modifier = Modifier -) { - Row( - modifier = modifier - .fillMaxWidth() - .clip(RoundedCornerShape(18.dp)) - .background(if (isCurrent) LocalGeoColors.current.primaryContainer.copy(alpha = 0.7f) else LocalGeoColors.current.surfaceContainer.copy(alpha = 0.9f)) - .border( - width = if (isCurrent) 1.5.dp else 1.dp, - color = if (isCurrent) LocalGeoColors.current.primary else LocalGeoColors.current.outlineVariant, - shape = RoundedCornerShape(18.dp) - ) - .clickable( - interactionSource = interactionSource, - indication = LocalIndication.current, - role = Role.Button, - onClick = onClick - ) - .padding(10.dp) - .testTag("station_${station.id}"), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) - ) { - Box( - modifier = Modifier - .size(sizeDp) - .clip(RoundedCornerShape(14.dp)) - .background(stationTileColor(station)) - .border(0.8.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(14.dp)) - ) { - AsyncImage( - model = station.iconResId, - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - ) - } - - Column(modifier = Modifier.weight(1f)) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp) - ) { - if (isCurrent && isPlaying) { - LiveOnAirDot() - } - Text( - text = station.name, - style = MaterialTheme.typography.titleSmall.copy( - fontWeight = FontWeight.Bold, - fontSize = 15.sp, - color = if (isCurrent) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurface - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - Text( - text = stationDescription(station), - style = MaterialTheme.typography.bodySmall.copy( - fontSize = 12.sp, - color = LocalGeoColors.current.onSurfaceVariant - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - } -} - -@Composable -private fun StationListRow( - station: RadioStation, - isCurrent: Boolean, - isPlaying: Boolean, - sizeDp: Dp, - onClick: () -> Unit, - interactionSource: MutableInteractionSource, - modifier: Modifier = Modifier -) { - Row( - modifier = modifier - .fillMaxWidth() - .clip(RoundedCornerShape(14.dp)) - .background(if (isCurrent) LocalGeoColors.current.primaryContainer.copy(alpha = 0.6f) else Color.Transparent) - .clickable( - interactionSource = interactionSource, - indication = LocalIndication.current, - role = Role.Button, - onClick = onClick - ) - .padding(horizontal = 10.dp, vertical = 7.dp) - .testTag("station_${station.id}"), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) - ) { - Box( - modifier = Modifier - .size(sizeDp) - .clip(RoundedCornerShape(10.dp)) - .background(stationTileColor(station)) - .border(0.8.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(10.dp)) - ) { - AsyncImage( - model = station.iconResId, - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - ) - } - - Column(modifier = Modifier.weight(1f)) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp) - ) { - if (isCurrent && isPlaying) { - LiveOnAirDot() - } - Text( - text = station.name, - style = MaterialTheme.typography.bodyMedium.copy( - fontWeight = FontWeight.Bold, - color = if (isCurrent) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurface - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - } - } -} - -@Composable -private fun StationDetailsRow( - station: RadioStation, - isCurrent: Boolean, - isPlaying: Boolean, - sizeDp: Dp, - onClick: () -> Unit, - interactionSource: MutableInteractionSource, - modifier: Modifier = Modifier -) { - Row( - modifier = modifier - .fillMaxWidth() - .clip(RoundedCornerShape(14.dp)) - .background(if (isCurrent) LocalGeoColors.current.primaryContainer.copy(alpha = 0.6f) else Color.Transparent) - .border( - width = 0.8.dp, - color = if (isCurrent) LocalGeoColors.current.primary else LocalGeoColors.current.outlineVariant.copy(alpha = 0.6f), - shape = RoundedCornerShape(14.dp) - ) - .clickable( - interactionSource = interactionSource, - indication = LocalIndication.current, - role = Role.Button, - onClick = onClick - ) - .padding(horizontal = 10.dp, vertical = 8.dp) - .testTag("station_${station.id}"), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) - ) { - Box( - modifier = Modifier - .size(sizeDp) - .clip(RoundedCornerShape(10.dp)) - .background(stationTileColor(station)) - .border(0.8.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(10.dp)) - ) { - AsyncImage( - model = station.iconResId, - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - ) - } - - Column(modifier = Modifier.weight(1.3f)) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp) - ) { - if (isCurrent && isPlaying) { - LiveOnAirDot() - } - Text( - text = station.name, - style = MaterialTheme.typography.bodyMedium.copy( - fontWeight = FontWeight.Bold, - color = if (isCurrent) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurface - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - Text( - text = stationDescription(station), - style = MaterialTheme.typography.bodySmall.copy( - fontSize = 11.5.sp, - color = LocalGeoColors.current.onSurfaceVariant - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - - Text( - text = stationGenres(station), - style = MaterialTheme.typography.bodySmall.copy( - fontSize = 11.5.sp, - color = LocalGeoColors.current.primary - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis, - modifier = Modifier.weight(0.9f) - ) - } -} diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationRow.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationRow.kt new file mode 100644 index 0000000..27bc48b --- /dev/null +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/StationRow.kt @@ -0,0 +1,226 @@ +package cc.skysparkle.fogwave.ui.components + +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +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.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +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.graphics.graphicsLayer +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import cc.skysparkle.fogwave.R +import cc.skysparkle.fogwave.data.model.RadioStation +import cc.skysparkle.fogwave.ui.theme.LocalGeoColors + +@Composable +fun LiveOnAirDot(modifier: Modifier = Modifier, size: Dp = 7.dp) { + val infiniteTransition = rememberInfiniteTransition(label = "pulse") + val scale by infiniteTransition.animateFloat( + initialValue = 0.8f, + targetValue = 1.25f, + animationSpec = infiniteRepeatable( + animation = tween(900, easing = FastOutSlowInEasing), + repeatMode = RepeatMode.Reverse + ), + label = "live_pulse" + ) + + Box( + modifier = modifier + .size(size) + .graphicsLayer { + scaleX = scale + scaleY = scale + } + .clip(CircleShape) + .background(LocalGeoColors.current.liveRed) + ) +} + +/** Small red "● LIVE" label used above station names. */ +@Composable +fun LiveLabel(active: Boolean, modifier: Modifier = Modifier) { + Row( + modifier = modifier, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(5.dp) + ) { + if (active) { + LiveOnAirDot(size = 6.dp) + } else { + Box( + modifier = Modifier + .size(6.dp) + .clip(CircleShape) + .background(LocalGeoColors.current.outline) + ) + } + Text( + text = stringResource(R.string.live_label), + style = MaterialTheme.typography.labelSmall.copy( + fontWeight = FontWeight.Bold, + fontSize = 10.sp, + letterSpacing = 1.sp, + color = if (active) LocalGeoColors.current.liveRed else LocalGeoColors.current.outline + ) + ) + } +} + +/** Station logo on its tile color with rounded corners. */ +@Composable +fun StationThumb( + station: RadioStation, + size: Dp, + modifier: Modifier = Modifier, + cornerRadius: Dp = 12.dp +) { + Box( + modifier = modifier + .size(size) + .clip(RoundedCornerShape(cornerRadius)) + .background(stationTileColor(station)) + ) { + Image( + painter = painterResource(id = station.iconResId), + contentDescription = null, + contentScale = ContentScale.Crop, + modifier = Modifier.matchParentSize() + ) + } +} + +/** A row of the station list: logo, name, description and a play / live indicator. */ +@Composable +fun StationRow( + station: RadioStation, + isCurrent: Boolean, + isPlaying: Boolean, + onClick: () -> Unit, + modifier: Modifier = Modifier, + subtitle: String? = null +) { + val colors = LocalGeoColors.current + val bg by animateColorAsState( + targetValue = if (isCurrent) colors.surfaceContainerHigh else Color.Transparent, + label = "station_row_bg" + ) + + Row( + modifier = modifier + .fillMaxWidth() + .clip(RoundedCornerShape(16.dp)) + .background(bg) + .clickable(role = Role.Button, onClick = onClick) + .padding(horizontal = 10.dp, vertical = 8.dp) + .testTag("station_${station.id}"), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(14.dp) + ) { + StationThumb(station = station, size = 48.dp) + + Column(modifier = Modifier.weight(1f)) { + Text( + text = station.name, + style = MaterialTheme.typography.bodyLarge.copy( + fontWeight = FontWeight.Bold, + fontSize = 15.sp, + letterSpacing = 0.sp, + color = if (isCurrent) colors.deepPurple else colors.onSurface + ), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = subtitle ?: stationDescription(station), + style = MaterialTheme.typography.bodySmall.copy( + fontSize = 12.sp, + color = colors.onSurfaceVariant + ), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + + Box( + modifier = Modifier.size(36.dp), + contentAlignment = Alignment.Center + ) { + if (isCurrent && isPlaying) { + LiveBars( + active = true, + color = colors.primary, + modifier = Modifier.size(width = 22.dp, height = 16.dp) + ) + } else { + AppIcon( + resId = R.drawable.ic_play, + contentDescription = stringResource(R.string.play_content_desc), + tint = if (isCurrent) colors.primary else colors.onSurfaceVariant, + size = 18.dp + ) + } + } + } +} + +/** Section title such as "Stations", with an optional trailing count. */ +@Composable +fun SectionHeader(title: String, modifier: Modifier = Modifier, trailing: String? = null) { + Row( + modifier = modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium.copy( + fontWeight = FontWeight.Bold, + fontSize = 17.sp, + letterSpacing = (-0.2).sp, + color = LocalGeoColors.current.onSurface + ), + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + if (trailing != null) { + Text( + text = trailing, + style = MaterialTheme.typography.labelMedium.copy( + fontWeight = FontWeight.Medium, + color = LocalGeoColors.current.onSurfaceVariant + ) + ) + } + } +} diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/TopBrandBar.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/TopBrandBar.kt index 46c348e..390c3a3 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/TopBrandBar.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/TopBrandBar.kt @@ -1,82 +1,173 @@ package cc.skysparkle.fogwave.ui.components +import androidx.compose.animation.AnimatedContent +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.togetherWith 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.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBarsPadding -import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import cc.skysparkle.fogwave.R import cc.skysparkle.fogwave.ui.theme.LocalGeoColors +/** + * Header with the logo on the left, the app name centered and a search action on the right. + * While searching, the title turns into a search field. + */ @Composable -fun TopBrandBar(modifier: Modifier = Modifier) { - Box( +fun TopBrandBar( + modifier: Modifier = Modifier, + showSearch: Boolean = false, + isSearchOpen: Boolean = false, + query: String = "", + onQueryChange: (String) -> Unit = {}, + onOpenSearch: () -> Unit = {}, + onCloseSearch: () -> Unit = {} +) { + val colors = LocalGeoColors.current + + Row( modifier = modifier .fillMaxWidth() - .background(LocalGeoColors.current.surfaceContainer.copy(alpha = 0.92f)) .statusBarsPadding() - .padding(horizontal = 20.dp, vertical = 12.dp) + .padding(start = 20.dp, end = 10.dp, top = 8.dp, bottom = 8.dp) + .height(48.dp) + .testTag("top_brand_bar"), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp) ) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(14.dp), - modifier = Modifier - .fillMaxWidth() - .testTag("top_brand_bar") - ) { - Box( + AppIcon( + resId = R.drawable.ic_fogwave_logo, + contentDescription = stringResource(R.string.fogwave_logo_content_desc), + size = 30.dp + ) + + Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.Center) { + AnimatedContent( + targetState = showSearch && isSearchOpen, + transitionSpec = { fadeIn(tween(180)) togetherWith fadeOut(tween(120)) }, + label = "header_search" + ) { searching -> + if (searching) { + SearchField(query = query, onQueryChange = onQueryChange) + } else { + Text( + text = stringResource(R.string.app_name), + style = MaterialTheme.typography.titleMedium.copy( + fontWeight = FontWeight.Bold, + fontSize = 17.sp, + letterSpacing = 0.sp, + color = colors.deepPurple + ), + modifier = Modifier + .fillMaxWidth() + .semantics { heading() }, + textAlign = TextAlign.Center + ) + } + } + } + + if (showSearch) { + IconButton( + onClick = if (isSearchOpen) onCloseSearch else onOpenSearch, modifier = Modifier .size(40.dp) - .clip(RoundedCornerShape(12.dp)), - contentAlignment = Alignment.Center + .testTag("search_toggle") ) { AppIcon( - resId = R.drawable.ic_fogwave_logo, - size = 34.dp - ) - } - - Column( - verticalArrangement = Arrangement.Center - ) { - Text( - text = stringResource(R.string.app_name), - style = MaterialTheme.typography.titleMedium.copy( - fontWeight = FontWeight.SemiBold, - fontSize = 20.sp, - letterSpacing = (-0.4).sp, - color = LocalGeoColors.current.deepPurple + resId = if (isSearchOpen) R.drawable.ic_close else R.drawable.ic_search, + contentDescription = stringResource( + if (isSearchOpen) R.string.close_content_desc else R.string.search_content_desc ), - modifier = Modifier.semantics { heading() } - ) - Text( - text = stringResource(R.string.app_subtitle), - style = MaterialTheme.typography.labelSmall.copy( - fontWeight = FontWeight.Medium, - fontSize = 11.5.sp, - color = LocalGeoColors.current.onSurfaceVariant, - letterSpacing = 0.2.sp - ) + tint = colors.onSurface, + size = 22.dp ) } + } else { + Box(modifier = Modifier.size(40.dp)) } } } + +@Composable +private fun SearchField(query: String, onQueryChange: (String) -> Unit) { + val colors = LocalGeoColors.current + val focusRequester = remember { FocusRequester() } + val keyboard = LocalSoftwareKeyboardController.current + + LaunchedEffect(Unit) { focusRequester.requestFocus() } + + BasicTextField( + value = query, + onValueChange = onQueryChange, + singleLine = true, + textStyle = MaterialTheme.typography.bodyLarge.copy(color = colors.onSurface, fontSize = 15.sp), + cursorBrush = SolidColor(colors.primary), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search), + keyboardActions = KeyboardActions(onSearch = { keyboard?.hide() }), + modifier = Modifier + .fillMaxWidth() + .focusRequester(focusRequester) + .testTag("search_field"), + decorationBox = { inner -> + Row( + modifier = Modifier + .fillMaxWidth() + .clip(CircleShape) + .background(colors.surfaceContainerHigh) + .padding(horizontal = 14.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp) + ) { + AppIcon(resId = R.drawable.ic_search, tint = colors.onSurfaceVariant, size = 18.dp) + Box(modifier = Modifier.weight(1f)) { + if (query.isEmpty()) { + Text( + text = stringResource(R.string.search_hint), + style = MaterialTheme.typography.bodyLarge.copy( + color = colors.onSurfaceVariant, + fontSize = 15.sp + ), + maxLines = 1 + ) + } + inner() + } + } + } + ) +} diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/ViewOptionsPopover.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/ViewOptionsPopover.kt deleted file mode 100644 index 1d1e0c6..0000000 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/ViewOptionsPopover.kt +++ /dev/null @@ -1,292 +0,0 @@ -package cc.skysparkle.fogwave.ui.components - -import androidx.compose.animation.AnimatedVisibility -import androidx.compose.animation.animateColorAsState -import androidx.compose.animation.core.FastOutLinearInEasing -import androidx.compose.animation.core.Spring -import androidx.compose.animation.core.spring -import androidx.compose.animation.core.tween -import androidx.compose.animation.expandVertically -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut -import androidx.compose.animation.scaleIn -import androidx.compose.animation.scaleOut -import androidx.compose.animation.shrinkVertically -import androidx.compose.foundation.background -import androidx.compose.foundation.border -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.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.selection.selectable -import androidx.compose.foundation.selection.selectableGroup -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Slider -import androidx.compose.material3.SliderDefaults -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.draw.shadow -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.TransformOrigin -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.semantics.contentDescription -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import cc.skysparkle.fogwave.R -import cc.skysparkle.fogwave.data.model.IconSizeStep -import cc.skysparkle.fogwave.data.model.ViewMode -import cc.skysparkle.fogwave.ui.theme.LocalGeoColors -import kotlin.math.roundToInt - -@Composable -fun StationsToolbar( - title: String, - isOpen: Boolean, - onToggleOpen: () -> Unit, - viewMode: ViewMode, - onSelectViewMode: (ViewMode) -> Unit, - sizeStep: IconSizeStep, - onSelectSizeStep: (IconSizeStep) -> Unit, - modifier: Modifier = Modifier, - showViewOptions: Boolean = true -) { - Column( - modifier = modifier - .fillMaxWidth() - .padding(horizontal = 20.dp, vertical = 6.dp) - ) { - Row( - // Same height with or without the view button, so the title does not jump between tabs. - modifier = Modifier.fillMaxWidth().heightIn(min = 38.dp), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically - ) { - Text( - text = title, - style = MaterialTheme.typography.titleLarge.copy( - fontWeight = FontWeight.Bold, - fontSize = 22.sp, - letterSpacing = (-0.4).sp, - color = LocalGeoColors.current.deepPurple - ), - maxLines = 1, - overflow = TextOverflow.Ellipsis, - modifier = Modifier - .weight(1f) - .padding(end = 12.dp) - ) - - if (showViewOptions) { - Box( - modifier = Modifier - .size(38.dp) - .clip(RoundedCornerShape(12.dp)) - .background(if (isOpen) LocalGeoColors.current.primaryContainer else LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(12.dp)) - .clickable(role = Role.Button) { onToggleOpen() } - .testTag("view_options_trigger"), - contentAlignment = Alignment.Center - ) { - AppIcon( - resId = R.drawable.ic_table, - contentDescription = stringResource(R.string.view_mode_content_desc), - tint = if (isOpen) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurfaceVariant, - size = 19.dp - ) - } - } - } - - AnimatedVisibility( - visible = isOpen && showViewOptions, - enter = expandVertically( - animationSpec = spring(dampingRatio = 0.85f, stiffness = Spring.StiffnessMediumLow), - expandFrom = Alignment.Top - ) + fadeIn(tween(200)) + scaleIn( - initialScale = 0.96f, - transformOrigin = TransformOrigin(1f, 0f), - animationSpec = spring(dampingRatio = 0.85f, stiffness = Spring.StiffnessMediumLow) - ), - exit = shrinkVertically( - animationSpec = tween(180, easing = FastOutLinearInEasing), - shrinkTowards = Alignment.Top - ) + fadeOut(tween(140)) + scaleOut( - targetScale = 0.96f, - transformOrigin = TransformOrigin(1f, 0f), - animationSpec = tween(180) - ) - ) { - Column( - modifier = Modifier - .padding(top = 10.dp) - .fillMaxWidth() - .shadow(4.dp, RoundedCornerShape(24.dp)) - .clip(RoundedCornerShape(24.dp)) - .background(LocalGeoColors.current.surfaceContainer) - .border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(24.dp)) - .padding(16.dp), - verticalArrangement = Arrangement.spacedBy(14.dp) - ) { - Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { - Text( - text = stringResource(R.string.display_mode_label), - style = MaterialTheme.typography.labelSmall.copy( - fontWeight = FontWeight.Bold, - fontSize = 10.5.sp, - letterSpacing = 0.8.sp, - color = LocalGeoColors.current.primary - ) - ) - - Row( - modifier = Modifier - .fillMaxWidth() - .clip(RoundedCornerShape(12.dp)) - .background(LocalGeoColors.current.surface) - .border(0.8.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(12.dp)) - .padding(3.dp) - .selectableGroup(), - horizontalArrangement = Arrangement.spacedBy(2.dp) - ) { - ViewModeSegment( - title = stringResource(R.string.view_mode_list), - icon = R.drawable.ic_list, - isSelected = viewMode == ViewMode.LIST, - onClick = { onSelectViewMode(ViewMode.LIST) }, - modifier = Modifier.weight(1f) - ) - ViewModeSegment( - title = stringResource(R.string.view_mode_table), - icon = R.drawable.ic_layout_columns, - isSelected = viewMode == ViewMode.DETAILS, - onClick = { onSelectViewMode(ViewMode.DETAILS) }, - modifier = Modifier.weight(1f) - ) - ViewModeSegment( - title = stringResource(R.string.view_mode_tiles), - icon = R.drawable.ic_layout_rows, - isSelected = viewMode == ViewMode.TILES, - onClick = { onSelectViewMode(ViewMode.TILES) }, - modifier = Modifier.weight(1f) - ) - ViewModeSegment( - title = stringResource(R.string.view_mode_icons), - icon = R.drawable.ic_grid, - isSelected = viewMode == ViewMode.ICONS, - onClick = { onSelectViewMode(ViewMode.ICONS) }, - modifier = Modifier.weight(1f) - ) - } - } - - Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text( - text = stringResource(R.string.size_label), - style = MaterialTheme.typography.labelSmall.copy( - fontWeight = FontWeight.Bold, - fontSize = 10.5.sp, - letterSpacing = 0.8.sp, - color = LocalGeoColors.current.primary - ) - ) - - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(10.dp) - ) { - Text( - text = "S", - style = MaterialTheme.typography.labelMedium.copy( - fontWeight = FontWeight.Bold, - color = LocalGeoColors.current.onSurfaceVariant - ) - ) - - val steps = IconSizeStep.entries - val currentIndex = steps.indexOf(sizeStep).toFloat() - val sizeLabel = stringResource(R.string.size_label) - - Slider( - value = currentIndex, - onValueChange = { indexFloat -> - val step = steps[indexFloat.roundToInt().coerceIn(0, steps.size - 1)] - // The slider reports every drag frame; only persist real changes. - if (step != sizeStep) onSelectSizeStep(step) - }, - valueRange = 0f..(steps.size - 1).toFloat(), - steps = steps.size - 2, - colors = SliderDefaults.colors( - thumbColor = LocalGeoColors.current.primary, - activeTrackColor = LocalGeoColors.current.primary, - inactiveTrackColor = LocalGeoColors.current.outlineVariant - ), - modifier = Modifier - .weight(1f) - .semantics { contentDescription = sizeLabel } - ) - - Text( - text = "XL", - style = MaterialTheme.typography.labelMedium.copy( - fontWeight = FontWeight.Bold, - color = LocalGeoColors.current.onSurfaceVariant - ) - ) - } - } - } - } - } -} - -@Composable -private fun ViewModeSegment( - title: String, - icon: Int, - isSelected: Boolean, - onClick: () -> Unit, - modifier: Modifier = Modifier -) { - val bg by animateColorAsState( - targetValue = if (isSelected) LocalGeoColors.current.primaryContainer else Color.Transparent, - animationSpec = tween(220), - label = "segment_bg" - ) - val tint by animateColorAsState( - targetValue = if (isSelected) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurfaceVariant, - animationSpec = tween(220), - label = "segment_tint" - ) - Box( - modifier = modifier - .height(34.dp) - .clip(RoundedCornerShape(9.dp)) - .background(bg) - .selectable(selected = isSelected, role = Role.RadioButton, onClick = onClick), - contentAlignment = Alignment.Center - ) { - AppIcon( - resId = icon, - contentDescription = title, - tint = tint, - size = 18.dp - ) - } -} diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt index a941951..3ac30fb 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt @@ -12,51 +12,62 @@ import androidx.compose.animation.core.spring import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut -import androidx.compose.animation.scaleIn import androidx.compose.animation.slideInHorizontally import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideOutHorizontally import androidx.compose.animation.slideOutVertically import androidx.compose.animation.togetherWith import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.runtime.Composable 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.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewmodel.compose.viewModel import cc.skysparkle.fogwave.R import cc.skysparkle.fogwave.data.model.AppTab +import cc.skysparkle.fogwave.data.model.Genre +import cc.skysparkle.fogwave.data.model.RadioStation import cc.skysparkle.fogwave.player.PlayerState import cc.skysparkle.fogwave.ui.components.AboutPanel import cc.skysparkle.fogwave.ui.components.BatteryOptimizationDialog import cc.skysparkle.fogwave.ui.components.EqualizerSheet import cc.skysparkle.fogwave.ui.components.FavoritesPanel +import cc.skysparkle.fogwave.ui.components.GenreCarousel import cc.skysparkle.fogwave.ui.components.MiniPlayer -import cc.skysparkle.fogwave.ui.components.MistyMountainBackground import cc.skysparkle.fogwave.ui.components.NavigationTabs import cc.skysparkle.fogwave.ui.components.NowPlayingSheet -import cc.skysparkle.fogwave.ui.components.StationCollection -import cc.skysparkle.fogwave.ui.components.StationsToolbar +import cc.skysparkle.fogwave.ui.components.SectionHeader +import cc.skysparkle.fogwave.ui.components.StationRow import cc.skysparkle.fogwave.ui.components.TopBrandBar +import cc.skysparkle.fogwave.ui.components.stationDescription +import cc.skysparkle.fogwave.ui.theme.LocalGeoColors import cc.skysparkle.fogwave.ui.viewmodel.RadioViewModel @OptIn(ExperimentalAnimationApi::class) @@ -67,6 +78,10 @@ fun HomeScreen( val uiState by viewModel.uiState.collectAsStateWithLifecycle() val isPlaying = uiState.playerState is PlayerState.Playing + var isSearchOpen by rememberSaveable { mutableStateOf(false) } + var query by rememberSaveable { mutableStateOf("") } + var selectedGenre by rememberSaveable { mutableStateOf(null) } + val favoriteStations = remember(uiState.stations, uiState.favorites) { uiState.stations.filter { it.id in uiState.favorites } } @@ -77,11 +92,16 @@ fun HomeScreen( uiState.recents.filter { it.id != uiState.currentStation?.id } } + val closeSearch = { + isSearchOpen = false + query = "" + } + BackHandler(enabled = uiState.isEqualizerPopOpen) { viewModel.closeEqualizerPop() } BackHandler(enabled = uiState.isNowPlayingOpen && !uiState.isEqualizerPopOpen) { viewModel.closeNowPlaying() } - BackHandler(enabled = uiState.isViewPopOpen && !uiState.isNowPlayingOpen) { viewModel.closeViewPop() } + BackHandler(enabled = isSearchOpen && !uiState.isNowPlayingOpen) { closeSearch() } BackHandler( - enabled = uiState.selectedTab != AppTab.RADIO && !uiState.isNowPlayingOpen && !uiState.isViewPopOpen + enabled = uiState.selectedTab != AppTab.RADIO && !uiState.isNowPlayingOpen && !isSearchOpen ) { viewModel.setSelectedTab(AppTab.RADIO) } val showBatteryOptimizationPrompt by viewModel.showBatteryOptimizationPrompt.collectAsStateWithLifecycle() @@ -90,16 +110,23 @@ fun HomeScreen( } val density = LocalDensity.current - var dockHeight by remember { mutableStateOf(140.dp) } + var dockHeight by remember { mutableStateOf(160.dp) } val scrollBottomPadding = dockHeight + 16.dp - Box(modifier = Modifier.fillMaxSize()) { - MistyMountainBackground() - - Column( - modifier = Modifier.fillMaxSize() - ) { - TopBrandBar() + Box( + modifier = Modifier + .fillMaxSize() + .background(LocalGeoColors.current.background) + ) { + Column(modifier = Modifier.fillMaxSize()) { + TopBrandBar( + showSearch = uiState.selectedTab == AppTab.RADIO, + isSearchOpen = isSearchOpen, + query = query, + onQueryChange = { query = it }, + onOpenSearch = { isSearchOpen = true }, + onCloseSearch = closeSearch + ) Box(modifier = Modifier.weight(1f)) { AnimatedContent( @@ -116,75 +143,34 @@ fun HomeScreen( label = "tabs" ) { tab -> when (tab) { - AppTab.RADIO, AppTab.FAVORITES -> { - val isFavorites = tab == AppTab.FAVORITES - Column(modifier = Modifier.fillMaxSize()) { - StationsToolbar( - title = stringResource( - if (isFavorites) R.string.favorite_stations_title else R.string.stations_title - ), - isOpen = uiState.isViewPopOpen, - onToggleOpen = { viewModel.toggleViewPop() }, - viewMode = uiState.viewMode, - onSelectViewMode = { viewModel.setViewMode(it) }, - sizeStep = uiState.sizeStep, - onSelectSizeStep = { viewModel.setSizeStep(it) }, - // View options live on the Radio tab only; Favorites follows that choice. - showViewOptions = !isFavorites - ) + AppTab.RADIO -> RadioTab( + stations = uiState.stations, + currentStation = uiState.currentStation, + isPlaying = isPlaying, + query = query.trim(), + selectedGenre = selectedGenre, + onSelectGenre = { selectedGenre = it }, + onSelectStation = { viewModel.onStationClick(it) }, + bottomContentPadding = scrollBottomPadding + ) - Box(modifier = Modifier.weight(1f)) { - AnimatedContent( - targetState = uiState.viewMode, - transitionSpec = { - (fadeIn(tween(220, delayMillis = 60)) + - scaleIn(initialScale = 0.985f, animationSpec = tween(260))) - .togetherWith(fadeOut(tween(120))) - }, - label = "view_mode" - ) { mode -> - if (isFavorites) { - FavoritesPanel( - favorites = favoriteStations, - currentStation = uiState.currentStation, - isPlaying = isPlaying, - viewMode = mode, - sizeStep = uiState.sizeStep, - onSelectStation = { viewModel.onStationClick(it) }, - onBrowseStations = { viewModel.setSelectedTab(AppTab.RADIO) }, - bottomContentPadding = scrollBottomPadding, - modifier = Modifier.fillMaxSize() - ) - } else { - StationCollection( - stations = uiState.stations, - currentStation = uiState.currentStation, - isPlaying = isPlaying, - viewMode = mode, - sizeStep = uiState.sizeStep, - onSelectStation = { viewModel.onStationClick(it) }, - bottomContentPadding = scrollBottomPadding, - modifier = Modifier.fillMaxSize() - ) - } - } - PopoverScrim( - visible = uiState.isViewPopOpen, - onDismiss = { viewModel.closeViewPop() } - ) - } - } - } + AppTab.FAVORITES -> FavoritesPanel( + favorites = favoriteStations, + currentStation = uiState.currentStation, + isPlaying = isPlaying, + onSelectStation = { viewModel.onStationClick(it) }, + onBrowseStations = { viewModel.setSelectedTab(AppTab.RADIO) }, + bottomContentPadding = scrollBottomPadding, + modifier = Modifier.fillMaxSize() + ) - AppTab.ABOUT -> { - Column( - modifier = Modifier - .fillMaxSize() - .verticalScroll(rememberScrollState()) - .padding(bottom = scrollBottomPadding) - ) { - AboutPanel() - } + AppTab.ABOUT -> Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(bottom = scrollBottomPadding) + ) { + AboutPanel() } } } @@ -206,13 +192,6 @@ fun HomeScreen( // even when the mini player is swiped away. .navigationBarsPadding() ) { - NavigationTabs( - selectedTab = uiState.selectedTab, - favoritesCount = uiState.unseenFavoritesCount, - onTabSelected = { viewModel.setSelectedTab(it) }, - modifier = Modifier.padding(horizontal = 20.dp, vertical = 6.dp) - ) - AnimatedVisibility( visible = !uiState.isMiniPlayerHidden, enter = fadeIn() + slideInVertically(initialOffsetY = { it }), @@ -221,13 +200,22 @@ fun HomeScreen( MiniPlayer( station = uiState.currentStation, playerState = uiState.playerState, + trackTitle = uiState.nowPlayingTitle, onTogglePlay = { viewModel.togglePlay() }, - onPrevious = { viewModel.previousStation() }, - onNext = { viewModel.nextStation() }, onOpenNowPlaying = { viewModel.openNowPlaying() }, onHide = { viewModel.hideMiniPlayer() } ) } + + NavigationTabs( + selectedTab = uiState.selectedTab, + favoritesCount = uiState.unseenFavoritesCount, + onTabSelected = { + closeSearch() + viewModel.setSelectedTab(it) + }, + modifier = Modifier.padding(horizontal = 20.dp, vertical = 6.dp) + ) } AnimatedVisibility( @@ -239,6 +227,8 @@ fun HomeScreen( NowPlayingSheet( station = uiState.currentStation, playerState = uiState.playerState, + trackTitle = uiState.nowPlayingTitle, + trackHistory = uiState.trackHistory, isFavorite = isCurFav, onToggleFavorite = { viewModel.toggleFavorite() }, onTogglePlay = { viewModel.togglePlay() }, @@ -286,22 +276,83 @@ fun HomeScreen( } } +/** Genre cards on top, then the (filtered) station list. */ @Composable -private fun PopoverScrim(visible: Boolean, onDismiss: () -> Unit) { - AnimatedVisibility( - visible = visible, - enter = fadeIn(tween(200)), - exit = fadeOut(tween(160)) +private fun RadioTab( + stations: List, + currentStation: RadioStation?, + isPlaying: Boolean, + query: String, + selectedGenre: Genre?, + onSelectGenre: (Genre?) -> Unit, + onSelectStation: (RadioStation) -> Unit, + bottomContentPadding: Dp +) { + val descriptions = stations.associate { it.id to stationDescription(it) } + val visible = remember(stations, query, selectedGenre, descriptions) { + stations.filter { station -> + (selectedGenre == null || selectedGenre in station.genres) && + (query.isEmpty() || + station.name.contains(query, ignoreCase = true) || + descriptions[station.id].orEmpty().contains(query, ignoreCase = true)) + } + } + + LazyColumn( + contentPadding = PaddingValues(top = 4.dp, bottom = bottomContentPadding), + modifier = Modifier.fillMaxSize() ) { - Box( - modifier = Modifier - .fillMaxSize() - .background(Color.Black.copy(alpha = 0.38f)) - .clickable( - interactionSource = remember { MutableInteractionSource() }, - indication = null, - onClick = onDismiss + if (query.isEmpty()) { + item(key = "genres") { + GenreCarousel( + stations = stations, + selectedGenre = selectedGenre, + onSelectGenre = onSelectGenre, + modifier = Modifier.padding(bottom = 22.dp) ) - ) + } + } + + item(key = "header") { + SectionHeader( + title = when { + query.isNotEmpty() -> stringResource(R.string.search_results_title) + selectedGenre != null -> stringResource(selectedGenre.labelRes) + else -> stringResource(R.string.stations_title) + }, + trailing = pluralStringResource(R.plurals.station_count, visible.size, visible.size), + modifier = Modifier.padding(start = 20.dp, end = 20.dp, bottom = 8.dp) + ) + } + + if (visible.isEmpty()) { + item(key = "empty") { + Text( + text = stringResource(R.string.search_no_results, query), + style = MaterialTheme.typography.bodyMedium.copy( + color = LocalGeoColors.current.onSurfaceVariant, + textAlign = TextAlign.Center + ), + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 32.dp, vertical = 32.dp) + ) + } + } + + items(visible, key = { it.id }) { station -> + val isCur = station.id == currentStation?.id + StationRow( + station = station, + isCurrent = isCur, + isPlaying = isCur && isPlaying, + onClick = { onSelectStation(station) }, + modifier = Modifier + .padding(horizontal = 10.dp, vertical = 1.dp) + .animateItem() + ) + } + + item(key = "spacer") { Spacer(modifier = Modifier.height(8.dp)) } } } diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/theme/Color.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/theme/Color.kt index 61c607e..898ca51 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/theme/Color.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/theme/Color.kt @@ -26,33 +26,34 @@ data class GeoColors( val accentLavender: Color, val onAccentLavender: Color, val deepPurple: Color, - val liveGreen: Color, + val liveRed: Color, val redFavorite: Color ) +// Dark take on the "Rad.io" layout: deep navy surfaces with an electric-blue accent. val DarkGeoColors = GeoColors( - background = Color(0xFF141218), - onBackground = Color(0xFFE6E0E9), - surface = Color(0xFF141218), - onSurface = Color(0xFFE6E0E9), - surfaceContainer = Color(0xFF211F26), - surfaceContainerHigh = Color(0xFF2B2930), - onSurfaceVariant = Color(0xFFCAC4D0), - outline = Color(0xFF938F99), - outlineVariant = Color(0xFF49454F), - primary = Color(0xFFD0BCFF), - onPrimary = Color(0xFF381E72), - primaryContainer = Color(0xFF4F378B), - onPrimaryContainer = Color(0xFFEADDFF), - secondary = Color(0xFFCCC2DC), - onSecondary = Color(0xFF332D41), - secondaryContainer = Color(0xFF4A4458), - onSecondaryContainer = Color(0xFFE8DEF8), - accentLavender = Color(0xFF4F378B), - onAccentLavender = Color(0xFFEADDFF), - deepPurple = Color(0xFFD0BCFF), - liveGreen = Color(0xFF81C995), - redFavorite = Color(0xFFF2B8B5) + background = Color(0xFF0D1016), + onBackground = Color(0xFFEEF1F7), + surface = Color(0xFF0D1016), + onSurface = Color(0xFFEEF1F7), + surfaceContainer = Color(0xFF161A23), + surfaceContainerHigh = Color(0xFF1F2430), + onSurfaceVariant = Color(0xFF98A1B3), + outline = Color(0xFF5C6577), + outlineVariant = Color(0xFF272D3A), + primary = Color(0xFF7C9DFF), + onPrimary = Color(0xFF0B1A47), + primaryContainer = Color(0xFF1F2D5C), + onPrimaryContainer = Color(0xFFDCE4FF), + secondary = Color(0xFFB2C1E6), + onSecondary = Color(0xFF18233F), + secondaryContainer = Color(0xFF283350), + onSecondaryContainer = Color(0xFFDCE4FF), + accentLavender = Color(0xFF3466F6), + onAccentLavender = Color(0xFFFFFFFF), + deepPurple = Color(0xFFF3F6FF), + liveRed = Color(0xFFFF4D5E), + redFavorite = Color(0xFFFF6B81) ) val LocalGeoColors = staticCompositionLocalOf { DarkGeoColors } diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/viewmodel/RadioViewModel.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/viewmodel/RadioViewModel.kt index 65ac4d3..3317c71 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/viewmodel/RadioViewModel.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/viewmodel/RadioViewModel.kt @@ -8,9 +8,8 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope import cc.skysparkle.fogwave.data.model.AppTab import cc.skysparkle.fogwave.data.model.ExtraPlayerTab -import cc.skysparkle.fogwave.data.model.IconSizeStep import cc.skysparkle.fogwave.data.model.RadioStation -import cc.skysparkle.fogwave.data.model.ViewMode +import cc.skysparkle.fogwave.data.model.TrackEntry import cc.skysparkle.fogwave.data.repository.RadioRepository import cc.skysparkle.fogwave.player.AudioEffectsController import cc.skysparkle.fogwave.player.AudioEffectsState @@ -32,15 +31,14 @@ data class RadioUiState( val favorites: Set = emptySet(), val recents: List = emptyList(), val selectedTab: AppTab = AppTab.RADIO, - val viewMode: ViewMode = ViewMode.ICONS, - val sizeStep: IconSizeStep = IconSizeStep.M, val isNowPlayingOpen: Boolean = false, val isEqualizerPopOpen: Boolean = false, - val isViewPopOpen: Boolean = false, - val activeExtraTab: ExtraPlayerTab = ExtraPlayerTab.RECENT, + val activeExtraTab: ExtraPlayerTab = ExtraPlayerTab.HISTORY, val audioEffects: AudioEffectsState = AudioEffectsState(), val isMiniPlayerHidden: Boolean = false, - val unseenFavoritesCount: Int = 0 + val unseenFavoritesCount: Int = 0, + val nowPlayingTitle: String? = null, + val trackHistory: List = emptyList() ) class RadioViewModel(application: Application) : AndroidViewModel(application) { @@ -60,10 +58,12 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { private val _selectedTab = MutableStateFlow(AppTab.RADIO) private val _isNowPlayingOpen = MutableStateFlow(false) private val _isEqualizerPopOpen = MutableStateFlow(false) - private val _isViewPopOpen = MutableStateFlow(false) - private val _activeExtraTab = MutableStateFlow(ExtraPlayerTab.RECENT) + private val _activeExtraTab = MutableStateFlow(ExtraPlayerTab.HISTORY) private val _isMiniPlayerHidden = MutableStateFlow(false) + // Newest first; kept for this session only. + private val _trackHistory = MutableStateFlow>(emptyList()) + private val _showBatteryOptimizationPrompt = MutableStateFlow(false) val showBatteryOptimizationPrompt: StateFlow = _showBatteryOptimizationPrompt.asStateFlow() @@ -83,16 +83,15 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { repository.favoritesFlow, repository.recentsFlow, _selectedTab, - repository.viewModeFlow, - repository.sizeStepFlow, _isNowPlayingOpen, _isEqualizerPopOpen, - _isViewPopOpen, _activeExtraTab, AudioEffectsController.state, _isMiniPlayerHidden, repository.seenFavoritesFlow, - _stations + _stations, + playerManager.nowPlayingTitle, + _trackHistory ) { params -> val current = params[0] as? RadioStation val pState = params[1] as PlayerState @@ -101,18 +100,18 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { @Suppress("UNCHECKED_CAST") val recentsIds = params[3] as List val tab = params[4] as AppTab - val mode = params[5] as ViewMode - val size = params[6] as IconSizeStep - val nowPlaying = params[7] as Boolean - val eqPop = params[8] as Boolean - val viewPop = params[9] as Boolean - val extraTab = params[10] as ExtraPlayerTab - val effects = params[11] as AudioEffectsState - val miniHidden = params[12] as Boolean + val nowPlaying = params[5] as Boolean + val eqPop = params[6] as Boolean + val extraTab = params[7] as ExtraPlayerTab + val effects = params[8] as AudioEffectsState + val miniHidden = params[9] as Boolean @Suppress("UNCHECKED_CAST") - val seenFavs = params[13] as Set + val seenFavs = params[10] as Set @Suppress("UNCHECKED_CAST") - val orderedStations = params[14] as List + val orderedStations = params[11] as List + val songTitle = params[12] as String? + @Suppress("UNCHECKED_CAST") + val history = params[13] as List val byId = orderedStations.associateBy { it.id } val recentsList = recentsIds.mapNotNull { byId[it] } @@ -124,15 +123,14 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { favorites = favs, recents = recentsList, selectedTab = tab, - viewMode = mode, - sizeStep = size, isNowPlayingOpen = nowPlaying, isEqualizerPopOpen = eqPop, - isViewPopOpen = viewPop, activeExtraTab = extraTab, audioEffects = effects, isMiniPlayerHidden = miniHidden, - unseenFavoritesCount = favs.count { it !in seenFavs } + unseenFavoritesCount = favs.count { it !in seenFavs }, + nowPlayingTitle = songTitle, + trackHistory = history ) }.stateIn( scope = viewModelScope, @@ -141,8 +139,6 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { stations = stations, currentStation = initialStation, favorites = repository.favoritesFlow.value, - viewMode = repository.viewModeFlow.value, - sizeStep = repository.sizeStepFlow.value, audioEffects = AudioEffectsController.state.value, unseenFavoritesCount = repository.favoritesFlow.value.count { it !in repository.seenFavoritesFlow.value } ) @@ -159,6 +155,20 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { } } } + viewModelScope.launch { + playerManager.nowPlayingTitle.collect { title -> + val stationId = playerManager.currentMediaId.value ?: _currentStation.value?.id + if (title != null && stationId != null) recordTrack(stationId, title) + } + } + } + + private fun recordTrack(stationId: String, title: String) { + val history = _trackHistory.value + val last = history.firstOrNull { it.stationId == stationId } + if (last?.title == title) return + _trackHistory.value = (listOf(TrackEntry(stationId, title, System.currentTimeMillis())) + history) + .take(MAX_TRACK_HISTORY) } /** Tap on a station tile: open the player for the station already on air, otherwise tune in. */ @@ -273,20 +283,11 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { fun setSelectedTab(tab: AppTab) { _selectedTab.value = tab - _isViewPopOpen.value = false if (tab == AppTab.FAVORITES) { repository.markFavoritesSeen(repository.favoritesFlow.value) } } - fun setViewMode(mode: ViewMode) { - repository.setViewMode(mode) - } - - fun setSizeStep(step: IconSizeStep) { - repository.setSizeStep(step) - } - fun openNowPlaying() { _isNowPlayingOpen.value = true } @@ -304,14 +305,6 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { _isEqualizerPopOpen.value = false } - fun toggleViewPop() { - _isViewPopOpen.value = !_isViewPopOpen.value - } - - fun closeViewPop() { - _isViewPopOpen.value = false - } - fun setActiveExtraTab(tab: ExtraPlayerTab) { _activeExtraTab.value = tab } @@ -320,4 +313,8 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) { super.onCleared() playerManager.release() } + + private companion object { + const val MAX_TRACK_HISTORY = 60 + } } diff --git a/app/src/main/res/drawable-nodpi/bg_misty_mountain.webp b/app/src/main/res/drawable-nodpi/bg_misty_mountain.webp deleted file mode 100644 index bb5740a33eb736bf72dfbe5d893e6be3127aa637..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64242 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 diff --git a/app/src/main/res/drawable-nodpi/ic_grid.webp b/app/src/main/res/drawable-nodpi/ic_grid.webp deleted file mode 100644 index 11adca3e9781bca79e26dd9e73ffa61a29859661..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 952 zcmV;p14sN)Nk&Gn0{{S5MM6+kP&iDa0{{Ro|G+;Gpx`!=BuQcb^Z!?0mEqPA^mu9vp!|0g0*ribE}7siAr@>$Hp5NCJRwj2(z^2qAQfKnP)Z z62nQ?_rlLlwhI?|{8SRkC3L0T$ue&-Fq!d+Dh=Xb>Uqn{4Qm=N!iBd+8?+GF7+ zE4ZT0AN|T>;UEx?#94@XC2}VQIsYto45Azh=U4v*p)}i1&a6bGB6EWr&56qgk=JA~ zQSzz#e2TPHiO1syo!eOm*zWC}W#N7vS-Ri{2JKvjat;jjnM#sJpRF zj{+<#ZUPpc+zNdd4eNM_^m!3rQ4$rT$GivIFpjq9cuk~U3TVpO0vT(R3Br2Cb~zka zi(Mpt49zinQOBbwh8N9`cIbL_H?`Wuum3|&{VOo^)ZxCnx_1BWilTU{@9rhVTNsud z!b{6tS{3o+hMJeV70w=A`DCziS1d91@a66(z`XS?uqh<8-i>Hi@no2KR|`99-rS*j zcc~9TQdsYDrg67g*1IL6)IGx{uXl|{+xU9-gBWb~b{BYr?bPmOCZGjR!iB@MyTV$v zyAzSViSs+JDnw6^W)SCh zo)H%Ax_S-9-4glr?iYq>cR&u&?qcL|r$p4jz(X<5jN~Vz%sBVBQ@cRgwYzL|HEcP> zBE}!K-7y;IC$~E%nb!iIH}|;x4xmRIcMH4tkdL!5T$lG0b^p7U{F=MXkYTofM!n_4 zb(x5NC aHep!7pW!bX3k${Yl3hfOPhbD>eHjSA3d#2X diff --git a/app/src/main/res/drawable-nodpi/ic_layout_columns.webp b/app/src/main/res/drawable-nodpi/ic_layout_columns.webp deleted file mode 100644 index 215b6a6bec5674f70d31e03ad877e791f53dce76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 678 zcmV;X0$Kf1Nk&GV0ssJ4MM6+kP&iDH0ssIn|G+;G9?6mI)~%$Mf7l*L6bN06e`O#O zAOi-##Z8KP1!)_wC_58CkZq%Ow3`jB6W~Ap|NJj@W4Y0Ws@OOY%8058>Jqh2qLWek z)FbOSv0)ugC9=*E8P?g|i|3>)UV z`t!^(pZwRKc>@!i!)nzu)NFLIF}gI-Qe(h&v8cm3Eb}$&W0_CESBz=C$7jJb-`Q!t zv&(#PUv`E9^I_uFR+^eI(qk+kirzZ@L?f$KOnu0tvAq@LMJoQKi&8bB?Z0@WY-9{9(i?TzIZKF1{n;oqaU_bx={J-pj;=vzKwm+CGo~r%>Pnk(M zBGn#3M6UnHH$C8@$dDmL?N>lWpe(O15SJj8AN%q6TzkG>YPFZiV_EpmAAfh1a;Lc< z522L#+%Mh!BZqx_h1#DcB^MC21PK$A4n#~3lQy(% zKmY&Q9zlO}2TGEmi0}kW>VOHI_?QDPiu;sFY~iUuB8wc`Xfg>aQjGzMsmQ>TuWP~u zl7WbCK;N$%5EEw&8Av>-PB_#D(d715o&>|pyV=YBthWm|GS^m)C2`h^S|XtYkfj3& z|C%7amZCDVw{U#$q4=KeSCBO=68=TkK&$7e^7I_)sV1td;|ZD zz}C&3b5Ce?AK$Kpt#@c~ zz6Ue0CdjV^_^rF^RskNF~nf(AGi8Qt<2>${A@8tDQs$G3_yBpZ4a;`@1K_Pd^@Q33MPN|lT9Vd?2grR)9t zqgvv=xO(vY;v;~)PmiM-YJp0bO+Xi+6E-EV&F%}~?-Ua;_Cg;rSZvhj!o=h@;N3)} OYs(|-=l`GomjwX&V^YBY diff --git a/app/src/main/res/drawable-nodpi/ic_list.webp b/app/src/main/res/drawable-nodpi/ic_list.webp deleted file mode 100644 index 9bab3cc193787ca997d99a84477f8e39971e299b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 922 zcmV;L17-YDNk&GJ0{{S5MM6+kP&iD50{{Ro|G+;Gkl?nFBuUKw|9WP2w=&WZxpyf@ z+ki#cA&|7i?wlao=4eNo+0f<+vX#2IXff$a8k1TqSHH3A%j-X0|M9m4Z~!0x057a3 z4q&zj;bQ?G61WGV?+5@z_3SPX1eU&EI8dUV)MOh06%8tYa+?6!mt&9Znn1Zt01YB| zZblRwF(VX{9~MW<2nJ__@W=Twsoo?M15peX;pg?1I;yGYw_TK^>f1D$NX{y}+$1~; zizc`mY$N^A698_TG$T+ezzINQ-LZd2$9p7oXWa9KD#Vz(7nS!*CjjX7kYmT?Y`?1< zcrPp}{NG{KS71XWa1I`Rws}jWKw*D0utDX@Bw$^-Kr01 zoq}{ANP)ek4z_jSX+njoL3js5U84_^^rGIpQ`AJfTW|}DZo@mZsET*$`n+3}CsCI> zerj4aQxDdjg0ZccTuDyNOy&MgTjHyJDb| z_pJ@{6aZhx-RtZDp!K*r{BI@o)ayU6S9R*CiRWGA#}A2nlWA9R2#X1wa0o|cohsuJ z0!8%{%^Pr4%A_>hyxXGGX~(Iuql%wjZ_Yr|&M&&+y!!_}Mtmb*CLy$_I6bA=7%?4a zMzC79rKG`Hue)l72t<$!*cqkW8hjGofr)vy%1r`o0*x2-;obWAT6fjY4ewIN9*Jm3 z-l;`5xyf!>)HJ+Pi+&Dxw|%0{v#4IMkrA2w{}BXAt32iYeo>t-F^R;odq9 wrRw7ePWxY?_9hjo4FVwQyrK@3BG+9FAOLuAJ$uTR59j*w`j6Lt{5=5-00pPHTL1t6 diff --git a/app/src/main/res/drawable-nodpi/ic_table.webp b/app/src/main/res/drawable-nodpi/ic_table.webp deleted file mode 100644 index fda6abca0e6158b33706760ee9d1175523953839..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 644 zcmV-~0(<>ZNk&F|0ssJ4MM6+kP&iC*0ssIn|G+;G2{mrpMz)hJ|Nn7n^qwR7KLPy0 zh*6PcV4kNJlsjqaX60xB+F39s=|?n6`(#cbWAt`NkR-Q_q{ROpz2^K0 z0tj-9fS}0#(GaF>8yWil#qGwRk)$wFWq`8&DdTX)2$Cd2-DhKVZg6_zgZBCMAMcle zjUNE}df=dcw@0|w0|h+5Bp-tN+hZdP)I=07?*I%gHWW!DX9os9{KUWqZUgb7t z?>|=Qfc49cL-XW=N`aLMc(Bl%h_qnZKV(SdK+?5uYjIs^@L`&71K?z6qqUn`D4OHU z@s-}HxLfcwY)}hirxc99z?6QV{dfeqVSYhO*47Ka(*#A}2)N#Xwe~Nc znLwUst_LLHOBVYkiUSvu!79Inp4d?TrpXqI_F*2?LwkWI&`(-*?=oZKu8oz?Hy)#V z9S!o1(s+T@mKf4@&_~QWOAr`I#FKQNwGyoxnPj2umK3KW(e-FgjtHAlXBZe%2 z_Zui#P68`+OYZjfyW5JXiibR(b}njqYYH%FAAH?}VaL3tz*Kc*m#yGpy01`x-g?C?emxbfCwCV3 zuc{uig8y9#n9`@tdGoT}d0Av9IZEyeab{PPLT00&9 diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml new file mode 100644 index 0000000..ede74b1 --- /dev/null +++ b/app/src/main/res/drawable/ic_close.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/ic_music_note.xml b/app/src/main/res/drawable/ic_music_note.xml new file mode 100644 index 0000000..260c062 --- /dev/null +++ b/app/src/main/res/drawable/ic_music_note.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 0000000..930fbc9 --- /dev/null +++ b/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml new file mode 100644 index 0000000..eba988a --- /dev/null +++ b/app/src/main/res/drawable/ic_share.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index da6414f..d03ee32 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,5 @@ Fogwave - Internetradio Version %1$s Ein schneller, eleganter Internetradio-Player mit klarem Klang und ausgewogenem geometrischem Design. @@ -9,9 +8,7 @@ Fogwave-Logo Verbindung wird hergestellt… - Auf Sendung Gestoppt - Läuft gerade • LIVE LÄUFT GERADE Schließen Equalizer @@ -40,19 +37,11 @@ Status Auf Sendung • Livestream - Anzeigemodus - ANZEIGEMODUS - Liste - Tabelle - Kacheln - Symbole - GRÖSSE Noch keine Favoriten Öffne den Player eines beliebigen Senders und tippe auf das Herz, um ihn zu den Favoriten hinzuzufügen. Sender - Lieblingssender Radio Favoriten @@ -112,4 +101,21 @@ Jazz Pop Rock + + LIVE + Suchen + Sender suchen + Suchergebnisse + Keine Sender passend zu „%1$s“ + Alle Sender + + %d Sender + %d Sender + + Titel + Songs, die der Sender ansagt, erscheinen hier, während du zuhörst. + Läuft gerade + Teilen + Ich höre %1$s mit Fogwave + Ich höre „%1$s“ auf %2$s mit Fogwave diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8e87f5c..f44d568 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,6 +1,5 @@ Fogwave - インターネットラジオ バージョン %1$s クリアなサウンドと調和のとれた幾何学的デザインを備えた、高速でエレガントなインターネットラジオプレーヤー。 @@ -9,9 +8,7 @@ Fogwave ロゴ 接続中… - オンエア中 停止中 - 再生中 • ライブ 再生中 閉じる イコライザー @@ -40,19 +37,11 @@ 状態 オンエア中 • ライブストリーム - 表示モード - 表示モード - リスト - テーブル - タイル - アイコン - サイズ お気に入りはまだありません 好きな局のプレーヤーを開き、ハートをタップしてお気に入りに追加してください。 ラジオ局 - お気に入りの局 ラジオ お気に入り @@ -112,4 +101,20 @@ ジャズ ポップ ロック + + ライブ + 検索 + 局を検索 + 検索結果 + 「%1$s」に一致する局はありません + すべての局 + + %d 局 + + 曲 + 聴いている間、局が配信する曲名がここに表示されます。 + 再生中 + 共有 + Fogwaveで%1$sを聴いています + Fogwaveで%2$sの「%1$s」を聴いています diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 790d45f..7f1351e 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1,6 +1,5 @@ Fogwave - Interneto radijas Versija %1$s Greitas ir elegantiškas interneto radijo grotuvas su švariu garsu ir darniu geometriniu dizainu. @@ -9,9 +8,7 @@ Fogwave logotipas Jungiamasi… - Eteryje Sustabdyta - Dabar skamba • tiesiogiai DABAR SKAMBA Uždaryti Ekvalaizeris @@ -40,19 +37,11 @@ Būsena Eteryje • tiesioginė transliacija - Rodymo būdas - RODYMO BŪDAS - Sąrašas - Lentelė - Plytelės - Piktogramos - DYDIS Mėgstamų kol kas nėra Atverkite bet kurios stoties grotuvą ir bakstelėkite širdelę, kad pridėtumėte ją prie mėgstamų. Stotys - Mėgstamos stotys Radijas Mėgstami @@ -112,4 +101,23 @@ Džiazas Pop Rokas + + TIESIOGIAI + Ieškoti + Ieškoti stočių + Paieškos rezultatai + Nėra stočių pagal „%1$s“ + Visos stotys + + %d stotis + %d stotys + %d stoties + %d stočių + + Kūriniai + Čia bus rodomos dainos, kurias skelbia stotis, kol klausotės. + Dabar skamba + Bendrinti + Klausausi %1$s per Fogwave + Klausausi „%1$s“ per %2$s su Fogwave diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fb88939..0423a4b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,6 +1,5 @@ Fogwave - Интернет-радио Версия %1$s Быстрый и элегантный плеер интернет-радио с чистым звуком и гармоничным геометрическим дизайном. @@ -9,9 +8,7 @@ Логотип Fogwave Подключение… - В эфире Остановлено - Сейчас играет • прямой эфир СЕЙЧАС ИГРАЕТ Закрыть Эквалайзер @@ -40,19 +37,11 @@ Статус В эфире • прямая трансляция - Вид отображения - РЕЖИМ ОТОБРАЖЕНИЯ - Список - Таблица - Плитки - Значки - РАЗМЕР В любимых пока ничего нет Откройте плеер любой станции и нажмите на сердечко, чтобы добавить её в список любимых. Станции - Любимые станции Радио Любимые @@ -112,4 +101,23 @@ Джаз Поп Рок + + В ЭФИРЕ + Поиск + Поиск станций + Результаты поиска + Нет станций по запросу «%1$s» + Все станции + + %d станция + %d станции + %d станций + %d станции + + Треки + Здесь появятся песни, которые объявляет станция, пока вы слушаете. + Сейчас играет + Поделиться + Слушаю %1$s в Fogwave + Слушаю «%1$s» на %2$s в Fogwave diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 2037b6d..ffb89f3 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1,6 +1,5 @@ Fogwave - 网络电台 版本 %1$s 音质清晰、几何设计和谐统一的快速优雅网络电台播放器。 @@ -9,9 +8,7 @@ Fogwave 标志 正在连接… - 正在直播 已停止 - 正在播放 • 直播 正在播放 关闭 均衡器 @@ -40,19 +37,11 @@ 状态 正在直播 • 实时音频流 - 显示模式 - 显示模式 - 列表 - 表格 - 磁贴 - 图标 - 大小 收藏夹还是空的 打开任意电台的播放器,点击心形图标即可将其加入收藏。 电台 - 收藏的电台 电台 收藏 @@ -112,4 +101,20 @@ 爵士 流行 摇滚 + + 直播 + 搜索 + 搜索电台 + 搜索结果 + 没有与“%1$s”匹配的电台 + 全部电台 + + %d 个电台 + + 曲目 + 收听时,电台播报的歌曲会显示在这里。 + 正在播放 + 分享 + 我正在用 Fogwave 收听 %1$s + 我正在用 Fogwave 收听 %2$s 的“%1$s” diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4219aed..3c3ab33 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,4 +1,4 @@ - #FF141218 + #FF0D1016 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9a8f95e..ea94fdc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,5 @@ Fogwave - Internet Radio Version %1$s A fast, elegant internet radio player with clean sound and a balanced geometric design. @@ -9,9 +8,7 @@ Fogwave logo Connecting… - On air Stopped - Now playing • LIVE NOW PLAYING Close Equalizer @@ -44,19 +41,11 @@ Status On air • Live Stream - Display mode - DISPLAY MODE - List - Table - Tiles - Icons - SIZE Nothing in favorites yet Open any station\'s player and tap the heart to add it to favorites. Stations - Favorite Stations Radio Favorites @@ -112,4 +101,21 @@ Jazz Pop Rock + + LIVE + Search + Search stations + Search results + No stations match “%1$s” + All stations + + %d station + %d stations + + Tracks + Songs the station announces will show up here while you listen. + Now playing + Share + I\'m listening to %1$s on Fogwave + I\'m listening to “%1$s” on %2$s with Fogwave diff --git a/app/src/test/java/cc/skysparkle/fogwave/StationItemScreenshotTest.kt b/app/src/test/java/cc/skysparkle/fogwave/StationRowScreenshotTest.kt similarity index 79% rename from app/src/test/java/cc/skysparkle/fogwave/StationItemScreenshotTest.kt rename to app/src/test/java/cc/skysparkle/fogwave/StationRowScreenshotTest.kt index b21ba44..d492a51 100644 --- a/app/src/test/java/cc/skysparkle/fogwave/StationItemScreenshotTest.kt +++ b/app/src/test/java/cc/skysparkle/fogwave/StationRowScreenshotTest.kt @@ -3,10 +3,8 @@ package cc.skysparkle.fogwave import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onRoot import cc.skysparkle.fogwave.data.model.Genre -import cc.skysparkle.fogwave.data.model.IconSizeStep import cc.skysparkle.fogwave.data.model.RadioStation -import cc.skysparkle.fogwave.data.model.ViewMode -import cc.skysparkle.fogwave.ui.components.StationItem +import cc.skysparkle.fogwave.ui.components.StationRow import cc.skysparkle.fogwave.ui.theme.FogwaveTheme import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers import com.github.takahirom.roborazzi.captureRoboImage @@ -20,7 +18,7 @@ import org.robolectric.annotation.GraphicsMode @RunWith(RobolectricTestRunner::class) @GraphicsMode(GraphicsMode.Mode.NATIVE) @Config(qualifiers = RobolectricDeviceQualifiers.Pixel8, sdk = [36]) -class StationItemScreenshotTest { +class StationRowScreenshotTest { @get:Rule val composeTestRule = createComposeRule() private val station = RadioStation( @@ -34,20 +32,18 @@ class StationItemScreenshotTest { ) @Test - fun stationItem_list_screenshot() { + fun stationRow_screenshot() { composeTestRule.setContent { FogwaveTheme { - StationItem( + StationRow( station = station, isCurrent = true, isPlaying = false, - viewMode = ViewMode.LIST, - sizeStep = IconSizeStep.M, onClick = {} ) } } - composeTestRule.onRoot().captureRoboImage(filePath = "src/test/screenshots/station_item.png") + composeTestRule.onRoot().captureRoboImage(filePath = "src/test/screenshots/station_row.png") } } diff --git a/fastlane/metadata/android/de/full_description.txt b/fastlane/metadata/android/de/full_description.txt index 1a46785..976e32b 100644 --- a/fastlane/metadata/android/de/full_description.txt +++ b/fastlane/metadata/android/de/full_description.txt @@ -6,7 +6,7 @@
  • Genieße deinen Lieblingsklang mit Equalizer, gespeicherten Einstellungen, Lautstärkeverstärkung und Audio-Presets.
  • Hör einfach weiter: Bricht der Stream oder das Netz ab, verbindet sich die App automatisch neu.
  • Nimm das Radio mit auf die Straße – mit Android-Auto-Unterstützung.
  • -
  • Finde Sender auf deine Art: Favoriten, zuletzt gehörte Sender, passende Genres und vier Ansichten.
  • +
  • Finde Sender auf deine Art: Genre-Karten, Suche, Favoriten, zuletzt gehörte und ähnliche Sender – dazu der laufende Song und ein Titelverlauf.
  • Wähle einen Sender und tippe auf Wiedergabe. Fogwave spielt im Hintergrund weiter und speichert deine Equalizer-Einstellungen für das nächste Mal. Das dunkle, aufgeräumte Design gibt es auf Englisch, Russisch, Deutsch, Japanisch, Litauisch und Chinesisch.

    diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 4fda65d..2c6ea56 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -6,7 +6,7 @@
  • Enjoy your favorite sound with an equalizer, saved settings, loudness boost, and audio presets.
  • Get back to listening easily with auto-reconnect when your stream or network drops.
  • Take radio on the road with Android Auto support.
  • -
  • Find stations your way with favorites, recently played stations, genre matches, and four viewing layouts.
  • +
  • Find stations your way with genre cards, search, favorites, recently played and similar stations, and see the song that is on air with a track history.
  • Choose a station and press play. Fogwave keeps audio running in the background and saves your equalizer settings for your next session. Its dark, uncluttered design is available in English, Russian, German, Japanese, Lithuanian, and Chinese.

    diff --git a/fastlane/metadata/android/ja/full_description.txt b/fastlane/metadata/android/ja/full_description.txt index 4938421..0f45c1e 100644 --- a/fastlane/metadata/android/ja/full_description.txt +++ b/fastlane/metadata/android/ja/full_description.txt @@ -6,7 +6,7 @@
  • イコライザー、設定の保存、ラウドネスブースト、オーディオプリセットで好みの音に。
  • ストリームやネットワークが途切れても自動で再接続し、すぐに再生が戻ります。
  • Android Autoに対応し、ドライブ中もラジオを。
  • -
  • お気に入り、最近聴いた局、ジャンルの一致、4種類の表示レイアウトで、自分好みに局を探せます。
  • +
  • ジャンルカード、検索、お気に入り、最近聴いた局、似ている局で自分好みに局を探せます。再生中の曲名と曲の履歴も表示します。
  • 局を選んで再生するだけ。Fogwaveはバックグラウンドで再生を続け、イコライザー設定を次回まで保存します。ダークで余計なもののないデザインは、英語、ロシア語、ドイツ語、日本語、リトアニア語、中国語に対応しています。

    diff --git a/fastlane/metadata/android/lt/full_description.txt b/fastlane/metadata/android/lt/full_description.txt index 9bb07d4..ec065ac 100644 --- a/fastlane/metadata/android/lt/full_description.txt +++ b/fastlane/metadata/android/lt/full_description.txt @@ -6,7 +6,7 @@
  • Mėgaukitės mėgstamu skambėjimu su ekvalaizeriu, išsaugomais nustatymais, garsumo stiprinimu ir garso šablonais.
  • Lengvai grįžkite prie klausymo – nutrūkus srautui ar ryšiui programėlė automatiškai prisijungia iš naujo.
  • Pasiimkite radiją į kelionę su Android Auto palaikymu.
  • -
  • Raskite stotis savaip: mėgstamiausios, neseniai klausytos, panašūs žanrai ir keturi rodinio išdėstymai.
  • +
  • Raskite stotis savaip: žanrų kortelės, paieška, mėgstamiausios, neseniai klausytos ir panašios stotys, o taip pat dabar skambanti daina ir kūrinių istorija.
  • Pasirinkite stotį ir paspauskite grojimo mygtuką. Fogwave toliau groja fone ir išsaugo ekvalaizerio nustatymus kitam kartui. Tamsus, tvarkingas dizainas prieinamas anglų, rusų, vokiečių, japonų, lietuvių ir kinų kalbomis.

    diff --git a/fastlane/metadata/android/ru/full_description.txt b/fastlane/metadata/android/ru/full_description.txt index 4276558..dd0e2e3 100644 --- a/fastlane/metadata/android/ru/full_description.txt +++ b/fastlane/metadata/android/ru/full_description.txt @@ -6,7 +6,7 @@
  • Настройте звук под себя: эквалайзер, сохранённые настройки, усиление громкости и аудиопресеты.
  • Легко возвращайтесь к прослушиванию: приложение само переподключится, если поток или сеть пропадут.
  • Берите радио в дорогу благодаря поддержке Android Auto.
  • -
  • Находите станции по-своему: избранное, недавно прослушанные, подбор по жанру и четыре варианта отображения.
  • +
  • Находите станции по-своему: карточки жанров, поиск, избранное, недавно прослушанные и похожие станции, а также название текущей песни и история треков.
  • Выберите станцию и нажмите кнопку воспроизведения. Fogwave продолжает играть в фоне и сохраняет настройки эквалайзера до следующего раза. Тёмный лаконичный интерфейс доступен на английском, русском, немецком, японском, литовском и китайском.

    diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt index afc13f0..a37ae50 100644 --- a/fastlane/metadata/android/zh-CN/full_description.txt +++ b/fastlane/metadata/android/zh-CN/full_description.txt @@ -6,7 +6,7 @@
  • 用均衡器、已保存的设置、响度增强和音频预设,调出你喜欢的声音。
  • 音频流或网络中断时自动重新连接,轻松恢复收听。
  • 支持 Android Auto,开车也能听电台。
  • -
  • 按你的方式查找电台:收藏、最近收听、类型匹配,以及四种显示布局。
  • +
  • 按你的方式查找电台:类型卡片、搜索、收藏、最近收听和相似电台,还能看到正在播放的歌曲和曲目历史。
  • 选择电台,点击播放即可。Fogwave 会在后台持续播放,并保存你的均衡器设置供下次使用。深色简洁的界面支持英语、俄语、德语、日语、立陶宛语和中文。