Play built-in music when the radio has no connection, separate track for games and puzzles

This commit is contained in:
2026-10-14 11:48:26 +00:00
parent 5c0f80247f
commit c08272fb4a
16 changed files with 157 additions and 147 deletions
@@ -84,10 +84,6 @@ 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
@@ -60,7 +60,6 @@ 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
@@ -107,13 +106,6 @@ 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),