summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorMike Harris <atarimike@gmail.com>2017-09-26 20:39:51 -0700
committerMike Harris <atarimike@gmail.com>2017-10-03 17:51:08 -0700
commitbdeee34eac64f57587c7da6aee0dcda38eb7846c (patch)
tree900416c61e451c5d9ab17520012bdb61428019d2 /Source/Android/app/src/main/java
parentd790660b598a4d9b5d9a2dadd1a375beb83a8788 (diff)
Move newInstance and launch to the top of the file.
Following the style guide, constructors go before public methods. newInstance and launch are basically constructors.
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java32
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java16
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java21
3 files changed, 33 insertions, 36 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 56e2226325..b1e53ebb6a 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
@@ -156,8 +156,23 @@ public final class EmulationActivity extends AppCompatActivity
buttonsActionsMap.append(R.id.menu_emulation_load_4, EmulationActivity.MENU_ACTION_LOAD_SLOT4);
buttonsActionsMap.append(R.id.menu_emulation_load_5, EmulationActivity.MENU_ACTION_LOAD_SLOT5);
buttonsActionsMap.append(R.id.menu_exit, EmulationActivity.MENU_ACTION_EXIT);
+ }
+
+ public static void launch(Activity activity, String path, String title, String screenshotPath, int position, View sharedView)
+ {
+ Intent launcher = new Intent(activity, EmulationActivity.class);
+
+ launcher.putExtra("SelectedGame", path);
+ launcher.putExtra("SelectedTitle", title);
+ launcher.putExtra("ScreenPath", screenshotPath);
+ launcher.putExtra("GridPosition", position);
+ ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(
+ activity,
+ sharedView,
+ "image_game_screenshot");
+ activity.startActivityForResult(launcher, MainPresenter.REQUEST_EMULATE_GAME, options.toBundle());
}
@Override
@@ -941,21 +956,4 @@ public final class EmulationActivity extends AppCompatActivity
{
return mIsGameCubeGame;
}
-
- public static void launch(Activity activity, String path, String title, String screenshotPath, int position, View sharedView)
- {
- Intent launcher = new Intent(activity, EmulationActivity.class);
-
- launcher.putExtra("SelectedGame", path);
- launcher.putExtra("SelectedTitle", title);
- launcher.putExtra("ScreenPath", screenshotPath);
- launcher.putExtra("GridPosition", position);
-
- ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(
- activity,
- sharedView,
- "image_game_screenshot");
-
- activity.startActivityForResult(launcher, MainPresenter.REQUEST_EMULATE_GAME, options.toBundle());
- }
}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
index c5b12165ff..7c30cd54f1 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
@@ -22,6 +22,13 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
private static final String FRAGMENT_TAG = "settings";
private SettingsActivityPresenter mPresenter = new SettingsActivityPresenter(this);
+ public static void launch(Context context, String menuTag)
+ {
+ Intent settings = new Intent(context, SettingsActivity.class);
+ settings.putExtra(ARG_FILE_NAME, menuTag);
+ context.startActivity(settings);
+ }
+
@Override
protected void onCreate(Bundle savedInstanceState)
{
@@ -173,13 +180,4 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
{
return (SettingsFragment) getFragmentManager().findFragmentByTag(FRAGMENT_TAG);
}
-
- public static void launch(Context context, String menuTag)
- {
- Intent settings = new Intent(context, SettingsActivity.class);
-
- settings.putExtra(ARG_FILE_NAME, menuTag);
-
- context.startActivity(settings);
- }
}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java
index 19433dc2a5..dd752c6664 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java
@@ -30,6 +30,17 @@ public final class SettingsFragment extends Fragment implements SettingsFragment
private SettingsAdapter mAdapter;
+ public static Fragment newInstance(String menuTag)
+ {
+ SettingsFragment fragment = new SettingsFragment();
+
+ Bundle arguments = new Bundle();
+ arguments.putString(ARGUMENT_MENU_TAG, menuTag);
+
+ fragment.setArguments(arguments);
+ return fragment;
+ }
+
@Override
public void onAttach(Context context)
{
@@ -175,14 +186,4 @@ public final class SettingsFragment extends Fragment implements SettingsFragment
mActivity.onExtensionSettingChanged(key, value);
}
- public static Fragment newInstance(String menuTag)
- {
- SettingsFragment fragment = new SettingsFragment();
-
- Bundle arguments = new Bundle();
- arguments.putString(ARGUMENT_MENU_TAG, menuTag);
-
- fragment.setArguments(arguments);
- return fragment;
- }
}