From 34f1a08e1b37fe297986b848a7c9d1b4ee6d30e9 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sun, 29 Mar 2020 22:19:56 +0200 Subject: [PATCH] Remove unused code --- .../activities/EmulationActivity.java | 6 ------ .../citra/citra_emu/model/GameProvider.java | 2 -- .../citra/citra_emu/overlay/InputOverlay.java | 1 - .../citra/citra_emu/ui/main/MainActivity.java | 5 ----- .../ui/platform/PlatformGamesFragment.java | 5 ----- .../ui/platform/PlatformGamesView.java | 8 -------- .../ui/settings/SettingsFrameLayout.java | 19 ------------------- .../app/src/main/res/menu/menu_settings.xml | 4 +--- 8 files changed, 1 insertion(+), 49 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java index 3b596fced..9a0565d2b 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java @@ -103,12 +103,6 @@ public final class EmulationActivity extends AppCompatActivity { private boolean activityRecreated; private String mSelectedTitle; private String mPath; - private Runnable afterShowingScreenshot = new Runnable() { - @Override - public void run() { - supportFinishAfterTransition(); - } - }; public static void launch(FragmentActivity activity, String path, String title) { Intent launcher = new Intent(activity, EmulationActivity.class); diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java b/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java index ff6512a87..001a157db 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java @@ -21,8 +21,6 @@ public final class GameProvider extends ContentProvider { public static final String AUTHORITY = "content://" + BuildConfig.APPLICATION_ID + ".provider"; public static final Uri URI_FOLDER = Uri.parse(AUTHORITY + "/" + GameDatabase.TABLE_NAME_FOLDERS + "/"); - public static final Uri URI_GAME = - Uri.parse(AUTHORITY + "/" + GameDatabase.TABLE_NAME_GAMES + "/"); public static final Uri URI_REFRESH = Uri.parse(AUTHORITY + "/" + REFRESH_LIBRARY + "/"); public static final Uri URI_RESET = Uri.parse(AUTHORITY + "/" + RESET_LIBRARY + "/"); diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java index 41163250c..da3292c32 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.java @@ -673,7 +673,6 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener { if (!mPreferences.getBoolean("OverlayInit", false)) { // It's possible that a user has created their overlay before this was added // Only change the overlay if the 'A' button is not in the upper corner. - // GameCube if (mPreferences.getFloat(ButtonType.BUTTON_A + "-X", 0f) == 0f) { defaultOverlayLandscape(); } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java index 5e3e66971..fcd1061f5 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java @@ -190,11 +190,6 @@ public final class MainActivity extends AppCompatActivity implements MainView { } } - @Nullable - private PlatformGamesView getPlatformGamesView() { - return (PlatformGamesView) getSupportFragmentManager().findFragmentById(mFrameLayoutId); - } - @Override protected void onDestroy() { EmulationActivity.tryDismissRunningNotification(this); diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java index 9ff443238..040b78782 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java @@ -70,11 +70,6 @@ public final class PlatformGamesFragment extends Fragment implements PlatformGam mPresenter.refresh(); } - @Override - public void onItemClick(String gameId) { - // No-op for now - } - @Override public void showGames(Cursor games) { if (mAdapter != null) { diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java index bd19d3135..e0ecd58d5 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesView.java @@ -19,14 +19,6 @@ public interface PlatformGamesView { */ void refreshScreenshotAtPosition(int position); - /** - * Pass a click event to the view's Presenter. Typically called from the - * view's list adapter. - * - * @param gameId The ID of the game that was clicked. - */ - void onItemClick(String gameId); - /** * To be called when an asynchronous database read completes. Passes the * result, in this case a {@link Cursor}, to the view. diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFrameLayout.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFrameLayout.java index 130e7cf01..af2600bc1 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFrameLayout.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFrameLayout.java @@ -24,23 +24,4 @@ public final class SettingsFrameLayout extends FrameLayout { public SettingsFrameLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } - - public float getYFraction() { - return getY() / getHeight(); - } - - public void setYFraction(float yFraction) { - final int height = getHeight(); - setY((height > 0) ? (yFraction * height) : -9999); - } - - public float getVisibleness() { - return 1.0f; - } - - public void setVisibleness(float visibleness) { - setScaleX(visibleness); - setScaleY(visibleness); - setAlpha(visibleness); - } } diff --git a/src/android/app/src/main/res/menu/menu_settings.xml b/src/android/app/src/main/res/menu/menu_settings.xml index 9eb7100fa..f156b75b3 100644 --- a/src/android/app/src/main/res/menu/menu_settings.xml +++ b/src/android/app/src/main/res/menu/menu_settings.xml @@ -1,4 +1,2 @@ - - \ No newline at end of file + \ No newline at end of file