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 9bb3be3878..7ca2ae0c9e 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 @@ -99,7 +99,7 @@ public final class EmulationActivity extends AppCompatActivity MENU_ACTION_LOAD_SLOT6, MENU_ACTION_EXIT, MENU_ACTION_CHANGE_DISC, MENU_ACTION_RESET_OVERLAY, MENU_SET_IR_SENSITIVITY, MENU_ACTION_CHOOSE_DOUBLETAP, MENU_ACTION_MOTION_CONTROLS, MENU_ACTION_PAUSE_EMULATION, MENU_ACTION_UNPAUSE_EMULATION, - MENU_ACTION_OVERLAY_CONTROLS, MENU_ACTION_SETTINGS_CORE, MENU_ACTION_SETTINGS_GRAPHICS}) + MENU_ACTION_OVERLAY_CONTROLS, MENU_ACTION_SETTINGS}) public @interface MenuAction { } @@ -137,8 +137,7 @@ public final class EmulationActivity extends AppCompatActivity public static final int MENU_ACTION_PAUSE_EMULATION = 30; public static final int MENU_ACTION_UNPAUSE_EMULATION = 31; public static final int MENU_ACTION_OVERLAY_CONTROLS = 32; - public static final int MENU_ACTION_SETTINGS_CORE = 33; - public static final int MENU_ACTION_SETTINGS_GRAPHICS = 34; + public static final int MENU_ACTION_SETTINGS = 33; private static final SparseIntArray buttonsActionsMap = new SparseIntArray(); @@ -656,12 +655,8 @@ public final class EmulationActivity extends AppCompatActivity showMotionControlsOptions(); break; - case MENU_ACTION_SETTINGS_CORE: - SettingsActivity.launch(this, MenuTag.CONFIG); - break; - - case MENU_ACTION_SETTINGS_GRAPHICS: - SettingsActivity.launch(this, MenuTag.GRAPHICS); + case MENU_ACTION_SETTINGS: + SettingsActivity.launch(this, MenuTag.SETTINGS); break; case MENU_ACTION_EXIT: diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java index 8422f2903b..721cd52a6a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java @@ -4,6 +4,7 @@ import androidx.annotation.NonNull; public enum MenuTag { + SETTINGS("settings"), CONFIG("config"), CONFIG_GENERAL("config_general"), CONFIG_INTERFACE("config_interface"), diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java index 155cf1bfac..405040f391 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java @@ -35,7 +35,8 @@ public final class SettingsFragment extends Fragment implements SettingsFragment static { - titles.put(MenuTag.CONFIG, R.string.preferences_settings); + titles.put(MenuTag.SETTINGS, R.string.preferences_settings); + titles.put(MenuTag.CONFIG, R.string.config); titles.put(MenuTag.CONFIG_GENERAL, R.string.general_submenu); titles.put(MenuTag.CONFIG_INTERFACE, R.string.interface_submenu); titles.put(MenuTag.CONFIG_AUDIO, R.string.audio_submenu); @@ -43,10 +44,10 @@ public final class SettingsFragment extends Fragment implements SettingsFragment titles.put(MenuTag.CONFIG_GAME_CUBE, R.string.gamecube_submenu); titles.put(MenuTag.CONFIG_WII, R.string.wii_submenu); titles.put(MenuTag.CONFIG_ADVANCED, R.string.advanced_submenu); - titles.put(MenuTag.WIIMOTE, R.string.grid_menu_wiimote_settings); + titles.put(MenuTag.WIIMOTE, R.string.wiimote_settings); titles.put(MenuTag.WIIMOTE_EXTENSION, R.string.wiimote_extensions); - titles.put(MenuTag.GCPAD_TYPE, R.string.grid_menu_gcpad_settings); - titles.put(MenuTag.GRAPHICS, R.string.grid_menu_graphics_settings); + titles.put(MenuTag.GCPAD_TYPE, R.string.gcpad_settings); + titles.put(MenuTag.GRAPHICS, R.string.graphics_settings); titles.put(MenuTag.HACKS, R.string.hacks_submenu); titles.put(MenuTag.CONFIG_LOG, R.string.log_submenu); titles.put(MenuTag.DEBUG, R.string.debug_submenu); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index 8f50dac6e1..622e552f63 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -122,6 +122,10 @@ public final class SettingsFragmentPresenter switch (mMenuTag) { + case SETTINGS: + addTopLevelSettings(sl); + break; + case CONFIG: addConfigSettings(sl); break; @@ -216,6 +220,20 @@ public final class SettingsFragmentPresenter mView.showSettingsList(mSettingsList); } + private void addTopLevelSettings(ArrayList sl) + { + sl.add(new SubmenuSetting(R.string.config, MenuTag.CONFIG)); + sl.add(new SubmenuSetting(R.string.graphics_settings, MenuTag.GRAPHICS)); + + if (!NativeLibrary.IsRunning()) + { + sl.add(new SubmenuSetting(R.string.gcpad_settings, MenuTag.GCPAD_TYPE)); + sl.add(new SubmenuSetting(R.string.wiimote_settings, MenuTag.WIIMOTE)); + } + + sl.add(new HeaderSetting(R.string.setting_clear_info, 0)); + } + private void addConfigSettings(ArrayList sl) { sl.add(new SubmenuSetting(R.string.general_submenu, MenuTag.CONFIG_GENERAL)); @@ -227,7 +245,6 @@ public final class SettingsFragmentPresenter sl.add(new SubmenuSetting(R.string.advanced_submenu, MenuTag.CONFIG_ADVANCED)); sl.add(new SubmenuSetting(R.string.log_submenu, MenuTag.CONFIG_LOG)); sl.add(new SubmenuSetting(R.string.debug_submenu, MenuTag.DEBUG)); - sl.add(new HeaderSetting(R.string.setting_clear_info, 0)); } private void addGeneralSettings(ArrayList sl) @@ -513,7 +530,6 @@ public final class SettingsFragmentPresenter sl.add(new HeaderSetting(R.string.graphics_enhancements_and_hacks, 0)); sl.add(new SubmenuSetting(R.string.enhancements_submenu, MenuTag.ENHANCEMENTS)); sl.add(new SubmenuSetting(R.string.hacks_submenu, MenuTag.HACKS)); - sl.add(new HeaderSetting(R.string.setting_clear_info, 0)); } private void addEnhanceSettings(ArrayList sl) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java index 90b3ee7d2d..555b20097d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java @@ -48,9 +48,7 @@ public final class MenuFragment extends Fragment implements View.OnClickListener .append(R.id.menu_refresh_wiimotes, EmulationActivity.MENU_ACTION_REFRESH_WIIMOTES); buttonsActionsMap.append(R.id.menu_change_disc, EmulationActivity.MENU_ACTION_CHANGE_DISC); buttonsActionsMap.append(R.id.menu_exit, EmulationActivity.MENU_ACTION_EXIT); - buttonsActionsMap.append(R.id.menu_settings_core, EmulationActivity.MENU_ACTION_SETTINGS_CORE); - buttonsActionsMap.append(R.id.menu_settings_graphics, - EmulationActivity.MENU_ACTION_SETTINGS_GRAPHICS); + buttonsActionsMap.append(R.id.menu_settings, EmulationActivity.MENU_ACTION_SETTINGS); } public static MenuFragment newInstance() 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 75f2002ba3..8db0ee44a1 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 @@ -71,20 +71,8 @@ public final class MainPresenter { switch (itemId) { - case R.id.menu_settings_core: - mView.launchSettingsActivity(MenuTag.CONFIG); - return true; - - case R.id.menu_settings_graphics: - mView.launchSettingsActivity(MenuTag.GRAPHICS); - return true; - - case R.id.menu_settings_gcpad: - mView.launchSettingsActivity(MenuTag.GCPAD_TYPE); - return true; - - case R.id.menu_settings_wiimote: - mView.launchSettingsActivity(MenuTag.WIIMOTE); + case R.id.menu_settings: + mView.launchSettingsActivity(MenuTag.SETTINGS); return true; case R.id.menu_refresh: 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 23d1050d04..c7bc923461 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 @@ -313,21 +313,9 @@ public final class TvMainActivity extends FragmentActivity implements MainView { ArrayObjectAdapter rowItems = new ArrayObjectAdapter(new SettingsRowPresenter()); - rowItems.add(new TvSettingsItem(R.id.menu_settings_core, - R.drawable.ic_settings_core_tv, - R.string.grid_menu_config)); - - rowItems.add(new TvSettingsItem(R.id.menu_settings_graphics, - R.drawable.ic_settings_graphics_tv, - R.string.grid_menu_graphics_settings)); - - rowItems.add(new TvSettingsItem(R.id.menu_settings_gcpad, - R.drawable.ic_settings_gcpad, - R.string.grid_menu_gcpad_settings)); - - rowItems.add(new TvSettingsItem(R.id.menu_settings_wiimote, - R.drawable.ic_settings_wiimote, - R.string.grid_menu_wiimote_settings)); + rowItems.add(new TvSettingsItem(R.id.menu_settings, + R.drawable.ic_settings_tv, + R.string.grid_menu_settings)); rowItems.add(new TvSettingsItem(R.id.button_add_directory, R.drawable.ic_add_tv, diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png new file mode 100644 index 0000000000..9059e0021a Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png differ diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_core.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_core.png deleted file mode 100644 index adc2323818..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_core.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_gcpad.png deleted file mode 100644 index 524a8c570a..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_gcpad.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_graphics.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_graphics.png deleted file mode 100644 index a0a50b4fcb..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_graphics.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png deleted file mode 100644 index 24a581832a..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_gcpad.png deleted file mode 100644 index c41d686607..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_gcpad.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png deleted file mode 100644 index 545d95b68e..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png new file mode 100644 index 0000000000..307389f320 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_core.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_core.png deleted file mode 100644 index 6d00c290ad..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_core.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_gcpad.png deleted file mode 100644 index 81280d05b1..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_gcpad.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_graphics.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_graphics.png deleted file mode 100644 index 8d8bae42a4..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_graphics.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_wiimote.png deleted file mode 100644 index 98a49734d7..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_wiimote.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png new file mode 100644 index 0000000000..45d855b496 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_core.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_core.png deleted file mode 100644 index 9d571a14f3..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_core.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_gcpad.png deleted file mode 100644 index 1063b3d0ee..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_gcpad.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_graphics.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_graphics.png deleted file mode 100644 index 5edb430018..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_graphics.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png deleted file mode 100644 index 32e7995e37..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png new file mode 100644 index 0000000000..46180dd6f3 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png differ diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png deleted file mode 100644 index 361bc89afd..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_gcpad.png deleted file mode 100644 index cb8e91181d..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_gcpad.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_graphics.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_graphics.png deleted file mode 100644 index d99de55020..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_graphics.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png deleted file mode 100644 index fc8be98566..0000000000 Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_core_tv.png b/Source/Android/app/src/main/res/drawable/ic_settings_core_tv.png deleted file mode 100644 index 361bc89afd..0000000000 Binary files a/Source/Android/app/src/main/res/drawable/ic_settings_core_tv.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable/ic_settings_gcpad.png deleted file mode 100644 index cb8e91181d..0000000000 Binary files a/Source/Android/app/src/main/res/drawable/ic_settings_gcpad.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_graphics_tv.png b/Source/Android/app/src/main/res/drawable/ic_settings_graphics_tv.png deleted file mode 100644 index d99de55020..0000000000 Binary files a/Source/Android/app/src/main/res/drawable/ic_settings_graphics_tv.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_tv.png b/Source/Android/app/src/main/res/drawable/ic_settings_tv.png new file mode 100644 index 0000000000..46180dd6f3 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable/ic_settings_tv.png differ diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png deleted file mode 100644 index fc8be98566..0000000000 Binary files a/Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png and /dev/null differ diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml index 8beb206850..b24e9a1b33 100644 --- a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml +++ b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml @@ -31,16 +31,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> -