ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Save/LoadFragment's layout ID inline and private. 

Fix the hack of using the layout resource ID as a save/load ID, and
instead use a proper enum.
This commit is contained in:
Mike Harris 2017-09-25 23:02:54 -07:00
parent 96525cbaaa
commit ab90a3029d
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -72,6 +72,11 @@ public final class EmulationActivity extends AppCompatActivity
private static boolean mIsGameCubeGame; private static boolean mIsGameCubeGame;
private enum MenuType
{
SAVE, LOAD
}
/** /**
* Handlers are a way to pass a message to an Activity telling it to do something * Handlers are a way to pass a message to an Activity telling it to do something
* on the UI thread. This Handler responds to any message, even blank ones, by * on the UI thread. This Handler responds to any message, even blank ones, by
@ -522,14 +527,14 @@ public final class EmulationActivity extends AppCompatActivity
case MENU_ACTION_SAVE_ROOT: case MENU_ACTION_SAVE_ROOT:
if (!mDeviceHasTouchScreen) if (!mDeviceHasTouchScreen)
{ {
showMenu(SaveStateFragment.FRAGMENT_ID); showMenu(MenuType.SAVE);
} }
return; return;
case MENU_ACTION_LOAD_ROOT: case MENU_ACTION_LOAD_ROOT:
if (!mDeviceHasTouchScreen) if (!mDeviceHasTouchScreen)
{ {
showMenu(LoadStateFragment.FRAGMENT_ID); showMenu(MenuType.LOAD);
} }
return; return;
@ -862,18 +867,18 @@ public final class EmulationActivity extends AppCompatActivity
}); });
} }
private void showMenu(int menuId) private void showMenu(MenuType menuId)
{ {
Fragment fragment; Fragment fragment;
switch (menuId) switch (menuId)
{ {
case SaveStateFragment.FRAGMENT_ID: case SAVE:
fragment = SaveStateFragment.newInstance(); fragment = SaveStateFragment.newInstance();
mSubmenuFragmentTag = SaveStateFragment.FRAGMENT_TAG; mSubmenuFragmentTag = SaveStateFragment.FRAGMENT_TAG;
break; break;
case LoadStateFragment.FRAGMENT_ID: case LOAD:
fragment = LoadStateFragment.newInstance(); fragment = LoadStateFragment.newInstance();
mSubmenuFragmentTag = LoadStateFragment.FRAGMENT_TAG; mSubmenuFragmentTag = LoadStateFragment.FRAGMENT_TAG;
break; break;

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/LoadStateFragment.java
View File

@ -17,7 +17,6 @@ import org.dolphinemu.dolphinemu.activities.EmulationActivity;
public final class LoadStateFragment extends Fragment implements View.OnClickListener public final class LoadStateFragment extends Fragment implements View.OnClickListener
{ {
public static final String FRAGMENT_TAG = BuildConfig.APPLICATION_ID + ".load_state"; public static final String FRAGMENT_TAG = BuildConfig.APPLICATION_ID + ".load_state";
public static final int FRAGMENT_ID = R.layout.fragment_state_load;
private static SparseIntArray buttonsActionsMap = new SparseIntArray(); private static SparseIntArray buttonsActionsMap = new SparseIntArray();
static { static {
@ -42,7 +41,7 @@ public final class LoadStateFragment extends Fragment implements View.OnClickLis
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{ {
View rootView = inflater.inflate(FRAGMENT_ID, container, false); View rootView = inflater.inflate(R.layout.fragment_state_load, container, false);
GridLayout grid = (GridLayout) rootView.findViewById(R.id.grid_state_slots); GridLayout grid = (GridLayout) rootView.findViewById(R.id.grid_state_slots);
for (int childIndex = 0; childIndex < grid.getChildCount(); childIndex++) for (int childIndex = 0; childIndex < grid.getChildCount(); childIndex++)

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveStateFragment.java
View File

@ -17,7 +17,6 @@ import org.dolphinemu.dolphinemu.activities.EmulationActivity;
public final class SaveStateFragment extends Fragment implements View.OnClickListener public final class SaveStateFragment extends Fragment implements View.OnClickListener
{ {
public static final String FRAGMENT_TAG = BuildConfig.APPLICATION_ID + ".save_state"; public static final String FRAGMENT_TAG = BuildConfig.APPLICATION_ID + ".save_state";
public static final int FRAGMENT_ID = R.layout.fragment_state_save;
private static SparseIntArray buttonsActionsMap = new SparseIntArray(); private static SparseIntArray buttonsActionsMap = new SparseIntArray();
static { static {
@ -42,7 +41,7 @@ public final class SaveStateFragment extends Fragment implements View.OnClickLis
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{ {
View rootView = inflater.inflate(FRAGMENT_ID, container, false); View rootView = inflater.inflate(R.layout.fragment_state_save, container, false);
GridLayout grid = (GridLayout) rootView.findViewById(R.id.grid_state_slots); GridLayout grid = (GridLayout) rootView.findViewById(R.id.grid_state_slots);
for (int childIndex = 0; childIndex < grid.getChildCount(); childIndex++) for (int childIndex = 0; childIndex < grid.getChildCount(); childIndex++)