Redesign UI: genre cards, search, station disc player and track history

This commit is contained in:
2026-11-10 16:06:36 +02:00
parent 36c56ecf35
commit 33423fbbc0
42 changed files with 1635 additions and 1795 deletions
+2 -1
View File
@@ -43,7 +43,8 @@
- 🔄 **Auto-reconnect** when the stream drops or the network comes back - 🔄 **Auto-reconnect** when the stream drops or the network comes back
- 🎚️ **Equalizer** with presets, loudness boost and dynamics processing - 🎚️ **Equalizer** with presets, loudness boost and dynamics processing
- ❤️ **Favorites, recently played and similar stations** matched by genre - ❤️ **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** - 🌙 **Dark theme**
- 🌍 **Six languages** — English, Russian, German, Japanese, Lithuanian and Chinese - 🌍 **Six languages** — English, Russian, German, Japanese, Lithuanian and Chinese
- 🔓 **No ads, no tracking, no accounts** - 🔓 **No ads, no tracking, no accounts**
@@ -29,20 +29,6 @@ enum class Genre(@param:StringRes val labelRes: Int) {
LATVIAN(R.string.genre_latvian) 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) { enum class AppTab(@param:StringRes val titleRes: Int) {
RADIO(R.string.tab_radio), RADIO(R.string.tab_radio),
FAVORITES(R.string.tab_favorites), 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) { enum class ExtraPlayerTab(@param:StringRes val titleRes: Int) {
HISTORY(R.string.extra_tab_history),
RECENT(R.string.extra_tab_recent), RECENT(R.string.extra_tab_recent),
SIMILAR(R.string.extra_tab_similar), SIMILAR(R.string.extra_tab_similar),
INFO(R.string.extra_tab_info) 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 }
}
@@ -4,9 +4,7 @@ import android.content.Context
import androidx.core.content.edit import androidx.core.content.edit
import cc.skysparkle.fogwave.R import cc.skysparkle.fogwave.R
import cc.skysparkle.fogwave.data.model.Genre 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.RadioStation
import cc.skysparkle.fogwave.data.model.ViewMode
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
@@ -158,12 +156,6 @@ class RadioRepository(context: Context) {
private val _recentsFlow = MutableStateFlow<List<String>>(loadRecents()) private val _recentsFlow = MutableStateFlow<List<String>>(loadRecents())
val recentsFlow: StateFlow<List<String>> = _recentsFlow.asStateFlow() val recentsFlow: StateFlow<List<String>> = _recentsFlow.asStateFlow()
private val _viewModeFlow = MutableStateFlow(loadViewMode())
val viewModeFlow: StateFlow<ViewMode> = _viewModeFlow.asStateFlow()
private val _sizeStepFlow = MutableStateFlow(loadSizeStep())
val sizeStepFlow: StateFlow<IconSizeStep> = _sizeStepFlow.asStateFlow()
private val _seenFavoritesFlow = MutableStateFlow(loadSeenFavorites()) private val _seenFavoritesFlow = MutableStateFlow(loadSeenFavorites())
val seenFavoritesFlow: StateFlow<Set<String>> = _seenFavoritesFlow.asStateFlow() val seenFavoritesFlow: StateFlow<Set<String>> = _seenFavoritesFlow.asStateFlow()
@@ -262,34 +254,6 @@ class RadioRepository(context: Context) {
prefs.edit { putString("recents", arr.toString()) } 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 { fun hasSeenBatteryOptimizationPrompt(): Boolean {
return prefs.getBoolean("seen_battery_optimization_prompt", false) return prefs.getBoolean("seen_battery_optimization_prompt", false)
} }
@@ -30,6 +30,10 @@ class RadioPlayerManager(private val context: Context) {
private val _currentMediaId = MutableStateFlow<String?>(null) private val _currentMediaId = MutableStateFlow<String?>(null)
val currentMediaId: StateFlow<String?> = _currentMediaId.asStateFlow() val currentMediaId: StateFlow<String?> = _currentMediaId.asStateFlow()
/** Song announced by the stream (ICY / ID3 metadata), or null when the station sends none. */
private val _nowPlayingTitle = MutableStateFlow<String?>(null)
val nowPlayingTitle: StateFlow<String?> = _nowPlayingTitle.asStateFlow()
private var currentStation: RadioStation? = null private var currentStation: RadioStation? = null
private var pendingStation: 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) { override fun onEvents(player: Player, events: Player.Events) {
_playerState.value = deriveState(player) _playerState.value = deriveState(player)
_currentMediaId.value = player.currentMediaItem?.mediaId _currentMediaId.value = player.currentMediaItem?.mediaId
_nowPlayingTitle.value = streamTitle(player)
} }
override fun onPlayerError(error: PlaybackException) { override fun onPlayerError(error: PlaybackException) {
@@ -85,6 +90,7 @@ class RadioPlayerManager(private val context: Context) {
} else { } else {
_playerState.value = deriveState(c) _playerState.value = deriveState(c)
_currentMediaId.value = c.currentMediaItem?.mediaId _currentMediaId.value = c.currentMediaItem?.mediaId
_nowPlayingTitle.value = streamTitle(c)
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Failed to connect to FogwavePlaybackService", e) 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( private fun errorMessage(error: PlaybackException): String = context.getString(
when (error.errorCode) { when (error.errorCode) {
PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED, PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
@@ -144,6 +158,7 @@ class RadioPlayerManager(private val context: Context) {
return return
} }
_playerState.value = PlayerState.Connecting _playerState.value = PlayerState.Connecting
_nowPlayingTitle.value = null
try { try {
c.setMediaItem(station.toMediaItem(context)) c.setMediaItem(station.toMediaItem(context))
c.prepare() c.prepare()
@@ -101,7 +101,7 @@ fun EqualizerSheet(
text = if (audioEffects.equalizerEnabled) stringResource(R.string.equalizer_on) else stringResource(R.string.equalizer_off), text = if (audioEffects.equalizerEnabled) stringResource(R.string.equalizer_on) else stringResource(R.string.equalizer_off),
style = MaterialTheme.typography.labelMedium.copy( style = MaterialTheme.typography.labelMedium.copy(
fontWeight = FontWeight.Bold, 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) modifier = Modifier.padding(end = 6.dp)
) )
@@ -15,9 +15,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn 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.lazy.items
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape 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.clip
import androidx.compose.ui.draw.shadow import androidx.compose.ui.draw.shadow
import androidx.compose.ui.platform.testTag import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign 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.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import cc.skysparkle.fogwave.R 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.RadioStation
import cc.skysparkle.fogwave.data.model.ViewMode
import cc.skysparkle.fogwave.ui.theme.LocalGeoColors import cc.skysparkle.fogwave.ui.theme.LocalGeoColors
@Composable @Composable
@@ -50,8 +46,6 @@ fun FavoritesPanel(
favorites: List<RadioStation>, favorites: List<RadioStation>,
currentStation: RadioStation?, currentStation: RadioStation?,
isPlaying: Boolean, isPlaying: Boolean,
viewMode: ViewMode,
sizeStep: IconSizeStep,
onSelectStation: (RadioStation) -> Unit, onSelectStation: (RadioStation) -> Unit,
onBrowseStations: () -> Unit, onBrowseStations: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
@@ -66,70 +60,29 @@ fun FavoritesPanel(
return return
} }
StationCollection( LazyColumn(
stations = favorites, contentPadding = PaddingValues(start = 10.dp, end = 10.dp, top = 8.dp, bottom = bottomContentPadding),
currentStation = currentStation, verticalArrangement = Arrangement.spacedBy(2.dp),
isPlaying = isPlaying,
viewMode = viewMode,
sizeStep = sizeStep,
onSelectStation = onSelectStation,
bottomContentPadding = bottomContentPadding,
modifier = modifier
)
}
/** The station grid (Icons mode) or list (other modes), shared by the Radio and Favorites tabs. */
@Composable
fun StationCollection(
stations: List<RadioStation>,
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 modifier = modifier
) { ) {
items(stations, key = { it.id }) { 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)
)
}
items(favorites, key = { it.id }) { station ->
val isCur = station.id == currentStation?.id val isCur = station.id == currentStation?.id
StationItem( StationRow(
station = station, station = station,
isCurrent = isCur, isCurrent = isCur,
isPlaying = isCur && isPlaying, isPlaying = isCur && isPlaying,
viewMode = viewMode, onClick = { onSelectStation(station) },
sizeStep = sizeStep, modifier = Modifier.animateItem()
onClick = { onSelectStation(station) }
) )
} }
} }
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) }
)
}
}
}
} }
@Composable @Composable
@@ -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<Color, Color> = 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<RadioStation>,
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
)
}
}
}
@@ -5,7 +5,6 @@ import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.animate import androidx.compose.animation.core.animate
import androidx.compose.animation.core.spring import androidx.compose.animation.core.spring
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable 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.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.ripple 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.clip
import androidx.compose.ui.draw.shadow import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.testTag import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
@@ -63,15 +59,15 @@ private val TABLET_MINI_PLAYER_MAX_WIDTH_DP = 640.dp
fun MiniPlayer( fun MiniPlayer(
station: RadioStation?, station: RadioStation?,
playerState: PlayerState, playerState: PlayerState,
trackTitle: String?,
onTogglePlay: () -> Unit, onTogglePlay: () -> Unit,
onPrevious: () -> Unit,
onNext: () -> Unit,
onOpenNowPlaying: () -> Unit, onOpenNowPlaying: () -> Unit,
onHide: () -> Unit, onHide: () -> Unit,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
if (station == null) return if (station == null) return
val colors = LocalGeoColors.current
val isPlaying = playerState is PlayerState.Playing val isPlaying = playerState is PlayerState.Playing
val isConnecting = playerState is PlayerState.Connecting val isConnecting = playerState is PlayerState.Connecting
val isError = playerState is PlayerState.Error val isError = playerState is PlayerState.Error
@@ -79,7 +75,7 @@ fun MiniPlayer(
val subText = when { val subText = when {
isError -> playerState.message isError -> playerState.message
isConnecting -> stringResource(R.string.player_connecting) isConnecting -> stringResource(R.string.player_connecting)
isPlaying -> stringResource(R.string.player_on_air) isPlaying && trackTitle != null -> trackTitle
else -> stationDescription(station) else -> stationDescription(station)
} }
@@ -107,10 +103,10 @@ fun MiniPlayer(
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.shadow(6.dp, RoundedCornerShape(32.dp)) .shadow(12.dp, RoundedCornerShape(28.dp))
.clip(RoundedCornerShape(32.dp)) .clip(RoundedCornerShape(28.dp))
.background(LocalGeoColors.current.surfaceContainer) .background(colors.surfaceContainerHigh)
.border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(32.dp)) .border(1.dp, colors.outlineVariant, RoundedCornerShape(28.dp))
.clickable( .clickable(
interactionSource = remember { MutableInteractionSource() }, interactionSource = remember { MutableInteractionSource() },
indication = ripple(bounded = true) indication = ripple(bounded = true)
@@ -150,110 +146,71 @@ 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"), .testTag("mini_player"),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp) horizontalArrangement = Arrangement.spacedBy(12.dp)
) { ) {
Box( StationDisc(
modifier = Modifier station = station,
.size(46.dp) isPlaying = isPlaying,
.clip(RoundedCornerShape(14.dp)) ringWidth = 2.dp,
.background(stationTileColor(station)) ringGap = 3.dp,
.border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(14.dp)) glow = false,
) { modifier = Modifier.size(56.dp)
Image(
painter = painterResource(id = station.iconResId),
contentDescription = null,
contentScale = ContentScale.Crop,
modifier = Modifier.matchParentSize()
) )
}
Column( Column(
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
verticalArrangement = Arrangement.Center verticalArrangement = Arrangement.spacedBy(1.dp)
) { ) {
LiveLabel(active = isPlaying)
Text( Text(
text = station.name, text = station.name,
style = MaterialTheme.typography.bodyMedium.copy( style = MaterialTheme.typography.bodyMedium.copy(
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
fontSize = 14.5.sp, fontSize = 15.sp,
color = LocalGeoColors.current.deepPurple color = colors.deepPurple
), ),
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )
Text( Text(
text = subText, text = subText,
style = MaterialTheme.typography.bodySmall.copy( style = MaterialTheme.typography.bodySmall.copy(
fontSize = 11.5.sp, fontSize = 12.sp,
color = if (isError) LocalGeoColors.current.redFavorite else (if (isPlaying) LocalGeoColors.current.liveGreen else LocalGeoColors.current.onSurfaceVariant) color = if (isError) colors.redFavorite else colors.onSurfaceVariant
), ),
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )
} }
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(2.dp)
) {
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
)
}
Box( Box(
modifier = Modifier modifier = Modifier
.size(42.dp) .size(48.dp)
.shadow(2.dp, CircleShape) .shadow(6.dp, CircleShape)
.clip(CircleShape) .clip(CircleShape)
.background(LocalGeoColors.current.accentLavender) .background(colors.accentLavender)
.clickable { onTogglePlay() } .clickable { onTogglePlay() }
.testTag("mini_play_btn"), .testTag("mini_play_btn"),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
if (isConnecting) { if (isConnecting) {
CircularProgressIndicator( CircularProgressIndicator(
modifier = Modifier.size(20.dp), modifier = Modifier.size(22.dp),
color = LocalGeoColors.current.onAccentLavender, color = colors.onAccentLavender,
strokeWidth = 2.dp strokeWidth = 2.dp
) )
} else { } else {
AppIcon( AppIcon(
resId = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play, 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), contentDescription = if (isPlaying) stringResource(R.string.pause_content_desc) else stringResource(R.string.play_content_desc),
tint = LocalGeoColors.current.onAccentLavender, tint = colors.onAccentLavender,
size = 22.dp size = 22.dp
) )
} }
} }
IconButton(
onClick = onNext,
modifier = Modifier
.size(36.dp)
.testTag("mini_next_btn")
) {
AppIcon(
resId = R.drawable.ic_chevron_right,
contentDescription = stringResource(R.string.next_station_content_desc),
tint = LocalGeoColors.current.onSurfaceVariant,
size = 24.dp
)
}
}
} }
} }
} }
@@ -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)
)
)
)
)
}
}
@@ -1,5 +1,8 @@
package cc.skysparkle.fogwave.ui.components 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.animateColorAsState
import androidx.compose.animation.core.FastOutLinearInEasing import androidx.compose.animation.core.FastOutLinearInEasing
import androidx.compose.animation.core.Spring 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.animateFloatAsState
import androidx.compose.animation.core.spring import androidx.compose.animation.core.spring
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.detectTapGestures 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.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer 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.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size 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.layout.widthIn
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable 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.NestedScrollSource
import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.input.pointer.pointerInput 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.LocalDensity
import androidx.compose.ui.platform.testTag import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics 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.R
import cc.skysparkle.fogwave.data.model.ExtraPlayerTab import cc.skysparkle.fogwave.data.model.ExtraPlayerTab
import cc.skysparkle.fogwave.data.model.RadioStation 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.AudioEffectsState
import cc.skysparkle.fogwave.player.PlayerState import cc.skysparkle.fogwave.player.PlayerState
import cc.skysparkle.fogwave.ui.theme.LocalGeoColors import cc.skysparkle.fogwave.ui.theme.LocalGeoColors
import java.util.Date
import kotlin.math.roundToInt import kotlin.math.roundToInt
@Composable @Composable
fun NowPlayingSheet( fun NowPlayingSheet(
station: RadioStation?, station: RadioStation?,
playerState: PlayerState, playerState: PlayerState,
trackTitle: String?,
trackHistory: List<TrackEntry>,
isFavorite: Boolean, isFavorite: Boolean,
onToggleFavorite: () -> Unit, onToggleFavorite: () -> Unit,
onTogglePlay: () -> Unit, onTogglePlay: () -> Unit,
@@ -100,6 +105,8 @@ fun NowPlayingSheet(
) { ) {
if (station == null) return if (station == null) return
val colors = LocalGeoColors.current
val context = LocalContext.current
val isPlaying = playerState is PlayerState.Playing val isPlaying = playerState is PlayerState.Playing
val isConnecting = playerState is PlayerState.Connecting val isConnecting = playerState is PlayerState.Connecting
val isError = playerState is PlayerState.Error val isError = playerState is PlayerState.Error
@@ -110,238 +117,215 @@ fun NowPlayingSheet(
SheetDragState( SheetDragState(
dismissThresholdPx = with(density) { 110.dp.toPx() }, dismissThresholdPx = with(density) { 110.dp.toPx() },
flingThresholdPx = with(density) { 1400.dp.toPx() }, flingThresholdPx = with(density) { 1400.dp.toPx() },
offscreenPx = with(density) { 900.dp.toPx() }, offscreenPx = with(density) { 1200.dp.toPx() },
onDismiss = { currentOnClose() } onDismiss = { currentOnClose() }
) )
} }
val artScale by animateFloatAsState( val discScale by animateFloatAsState(
targetValue = if (isPlaying) 1.02f else 0.98f, targetValue = if (isPlaying) 1f else 0.94f,
animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy), animationSpec = spring(dampingRatio = Spring.DampingRatioMediumBouncy),
label = "art_scale" label = "disc_scale"
) )
Box( Box(
modifier = modifier modifier = modifier
.fillMaxSize() .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 { .drawBehind {
val progress = (drag.offsetPx / drag.dismissThresholdPx).coerceIn(0f, 1f) val progress = (drag.offsetPx / drag.dismissThresholdPx).coerceIn(0f, 1f)
drawRect(Color.Black.copy(alpha = 0.55f * (1f - progress))) drawRect(Color.Black.copy(alpha = 0.55f * (1f - progress)))
} }
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null
) {
onClose()
}
) { ) {
BoxWithConstraints(modifier = Modifier.fillMaxSize()) { BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
val isTablet = maxWidth > 600.dp 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( Column(
modifier = Modifier modifier = Modifier
.align(Alignment.BottomCenter) .align(Alignment.TopCenter)
.then(sheetModifier) .then(sheetModifier)
.offset { IntOffset(0, drag.offsetPx.roundToInt()) } .offset { IntOffset(0, drag.offsetPx.roundToInt()) }
.then(sheetWidthModifier) .then(pageWidth)
.fillMaxHeight(0.94f) .fillMaxSize()
.shadow(16.dp, RoundedCornerShape(topStart = 36.dp, topEnd = 36.dp)) .background(colors.background)
.clip(RoundedCornerShape(topStart = 36.dp, topEnd = 36.dp)) // Swallow taps so nothing underneath reacts to them.
.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.
.pointerInput(Unit) { detectTapGestures { } } .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) .nestedScroll(drag.nestedScrollConnection)
.navigationBarsPadding()
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
.padding(bottom = 28.dp) .statusBarsPadding()
.navigationBarsPadding()
.padding(bottom = 24.dp)
.testTag("now_playing_sheet"), .testTag("now_playing_sheet"),
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
Box( Row(
modifier = Modifier 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() .fillMaxWidth()
.aspectRatio(1f) .padding(horizontal = 8.dp, vertical = 4.dp),
.scale(artScale) verticalAlignment = Alignment.CenterVertically
.shadow(8.dp, RoundedCornerShape(32.dp))
.clip(RoundedCornerShape(32.dp))
.background(stationTileColor(station))
.border(1.5.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(32.dp))
) { ) {
Image( IconButton(onClick = onClose, modifier = Modifier.testTag("np_close_btn")) {
painter = painterResource(id = station.iconResId), AppIcon(
contentDescription = null, resId = R.drawable.ic_chevron_left,
contentScale = ContentScale.Crop, contentDescription = stringResource(R.string.back_content_desc),
modifier = Modifier.matchParentSize() 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
)
}
}
Column( StationDisc(
station = station,
isPlaying = isPlaying,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .padding(top = 12.dp, bottom = 20.dp)
.padding(horizontal = 24.dp, vertical = 6.dp), .fillMaxWidth(if (isTablet) 0.6f else 0.74f)
horizontalAlignment = Alignment.CenterHorizontally .scale(discScale)
) {
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( Row(
modifier = Modifier modifier = Modifier
.clip(CircleShape) .fillMaxWidth()
.background(if (isPlaying) LocalGeoColors.current.primaryContainer else LocalGeoColors.current.surfaceContainer) .padding(horizontal = 24.dp),
.border( verticalAlignment = Alignment.CenterVertically,
width = 1.dp, horizontalArrangement = Arrangement.spacedBy(4.dp)
color = if (isPlaying) LocalGeoColors.current.primary.copy(alpha = 0.4f) else LocalGeoColors.current.outlineVariant, ) {
shape = CircleShape 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
) )
.padding(horizontal = 14.dp, vertical = 6.dp), 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, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(6.dp) horizontalArrangement = Arrangement.spacedBy(6.dp)
) { ) {
when { AppIcon(resId = R.drawable.ic_music_note, tint = colors.onSurfaceVariant, size = 13.dp)
isPlaying -> LiveOnAirDot() Text(
isError -> AppIcon( text = stringResource(R.string.now_playing_label),
resId = R.drawable.ic_alert, style = MaterialTheme.typography.labelSmall.copy(
tint = LocalGeoColors.current.redFavorite, fontWeight = FontWeight.SemiBold,
size = 12.dp fontSize = 10.5.sp,
letterSpacing = 1.2.sp,
color = colors.onSurfaceVariant
) )
!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)
) )
} }
Spacer(modifier = Modifier.height(6.dp))
Text( Text(
text = when { text = when {
isError -> playerState.message isError -> playerState.message
isConnecting -> stringResource(R.string.player_connecting) isConnecting -> stringResource(R.string.player_connecting)
isPlaying -> stringResource(R.string.now_playing_live) !isPlaying -> stringResource(R.string.player_stopped)
else -> stringResource(R.string.player_stopped) else -> trackTitle ?: stationDescription(station)
}, },
style = MaterialTheme.typography.labelSmall.copy( style = MaterialTheme.typography.titleMedium.copy(
fontWeight = FontWeight.SemiBold, fontWeight = FontWeight.SemiBold,
fontSize = 12.sp, fontSize = 16.sp,
color = if (isPlaying) LocalGeoColors.current.deepPurple else (if (isError) LocalGeoColors.current.redFavorite else LocalGeoColors.current.onSurfaceVariant) lineHeight = 21.sp,
) textAlign = TextAlign.Center,
) color = if (isError) colors.redFavorite else colors.onSurface
} ),
} maxLines = 2,
overflow = TextOverflow.Ellipsis,
LiveBars(
active = isPlaying,
color = LocalGeoColors.current.primary,
modifier = Modifier modifier = Modifier
.align(Alignment.CenterHorizontally) .padding(horizontal = 32.dp)
.padding(vertical = 10.dp) .heightIn(min = 42.dp)
.testTag("np_track_title")
) )
Box( Spacer(modifier = Modifier.height(18.dp))
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 18.dp, vertical = 8.dp),
contentAlignment = Alignment.Center
) {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(14.dp) horizontalArrangement = Arrangement.spacedBy(28.dp)
) { ) {
Box( IconButton(
onClick = onPrevious,
modifier = Modifier modifier = Modifier
.size(50.dp) .size(52.dp)
.clip(CircleShape) .testTag("np_prev_btn")
.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
)
}
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( AppIcon(
resId = R.drawable.ic_skip_previous, resId = R.drawable.ic_skip_previous,
contentDescription = stringResource(R.string.previous_station_content_desc), contentDescription = stringResource(R.string.previous_station_content_desc),
tint = LocalGeoColors.current.deepPurple, tint = colors.onSurface,
size = 24.dp size = 28.dp
) )
} }
Box( Box(
modifier = Modifier modifier = Modifier
.size(72.dp) .size(76.dp)
.shadow(4.dp, RoundedCornerShape(26.dp)) .shadow(14.dp, CircleShape, ambientColor = colors.accentLavender, spotColor = colors.accentLavender)
.clip(RoundedCornerShape(26.dp)) .clip(CircleShape)
.background(LocalGeoColors.current.accentLavender) .background(colors.accentLavender)
.clickable { onTogglePlay() } .clickable { onTogglePlay() }
.testTag("np_play_btn"), .testTag("np_play_btn"),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
@@ -352,269 +336,175 @@ fun NowPlayingSheet(
modifier = Modifier modifier = Modifier
.size(32.dp) .size(32.dp)
.semantics { contentDescription = connecting }, .semantics { contentDescription = connecting },
color = LocalGeoColors.current.onAccentLavender, color = colors.onAccentLavender,
strokeWidth = 3.dp strokeWidth = 3.dp
) )
} else { } else {
AppIcon( AppIcon(
resId = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play, 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), contentDescription = stringResource(
tint = LocalGeoColors.current.onAccentLavender, if (isPlaying) R.string.pause_content_desc else R.string.play_content_desc
size = 34.dp ),
tint = colors.onAccentLavender,
size = 32.dp
) )
} }
} }
Box( IconButton(
onClick = onNext,
modifier = Modifier modifier = Modifier
.size(50.dp) .size(52.dp)
.clip(CircleShape) .testTag("np_next_btn")
.background(LocalGeoColors.current.surfaceContainer)
.border(1.dp, LocalGeoColors.current.outlineVariant, CircleShape)
.clickable { onNext() }
.testTag("np_next_btn"),
contentAlignment = Alignment.Center
) { ) {
AppIcon( AppIcon(
resId = R.drawable.ic_skip_next, resId = R.drawable.ic_skip_next,
contentDescription = stringResource(R.string.next_station_content_desc), contentDescription = stringResource(R.string.next_station_content_desc),
tint = LocalGeoColors.current.deepPurple, tint = colors.onSurface,
size = 24.dp size = 28.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
)
}
}
} }
Spacer(modifier = Modifier.height(16.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<TrackEntry>,
activeExtraTab: ExtraPlayerTab,
onSelectExtraTab: (ExtraPlayerTab) -> Unit,
recents: List<RadioStation>,
similarStations: List<RadioStation>,
onSelectStation: (RadioStation) -> Unit
) {
val colors = LocalGeoColors.current
val isPlaying = playerState is PlayerState.Playing
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 20.dp), .padding(horizontal = 12.dp)
verticalArrangement = Arrangement.spacedBy(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( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clip(RoundedCornerShape(14.dp)) .horizontalScroll(rememberScrollState())
.background(LocalGeoColors.current.surfaceContainer) .padding(horizontal = 12.dp, vertical = 12.dp),
.border(1.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(14.dp)) horizontalArrangement = Arrangement.spacedBy(8.dp)
.padding(4.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp)
) { ) {
ExtraPlayerTab.entries.forEach { tab -> ExtraPlayerTab.entries.forEach { tab ->
val isSelected = tab == activeExtraTab val isSelected = tab == activeExtraTab
val bg by animateColorAsState( val bg by animateColorAsState(
targetValue = if (isSelected) LocalGeoColors.current.primaryContainer else Color.Transparent, targetValue = if (isSelected) colors.accentLavender else colors.surfaceContainerHigh,
label = "extra_tab_bg" label = "extra_tab_bg"
) )
val textColor by animateColorAsState( val fg by animateColorAsState(
targetValue = if (isSelected) LocalGeoColors.current.deepPurple else LocalGeoColors.current.onSurfaceVariant, targetValue = if (isSelected) colors.onAccentLavender else colors.onSurfaceVariant,
label = "extra_tab_text" label = "extra_tab_fg"
) )
Box( Box(
modifier = Modifier modifier = Modifier
.weight(1f) .clip(CircleShape)
.clip(RoundedCornerShape(10.dp))
.background(bg) .background(bg)
.clickable { onSelectExtraTab(tab) } .clickable { onSelectExtraTab(tab) }
.padding(vertical = 8.dp), .padding(horizontal = 14.dp, vertical = 8.dp)
.testTag("extra_tab_${tab.name.lowercase()}"),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
Text( Text(
text = stringResource(tab.titleRes), text = stringResource(tab.titleRes),
style = MaterialTheme.typography.labelSmall.copy( style = MaterialTheme.typography.labelMedium.copy(
fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium, fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Medium,
fontSize = 12.sp, fontSize = 12.5.sp,
color = textColor color = fg
) ),
maxLines = 1
) )
} }
} }
} }
Column(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 8.dp),
verticalArrangement = Arrangement.spacedBy(2.dp)
) {
when (activeExtraTab) { 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
)
}
}
}
ExtraPlayerTab.RECENT -> { ExtraPlayerTab.RECENT -> {
if (recents.isEmpty()) { if (recents.isEmpty()) {
Text( EmptyHint(stringResource(R.string.recent_empty))
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 { } else {
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
recents.forEach { s -> recents.forEach { s ->
val isCur = s.id == station.id StationRow(
Row( station = s,
modifier = Modifier isCurrent = false,
.fillMaxWidth() isPlaying = false,
.clip(RoundedCornerShape(14.dp)) onClick = { onSelectStation(s) }
.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 -> { ExtraPlayerTab.SIMILAR -> {
if (similarStations.isEmpty()) { if (similarStations.isEmpty()) {
Text( EmptyHint(stringResource(R.string.similar_empty))
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 { } else {
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
similarStations.forEach { s -> similarStations.forEach { s ->
Row( StationRow(
modifier = Modifier station = s,
.fillMaxWidth() isCurrent = false,
.clip(RoundedCornerShape(14.dp)) isPlaying = false,
.background(LocalGeoColors.current.surfaceContainer) onClick = { onSelectStation(s) },
.border(0.8.dp, LocalGeoColors.current.outlineVariant, RoundedCornerShape(14.dp)) subtitle = "${stationDescription(s)} • ${stationGenres(s)}"
.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
)
}
}
}
} }
} }
@@ -622,11 +512,8 @@ fun NowPlayingSheet(
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clip(RoundedCornerShape(16.dp)) .padding(horizontal = 10.dp, vertical = 4.dp),
.background(LocalGeoColors.current.surfaceContainer) verticalArrangement = Arrangement.spacedBy(12.dp)
.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_station), value = station.name)
InfoRow(key = stringResource(R.string.info_description), value = stationDescription(station)) InfoRow(key = stringResource(R.string.info_description), value = stationDescription(station))
@@ -646,8 +533,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 @Composable
@@ -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 * 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. * the gesture works anywhere on the (scrollable) sheet once its content is scrolled to the top.
@@ -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)
)
}
}
}
@@ -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)
)
}
}
@@ -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
)
)
}
}
}
@@ -1,82 +1,173 @@
package cc.skysparkle.fogwave.ui.components 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.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding 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.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip 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.platform.testTag
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.font.FontWeight 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.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import cc.skysparkle.fogwave.R import cc.skysparkle.fogwave.R
import cc.skysparkle.fogwave.ui.theme.LocalGeoColors 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 @Composable
fun TopBrandBar(modifier: Modifier = Modifier) { fun TopBrandBar(
Box( 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 modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.background(LocalGeoColors.current.surfaceContainer.copy(alpha = 0.92f))
.statusBarsPadding() .statusBarsPadding()
.padding(horizontal = 20.dp, vertical = 12.dp) .padding(start = 20.dp, end = 10.dp, top = 8.dp, bottom = 8.dp)
) { .height(48.dp)
Row( .testTag("top_brand_bar"),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(14.dp), horizontalArrangement = Arrangement.spacedBy(10.dp)
modifier = Modifier
.fillMaxWidth()
.testTag("top_brand_bar")
) {
Box(
modifier = Modifier
.size(40.dp)
.clip(RoundedCornerShape(12.dp)),
contentAlignment = Alignment.Center
) { ) {
AppIcon( AppIcon(
resId = R.drawable.ic_fogwave_logo, resId = R.drawable.ic_fogwave_logo,
size = 34.dp contentDescription = stringResource(R.string.fogwave_logo_content_desc),
size = 30.dp
) )
}
Column( Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.Center) {
verticalArrangement = Arrangement.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(
text = stringResource(R.string.app_name), text = stringResource(R.string.app_name),
style = MaterialTheme.typography.titleMedium.copy( style = MaterialTheme.typography.titleMedium.copy(
fontWeight = FontWeight.SemiBold, fontWeight = FontWeight.Bold,
fontSize = 20.sp, fontSize = 17.sp,
letterSpacing = (-0.4).sp, letterSpacing = 0.sp,
color = LocalGeoColors.current.deepPurple color = colors.deepPurple
), ),
modifier = Modifier.semantics { heading() } modifier = Modifier
) .fillMaxWidth()
Text( .semantics { heading() },
text = stringResource(R.string.app_subtitle), textAlign = TextAlign.Center
style = MaterialTheme.typography.labelSmall.copy(
fontWeight = FontWeight.Medium,
fontSize = 11.5.sp,
color = LocalGeoColors.current.onSurfaceVariant,
letterSpacing = 0.2.sp
)
) )
} }
} }
} }
if (showSearch) {
IconButton(
onClick = if (isSearchOpen) onCloseSearch else onOpenSearch,
modifier = Modifier
.size(40.dp)
.testTag("search_toggle")
) {
AppIcon(
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
),
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()
}
}
}
)
} }
@@ -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
)
}
}
@@ -12,51 +12,62 @@ import androidx.compose.animation.core.spring
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut import androidx.compose.animation.fadeOut
import androidx.compose.animation.scaleIn
import androidx.compose.animation.slideInHorizontally import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutHorizontally import androidx.compose.animation.slideOutHorizontally
import androidx.compose.animation.slideOutVertically import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith import androidx.compose.animation.togetherWith
import androidx.compose.foundation.background 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.Box
import androidx.compose.foundation.layout.Column 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.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding 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.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource 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.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import cc.skysparkle.fogwave.R import cc.skysparkle.fogwave.R
import cc.skysparkle.fogwave.data.model.AppTab 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.player.PlayerState
import cc.skysparkle.fogwave.ui.components.AboutPanel import cc.skysparkle.fogwave.ui.components.AboutPanel
import cc.skysparkle.fogwave.ui.components.BatteryOptimizationDialog import cc.skysparkle.fogwave.ui.components.BatteryOptimizationDialog
import cc.skysparkle.fogwave.ui.components.EqualizerSheet import cc.skysparkle.fogwave.ui.components.EqualizerSheet
import cc.skysparkle.fogwave.ui.components.FavoritesPanel 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.MiniPlayer
import cc.skysparkle.fogwave.ui.components.MistyMountainBackground
import cc.skysparkle.fogwave.ui.components.NavigationTabs import cc.skysparkle.fogwave.ui.components.NavigationTabs
import cc.skysparkle.fogwave.ui.components.NowPlayingSheet import cc.skysparkle.fogwave.ui.components.NowPlayingSheet
import cc.skysparkle.fogwave.ui.components.StationCollection import cc.skysparkle.fogwave.ui.components.SectionHeader
import cc.skysparkle.fogwave.ui.components.StationsToolbar import cc.skysparkle.fogwave.ui.components.StationRow
import cc.skysparkle.fogwave.ui.components.TopBrandBar 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 import cc.skysparkle.fogwave.ui.viewmodel.RadioViewModel
@OptIn(ExperimentalAnimationApi::class) @OptIn(ExperimentalAnimationApi::class)
@@ -67,6 +78,10 @@ fun HomeScreen(
val uiState by viewModel.uiState.collectAsStateWithLifecycle() val uiState by viewModel.uiState.collectAsStateWithLifecycle()
val isPlaying = uiState.playerState is PlayerState.Playing val isPlaying = uiState.playerState is PlayerState.Playing
var isSearchOpen by rememberSaveable { mutableStateOf(false) }
var query by rememberSaveable { mutableStateOf("") }
var selectedGenre by rememberSaveable { mutableStateOf<Genre?>(null) }
val favoriteStations = remember(uiState.stations, uiState.favorites) { val favoriteStations = remember(uiState.stations, uiState.favorites) {
uiState.stations.filter { it.id in uiState.favorites } uiState.stations.filter { it.id in uiState.favorites }
} }
@@ -77,11 +92,16 @@ fun HomeScreen(
uiState.recents.filter { it.id != uiState.currentStation?.id } uiState.recents.filter { it.id != uiState.currentStation?.id }
} }
val closeSearch = {
isSearchOpen = false
query = ""
}
BackHandler(enabled = uiState.isEqualizerPopOpen) { viewModel.closeEqualizerPop() } BackHandler(enabled = uiState.isEqualizerPopOpen) { viewModel.closeEqualizerPop() }
BackHandler(enabled = uiState.isNowPlayingOpen && !uiState.isEqualizerPopOpen) { viewModel.closeNowPlaying() } BackHandler(enabled = uiState.isNowPlayingOpen && !uiState.isEqualizerPopOpen) { viewModel.closeNowPlaying() }
BackHandler(enabled = uiState.isViewPopOpen && !uiState.isNowPlayingOpen) { viewModel.closeViewPop() } BackHandler(enabled = isSearchOpen && !uiState.isNowPlayingOpen) { closeSearch() }
BackHandler( BackHandler(
enabled = uiState.selectedTab != AppTab.RADIO && !uiState.isNowPlayingOpen && !uiState.isViewPopOpen enabled = uiState.selectedTab != AppTab.RADIO && !uiState.isNowPlayingOpen && !isSearchOpen
) { viewModel.setSelectedTab(AppTab.RADIO) } ) { viewModel.setSelectedTab(AppTab.RADIO) }
val showBatteryOptimizationPrompt by viewModel.showBatteryOptimizationPrompt.collectAsStateWithLifecycle() val showBatteryOptimizationPrompt by viewModel.showBatteryOptimizationPrompt.collectAsStateWithLifecycle()
@@ -90,16 +110,23 @@ fun HomeScreen(
} }
val density = LocalDensity.current val density = LocalDensity.current
var dockHeight by remember { mutableStateOf(140.dp) } var dockHeight by remember { mutableStateOf(160.dp) }
val scrollBottomPadding = dockHeight + 16.dp val scrollBottomPadding = dockHeight + 16.dp
Box(modifier = Modifier.fillMaxSize()) { Box(
MistyMountainBackground() modifier = Modifier
.fillMaxSize()
Column( .background(LocalGeoColors.current.background)
modifier = Modifier.fillMaxSize()
) { ) {
TopBrandBar() 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)) { Box(modifier = Modifier.weight(1f)) {
AnimatedContent( AnimatedContent(
@@ -116,68 +143,28 @@ fun HomeScreen(
label = "tabs" label = "tabs"
) { tab -> ) { tab ->
when (tab) { when (tab) {
AppTab.RADIO, AppTab.FAVORITES -> { AppTab.RADIO -> RadioTab(
val isFavorites = tab == AppTab.FAVORITES stations = uiState.stations,
Column(modifier = Modifier.fillMaxSize()) { currentStation = uiState.currentStation,
StationsToolbar( isPlaying = isPlaying,
title = stringResource( query = query.trim(),
if (isFavorites) R.string.favorite_stations_title else R.string.stations_title selectedGenre = selectedGenre,
), onSelectGenre = { selectedGenre = it },
isOpen = uiState.isViewPopOpen, onSelectStation = { viewModel.onStationClick(it) },
onToggleOpen = { viewModel.toggleViewPop() }, bottomContentPadding = scrollBottomPadding
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
) )
Box(modifier = Modifier.weight(1f)) { AppTab.FAVORITES -> FavoritesPanel(
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, favorites = favoriteStations,
currentStation = uiState.currentStation, currentStation = uiState.currentStation,
isPlaying = isPlaying, isPlaying = isPlaying,
viewMode = mode,
sizeStep = uiState.sizeStep,
onSelectStation = { viewModel.onStationClick(it) }, onSelectStation = { viewModel.onStationClick(it) },
onBrowseStations = { viewModel.setSelectedTab(AppTab.RADIO) }, onBrowseStations = { viewModel.setSelectedTab(AppTab.RADIO) },
bottomContentPadding = scrollBottomPadding, bottomContentPadding = scrollBottomPadding,
modifier = Modifier.fillMaxSize() 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.ABOUT -> { AppTab.ABOUT -> Column(
Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
@@ -189,7 +176,6 @@ fun HomeScreen(
} }
} }
} }
}
Column( Column(
modifier = Modifier modifier = Modifier
@@ -206,13 +192,6 @@ fun HomeScreen(
// even when the mini player is swiped away. // even when the mini player is swiped away.
.navigationBarsPadding() .navigationBarsPadding()
) { ) {
NavigationTabs(
selectedTab = uiState.selectedTab,
favoritesCount = uiState.unseenFavoritesCount,
onTabSelected = { viewModel.setSelectedTab(it) },
modifier = Modifier.padding(horizontal = 20.dp, vertical = 6.dp)
)
AnimatedVisibility( AnimatedVisibility(
visible = !uiState.isMiniPlayerHidden, visible = !uiState.isMiniPlayerHidden,
enter = fadeIn() + slideInVertically(initialOffsetY = { it }), enter = fadeIn() + slideInVertically(initialOffsetY = { it }),
@@ -221,13 +200,22 @@ fun HomeScreen(
MiniPlayer( MiniPlayer(
station = uiState.currentStation, station = uiState.currentStation,
playerState = uiState.playerState, playerState = uiState.playerState,
trackTitle = uiState.nowPlayingTitle,
onTogglePlay = { viewModel.togglePlay() }, onTogglePlay = { viewModel.togglePlay() },
onPrevious = { viewModel.previousStation() },
onNext = { viewModel.nextStation() },
onOpenNowPlaying = { viewModel.openNowPlaying() }, onOpenNowPlaying = { viewModel.openNowPlaying() },
onHide = { viewModel.hideMiniPlayer() } 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( AnimatedVisibility(
@@ -239,6 +227,8 @@ fun HomeScreen(
NowPlayingSheet( NowPlayingSheet(
station = uiState.currentStation, station = uiState.currentStation,
playerState = uiState.playerState, playerState = uiState.playerState,
trackTitle = uiState.nowPlayingTitle,
trackHistory = uiState.trackHistory,
isFavorite = isCurFav, isFavorite = isCurFav,
onToggleFavorite = { viewModel.toggleFavorite() }, onToggleFavorite = { viewModel.toggleFavorite() },
onTogglePlay = { viewModel.togglePlay() }, onTogglePlay = { viewModel.togglePlay() },
@@ -286,22 +276,83 @@ fun HomeScreen(
} }
} }
/** Genre cards on top, then the (filtered) station list. */
@Composable @Composable
private fun PopoverScrim(visible: Boolean, onDismiss: () -> Unit) { private fun RadioTab(
AnimatedVisibility( stations: List<RadioStation>,
visible = visible, currentStation: RadioStation?,
enter = fadeIn(tween(200)), isPlaying: Boolean,
exit = fadeOut(tween(160)) 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( if (query.isEmpty()) {
modifier = Modifier item(key = "genres") {
.fillMaxSize() GenreCarousel(
.background(Color.Black.copy(alpha = 0.38f)) stations = stations,
.clickable( selectedGenre = selectedGenre,
interactionSource = remember { MutableInteractionSource() }, onSelectGenre = onSelectGenre,
indication = null, modifier = Modifier.padding(bottom = 22.dp)
onClick = onDismiss
)
) )
} }
}
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)) }
}
} }
@@ -26,33 +26,34 @@ data class GeoColors(
val accentLavender: Color, val accentLavender: Color,
val onAccentLavender: Color, val onAccentLavender: Color,
val deepPurple: Color, val deepPurple: Color,
val liveGreen: Color, val liveRed: Color,
val redFavorite: Color val redFavorite: Color
) )
// Dark take on the "Rad.io" layout: deep navy surfaces with an electric-blue accent.
val DarkGeoColors = GeoColors( val DarkGeoColors = GeoColors(
background = Color(0xFF141218), background = Color(0xFF0D1016),
onBackground = Color(0xFFE6E0E9), onBackground = Color(0xFFEEF1F7),
surface = Color(0xFF141218), surface = Color(0xFF0D1016),
onSurface = Color(0xFFE6E0E9), onSurface = Color(0xFFEEF1F7),
surfaceContainer = Color(0xFF211F26), surfaceContainer = Color(0xFF161A23),
surfaceContainerHigh = Color(0xFF2B2930), surfaceContainerHigh = Color(0xFF1F2430),
onSurfaceVariant = Color(0xFFCAC4D0), onSurfaceVariant = Color(0xFF98A1B3),
outline = Color(0xFF938F99), outline = Color(0xFF5C6577),
outlineVariant = Color(0xFF49454F), outlineVariant = Color(0xFF272D3A),
primary = Color(0xFFD0BCFF), primary = Color(0xFF7C9DFF),
onPrimary = Color(0xFF381E72), onPrimary = Color(0xFF0B1A47),
primaryContainer = Color(0xFF4F378B), primaryContainer = Color(0xFF1F2D5C),
onPrimaryContainer = Color(0xFFEADDFF), onPrimaryContainer = Color(0xFFDCE4FF),
secondary = Color(0xFFCCC2DC), secondary = Color(0xFFB2C1E6),
onSecondary = Color(0xFF332D41), onSecondary = Color(0xFF18233F),
secondaryContainer = Color(0xFF4A4458), secondaryContainer = Color(0xFF283350),
onSecondaryContainer = Color(0xFFE8DEF8), onSecondaryContainer = Color(0xFFDCE4FF),
accentLavender = Color(0xFF4F378B), accentLavender = Color(0xFF3466F6),
onAccentLavender = Color(0xFFEADDFF), onAccentLavender = Color(0xFFFFFFFF),
deepPurple = Color(0xFFD0BCFF), deepPurple = Color(0xFFF3F6FF),
liveGreen = Color(0xFF81C995), liveRed = Color(0xFFFF4D5E),
redFavorite = Color(0xFFF2B8B5) redFavorite = Color(0xFFFF6B81)
) )
val LocalGeoColors = staticCompositionLocalOf { DarkGeoColors } val LocalGeoColors = staticCompositionLocalOf { DarkGeoColors }
@@ -8,9 +8,8 @@ import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import cc.skysparkle.fogwave.data.model.AppTab import cc.skysparkle.fogwave.data.model.AppTab
import cc.skysparkle.fogwave.data.model.ExtraPlayerTab 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.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.data.repository.RadioRepository
import cc.skysparkle.fogwave.player.AudioEffectsController import cc.skysparkle.fogwave.player.AudioEffectsController
import cc.skysparkle.fogwave.player.AudioEffectsState import cc.skysparkle.fogwave.player.AudioEffectsState
@@ -32,15 +31,14 @@ data class RadioUiState(
val favorites: Set<String> = emptySet(), val favorites: Set<String> = emptySet(),
val recents: List<RadioStation> = emptyList(), val recents: List<RadioStation> = emptyList(),
val selectedTab: AppTab = AppTab.RADIO, val selectedTab: AppTab = AppTab.RADIO,
val viewMode: ViewMode = ViewMode.ICONS,
val sizeStep: IconSizeStep = IconSizeStep.M,
val isNowPlayingOpen: Boolean = false, val isNowPlayingOpen: Boolean = false,
val isEqualizerPopOpen: Boolean = false, val isEqualizerPopOpen: Boolean = false,
val isViewPopOpen: Boolean = false, val activeExtraTab: ExtraPlayerTab = ExtraPlayerTab.HISTORY,
val activeExtraTab: ExtraPlayerTab = ExtraPlayerTab.RECENT,
val audioEffects: AudioEffectsState = AudioEffectsState(), val audioEffects: AudioEffectsState = AudioEffectsState(),
val isMiniPlayerHidden: Boolean = false, val isMiniPlayerHidden: Boolean = false,
val unseenFavoritesCount: Int = 0 val unseenFavoritesCount: Int = 0,
val nowPlayingTitle: String? = null,
val trackHistory: List<TrackEntry> = emptyList()
) )
class RadioViewModel(application: Application) : AndroidViewModel(application) { class RadioViewModel(application: Application) : AndroidViewModel(application) {
@@ -60,10 +58,12 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) {
private val _selectedTab = MutableStateFlow(AppTab.RADIO) private val _selectedTab = MutableStateFlow(AppTab.RADIO)
private val _isNowPlayingOpen = MutableStateFlow(false) private val _isNowPlayingOpen = MutableStateFlow(false)
private val _isEqualizerPopOpen = MutableStateFlow(false) private val _isEqualizerPopOpen = MutableStateFlow(false)
private val _isViewPopOpen = MutableStateFlow(false) private val _activeExtraTab = MutableStateFlow(ExtraPlayerTab.HISTORY)
private val _activeExtraTab = MutableStateFlow(ExtraPlayerTab.RECENT)
private val _isMiniPlayerHidden = MutableStateFlow(false) private val _isMiniPlayerHidden = MutableStateFlow(false)
// Newest first; kept for this session only.
private val _trackHistory = MutableStateFlow<List<TrackEntry>>(emptyList())
private val _showBatteryOptimizationPrompt = MutableStateFlow(false) private val _showBatteryOptimizationPrompt = MutableStateFlow(false)
val showBatteryOptimizationPrompt: StateFlow<Boolean> = _showBatteryOptimizationPrompt.asStateFlow() val showBatteryOptimizationPrompt: StateFlow<Boolean> = _showBatteryOptimizationPrompt.asStateFlow()
@@ -83,16 +83,15 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) {
repository.favoritesFlow, repository.favoritesFlow,
repository.recentsFlow, repository.recentsFlow,
_selectedTab, _selectedTab,
repository.viewModeFlow,
repository.sizeStepFlow,
_isNowPlayingOpen, _isNowPlayingOpen,
_isEqualizerPopOpen, _isEqualizerPopOpen,
_isViewPopOpen,
_activeExtraTab, _activeExtraTab,
AudioEffectsController.state, AudioEffectsController.state,
_isMiniPlayerHidden, _isMiniPlayerHidden,
repository.seenFavoritesFlow, repository.seenFavoritesFlow,
_stations _stations,
playerManager.nowPlayingTitle,
_trackHistory
) { params -> ) { params ->
val current = params[0] as? RadioStation val current = params[0] as? RadioStation
val pState = params[1] as PlayerState val pState = params[1] as PlayerState
@@ -101,18 +100,18 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val recentsIds = params[3] as List<String> val recentsIds = params[3] as List<String>
val tab = params[4] as AppTab val tab = params[4] as AppTab
val mode = params[5] as ViewMode val nowPlaying = params[5] as Boolean
val size = params[6] as IconSizeStep val eqPop = params[6] as Boolean
val nowPlaying = params[7] as Boolean val extraTab = params[7] as ExtraPlayerTab
val eqPop = params[8] as Boolean val effects = params[8] as AudioEffectsState
val viewPop = params[9] as Boolean val miniHidden = params[9] as Boolean
val extraTab = params[10] as ExtraPlayerTab
val effects = params[11] as AudioEffectsState
val miniHidden = params[12] as Boolean
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val seenFavs = params[13] as Set<String> val seenFavs = params[10] as Set<String>
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val orderedStations = params[14] as List<RadioStation> val orderedStations = params[11] as List<RadioStation>
val songTitle = params[12] as String?
@Suppress("UNCHECKED_CAST")
val history = params[13] as List<TrackEntry>
val byId = orderedStations.associateBy { it.id } val byId = orderedStations.associateBy { it.id }
val recentsList = recentsIds.mapNotNull { byId[it] } val recentsList = recentsIds.mapNotNull { byId[it] }
@@ -124,15 +123,14 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) {
favorites = favs, favorites = favs,
recents = recentsList, recents = recentsList,
selectedTab = tab, selectedTab = tab,
viewMode = mode,
sizeStep = size,
isNowPlayingOpen = nowPlaying, isNowPlayingOpen = nowPlaying,
isEqualizerPopOpen = eqPop, isEqualizerPopOpen = eqPop,
isViewPopOpen = viewPop,
activeExtraTab = extraTab, activeExtraTab = extraTab,
audioEffects = effects, audioEffects = effects,
isMiniPlayerHidden = miniHidden, isMiniPlayerHidden = miniHidden,
unseenFavoritesCount = favs.count { it !in seenFavs } unseenFavoritesCount = favs.count { it !in seenFavs },
nowPlayingTitle = songTitle,
trackHistory = history
) )
}.stateIn( }.stateIn(
scope = viewModelScope, scope = viewModelScope,
@@ -141,8 +139,6 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) {
stations = stations, stations = stations,
currentStation = initialStation, currentStation = initialStation,
favorites = repository.favoritesFlow.value, favorites = repository.favoritesFlow.value,
viewMode = repository.viewModeFlow.value,
sizeStep = repository.sizeStepFlow.value,
audioEffects = AudioEffectsController.state.value, audioEffects = AudioEffectsController.state.value,
unseenFavoritesCount = repository.favoritesFlow.value.count { it !in repository.seenFavoritesFlow.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. */ /** 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) { fun setSelectedTab(tab: AppTab) {
_selectedTab.value = tab _selectedTab.value = tab
_isViewPopOpen.value = false
if (tab == AppTab.FAVORITES) { if (tab == AppTab.FAVORITES) {
repository.markFavoritesSeen(repository.favoritesFlow.value) repository.markFavoritesSeen(repository.favoritesFlow.value)
} }
} }
fun setViewMode(mode: ViewMode) {
repository.setViewMode(mode)
}
fun setSizeStep(step: IconSizeStep) {
repository.setSizeStep(step)
}
fun openNowPlaying() { fun openNowPlaying() {
_isNowPlayingOpen.value = true _isNowPlayingOpen.value = true
} }
@@ -304,14 +305,6 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) {
_isEqualizerPopOpen.value = false _isEqualizerPopOpen.value = false
} }
fun toggleViewPop() {
_isViewPopOpen.value = !_isViewPopOpen.value
}
fun closeViewPop() {
_isViewPopOpen.value = false
}
fun setActiveExtraTab(tab: ExtraPlayerTab) { fun setActiveExtraTab(tab: ExtraPlayerTab) {
_activeExtraTab.value = tab _activeExtraTab.value = tab
} }
@@ -320,4 +313,8 @@ class RadioViewModel(application: Application) : AndroidViewModel(application) {
super.onCleared() super.onCleared()
playerManager.release() playerManager.release()
} }
private companion object {
const val MAX_TRACK_HISTORY = 60
}
} }
Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 952 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 680 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 922 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 644 B

+12
View File
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00000000"
android:strokeColor="#FFFFFFFF"
android:strokeWidth="2"
android:strokeLineCap="round"
android:pathData="M6,6L18,18 M18,6L6,18" />
</vector>
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00000000"
android:strokeColor="#FFFFFFFF"
android:strokeWidth="2"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:pathData="M6,17a3,3 0,1 0,6 0a3,3 0,1 0,-6 0z M12,17V4L19,6V9L12,7" />
</vector>
+12
View File
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00000000"
android:strokeColor="#FFFFFFFF"
android:strokeWidth="2"
android:strokeLineCap="round"
android:pathData="M11,4a7,7 0,1 0,0 14a7,7 0,1 0,0 -14z M16.2,16.2L20,20" />
</vector>
+12
View File
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00000000"
android:strokeColor="#FFFFFFFF"
android:strokeWidth="2"
android:strokeLineCap="round"
android:pathData="M15.5,5a2.5,2.5 0,1 0,5 0a2.5,2.5 0,1 0,-5 0z M3.5,12a2.5,2.5 0,1 0,5 0a2.5,2.5 0,1 0,-5 0z M15.5,19a2.5,2.5 0,1 0,5 0a2.5,2.5 0,1 0,-5 0z M8.2,10.8L15.8,6.2 M8.2,13.2L15.8,17.8" />
</vector>
+17 -11
View File
@@ -1,6 +1,5 @@
<resources> <resources>
<string name="app_name">Fogwave</string> <string name="app_name">Fogwave</string>
<string name="app_subtitle">Internetradio</string>
<string name="about_version">Version %1$s</string> <string name="about_version">Version %1$s</string>
<string name="about_description">Ein schneller, eleganter Internetradio-Player mit klarem Klang und ausgewogenem geometrischem Design.</string> <string name="about_description">Ein schneller, eleganter Internetradio-Player mit klarem Klang und ausgewogenem geometrischem Design.</string>
@@ -9,9 +8,7 @@
<string name="fogwave_logo_content_desc">Fogwave-Logo</string> <string name="fogwave_logo_content_desc">Fogwave-Logo</string>
<string name="player_connecting">Verbindung wird hergestellt…</string> <string name="player_connecting">Verbindung wird hergestellt…</string>
<string name="player_on_air">Auf Sendung</string>
<string name="player_stopped">Gestoppt</string> <string name="player_stopped">Gestoppt</string>
<string name="now_playing_live">Läuft gerade • LIVE</string>
<string name="now_playing_label">LÄUFT GERADE</string> <string name="now_playing_label">LÄUFT GERADE</string>
<string name="close_content_desc">Schließen</string> <string name="close_content_desc">Schließen</string>
<string name="equalizer_content_desc">Equalizer</string> <string name="equalizer_content_desc">Equalizer</string>
@@ -40,19 +37,11 @@
<string name="info_status">Status</string> <string name="info_status">Status</string>
<string name="status_live">Auf Sendung • Livestream</string> <string name="status_live">Auf Sendung • Livestream</string>
<string name="view_mode_content_desc">Anzeigemodus</string>
<string name="display_mode_label">ANZEIGEMODUS</string>
<string name="view_mode_list">Liste</string>
<string name="view_mode_table">Tabelle</string>
<string name="view_mode_tiles">Kacheln</string>
<string name="view_mode_icons">Symbole</string>
<string name="size_label">GRÖSSE</string>
<string name="favorites_empty_title">Noch keine Favoriten</string> <string name="favorites_empty_title">Noch keine Favoriten</string>
<string name="favorites_empty_subtitle">Öffne den Player eines beliebigen Senders und tippe auf das Herz, um ihn zu den Favoriten hinzuzufügen.</string> <string name="favorites_empty_subtitle">Öffne den Player eines beliebigen Senders und tippe auf das Herz, um ihn zu den Favoriten hinzuzufügen.</string>
<string name="stations_title">Sender</string> <string name="stations_title">Sender</string>
<string name="favorite_stations_title">Lieblingssender</string>
<string name="tab_radio">Radio</string> <string name="tab_radio">Radio</string>
<string name="tab_favorites">Favoriten</string> <string name="tab_favorites">Favoriten</string>
@@ -112,4 +101,21 @@
<string name="eq_preset_jazz">Jazz</string> <string name="eq_preset_jazz">Jazz</string>
<string name="eq_preset_pop">Pop</string> <string name="eq_preset_pop">Pop</string>
<string name="eq_preset_rock">Rock</string> <string name="eq_preset_rock">Rock</string>
<string name="live_label">LIVE</string>
<string name="search_content_desc">Suchen</string>
<string name="search_hint">Sender suchen</string>
<string name="search_results_title">Suchergebnisse</string>
<string name="search_no_results">Keine Sender passend zu „%1$s“</string>
<string name="genre_all">Alle Sender</string>
<plurals name="station_count">
<item quantity="one">%d Sender</item>
<item quantity="other">%d Sender</item>
</plurals>
<string name="extra_tab_history">Titel</string>
<string name="history_empty">Songs, die der Sender ansagt, erscheinen hier, während du zuhörst.</string>
<string name="history_now_playing_tag">Läuft gerade</string>
<string name="share_content_desc">Teilen</string>
<string name="share_text">Ich höre %1$s mit Fogwave</string>
<string name="share_text_track">Ich höre „%1$s“ auf %2$s mit Fogwave</string>
</resources> </resources>
+16 -11
View File
@@ -1,6 +1,5 @@
<resources> <resources>
<string name="app_name">Fogwave</string> <string name="app_name">Fogwave</string>
<string name="app_subtitle">インターネットラジオ</string>
<string name="about_version">バージョン %1$s</string> <string name="about_version">バージョン %1$s</string>
<string name="about_description">クリアなサウンドと調和のとれた幾何学的デザインを備えた、高速でエレガントなインターネットラジオプレーヤー。</string> <string name="about_description">クリアなサウンドと調和のとれた幾何学的デザインを備えた、高速でエレガントなインターネットラジオプレーヤー。</string>
@@ -9,9 +8,7 @@
<string name="fogwave_logo_content_desc">Fogwave ロゴ</string> <string name="fogwave_logo_content_desc">Fogwave ロゴ</string>
<string name="player_connecting">接続中…</string> <string name="player_connecting">接続中…</string>
<string name="player_on_air">オンエア中</string>
<string name="player_stopped">停止中</string> <string name="player_stopped">停止中</string>
<string name="now_playing_live">再生中 • ライブ</string>
<string name="now_playing_label">再生中</string> <string name="now_playing_label">再生中</string>
<string name="close_content_desc">閉じる</string> <string name="close_content_desc">閉じる</string>
<string name="equalizer_content_desc">イコライザー</string> <string name="equalizer_content_desc">イコライザー</string>
@@ -40,19 +37,11 @@
<string name="info_status">状態</string> <string name="info_status">状態</string>
<string name="status_live">オンエア中 • ライブストリーム</string> <string name="status_live">オンエア中 • ライブストリーム</string>
<string name="view_mode_content_desc">表示モード</string>
<string name="display_mode_label">表示モード</string>
<string name="view_mode_list">リスト</string>
<string name="view_mode_table">テーブル</string>
<string name="view_mode_tiles">タイル</string>
<string name="view_mode_icons">アイコン</string>
<string name="size_label">サイズ</string>
<string name="favorites_empty_title">お気に入りはまだありません</string> <string name="favorites_empty_title">お気に入りはまだありません</string>
<string name="favorites_empty_subtitle">好きな局のプレーヤーを開き、ハートをタップしてお気に入りに追加してください。</string> <string name="favorites_empty_subtitle">好きな局のプレーヤーを開き、ハートをタップしてお気に入りに追加してください。</string>
<string name="stations_title">ラジオ局</string> <string name="stations_title">ラジオ局</string>
<string name="favorite_stations_title">お気に入りの局</string>
<string name="tab_radio">ラジオ</string> <string name="tab_radio">ラジオ</string>
<string name="tab_favorites">お気に入り</string> <string name="tab_favorites">お気に入り</string>
@@ -112,4 +101,20 @@
<string name="eq_preset_jazz">ジャズ</string> <string name="eq_preset_jazz">ジャズ</string>
<string name="eq_preset_pop">ポップ</string> <string name="eq_preset_pop">ポップ</string>
<string name="eq_preset_rock">ロック</string> <string name="eq_preset_rock">ロック</string>
<string name="live_label">ライブ</string>
<string name="search_content_desc">検索</string>
<string name="search_hint">局を検索</string>
<string name="search_results_title">検索結果</string>
<string name="search_no_results">「%1$s」に一致する局はありません</string>
<string name="genre_all">すべての局</string>
<plurals name="station_count">
<item quantity="other">%d 局</item>
</plurals>
<string name="extra_tab_history">曲</string>
<string name="history_empty">聴いている間、局が配信する曲名がここに表示されます。</string>
<string name="history_now_playing_tag">再生中</string>
<string name="share_content_desc">共有</string>
<string name="share_text">Fogwaveで%1$sを聴いています</string>
<string name="share_text_track">Fogwaveで%2$sの「%1$s」を聴いています</string>
</resources> </resources>
+19 -11
View File
@@ -1,6 +1,5 @@
<resources> <resources>
<string name="app_name">Fogwave</string> <string name="app_name">Fogwave</string>
<string name="app_subtitle">Interneto radijas</string>
<string name="about_version">Versija %1$s</string> <string name="about_version">Versija %1$s</string>
<string name="about_description">Greitas ir elegantiškas interneto radijo grotuvas su švariu garsu ir darniu geometriniu dizainu.</string> <string name="about_description">Greitas ir elegantiškas interneto radijo grotuvas su švariu garsu ir darniu geometriniu dizainu.</string>
@@ -9,9 +8,7 @@
<string name="fogwave_logo_content_desc">Fogwave logotipas</string> <string name="fogwave_logo_content_desc">Fogwave logotipas</string>
<string name="player_connecting">Jungiamasi…</string> <string name="player_connecting">Jungiamasi…</string>
<string name="player_on_air">Eteryje</string>
<string name="player_stopped">Sustabdyta</string> <string name="player_stopped">Sustabdyta</string>
<string name="now_playing_live">Dabar skamba • tiesiogiai</string>
<string name="now_playing_label">DABAR SKAMBA</string> <string name="now_playing_label">DABAR SKAMBA</string>
<string name="close_content_desc">Uždaryti</string> <string name="close_content_desc">Uždaryti</string>
<string name="equalizer_content_desc">Ekvalaizeris</string> <string name="equalizer_content_desc">Ekvalaizeris</string>
@@ -40,19 +37,11 @@
<string name="info_status">Būsena</string> <string name="info_status">Būsena</string>
<string name="status_live">Eteryje • tiesioginė transliacija</string> <string name="status_live">Eteryje • tiesioginė transliacija</string>
<string name="view_mode_content_desc">Rodymo būdas</string>
<string name="display_mode_label">RODYMO BŪDAS</string>
<string name="view_mode_list">Sąrašas</string>
<string name="view_mode_table">Lentelė</string>
<string name="view_mode_tiles">Plytelės</string>
<string name="view_mode_icons">Piktogramos</string>
<string name="size_label">DYDIS</string>
<string name="favorites_empty_title">Mėgstamų kol kas nėra</string> <string name="favorites_empty_title">Mėgstamų kol kas nėra</string>
<string name="favorites_empty_subtitle">Atverkite bet kurios stoties grotuvą ir bakstelėkite širdelę, kad pridėtumėte ją prie mėgstamų.</string> <string name="favorites_empty_subtitle">Atverkite bet kurios stoties grotuvą ir bakstelėkite širdelę, kad pridėtumėte ją prie mėgstamų.</string>
<string name="stations_title">Stotys</string> <string name="stations_title">Stotys</string>
<string name="favorite_stations_title">Mėgstamos stotys</string>
<string name="tab_radio">Radijas</string> <string name="tab_radio">Radijas</string>
<string name="tab_favorites">Mėgstami</string> <string name="tab_favorites">Mėgstami</string>
@@ -112,4 +101,23 @@
<string name="eq_preset_jazz">Džiazas</string> <string name="eq_preset_jazz">Džiazas</string>
<string name="eq_preset_pop">Pop</string> <string name="eq_preset_pop">Pop</string>
<string name="eq_preset_rock">Rokas</string> <string name="eq_preset_rock">Rokas</string>
<string name="live_label">TIESIOGIAI</string>
<string name="search_content_desc">Ieškoti</string>
<string name="search_hint">Ieškoti stočių</string>
<string name="search_results_title">Paieškos rezultatai</string>
<string name="search_no_results">Nėra stočių pagal „%1$s“</string>
<string name="genre_all">Visos stotys</string>
<plurals name="station_count">
<item quantity="one">%d stotis</item>
<item quantity="few">%d stotys</item>
<item quantity="many">%d stoties</item>
<item quantity="other">%d stočių</item>
</plurals>
<string name="extra_tab_history">Kūriniai</string>
<string name="history_empty">Čia bus rodomos dainos, kurias skelbia stotis, kol klausotės.</string>
<string name="history_now_playing_tag">Dabar skamba</string>
<string name="share_content_desc">Bendrinti</string>
<string name="share_text">Klausausi %1$s per Fogwave</string>
<string name="share_text_track">Klausausi „%1$s“ per %2$s su Fogwave</string>
</resources> </resources>
+19 -11
View File
@@ -1,6 +1,5 @@
<resources> <resources>
<string name="app_name">Fogwave</string> <string name="app_name">Fogwave</string>
<string name="app_subtitle">Интернет-радио</string>
<string name="about_version">Версия %1$s</string> <string name="about_version">Версия %1$s</string>
<string name="about_description">Быстрый и элегантный плеер интернет-радио с чистым звуком и гармоничным геометрическим дизайном.</string> <string name="about_description">Быстрый и элегантный плеер интернет-радио с чистым звуком и гармоничным геометрическим дизайном.</string>
@@ -9,9 +8,7 @@
<string name="fogwave_logo_content_desc">Логотип Fogwave</string> <string name="fogwave_logo_content_desc">Логотип Fogwave</string>
<string name="player_connecting">Подключение…</string> <string name="player_connecting">Подключение…</string>
<string name="player_on_air">В эфире</string>
<string name="player_stopped">Остановлено</string> <string name="player_stopped">Остановлено</string>
<string name="now_playing_live">Сейчас играет • прямой эфир</string>
<string name="now_playing_label">СЕЙЧАС ИГРАЕТ</string> <string name="now_playing_label">СЕЙЧАС ИГРАЕТ</string>
<string name="close_content_desc">Закрыть</string> <string name="close_content_desc">Закрыть</string>
<string name="equalizer_content_desc">Эквалайзер</string> <string name="equalizer_content_desc">Эквалайзер</string>
@@ -40,19 +37,11 @@
<string name="info_status">Статус</string> <string name="info_status">Статус</string>
<string name="status_live">В эфире • прямая трансляция</string> <string name="status_live">В эфире • прямая трансляция</string>
<string name="view_mode_content_desc">Вид отображения</string>
<string name="display_mode_label">РЕЖИМ ОТОБРАЖЕНИЯ</string>
<string name="view_mode_list">Список</string>
<string name="view_mode_table">Таблица</string>
<string name="view_mode_tiles">Плитки</string>
<string name="view_mode_icons">Значки</string>
<string name="size_label">РАЗМЕР</string>
<string name="favorites_empty_title">В любимых пока ничего нет</string> <string name="favorites_empty_title">В любимых пока ничего нет</string>
<string name="favorites_empty_subtitle">Откройте плеер любой станции и нажмите на сердечко, чтобы добавить её в список любимых.</string> <string name="favorites_empty_subtitle">Откройте плеер любой станции и нажмите на сердечко, чтобы добавить её в список любимых.</string>
<string name="stations_title">Станции</string> <string name="stations_title">Станции</string>
<string name="favorite_stations_title">Любимые станции</string>
<string name="tab_radio">Радио</string> <string name="tab_radio">Радио</string>
<string name="tab_favorites">Любимые</string> <string name="tab_favorites">Любимые</string>
@@ -112,4 +101,23 @@
<string name="eq_preset_jazz">Джаз</string> <string name="eq_preset_jazz">Джаз</string>
<string name="eq_preset_pop">Поп</string> <string name="eq_preset_pop">Поп</string>
<string name="eq_preset_rock">Рок</string> <string name="eq_preset_rock">Рок</string>
<string name="live_label">В ЭФИРЕ</string>
<string name="search_content_desc">Поиск</string>
<string name="search_hint">Поиск станций</string>
<string name="search_results_title">Результаты поиска</string>
<string name="search_no_results">Нет станций по запросу «%1$s»</string>
<string name="genre_all">Все станции</string>
<plurals name="station_count">
<item quantity="one">%d станция</item>
<item quantity="few">%d станции</item>
<item quantity="many">%d станций</item>
<item quantity="other">%d станции</item>
</plurals>
<string name="extra_tab_history">Треки</string>
<string name="history_empty">Здесь появятся песни, которые объявляет станция, пока вы слушаете.</string>
<string name="history_now_playing_tag">Сейчас играет</string>
<string name="share_content_desc">Поделиться</string>
<string name="share_text">Слушаю %1$s в Fogwave</string>
<string name="share_text_track">Слушаю «%1$s» на %2$s в Fogwave</string>
</resources> </resources>
+16 -11
View File
@@ -1,6 +1,5 @@
<resources> <resources>
<string name="app_name">Fogwave</string> <string name="app_name">Fogwave</string>
<string name="app_subtitle">网络电台</string>
<string name="about_version">版本 %1$s</string> <string name="about_version">版本 %1$s</string>
<string name="about_description">音质清晰、几何设计和谐统一的快速优雅网络电台播放器。</string> <string name="about_description">音质清晰、几何设计和谐统一的快速优雅网络电台播放器。</string>
@@ -9,9 +8,7 @@
<string name="fogwave_logo_content_desc">Fogwave 标志</string> <string name="fogwave_logo_content_desc">Fogwave 标志</string>
<string name="player_connecting">正在连接…</string> <string name="player_connecting">正在连接…</string>
<string name="player_on_air">正在直播</string>
<string name="player_stopped">已停止</string> <string name="player_stopped">已停止</string>
<string name="now_playing_live">正在播放 • 直播</string>
<string name="now_playing_label">正在播放</string> <string name="now_playing_label">正在播放</string>
<string name="close_content_desc">关闭</string> <string name="close_content_desc">关闭</string>
<string name="equalizer_content_desc">均衡器</string> <string name="equalizer_content_desc">均衡器</string>
@@ -40,19 +37,11 @@
<string name="info_status">状态</string> <string name="info_status">状态</string>
<string name="status_live">正在直播 • 实时音频流</string> <string name="status_live">正在直播 • 实时音频流</string>
<string name="view_mode_content_desc">显示模式</string>
<string name="display_mode_label">显示模式</string>
<string name="view_mode_list">列表</string>
<string name="view_mode_table">表格</string>
<string name="view_mode_tiles">磁贴</string>
<string name="view_mode_icons">图标</string>
<string name="size_label">大小</string>
<string name="favorites_empty_title">收藏夹还是空的</string> <string name="favorites_empty_title">收藏夹还是空的</string>
<string name="favorites_empty_subtitle">打开任意电台的播放器,点击心形图标即可将其加入收藏。</string> <string name="favorites_empty_subtitle">打开任意电台的播放器,点击心形图标即可将其加入收藏。</string>
<string name="stations_title">电台</string> <string name="stations_title">电台</string>
<string name="favorite_stations_title">收藏的电台</string>
<string name="tab_radio">电台</string> <string name="tab_radio">电台</string>
<string name="tab_favorites">收藏</string> <string name="tab_favorites">收藏</string>
@@ -112,4 +101,20 @@
<string name="eq_preset_jazz">爵士</string> <string name="eq_preset_jazz">爵士</string>
<string name="eq_preset_pop">流行</string> <string name="eq_preset_pop">流行</string>
<string name="eq_preset_rock">摇滚</string> <string name="eq_preset_rock">摇滚</string>
<string name="live_label">直播</string>
<string name="search_content_desc">搜索</string>
<string name="search_hint">搜索电台</string>
<string name="search_results_title">搜索结果</string>
<string name="search_no_results">没有与“%1$s”匹配的电台</string>
<string name="genre_all">全部电台</string>
<plurals name="station_count">
<item quantity="other">%d 个电台</item>
</plurals>
<string name="extra_tab_history">曲目</string>
<string name="history_empty">收听时,电台播报的歌曲会显示在这里。</string>
<string name="history_now_playing_tag">正在播放</string>
<string name="share_content_desc">分享</string>
<string name="share_text">我正在用 Fogwave 收听 %1$s</string>
<string name="share_text_track">我正在用 Fogwave 收听 %2$s 的“%1$s”</string>
</resources> </resources>
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="fogwave_background">#FF141218</color> <color name="fogwave_background">#FF0D1016</color>
</resources> </resources>
+17 -11
View File
@@ -1,6 +1,5 @@
<resources> <resources>
<string name="app_name">Fogwave</string> <string name="app_name">Fogwave</string>
<string name="app_subtitle">Internet Radio</string>
<string name="about_version">Version %1$s</string> <string name="about_version">Version %1$s</string>
<string name="about_description">A fast, elegant internet radio player with clean sound and a balanced geometric design.</string> <string name="about_description">A fast, elegant internet radio player with clean sound and a balanced geometric design.</string>
@@ -9,9 +8,7 @@
<string name="fogwave_logo_content_desc">Fogwave logo</string> <string name="fogwave_logo_content_desc">Fogwave logo</string>
<string name="player_connecting">Connecting…</string> <string name="player_connecting">Connecting…</string>
<string name="player_on_air">On air</string>
<string name="player_stopped">Stopped</string> <string name="player_stopped">Stopped</string>
<string name="now_playing_live">Now playing • LIVE</string>
<string name="now_playing_label">NOW PLAYING</string> <string name="now_playing_label">NOW PLAYING</string>
<string name="close_content_desc">Close</string> <string name="close_content_desc">Close</string>
<string name="equalizer_content_desc">Equalizer</string> <string name="equalizer_content_desc">Equalizer</string>
@@ -44,19 +41,11 @@
<string name="info_status">Status</string> <string name="info_status">Status</string>
<string name="status_live">On air • Live Stream</string> <string name="status_live">On air • Live Stream</string>
<string name="view_mode_content_desc">Display mode</string>
<string name="display_mode_label">DISPLAY MODE</string>
<string name="view_mode_list">List</string>
<string name="view_mode_table">Table</string>
<string name="view_mode_tiles">Tiles</string>
<string name="view_mode_icons">Icons</string>
<string name="size_label">SIZE</string>
<string name="favorites_empty_title">Nothing in favorites yet</string> <string name="favorites_empty_title">Nothing in favorites yet</string>
<string name="favorites_empty_subtitle">Open any station\'s player and tap the heart to add it to favorites.</string> <string name="favorites_empty_subtitle">Open any station\'s player and tap the heart to add it to favorites.</string>
<string name="stations_title">Stations</string> <string name="stations_title">Stations</string>
<string name="favorite_stations_title">Favorite Stations</string>
<string name="tab_radio">Radio</string> <string name="tab_radio">Radio</string>
<string name="tab_favorites">Favorites</string> <string name="tab_favorites">Favorites</string>
@@ -112,4 +101,21 @@
<string name="eq_preset_jazz">Jazz</string> <string name="eq_preset_jazz">Jazz</string>
<string name="eq_preset_pop">Pop</string> <string name="eq_preset_pop">Pop</string>
<string name="eq_preset_rock">Rock</string> <string name="eq_preset_rock">Rock</string>
<string name="live_label">LIVE</string>
<string name="search_content_desc">Search</string>
<string name="search_hint">Search stations</string>
<string name="search_results_title">Search results</string>
<string name="search_no_results">No stations match “%1$s”</string>
<string name="genre_all">All stations</string>
<plurals name="station_count">
<item quantity="one">%d station</item>
<item quantity="other">%d stations</item>
</plurals>
<string name="extra_tab_history">Tracks</string>
<string name="history_empty">Songs the station announces will show up here while you listen.</string>
<string name="history_now_playing_tag">Now playing</string>
<string name="share_content_desc">Share</string>
<string name="share_text">I\'m listening to %1$s on Fogwave</string>
<string name="share_text_track">I\'m listening to “%1$s” on %2$s with Fogwave</string>
</resources> </resources>
@@ -3,10 +3,8 @@ package cc.skysparkle.fogwave
import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onRoot import androidx.compose.ui.test.onRoot
import cc.skysparkle.fogwave.data.model.Genre 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.RadioStation
import cc.skysparkle.fogwave.data.model.ViewMode import cc.skysparkle.fogwave.ui.components.StationRow
import cc.skysparkle.fogwave.ui.components.StationItem
import cc.skysparkle.fogwave.ui.theme.FogwaveTheme import cc.skysparkle.fogwave.ui.theme.FogwaveTheme
import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
import com.github.takahirom.roborazzi.captureRoboImage import com.github.takahirom.roborazzi.captureRoboImage
@@ -20,7 +18,7 @@ import org.robolectric.annotation.GraphicsMode
@RunWith(RobolectricTestRunner::class) @RunWith(RobolectricTestRunner::class)
@GraphicsMode(GraphicsMode.Mode.NATIVE) @GraphicsMode(GraphicsMode.Mode.NATIVE)
@Config(qualifiers = RobolectricDeviceQualifiers.Pixel8, sdk = [36]) @Config(qualifiers = RobolectricDeviceQualifiers.Pixel8, sdk = [36])
class StationItemScreenshotTest { class StationRowScreenshotTest {
@get:Rule val composeTestRule = createComposeRule() @get:Rule val composeTestRule = createComposeRule()
private val station = RadioStation( private val station = RadioStation(
@@ -34,20 +32,18 @@ class StationItemScreenshotTest {
) )
@Test @Test
fun stationItem_list_screenshot() { fun stationRow_screenshot() {
composeTestRule.setContent { composeTestRule.setContent {
FogwaveTheme { FogwaveTheme {
StationItem( StationRow(
station = station, station = station,
isCurrent = true, isCurrent = true,
isPlaying = false, isPlaying = false,
viewMode = ViewMode.LIST,
sizeStep = IconSizeStep.M,
onClick = {} onClick = {}
) )
} }
} }
composeTestRule.onRoot().captureRoboImage(filePath = "src/test/screenshots/station_item.png") composeTestRule.onRoot().captureRoboImage(filePath = "src/test/screenshots/station_row.png")
} }
} }
@@ -6,7 +6,7 @@
<li>Genieße deinen Lieblingsklang mit Equalizer, gespeicherten Einstellungen, Lautstärkeverstärkung und Audio-Presets.</li> <li>Genieße deinen Lieblingsklang mit Equalizer, gespeicherten Einstellungen, Lautstärkeverstärkung und Audio-Presets.</li>
<li>Hör einfach weiter: Bricht der Stream oder das Netz ab, verbindet sich die App automatisch neu.</li> <li>Hör einfach weiter: Bricht der Stream oder das Netz ab, verbindet sich die App automatisch neu.</li>
<li>Nimm das Radio mit auf die Straße – mit Android-Auto-Unterstützung.</li> <li>Nimm das Radio mit auf die Straße – mit Android-Auto-Unterstützung.</li>
<li>Finde Sender auf deine Art: Favoriten, zuletzt gehörte Sender, passende Genres und vier Ansichten.</li> <li>Finde Sender auf deine Art: Genre-Karten, Suche, Favoriten, zuletzt gehörte und ähnliche Sender – dazu der laufende Song und ein Titelverlauf.</li>
</ul> </ul>
<p>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.</p> <p>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.</p>
@@ -6,7 +6,7 @@
<li>Enjoy your favorite sound with an equalizer, saved settings, loudness boost, and audio presets.</li> <li>Enjoy your favorite sound with an equalizer, saved settings, loudness boost, and audio presets.</li>
<li>Get back to listening easily with auto-reconnect when your stream or network drops.</li> <li>Get back to listening easily with auto-reconnect when your stream or network drops.</li>
<li>Take radio on the road with Android Auto support.</li> <li>Take radio on the road with Android Auto support.</li>
<li>Find stations your way with favorites, recently played stations, genre matches, and four viewing layouts.</li> <li>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.</li>
</ul> </ul>
<p>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.</p> <p>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.</p>
@@ -6,7 +6,7 @@
<li>イコライザー、設定の保存、ラウドネスブースト、オーディオプリセットで好みの音に。</li> <li>イコライザー、設定の保存、ラウドネスブースト、オーディオプリセットで好みの音に。</li>
<li>ストリームやネットワークが途切れても自動で再接続し、すぐに再生が戻ります。</li> <li>ストリームやネットワークが途切れても自動で再接続し、すぐに再生が戻ります。</li>
<li>Android Autoに対応し、ドライブ中もラジオを。</li> <li>Android Autoに対応し、ドライブ中もラジオを。</li>
<li>お気に入り、最近聴いた局、ジャンルの一致、4種類の表示レイアウトで、自分好みに局を探せます。</li> <li>ジャンルカード、検索、お気に入り、最近聴いた局、似ている局で自分好みに局を探せます。再生中の曲名と曲の履歴も表示します。</li>
</ul> </ul>
<p>局を選んで再生するだけ。Fogwaveはバックグラウンドで再生を続け、イコライザー設定を次回まで保存します。ダークで余計なもののないデザインは、英語、ロシア語、ドイツ語、日本語、リトアニア語、中国語に対応しています。</p> <p>局を選んで再生するだけ。Fogwaveはバックグラウンドで再生を続け、イコライザー設定を次回まで保存します。ダークで余計なもののないデザインは、英語、ロシア語、ドイツ語、日本語、リトアニア語、中国語に対応しています。</p>
@@ -6,7 +6,7 @@
<li>Mėgaukitės mėgstamu skambėjimu su ekvalaizeriu, išsaugomais nustatymais, garsumo stiprinimu ir garso šablonais.</li> <li>Mėgaukitės mėgstamu skambėjimu su ekvalaizeriu, išsaugomais nustatymais, garsumo stiprinimu ir garso šablonais.</li>
<li>Lengvai grįžkite prie klausymo – nutrūkus srautui ar ryšiui programėlė automatiškai prisijungia iš naujo.</li> <li>Lengvai grįžkite prie klausymo – nutrūkus srautui ar ryšiui programėlė automatiškai prisijungia iš naujo.</li>
<li>Pasiimkite radiją į kelionę su Android Auto palaikymu.</li> <li>Pasiimkite radiją į kelionę su Android Auto palaikymu.</li>
<li>Raskite stotis savaip: mėgstamiausios, neseniai klausytos, panašūs žanrai ir keturi rodinio išdėstymai.</li> <li>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.</li>
</ul> </ul>
<p>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.</p> <p>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.</p>
@@ -6,7 +6,7 @@
<li>Настройте звук под себя: эквалайзер, сохранённые настройки, усиление громкости и аудиопресеты.</li> <li>Настройте звук под себя: эквалайзер, сохранённые настройки, усиление громкости и аудиопресеты.</li>
<li>Легко возвращайтесь к прослушиванию: приложение само переподключится, если поток или сеть пропадут.</li> <li>Легко возвращайтесь к прослушиванию: приложение само переподключится, если поток или сеть пропадут.</li>
<li>Берите радио в дорогу благодаря поддержке Android Auto.</li> <li>Берите радио в дорогу благодаря поддержке Android Auto.</li>
<li>Находите станции по-своему: избранное, недавно прослушанные, подбор по жанру и четыре варианта отображения.</li> <li>Находите станции по-своему: карточки жанров, поиск, избранное, недавно прослушанные и похожие станции, а также название текущей песни и история треков.</li>
</ul> </ul>
<p>Выберите станцию и нажмите кнопку воспроизведения. Fogwave продолжает играть в фоне и сохраняет настройки эквалайзера до следующего раза. Тёмный лаконичный интерфейс доступен на английском, русском, немецком, японском, литовском и китайском.</p> <p>Выберите станцию и нажмите кнопку воспроизведения. Fogwave продолжает играть в фоне и сохраняет настройки эквалайзера до следующего раза. Тёмный лаконичный интерфейс доступен на английском, русском, немецком, японском, литовском и китайском.</p>
@@ -6,7 +6,7 @@
<li>用均衡器、已保存的设置、响度增强和音频预设,调出你喜欢的声音。</li> <li>用均衡器、已保存的设置、响度增强和音频预设,调出你喜欢的声音。</li>
<li>音频流或网络中断时自动重新连接,轻松恢复收听。</li> <li>音频流或网络中断时自动重新连接,轻松恢复收听。</li>
<li>支持 Android Auto,开车也能听电台。</li> <li>支持 Android Auto,开车也能听电台。</li>
<li>按你的方式查找电台:收藏、最近收听、类型匹配,以及四种显示布局。</li> <li>按你的方式查找电台:类型卡片、搜索、收藏、最近收听和相似电台,还能看到正在播放的歌曲和曲目历史。</li>
</ul> </ul>
<p>选择电台,点击播放即可。Fogwave 会在后台持续播放,并保存你的均衡器设置供下次使用。深色简洁的界面支持英语、俄语、德语、日语、立陶宛语和中文。</p> <p>选择电台,点击播放即可。Fogwave 会在后台持续播放,并保存你的均衡器设置供下次使用。深色简洁的界面支持英语、俄语、德语、日语、立陶宛语和中文。</p>