From 47e776d3789f7127fd2e80bc4988653a3ef001c2 Mon Sep 17 00:00:00 2001 From: weihuoya Date: Wed, 17 Apr 2019 20:15:56 +0800 Subject: [PATCH] rm unused code --- .../activities/EmulationActivity.java | 2 +- .../dolphinemu/ui/main/MainActivity.java | 17 ----------------- .../dolphinemu/ui/main/MainPresenter.java | 6 ------ .../dolphinemu/dolphinemu/ui/main/MainView.java | 9 --------- .../dolphinemu/ui/main/TvMainActivity.java | 10 ---------- 5 files changed, 1 insertion(+), 43 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 2ee9cbb9f5..81b090373e 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 @@ -195,7 +195,7 @@ public final class EmulationActivity extends AppCompatActivity launcher.putExtra(EXTRA_SELECTED_TITLE, gameFile.getTitle()); launcher.putExtra(EXTRA_SELECTED_GAMEID, gameFile.getGameId()); launcher.putExtra(EXTRA_PLATFORM, gameFile.getPlatform()); - activity.startActivityForResult(launcher, MainPresenter.REQUEST_EMULATE_GAME); + activity.startActivity(launcher); } @Override diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java index f5eee1bc68..4aed5bf166 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java @@ -131,19 +131,6 @@ public final class MainActivity extends AppCompatActivity implements MainView mToolbar.setSubtitle(version); } - @Override - public void refreshFragmentScreenshot(int fragmentPosition) - { - // Invalidate Picasso image so that the new screenshot is animated in. - Platform platform = Platform.fromPosition(mViewPager.getCurrentItem()); - PlatformGamesView fragment = getPlatformGamesView(platform); - - if (fragment != null) - { - fragment.refreshScreenshotAtPosition(fragmentPosition); - } - } - @Override public void launchSettingsActivity(MenuTag menuTag) { @@ -173,10 +160,6 @@ public final class MainActivity extends AppCompatActivity implements MainView mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedDirectory(result)); } break; - - case MainPresenter.REQUEST_EMULATE_GAME: - mPresenter.refreshFragmentScreenshot(resultCode); - break; } } 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 b68c8e1466..29afda89fe 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 @@ -15,7 +15,6 @@ import org.dolphinemu.dolphinemu.services.GameFileCacheService; public final class MainPresenter { public static final int REQUEST_ADD_DIRECTORY = 1; - public static final int REQUEST_EMULATE_GAME = 2; private final MainView mView; private final Context mContext; @@ -105,9 +104,4 @@ public final class MainPresenter { mDirToAdd = dir; } - - public void refreshFragmentScreenshot(int resultCode) - { - mView.refreshFragmentScreenshot(resultCode); - } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java index a24784f3a1..d9ef95cdf1 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java @@ -17,15 +17,6 @@ public interface MainView */ void setVersionString(String version); - /** - * Tell the view to tell the currently displayed {@link android.support.v4.app.Fragment} - * to refresh the screenshot at the given position in its list of games. - * - * @param fragmentPosition An index corresponding to the list or grid of games. - */ - void refreshFragmentScreenshot(int fragmentPosition); - - void launchSettingsActivity(MenuTag menuTag); void launchFileListActivity(); 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 1fc4db171f..0457de51e6 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 @@ -131,12 +131,6 @@ public final class TvMainActivity extends FragmentActivity implements MainView mBrowseFragment.setTitle(version); } - @Override - public void refreshFragmentScreenshot(int fragmentPosition) - { - mRowsAdapter.notifyArrayItemRangeChanged(0, mRowsAdapter.size()); - } - @Override public void launchSettingsActivity(MenuTag menuTag) { @@ -177,10 +171,6 @@ public final class TvMainActivity extends FragmentActivity implements MainView mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedDirectory(result)); } break; - - case MainPresenter.REQUEST_EMULATE_GAME: - mPresenter.refreshFragmentScreenshot(resultCode); - break; } }