From 041af9b7382ad64672f6b68f2db4d7c2b2816626 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Fri, 5 Feb 2021 18:51:45 +0800 Subject: [PATCH] [Mobile] update volume selection --- .../forge/screens/settings/SettingsPage.java | 43 ++++++------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java index a5280d129c8..50c56f3e00d 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java @@ -438,39 +438,22 @@ public class SettingsPage extends TabPage { localizer.getMessage("nlVibrateAfterLongPress")), 6); //Sound Options - if(GuiBase.getInterface().isLibgdxPort()) { - lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_SOUNDS, + lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_SOUNDS, localizer.getMessage("cbAdjustSoundsVolume"), localizer.getMessage("nlAdjustSoundsVolume"), - new String[]{"0", "25", "50", "75", "100"}), + new String[]{"0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"}), 7); - lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_MUSIC, - localizer.getMessage("cbAdjustMusicVolume"), - localizer.getMessage("nlAdjustMusicVolume"), - new String[]{"0", "25", "50", "75", "100"}) { - @Override - public void valueChanged(String newValue) { - super.valueChanged(newValue); - //update background music when this setting changes - SoundSystem.instance.changeBackgroundTrack(); - } - }, 7); - } else { - lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_SOUNDS, - localizer.getMessage("cbEnableSounds"), - localizer.getMessage("nlEnableSounds")), - 7); - lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_MUSIC, - localizer.getMessage("cbEnableMusic"), - localizer.getMessage("nlEnableMusic")) { - @Override - public void select() { - super.select(); - //update background music when this setting changes - SoundSystem.instance.changeBackgroundTrack(); - } - },7); - } + lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_MUSIC, + localizer.getMessage("cbAdjustMusicVolume"), + localizer.getMessage("nlAdjustMusicVolume"), + new String[]{"0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"}) { + @Override + public void valueChanged(String newValue) { + super.valueChanged(newValue); + //update background music when this setting changes + SoundSystem.instance.changeBackgroundTrack(); + } + }, 7); /*lstSettings.addItem(new BooleanSetting(FPref.UI_ALT_SOUND_SYSTEM, "Use Alternate Sound System", "Use the alternate sound system (only use if you have issues with sound not playing or disappearing)."),