From c08272fb4a16fafc415dd8a2a9aad9eecf03796c Mon Sep 17 00:00:00 2001 From: kalarina Date: Wed, 14 Oct 2026 11:48:26 +0000 Subject: [PATCH] Play built-in music when the radio has no connection, separate track for games and puzzles --- .../cc/skysparkle/matewave/MainActivity.kt | 13 + .../skysparkle/matewave/audio/SoundManager.kt | 231 ++++++++++-------- .../matewave/ui/screens/MainMenuScreen.kt | 4 - .../matewave/ui/screens/SettingsScreen.kt | 8 - app/src/main/res/values-de/strings.xml | 6 +- app/src/main/res/values-ja/strings.xml | 6 +- app/src/main/res/values-lt/strings.xml | 6 +- app/src/main/res/values-ru/strings.xml | 6 +- app/src/main/res/values-zh/strings.xml | 6 +- app/src/main/res/values/strings.xml | 6 +- .../metadata/android/de-DE/changelogs/2.txt | 2 +- .../metadata/android/en-US/changelogs/2.txt | 2 +- .../metadata/android/ja-JP/changelogs/2.txt | 2 +- fastlane/metadata/android/lt/changelogs/2.txt | 2 +- .../metadata/android/ru-RU/changelogs/2.txt | 2 +- .../metadata/android/zh-CN/changelogs/2.txt | 2 +- 16 files changed, 157 insertions(+), 147 deletions(-) diff --git a/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt b/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt index 8077f98..b830efd 100644 --- a/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt +++ b/app/src/main/java/cc/skysparkle/matewave/MainActivity.kt @@ -260,6 +260,7 @@ private fun AppNavHost() { } composable("game") { + PlayScreenMusic() GameScreen( viewModel = viewModel, onExit = { navController.popBackStack("menu", inclusive = false) } @@ -267,6 +268,7 @@ private fun AppNavHost() { } composable("openingStudy") { + PlayScreenMusic() cc.skysparkle.matewave.ui.screens.OpeningStudyScreen( viewModel = studyViewModel, onBack = { navController.popBackStack() }, @@ -275,6 +277,7 @@ private fun AppNavHost() { } composable("openingTrainer") { + PlayScreenMusic() cc.skysparkle.matewave.ui.screens.OpeningTrainerScreen( viewModel = studyViewModel, onBack = { navController.popBackStack() } @@ -282,6 +285,7 @@ private fun AppNavHost() { } composable("puzzleSolve") { + PlayScreenMusic() PuzzleSolveScreen( viewModel = viewModel, onBack = { navController.popBackStack("menu", inclusive = false) }, @@ -355,3 +359,12 @@ private fun sharedAxisOut(forward: Boolean): androidx.compose.animation.ExitTran androidx.compose.animation.fadeOut( androidx.compose.animation.core.tween(durationMillis = 120, easing = androidx.compose.animation.core.LinearEasing) ) + +// Offline music switches to the game track while a game, puzzle or opening study is open +@Composable +private fun PlayScreenMusic() { + androidx.compose.runtime.DisposableEffect(Unit) { + SoundManager.enterPlayScreen() + onDispose { SoundManager.leavePlayScreen() } + } +} 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 e137a36..b3be683 100644 --- a/app/src/main/java/cc/skysparkle/matewave/audio/SoundManager.kt +++ b/app/src/main/java/cc/skysparkle/matewave/audio/SoundManager.kt @@ -9,6 +9,9 @@ import android.media.AudioFocusRequest import android.media.AudioManager import android.media.MediaPlayer import android.media.SoundPool +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities import android.os.Build import android.os.Handler import android.os.Looper @@ -25,11 +28,13 @@ object SoundManager { "https://stream.srg-ssr.ch/srgssr/rsj/aac/96" ) + // Played instead of the radio when it can't be reached + private const val MENU_TRACK = "music/midnight_grove_conversations.ogg" + private const val PLAY_TRACK = "music/raindrops_and_pawns.ogg" + 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 @@ -47,46 +52,46 @@ object SoundManager { private var sourceIndex = 0 private var connectTimeoutRunnable: Runnable? = null private var audioManager: AudioManager? = null + private var connectivity: ConnectivityManager? = null + private var networkCallbackRegistered = false private var focusRequest: AudioFocusRequest? = null private var focusGranted = false private var noisyReceiverRegistered = false private val mainHandler = Handler(Looper.getMainLooper()) + private var offlinePlayer: MediaPlayer? = null + private var offlinePrepared = false + private var offlineTrack: String? = null + private var playScreens = 0 + private var appInForeground = false + /** 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 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 setRadioState(state: RadioState) { + _radioState.value = state + updateOfflineMusic() } - private fun pauseMenuMusic() { - val player = menuPlayer ?: return - if (menuPrepared) runCatching { if (player.isPlaying) player.pause() } + private fun pauseAll() { + musicPlayer?.let { player -> if (playerPrepared) runCatching { if (player.isPlaying) player.pause() } } + offlinePlayer?.let { player -> if (offlinePrepared) runCatching { if (player.isPlaying) player.pause() } } + } + + private fun setVolumeAll(volume: Float) { + runCatching { musicPlayer?.setVolume(volume, volume) } + runCatching { offlinePlayer?.setVolume(volume, volume) } } private val noisyReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - if (intent.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY) { - pauseRadio() - pauseMenuMusic() - } + if (intent.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY) pauseAll() } } @@ -94,29 +99,33 @@ object SoundManager { when (change) { AudioManager.AUDIOFOCUS_LOSS -> { stopRadioInternal() - releaseMenuPlayer() + releaseOfflinePlayer() abandonAudioFocus() } AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> { focusGranted = false - 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) } + pauseAll() } + AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> setVolumeAll(BASE_VOLUME * 0.3f) AudioManager.AUDIOFOCUS_GAIN -> { focusGranted = true + setVolumeAll(BASE_VOLUME) val player = musicPlayer - if (player != null && playerPrepared) runCatching { - player.setVolume(BASE_VOLUME, BASE_VOLUME) - if (!player.isPlaying) player.start() + if (player != null && playerPrepared) runCatching { if (!player.isPlaying) player.start() } + val offline = offlinePlayer + if (offline != null && offlinePrepared && shouldPlayOffline()) { + runCatching { if (!offline.isPlaying) offline.start() } } - val menu = menuPlayer - if (menu != null && menuPrepared && shouldPlayMenuMusic()) runCatching { - menu.setVolume(BASE_VOLUME, BASE_VOLUME) - if (!menu.isPlaying) menu.start() + } + } + } + + // Brings the radio back once the device is online again + private val networkCallback = object : ConnectivityManager.NetworkCallback() { + override fun onAvailable(network: Network) { + mainHandler.post { + if (musicEnabled && appInForeground && musicPlayer == null && _radioState.value == RadioState.ERROR) { + startRadio() } } } @@ -128,14 +137,11 @@ object SoundManager { val ctx = context.applicationContext appContext = ctx audioManager = ctx.getSystemService(Context.AUDIO_SERVICE) as? AudioManager + connectivity = ctx.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager val prefs = ctx.getSharedPreferences(PREFS, Context.MODE_PRIVATE) 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) @@ -189,22 +195,47 @@ object SoundManager { noisyReceiverRegistered = false } + private fun registerNetworkCallback() { + val cm = connectivity ?: return + if (networkCallbackRegistered) return + runCatching { cm.registerDefaultNetworkCallback(networkCallback) } + .onSuccess { networkCallbackRegistered = true } + } + + private fun unregisterNetworkCallback() { + val cm = connectivity ?: return + if (!networkCallbackRegistered) return + runCatching { cm.unregisterNetworkCallback(networkCallback) } + networkCallbackRegistered = false + } + + private fun isOnline(): Boolean { + val cm = connectivity ?: return true + val caps = cm.getNetworkCapabilities(cm.activeNetwork) ?: return false + return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + } + 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 + setRadioState(RadioState.ERROR) return } registerNoisyReceiver() + registerNetworkCallback() retryCount = 0 + if (!isOnline()) { + // No point waiting for timeouts: play offline music until the network is back + setRadioState(RadioState.ERROR) + return + } connect(ctx) } private fun connect(ctx: Context) { - _radioState.value = RadioState.CONNECTING + setRadioState(RadioState.CONNECTING) val url = RADIO_SOURCES[sourceIndex % RADIO_SOURCES.size] try { val player = MediaPlayer() @@ -221,9 +252,9 @@ object SoundManager { player.setOnPreparedListener { cancelConnectTimeout() playerPrepared = true - it.start() retryCount = 0 - _radioState.value = RadioState.PLAYING + if (appInForeground) it.start() + setRadioState(RadioState.PLAYING) } player.setOnErrorListener { mp, _, _ -> cancelConnectTimeout() @@ -279,18 +310,18 @@ object SoundManager { private fun scheduleRetry(ctx: Context) { cancelConnectTimeout() if (!musicEnabled) { - _radioState.value = RadioState.IDLE + setRadioState(RadioState.IDLE) return } - if (retryCount >= MAX_RETRIES) { - _radioState.value = RadioState.ERROR - Log.w(TAG, "Could not connect to the radio after $MAX_RETRIES attempts") + if (retryCount >= MAX_RETRIES || !isOnline()) { + if (retryCount >= MAX_RETRIES) Log.w(TAG, "Could not connect to the radio after $MAX_RETRIES attempts") + setRadioState(RadioState.ERROR) return } sourceIndex++ val delay = RETRY_DELAYS_MS.getOrElse(retryCount) { RETRY_DELAYS_MS.last() } retryCount++ - _radioState.value = RadioState.CONNECTING + setRadioState(RadioState.CONNECTING) mainHandler.postDelayed({ if (musicEnabled && musicPlayer == null) connect(ctx) }, delay) @@ -302,22 +333,22 @@ object SoundManager { musicPlayer = null playerPrepared = false unregisterNoisyReceiver() + unregisterNetworkCallback() abandonAudioFocus() mainHandler.removeCallbacksAndMessages(null) - _radioState.value = RadioState.IDLE + setRadioState(RadioState.IDLE) } fun onAppResumed() { appInForeground = true if (musicEnabled && musicPlayer == null) startRadio() - updateMenuMusic() + updateOfflineMusic() } fun onAppPaused() { appInForeground = false + releaseOfflinePlayer() stopRadioInternal() - releaseMenuPlayer() - abandonAudioFocus() } fun setMusicEnabled(enabled: Boolean) { @@ -327,96 +358,86 @@ object SoundManager { if (enabled) { startRadio() } else { + releaseOfflinePlayer() stopRadioInternal() - updateMenuMusic() } } - fun setMenuMusicEnabled(enabled: Boolean) { - menuMusicEnabled = enabled - appContext?.getSharedPreferences(PREFS, Context.MODE_PRIVATE)?.edit() - ?.putBoolean(KEY_MENU_MUSIC, enabled)?.apply() - updateMenuMusic() + /** Games, puzzles and opening study call this while they are on screen. */ + fun enterPlayScreen() { + playScreens++ + updateOfflineMusic() } - /** Called by the main screen when it appears and disappears. */ - fun setMenuVisible(visible: Boolean) { - menuVisible = visible - updateMenuMusic() + fun leavePlayScreen() { + playScreens = maxOf(0, playScreens - 1) + updateOfflineMusic() } - private fun updateMenuMusic() { - if (shouldPlayMenuMusic()) startMenuMusic() else pauseMenuMusicAndFocus() + // The radio is on but can't be reached: no network, or the first attempt already failed + private fun radioUnavailable(): Boolean = when (_radioState.value) { + RadioState.ERROR -> true + RadioState.CONNECTING -> retryCount > 0 + else -> false } - private fun shouldPlayMenuMusic() = menuMusicEnabled && !musicEnabled && menuVisible && appInForeground + private fun shouldPlayOffline() = musicEnabled && appInForeground && radioUnavailable() - 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() } - } + private fun updateOfflineMusic() { + if (!shouldPlayOffline()) { + releaseOfflinePlayer() return } - // Never cut off music another app is already playing. - if (audioManager?.isMusicActive == true) return + val track = if (playScreens > 0) PLAY_TRACK else MENU_TRACK + val player = offlinePlayer + if (player != null && offlineTrack == track) { + if (offlinePrepared && !player.isPlaying && requestAudioFocus()) runCatching { player.start() } + return + } + releaseOfflinePlayer() if (!requestAudioFocus()) return registerNoisyReceiver() - playMenuTrack(menuTrackIndex) + playOfflineTrack(track) } - private fun playMenuTrack(index: Int) { + private fun playOfflineTrack(track: String) { val ctx = appContext ?: return - if (menuTracks.isEmpty()) return - val name = menuTracks[index % menuTracks.size] try { val player = MediaPlayer() - menuPlayer = player - menuPrepared = false + offlinePlayer = player + offlineTrack = track + offlinePrepared = false player.setAudioAttributes( AudioAttributes.Builder() .setUsage(AudioAttributes.USAGE_MEDIA) .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) .build() ) - ctx.assets.openFd("$MENU_MUSIC_DIR/$name").use { fd -> + ctx.assets.openFd(track).use { fd -> player.setDataSource(fd.fileDescriptor, fd.startOffset, fd.length) } + player.isLooping = true player.setVolume(BASE_VOLUME, BASE_VOLUME) player.setOnPreparedListener { - menuPrepared = true - if (shouldPlayMenuMusic()) it.start() - } - player.setOnCompletionListener { mp -> - if (menuPlayer === mp) { - releaseMenuPlayer() - menuTrackIndex = (menuTrackIndex + 1) % menuTracks.size - if (shouldPlayMenuMusic()) playMenuTrack(menuTrackIndex) - } + offlinePrepared = true + if (shouldPlayOffline() && focusGranted) it.start() } player.setOnErrorListener { mp, _, _ -> - if (menuPlayer === mp) releaseMenuPlayer() + if (offlinePlayer === mp) releaseOfflinePlayer() true } player.prepareAsync() } catch (e: Exception) { - Log.w(TAG, "Menu music error ($name): ${e.message}") - releaseMenuPlayer() + Log.w(TAG, "Offline music error ($track): ${e.message}") + releaseOfflinePlayer() } } - private fun releaseMenuPlayer() { - try { menuPlayer?.release() } catch (_: Exception) {} - menuPlayer = null - menuPrepared = false + private fun releaseOfflinePlayer() { + try { offlinePlayer?.release() } catch (_: Exception) {} + offlinePlayer = null + offlineTrack = null + offlinePrepared = false } fun setSfxEnabled(enabled: Boolean) { 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 66838a6..f976204 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,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 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 d590006..64a24ca 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,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), diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b54b2da..4ccba0a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -25,9 +25,9 @@ Version %1$s Quellcode Jazzradio - Internetradio im Hintergrund statt Stille + Radio Swiss Jazz. Ohne Verbindung läuft eingebaute Musik Verbinde... - Verbindung fehlgeschlagen + Keine Verbindung, eingebaute Musik Soundeffekte Figur wählen, ziehen, schlagen Zurück @@ -354,8 +354,6 @@ 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 diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b07e40d..779eb0e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -25,9 +25,9 @@ バージョン %1$s ソースコード ジャズラジオ - 無音のかわりにインターネットラジオをバックグラウンドで再生 + Radio Swiss Jazz。接続がないときは内蔵の音楽を再生 接続中... - 接続できませんでした + 接続なし・内蔵の音楽 効果音 駒の選択、移動、取る音 戻る @@ -353,8 +353,6 @@ オンにすると、Bluetoothでプレイヤーを探せます 接続するまで、同じWi-Fiのプレイヤーは見つかりません 設定を開く - メニューの音楽 - ラジオがオフのとき、ホーム画面で穏やかな音楽を流します クイーン ルーク ビショップ diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 20dbe37..f5ef7da 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -25,9 +25,9 @@ Versija %1$s Šaltinio kodas Džiazo radijas - Interneto radijas fone vietoj tylos + Radio Swiss Jazz. Be ryšio groja įdiegta muzika Jungiamasi... - Nepavyko prisijungti + Nėra ryšio, įdiegta muzika Garso efektai Figūros pasirinkimas, ėjimas, paėmimas Atgal @@ -356,8 +356,6 @@ Į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 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3a30cfd..07fa4d0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -30,9 +30,9 @@ Версия %1$s Исходный код Джаз-радио - Фоновый интернет-эфир вместо тишины + Radio Swiss Jazz. Без связи играет встроенная музыка Подключение... - Не удалось подключиться + Нет связи, встроенная музыка Звуковые эффекты Выбор фигуры, ход, взятие Назад @@ -362,8 +362,6 @@ Включите, чтобы находить игроков по Bluetooth Игроков в той же сети Wi-Fi не найти, пока вы не подключитесь Открыть настройки - Музыка в меню - Спокойная музыка на главном экране, пока радио выключено Ферзь Ладья Слон diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 49201c1..6ce2a0f 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -25,9 +25,9 @@ 版本 %1$s 源代码 爵士电台 - 在后台播放网络电台,告别寂静 + Radio Swiss Jazz。无网络时播放内置音乐 正在连接... - 无法连接 + 无连接,播放内置音乐 音效 选子、走子、吃子 返回 @@ -353,8 +353,6 @@ 开启后即可通过蓝牙查找玩家 连接 Wi-Fi 后才能找到同一网络中的玩家 打开设置 - 菜单音乐 - 电台关闭时,在主屏幕播放舒缓的音乐 后 车 象 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce3eea4..918b211 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,9 +25,9 @@ Version %1$s Source code Jazz radio - Background internet radio instead of silence + Radio Swiss Jazz. Without a connection, built-in music plays Connecting... - Couldn\'t connect + No connection, built-in music Sound effects Selecting a piece, moving, capturing Back @@ -354,8 +354,6 @@ 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 diff --git a/fastlane/metadata/android/de-DE/changelogs/2.txt b/fastlane/metadata/android/de-DE/changelogs/2.txt index 0a59df2..dee0f49 100644 --- a/fastlane/metadata/android/de-DE/changelogs/2.txt +++ b/fastlane/metadata/android/de-DE/changelogs/2.txt @@ -1,4 +1,4 @@ -• Ruhige Musik auf dem Startbildschirm, in den Einstellungen abschaltbar +• Eingebaute Musik, wenn das Jazzradio keine Verbindung hat, mit eigenem Stück für Partien und Aufgaben • Jazzradio ist standardmäßig aus und streamt nur über HTTPS • Der App-Start stoppt keine Musik in anderen Apps mehr • Screenreader nennen die Figuren bei der Bauernumwandlung diff --git a/fastlane/metadata/android/en-US/changelogs/2.txt b/fastlane/metadata/android/en-US/changelogs/2.txt index 7d7fcd3..8924cac 100644 --- a/fastlane/metadata/android/en-US/changelogs/2.txt +++ b/fastlane/metadata/android/en-US/changelogs/2.txt @@ -1,4 +1,4 @@ -• Calm music on the main screen, can be turned off in Settings +• Built-in music when the jazz radio has no connection, with its own track for games and puzzles • Jazz radio is off by default and streams over HTTPS only • Starting the app no longer stops music in other apps • Screen readers name the pieces in the promotion dialog diff --git a/fastlane/metadata/android/ja-JP/changelogs/2.txt b/fastlane/metadata/android/ja-JP/changelogs/2.txt index fd7306e..9110df4 100644 --- a/fastlane/metadata/android/ja-JP/changelogs/2.txt +++ b/fastlane/metadata/android/ja-JP/changelogs/2.txt @@ -1,4 +1,4 @@ -• ホーム画面で穏やかな音楽(設定でオフ可能) +• ジャズラジオに接続できないときは内蔵の音楽を再生。対局とパズルには専用の曲 • ジャズラジオは初期状態でオフ、HTTPS のみで配信 • 起動時に他のアプリの音楽を止めなくなりました • スクリーンリーダーが昇格画面の駒を読み上げます diff --git a/fastlane/metadata/android/lt/changelogs/2.txt b/fastlane/metadata/android/lt/changelogs/2.txt index b1e696a..e53b90a 100644 --- a/fastlane/metadata/android/lt/changelogs/2.txt +++ b/fastlane/metadata/android/lt/changelogs/2.txt @@ -1,4 +1,4 @@ -• Rami muzika pagrindiniame ekrane, išjungiama nustatymuose +• Įdiegta muzika, kai džiazo radijas neturi ryšio, su atskiru kūriniu partijoms ir uždaviniams • Džiazo radijas pagal numatymą išjungtas ir veikia tik per HTTPS • Paleidus programėlę, kitų programėlių muzika nebesustoja • Ekrano skaitytuvai įvardija figuras virstant pėstininkui diff --git a/fastlane/metadata/android/ru-RU/changelogs/2.txt b/fastlane/metadata/android/ru-RU/changelogs/2.txt index 940fba0..b92a724 100644 --- a/fastlane/metadata/android/ru-RU/changelogs/2.txt +++ b/fastlane/metadata/android/ru-RU/changelogs/2.txt @@ -1,4 +1,4 @@ -• Спокойная музыка на главном экране, отключается в настройках +• Встроенная музыка, когда у джаз-радио нет связи, со своим треком для партий и задач • Джаз-радио выключено по умолчанию и работает только по HTTPS • Запуск приложения больше не останавливает музыку в других приложениях • Экранные дикторы называют фигуры при превращении пешки diff --git a/fastlane/metadata/android/zh-CN/changelogs/2.txt b/fastlane/metadata/android/zh-CN/changelogs/2.txt index 73bedf7..8a60b3a 100644 --- a/fastlane/metadata/android/zh-CN/changelogs/2.txt +++ b/fastlane/metadata/android/zh-CN/changelogs/2.txt @@ -1,4 +1,4 @@ -• 主屏幕新增舒缓音乐,可在设置中关闭 +• 爵士电台无法连接时播放内置音乐,对局和谜题有专属曲目 • 爵士电台默认关闭,且仅通过 HTTPS 播放 • 启动应用时不再中断其他应用的音乐 • 屏幕阅读器会读出兵升变时的棋子名称