Radio off by default over HTTPS only, menu music, labels for promotion pieces

This commit is contained in:
2026-10-13 15:54:51 +00:00
parent 1bcea6743e
commit fe182d6798
11 changed files with 210 additions and 13 deletions
@@ -20,14 +20,16 @@ enum class RadioState { IDLE, CONNECTING, PLAYING, ERROR }
object SoundManager { object SoundManager {
private val RADIO_SOURCES = listOf( private val RADIO_SOURCES = listOf(
"http://stream.srg-ssr.ch/srgssr/rsj/aac/192",
"https://stream.srg-ssr.ch/srgssr/rsj/mp3/128", "https://stream.srg-ssr.ch/srgssr/rsj/mp3/128",
"http://stream.srg-ssr.ch/srgssr/rsj/aac/96" "https://stream.srg-ssr.ch/srgssr/rsj/aac/192",
"https://stream.srg-ssr.ch/srgssr/rsj/aac/96"
) )
private const val PREFS = "chess_sound_prefs" private const val PREFS = "chess_sound_prefs"
private const val KEY_MUSIC = "music_enabled" private const val KEY_MUSIC = "music_enabled"
private const val KEY_SFX = "sfx_enabled" private const val KEY_SFX = "sfx_enabled"
private const val KEY_MENU_MUSIC = "menu_music_enabled"
private const val MENU_MUSIC_DIR = "music"
private const val TAG = "SoundManager" private const val TAG = "SoundManager"
private const val RADIO_START_DELAY_MS = 1_500L private const val RADIO_START_DELAY_MS = 1_500L
@@ -49,7 +51,11 @@ object SoundManager {
private var noisyReceiverRegistered = false private var noisyReceiverRegistered = false
private val mainHandler = Handler(Looper.getMainLooper()) private val mainHandler = Handler(Looper.getMainLooper())
var musicEnabled: Boolean = true /** Jazz radio. Off until the user turns it on, so nothing connects on start. */
var musicEnabled: Boolean = false
private set
/** Bundled tracks on the main screen, used while the radio is off. */
var menuMusicEnabled: Boolean = true
private set private set
var sfxEnabled: Boolean = true var sfxEnabled: Boolean = true
private set private set
@@ -57,29 +63,58 @@ object SoundManager {
private val _radioState = MutableStateFlow(RadioState.IDLE) private val _radioState = MutableStateFlow(RadioState.IDLE)
val radioState: StateFlow<RadioState> = _radioState val radioState: StateFlow<RadioState> = _radioState
private var menuPlayer: MediaPlayer? = null
private var menuPrepared = false
private var menuTracks: List<String> = emptyList()
private var menuTrackIndex = 0
private var menuVisible = false
private var appInForeground = false
private fun pauseRadio() { private fun pauseRadio() {
val player = musicPlayer ?: return val player = musicPlayer ?: return
if (playerPrepared) runCatching { if (player.isPlaying) player.pause() } if (playerPrepared) runCatching { if (player.isPlaying) player.pause() }
} }
private fun pauseMenuMusic() {
val player = menuPlayer ?: return
if (menuPrepared) runCatching { if (player.isPlaying) player.pause() }
}
private val noisyReceiver = object : BroadcastReceiver() { private val noisyReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
if (intent.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY) pauseRadio() if (intent.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY) {
pauseRadio()
pauseMenuMusic()
}
} }
} }
private val focusChangeListener = AudioManager.OnAudioFocusChangeListener { change -> private val focusChangeListener = AudioManager.OnAudioFocusChangeListener { change ->
when (change) { when (change) {
AudioManager.AUDIOFOCUS_LOSS -> stopRadioInternal() AudioManager.AUDIOFOCUS_LOSS -> {
AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> pauseRadio() stopRadioInternal()
AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> releaseMenuPlayer()
abandonAudioFocus()
}
AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
pauseRadio()
pauseMenuMusic()
}
AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
runCatching { musicPlayer?.setVolume(BASE_VOLUME * 0.3f, BASE_VOLUME * 0.3f) } runCatching { musicPlayer?.setVolume(BASE_VOLUME * 0.3f, BASE_VOLUME * 0.3f) }
runCatching { menuPlayer?.setVolume(BASE_VOLUME * 0.3f, BASE_VOLUME * 0.3f) }
}
AudioManager.AUDIOFOCUS_GAIN -> { AudioManager.AUDIOFOCUS_GAIN -> {
val player = musicPlayer val player = musicPlayer
if (player != null && playerPrepared) runCatching { if (player != null && playerPrepared) runCatching {
player.setVolume(BASE_VOLUME, BASE_VOLUME) player.setVolume(BASE_VOLUME, BASE_VOLUME)
if (!player.isPlaying) player.start() if (!player.isPlaying) player.start()
} }
val menu = menuPlayer
if (menu != null && menuPrepared && menuVisible) runCatching {
menu.setVolume(BASE_VOLUME, BASE_VOLUME)
if (!menu.isPlaying) menu.start()
}
} }
} }
} }
@@ -92,8 +127,12 @@ object SoundManager {
audioManager = ctx.getSystemService(Context.AUDIO_SERVICE) as? AudioManager audioManager = ctx.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
val prefs = ctx.getSharedPreferences(PREFS, Context.MODE_PRIVATE) val prefs = ctx.getSharedPreferences(PREFS, Context.MODE_PRIVATE)
musicEnabled = prefs.getBoolean(KEY_MUSIC, true) musicEnabled = prefs.getBoolean(KEY_MUSIC, false)
sfxEnabled = prefs.getBoolean(KEY_SFX, true) sfxEnabled = prefs.getBoolean(KEY_SFX, true)
menuMusicEnabled = prefs.getBoolean(KEY_MENU_MUSIC, true)
menuTracks = runCatching {
ctx.assets.list(MENU_MUSIC_DIR)?.filter { it.endsWith(".ogg") || it.endsWith(".mp3") }?.sorted()
}.getOrNull().orEmpty()
ensureSoundPool(ctx) ensureSoundPool(ctx)
@@ -104,6 +143,7 @@ object SoundManager {
private fun requestAudioFocus(): Boolean { private fun requestAudioFocus(): Boolean {
val am = audioManager ?: return false val am = audioManager ?: return false
if (focusRequest != null) return true
val attrs = AudioAttributes.Builder() val attrs = AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA) .setUsage(AudioAttributes.USAGE_MEDIA)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
@@ -145,6 +185,7 @@ object SoundManager {
private fun startRadio() { private fun startRadio() {
val ctx = appContext ?: return val ctx = appContext ?: return
if (musicPlayer != null) return if (musicPlayer != null) return
releaseMenuPlayer()
if (!requestAudioFocus()) { if (!requestAudioFocus()) {
Log.w(TAG, "Audio focus denied, radio not started") Log.w(TAG, "Audio focus denied, radio not started")
_radioState.value = RadioState.ERROR _radioState.value = RadioState.ERROR
@@ -260,18 +301,116 @@ object SoundManager {
} }
fun onAppResumed() { fun onAppResumed() {
appInForeground = true
if (musicEnabled && musicPlayer == null) startRadio() if (musicEnabled && musicPlayer == null) startRadio()
updateMenuMusic()
} }
fun onAppPaused() { fun onAppPaused() {
appInForeground = false
stopRadioInternal() stopRadioInternal()
releaseMenuPlayer()
abandonAudioFocus()
} }
fun setMusicEnabled(enabled: Boolean) { fun setMusicEnabled(enabled: Boolean) {
musicEnabled = enabled musicEnabled = enabled
appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE)?.edit() appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE)?.edit()
?.putBoolean(KEY_MUSIC, enabled)?.apply() ?.putBoolean(KEY_MUSIC, enabled)?.apply()
if (enabled) startRadio() else stopRadioInternal() if (enabled) {
startRadio()
} else {
stopRadioInternal()
updateMenuMusic()
}
}
fun setMenuMusicEnabled(enabled: Boolean) {
menuMusicEnabled = enabled
appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE)?.edit()
?.putBoolean(KEY_MENU_MUSIC, enabled)?.apply()
updateMenuMusic()
}
/** Called by the main screen when it appears and disappears. */
fun setMenuVisible(visible: Boolean) {
menuVisible = visible
updateMenuMusic()
}
private fun updateMenuMusic() {
val shouldPlay = menuMusicEnabled && !musicEnabled && menuVisible && appInForeground
if (shouldPlay) startMenuMusic() else pauseMenuMusicAndFocus()
}
private fun pauseMenuMusicAndFocus() {
pauseMenuMusic()
if (!musicEnabled) abandonAudioFocus()
}
private fun startMenuMusic() {
if (menuTracks.isEmpty()) return
val player = menuPlayer
if (player != null) {
if (menuPrepared && !player.isPlaying && requestAudioFocus()) {
registerNoisyReceiver()
runCatching { player.setVolume(BASE_VOLUME, BASE_VOLUME); player.start() }
}
return
}
// Never cut off music another app is already playing.
if (audioManager?.isMusicActive == true) return
if (!requestAudioFocus()) return
registerNoisyReceiver()
playMenuTrack(menuTrackIndex)
}
private fun playMenuTrack(index: Int) {
val ctx = appContext ?: return
if (menuTracks.isEmpty()) return
val name = menuTracks[index % menuTracks.size]
try {
val player = MediaPlayer()
menuPlayer = player
menuPrepared = false
player.setAudioAttributes(
AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build()
)
ctx.assets.openFd("$MENU_MUSIC_DIR/$name").use { fd ->
player.setDataSource(fd.fileDescriptor, fd.startOffset, fd.length)
}
player.setVolume(BASE_VOLUME, BASE_VOLUME)
player.setOnPreparedListener {
menuPrepared = true
if (menuVisible && appInForeground && menuMusicEnabled && !musicEnabled) it.start()
}
player.setOnCompletionListener { mp ->
if (menuPlayer === mp) {
releaseMenuPlayer()
menuTrackIndex = (menuTrackIndex + 1) % menuTracks.size
if (menuVisible && appInForeground && menuMusicEnabled && !musicEnabled) {
playMenuTrack(menuTrackIndex)
}
}
}
player.setOnErrorListener { mp, _, _ ->
if (menuPlayer === mp) releaseMenuPlayer()
true
}
player.prepareAsync()
} catch (e: Exception) {
Log.w(TAG, "Menu music error ($name): ${e.message}")
releaseMenuPlayer()
}
}
private fun releaseMenuPlayer() {
try { menuPlayer?.release() } catch (_: Exception) {}
menuPlayer = null
menuPrepared = false
} }
fun setSfxEnabled(enabled: Boolean) { fun setSfxEnabled(enabled: Boolean) {
@@ -17,6 +17,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import cc.skysparkle.matewave.R import cc.skysparkle.matewave.R
import cc.skysparkle.matewave.engine.Piece import cc.skysparkle.matewave.engine.Piece
@@ -39,6 +42,14 @@ fun PromotionDialog(color: PieceColor, onChoose: (PieceType) -> Unit, onDismiss:
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
listOf(PieceType.QUEEN, PieceType.ROOK, PieceType.BISHOP, PieceType.KNIGHT).forEach { type -> listOf(PieceType.QUEEN, PieceType.ROOK, PieceType.BISHOP, PieceType.KNIGHT).forEach { type ->
val optionShape = RoundedCornerShape(UiCornerRadius) val optionShape = RoundedCornerShape(UiCornerRadius)
val label = stringResource(
when (type) {
PieceType.QUEEN -> R.string.piece_queen
PieceType.ROOK -> R.string.piece_rook
PieceType.BISHOP -> R.string.piece_bishop
else -> R.string.piece_knight
}
)
Box( Box(
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
@@ -46,7 +57,8 @@ fun PromotionDialog(color: PieceColor, onChoose: (PieceType) -> Unit, onDismiss:
.clip(optionShape) .clip(optionShape)
.background(ink.copy(alpha = 0.10f)) .background(ink.copy(alpha = 0.10f))
.border(1.dp, PanelBorder, optionShape) .border(1.dp, PanelBorder, optionShape)
.clickable { onChoose(type) } .clickable(onClickLabel = label, role = Role.Button) { onChoose(type) }
.semantics { contentDescription = label }
.padding(8.dp), .padding(8.dp),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
@@ -84,6 +84,10 @@ fun MainMenuScreen(
onFriendsClick: () -> Unit onFriendsClick: () -> Unit
) { ) {
val context = LocalContext.current val context = LocalContext.current
androidx.compose.runtime.DisposableEffect(Unit) {
cc.skysparkle.matewave.audio.SoundManager.setMenuVisible(true)
onDispose { cc.skysparkle.matewave.audio.SoundManager.setMenuVisible(false) }
}
val resumable by viewModel.resumable.collectAsState() val resumable by viewModel.resumable.collectAsState()
val ongoing = resumable val ongoing = resumable
val hasOngoingGame = ongoing != null val hasOngoingGame = ongoing != null
@@ -60,6 +60,7 @@ fun SettingsScreen(
onOpenShare: () -> Unit onOpenShare: () -> Unit
) { ) {
var musicOn by remember { mutableStateOf(SoundManager.musicEnabled) } var musicOn by remember { mutableStateOf(SoundManager.musicEnabled) }
var menuMusicOn by remember { mutableStateOf(SoundManager.menuMusicEnabled) }
var sfxOn by remember { mutableStateOf(SoundManager.sfxEnabled) } var sfxOn by remember { mutableStateOf(SoundManager.sfxEnabled) }
val context = LocalContext.current val context = LocalContext.current
@@ -106,6 +107,13 @@ fun SettingsScreen(
) { ) {
SectionCaption(stringResource(R.string.settings_section_sound)) SectionCaption(stringResource(R.string.settings_section_sound))
ListGroup { ListGroup {
ListRow(
title = stringResource(R.string.settings_menu_music),
subtitle = stringResource(R.string.settings_menu_music_subtitle),
icon = R.drawable.ic_music,
trailing = { SettingSwitch(menuMusicOn) { menuMusicOn = it; SoundManager.setMenuMusicEnabled(it) } }
)
ListDivider()
ListRow( ListRow(
title = stringResource(R.string.settings_radio), title = stringResource(R.string.settings_radio),
subtitle = stringResource(R.string.settings_radio_subtitle), subtitle = stringResource(R.string.settings_radio_subtitle),
+6
View File
@@ -354,4 +354,10 @@
<string name="nearby_bt_off_hint">Schalte es ein, um Spieler per Bluetooth zu finden</string> <string name="nearby_bt_off_hint">Schalte es ein, um Spieler per Bluetooth zu finden</string>
<string name="nearby_wifi_hint">Spieler im selben WLAN werden erst gefunden, wenn du verbunden bist</string> <string name="nearby_wifi_hint">Spieler im selben WLAN werden erst gefunden, wenn du verbunden bist</string>
<string name="permission_open_settings">Einstellungen öffnen</string> <string name="permission_open_settings">Einstellungen öffnen</string>
<string name="settings_menu_music">Menümusik</string>
<string name="settings_menu_music_subtitle">Ruhige Musik auf dem Startbildschirm, solange das Radio aus ist</string>
<string name="piece_queen">Dame</string>
<string name="piece_rook">Turm</string>
<string name="piece_bishop">Läufer</string>
<string name="piece_knight">Springer</string>
</resources> </resources>
+6
View File
@@ -353,4 +353,10 @@
<string name="nearby_bt_off_hint">オンにすると、Bluetoothでプレイヤーを探せます</string> <string name="nearby_bt_off_hint">オンにすると、Bluetoothでプレイヤーを探せます</string>
<string name="nearby_wifi_hint">接続するまで、同じWi-Fiのプレイヤーは見つかりません</string> <string name="nearby_wifi_hint">接続するまで、同じWi-Fiのプレイヤーは見つかりません</string>
<string name="permission_open_settings">設定を開く</string> <string name="permission_open_settings">設定を開く</string>
<string name="settings_menu_music">メニューの音楽</string>
<string name="settings_menu_music_subtitle">ラジオがオフのとき、ホーム画面で穏やかな音楽を流します</string>
<string name="piece_queen">クイーン</string>
<string name="piece_rook">ルーク</string>
<string name="piece_bishop">ビショップ</string>
<string name="piece_knight">ナイト</string>
</resources> </resources>
+6
View File
@@ -356,4 +356,10 @@
<string name="nearby_bt_off_hint">Įjunkite, kad rastumėte žaidėjus per „Bluetooth“</string> <string name="nearby_bt_off_hint">Įjunkite, kad rastumėte žaidėjus per „Bluetooth“</string>
<string name="nearby_wifi_hint">Žaidėjų tame pačiame „Wi-Fi“ tinkle nerasite, kol neprisijungsite</string> <string name="nearby_wifi_hint">Žaidėjų tame pačiame „Wi-Fi“ tinkle nerasite, kol neprisijungsite</string>
<string name="permission_open_settings">Atidaryti nustatymus</string> <string name="permission_open_settings">Atidaryti nustatymus</string>
<string name="settings_menu_music">Meniu muzika</string>
<string name="settings_menu_music_subtitle">Rami muzika pagrindiniame ekrane, kol radijas išjungtas</string>
<string name="piece_queen">Valdovė</string>
<string name="piece_rook">Bokštas</string>
<string name="piece_bishop">Rikis</string>
<string name="piece_knight">Žirgas</string>
</resources> </resources>
+6
View File
@@ -362,4 +362,10 @@
<string name="nearby_bt_off_hint">Включите, чтобы находить игроков по Bluetooth</string> <string name="nearby_bt_off_hint">Включите, чтобы находить игроков по Bluetooth</string>
<string name="nearby_wifi_hint">Игроков в той же сети Wi-Fi не найти, пока вы не подключитесь</string> <string name="nearby_wifi_hint">Игроков в той же сети Wi-Fi не найти, пока вы не подключитесь</string>
<string name="permission_open_settings">Открыть настройки</string> <string name="permission_open_settings">Открыть настройки</string>
<string name="settings_menu_music">Музыка в меню</string>
<string name="settings_menu_music_subtitle">Спокойная музыка на главном экране, пока радио выключено</string>
<string name="piece_queen">Ферзь</string>
<string name="piece_rook">Ладья</string>
<string name="piece_bishop">Слон</string>
<string name="piece_knight">Конь</string>
</resources> </resources>
+6
View File
@@ -353,4 +353,10 @@
<string name="nearby_bt_off_hint">开启后即可通过蓝牙查找玩家</string> <string name="nearby_bt_off_hint">开启后即可通过蓝牙查找玩家</string>
<string name="nearby_wifi_hint">连接 Wi-Fi 后才能找到同一网络中的玩家</string> <string name="nearby_wifi_hint">连接 Wi-Fi 后才能找到同一网络中的玩家</string>
<string name="permission_open_settings">打开设置</string> <string name="permission_open_settings">打开设置</string>
<string name="settings_menu_music">菜单音乐</string>
<string name="settings_menu_music_subtitle">电台关闭时,在主屏幕播放舒缓的音乐</string>
<string name="piece_queen">后</string>
<string name="piece_rook">车</string>
<string name="piece_bishop">象</string>
<string name="piece_knight">马</string>
</resources> </resources>
+6
View File
@@ -354,4 +354,10 @@
<string name="nearby_bt_off_hint">Turn it on to find players over Bluetooth</string> <string name="nearby_bt_off_hint">Turn it on to find players over Bluetooth</string>
<string name="nearby_wifi_hint">Players on the same Wi-Fi network can\'t be found until you connect</string> <string name="nearby_wifi_hint">Players on the same Wi-Fi network can\'t be found until you connect</string>
<string name="permission_open_settings">Open settings</string> <string name="permission_open_settings">Open settings</string>
<string name="settings_menu_music">Menu music</string>
<string name="settings_menu_music_subtitle">Calm music on the main screen while the radio is off</string>
<string name="piece_queen">Queen</string>
<string name="piece_rook">Rook</string>
<string name="piece_bishop">Bishop</string>
<string name="piece_knight">Knight</string>
</resources> </resources>
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<network-security-config> <network-security-config>
<domain-config cleartextTrafficPermitted="true"> <base-config cleartextTrafficPermitted="false" />
<domain includeSubdomains="true">stream.srg-ssr.ch</domain>
</domain-config>
</network-security-config> </network-security-config>