piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Android: Pass GameFile to GamePropertiesDialog::newInstance

Browse Source
This commit is contained in:
JosJuice
2020-06-23 18:31:39 +02:00
parent 8c999cf3b1
commit 5d13f3675f
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
View File

@ -156,9 +156,7 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
return true; return true;
} }
GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile.getPath(), GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile);
gameId, holder.gameFile.getRevision(), holder.gameFile.getPlatform());
((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction() ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction()
.add(fragment, GamePropertiesDialog.TAG).commit(); .add(fragment, GamePropertiesDialog.TAG).commit();

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
View File

@ -100,9 +100,7 @@ public final class GameRowPresenter extends Presenter
return true; return true;
} }
GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile.getPath(), GamePropertiesDialog fragment = GamePropertiesDialog.newInstance(holder.gameFile);
gameId, holder.gameFile.getRevision(), holder.gameFile.getPlatform());
((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction() ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction()
.add(fragment, GamePropertiesDialog.TAG).commit(); .add(fragment, GamePropertiesDialog.TAG).commit();

18
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
View File

@ -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.model.StringSetting;
import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag;
import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; 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.ui.platform.Platform;
import org.dolphinemu.dolphinemu.utils.DirectoryInitialization; import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
import org.dolphinemu.dolphinemu.utils.Log; import org.dolphinemu.dolphinemu.utils.Log;
@ -23,21 +24,20 @@ import java.io.File;
public class GamePropertiesDialog extends DialogFragment public class GamePropertiesDialog extends DialogFragment
{ {
public static final String TAG = "GamePropertiesDialog"; public static final String TAG = "GamePropertiesDialog";
public static final String ARG_PATH = "path"; private static final String ARG_PATH = "path";
public static final String ARG_GAMEID = "game_id"; private static final String ARG_GAMEID = "game_id";
public static final String ARG_REVISION = "revision"; 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, public static GamePropertiesDialog newInstance(GameFile gameFile)
int platform)
{ {
GamePropertiesDialog fragment = new GamePropertiesDialog(); GamePropertiesDialog fragment = new GamePropertiesDialog();
Bundle arguments = new Bundle(); Bundle arguments = new Bundle();
arguments.putString(ARG_PATH, path); arguments.putString(ARG_PATH, gameFile.getPath());
arguments.putString(ARG_GAMEID, gameId); arguments.putString(ARG_GAMEID, gameFile.getGameId());
arguments.putInt(ARG_REVISION, revision); arguments.putInt(ARG_REVISION, gameFile.getRevision());
arguments.putInt(ARG_PLATFORM, platform); arguments.putInt(ARG_PLATFORM, gameFile.getPlatform());
fragment.setArguments(arguments); fragment.setArguments(arguments);
return fragment; return fragment;