From 5d13f3675f9907459f107e951d39713628e51177 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 23 Jun 2020 18:31:39 +0200 Subject: [PATCH] Android: Pass GameFile to GamePropertiesDialog::newInstance --- .../dolphinemu/adapters/GameAdapter.java | 4 +--- .../dolphinemu/adapters/GameRowPresenter.java | 4 +--- .../dialogs/GamePropertiesDialog.java | 18 +++++++++--------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java index ff2db6b6a5..5fd27ad5ab 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java @@ -156,9 +156,7 @@ public final class GameAdapter extends RecyclerView.Adapter impl return true; } - GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile.getPath(), - gameId, holder.gameFile.getRevision(), holder.gameFile.getPlatform()); - + GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile); ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction() .add(fragment, GamePropertiesDialog.TAG).commit(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java index 6790f331b2..aa600173f4 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java @@ -100,9 +100,7 @@ public final class GameRowPresenter extends Presenter return true; } - GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile.getPath(), - gameId, holder.gameFile.getRevision(), holder.gameFile.getPlatform()); - + GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile); ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction() .add(fragment, GamePropertiesDialog.TAG).commit(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java index 44642d30b8..9e4f7a535b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java @@ -14,6 +14,7 @@ import org.dolphinemu.dolphinemu.features.settings.model.Settings; import org.dolphinemu.dolphinemu.features.settings.model.StringSetting; import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; +import org.dolphinemu.dolphinemu.model.GameFile; import org.dolphinemu.dolphinemu.ui.platform.Platform; import org.dolphinemu.dolphinemu.utils.DirectoryInitialization; import org.dolphinemu.dolphinemu.utils.Log; @@ -23,21 +24,20 @@ import java.io.File; public class GamePropertiesDialog extends DialogFragment { public static final String TAG = "GamePropertiesDialog"; - public static final String ARG_PATH = "path"; - public static final String ARG_GAMEID = "game_id"; + private static final String ARG_PATH = "path"; + private static final String ARG_GAMEID = "game_id"; public static final String ARG_REVISION = "revision"; - public static final String ARG_PLATFORM = "platform"; + private static final String ARG_PLATFORM = "platform"; - public static GamePropertiesDialog newInstance(String path, String gameId, int revision, - int platform) + public static GamePropertiesDialog newInstance(GameFile gameFile) { GamePropertiesDialog fragment = new GamePropertiesDialog(); Bundle arguments = new Bundle(); - arguments.putString(ARG_PATH, path); - arguments.putString(ARG_GAMEID, gameId); - arguments.putInt(ARG_REVISION, revision); - arguments.putInt(ARG_PLATFORM, platform); + arguments.putString(ARG_PATH, gameFile.getPath()); + arguments.putString(ARG_GAMEID, gameFile.getGameId()); + arguments.putInt(ARG_REVISION, gameFile.getRevision()); + arguments.putInt(ARG_PLATFORM, gameFile.getPlatform()); fragment.setArguments(arguments); return fragment;