ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Reorder options in main menu

This commit is contained in:
Connor McLaughlin 2021-02-27 14:30:32 +10:00
parent e53ec0cc73
commit d0ace6ed5a
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/src/main/java/com/github/stenzek/duckstation/MainActivity.java
View File

@ -205,9 +205,7 @@ public class MainActivity extends AppCompatActivity {
int id = item.getItemId(); int id = item.getItemId();
//noinspection SimplifiableIfStatement //noinspection SimplifiableIfStatement
if (id == R.id.action_resume) { if (id == R.id.action_start_bios) {
startEmulation(null, true);
} else if (id == R.id.action_start_bios) {
startEmulation(null, false); startEmulation(null, false);
} else if (id == R.id.action_start_file) { } else if (id == R.id.action_start_file) {
startStartFile(); startStartFile();

36
android/app/src/main/res/menu/menu_main.xml
View File

@ -3,9 +3,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:context="com.github.stenzek.duckstation.MainActivity"> tools:context="com.github.stenzek.duckstation.MainActivity">
<group android:id="@+id/start_menu"> <group android:id="@+id/start_menu">
<item
android:id="@+id/action_resume"
android:title="@string/menu_main_resume_last_session" />
<item <item
android:id="@+id/action_start_file" android:id="@+id/action_start_file"
android:title="@string/menu_main_start_file" /> android:title="@string/menu_main_start_file" />
@ -13,19 +10,33 @@
android:id="@+id/action_start_bios" android:id="@+id/action_start_bios"
android:title="@string/menu_main_start_bios" /> android:title="@string/menu_main_start_bios" />
</group> </group>
<group android:id="@+id/game_list"> <group android:id="@+id/settings">
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_baseline_settings_24"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_controller_mapping"
android:icon="@drawable/ic_baseline_gamepad_24"
android:title="@string/action_controller_mapping" />
<item <item
android:id="@+id/action_edit_game_directories" android:id="@+id/action_edit_game_directories"
android:title="@string/menu_main_edit_game_directories" /> android:title="@string/menu_main_edit_game_directories" />
<item
android:id="@+id/action_import_bios"
android:title="@string/menu_main_import_bios" />
</group>
<group android:id="@+id/game_list">
<item <item
android:id="@+id/action_scan_for_new_games" android:id="@+id/action_scan_for_new_games"
android:title="@string/menu_main_scan_for_new_games" /> android:title="@string/menu_main_scan_for_new_games" />
<item <item
android:id="@+id/action_rescan_all_games" android:id="@+id/action_rescan_all_games"
android:title="@string/menu_main_rescan_all_games" /> android:title="@string/menu_main_rescan_all_games" />
<item </group>
android:id="@+id/action_import_bios" <group android:id="@+id/support">
android:title="@string/menu_main_import_bios" />
<item <item
android:id="@+id/action_show_version" android:id="@+id/action_show_version"
android:title="@string/menu_main_show_version" /> android:title="@string/menu_main_show_version" />
@ -36,15 +47,4 @@
android:id="@+id/action_discord_server" android:id="@+id/action_discord_server"
android:title="@string/menu_main_discord_server" /> android:title="@string/menu_main_discord_server" />
</group> </group>
<item
android:id="@+id/action_controller_mapping"
android:icon="@drawable/ic_baseline_gamepad_24"
android:orderInCategory="100"
android:title="@string/action_controller_mapping" />
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_baseline_settings_24"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="ifRoom" />
</menu> </menu>