Compare commits

12 Commits
Author SHA1 Message Date
kfj001 58ea55f359 Updates build_whitelabel to regenerate album art for android auto app 2026-07-20 18:20:42 -07:00
kfj001 f069fcdbfb updates themeing to align better with website harmonies 2026-07-12 01:38:14 -07:00
kfj001 9706cc9a6d adds available annotation to carplay logic 2026-07-11 23:41:42 -07:00
Your Name ea1bc88a70 Adds app whitelabling feature from kmountainflower site dumps 2026-07-07 10:00:16 +00:00
kfj001 b8d624343b Merge pull request 'Alters the metadata sent to google cast to reflect the station rather the song when cast began.' (#8) from cast_station_name_not_current_track into main
Reviewed-on: http://192.168.1.74:30008/kfj001/kryz-go-flutter/pulls/8
2026-05-17 14:32:58 -07:00
kfj001 4c4113f66f Alters the metadata sent to google cast to reflect the station rather the song when cast began. 2026-05-17 14:32:38 -07:00
kfj001 5f3801e65f Merge pull request 'corrects problem where google cast was disconnected from player state when app launched from head unit' (#7) from fix_cast into main
Reviewed-on: http://192.168.1.74:30008/kfj001/kryz-go-flutter/pulls/7
2026-05-17 14:21:45 -07:00
kfj001 a2b5da3669 corrects problem where google cast was disconnected from player state when app launched from head unit 2026-05-16 23:45:11 -07:00
kfj001 1c7e27b83d Merge pull request 'refactors design to flutter driven service core.' (#6) from central_flutter_service into main
Reviewed-on: http://192.168.1.74:30008/kfj001/kryz-go-flutter/pulls/6
2026-05-16 21:22:16 -07:00
kfj001 df2338e5e9 higher resolution android auto logo 2026-05-16 21:21:34 -07:00
kfj001 85740b399b bug fixes for android auto 2026-05-16 21:05:34 -07:00
kfj001 5ea7442c7c refactors design to flutter driven service core. 2026-05-16 20:52:39 -07:00
164 changed files with 1723 additions and 728 deletions
Regular → Executable
+1 -1
View File
@@ -4,7 +4,7 @@ ENV PATH="$PATH:/opt/flutter/bin"
# Install system dependencies # Install system dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
wget curl unzip git xz-utils zip cmake clang pkg-config mesa-utils lld libgtk-3-dev ninja-build libglu1-mesa openjdk-17-jdk\ wget curl unzip git xz-utils zip cmake clang pkg-config mesa-utils python3 pip pipx lld libgtk-3-dev ninja-build libglu1-mesa openjdk-17-jdk\
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Become non-root # Become non-root
Regular → Executable
+8 -2
View File
@@ -1,7 +1,7 @@
{ {
"name": "kryz-go", "name": "kryz-go",
"mounts": [ "mounts": [
"source=/dev/dri,target=/dev/dri,type=bind" // "source=/dev/dri,target=/dev/dri,type=bind"
], ],
"build": { "build": {
"dockerfile": "Dockerfile" "dockerfile": "Dockerfile"
@@ -14,5 +14,11 @@
] ]
} }
}, },
"postCreateCommand": "flutter doctor -v" "postCreateCommand": "flutter pub get && python3 -m venv .venv && . .venv/bin/activate && pip install --upgrade pip && pip install -r requirements.txt && curl -fsSL https://claude.ai/install.sh | bash",
"postStartCommand": ".venv/bin/activate",
"containerEnv": {
"ANTHROPIC_BASE_URL": "http://192.168.1.108:1234",
"ANTHROPIC_API_KEY": "lmstudio",
"ANTHROPIC_BASE_MODEL": "qwen/qwen3.6-27b"
}
} }
Regular → Executable
+9 -1
View File
@@ -1,3 +1,6 @@
# Generated whitelabel config — rebuilt by build_whitelabel.py
lib/generated/
# ---> Dart # ---> Dart
# See https://www.dartlang.org/guides/libraries/private-files # See https://www.dartlang.org/guides/libraries/private-files
@@ -69,7 +72,7 @@ google-services.json
.LSOverride .LSOverride
# Icon must end with two \r # Icon must end with two \r
Icon Icon
# Thumbnails # Thumbnails
._* ._*
@@ -90,3 +93,8 @@ Network Trash Folder
Temporary Items Temporary Items
.apdisk .apdisk
# Python venv
.venv/
# Whitelabel app theming
theme.json
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
View File
+1 -1
View File
@@ -8,7 +8,7 @@
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/> <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
<application <application
android:label="KRYZ Go!" android:label="KMountain Flower Radio"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity
@@ -3,36 +3,33 @@ package com.example.kryz_go_flutter
import android.app.Notification import android.app.Notification
import android.app.NotificationChannel import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.content.ComponentName
import android.content.Context import android.content.Context
import android.media.AudioAttributes import android.content.Intent
import android.media.AudioFocusRequest import android.graphics.Bitmap
import android.media.AudioManager import android.graphics.BitmapFactory
import android.media.MediaPlayer import android.os.Handler
import android.os.Looper
import android.support.v4.media.MediaBrowserCompat
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.support.v4.media.MediaBrowserCompat.MediaItem import android.support.v4.media.MediaBrowserCompat.MediaItem
import android.support.v4.media.MediaDescriptionCompat import android.support.v4.media.MediaDescriptionCompat
import android.support.v4.media.MediaMetadataCompat import android.support.v4.media.MediaMetadataCompat
import android.support.v4.media.session.MediaControllerCompat
import android.support.v4.media.session.MediaSessionCompat import android.support.v4.media.session.MediaSessionCompat
import android.support.v4.media.session.PlaybackStateCompat import android.support.v4.media.session.PlaybackStateCompat
import android.util.Log import android.util.Log
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.media.MediaBrowserServiceCompat import androidx.media.MediaBrowserServiceCompat
import com.ryanheise.audioservice.AudioService
/** /**
* MediaBrowserService for Android Auto. * MediaBrowserService for Android Auto.
* *
* Android Auto connects to this service to browse content and control playback. * Android Auto connects to this service to browse content and send transport
* * controls. Playback execution is delegated to Flutter's audio_service session.
* Two playback modes:
* 1. Cold start (Flutter not running): the service plays the stream directly via
* MediaPlayer. This avoids the unreliable startActivity → Flutter bridge.
* 2. Warm start (Flutter running): MainActivity registers play/stop callbacks so
* Auto commands are forwarded through the method channel to just_audio.
*
* When the Flutter app opens while the service is playing, MainActivity stops the
* service's MediaPlayer and Flutter takes over seamlessly.
* *
* Brand color (#E36A18) is declared on this service via KryzAutoTheme in styles.xml * Brand color (#E36A18) is declared on this service via KryzAutoTheme in styles.xml
* so Android Auto accents its media UI with the KRYZ orange. * so Android Auto accents its media UI with the KRYZ orange.
@@ -43,48 +40,66 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
private const val TAG = "KryzAutoService" private const val TAG = "KryzAutoService"
private const val MEDIA_ID_ROOT = "kryz_root" private const val MEDIA_ID_ROOT = "kryz_root"
private const val MEDIA_ID_LIVE = "kryz_live_stream" private const val MEDIA_ID_LIVE = "kryz_live_stream"
private const val STREAM_URL = "https://kryz.out.airtime.pro/kryz_a" private const val STREAM_URL = "https://libretime.westerntechnologies.duckdns.org/main"
private const val NOTIFICATION_CHANNEL_ID = "com.kryzgoflutter.auto.channel" private const val NOTIFICATION_CHANNEL_ID = "com.kryzgoflutter.auto.channel"
private const val NOTIFICATION_ID = 1001 private const val NOTIFICATION_ID = 1001
private var instance: KryzAutoMediaBrowserService? = null
// Called by MainActivity to mirror Flutter playback state into the MediaSession.
fun updatePlaybackState(isPlaying: Boolean, isBuffering: Boolean) {
instance?.applyPlaybackState(isPlaying, isBuffering)
}
// Called by MainActivity when Flutter is alive and taking over from the service player.
fun stopServicePlayer() {
instance?.stopServicePlayback()
}
fun isServicePlaying(): Boolean {
return try {
instance?.serviceMediaPlayer?.isPlaying == true
} catch (_: IllegalStateException) {
false
}
}
// Flutter-side play/stop callbacks registered by MainActivity when Flutter is ready.
private var directPlayCallback: (() -> Unit)? = null
private var directStopCallback: (() -> Unit)? = null
fun registerDirectCallbacks(play: () -> Unit, stop: () -> Unit) {
directPlayCallback = play
directStopCallback = stop
}
fun unregisterDirectCallbacks() {
directPlayCallback = null
directStopCallback = null
}
} }
private lateinit var mediaSession: MediaSessionCompat private lateinit var mediaSession: MediaSessionCompat
private var serviceMediaPlayer: MediaPlayer? = null private var audioServiceBrowser: MediaBrowserCompat? = null
private var audioFocusRequest: AudioFocusRequest? = null private var audioServiceController: MediaControllerCompat? = null
private val mainHandler = Handler(Looper.getMainLooper())
private var pendingPlayRequest: Boolean = false
private var pendingStopRequest: Boolean = false
private var reconnectScheduled: Boolean = false
/**
* Album-art bitmap loaded from the drawable resource.
* Embedded directly into MediaMetadata so Android Auto cannot serve a stale URI cache.
*/
private val albumArtBitmap: Bitmap by lazy {
BitmapFactory.decodeResource(resources, R.drawable.kryz_auto_art)
}
private val mediaControllerCallback = object : MediaControllerCompat.Callback() {
override fun onPlaybackStateChanged(state: PlaybackStateCompat?) {
applyPlaybackStateFromFlutter(state)
}
override fun onMetadataChanged(metadata: MediaMetadataCompat?) {
applyNowPlayingMetadataFromFlutter(metadata)
}
}
private val browserConnectionCallback = object : MediaBrowserCompat.ConnectionCallback() {
override fun onConnected() {
val browser = audioServiceBrowser ?: return
try {
val controller = MediaControllerCompat(this@KryzAutoMediaBrowserService, browser.sessionToken)
audioServiceController?.unregisterCallback(mediaControllerCallback)
audioServiceController = controller
controller.registerCallback(mediaControllerCallback)
applyPlaybackStateFromFlutter(controller.playbackState)
applyNowPlayingMetadataFromFlutter(controller.metadata)
consumePendingTransportCommands()
Log.d(TAG, "Connected to Flutter audio_service session")
} catch (error: Exception) {
Log.e(TAG, "Unable to bind media controller: ${error.message}")
}
}
override fun onConnectionSuspended() {
Log.w(TAG, "audio_service browser connection suspended")
handleControllerDisconnected()
scheduleBrowserReconnect()
}
override fun onConnectionFailed() {
Log.e(TAG, "audio_service browser connection failed")
handleControllerDisconnected()
scheduleBrowserReconnect()
}
}
private val mediaSessionCallback = object : MediaSessionCompat.Callback() { private val mediaSessionCallback = object : MediaSessionCompat.Callback() {
override fun onPlay() { override fun onPlay() {
@@ -94,12 +109,7 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
override fun onStop() { override fun onStop() {
Log.d(TAG, "onStop()") Log.d(TAG, "onStop()")
val stop = directStopCallback dispatchStopCommand()
if (stop != null) {
stop()
} else {
stopServicePlayback()
}
} }
override fun onPlayFromMediaId(mediaId: String?, extras: Bundle?) { override fun onPlayFromMediaId(mediaId: String?, extras: Bundle?) {
@@ -114,20 +124,25 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
} }
private fun triggerPlay() { private fun triggerPlay() {
val play = directPlayCallback dispatchPlayCommand()
if (play != null) { }
// Flutter is running — signal buffering then let Flutter handle audio.
applyPlaybackState(isPlaying = false, isBuffering = true) /**
play() * Build an android.resource Uri for the Auto album-art drawable.
} else { * Uses R.drawable.kryz_auto_art so the resource shrinker sees the reference
// Flutter is not running — play directly via MediaPlayer. * and keeps the image in release APKs.
startServicePlayback() */
} private fun getAutoArtUri(): Uri {
return Uri.Builder()
.scheme("android.resource")
.authority(packageName)
.appendPath(resources.getResourceTypeName(R.drawable.kryz_auto_art))
.appendPath(resources.getResourceEntryName(R.drawable.kryz_auto_art))
.build()
} }
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
instance = this
Log.d(TAG, "onCreate()") Log.d(TAG, "onCreate()")
createNotificationChannel() createNotificationChannel()
@@ -154,6 +169,7 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
} }
sessionToken = mediaSession.sessionToken sessionToken = mediaSession.sessionToken
Log.d(TAG, "MediaSession created, sessionToken set") Log.d(TAG, "MediaSession created, sessionToken set")
connectToFlutterAudioService()
} }
override fun onGetRoot( override fun onGetRoot(
@@ -171,11 +187,11 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
) { ) {
Log.d(TAG, "onLoadChildren($parentId)") Log.d(TAG, "onLoadChildren($parentId)")
if (parentId == MEDIA_ID_ROOT) { if (parentId == MEDIA_ID_ROOT) {
val iconUri = Uri.parse("android.resource://${packageName}/mipmap/ic_launcher") val iconUri = getAutoArtUri()
val description = MediaDescriptionCompat.Builder() val description = MediaDescriptionCompat.Builder()
.setMediaId(MEDIA_ID_LIVE) .setMediaId(MEDIA_ID_LIVE)
.setTitle("KRYZ Live Stream") .setTitle("KMTN Live Stream")
.setSubtitle("KRYZ Radio") .setSubtitle("KMountain Radio")
.setIconUri(iconUri) .setIconUri(iconUri)
.setMediaUri(Uri.parse(STREAM_URL)) .setMediaUri(Uri.parse(STREAM_URL))
.build() .build()
@@ -187,76 +203,35 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
override fun onDestroy() { override fun onDestroy() {
Log.d(TAG, "onDestroy()") Log.d(TAG, "onDestroy()")
stopServicePlayback() stopFlutterPlaybackForHeadUnitDisconnect()
instance = null disconnectFromFlutterAudioService()
if (::mediaSession.isInitialized) mediaSession.release() if (::mediaSession.isInitialized) mediaSession.release()
super.onDestroy() super.onDestroy()
} }
// Direct MediaPlayer playback used when Flutter is not running (cold Auto start). override fun onTaskRemoved(rootIntent: Intent?) {
private fun startServicePlayback() { Log.d(TAG, "onTaskRemoved()")
Log.d(TAG, "startServicePlayback()") stopFlutterPlaybackForHeadUnitDisconnect()
stopServicePlayback() super.onTaskRemoved(rootIntent)
applyPlaybackState(isPlaying = false, isBuffering = true)
startForeground(NOTIFICATION_ID, buildNotification(isPlaying = false))
requestAudioFocus()
val player = MediaPlayer()
try {
player.setAudioAttributes(
AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build()
)
player.setDataSource(STREAM_URL)
player.setOnPreparedListener { mp ->
Log.d(TAG, "MediaPlayer prepared → starting")
mp.start()
applyPlaybackState(isPlaying = true, isBuffering = false)
startForeground(NOTIFICATION_ID, buildNotification(isPlaying = true))
}
player.setOnInfoListener { _, what, _ ->
when (what) {
MediaPlayer.MEDIA_INFO_BUFFERING_START ->
applyPlaybackState(isPlaying = false, isBuffering = true)
MediaPlayer.MEDIA_INFO_BUFFERING_END ->
applyPlaybackState(isPlaying = true, isBuffering = false)
}
true
}
player.setOnErrorListener { _, what, extra ->
Log.e(TAG, "MediaPlayer error what=$what extra=$extra")
applyPlaybackState(isPlaying = false, isBuffering = false)
@Suppress("DEPRECATION")
stopForeground(true)
true
}
player.prepareAsync()
serviceMediaPlayer = player
} catch (e: Exception) {
Log.e(TAG, "Failed to start service playback: ${e.message}")
player.release()
applyPlaybackState(isPlaying = false, isBuffering = false)
@Suppress("DEPRECATION")
stopForeground(true)
}
} }
private fun stopServicePlayback() { override fun onUnbind(intent: Intent?): Boolean {
val player = serviceMediaPlayer ?: return Log.d(TAG, "onUnbind()")
Log.d(TAG, "stopServicePlayback()") stopFlutterPlaybackForHeadUnitDisconnect()
serviceMediaPlayer = null return super.onUnbind(intent)
}
private fun stopFlutterPlaybackForHeadUnitDisconnect() {
pendingPlayRequest = false
pendingStopRequest = false
try { try {
if (player.isPlaying) player.stop() audioServiceController?.transportControls?.stop()
player.release() } catch (error: Exception) {
} catch (e: Exception) { Log.w(TAG, "Unable to stop Flutter audio on head unit disconnect: ${error.message}")
Log.e(TAG, "Error releasing MediaPlayer: ${e.message}")
} }
abandonAudioFocus()
applyPlaybackState(isPlaying = false, isBuffering = false) applyPlaybackState(isPlaying = false, isBuffering = false)
@Suppress("DEPRECATION")
stopForeground(true)
} }
private fun applyPlaybackState(isPlaying: Boolean, isBuffering: Boolean) { private fun applyPlaybackState(isPlaying: Boolean, isBuffering: Boolean) {
@@ -279,44 +254,76 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
.setState(state, PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN, 1f) .setState(state, PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN, 1f)
.build() .build()
) )
startForeground(NOTIFICATION_ID, buildNotification(isPlaying = isPlaying, isBuffering = isBuffering))
Log.d(TAG, "applyPlaybackState: playing=$isPlaying buffering=$isBuffering") Log.d(TAG, "applyPlaybackState: playing=$isPlaying buffering=$isBuffering")
} }
private fun requestAudioFocus() { private fun dispatchPlayCommand() {
val audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager val controller = audioServiceController
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (controller != null) {
val req = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN) pendingPlayRequest = false
.setAudioAttributes( pendingStopRequest = false
AudioAttributes.Builder() applyPlaybackState(isPlaying = false, isBuffering = true)
.setUsage(AudioAttributes.USAGE_MEDIA) controller.transportControls.play()
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) return
.build() }
)
.build() pendingStopRequest = false
audioFocusRequest = req pendingPlayRequest = true
audioManager.requestAudioFocus(req) applyPlaybackState(isPlaying = false, isBuffering = true)
} else { connectToFlutterAudioService()
@Suppress("DEPRECATION") }
audioManager.requestAudioFocus(null, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN)
private fun dispatchStopCommand() {
val controller = audioServiceController
if (controller != null) {
pendingPlayRequest = false
pendingStopRequest = false
controller.transportControls.stop()
return
}
pendingPlayRequest = false
pendingStopRequest = true
applyPlaybackState(isPlaying = false, isBuffering = false)
connectToFlutterAudioService()
}
private fun consumePendingTransportCommands() {
val controller = audioServiceController ?: return
if (pendingStopRequest) {
pendingStopRequest = false
controller.transportControls.stop()
}
if (pendingPlayRequest) {
pendingPlayRequest = false
controller.transportControls.play()
} }
} }
private fun abandonAudioFocus() { private fun applyPlaybackStateFromFlutter(state: PlaybackStateCompat?) {
val audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager if (state == null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { applyPlaybackState(isPlaying = false, isBuffering = false)
audioFocusRequest?.let { audioManager.abandonAudioFocusRequest(it) } return
audioFocusRequest = null
} }
val isPlaying = state.state == PlaybackStateCompat.STATE_PLAYING
val isBuffering = state.state == PlaybackStateCompat.STATE_BUFFERING ||
state.state == PlaybackStateCompat.STATE_CONNECTING
applyPlaybackState(isPlaying = isPlaying, isBuffering = isBuffering)
} }
private fun createNotificationChannel() { private fun createNotificationChannel() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channel = NotificationChannel( val channel = NotificationChannel(
NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID,
"KRYZ Auto Playback", "KMountain Flower Radio Auto Playback",
NotificationManager.IMPORTANCE_LOW, NotificationManager.IMPORTANCE_LOW,
).apply { ).apply {
description = "KRYZ Radio Android Auto playback" description = "KMountain Flower Radio Android Auto playback"
setShowBadge(false) setShowBadge(false)
} }
val mgr = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager val mgr = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -324,26 +331,135 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
} }
} }
private fun buildNotification(isPlaying: Boolean): Notification { private fun buildNotification(isPlaying: Boolean, isBuffering: Boolean): Notification {
val statusText = when {
isPlaying -> "Playing from Flutter audio handler"
isBuffering -> "Connecting via Flutter audio handler..."
else -> "Stopped"
}
return NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) return NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
.setContentTitle("KRYZ Radio") .setContentTitle("KMountain Radio")
.setContentText(if (isPlaying) "Playing via Android Auto" else "Connecting…") .setContentText(statusText)
.setSmallIcon(R.mipmap.ic_launcher) .setSmallIcon(R.mipmap.ic_launcher)
.setOngoing(isPlaying) .setOngoing(isPlaying || isBuffering)
.setSilent(true) .setSilent(true)
.build() .build()
} }
private fun applyNowPlayingMetadata(
title: String?,
subtitle: String?,
album: String?,
mediaUri: String?,
) {
if (!::mediaSession.isInitialized) return
val iconUri = getAutoArtUri()
mediaSession.setMetadata(
MediaMetadataCompat.Builder()
.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title ?: "KMTN Live Stream")
.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, subtitle ?: "KMountain Radio")
.putString(MediaMetadataCompat.METADATA_KEY_ALBUM, album ?: "Live")
.putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, MEDIA_ID_LIVE)
.putString(MediaMetadataCompat.METADATA_KEY_MEDIA_URI, mediaUri ?: STREAM_URL)
.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, albumArtBitmap)
.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, albumArtBitmap)
.build()
)
}
private fun applyNowPlayingMetadataFromFlutter(metadata: MediaMetadataCompat?) {
if (metadata == null) {
applyNowPlayingMetadata(
title = "KMTN Live Stream",
subtitle = "KMountain Radio",
album = "Live",
mediaUri = STREAM_URL,
)
return
}
applyNowPlayingMetadata(
title = metadata.getString(MediaMetadataCompat.METADATA_KEY_TITLE),
subtitle = metadata.getString(MediaMetadataCompat.METADATA_KEY_ARTIST),
album = metadata.getString(MediaMetadataCompat.METADATA_KEY_ALBUM),
mediaUri = metadata.getString(MediaMetadataCompat.METADATA_KEY_MEDIA_URI),
)
}
private fun connectToFlutterAudioService() {
if (audioServiceController != null) {
return
}
val existing = audioServiceBrowser
if (existing?.isConnected == true) {
return
}
if (existing != null) {
try {
existing.connect()
} catch (error: Exception) {
Log.w(TAG, "Failed reconnect attempt: ${error.message}")
}
return
}
val browser = MediaBrowserCompat(
this,
ComponentName(this, AudioService::class.java),
browserConnectionCallback,
null,
)
audioServiceBrowser = browser
browser.connect()
}
private fun disconnectFromFlutterAudioService() {
reconnectScheduled = false
mainHandler.removeCallbacksAndMessages(null)
handleControllerDisconnected()
audioServiceBrowser?.let { browser ->
if (browser.isConnected) {
browser.disconnect()
}
}
audioServiceBrowser = null
}
private fun handleControllerDisconnected() {
audioServiceController?.unregisterCallback(mediaControllerCallback)
audioServiceController = null
}
private fun scheduleBrowserReconnect() {
if (reconnectScheduled) {
return
}
reconnectScheduled = true
mainHandler.postDelayed(
{
reconnectScheduled = false
connectToFlutterAudioService()
},
1200,
)
}
private fun buildLiveStreamMetadata(): MediaMetadataCompat { private fun buildLiveStreamMetadata(): MediaMetadataCompat {
val iconUri = Uri.parse("android.resource://${packageName}/mipmap/ic_launcher")
return MediaMetadataCompat.Builder() return MediaMetadataCompat.Builder()
.putString(MediaMetadataCompat.METADATA_KEY_TITLE, "KRYZ Live Stream") .putString(MediaMetadataCompat.METADATA_KEY_TITLE, "KMTN Live Stream")
.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, "KRYZ Radio") .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, "KMountain Radio")
.putString(MediaMetadataCompat.METADATA_KEY_ALBUM, "Live") .putString(MediaMetadataCompat.METADATA_KEY_ALBUM, "Live")
.putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, MEDIA_ID_LIVE) .putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, MEDIA_ID_LIVE)
.putString(MediaMetadataCompat.METADATA_KEY_MEDIA_URI, STREAM_URL) .putString(MediaMetadataCompat.METADATA_KEY_MEDIA_URI, STREAM_URL)
.putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI, iconUri.toString()) .putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, albumArtBitmap)
.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, iconUri.toString()) .putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, albumArtBitmap)
.build() .build()
} }
} }
+222 -75
View File
@@ -27,17 +27,26 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
companion object { companion object {
private const val METHOD_CHANNEL = "kryz_go_flutter/casting/methods" private const val METHOD_CHANNEL = "kryz_go_flutter/casting/methods"
private const val EVENT_CHANNEL = "kryz_go_flutter/casting/events" private const val EVENT_CHANNEL = "kryz_go_flutter/casting/events"
private const val PLAYBACK_METHOD_CHANNEL = "kryz_go_flutter/playback/methods" private const val MAX_PENDING_CAST_AUTOPLAY_RETRIES = 5
private const val REMOTE_STATUS_POLL_INTERVAL_MS = 500L
} }
private data class PendingCastRequest(
val streamUrl: String,
val title: String,
val subtitle: String,
)
private var castContext: CastContext? = null private var castContext: CastContext? = null
private var methodChannel: MethodChannel? = null
private var eventSink: EventChannel.EventSink? = null private var eventSink: EventChannel.EventSink? = null
private var chooserDialog: MediaRouteChooserDialog? = null private var chooserDialog: MediaRouteChooserDialog? = null
private val mainHandler = Handler(Looper.getMainLooper()) private val mainHandler = Handler(Looper.getMainLooper())
private var activeRemoteMediaClient: RemoteMediaClient? = null private var activeRemoteMediaClient: RemoteMediaClient? = null
private var playbackMethodChannel: MethodChannel? = null private var pendingCastRequest: PendingCastRequest? = null
private var flutterReady = false private var pendingCastRequestInFlight: Boolean = false
private var pendingAutoPlay = false private var pendingCastAutoplayRetryCount: Int = 0
private var remoteCastStatusPollingRunnable: Runnable? = null
private var statusPayload: MutableMap<String, Any?> = mutableMapOf( private var statusPayload: MutableMap<String, Any?> = mutableMapOf(
"status" to "idle", "status" to "idle",
@@ -62,10 +71,13 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
override fun onSessionStarted(session: CastSession, sessionId: String) { override fun onSessionStarted(session: CastSession, sessionId: String) {
attachRemoteClientCallback(session) attachRemoteClientCallback(session)
startRemoteStatusPolling()
emitStatus("connected", session.castDevice?.friendlyName) emitStatus("connected", session.castDevice?.friendlyName)
startPendingCastRequest(session)
} }
override fun onSessionStartFailed(session: CastSession, error: Int) { override fun onSessionStartFailed(session: CastSession, error: Int) {
clearPendingCastRequest()
emitStatus("error", message = "Cast session failed to start ($error)") emitStatus("error", message = "Cast session failed to start ($error)")
} }
@@ -75,6 +87,10 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
} }
override fun onSessionEnded(session: CastSession, error: Int) { override fun onSessionEnded(session: CastSession, error: Int) {
stopRemoteStatusPolling()
clearPendingCastRequest()
// If app was launched from Android Auto, restart audio service on cast disconnect
restartAudioServiceSession()
emitStatus("idle") emitStatus("idle")
} }
@@ -84,14 +100,18 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
override fun onSessionResumed(session: CastSession, wasSuspended: Boolean) { override fun onSessionResumed(session: CastSession, wasSuspended: Boolean) {
attachRemoteClientCallback(session) attachRemoteClientCallback(session)
startRemoteStatusPolling()
emitStatus("connected", session.castDevice?.friendlyName) emitStatus("connected", session.castDevice?.friendlyName)
startPendingCastRequest(session)
} }
override fun onSessionResumeFailed(session: CastSession, error: Int) { override fun onSessionResumeFailed(session: CastSession, error: Int) {
clearPendingCastRequest()
emitStatus("error", message = "Cast session failed to resume ($error)") emitStatus("error", message = "Cast session failed to resume ($error)")
} }
override fun onSessionSuspended(session: CastSession, reason: Int) { override fun onSessionSuspended(session: CastSession, reason: Int) {
stopRemoteStatusPolling()
detachRemoteClientCallback() detachRemoteClientCallback()
emitStatus("idle") emitStatus("idle")
} }
@@ -100,44 +120,12 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
override fun configureFlutterEngine(flutterEngine: FlutterEngine) { override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
super.configureFlutterEngine(flutterEngine) super.configureFlutterEngine(flutterEngine)
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, METHOD_CHANNEL) methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, METHOD_CHANNEL)
.setMethodCallHandler(this) .apply { setMethodCallHandler(this@MainActivity) }
EventChannel(flutterEngine.dartExecutor.binaryMessenger, EVENT_CHANNEL) EventChannel(flutterEngine.dartExecutor.binaryMessenger, EVENT_CHANNEL)
.setStreamHandler(this) .setStreamHandler(this)
playbackMethodChannel = MethodChannel(
flutterEngine.dartExecutor.binaryMessenger,
PLAYBACK_METHOD_CHANNEL,
)
playbackMethodChannel?.setMethodCallHandler { call, result ->
when (call.method) {
"flutterReady" -> {
flutterReady = true
// Stop the service's MediaPlayer and hand off to Flutter.
val wasServicePlaying = KryzAutoMediaBrowserService.isServicePlaying()
KryzAutoMediaBrowserService.stopServicePlayer()
KryzAutoMediaBrowserService.registerDirectCallbacks(
play = { mainHandler.post { invokeFlutterPlay() } },
stop = { mainHandler.post { playbackMethodChannel?.invokeMethod("stop", null) } },
)
if (pendingAutoPlay || wasServicePlaying) {
pendingAutoPlay = false
invokeFlutterPlay()
}
result.success(null)
}
"updatePlaybackState" -> {
val isPlaying = call.argument<Boolean>("isPlaying") ?: false
val isBuffering = call.argument<Boolean>("isBuffering") ?: false
KryzAutoMediaBrowserService.updatePlaybackState(isPlaying, isBuffering)
result.success(null)
}
else -> result.notImplemented()
}
}
initializeCastContext() initializeCastContext()
} }
@@ -150,13 +138,14 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
when (call.method) { when (call.method) {
"getStatus" -> result.success(statusPayload) "getStatus" -> result.success(statusPayload)
"showDevicePicker" -> { "showDevicePicker" -> {
showDevicePicker() showDevicePicker(call)
result.success(null) result.success(null)
} }
"startCastingLiveStream" -> { "startCastingLiveStream" -> {
startCastingLiveStream(call, result) startCastingLiveStream(call, result)
} }
"disconnect" -> { "disconnect" -> {
clearPendingCastRequest()
castContext?.sessionManager?.endCurrentSession(true) castContext?.sessionManager?.endCurrentSession(true)
emitStatus("idle") emitStatus("idle")
result.success(null) result.success(null)
@@ -181,8 +170,6 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
chooserDialog?.dismiss() chooserDialog?.dismiss()
chooserDialog = null chooserDialog = null
KryzAutoMediaBrowserService.unregisterDirectCallbacks()
castContext?.sessionManager?.removeSessionManagerListener( castContext?.sessionManager?.removeSessionManagerListener(
castSessionManagerListener, castSessionManagerListener,
CastSession::class.java, CastSession::class.java,
@@ -192,16 +179,6 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
super.onDestroy() super.onDestroy()
} }
private fun invokeFlutterPlay() {
if (!flutterReady) {
pendingAutoPlay = true
return
}
mainHandler.post {
playbackMethodChannel?.invokeMethod("play", null)
}
}
private fun initializeCastContext() { private fun initializeCastContext() {
try { try {
castContext = CastContext.getSharedInstance(this) castContext = CastContext.getSharedInstance(this)
@@ -222,12 +199,15 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
} }
} }
private fun showDevicePicker() { private fun showDevicePicker(call: MethodCall) {
if (castContext == null) { if (castContext == null) {
clearPendingCastRequest()
emitStatus("unavailable", message = "Cast services unavailable") emitStatus("unavailable", message = "Cast services unavailable")
return return
} }
setPendingCastRequest(parsePendingCastRequest(call.arguments))
val receiverAppId = getString(R.string.cast_receiver_app_id) val receiverAppId = getString(R.string.cast_receiver_app_id)
val routeSelector = MediaRouteSelector.Builder() val routeSelector = MediaRouteSelector.Builder()
.addControlCategory(CastMediaControlIntent.categoryForCast(receiverAppId)) .addControlCategory(CastMediaControlIntent.categoryForCast(receiverAppId))
@@ -258,6 +238,7 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
val currentStatus = statusPayload["status"] as? String val currentStatus = statusPayload["status"] as? String
if (currentSession == null && currentStatus == "connecting") { if (currentSession == null && currentStatus == "connecting") {
clearPendingCastRequest()
emitStatus("idle") emitStatus("idle")
} }
} }
@@ -270,8 +251,8 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
} }
val streamUrl = arguments["streamUrl"] as? String val streamUrl = arguments["streamUrl"] as? String
val title = arguments["title"] as? String ?: "Live Stream" val title = "KRYZ 98.5 LPFM Mariposa Community Radio"
val subtitle = arguments["subtitle"] as? String ?: "" val subtitle = "Live Stream"
if (streamUrl.isNullOrBlank()) { if (streamUrl.isNullOrBlank()) {
result.error("invalid_stream_url", "streamUrl is required", null) result.error("invalid_stream_url", "streamUrl is required", null)
@@ -284,6 +265,113 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
return return
} }
val loadRequestData = buildLoadRequestData(
streamUrl = streamUrl,
title = title,
subtitle = subtitle,
)
loadMediaWithRetry(
session = currentSession,
loadRequestData = loadRequestData,
attempt = 1,
result = result,
)
}
private fun setPendingCastRequest(request: PendingCastRequest?) {
pendingCastRequest = request
pendingCastRequestInFlight = false
pendingCastAutoplayRetryCount = 0
}
private fun clearPendingCastRequest() {
setPendingCastRequest(null)
}
private fun parsePendingCastRequest(arguments: Any?): PendingCastRequest? {
val map = arguments as? Map<*, *> ?: return null
val shouldAutoplay = map["autoplay"] as? Boolean ?: false
if (!shouldAutoplay) {
return null
}
val streamUrl = map["streamUrl"] as? String
if (streamUrl.isNullOrBlank()) {
return null
}
return PendingCastRequest(
streamUrl = streamUrl,
title = map["title"] as? String ?: "Live Stream",
subtitle = map["subtitle"] as? String ?: "",
)
}
private fun startPendingCastRequest(session: CastSession) {
val request = pendingCastRequest ?: return
if (pendingCastRequestInFlight) {
return
}
pendingCastRequestInFlight = true
loadMediaWithRetry(
session = session,
loadRequestData = buildLoadRequestData(
streamUrl = request.streamUrl,
title = request.title,
subtitle = request.subtitle,
),
attempt = 1,
result = object : MethodChannel.Result {
override fun success(result: Any?) {
clearPendingCastRequest()
}
override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) {
pendingCastRequestInFlight = false
schedulePendingCastRequestRetry(errorMessage ?: errorCode)
}
override fun notImplemented() {}
},
)
}
private fun schedulePendingCastRequestRetry(message: String) {
val request = pendingCastRequest
val currentSession = castContext?.sessionManager?.currentCastSession
if (request == null || currentSession == null || !currentSession.isConnected) {
clearPendingCastRequest()
emitStatus("error", message = message)
return
}
if (pendingCastAutoplayRetryCount >= MAX_PENDING_CAST_AUTOPLAY_RETRIES) {
clearPendingCastRequest()
emitStatus("error", message = message)
return
}
pendingCastAutoplayRetryCount += 1
mainHandler.postDelayed(
{
val resumedSession = castContext?.sessionManager?.currentCastSession
if (resumedSession != null && resumedSession.isConnected) {
startPendingCastRequest(resumedSession)
} else {
clearPendingCastRequest()
}
},
1000,
)
}
private fun buildLoadRequestData(
streamUrl: String,
title: String,
subtitle: String,
): MediaLoadRequestData {
val metadata = MediaMetadata(MediaMetadata.MEDIA_TYPE_MUSIC_TRACK).apply { val metadata = MediaMetadata(MediaMetadata.MEDIA_TYPE_MUSIC_TRACK).apply {
putString(MediaMetadata.KEY_TITLE, title) putString(MediaMetadata.KEY_TITLE, title)
putString(MediaMetadata.KEY_SUBTITLE, subtitle) putString(MediaMetadata.KEY_SUBTITLE, subtitle)
@@ -295,17 +383,10 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
.setMetadata(metadata) .setMetadata(metadata)
.build() .build()
val loadRequestData = MediaLoadRequestData.Builder() return MediaLoadRequestData.Builder()
.setMediaInfo(mediaInfo) .setMediaInfo(mediaInfo)
.setAutoplay(true) .setAutoplay(true)
.build() .build()
loadMediaWithRetry(
session = currentSession,
loadRequestData = loadRequestData,
attempt = 1,
result = result,
)
} }
private fun loadMediaWithRetry( private fun loadMediaWithRetry(
@@ -340,14 +421,14 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
try { try {
remoteMediaClient.load(loadRequestData).setResultCallback { mediaChannelResult -> remoteMediaClient.load(loadRequestData).setResultCallback { mediaChannelResult ->
if (mediaChannelResult == null) {
emitStatus("error", message = "Cast load returned no result")
result.error("cast_load_failed", "Cast load returned no result", null)
return@setResultCallback
}
if (mediaChannelResult.status.isSuccess) { if (mediaChannelResult.status.isSuccess) {
// Stop local playback immediately when remote load succeeds
// This MUST be done in Kotlin (not Flutter) because the audio service
// session may be active from Android Auto and won't respond to Flutter calls
stopAudioServiceSession()
emitStatus("connected", session.castDevice?.friendlyName) emitStatus("connected", session.castDevice?.friendlyName)
// Force initial remote status update and continue polling
emitRemotePlaybackStatus() emitRemotePlaybackStatus()
result.success(null) result.success(null)
return@setResultCallback return@setResultCallback
@@ -379,11 +460,6 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
try { try {
remoteMediaClient.stop().setResultCallback { stopResult -> remoteMediaClient.stop().setResultCallback { stopResult ->
if (stopResult == null) {
result.error("cast_stop_failed", "Cast stop returned no result", null)
return@setResultCallback
}
if (stopResult.status.isSuccess) { if (stopResult.status.isSuccess) {
emitStatus("connected", session.castDevice?.friendlyName, playbackStatus = "stopped") emitStatus("connected", session.castDevice?.friendlyName, playbackStatus = "stopped")
result.success(null) result.success(null)
@@ -414,22 +490,59 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
detachRemoteClientCallback() detachRemoteClientCallback()
activeRemoteMediaClient = remoteMediaClient activeRemoteMediaClient = remoteMediaClient
remoteMediaClient.registerCallback(remoteMediaClientCallback) remoteMediaClient.registerCallback(remoteMediaClientCallback)
startRemoteStatusPolling()
if (pendingCastRequest != null) {
startPendingCastRequest(session)
}
emitRemotePlaybackStatus() emitRemotePlaybackStatus()
} }
private fun detachRemoteClientCallback() { private fun detachRemoteClientCallback() {
stopRemoteStatusPolling()
activeRemoteMediaClient?.unregisterCallback(remoteMediaClientCallback) activeRemoteMediaClient?.unregisterCallback(remoteMediaClientCallback)
activeRemoteMediaClient = null activeRemoteMediaClient = null
} }
private fun startRemoteStatusPolling() {
if (remoteCastStatusPollingRunnable != null) {
return
}
val pollRunnable = object : Runnable {
override fun run() {
try {
if (activeRemoteMediaClient != null) {
emitRemotePlaybackStatus()
// Use mainHandler to keep polling alive across lifecycle changes
mainHandler.postDelayed(this, REMOTE_STATUS_POLL_INTERVAL_MS)
}
} catch (e: Exception) {
// Safely handle any errors to keep polling thread alive
e.printStackTrace()
}
}
}
remoteCastStatusPollingRunnable = pollRunnable
mainHandler.post(pollRunnable)
}
private fun stopRemoteStatusPolling() {
val runnable = remoteCastStatusPollingRunnable ?: return
mainHandler.removeCallbacks(runnable)
remoteCastStatusPollingRunnable = null
}
private fun emitRemotePlaybackStatus() { private fun emitRemotePlaybackStatus() {
val remoteMediaClient = activeRemoteMediaClient val remoteMediaClient = activeRemoteMediaClient
val mediaStatus = remoteMediaClient?.mediaStatus if (remoteMediaClient == null) return
val mediaStatus = remoteMediaClient.mediaStatus
val playbackStatus = when (mediaStatus?.playerState) { val playbackStatus = when (mediaStatus?.playerState) {
MediaStatus.PLAYER_STATE_PLAYING -> "playing" MediaStatus.PLAYER_STATE_PLAYING -> "playing"
MediaStatus.PLAYER_STATE_BUFFERING, MediaStatus.PLAYER_STATE_BUFFERING,
MediaStatus.PLAYER_STATE_LOADING -> "buffering" MediaStatus.PLAYER_STATE_LOADING -> "buffering"
MediaStatus.PLAYER_STATE_PAUSED, MediaStatus.PLAYER_STATE_PAUSED -> "stopped"
MediaStatus.PLAYER_STATE_IDLE, MediaStatus.PLAYER_STATE_IDLE,
MediaStatus.PLAYER_STATE_UNKNOWN, MediaStatus.PLAYER_STATE_UNKNOWN,
null -> "stopped" null -> "stopped"
@@ -442,6 +555,40 @@ class MainActivity : AudioServiceActivity(), MethodChannel.MethodCallHandler, Ev
} }
} }
private fun stopLocalAudioPlayback() {
try {
// Tell Flutter side to stop local audio via method channel
// This prevents audio from playing on both mobile and cast device
methodChannel?.invokeMethod("stopLocalAudio", null)
} catch (e: Exception) {
// Silently handle if Flutter side doesn't implement this method
e.printStackTrace()
}
}
private fun stopAudioServiceSession() {
try {
// Stop the audio service session directly (works even if app is in background via Android Auto)
// This ensures the shared audio handler doesn't keep playing when cast device takes over
// Access the audio service through the session token if available
methodChannel?.invokeMethod("stopAudioService", null)
} catch (e: Exception) {
// Audio service might not be available, silently continue
e.printStackTrace()
}
}
private fun restartAudioServiceSession() {
try {
// When cast session ends, allow the audio service to resume management
// This re-enables local playback for the Flutter side
methodChannel?.invokeMethod("resumeLocalAudio", null)
} catch (e: Exception) {
// If Flutter handler isn't ready, that's ok - audio service will be managed externally
e.printStackTrace()
}
}
private fun emitStatus( private fun emitStatus(
status: String, status: String,
deviceName: String? = null, deviceName: String? = null,
Binary file not shown.

After

Width:  |  Height:  |  Size: 811 KiB

View File
View File
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File
+3 -3
View File
@@ -5,7 +5,7 @@
#E36A18 matches AppThemeBusinessObject.lightColors.primarySeed (brand orange). #E36A18 matches AppThemeBusinessObject.lightColors.primarySeed (brand orange).
--> -->
<resources> <resources>
<color name="kryz_primary">#E36A18</color> <color name="kryz_primary">#1a3a5c</color>
<color name="kryz_primary_dark">#B84E08</color> <color name="kryz_primary_dark">#0e2440</color>
<color name="kryz_accent">#1663C7</color> <color name="kryz_accent">#e87a2e</color>
</resources> </resources>
View File
View File
View File
View File
Regular → Executable
View File
Regular → Executable
View File
View File
Regular → Executable
View File
Regular → Executable
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 422 KiB

-171
View File
@@ -1,171 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="1000"
height="1000"
viewBox="0 0 1000 1000"
version="1.1"
id="svg7"
sodipodi:docname="icon_2.svg"
inkscape:version="1.4.3 (fcd0343856, 2026-01-01)"
inkscape:export-filename="app_icon.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs7" />
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.68550502"
inkscape:cx="485.04386"
inkscape:cy="511.30187"
inkscape:window-width="1920"
inkscape:window-height="962"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg7" />
<!-- Background -->
<rect
x="-2"
y="-2"
width="1002"
height="1002"
fill="#0b2e59"
id="rect1"
style="stroke-width:1.77131" />
<!-- Accent bands -->
<rect
x="19.82901"
y="426.9852"
width="960.34198"
height="79.542099"
fill="#f58220"
opacity="0.9"
id="rect2"
style="stroke-width:1.54503" />
<rect
x="19.82901"
y="506.52728"
width="960.34198"
height="39.771049"
fill="#ffb347"
opacity="0.9"
id="rect3"
style="stroke-width:1.54503" />
<!-- Subtle inner border -->
<rect
x="21.657974"
y="21.657974"
width="956.68402"
height="956.68408"
fill="none"
stroke="#f58220"
stroke-width="7.31594"
id="rect4" />
<!-- Letters group -->
<g
font-family="system-ui, '-apple-system', BlinkMacSystemFont, 'Segoe UI', sans-serif"
font-weight="800"
text-anchor="middle"
dominant-baseline="middle"
id="g7"
transform="matrix(1.4298147,0,0,1.4298147,-109.59816,77.582873)">
<!-- K -->
<text
x="150"
y="190"
font-size="160px"
fill="#f58220"
id="text4">K</text>
<!-- R -->
<text
x="320"
y="190"
font-size="160px"
fill="#ffffff"
id="text5">R</text>
<!-- Y -->
<text
x="490"
y="190"
font-size="160px"
fill="#f58220"
id="text6">Y</text>
<!-- G in a blue block -->
<rect
x="580"
y="80"
width="170"
height="220"
rx="18"
ry="18"
fill="#123b73"
id="rect6" />
<text
x="665"
y="190"
font-size="160px"
fill="#ffb347"
id="text7">Z</text>
</g>
<!-- Small underline accent under the word -->
<rect
x="19.82901"
y="415.05389"
width="960.34204"
height="11.931314"
fill="#ffb347"
opacity="0.85"
id="rect7"
style="stroke-width:2.08331" />
<text
xml:space="preserve"
style="font-weight:bold;font-size:100.118px;line-height:0;font-family:'Noto Sans Mono CJK KR';-inkscape-font-specification:'Noto Sans Mono CJK KR Bold';letter-spacing:0px;writing-mode:lr-tb;direction:ltr;fill:#ffffff;stroke:#000000;stroke-width:1.65284"
x="22.209259"
y="501.82516"
id="text8"><tspan
sodipodi:role="line"
id="tspan7"
x="22.209259"
y="501.82516"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:100.118px;font-family:C059;-inkscape-font-specification:'C059, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke:none;stroke-width:1.65284">98.5 LPFM</tspan></text>
<text
xml:space="preserve"
style="font-style:italic;font-variant:normal;font-weight:500;font-stretch:normal;font-size:169.76px;line-height:0.8;font-family:Z003;-inkscape-font-specification:'Z003, Medium Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;writing-mode:lr-tb;direction:ltr;fill:#ffffff;stroke:none;stroke-width:2.80256"
x="25.539324"
y="669.90143"
id="text10"><tspan
sodipodi:role="line"
id="tspan10"
x="25.539324"
y="669.90143"
style="line-height:0.8;stroke-width:2.80256">Mariposa</tspan><tspan
sodipodi:role="line"
x="25.539324"
y="805.70941"
id="tspan11"
style="line-height:0.8;stroke-width:2.80256">Community</tspan><tspan
sodipodi:role="line"
x="25.539324"
y="941.5174"
style="line-height:0.8;stroke-width:2.80256"
id="tspan13">Radio</tspan></text>
<text
xml:space="preserve"
style="font-style:italic;font-variant:normal;font-weight:500;font-stretch:normal;font-size:348.901px;line-height:0.8;font-family:Z003;-inkscape-font-specification:'Z003, Medium Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;writing-mode:lr-tb;direction:ltr;fill:#ffffff;stroke:none;stroke-width:5.76"
x="867.28961"
y="762.51642"
id="text12"><tspan
sodipodi:role="line"
id="tspan12" /></text>
</svg>

Before

Width:  |  Height:  |  Size: 5.3 KiB

+585
View File
@@ -0,0 +1,585 @@
#!/usr/bin/env python3
"""
Whitelabel build script for KRYZ Go Flutter.
Reads theme.json and generates:
- lib/generated/app_config.dart (compile-time constants)
- lib/generated/theme_colors.dart (light + dark AppThemeColors)
- assets/icon/app_icon.png (from embedded logo SVG)
Patches native platform files (AndroidManifest, Info.plist, automotive_colors.xml, Kotlin).
Invokes flutter_launcher_icons and flutter_name_manager.
Usage:
python3 build_whitelabel.py [--theme theme.json] [--no-tools]
"""
import argparse
import base64
import json
import math
import os
import re
import subprocess
import sys
# ---------------------------------------------------------------------------
# Helpers
# ---------------------------------------------------------------------------
PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
def hex_to_rgba(hex_color: str, alpha: float = 1.0) -> str:
"""Convert '#RRGGBB' hex to '0xAARRGGBB' Dart Color format."""
hex_color = hex_color.lstrip("#")
assert len(hex_color) == 6, f"Expected 6 hex digits, got {len(hex_color)}"
r = int(hex_color[0:2], 16)
g = int(hex_color[2:4], 16)
b = int(hex_color[4:6], 16)
a = int(round(alpha * 255))
return f"Color(0x{a:02X}{r:02X}{g:02X}{b:02X})"
def darken(hex_color: str, factor: float) -> str:
"""Darken a hex color by multiplying RGB channels by factor (0-1)."""
hex_color = hex_color.lstrip("#")
r = int(hex_color[0:2], 16)
g = int(hex_color[2:4], 16)
b = int(hex_color[4:6], 16)
r = int(min(r * factor, 255))
g = int(min(g * factor, 255))
b = int(min(b * factor, 255))
return f"Color(0xFF{r:02X}{g:02X}{b:02X})"
def dart_escape(value: str) -> str:
"""Escape a string for use in a Dart const string literal."""
return value.replace("\\", "\\\\").replace("'", "\\'").replace("\n", "\\n")
def read_theme(path: str) -> dict:
with open(path, "r", encoding="utf-8") as f:
return json.load(f)
# ---------------------------------------------------------------------------
# Config generation
# ---------------------------------------------------------------------------
def generate_app_config(theme: dict) -> str:
station = theme["station"]
streams = theme["streams"]
name_primary = station.get("name_primary", "")
name_secondary = station.get("name_secondary", "")
callsign = station.get("callsign", "")
tagline = station.get("tagline", "")
frequency = station.get("frequency", "")
stream_url = streams.get("url", "")
metadata_url = streams.get("metadata_url")
app_name = f"{name_primary} {name_secondary}".strip()
default_title = f"{callsign or name_primary} Live Stream"
default_artist = f"{name_primary} Radio"
metadata_url_line = ""
if metadata_url:
metadata_url_line = f" static const String metadataUrl = '{dart_escape(metadata_url)}';\n"
else:
metadata_url_line = " static const String? metadataUrl = null;\n"
return f'''// GENERATED FILE — DO NOT EDIT.
// Run `python3 build_whitelabel.py` to regenerate.
class AppConfig {{
static const String callsign = '{dart_escape(callsign)}';
static const String appName = '{dart_escape(app_name)}';
static const String tagline = '{dart_escape(tagline)}';
static const String frequency = '{dart_escape(frequency)}';
static const String streamUrl = '{dart_escape(stream_url)}';
{metadata_url_line.rstrip()}
static const String defaultTitle = '{dart_escape(default_title)}';
static const String defaultArtist = '{dart_escape(default_artist)}';
}}
'''
# ---------------------------------------------------------------------------
# Theme colors generation
# ---------------------------------------------------------------------------
def generate_theme_colors(theme: dict) -> str:
c = theme["colors"]
# Light mode — mapped to match companion website color usage
light_props = [
("headingColor", hex_to_rgba(c["primary"])),
("accentColor", hex_to_rgba(c["accent"])),
("scaffoldGradientStart", hex_to_rgba(c["background"])),
("scaffoldGradientEnd", hex_to_rgba(c["light"])),
("shellSurface", hex_to_rgba(c["white"], 0.97)),
("shellBorder", hex_to_rgba(c["medium"], 0.10)),
("mutedText", hex_to_rgba(c["medium"])),
("textOnDark", hex_to_rgba(c["white"])),
("textOnDarkSecondary", hex_to_rgba(c["light"])),
("controlsGradientStart", hex_to_rgba(c["primary"])),
("controlsGradientEnd", hex_to_rgba(c["primary_light"])),
("controlsShadow", hex_to_rgba(c["black"], 0.14)),
("bodyText", hex_to_rgba(c["text"])),
("cardSurface", hex_to_rgba(c["white"], 0.08)),
("cardBorder", hex_to_rgba(c["white"], 0.12)),
("successColor", hex_to_rgba(c["success"])),
("dangerColor", hex_to_rgba(c["danger"])),
]
# Dark mode — mapped to match companion website color usage
dark_props = [
("headingColor", hex_to_rgba(c["primary_light"])),
("accentColor", hex_to_rgba(c["accent_light"])),
("scaffoldGradientStart", hex_to_rgba(c["black"])),
("scaffoldGradientEnd", darken(c["primary_dark"], 0.30)),
("shellSurface", hex_to_rgba(c["primary_dark"], 0.85)),
("shellBorder", hex_to_rgba(c["medium"], 0.20)),
("mutedText", hex_to_rgba(c["medium"])),
("textOnDark", hex_to_rgba(c["white"])),
("textOnDarkSecondary", hex_to_rgba(c["light"])),
("controlsGradientStart", hex_to_rgba(c["primary_dark"])),
("controlsGradientEnd", hex_to_rgba(c["primary"])),
("controlsShadow", hex_to_rgba(c["black"], 0.27)),
("bodyText", hex_to_rgba(c["light"])),
("cardSurface", hex_to_rgba(c["white"], 0.08)),
("cardBorder", hex_to_rgba(c["white"], 0.12)),
("successColor", hex_to_rgba(c["success"])),
("dangerColor", hex_to_rgba(c["danger"])),
]
def props_block(props, indent: str = " ") -> str:
lines = []
for name, color_expr in props:
lines.append(f"{indent}{name}: {color_expr},")
return "\n".join(lines)
return f'''// GENERATED FILE — DO NOT EDIT.
// Run `python3 build_whitelabel.py` to regenerate.
import 'package:flutter/material.dart';
import '../app_theme_business_object.dart';
class GeneratedThemeColors {{
static const AppThemeColors lightColors = AppThemeColors(
{props_block(light_props)}
);
static const AppThemeColors darkColors = AppThemeColors(
{props_block(dark_props)}
);
}}
'''
# ---------------------------------------------------------------------------
# Icon generation
# ---------------------------------------------------------------------------
def generate_icon(theme: dict, dry_run: bool = False) -> None:
"""Decode embedded logo (JPEG, PNG, or SVG) and write app_icon.png."""
embedded = theme.get("images_embedded", {})
logo = embedded.get("logo", {})
data_b64 = logo.get("data", "")
content_type = logo.get("content_type", "")
if not data_b64:
print(" [icon] No embedded logo data — skipping icon generation")
return
raw_bytes = base64.b64decode(data_b64)
icon_path = os.path.join(PROJECT_ROOT, "assets", "icon", "app_icon.png")
if dry_run:
print(f" [icon] Would generate PNG from embedded {content_type or 'image'} at assets/icon/app_icon.png")
return
# --- JPEG / PNG: convert to PNG via Pillow, or write as-is ---
if content_type in ("image/jpeg", "image/png"):
try:
from PIL import Image
import io
img = Image.open(io.BytesIO(raw_bytes)).convert("RGBA")
img = img.resize((1024, 1024), Image.LANCZOS)
img.save(icon_path, "PNG")
print(f" [icon] Converted {content_type} → PNG (Pillow, 1024×1024)")
return
except ImportError:
pass
except Exception as e:
print(f" [icon] Pillow conversion failed: {e} — writing raw bytes")
# Fallback: write raw bytes directly (flutter_launcher_icons accepts JPEG)
if content_type == "image/jpeg":
fallback = os.path.join(PROJECT_ROOT, "assets", "icon", "app_icon.jpg")
else:
fallback = icon_path
with open(fallback, "wb") as f:
f.write(raw_bytes)
print(f" [icon] Wrote embedded {content_type} (no Pillow — using raw bytes)")
# If we wrote a JPEG, rename the pubspec image_path is still .png,
# so try to at least rename it
if fallback != icon_path:
os.replace(fallback, icon_path)
return
# --- SVG: render to PNG via cairosvg or rsvg-convert ---
try:
import cairosvg
cairosvg.svg2png(bytestring=raw_bytes, write_to=icon_path, output_width=1024, output_height=1024)
print(" [icon] Rendered SVG → PNG (cairosvg)")
return
except ImportError:
pass
except Exception as e:
print(f" [icon] cairosvg failed: {e} — trying rsvg-convert")
try:
import tempfile
with tempfile.NamedTemporaryFile(suffix=".svg", delete=False) as tmp:
tmp.write(raw_bytes)
tmp_path = tmp.name
subprocess.run(
["rsvg-convert", "-w", "1024", "-h", "1024", "-o", icon_path, tmp_path],
check=True,
capture_output=True,
)
os.unlink(tmp_path)
print(" [icon] Rendered SVG → PNG (rsvg-convert)")
except Exception as e:
print(f" [icon] WARNING: Could not render icon: {e}")
print(" [icon] Install cairosvg (`pip install cairosvg`) or rsvg-convert")
def generate_android_auto_art(theme: dict, dry_run: bool = False) -> None:
"""Decode embedded hero_icon (JPEG, PNG, or SVG) and write kryz_auto_art.png."""
embedded = theme["images_embedded"]
hero_data = embedded["hero_icon"]["data"]
hero_content_type = embedded["hero_icon"].get("content_type", "")
print(" [android-auto-art] Using 'hero_icon' from images_embedded")
raw_bytes = base64.b64decode(hero_data)
icon_path = os.path.join(PROJECT_ROOT, "android", "app", "src", "main", "res", "drawable-nodpi", "kryz_auto_art.png")
if dry_run:
print(f" [android-auto-art] Would generate PNG from embedded {hero_content_type or 'image'} at android/app/src/main/res/drawable-nodpi/kryz_auto_art.png")
return
# --- JPEG / PNG: convert to PNG via Pillow, or write as-is ---
if hero_content_type in ("image/jpeg", "image/png"):
try:
from PIL import Image
import io
img = Image.open(io.BytesIO(raw_bytes)).convert("RGBA")
img = img.resize((1024, 1024), Image.LANCZOS)
img.save(icon_path, "PNG")
print(f" [android-auto-art] Converted {hero_content_type} → PNG (Pillow, 1024×1024)")
return
except ImportError:
pass
except Exception as e:
print(f" [android-auto-art] Pillow conversion failed: {e} — writing raw bytes")
# Fallback: write raw bytes directly
if hero_content_type == "image/jpeg":
fallback = os.path.join(PROJECT_ROOT, "android", "app", "src", "main", "res", "drawable-nodpi", "kryz_auto_art.jpg")
else:
fallback = icon_path
with open(fallback, "wb") as f:
f.write(raw_bytes)
print(f" [android-auto-art] Wrote embedded {hero_content_type} (no Pillow — using raw bytes)")
if fallback != icon_path:
os.replace(fallback, icon_path)
return
# --- SVG: render to PNG via cairosvg or rsvg-convert ---
try:
import cairosvg
cairosvg.svg2png(bytestring=raw_bytes, write_to=icon_path, output_width=1024, output_height=1024)
print(" [android-auto-art] Rendered SVG → PNG (cairosvg)")
return
except ImportError:
pass
except Exception as e:
print(f" [android-auto-art] cairosvg failed: {e} — trying rsvg-convert")
try:
import tempfile
with tempfile.NamedTemporaryFile(suffix=".svg", delete=False) as tmp:
tmp.write(raw_bytes)
tmp_path = tmp.name
subprocess.run(
["rsvg-convert", "-w", "1024", "-h", "1024", "-o", icon_path, tmp_path],
check=True,
capture_output=True,
)
os.unlink(tmp_path)
print(" [android-auto-art] Rendered SVG → PNG (rsvg-convert)")
except Exception as e:
print(f" [android-auto-art] WARNING: Could not render icon: {e}")
print(" [android-auto-art] Install cairosvg (`pip install cairosvg`) or rsvg-convert")
# ---------------------------------------------------------------------------
# Native file patching
# ---------------------------------------------------------------------------
def patch_android_manifest(theme: dict, dry_run: bool = False) -> None:
path = os.path.join(PROJECT_ROOT, "android", "app", "src", "main", "AndroidManifest.xml")
if not os.path.exists(path):
print(" [android] AndroidManifest.xml not found — skipping")
return
station = theme["station"]
app_name = f"{station.get('name_primary','')} {station.get('name_secondary','')}".strip()
with open(path, "r", encoding="utf-8") as f:
content = f.read()
new_content = re.sub(
r'android:label="[^"]*"',
f'android:label="{app_name}"',
content,
)
if dry_run:
print(f" [android] Would patch AndroidManifest.xml label → '{app_name}'")
return
with open(path, "w", encoding="utf-8") as f:
f.write(new_content)
print(f" [android] Patched AndroidManifest.xml label → '{app_name}'")
def patch_info_plist(theme: dict, dry_run: bool = False) -> None:
path = os.path.join(PROJECT_ROOT, "ios", "Runner", "Info.plist")
if not os.path.exists(path):
print(" [ios] Info.plist not found — skipping")
return
station = theme["station"]
app_name = f"{station.get('name_primary','')} {station.get('name_secondary','')}".strip()
with open(path, "r", encoding="utf-8") as f:
content = f.read()
# Replace CFBundleDisplayName value
content = re.sub(
r'(<key>CFBundleDisplayName</key>\s*<string>)[^<]*(</string>)',
rf'\1{app_name}\2',
content,
)
# Replace CFBundleName value
content = re.sub(
r'(<key>CFBundleName</key>\s*<string>)[^<]*(</string>)',
rf'\1{app_name}\2',
content,
)
if dry_run:
print(f" [ios] Would patch Info.plist CFBundleDisplayName/CFBundleName → '{app_name}'")
return
with open(path, "w", encoding="utf-8") as f:
f.write(content)
print(f" [ios] Patched Info.plist → '{app_name}'")
def patch_automotive_colors(theme: dict, dry_run: bool = False) -> None:
path = os.path.join(PROJECT_ROOT, "android", "app", "src", "main", "res", "values", "automotive_colors.xml")
if not os.path.exists(path):
print(" [android-auto] automotive_colors.xml not found — skipping")
return
c = theme["colors"]
with open(path, "r", encoding="utf-8") as f:
content = f.read()
# Replace hex values in color tags
content = re.sub(
r'(<color name="kryz_primary">)#[^<]*</color>',
rf'\1{c["primary"]}</color>',
content,
)
content = re.sub(
r'(<color name="kryz_primary_dark">)#[^<]*</color>',
rf'\1{c["primary_dark"]}</color>',
content,
)
content = re.sub(
r'(<color name="kryz_accent">)#[^<]*</color>',
rf'\1{c["accent"]}</color>',
content,
)
if dry_run:
print(" [android-auto] Would patch automotive_colors.xml")
return
with open(path, "w", encoding="utf-8") as f:
f.write(content)
print(" [android-auto] Patched automotive_colors.xml")
def patch_kotlin_service(theme: dict, dry_run: bool = False) -> None:
kts = list(
os.path.join(PROJECT_ROOT, "android", "app", "src", "main", "kotlin", "com", "example", "kryz_go_flutter", f)
for f in os.listdir(
os.path.join(PROJECT_ROOT, "android", "app", "src", "main", "kotlin", "com", "example", "kryz_go_flutter")
)
) if os.path.isdir(
os.path.join(PROJECT_ROOT, "android", "app", "src", "main", "kotlin", "com", "example", "kryz_go_flutter")
) else []
if not kts:
print(" [kotlin] No Kotlin files found — skipping")
return
station = theme["station"]
streams = theme["streams"]
name_primary = station.get("name_primary", "KRYZ")
callsign = station.get("callsign", name_primary)
app_name = f"{name_primary} {station.get('name_secondary','')}".strip()
default_title = f"{callsign} Live Stream"
default_artist = f"{name_primary} Radio"
stream_url = streams.get("url", "")
replacements = [
# STREAM_URL constant
(r'(private const val STREAM_URL = ")[^"]*(")', rf'\g<1>{stream_url}\2'),
# "KRYZ Live Stream" → default title
(r'"KRYZ Live Stream"', f'"{default_title}"'),
# "KRYZ Radio" → default artist
(r'"KRYZ Radio"', f'"{default_artist}"'),
# "KRYZ Auto Playback" → app name + " Auto Playback"
(r'"KRYZ Auto Playback"', f'"{app_name} Auto Playback"'),
# "KRYZ Radio Android Auto playback" → descriptive text
(r'"KRYZ Radio Android Auto playback"', f'"{app_name} Android Auto playback"'),
]
for kfile in kts:
if not kfile.endswith(".kt"):
continue
with open(kfile, "r", encoding="utf-8") as f:
content = f.read()
original = content
for pattern, replacement in replacements:
content = re.sub(pattern, replacement, content)
if content == original:
continue
if dry_run:
print(f" [kotlin] Would patch {os.path.basename(kfile)}")
return
with open(kfile, "w", encoding="utf-8") as f:
f.write(content)
print(f" [kotlin] Patched {os.path.basename(kfile)}")
# ---------------------------------------------------------------------------
# Main
# ---------------------------------------------------------------------------
def main():
parser = argparse.ArgumentParser(description="Whitelabel build script")
parser.add_argument("--theme", default=os.path.join(PROJECT_ROOT, "theme.json"), help="Path to theme.json")
parser.add_argument("--dry-run", action="store_true", help="Show what would be done without writing files")
parser.add_argument("--no-tools", action="store_true", help="Skip invoking flutter_launcher_icons and flutter_name_manager")
args = parser.parse_args()
theme_path = args.theme
if not os.path.exists(theme_path):
print(f"Error: theme.json not found at {theme_path}")
sys.exit(1)
print(f"Reading {theme_path} ...")
theme = read_theme(theme_path)
station = theme.get("station", {})
if not station.get("name_primary"):
print("Error: theme.json is missing station.name_primary")
sys.exit(1)
app_name = f"{station.get('name_primary','')} {station.get('name_secondary','')}".strip()
print(f"Whitelabel: {app_name}")
print()
# Generate Dart files
gen_dir = os.path.join(PROJECT_ROOT, "lib", "generated")
os.makedirs(gen_dir, exist_ok=True)
app_config_path = os.path.join(gen_dir, "app_config.dart")
theme_colors_path = os.path.join(gen_dir, "theme_colors.dart")
if args.dry_run:
print(" [gen] Would generate lib/generated/app_config.dart")
print(" [gen] Would generate lib/generated/theme_colors.dart")
else:
with open(app_config_path, "w", encoding="utf-8") as f:
f.write(generate_app_config(theme))
print(" [gen] Generated lib/generated/app_config.dart")
with open(theme_colors_path, "w", encoding="utf-8") as f:
f.write(generate_theme_colors(theme))
print(" [gen] Generated lib/generated/theme_colors.dart")
# Generate icon
print()
generate_icon(theme, dry_run=args.dry_run)
# Generate Android Auto album art
print()
generate_android_auto_art(theme, dry_run=args.dry_run)
# Patch native files
print()
patch_android_manifest(theme, dry_run=args.dry_run)
patch_info_plist(theme, dry_run=args.dry_run)
patch_automotive_colors(theme, dry_run=args.dry_run)
patch_kotlin_service(theme, dry_run=args.dry_run)
# Invoke downstream tools
if not args.dry_run and not args.no_tools:
print()
print("Running flutter_launcher_icons ...")
try:
subprocess.run(
["dart", "run", "flutter_launcher_icons"],
cwd=PROJECT_ROOT,
check=True,
)
print(" flutter_launcher_icons succeeded")
except subprocess.CalledProcessError as e:
print(f" WARNING: flutter_launcher_icons failed: {e}")
except FileNotFoundError:
print(" WARNING: 'dart' not found — run `flutter pub get` first")
print()
print("Running flutter_name_manager ...")
try:
subprocess.run(
["dart", "run", "flutter_name_manager", "--app-name", app_name],
cwd=PROJECT_ROOT,
check=True,
)
print(" flutter_name_manager succeeded")
except subprocess.CalledProcessError as e:
print(f" WARNING: flutter_name_manager failed: {e}")
except FileNotFoundError:
print(" WARNING: 'dart' not found — run `flutter pub get` first")
print()
print("Done!")
if __name__ == "__main__":
main()
Regular → Executable
View File
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
View File
View File
View File
Generated Regular → Executable
View File
View File
View File
Regular → Executable
-96
View File
@@ -178,99 +178,3 @@ import AVKit
NotificationCenter.default.removeObserver(self) NotificationCenter.default.removeObserver(self)
} }
} }
private func handleCastingMethod(call: FlutterMethodCall, result: @escaping FlutterResult) {
switch call.method {
case "getStatus":
updateCastingStatusForCurrentRoute()
result(castingStatus)
case "showDevicePicker":
showAirPlayPicker()
result(nil)
case "startCastingLiveStream":
// AirPlay route selection controls where iOS outputs audio. No explicit load call needed.
result(nil)
case "disconnect":
// iOS does not expose direct route disconnect. Users select route via picker.
showAirPlayPicker()
result(nil)
default:
result(FlutterMethodNotImplemented)
}
}
private func showAirPlayPicker() {
DispatchQueue.main.async {
guard let rootViewController = self.activeRootViewController() else {
self.emitCastingEvent(status: "error", message: "Unable to open AirPlay picker")
return
}
let routePickerView = AVRoutePickerView(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
routePickerView.alpha = 0.01
rootViewController.view.addSubview(routePickerView)
for subview in routePickerView.subviews {
if let button = subview as? UIButton {
button.sendActions(for: .touchUpInside)
break
}
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
routePickerView.removeFromSuperview()
}
}
}
private func activeRootViewController() -> UIViewController? {
let activeScene = UIApplication.shared.connectedScenes
.first { $0.activationState == .foregroundActive } as? UIWindowScene
let keyWindow = activeScene?.windows.first { $0.isKeyWindow }
return keyWindow?.rootViewController
}
private func updateCastingStatusForCurrentRoute() {
let currentOutputs = AVAudioSession.sharedInstance().currentRoute.outputs
if let airPlayOutput = currentOutputs.first(where: { $0.portType == .airPlay }) {
castingStatus = [
"status": "connected",
"platform": "ios",
"deviceName": airPlayOutput.portName
]
} else {
castingStatus = [
"status": "idle",
"platform": "ios"
]
}
castingEventSink?(castingStatus)
}
private func emitCastingEvent(status: String, message: String) {
let event: [String: Any] = [
"status": status,
"platform": "ios",
"message": message
]
castingStatus = event
castingEventSink?(event)
}
func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? {
castingEventSink = events
events(castingStatus)
return nil
}
func onCancel(withArguments arguments: Any?) -> FlutterError? {
castingEventSink = nil
return nil
}
deinit {
NotificationCenter.default.removeObserver(self)
}
}
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 420 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 936 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File
View File

Before

Width:  |  Height:  |  Size: 68 B

After

Width:  |  Height:  |  Size: 68 B

View File

Before

Width:  |  Height:  |  Size: 68 B

After

Width:  |  Height:  |  Size: 68 B

View File

Before

Width:  |  Height:  |  Size: 68 B

After

Width:  |  Height:  |  Size: 68 B

View File
View File
View File
+1
View File
@@ -14,6 +14,7 @@ import UIKit
* Note: the com.apple.developer.carplay-audio entitlement must be enabled in the * Note: the com.apple.developer.carplay-audio entitlement must be enabled in the
* Apple Developer Portal and added to the target in Xcode Signing & Capabilities. * Apple Developer Portal and added to the target in Xcode Signing & Capabilities.
*/ */
@available(iOS 14.0, *)
class CarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate { class CarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate {
private var carPlayInterfaceController: CPInterfaceController? private var carPlayInterfaceController: CPInterfaceController?
Regular → Executable
+2 -2
View File
@@ -7,7 +7,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string> <string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>KRYZ Go!</string> <string>KMountain Flower Radio</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@@ -15,7 +15,7 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>KRYZ Go!</string> <string>KMountain Flower Radio</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
View File
Regular → Executable
View File
Regular → Executable
View File
View File
+63 -65
View File
@@ -1,69 +1,67 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'generated/theme_colors.dart';
class AppThemeColors { class AppThemeColors {
const AppThemeColors({ const AppThemeColors({
required this.primarySeed, required this.headingColor,
required this.secondarySeed, required this.accentColor,
required this.scaffoldGradientStart, required this.scaffoldGradientStart,
required this.scaffoldGradientEnd, required this.scaffoldGradientEnd,
required this.shellSurface, required this.shellSurface,
required this.shellBorder, required this.shellBorder,
required this.accent, required this.mutedText,
required this.webViewBorder, required this.textOnDark,
required this.webViewBackground, required this.textOnDarkSecondary,
required this.controlsGradientStart, required this.controlsGradientStart,
required this.controlsGradientEnd, required this.controlsGradientEnd,
required this.controlsShadow, required this.controlsShadow,
required this.statusText, required this.bodyText,
required this.cardSurface,
required this.cardBorder,
required this.successColor,
required this.dangerColor,
}); });
final Color primarySeed; /// Website: `primary` → headings (h1h6)
final Color secondarySeed; final Color headingColor;
/// Website: `accent` → links & accent highlights
final Color accentColor;
/// Page background gradient start — website: `background` (cream)
final Color scaffoldGradientStart; final Color scaffoldGradientStart;
/// Page background gradient end — website: `light`
final Color scaffoldGradientEnd; final Color scaffoldGradientEnd;
/// Top header card surface
final Color shellSurface; final Color shellSurface;
/// Top header card border
final Color shellBorder; final Color shellBorder;
final Color accent; /// Website: `medium` → muted / secondary text
final Color webViewBorder; final Color mutedText;
final Color webViewBackground; /// Website: `white` → text on dark surfaces
final Color textOnDark;
/// Website: `light` → secondary text on dark surfaces
final Color textOnDarkSecondary;
/// Controls bar / card surface gradient start — website: `primary_dark`
final Color controlsGradientStart; final Color controlsGradientStart;
/// Controls bar / card surface gradient end — website: `primary_dark`
final Color controlsGradientEnd; final Color controlsGradientEnd;
/// Shadow color for elevated surfaces
final Color controlsShadow; final Color controlsShadow;
final Color statusText; /// Website: `text` → body text
final Color bodyText;
/// Inner card background overlay — derived from `primary_dark` / `primary_light`
final Color cardSurface;
/// Inner card border — derived from `primary_dark` / `primary_light`
final Color cardBorder;
/// Website: `success` → live indicator, success states
final Color successColor;
/// Website: `danger` → error states
final Color dangerColor;
} }
class AppThemeBusinessObject { class AppThemeBusinessObject {
static const AppThemeColors lightColors = AppThemeColors( static const AppThemeColors lightColors = GeneratedThemeColors.lightColors;
primarySeed: Color(0xFFE36A18), static const AppThemeColors darkColors = GeneratedThemeColors.darkColors;
secondarySeed: Color(0xFF1663C7),
scaffoldGradientStart: Color(0xFFFFF3E3),
scaffoldGradientEnd: Color(0xFFE6F2FF),
shellSurface: Color(0xF7FFFFFF),
shellBorder: Color(0x1A1A4D86),
accent: Color(0xFF0F5DB6),
webViewBorder: Color(0x261A4D86),
webViewBackground: Color(0xFFFFFFFF),
controlsGradientStart: Color(0xFFFFB465),
controlsGradientEnd: Color(0xFF69ADFF),
controlsShadow: Color(0x24114B7A),
statusText: Color(0xFF13243D),
);
static const AppThemeColors darkColors = AppThemeColors(
primarySeed: Color(0xFFFF9D59),
secondarySeed: Color(0xFF76B8FF),
scaffoldGradientStart: Color(0xFF0F1C30),
scaffoldGradientEnd: Color(0xFF31190C),
shellSurface: Color(0xD9162438),
shellBorder: Color(0x3366AAFF),
accent: Color(0xFFFFBC7E),
webViewBorder: Color(0x3378B7FF),
webViewBackground: Color(0xFF0C1420),
controlsGradientStart: Color(0xFF275792),
controlsGradientEnd: Color(0xFF9A4F1F),
controlsShadow: Color(0x44000000),
statusText: Color(0xFFF4F7FF),
);
static bool isDarkMode(BuildContext context) { static bool isDarkMode(BuildContext context) {
return MediaQuery.platformBrightnessOf(context) == Brightness.dark; return MediaQuery.platformBrightnessOf(context) == Brightness.dark;
@@ -74,17 +72,17 @@ class AppThemeBusinessObject {
} }
static ThemeData lightTheme() { static ThemeData lightTheme() {
final ColorScheme scheme = final ColorScheme scheme = ColorScheme.light(
ColorScheme.fromSeed( brightness: Brightness.light,
seedColor: lightColors.primarySeed, primary: lightColors.headingColor,
brightness: Brightness.light, onPrimary: lightColors.textOnDark,
).copyWith( secondary: lightColors.accentColor,
primary: lightColors.primarySeed, onSecondary: lightColors.textOnDark,
secondary: lightColors.secondarySeed, surface: lightColors.shellSurface,
tertiary: const Color(0xFF2C85E1), onSurface: lightColors.bodyText,
surface: const Color(0xFFFFFBF7), error: lightColors.dangerColor,
onSurface: lightColors.statusText, onError: lightColors.textOnDark,
); );
return ThemeData( return ThemeData(
useMaterial3: true, useMaterial3: true,
@@ -104,17 +102,17 @@ class AppThemeBusinessObject {
} }
static ThemeData darkTheme() { static ThemeData darkTheme() {
final ColorScheme scheme = final ColorScheme scheme = ColorScheme.dark(
ColorScheme.fromSeed( brightness: Brightness.dark,
seedColor: darkColors.primarySeed, primary: darkColors.headingColor,
brightness: Brightness.dark, onPrimary: darkColors.textOnDark,
).copyWith( secondary: darkColors.accentColor,
primary: darkColors.primarySeed, onSecondary: darkColors.textOnDark,
secondary: darkColors.secondarySeed, surface: darkColors.shellSurface,
tertiary: const Color(0xFF4E97E8), onSurface: darkColors.bodyText,
surface: const Color(0xFF111A27), error: darkColors.dangerColor,
onSurface: darkColors.statusText, onError: darkColors.textOnDark,
); );
return ThemeData( return ThemeData(
useMaterial3: true, useMaterial3: true,
Regular → Executable
+51 -3
View File
@@ -20,6 +20,9 @@ class CastingBusinessObject extends ChangeNotifier {
CastingPlaybackStatus _playbackStatus = CastingPlaybackStatus.unknown; CastingPlaybackStatus _playbackStatus = CastingPlaybackStatus.unknown;
String? _connectedDeviceName; String? _connectedDeviceName;
String? _lastError; String? _lastError;
/// Callback for when native side requests local audio to stop
VoidCallback? onStopLocalAudioRequested;
CastingStatus get status => _status; CastingStatus get status => _status;
CastingPlaybackStatus get playbackStatus => _playbackStatus; CastingPlaybackStatus get playbackStatus => _playbackStatus;
@@ -55,6 +58,18 @@ class CastingBusinessObject extends ChangeNotifier {
}, },
); );
// Set up handler for native method calls (e.g., stopLocalAudio)
_methodChannel.setMethodCallHandler(_handleMethodCall);
await refreshStatus();
}
Future<void> refreshStatus() async {
if (!isSupportedOnThisPlatform) {
_setStatus(CastingStatus.unavailable);
return;
}
try { try {
final dynamic status = await _methodChannel.invokeMethod<dynamic>( final dynamic status = await _methodChannel.invokeMethod<dynamic>(
'getStatus', 'getStatus',
@@ -66,7 +81,12 @@ class CastingBusinessObject extends ChangeNotifier {
} }
} }
Future<void> showDevicePicker() async { Future<void> showDevicePicker({
bool autoplay = false,
String? streamUrl,
String? title,
String? subtitle,
}) async {
if (!isSupportedOnThisPlatform) { if (!isSupportedOnThisPlatform) {
_setStatus(CastingStatus.unavailable); _setStatus(CastingStatus.unavailable);
return; return;
@@ -77,7 +97,12 @@ class CastingBusinessObject extends ChangeNotifier {
} }
try { try {
await _methodChannel.invokeMethod<void>('showDevicePicker'); await _methodChannel.invokeMethod<void>('showDevicePicker', {
'autoplay': autoplay,
'streamUrl': streamUrl,
'title': title,
'subtitle': subtitle,
});
} on PlatformException catch (error) { } on PlatformException catch (error) {
_lastError = error.message ?? error.code; _lastError = error.message ?? error.code;
_setStatus(CastingStatus.error); _setStatus(CastingStatus.error);
@@ -102,7 +127,10 @@ class CastingBusinessObject extends ChangeNotifier {
}); });
} on PlatformException catch (error) { } on PlatformException catch (error) {
_lastError = error.message ?? error.code; _lastError = error.message ?? error.code;
_setStatus(CastingStatus.error); // Do NOT set status to error here — native emits its own status events.
// Overriding status from Dart corrupts the UI when native considers the
// session still connected (e.g. during a retry after a race condition).
rethrow;
} }
} }
@@ -146,6 +174,8 @@ class CastingBusinessObject extends ChangeNotifier {
if (deviceName != null && deviceName.isNotEmpty) { if (deviceName != null && deviceName.isNotEmpty) {
_connectedDeviceName = deviceName; _connectedDeviceName = deviceName;
} else if (status != 'connected') {
_connectedDeviceName = null;
} }
if (message != null && message.isNotEmpty) { if (message != null && message.isNotEmpty) {
@@ -210,4 +240,22 @@ class CastingBusinessObject extends ChangeNotifier {
_eventSubscription?.cancel(); _eventSubscription?.cancel();
super.dispose(); super.dispose();
} }
/// Handles method calls from native code
Future<dynamic> _handleMethodCall(MethodCall call) async {
switch (call.method) {
case 'stopLocalAudio':
onStopLocalAudioRequested?.call();
return null;
case 'stopAudioService':
// Stop the audio service directly (called when transferring to cast)
onStopLocalAudioRequested?.call();
return null;
case 'resumeLocalAudio':
// Audio service is resuming after cast disconnect; no action needed on Flutter side
return null;
default:
return null;
}
}
} }
+223
View File
@@ -0,0 +1,223 @@
import 'dart:async';
import 'dart:convert';
import 'package:audio_service/audio_service.dart';
import 'package:audio_session/audio_session.dart';
import 'package:http/http.dart' as http;
import 'package:just_audio/just_audio.dart';
import 'generated/app_config.dart';
import 'live_info_business_object.dart';
class KryzAudioHandler extends BaseAudioHandler with SeekHandler {
KryzAudioHandler() {
mediaItem.add(_defaultMediaItem);
_playerStateSubscription = _player.playerStateStream.listen(
_onPlayerStateChanged,
);
}
static const String streamUrl = AppConfig.streamUrl;
static const String mediaId = 'kryz-live-stream';
static const String _liveInfoEndpoint = AppConfig.metadataUrl ?? '';
static const Duration _liveInfoTimeout = Duration(seconds: 8);
static const Duration _metadataRefreshInterval = Duration(seconds: 20);
static const MediaItem _defaultMediaItem = MediaItem(
id: mediaId,
title: AppConfig.defaultTitle,
artist: AppConfig.defaultArtist,
album: 'Live',
extras: <String, dynamic>{
'isLive': true,
'seekable': false,
},
);
final AudioPlayer _player = AudioPlayer();
late final StreamSubscription<PlayerState> _playerStateSubscription;
Timer? _metadataRefreshTimer;
bool _isAudioSessionConfigured = false;
bool _isSourceLoaded = false;
bool _playRequested = false;
Future<void> updateMetadataFromLiveInfo(LiveInfoSnapshot? snapshot) async {
final current = snapshot?.current;
if (current == null || current.type != 'track') {
mediaItem.add(_defaultMediaItem);
return;
}
final String subtitle = current.displaySubtitle.trim();
mediaItem.add(
MediaItem(
id: mediaId,
title: current.displayTitle,
artist: subtitle.isEmpty ? AppConfig.defaultArtist : subtitle,
album: 'Live',
extras: <String, dynamic>{
'isLive': true,
'seekable': false,
'starts': current.starts,
'ends': current.ends,
'schedulerTime': snapshot?.schedulerTime,
},
),
);
}
@override
Future<void> play() async {
_playRequested = true;
playbackState.add(
playbackState.value.copyWith(
controls: const <MediaControl>[MediaControl.stop],
systemActions: const <MediaAction>{},
processingState: AudioProcessingState.buffering,
playing: false,
),
);
await _configureAudioSessionIfNeeded();
try {
if (!_isSourceLoaded) {
await _player.setAudioSource(
AudioSource.uri(
Uri.parse(streamUrl),
tag: mediaItem.value,
),
);
_isSourceLoaded = true;
}
final session = await AudioSession.instance;
await session.setActive(true);
await _player.play();
await _refreshMetadataFromApi();
_startMetadataRefreshTimer();
} catch (_) {
_playRequested = false;
playbackState.add(
playbackState.value.copyWith(
controls: const <MediaControl>[MediaControl.play],
systemActions: const <MediaAction>{},
processingState: AudioProcessingState.idle,
playing: false,
),
);
rethrow;
}
}
@override
Future<void> stop() async {
_playRequested = false;
_isSourceLoaded = false;
_metadataRefreshTimer?.cancel();
_metadataRefreshTimer = null;
await _player.stop();
playbackState.add(
playbackState.value.copyWith(
controls: const <MediaControl>[MediaControl.play],
systemActions: const <MediaAction>{},
processingState: AudioProcessingState.idle,
playing: false,
),
);
}
@override
Future<void> seek(Duration position) async {
// Live stream is intentionally non-seekable.
}
@override
Future<void> playFromMediaId(String mediaId, [Map<String, dynamic>? extras]) {
return play();
}
@override
Future<void> playFromSearch(String query, [Map<String, dynamic>? extras]) {
return play();
}
Future<void> dispose() async {
_metadataRefreshTimer?.cancel();
await _playerStateSubscription.cancel();
await _player.dispose();
}
Future<void> _configureAudioSessionIfNeeded() async {
if (_isAudioSessionConfigured) {
return;
}
final session = await AudioSession.instance;
await session.configure(const AudioSessionConfiguration.music());
_isAudioSessionConfigured = true;
}
void _onPlayerStateChanged(PlayerState state) {
final AudioProcessingState processingState = switch (state.processingState) {
ProcessingState.idle => AudioProcessingState.idle,
ProcessingState.loading => AudioProcessingState.loading,
ProcessingState.buffering => AudioProcessingState.buffering,
ProcessingState.ready => AudioProcessingState.ready,
ProcessingState.completed => AudioProcessingState.completed,
};
final bool isPlaying = state.playing && state.processingState == ProcessingState.ready;
final bool isBuffering = (state.playing && state.processingState != ProcessingState.ready) ||
(_playRequested && !state.playing && state.processingState != ProcessingState.completed);
playbackState.add(
playbackState.value.copyWith(
controls: <MediaControl>[
if (isPlaying || isBuffering) MediaControl.stop else MediaControl.play,
],
systemActions: const <MediaAction>{},
processingState: isBuffering ? AudioProcessingState.buffering : processingState,
playing: isPlaying,
),
);
if (isPlaying || isBuffering) {
_startMetadataRefreshTimer();
} else {
_metadataRefreshTimer?.cancel();
_metadataRefreshTimer = null;
}
}
void _startMetadataRefreshTimer() {
if (_metadataRefreshTimer != null) {
return;
}
_metadataRefreshTimer = Timer.periodic(_metadataRefreshInterval, (_) {
_refreshMetadataFromApi();
});
}
Future<void> _refreshMetadataFromApi() async {
try {
final response = await http
.get(Uri.parse(_liveInfoEndpoint))
.timeout(_liveInfoTimeout);
if (response.statusCode < 200 || response.statusCode >= 300) {
return;
}
final dynamic decoded = jsonDecode(response.body);
if (decoded is! Map<String, dynamic>) {
return;
}
final snapshot = LiveInfoSnapshot.fromJson(decoded);
await updateMetadataFromLiveInfo(snapshot);
} catch (_) {
// Keep existing metadata if live-info fetch fails.
}
}
}
+24 -6
View File
@@ -4,17 +4,31 @@ import 'dart:convert';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'generated/app_config.dart';
class LiveInfoBusinessObject extends ChangeNotifier { class LiveInfoBusinessObject extends ChangeNotifier {
LiveInfoBusinessObject({ LiveInfoBusinessObject({
this.endpoint = const String.fromEnvironment( String? endpoint,
'KRYZ_LIVE_INFO_URL',
defaultValue: 'http://kryz.airtime.pro/api/live-info',
),
int refreshIntervalSeconds = 20, int refreshIntervalSeconds = 20,
this.requestTimeout = const Duration(seconds: 8), this.requestTimeout = const Duration(seconds: 8),
}) : _refreshIntervalSeconds = refreshIntervalSeconds; }) : _endpointOverride = endpoint,
_refreshIntervalSeconds = refreshIntervalSeconds;
final String endpoint; /// Explicit endpoint passed at construction, if any.
final String? _endpointOverride;
/// The effective polling endpoint: construction override > env var > AppConfig.
String get endpoint {
final override = _endpointOverride;
if (override != null && override.isNotEmpty) {
return override;
}
const envUrl = String.fromEnvironment('KRYZ_LIVE_INFO_URL', defaultValue: '');
if (envUrl.isNotEmpty) {
return envUrl;
}
return AppConfig.metadataUrl ?? '';
}
final Duration requestTimeout; final Duration requestTimeout;
Timer? _pollTimer; Timer? _pollTimer;
@@ -34,6 +48,10 @@ class LiveInfoBusinessObject extends ChangeNotifier {
List<RecentPlayedItem> get recentPlayed => List.unmodifiable(_recentPlayed); List<RecentPlayedItem> get recentPlayed => List.unmodifiable(_recentPlayed);
Future<void> start() async { Future<void> start() async {
// Skip polling if no endpoint is configured
if (endpoint.isEmpty && (AppConfig.metadataUrl ?? '').isEmpty) {
return;
}
await refresh(); await refresh();
_restartTimer(); _restartTimer();
} }
Regular → Executable
+14 -6
View File
@@ -58,7 +58,7 @@ class LiveInfoPanel extends StatelessWidget {
children: [ children: [
Icon( Icon(
Icons.graphic_eq_rounded, Icons.graphic_eq_rounded,
color: themeColors.statusText, color: themeColors.textOnDarkSecondary,
size: 20, size: 20,
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
@@ -67,7 +67,7 @@ class LiveInfoPanel extends StatelessWidget {
'Live Studio Feed', 'Live Studio Feed',
style: Theme.of(context).textTheme.titleMedium?.copyWith( style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
color: themeColors.statusText, color: themeColors.textOnDark,
), ),
), ),
), ),
@@ -94,7 +94,9 @@ class LiveInfoPanel extends StatelessWidget {
child: TrackCard( child: TrackCard(
label: 'Now Playing', label: 'Now Playing',
track: current, track: current,
titleColor: themeColors.statusText, titleColor: themeColors.textOnDark,
cardSurface: themeColors.cardSurface,
cardBorder: themeColors.cardBorder,
), ),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
@@ -102,7 +104,9 @@ class LiveInfoPanel extends StatelessWidget {
child: TrackCard( child: TrackCard(
label: 'Coming Next', label: 'Coming Next',
track: next, track: next,
titleColor: themeColors.statusText, titleColor: themeColors.textOnDark,
cardSurface: themeColors.cardSurface,
cardBorder: themeColors.cardBorder,
), ),
), ),
], ],
@@ -113,14 +117,18 @@ class LiveInfoPanel extends StatelessWidget {
label: 'On Air Show', label: 'On Air Show',
show: currentShow, show: currentShow,
sourceTimezone: snapshot?.timezone, sourceTimezone: snapshot?.timezone,
titleColor: themeColors.statusText, titleColor: themeColors.textOnDarkSecondary,
cardSurface: themeColors.cardSurface,
cardBorder: themeColors.cardBorder,
), ),
const SizedBox(height: 6), const SizedBox(height: 6),
ShowCard( ShowCard(
label: 'Up Next Show', label: 'Up Next Show',
show: nextShow, show: nextShow,
sourceTimezone: snapshot?.timezone, sourceTimezone: snapshot?.timezone,
titleColor: themeColors.statusText, titleColor: themeColors.textOnDarkSecondary,
cardSurface: themeColors.cardSurface,
cardBorder: themeColors.cardBorder,
), ),
const SizedBox(height: 6), const SizedBox(height: 6),
Text( Text(
Regular → Executable
+83 -51
View File
@@ -1,8 +1,10 @@
import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:just_audio_background/just_audio_background.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:timezone/data/latest.dart' as tz; import 'package:timezone/data/latest.dart' as tz;
import 'generated/app_config.dart';
import 'app_theme_business_object.dart'; import 'app_theme_business_object.dart';
import 'casting_business_object.dart'; import 'casting_business_object.dart';
import 'live_info_business_object.dart'; import 'live_info_business_object.dart';
@@ -12,19 +14,16 @@ import 'streaming_audio_business_object.dart';
Future<void> main() async { Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
tz.initializeTimeZones(); tz.initializeTimeZones();
await JustAudioBackground.init(
androidNotificationChannelId: 'com.kryzgoflutter.audio.channel',
androidNotificationChannelName: 'KRYZ Audio Playback',
androidNotificationOngoing: true,
);
WidgetsFlutterBinding.ensureInitialized();
await SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
DeviceOrientation.portraitDown,
]);
runApp(const MyApp()); runApp(const MyApp());
// Keep startup non-blocking so UI can render even if background media
// services are initializing after an Android Auto cold start.
unawaited(
SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
DeviceOrientation.portraitDown,
]),
);
} }
class MyApp extends StatefulWidget { class MyApp extends StatefulWidget {
@@ -41,6 +40,7 @@ class _MyAppState extends State<MyApp> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
unawaited(_audio.ensureInitialized());
_casting.initialize(); _casting.initialize();
} }
@@ -54,7 +54,7 @@ class _MyAppState extends State<MyApp> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MaterialApp( return MaterialApp(
title: 'KRYZ Go!', title: AppConfig.appName,
theme: AppThemeBusinessObject.lightTheme(), theme: AppThemeBusinessObject.lightTheme(),
darkTheme: AppThemeBusinessObject.darkTheme(), darkTheme: AppThemeBusinessObject.darkTheme(),
themeMode: ThemeMode.system, themeMode: ThemeMode.system,
@@ -74,12 +74,11 @@ class MainPage extends StatefulWidget {
State<MainPage> createState() => _MainPageState(); State<MainPage> createState() => _MainPageState();
} }
class _MainPageState extends State<MainPage> { class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
StreamingAudioBusinessObject get _audio => widget.audio; StreamingAudioBusinessObject get _audio => widget.audio;
CastingBusinessObject get _casting => widget.casting; CastingBusinessObject get _casting => widget.casting;
final LiveInfoBusinessObject _liveInfo = LiveInfoBusinessObject(); final LiveInfoBusinessObject _liveInfo = LiveInfoBusinessObject();
static const List<int> _intervalOptions = <int>[5, 10, 15, 30, 60]; static const List<int> _intervalOptions = <int>[5, 10, 15, 30, 60];
bool _castStreamStartedForActiveSession = false;
bool _isStartingCastStream = false; bool _isStartingCastStream = false;
bool _pendingRemotePlay = false; bool _pendingRemotePlay = false;
@@ -134,15 +133,32 @@ class _MainPageState extends State<MainPage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
WidgetsBinding.instance.addObserver(this);
_audio.addListener(_handleAudioStateChanged); _audio.addListener(_handleAudioStateChanged);
_casting.addListener(_handleCastingStateChanged); _casting.addListener(_handleCastingStateChanged);
_liveInfo.addListener(_handleLiveInfoChanged); _liveInfo.addListener(_handleLiveInfoChanged);
_liveInfo.start(); _liveInfo.start();
_playbackChannel.setMethodCallHandler(_handlePlaybackMethodCall); _playbackChannel.setMethodCallHandler(_handlePlaybackMethodCall);
// Tell native that Flutter is ready to receive method calls.
// On Android this unblocks any pending auto_play from Android Auto. // When native code requests local audio to stop (cast media loaded)
if (defaultTargetPlatform == TargetPlatform.android) { _casting.onStopLocalAudioRequested = () {
_playbackChannel.invokeMethod<void>('flutterReady'); unawaited(_audio.stop());
};
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
if (state == AppLifecycleState.resumed) {
// Re-initialize (not just refresh) to re-establish the EventChannel
// subscription. In a cold-start Android Auto scenario the Flutter engine
// boots headlessly before MainActivity.configureFlutterEngine() runs, so
// the native EventChannel StreamHandler is not yet registered when
// initialize() first fires. The "listen" message is dropped, eventSink
// stays null, and all subsequent emitStatus() calls are silently lost.
// Calling initialize() here cancels that dead subscription and creates a
// fresh one now that the handler is registered; onListen immediately
// re-emits statusPayload so the Dart state is fully re-synced.
unawaited(_casting.initialize());
} }
} }
@@ -163,19 +179,11 @@ class _MainPageState extends State<MainPage> {
setState(() { setState(() {
// Rebuild when playback state changes from the player. // Rebuild when playback state changes from the player.
}); });
_syncAutoPlaybackState();
}
void _syncAutoPlaybackState() {
if (defaultTargetPlatform != TargetPlatform.android) return;
_playbackChannel.invokeMethod<void>('updatePlaybackState', {
'isPlaying': _audio.isPlaying,
'isBuffering': _audio.isBuffering,
});
} }
void _handleLiveInfoChanged() { void _handleLiveInfoChanged() {
_audio.updateMetadataFromLiveInfo(_liveInfo.snapshot);
if (!mounted) { if (!mounted) {
return; return;
} }
@@ -186,15 +194,27 @@ class _MainPageState extends State<MainPage> {
} }
void _handleCastingStateChanged() { void _handleCastingStateChanged() {
final currentStatus = _casting.status;
if (_casting.isPlaying || _casting.isBuffering) {
_pendingRemotePlay = false;
}
if (currentStatus != CastingStatus.connected) {
_isStartingCastStream = false;
}
if (_usesExternalCastPlayback && if (_usesExternalCastPlayback &&
(!_castStreamStartedForActiveSession || _pendingRemotePlay) && _pendingRemotePlay &&
!_isStartingCastStream) { !_isStartingCastStream) {
// Only load when _pendingRemotePlay was set by _play() while connecting.
// Do NOT trigger on justConnected — native pendingCastRequest handles
// all autoplay from showDevicePicker(autoplay: true).
_startCastingLiveStream(); _startCastingLiveStream();
} }
if (!_usesExternalCastPlayback) { if (!_usesExternalCastPlayback &&
_castStreamStartedForActiveSession = false; currentStatus != CastingStatus.connecting) {
_isStartingCastStream = false;
_pendingRemotePlay = false; _pendingRemotePlay = false;
} }
@@ -213,25 +233,28 @@ class _MainPageState extends State<MainPage> {
try { try {
await _casting.startCastingLiveStream( await _casting.startCastingLiveStream(
streamUrl: _audio.streamUrl, streamUrl: _audio.streamUrl,
title: 'KRYZ Live Stream', title: _audio.currentTitle,
subtitle: 'KRYZ Radio', subtitle: _audio.currentSubtitle,
); );
_castStreamStartedForActiveSession = true;
_pendingRemotePlay = false; _pendingRemotePlay = false;
if (_usesExternalCastPlayback && !_audio.isStopped) { if (_usesExternalCastPlayback && !_audio.isStopped) {
await _audio.stop(); await _audio.stop();
} }
} catch (_) { } catch (_) {
_castStreamStartedForActiveSession = false; _pendingRemotePlay = !_audio.isStopped;
// State is already updated by the casting business object.
} finally { } finally {
_isStartingCastStream = false; _isStartingCastStream = false;
} }
} }
Future<void> _play() async { Future<void> _play() async {
if (_casting.status == CastingStatus.connecting) {
_pendingRemotePlay = true;
return;
}
if (_usesExternalCastPlayback) { if (_usesExternalCastPlayback) {
if (_casting.isPlaying || _isStartingCastStream) { if (_casting.isPlaying || _isStartingCastStream) {
return; return;
@@ -241,12 +264,7 @@ class _MainPageState extends State<MainPage> {
return; return;
} }
if (_usesExternalCastPlayback && _pendingRemotePlay = false;
_casting.status == CastingStatus.connecting) {
_pendingRemotePlay = true;
return;
}
await _audio.play(); await _audio.play();
} }
@@ -265,7 +283,21 @@ class _MainPageState extends State<MainPage> {
return; return;
} }
await _casting.showDevicePicker(); final shouldAutoplay = !_audio.isStopped;
// Do NOT set _pendingRemotePlay when native handles autoplay.
// The native pendingCastRequest already handles autoplay via
// showDevicePicker(autoplay: true). Setting _pendingRemotePlay here
// causes a duplicate load from Flutter that races the native load and
// corrupts the cast status (especially in the Android Auto path).
// _pendingRemotePlay is only set by _play() when the user explicitly
// presses Play while the cast session is still connecting.
_pendingRemotePlay = false;
await _casting.showDevicePicker(
autoplay: shouldAutoplay,
streamUrl: shouldAutoplay ? _audio.streamUrl : null,
title: shouldAutoplay ? _audio.currentTitle : null,
subtitle: shouldAutoplay ? _audio.currentSubtitle : null,
);
} }
String _castingLabel() { String _castingLabel() {
@@ -304,6 +336,7 @@ class _MainPageState extends State<MainPage> {
@override @override
void dispose() { void dispose() {
WidgetsBinding.instance.removeObserver(this);
_audio.removeListener(_handleAudioStateChanged); _audio.removeListener(_handleAudioStateChanged);
_casting.removeListener(_handleCastingStateChanged); _casting.removeListener(_handleCastingStateChanged);
_liveInfo.removeListener(_handleLiveInfoChanged); _liveInfo.removeListener(_handleLiveInfoChanged);
@@ -362,12 +395,12 @@ class _MainPageState extends State<MainPage> {
const SizedBox(width: 14), const SizedBox(width: 14),
Expanded( Expanded(
child: Text( child: Text(
'KRYZ Go!', AppConfig.appName,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: theme.textTheme.headlineMedium?.copyWith( style: theme.textTheme.headlineMedium?.copyWith(
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
letterSpacing: 0.4, letterSpacing: 0.4,
color: themeColors.statusText, color: themeColors.headingColor,
), ),
), ),
), ),
@@ -426,8 +459,7 @@ class _MainPageState extends State<MainPage> {
), ),
ElevatedButton.icon( ElevatedButton.icon(
onPressed: onPressed:
_casting.status == CastingStatus.connecting || _casting.status == CastingStatus.connecting
_casting.status == CastingStatus.unavailable
? null ? null
: _toggleCasting, : _toggleCasting,
icon: Icon(_castingIcon()), icon: Icon(_castingIcon()),
@@ -437,7 +469,7 @@ class _MainPageState extends State<MainPage> {
_playbackStatusLabel(), _playbackStatusLabel(),
style: theme.textTheme.titleSmall?.copyWith( style: theme.textTheme.titleSmall?.copyWith(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: themeColors.statusText, color: themeColors.textOnDark,
), ),
), ),
], ],
Regular → Executable
View File
Regular → Executable
+13 -4
View File
@@ -10,12 +10,16 @@ class ShowCard extends StatelessWidget {
required this.show, required this.show,
required this.sourceTimezone, required this.sourceTimezone,
required this.titleColor, required this.titleColor,
required this.cardSurface,
required this.cardBorder,
}); });
final String label; final String label;
final LiveInfoShowInfo? show; final LiveInfoShowInfo? show;
final String? sourceTimezone; final String? sourceTimezone;
final Color titleColor; final Color titleColor;
final Color cardSurface;
final Color cardBorder;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -23,8 +27,8 @@ class ShowCard extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
color: Colors.black.withValues(alpha: 0.06), color: cardSurface,
border: Border.all(color: Colors.black.withValues(alpha: 0.08)), border: Border.all(color: cardBorder),
), ),
child: Row( child: Row(
children: [ children: [
@@ -37,7 +41,10 @@ class ShowCard extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: Theme.of( style: Theme.of(
context, context,
).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600), ).textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w600,
color: titleColor,
),
), ),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
@@ -46,7 +53,9 @@ class ShowCard extends StatelessWidget {
show?.starts, show?.starts,
sourceTimezone: sourceTimezone, sourceTimezone: sourceTimezone,
), ),
style: Theme.of(context).textTheme.labelSmall, style: Theme.of(
context,
).textTheme.labelSmall?.copyWith(color: titleColor),
), ),
], ],
), ),
+116 -61
View File
@@ -1,48 +1,95 @@
import 'dart:async'; import 'dart:async';
import 'package:audio_session/audio_session.dart'; import 'package:audio_service/audio_service.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:just_audio_background/just_audio_background.dart';
import 'package:just_audio/just_audio.dart'; import 'generated/app_config.dart';
import 'kryz_audio_handler.dart';
import 'live_info_business_object.dart';
enum StreamingPlaybackStatus { stopped, buffering, playing } enum StreamingPlaybackStatus { stopped, buffering, playing }
class StreamingAudioBusinessObject extends ChangeNotifier { class StreamingAudioBusinessObject extends ChangeNotifier {
StreamingAudioBusinessObject({ StreamingAudioBusinessObject() {
this.streamUrl = 'https://kryz.out.airtime.pro/kryz_a', final initFuture = _audioHandlerInitFuture;
}) { if (initFuture != null) {
_playerStateSubscription = _player.playerStateStream.listen((state) { initFuture.then((handler) {
_setPlaybackStatus(_mapPlayerStateToStatus(state)); if (_isDisposed) {
}); return;
}
_attachHandler(handler);
});
}
final handler = _audioHandler;
if (handler != null) {
_attachHandler(handler);
}
} }
final String streamUrl; static AudioHandler? _audioHandler;
final AudioPlayer _player = AudioPlayer(); static Future<AudioHandler>? _audioHandlerInitFuture;
late final StreamSubscription<PlayerState> _playerStateSubscription;
bool _isSourceLoaded = false; static Future<void> initializeBackgroundAudio() async {
if (_audioHandler != null) {
return;
}
_audioHandlerInitFuture ??= AudioService.init(
builder: () => KryzAudioHandler(),
config: const AudioServiceConfig(
androidNotificationChannelId: 'com.kryzgoflutter.audio.channel',
androidNotificationChannelName: '${AppConfig.appName} Audio Playback',
androidNotificationOngoing: true,
androidStopForegroundOnPause: true,
),
).then((handler) {
_audioHandler = handler;
return handler;
}).catchError((error) {
_audioHandlerInitFuture = null;
throw error;
});
await _audioHandlerInitFuture;
}
String get streamUrl => KryzAudioHandler.streamUrl;
StreamSubscription<PlaybackState>? _playbackStateSubscription;
StreamSubscription<MediaItem?>? _mediaItemSubscription;
StreamingPlaybackStatus _playbackStatus = StreamingPlaybackStatus.stopped; StreamingPlaybackStatus _playbackStatus = StreamingPlaybackStatus.stopped;
bool _isAudioSessionConfigured = false; bool _isDisposed = false;
bool _playRequested = false; bool _isAttached = false;
String _currentTitle = AppConfig.defaultTitle;
String _currentSubtitle = AppConfig.defaultArtist;
StreamingPlaybackStatus get playbackStatus => _playbackStatus; StreamingPlaybackStatus get playbackStatus => _playbackStatus;
bool get isPlaying => _playbackStatus == StreamingPlaybackStatus.playing; bool get isPlaying => _playbackStatus == StreamingPlaybackStatus.playing;
bool get isBuffering => _playbackStatus == StreamingPlaybackStatus.buffering; bool get isBuffering => _playbackStatus == StreamingPlaybackStatus.buffering;
bool get isStopped => _playbackStatus == StreamingPlaybackStatus.stopped; bool get isStopped => _playbackStatus == StreamingPlaybackStatus.stopped;
String get currentTitle => _currentTitle;
String get currentSubtitle => _currentSubtitle;
StreamingPlaybackStatus _mapPlayerStateToStatus(PlayerState state) { Future<void> ensureInitialized() async {
if (state.processingState == ProcessingState.completed) { await initializeBackgroundAudio();
}
StreamingPlaybackStatus _mapPlaybackStateToStatus(PlaybackState state) {
if (state.processingState == AudioProcessingState.completed) {
return StreamingPlaybackStatus.stopped; return StreamingPlaybackStatus.stopped;
} }
if (state.playing) { if (state.playing) {
if (state.processingState == ProcessingState.ready) { if (state.processingState == AudioProcessingState.ready) {
return StreamingPlaybackStatus.playing; return StreamingPlaybackStatus.playing;
} }
return StreamingPlaybackStatus.buffering; return StreamingPlaybackStatus.buffering;
} }
if (_playRequested && state.processingState != ProcessingState.completed) { if (state.processingState == AudioProcessingState.buffering ||
state.processingState == AudioProcessingState.loading) {
return StreamingPlaybackStatus.buffering; return StreamingPlaybackStatus.buffering;
} }
@@ -58,58 +105,66 @@ class StreamingAudioBusinessObject extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
Future<void> _configureAudioSessionIfNeeded() async {
if (_isAudioSessionConfigured) {
return;
}
final session = await AudioSession.instance;
await session.configure(const AudioSessionConfiguration.music());
_isAudioSessionConfigured = true;
}
Future<void> play() async { Future<void> play() async {
_playRequested = true;
await _configureAudioSessionIfNeeded();
_setPlaybackStatus(StreamingPlaybackStatus.buffering); _setPlaybackStatus(StreamingPlaybackStatus.buffering);
final handler = await _requireHandler();
try { await handler.play();
if (!_isSourceLoaded) {
await _player.setAudioSource(
AudioSource.uri(
Uri.parse(streamUrl),
tag: const MediaItem(
id: 'kryz-live-stream',
title: 'KRYZ Live Stream',
artist: 'KRYZ Radio',
album: 'Live',
),
),
);
_isSourceLoaded = true;
}
final session = await AudioSession.instance;
await session.setActive(true);
await _player.play();
} catch (_) {
_playRequested = false;
_setPlaybackStatus(StreamingPlaybackStatus.stopped);
rethrow;
}
} }
Future<void> stop() async { Future<void> stop() async {
_playRequested = false; final handler = await _requireHandler();
_isSourceLoaded = false; await handler.stop();
_setPlaybackStatus(StreamingPlaybackStatus.stopped); _setPlaybackStatus(StreamingPlaybackStatus.stopped);
await _player.stop(); }
Future<void> updateMetadataFromLiveInfo(LiveInfoSnapshot? snapshot) async {
final handler = await _requireHandler();
await handler.updateMetadataFromLiveInfo(snapshot);
}
Future<KryzAudioHandler> _requireHandler() async {
await initializeBackgroundAudio();
final handler = _audioHandler;
if (handler is! KryzAudioHandler) {
throw StateError('KryzAudioHandler is not initialized');
}
_attachHandler(handler);
return handler;
}
void _attachHandler(AudioHandler handler) {
if (_isAttached) {
return;
}
_isAttached = true;
_playbackStateSubscription = handler.playbackState.listen((state) {
_setPlaybackStatus(_mapPlaybackStateToStatus(state));
});
_mediaItemSubscription = handler.mediaItem.listen((item) {
if (item == null) {
return;
}
final title = item.title.trim().isEmpty ? AppConfig.defaultTitle : item.title;
final subtitle =
(item.artist ?? '').trim().isEmpty ? AppConfig.defaultArtist : item.artist!.trim();
if (title == _currentTitle && subtitle == _currentSubtitle) {
return;
}
_currentTitle = title;
_currentSubtitle = subtitle;
notifyListeners();
});
} }
@override @override
void dispose() { void dispose() {
_playerStateSubscription.cancel(); _isDisposed = true;
_player.dispose(); _playbackStateSubscription?.cancel();
_mediaItemSubscription?.cancel();
super.dispose(); super.dispose();
} }
} }
Regular → Executable
View File
Regular → Executable
+17 -5
View File
@@ -9,11 +9,15 @@ class TrackCard extends StatelessWidget {
required this.label, required this.label,
required this.track, required this.track,
required this.titleColor, required this.titleColor,
required this.cardSurface,
required this.cardBorder,
}); });
final String label; final String label;
final LiveInfoTrackInfo? track; final LiveInfoTrackInfo? track;
final Color titleColor; final Color titleColor;
final Color cardSurface;
final Color cardBorder;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -24,9 +28,9 @@ class TrackCard extends StatelessWidget {
return Container( return Container(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.black.withValues(alpha: 0.08), color: cardSurface,
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
border: Border.all(color: Colors.black.withValues(alpha: 0.12)), border: Border.all(color: cardBorder),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -45,21 +49,29 @@ class TrackCard extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: Theme.of( style: Theme.of(
context, context,
).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w700), ).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w700,
color: titleColor,
),
), ),
const SizedBox(height: 6), const SizedBox(height: 6),
Text( Text(
subtitle.isEmpty ? 'No metadata provided' : subtitle, subtitle.isEmpty ? 'No metadata provided' : subtitle,
maxLines: 6, maxLines: 6,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodySmall, style: Theme.of(
context,
).textTheme.bodySmall?.copyWith(color: titleColor),
), ),
const Spacer(), const Spacer(),
Text( Text(
window, window,
style: Theme.of( style: Theme.of(
context, context,
).textTheme.labelMedium?.copyWith(fontWeight: FontWeight.w600), ).textTheme.labelMedium?.copyWith(
fontWeight: FontWeight.w600,
color: titleColor,
),
), ),
], ],
), ),
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
View File
View File

Some files were not shown because too many files have changed in this diff Show More