CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 02:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Android] Make CoreSelection and HistorySelection statically instantiable.

Browse Source 
Allows showing the dialogs without the need for an actual variable or ugly "new HistorySelection(fm, tag).show();" syntax.

Also moved the else if for "Quit Retroarch" to the bottom of the if statements so its structured relative to the UI.
This commit is contained in:
Lioncash 2013-11-25 09:55:46 -05:00
parent 97cec15dcd
commit 95539090ec
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/phoenix/src/com/retroarch/browser/CoreSelection.java
View File

@ -27,6 +27,16 @@ public final class CoreSelection extends DialogFragment
{
private IconAdapter<ModuleWrapper> adapter;
/**
* Creates a statically instantiated instance of CoreSelection.
*
* @return a statically instantiated instance of CoreSelection.
*/
public static CoreSelection newInstance()
{
return new CoreSelection();
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{

10
android/phoenix/src/com/retroarch/browser/HistorySelection.java
View File

@ -33,6 +33,16 @@ public final class HistorySelection extends DialogFragment
private FragmentActivity ctx;
private IconAdapter<HistoryWrapper> adapter;
/**
* Creates a statically instantiated instance of HistorySelection.
*
* @return a statically instantiated instance of HistorySelection.
*/
public static HistorySelection newInstance()
{
return new HistorySelection();
}
@Override
public void onCreate(Bundle savedInstanceState)
{

18
android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java
View File

@ -347,14 +347,7 @@ public final class MainMenuFragment extends PreferenceListFragment implements On
// Load Core Preference
else if (prefKey.equals("loadCorePref"))
{
final CoreSelection coreSelection = new CoreSelection();
coreSelection.show(getFragmentManager(), "core_selection");
}
// Quit RetroArch preference
else if (prefKey.equals("quitRetroArch"))
{
// TODO - needs to close entire app gracefully - including
// NativeActivity if possible
CoreSelection.newInstance().show(getFragmentManager(), "core_selection");
}
// Load ROM Preference
else if (prefKey.equals("loadRomPref"))
@ -382,8 +375,13 @@ public final class MainMenuFragment extends PreferenceListFragment implements On
// Load ROM (History) Preference
else if (prefKey.equals("loadRomHistoryPref"))
{
final HistorySelection historySelection = new HistorySelection();
historySelection.show(getFragmentManager(), "history_selection");
HistorySelection.newInstance().show(getFragmentManager(), "history_selection");
}
// Quit RetroArch preference
else if (prefKey.equals("quitRetroArch"))
{
// TODO - needs to close entire app gracefully - including
// NativeActivity if possible
}
return true;