diff --git a/app/src/main/java/cc/skysparkle/matewave/audio/SoundManager.kt b/app/src/main/java/cc/skysparkle/matewave/audio/SoundManager.kt index 9d0118b..1b2e48a 100644 --- a/app/src/main/java/cc/skysparkle/matewave/audio/SoundManager.kt +++ b/app/src/main/java/cc/skysparkle/matewave/audio/SoundManager.kt @@ -20,14 +20,16 @@ enum class RadioState { IDLE, CONNECTING, PLAYING, ERROR } object SoundManager { private val RADIO_SOURCES = listOf( - "http://stream.srg-ssr.ch/srgssr/rsj/aac/192", "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 KEY_MUSIC = "music_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 RADIO_START_DELAY_MS = 1_500L @@ -49,7 +51,11 @@ object SoundManager { private var noisyReceiverRegistered = false 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 var sfxEnabled: Boolean = true private set @@ -57,29 +63,58 @@ object SoundManager { private val _radioState = MutableStateFlow(RadioState.IDLE) val radioState: StateFlow = _radioState + private var menuPlayer: MediaPlayer? = null + private var menuPrepared = false + private var menuTracks: List = emptyList() + private var menuTrackIndex = 0 + private var menuVisible = false + private var appInForeground = false + private fun pauseRadio() { val player = musicPlayer ?: return 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() { 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 -> when (change) { - AudioManager.AUDIOFOCUS_LOSS -> stopRadioInternal() - AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> pauseRadio() - AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> + AudioManager.AUDIOFOCUS_LOSS -> { + stopRadioInternal() + 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 { menuPlayer?.setVolume(BASE_VOLUME * 0.3f, BASE_VOLUME * 0.3f) } + } AudioManager.AUDIOFOCUS_GAIN -> { val player = musicPlayer if (player != null && playerPrepared) runCatching { player.setVolume(BASE_VOLUME, BASE_VOLUME) 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 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) + 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) @@ -104,6 +143,7 @@ object SoundManager { private fun requestAudioFocus(): Boolean { val am = audioManager ?: return false + if (focusRequest != null) return true val attrs = AudioAttributes.Builder() .setUsage(AudioAttributes.USAGE_MEDIA) .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) @@ -145,6 +185,7 @@ object SoundManager { private fun startRadio() { val ctx = appContext ?: return if (musicPlayer != null) return + releaseMenuPlayer() if (!requestAudioFocus()) { Log.w(TAG, "Audio focus denied, radio not started") _radioState.value = RadioState.ERROR @@ -260,18 +301,116 @@ object SoundManager { } fun onAppResumed() { + appInForeground = true if (musicEnabled && musicPlayer == null) startRadio() + updateMenuMusic() } fun onAppPaused() { + appInForeground = false stopRadioInternal() + releaseMenuPlayer() + abandonAudioFocus() } fun setMusicEnabled(enabled: Boolean) { musicEnabled = enabled appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE)?.edit() ?.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) { diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/components/PromotionDialog.kt b/app/src/main/java/cc/skysparkle/matewave/ui/components/PromotionDialog.kt index 43d453b..8c966df 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/components/PromotionDialog.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/components/PromotionDialog.kt @@ -17,6 +17,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.painterResource 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 cc.skysparkle.matewave.R 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)) { listOf(PieceType.QUEEN, PieceType.ROOK, PieceType.BISHOP, PieceType.KNIGHT).forEach { type -> 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( modifier = Modifier .weight(1f) @@ -46,7 +57,8 @@ fun PromotionDialog(color: PieceColor, onChoose: (PieceType) -> Unit, onDismiss: .clip(optionShape) .background(ink.copy(alpha = 0.10f)) .border(1.dp, PanelBorder, optionShape) - .clickable { onChoose(type) } + .clickable(onClickLabel = label, role = Role.Button) { onChoose(type) } + .semantics { contentDescription = label } .padding(8.dp), contentAlignment = Alignment.Center ) { diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/MainMenuScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/MainMenuScreen.kt index f976204..66838a6 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/MainMenuScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/MainMenuScreen.kt @@ -84,6 +84,10 @@ fun MainMenuScreen( onFriendsClick: () -> Unit ) { 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 ongoing = resumable val hasOngoingGame = ongoing != null diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt index 64a24ca..d590006 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt @@ -60,6 +60,7 @@ fun SettingsScreen( onOpenShare: () -> Unit ) { var musicOn by remember { mutableStateOf(SoundManager.musicEnabled) } + var menuMusicOn by remember { mutableStateOf(SoundManager.menuMusicEnabled) } var sfxOn by remember { mutableStateOf(SoundManager.sfxEnabled) } val context = LocalContext.current @@ -106,6 +107,13 @@ fun SettingsScreen( ) { SectionCaption(stringResource(R.string.settings_section_sound)) 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( title = stringResource(R.string.settings_radio), subtitle = stringResource(R.string.settings_radio_subtitle), diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d7b5349..b54b2da 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -354,4 +354,10 @@ Schalte es ein, um Spieler per Bluetooth zu finden Spieler im selben WLAN werden erst gefunden, wenn du verbunden bist Einstellungen öffnen + Menümusik + Ruhige Musik auf dem Startbildschirm, solange das Radio aus ist + Dame + Turm + Läufer + Springer diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 39ce577..b07e40d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -353,4 +353,10 @@ オンにすると、Bluetoothでプレイヤーを探せます 接続するまで、同じWi-Fiのプレイヤーは見つかりません 設定を開く + メニューの音楽 + ラジオがオフのとき、ホーム画面で穏やかな音楽を流します + クイーン + ルーク + ビショップ + ナイト diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index fe6890d..20dbe37 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -356,4 +356,10 @@ Įjunkite, kad rastumėte žaidėjus per „Bluetooth“ Žaidėjų tame pačiame „Wi-Fi“ tinkle nerasite, kol neprisijungsite Atidaryti nustatymus + Meniu muzika + Rami muzika pagrindiniame ekrane, kol radijas išjungtas + Valdovė + Bokštas + Rikis + Žirgas diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 95352e7..3a30cfd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -362,4 +362,10 @@ Включите, чтобы находить игроков по Bluetooth Игроков в той же сети Wi-Fi не найти, пока вы не подключитесь Открыть настройки + Музыка в меню + Спокойная музыка на главном экране, пока радио выключено + Ферзь + Ладья + Слон + Конь diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index a5fc48d..49201c1 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -353,4 +353,10 @@ 开启后即可通过蓝牙查找玩家 连接 Wi-Fi 后才能找到同一网络中的玩家 打开设置 + 菜单音乐 + 电台关闭时,在主屏幕播放舒缓的音乐 + 后 + 车 + 象 + 马 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1b93205..ce3eea4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -354,4 +354,10 @@ Turn it on to find players over Bluetooth Players on the same Wi-Fi network can\'t be found until you connect Open settings + Menu music + Calm music on the main screen while the radio is off + Queen + Rook + Bishop + Knight diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml index 1f88d19..6115950 100644 --- a/app/src/main/res/xml/network_security_config.xml +++ b/app/src/main/res/xml/network_security_config.xml @@ -1,6 +1,4 @@ - - stream.srg-ssr.ch - +