Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge pull request #7292 from mahdihijazi/settings_refactor
Android: Settings refactor & Fix custom game settings
- Loading branch information
Showing
44 changed files
with
1,711 additions
and
1,536 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...hinemu/model/settings/BooleanSetting.java → ...atures/settings/model/BooleanSetting.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...lphinemu/model/settings/FloatSetting.java → ...features/settings/model/FloatSetting.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
...dolphinemu/model/settings/IntSetting.java → ...u/features/settings/model/IntSetting.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
179 changes: 179 additions & 0 deletions
179
...Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| package org.dolphinemu.dolphinemu.features.settings.model; | ||
|
|
||
| import android.text.TextUtils; | ||
|
|
||
| import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivityView; | ||
| import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.TreeMap; | ||
|
|
||
| public class Settings | ||
| { | ||
| public static final String SECTION_INI_CORE = "Core"; | ||
| public static final String SECTION_INI_INTERFACE = "Interface"; | ||
|
|
||
| public static final String SECTION_GFX_SETTINGS = "Settings"; | ||
| public static final String SECTION_GFX_ENHANCEMENTS = "Enhancements"; | ||
| public static final String SECTION_GFX_HACKS = "Hacks"; | ||
|
|
||
| public static final String SECTION_STEREOSCOPY = "Stereoscopy"; | ||
|
|
||
| public static final String SECTION_WIIMOTE = "Wiimote"; | ||
|
|
||
| public static final String SECTION_BINDINGS = "Android"; | ||
|
|
||
| private String gameId; | ||
|
|
||
| private static final Map<String, List<String>> configFileSectionsMap = new HashMap<>(); | ||
|
|
||
| static | ||
| { | ||
| configFileSectionsMap.put(SettingsFile.FILE_NAME_DOLPHIN, Arrays.asList(SECTION_INI_CORE, SECTION_INI_INTERFACE, SECTION_BINDINGS)); | ||
| configFileSectionsMap.put(SettingsFile.FILE_NAME_GFX, Arrays.asList(SECTION_GFX_SETTINGS, SECTION_GFX_ENHANCEMENTS, SECTION_GFX_HACKS, SECTION_STEREOSCOPY)); | ||
| configFileSectionsMap.put(SettingsFile.FILE_NAME_WIIMOTE, Arrays.asList(SECTION_WIIMOTE + 1, SECTION_WIIMOTE + 2, SECTION_WIIMOTE + 3, SECTION_WIIMOTE + 4)); | ||
| } | ||
|
|
||
| /** | ||
| * A HashMap<String, SettingSection> that constructs a new SettingSection instead of returning null | ||
| * when getting a key not already in the map | ||
| */ | ||
| public static final class SettingsSectionMap extends HashMap<String, SettingSection> | ||
| { | ||
| @Override | ||
| public SettingSection get(Object key) | ||
| { | ||
| if (!(key instanceof String)) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| String stringKey = (String) key; | ||
|
|
||
| if (!super.containsKey(stringKey)) | ||
| { | ||
| SettingSection section = new SettingSection(stringKey); | ||
| super.put(stringKey, section); | ||
| return section; | ||
| } | ||
| return super.get(key); | ||
| } | ||
| } | ||
|
|
||
| private HashMap<String, SettingSection> sections = new Settings.SettingsSectionMap(); | ||
|
|
||
| public SettingSection getSection(String sectionName) | ||
| { | ||
| return sections.get(sectionName); | ||
| } | ||
|
|
||
| public boolean isEmpty() | ||
| { | ||
| return sections.isEmpty(); | ||
| } | ||
|
|
||
| public HashMap<String, SettingSection> getSections() | ||
| { | ||
| return sections; | ||
| } | ||
|
|
||
| public void loadSettings(SettingsActivityView view) | ||
| { | ||
| sections = new Settings.SettingsSectionMap(); | ||
|
|
||
| HashSet<String> filesToExclude = new HashSet<>(); | ||
| if (!TextUtils.isEmpty(gameId)) | ||
| { | ||
| // for per-game settings, don't load the WiiMoteNew.ini settings | ||
| filesToExclude.add(SettingsFile.FILE_NAME_WIIMOTE); | ||
| } | ||
|
|
||
| loadDolphinSettings(view, filesToExclude); | ||
|
|
||
| if (!TextUtils.isEmpty(gameId)) | ||
| { | ||
| loadGenericGameSettings(gameId, view); | ||
| loadCustomGameSettings(gameId, view); | ||
| } | ||
| } | ||
|
|
||
| private void loadDolphinSettings(SettingsActivityView view, HashSet<String> filesToExclude) | ||
| { | ||
| for (Map.Entry<String, List<String>> entry : configFileSectionsMap.entrySet()) | ||
| { | ||
| String fileName = entry.getKey(); | ||
| if(filesToExclude == null || !filesToExclude.contains(fileName)) | ||
| { | ||
| sections.putAll(SettingsFile.readFile(fileName, view)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void loadGenericGameSettings(String gameId, SettingsActivityView view) | ||
| { | ||
| // generic game settings | ||
| mergeSections(SettingsFile.readGenericGameSettings(gameId, view)); | ||
| mergeSections(SettingsFile.readGenericGameSettingsForAllRegions(gameId, view)); | ||
| } | ||
|
|
||
| private void loadCustomGameSettings(String gameId, SettingsActivityView view) | ||
| { | ||
| // custom game settings | ||
| mergeSections(SettingsFile.readCustomGameSettings(gameId, view)); | ||
| } | ||
|
|
||
| private void mergeSections(HashMap<String, SettingSection> updatedSections) | ||
| { | ||
| for (Map.Entry<String, SettingSection> entry : updatedSections.entrySet()) | ||
| { | ||
| if (sections.containsKey(entry.getKey())) | ||
| { | ||
| SettingSection originalSection = sections.get(entry.getKey()); | ||
| SettingSection updatedSection = entry.getValue(); | ||
| originalSection.mergeSection(updatedSection); | ||
| } | ||
| else | ||
| { | ||
| sections.put(entry.getKey(), entry.getValue()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public void loadSettings(String gameId, SettingsActivityView view) | ||
| { | ||
| this.gameId = gameId; | ||
| loadSettings(view); | ||
| } | ||
|
|
||
| public void saveSettings(SettingsActivityView view) | ||
| { | ||
| if (TextUtils.isEmpty(gameId)) | ||
| { | ||
| view.showToastMessage("Saved settings to INI files"); | ||
|
|
||
| for (Map.Entry<String, List<String>> entry : configFileSectionsMap.entrySet()) | ||
| { | ||
| String fileName = entry.getKey(); | ||
| List<String> sectionNames = entry.getValue(); | ||
| TreeMap<String, SettingSection> iniSections = new TreeMap<>(); | ||
| for (String section : sectionNames) | ||
| { | ||
| iniSections.put(section, sections.get(section)); | ||
| } | ||
|
|
||
| SettingsFile.saveFile(fileName, iniSections, view); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| // custom game settings | ||
| view.showToastMessage("Saved settings for " + gameId); | ||
| SettingsFile.saveCustomGameSettings(gameId, sections); | ||
| } | ||
|
|
||
| } | ||
| } |
6 changes: 3 additions & 3 deletions
6
...phinemu/model/settings/StringSetting.java → ...eatures/settings/model/StringSetting.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.