diff --git a/README.md b/README.md
index 0e4c464..8810275 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
## ✨ Features
-- 📻 **10 Lithuanian stations** — ZIP FM, Power Hit Radio, Rock FM, Relax FM, M-1, Gold FM and more
+- 📻 **14 stations from Lithuania and Latvia** — ZIP FM, Power Hit Radio, Rock FM, LRT Radijas, Žinių radijas, Latvijas Radio 1 & 2 and more
- 🎧 **Background playback** with lock-screen, notification, headphone and Bluetooth controls
- 🚗 **Android Auto** support
- 🔄 **Auto-reconnect** when the stream drops or the network comes back
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4461ffd..76004c8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -85,6 +85,7 @@ dependencies {
implementation(libs.coil.compose)
implementation(libs.androidx.media3.exoplayer)
+ implementation(libs.androidx.media3.exoplayer.hls)
implementation(libs.androidx.media3.common)
implementation(libs.androidx.media3.session)
implementation(libs.kotlinx.coroutines.android)
diff --git a/app/src/main/java/cc/skysparkle/fogwave/data/model/RadioStation.kt b/app/src/main/java/cc/skysparkle/fogwave/data/model/RadioStation.kt
index fda7bf5..dd3e058 100644
--- a/app/src/main/java/cc/skysparkle/fogwave/data/model/RadioStation.kt
+++ b/app/src/main/java/cc/skysparkle/fogwave/data/model/RadioStation.kt
@@ -24,7 +24,9 @@ enum class Genre(@param:StringRes val labelRes: Int) {
OLDIES(R.string.genre_oldies),
ROCK(R.string.genre_rock),
EASY_LISTENING(R.string.genre_easy_listening),
- LITHUANIAN(R.string.genre_lithuanian)
+ LITHUANIAN(R.string.genre_lithuanian),
+ NEWS_TALK(R.string.genre_news_talk),
+ LATVIAN(R.string.genre_latvian)
}
enum class ViewMode {
diff --git a/app/src/main/java/cc/skysparkle/fogwave/data/repository/RadioRepository.kt b/app/src/main/java/cc/skysparkle/fogwave/data/repository/RadioRepository.kt
index 03b4ffe..ac55edc 100644
--- a/app/src/main/java/cc/skysparkle/fogwave/data/repository/RadioRepository.kt
+++ b/app/src/main/java/cc/skysparkle/fogwave/data/repository/RadioRepository.kt
@@ -110,6 +110,43 @@ class RadioRepository(context: Context) {
genres = listOf(Genre.HITS, Genre.LITHUANIAN),
bitrate = "MP3 128 kbps",
lightBackdrop = true
+ ),
+ RadioStation(
+ id = "lrt",
+ name = "LRT Radijas",
+ descriptionRes = R.string.station_desc_lrt,
+ streamUrl = "https://lrt-cast.lrt.lt/lrt_radijas",
+ iconResId = R.drawable.ic_station_lrt,
+ genres = listOf(Genre.NEWS_TALK, Genre.LITHUANIAN),
+ bitrate = "MP3",
+ lightBackdrop = true
+ ),
+ RadioStation(
+ id = "ziniu",
+ name = "Žinių radijas",
+ descriptionRes = R.string.station_desc_ziniu,
+ streamUrl = "https://netradio.ziniur.lt/ziniur.mp3?n=975355",
+ iconResId = R.drawable.ic_station_ziniu,
+ genres = listOf(Genre.NEWS_TALK),
+ bitrate = "MP3"
+ ),
+ RadioStation(
+ id = "lr1",
+ name = "Latvijas Radio 1",
+ descriptionRes = R.string.station_desc_lr1,
+ streamUrl = "https://muste.latvijasradio.lv/shoutcast/mp4:lr1a.stream/playlist.m3u8",
+ iconResId = R.drawable.ic_station_lr1,
+ genres = listOf(Genre.NEWS_TALK),
+ bitrate = "HLS"
+ ),
+ RadioStation(
+ id = "lr2",
+ name = "Latvijas Radio 2",
+ descriptionRes = R.string.station_desc_lr2,
+ streamUrl = "https://muste.latvijasradio.lv/shoutcast/mp4:lr2a.stream/playlist.m3u8",
+ iconResId = R.drawable.ic_station_lr2,
+ genres = listOf(Genre.LATVIAN, Genre.POP),
+ bitrate = "HLS"
)
)
diff --git a/app/src/main/java/cc/skysparkle/fogwave/player/StationMediaItems.kt b/app/src/main/java/cc/skysparkle/fogwave/player/StationMediaItems.kt
index 7fd1278..b2a6992 100644
--- a/app/src/main/java/cc/skysparkle/fogwave/player/StationMediaItems.kt
+++ b/app/src/main/java/cc/skysparkle/fogwave/player/StationMediaItems.kt
@@ -5,12 +5,15 @@ import android.content.Context
import androidx.core.net.toUri
import androidx.media3.common.MediaItem
import androidx.media3.common.MediaMetadata
+import androidx.media3.common.MimeTypes
import cc.skysparkle.fogwave.data.model.RadioStation
fun RadioStation.toMediaItem(context: Context): MediaItem {
val artworkUri = "${ContentResolver.SCHEME_ANDROID_RESOURCE}://${context.packageName}/$iconResId".toUri()
return MediaItem.Builder()
.setUri(streamUrl)
+ // HLS playlists are picked up by the HLS module; everything else stays a progressive stream.
+ .apply { if (streamUrl.substringBefore('?').endsWith(".m3u8")) setMimeType(MimeTypes.APPLICATION_M3U8) }
.setMediaId(id)
.setMediaMetadata(
MediaMetadata.Builder()
diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/LicensesDialog.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/LicensesDialog.kt
index 51216ec..05d716c 100644
--- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/LicensesDialog.kt
+++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/LicensesDialog.kt
@@ -46,7 +46,7 @@ private val LIBRARIES = listOf(
LicenseRow("AndroidX Activity Compose", AOSP, APACHE, "https://developer.android.com/jetpack/androidx/releases/activity", BuildConfig.ACTIVITY_VERSION),
LicenseRow("AndroidX Core KTX", AOSP, APACHE, "https://developer.android.com/jetpack/androidx/releases/core", BuildConfig.CORE_KTX_VERSION),
LicenseRow("AndroidX Lifecycle (ViewModel + Runtime Compose)", AOSP, APACHE, "https://developer.android.com/jetpack/androidx/releases/lifecycle", BuildConfig.LIFECYCLE_VERSION),
- LicenseRow("AndroidX Media3 (ExoPlayer, MediaSession)", AOSP, APACHE, "https://developer.android.com/jetpack/androidx/releases/media3", BuildConfig.MEDIA3_VERSION),
+ LicenseRow("AndroidX Media3 (ExoPlayer, HLS, MediaSession)", AOSP, APACHE, "https://developer.android.com/jetpack/androidx/releases/media3", BuildConfig.MEDIA3_VERSION),
LicenseRow("AndroidX \u2014 other libraries pulled in by the ones above", AOSP, APACHE, "https://developer.android.com/jetpack/androidx"),
LicenseRow("Guava (used by Media3)", "Google", APACHE, "https://github.com/google/guava"),
LicenseRow("kotlinx.coroutines", "JetBrains", APACHE, "https://github.com/Kotlin/kotlinx.coroutines", BuildConfig.COROUTINES_VERSION),
diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/ViewOptionsPopover.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/ViewOptionsPopover.kt
index b4b9848..1d1e0c6 100644
--- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/ViewOptionsPopover.kt
+++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/ViewOptionsPopover.kt
@@ -21,6 +21,7 @@ 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
@@ -62,7 +63,8 @@ fun StationsToolbar(
onSelectViewMode: (ViewMode) -> Unit,
sizeStep: IconSizeStep,
onSelectSizeStep: (IconSizeStep) -> Unit,
- modifier: Modifier = Modifier
+ modifier: Modifier = Modifier,
+ showViewOptions: Boolean = true
) {
Column(
modifier = modifier
@@ -70,7 +72,8 @@ fun StationsToolbar(
.padding(horizontal = 20.dp, vertical = 6.dp)
) {
Row(
- modifier = Modifier.fillMaxWidth(),
+ // 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
) {
@@ -89,27 +92,29 @@ fun StationsToolbar(
.padding(end = 12.dp)
)
- 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
- )
+ 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,
+ visible = isOpen && showViewOptions,
enter = expandVertically(
animationSpec = spring(dampingRatio = 0.85f, stiffness = Spring.StiffnessMediumLow),
expandFrom = Alignment.Top
diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt
index abe21e5..a941951 100644
--- a/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt
+++ b/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt
@@ -128,7 +128,9 @@ fun HomeScreen(
viewMode = uiState.viewMode,
onSelectViewMode = { viewModel.setViewMode(it) },
sizeStep = uiState.sizeStep,
- onSelectSizeStep = { viewModel.setSizeStep(it) }
+ onSelectSizeStep = { viewModel.setSizeStep(it) },
+ // View options live on the Radio tab only; Favorites follows that choice.
+ showViewOptions = !isFavorites
)
Box(modifier = Modifier.weight(1f)) {
diff --git a/app/src/main/res/drawable-nodpi/ic_station_lr1.webp b/app/src/main/res/drawable-nodpi/ic_station_lr1.webp
new file mode 100644
index 0000000..fff6d5d
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_station_lr1.webp differ
diff --git a/app/src/main/res/drawable-nodpi/ic_station_lr2.webp b/app/src/main/res/drawable-nodpi/ic_station_lr2.webp
new file mode 100644
index 0000000..28f9fab
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_station_lr2.webp differ
diff --git a/app/src/main/res/drawable-nodpi/ic_station_lrt.webp b/app/src/main/res/drawable-nodpi/ic_station_lrt.webp
new file mode 100644
index 0000000..fa10333
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_station_lrt.webp differ
diff --git a/app/src/main/res/drawable-nodpi/ic_station_ziniu.webp b/app/src/main/res/drawable-nodpi/ic_station_ziniu.webp
new file mode 100644
index 0000000..1c77db6
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_station_ziniu.webp differ
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2eede21..da6414f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -88,6 +88,10 @@
Nimm Litauens beliebteste Radiosender mit – ganz ohne Ballast. Mit Fogwave schaltest du einfach ein, hörst im Hintergrund und genießt ein aufgeräumtes, werbefreies Erlebnis ohne Konto und ohne Tracking.
Bring Lithuania's favorite radio stations along, without the clutter. Fogwave makes it easy to tune in, listen in the background, and enjoy a clean, ad-free experience with no account or tracking required.
リトアニアで人気のラジオ局を、すっきりといつでも。Fogwaveなら簡単に選局でき、バックグラウンドで聴けて、広告なしの快適な体験を楽しめます。アカウント登録もトラッキングもありません。
Mėgstamiausios Lietuvos radijo stotys visada su jumis – be nereikalingų dalykų. Su Fogwave lengva įsijungti radiją, klausytis fone ir mėgautis švariu klausymu be reklamų, be paskyros ir be sekimo.
Любимые радиостанции Литвы всегда с вами — без лишнего. Fogwave позволяет легко включить радио, слушать его в фоне и наслаждаться чистым прослушиванием без рекламы, аккаунта и отслеживания.
随身携带立陶宛最受欢迎的电台,简洁不杂乱。Fogwave 让你轻松收听、后台播放,享受干净无广告的体验,无需账号,也没有任何跟踪。