diff options
Diffstat (limited to 'Source/Android/app/src/main/java')
6 files changed, 10 insertions, 75 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 9356b7d4d4..a49db4197f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -195,7 +195,7 @@ public final class EmulationActivity extends AppCompatActivity launcher.putExtra(EXTRA_SELECTED_TITLE, gameFile.getTitle()); launcher.putExtra(EXTRA_SELECTED_GAMEID, gameFile.getGameId()); launcher.putExtra(EXTRA_PLATFORM, gameFile.getPlatform()); - activity.startActivityForResult(launcher, MainPresenter.REQUEST_EMULATE_GAME); + activity.startActivity(launcher); } @Override @@ -939,13 +939,15 @@ public final class EmulationActivity extends AppCompatActivity builder.setView(view); builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> { - SettingsFile.saveSingleCustomSetting(mSelectedGameId, Settings.SECTION_CONTROLS, + NativeLibrary.LoadGameIniFile(mSelectedGameId); + NativeLibrary.SetUserSetting(mSelectedGameId, Settings.SECTION_CONTROLS, SettingsFile.KEY_WIIBIND_IR_PITCH, text_slider_value_pitch.getText().toString()); - SettingsFile.saveSingleCustomSetting(mSelectedGameId, Settings.SECTION_CONTROLS, + NativeLibrary.SetUserSetting(mSelectedGameId, Settings.SECTION_CONTROLS, SettingsFile.KEY_WIIBIND_IR_YAW, text_slider_value_yaw.getText().toString()); - SettingsFile.saveSingleCustomSetting(mSelectedGameId, Settings.SECTION_CONTROLS, + NativeLibrary.SetUserSetting(mSelectedGameId, Settings.SECTION_CONTROLS, SettingsFile.KEY_WIIBIND_IR_VERTICAL_OFFSET, text_slider_value_vertical_offset.getText().toString()); + NativeLibrary.SaveGameIniFile(mSelectedGameId); NativeLibrary.ReloadWiimoteConfig(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java index ff24a7a6d3..7ba9bcfd38 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java @@ -452,11 +452,10 @@ public final class SettingsFile final HashMap<String, SettingSection> sections) { Set<String> sortedSections = new TreeSet<>(sections.keySet()); - + NativeLibrary.LoadGameIniFile(gameId); for (String sectionKey : sortedSections) { SettingSection section = sections.get(sectionKey); - HashMap<String, Setting> settings = section.getSettings(); Set<String> sortedKeySet = new TreeSet<>(settings.keySet()); @@ -465,10 +464,7 @@ public final class SettingsFile { continue; } - else - { - NativeLibrary.LoadGameIniFile(gameId); - } + for (String settingKey : sortedKeySet) { Setting setting = settings.get(settingKey); @@ -478,7 +474,6 @@ public final class SettingsFile String padId = setting.getKey() .substring(setting.getKey().length() - 1, setting.getKey().length()); - saveCustomWiimoteSetting(gameId, KEY_WIIMOTE_EXTENSION, setting.getValueAsString(), padId); } @@ -488,17 +483,7 @@ public final class SettingsFile setting.getKey(), setting.getValueAsString()); } } - NativeLibrary.SaveGameIniFile(gameId); } - } - - public static void saveSingleCustomSetting(final String gameId, final String section, - final String key, - final String value) - { - NativeLibrary.LoadGameIniFile(gameId); - NativeLibrary.SetUserSetting(gameId, section, - key, value); NativeLibrary.SaveGameIniFile(gameId); } @@ -510,12 +495,11 @@ public final class SettingsFile * @param value * @param padId */ - public static void saveCustomWiimoteSetting(final String gameId, final String key, + private static void saveCustomWiimoteSetting(final String gameId, final String key, final String value, final String padId) { String profile = gameId + "_Wii" + padId; - String wiiConfigPath = DirectoryInitialization.getUserDirectory() + "/Config/Profiles/Wiimote/" + profile + ".ini"; @@ -532,14 +516,11 @@ public final class SettingsFile "Android/" + (Integer.valueOf(padId) + 4) + "/Touchscreen"); } - NativeLibrary.SetProfileSetting(profile, Settings.SECTION_PROFILE, key, - value); + NativeLibrary.SetProfileSetting(profile, Settings.SECTION_PROFILE, key, value); // Enable the profile - NativeLibrary.LoadGameIniFile(gameId); NativeLibrary.SetUserSetting(gameId, Settings.SECTION_CONTROLS, KEY_WIIMOTE_PROFILE + (Integer.valueOf(padId) + 1), profile); - NativeLibrary.SaveGameIniFile(gameId); } private static String mapSectionNameFromIni(String generalSectionName) @@ -733,10 +714,4 @@ public final class SettingsFile { return "[" + section.getName() + "]"; } - - private static String customWiimoteExtSettingAsString(Setting setting) - { - return setting.getKey().substring(0, setting.getKey().length() - 1) + " = " + - setting.getValueAsString(); - } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java index f5eee1bc68..4aed5bf166 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java @@ -132,19 +132,6 @@ public final class MainActivity extends AppCompatActivity implements MainView } @Override - public void refreshFragmentScreenshot(int fragmentPosition) - { - // Invalidate Picasso image so that the new screenshot is animated in. - Platform platform = Platform.fromPosition(mViewPager.getCurrentItem()); - PlatformGamesView fragment = getPlatformGamesView(platform); - - if (fragment != null) - { - fragment.refreshScreenshotAtPosition(fragmentPosition); - } - } - - @Override public void launchSettingsActivity(MenuTag menuTag) { SettingsActivity.launch(this, menuTag, ""); @@ -173,10 +160,6 @@ public final class MainActivity extends AppCompatActivity implements MainView mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedDirectory(result)); } break; - - case MainPresenter.REQUEST_EMULATE_GAME: - mPresenter.refreshFragmentScreenshot(resultCode); - break; } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java index b68c8e1466..29afda89fe 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java @@ -15,7 +15,6 @@ import org.dolphinemu.dolphinemu.services.GameFileCacheService; public final class MainPresenter { public static final int REQUEST_ADD_DIRECTORY = 1; - public static final int REQUEST_EMULATE_GAME = 2; private final MainView mView; private final Context mContext; @@ -105,9 +104,4 @@ public final class MainPresenter { mDirToAdd = dir; } - - public void refreshFragmentScreenshot(int resultCode) - { - mView.refreshFragmentScreenshot(resultCode); - } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java index a24784f3a1..d9ef95cdf1 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java @@ -17,15 +17,6 @@ public interface MainView */ void setVersionString(String version); - /** - * Tell the view to tell the currently displayed {@link android.support.v4.app.Fragment} - * to refresh the screenshot at the given position in its list of games. - * - * @param fragmentPosition An index corresponding to the list or grid of games. - */ - void refreshFragmentScreenshot(int fragmentPosition); - - void launchSettingsActivity(MenuTag menuTag); void launchFileListActivity(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java index 1fc4db171f..0457de51e6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java @@ -132,12 +132,6 @@ public final class TvMainActivity extends FragmentActivity implements MainView } @Override - public void refreshFragmentScreenshot(int fragmentPosition) - { - mRowsAdapter.notifyArrayItemRangeChanged(0, mRowsAdapter.size()); - } - - @Override public void launchSettingsActivity(MenuTag menuTag) { SettingsActivity.launch(this, menuTag, ""); @@ -177,10 +171,6 @@ public final class TvMainActivity extends FragmentActivity implements MainView mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedDirectory(result)); } break; - - case MainPresenter.REQUEST_EMULATE_GAME: - mPresenter.refreshFragmentScreenshot(resultCode); - break; } } |