From 5ed0cf8e0e9882896ee30b6deb24e971fda44d13 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 15 Jun 2019 20:14:35 +0200 Subject: Rename GameSettingsDialog to GamePropertiesDialog Since it no longer only contains settings. --- .../dolphinemu/adapters/GameAdapter.java | 10 +- .../dolphinemu/adapters/GameRowPresenter.java | 8 +- .../dolphinemu/dialogs/GamePropertiesDialog.java | 111 +++++++++++++++++++++ .../dolphinemu/dialogs/GameSettingsDialog.java | 110 -------------------- 4 files changed, 120 insertions(+), 119 deletions(-) create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameSettingsDialog.java (limited to 'Source/Android/app/src/main/java/org') 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 7d037522ef..82d97bee21 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 @@ -13,7 +13,7 @@ import android.view.ViewGroup; import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.activities.EmulationActivity; -import org.dolphinemu.dolphinemu.dialogs.GameSettingsDialog; +import org.dolphinemu.dolphinemu.dialogs.GamePropertiesDialog; import org.dolphinemu.dolphinemu.model.GameFile; import org.dolphinemu.dolphinemu.utils.PicassoUtils; import org.dolphinemu.dolphinemu.viewholders.GameViewHolder; @@ -145,11 +145,11 @@ public final class GameAdapter extends RecyclerView.Adapter impl return true; } - GameSettingsDialog fragment = - GameSettingsDialog. - newInstance(holder.gameFile.getPath(), gameId, holder.gameFile.getPlatform()); + GamePropertiesDialog fragment = + GamePropertiesDialog + .newInstance(holder.gameFile.getPath(), gameId, holder.gameFile.getPlatform()); ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction() - .add(fragment, GameSettingsDialog.TAG).commit(); + .add(fragment, GamePropertiesDialog.TAG).commit(); return true; } 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 7db90db8aa..6fef4a941f 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 @@ -13,7 +13,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.dialogs.GameSettingsDialog; +import org.dolphinemu.dolphinemu.dialogs.GamePropertiesDialog; import org.dolphinemu.dolphinemu.model.GameFile; import org.dolphinemu.dolphinemu.ui.platform.Platform; import org.dolphinemu.dolphinemu.utils.PicassoUtils; @@ -90,11 +90,11 @@ public final class GameRowPresenter extends Presenter return true; } - GameSettingsDialog fragment = - GameSettingsDialog.newInstance(holder.gameFile.getPath(), gameId, + GamePropertiesDialog fragment = + GamePropertiesDialog.newInstance(holder.gameFile.getPath(), gameId, holder.gameFile.getPlatform()); ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction() - .add(fragment, GameSettingsDialog.TAG).commit(); + .add(fragment, GamePropertiesDialog.TAG).commit(); return true; }); 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 new file mode 100644 index 0000000000..f5f6ea5eae --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java @@ -0,0 +1,111 @@ +package org.dolphinemu.dolphinemu.dialogs; + +import android.app.Dialog; +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentActivity; + +import android.widget.Toast; + +import org.dolphinemu.dolphinemu.R; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; +import org.dolphinemu.dolphinemu.ui.platform.Platform; +import org.dolphinemu.dolphinemu.utils.DirectoryInitialization; + +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"; + public static final String ARG_PLATFORM = "platform"; + + public static GamePropertiesDialog newInstance(String path, String gameId, int platform) + { + GamePropertiesDialog fragment = new GamePropertiesDialog(); + + Bundle arguments = new Bundle(); + arguments.putString(ARG_PATH, path); + arguments.putString(ARG_GAMEID, gameId); + arguments.putInt(ARG_PLATFORM, platform); + fragment.setArguments(arguments); + + return fragment; + } + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) + { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + + String path = requireArguments().getString(ARG_PATH); + String gameId = requireArguments().getString(ARG_GAMEID); + int platform = requireArguments().getInt(ARG_PLATFORM); + + builder.setTitle(requireContext() + .getString(R.string.preferences_game_properties) + ": " + gameId) + .setItems(platform == Platform.GAMECUBE.toInt() ? + R.array.gameSettingsMenusGC : + R.array.gameSettingsMenusWii, (dialog, which) -> + { + switch (which) + { + case 0: + GameDetailsDialog.newInstance(path).show((requireActivity()) + .getSupportFragmentManager(), "game_details"); + break; + case 1: + SettingsActivity.launch(getContext(), MenuTag.CONFIG, gameId); + break; + case 2: + SettingsActivity.launch(getContext(), MenuTag.GRAPHICS, gameId); + break; + case 3: + SettingsActivity.launch(getContext(), MenuTag.GCPAD_TYPE, gameId); + break; + case 4: + // Clear option for GC, Wii controls for else + if (platform == Platform.GAMECUBE.toInt()) + clearGameSettings(gameId); + else + SettingsActivity.launch(getActivity(), MenuTag.WIIMOTE, gameId); + break; + case 5: + clearGameSettings(gameId); + break; + } + }); + return builder.create(); + } + + + private void clearGameSettings(String gameId) + { + String path = + DirectoryInitialization.getUserDirectory() + "/GameSettings/" + gameId + ".ini"; + File gameSettingsFile = new File(path); + if (gameSettingsFile.exists()) + { + if (gameSettingsFile.delete()) + { + Toast.makeText(getContext(), "Cleared settings for " + gameId, Toast.LENGTH_SHORT) + .show(); + } + else + { + Toast.makeText(getContext(), "Unable to clear settings for " + gameId, + Toast.LENGTH_SHORT).show(); + } + } + else + { + Toast.makeText(getContext(), "No game settings to delete", Toast.LENGTH_SHORT).show(); + } + } +} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameSettingsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameSettingsDialog.java deleted file mode 100644 index a526723c8a..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameSettingsDialog.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.dolphinemu.dolphinemu.dialogs; - -import android.app.Dialog; -import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentActivity; - -import android.widget.Toast; - -import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; -import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; -import org.dolphinemu.dolphinemu.ui.platform.Platform; -import org.dolphinemu.dolphinemu.utils.DirectoryInitialization; - -import java.io.File; - -public class GameSettingsDialog extends DialogFragment -{ - public static final String TAG = "GameSettingsDialog"; - public static final String ARG_PATH = "path"; - public static final String ARG_GAMEID = "game_id"; - public static final String ARG_PLATFORM = "platform"; - - public static GameSettingsDialog newInstance(String path, String gameId, int platform) - { - GameSettingsDialog fragment = new GameSettingsDialog(); - - Bundle arguments = new Bundle(); - arguments.putString(ARG_PATH, path); - arguments.putString(ARG_GAMEID, gameId); - arguments.putInt(ARG_PLATFORM, platform); - fragment.setArguments(arguments); - - return fragment; - } - - @NonNull - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) - { - AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); - - String path = requireArguments().getString(ARG_PATH); - String gameId = requireArguments().getString(ARG_GAMEID); - int platform = requireArguments().getInt(ARG_PLATFORM); - - builder.setTitle(requireContext().getString(R.string.preferences_game_settings) + ": " + gameId) - .setItems(platform == Platform.GAMECUBE.toInt() ? - R.array.gameSettingsMenusGC : - R.array.gameSettingsMenusWii, (dialog, which) -> - { - switch (which) - { - case 0: - GameDetailsDialog.newInstance(path).show((requireActivity()) - .getSupportFragmentManager(), "game_details"); - break; - case 1: - SettingsActivity.launch(getContext(), MenuTag.CONFIG, gameId); - break; - case 2: - SettingsActivity.launch(getContext(), MenuTag.GRAPHICS, gameId); - break; - case 3: - SettingsActivity.launch(getContext(), MenuTag.GCPAD_TYPE, gameId); - break; - case 4: - // Clear option for GC, Wii controls for else - if (platform == Platform.GAMECUBE.toInt()) - clearGameSettings(gameId); - else - SettingsActivity.launch(getActivity(), MenuTag.WIIMOTE, gameId); - break; - case 5: - clearGameSettings(gameId); - break; - } - }); - return builder.create(); - } - - - private void clearGameSettings(String gameId) - { - String path = - DirectoryInitialization.getUserDirectory() + "/GameSettings/" + gameId + ".ini"; - File gameSettingsFile = new File(path); - if (gameSettingsFile.exists()) - { - if (gameSettingsFile.delete()) - { - Toast.makeText(getContext(), "Cleared settings for " + gameId, Toast.LENGTH_SHORT) - .show(); - } - else - { - Toast.makeText(getContext(), "Unable to clear settings for " + gameId, - Toast.LENGTH_SHORT).show(); - } - } - else - { - Toast.makeText(getContext(), "No game settings to delete", Toast.LENGTH_SHORT).show(); - } - } -} -- cgit v1.2.3