diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index 50ec628d1d..0fd64d013c 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion "20.0.0" + buildToolsVersion "20.0.0" lintOptions { // This is important as it will run lint but not abort on error @@ -47,6 +47,14 @@ android { dependencies { - compile 'com.android.support:support-v4:22.0.0' - compile 'com.android.support:support-v13:22.0.0' + compile 'com.android.support:support-v4:22.1.1' + compile 'com.android.support:support-v13:22.0.0' + compile 'com.android.support:cardview-v7:21.0.3' + compile 'com.android.support:recyclerview-v7:21.0.3' + + // For showing the banner as a circle a-la Material Design Guidelines + compile 'de.hdodenhof:circleimageview:1.2.2' + + // For loading huge screenshots from the disk. + compile "com.squareup.picasso:picasso:2.4.0" } diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index 5187f65691..981d4117e9 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -9,15 +9,28 @@ + + + + + + + + + + + - + diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index ab9f25b306..e7d2e2b328 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -130,6 +130,12 @@ public final class NativeLibrary */ public static native String GetTitle(String filename); + public static native String GetDescription(String filename); + public static native String GetGameId(String filename); + public static native String GetDate(String filename); + public static native long GetFilesize(String filename); + public static native boolean IsWiiTitle(String filename); + /** * Gets the Dolphin version string. * diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java new file mode 100644 index 0000000000..be0fbbed1a --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java @@ -0,0 +1,131 @@ +package org.dolphinemu.dolphinemu.activities; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.os.Environment; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.util.Log; +import android.view.Menu; +import android.view.MenuInflater; +import android.widget.Toolbar; + +import org.dolphinemu.dolphinemu.AssetCopyService; +import org.dolphinemu.dolphinemu.NativeLibrary; +import org.dolphinemu.dolphinemu.R; +import org.dolphinemu.dolphinemu.adapters.GameAdapter; +import org.dolphinemu.dolphinemu.model.Game; +import org.dolphinemu.dolphinemu.model.GcGame; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +public class GameGridActivity extends Activity +{ + private RecyclerView mRecyclerView; + private RecyclerView.Adapter mAdapter; + private RecyclerView.LayoutManager mLayoutManager; + + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_game_grid); + + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_game_list); + setActionBar(toolbar); + + mRecyclerView = (RecyclerView) findViewById(R.id.grid_games); + + // use this setting to improve performance if you know that changes + // in content do not change the layout size of the RecyclerView + //mRecyclerView.setHasFixedSize(true); + + // Specifying the LayoutManager determines how the RecyclerView arranges views. + mLayoutManager = new GridLayoutManager(this, 4); + mRecyclerView.setLayoutManager(mLayoutManager); + + mRecyclerView.addItemDecoration(new GameAdapter.SpacesItemDecoration(8)); + + // Create an adapter that will relate the dataset to the views on-screen. + mAdapter = new GameAdapter(getGameList()); + mRecyclerView.setAdapter(mAdapter); + + // Stuff in this block only happens when this activity is newly created (i.e. not a rotation) + if (savedInstanceState == null) + { + // Copy assets into appropriate locations. + Intent copyAssets = new Intent(this, AssetCopyService.class); + startService(copyAssets); + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) + { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.gamelist_menu, menu); + return true; + + } + + // TODO Replace all of this with a SQLite database + private ArrayList getGameList() + { + ArrayList gameList = new ArrayList(); + + final String DefaultDir = Environment.getExternalStorageDirectory() + File.separator + "dolphin-emu"; + + NativeLibrary.SetUserDirectory(DefaultDir); + + String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPaths", "0"); + Log.v("DolphinEmu", "Directories: " + Directories); + int intDirectories = Integer.parseInt(Directories); + + // Extensions to filter by. + Set exts = new HashSet(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs")); + + for (int a = 0; a < intDirectories; ++a) + { + String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + a, ""); + Log.v("DolphinEmu", "Directory " + a + ": " + BrowseDir); + + File currentDir = new File(BrowseDir); + File[] dirs = currentDir.listFiles(); + try + { + for (File entry : dirs) + { + if (!entry.isHidden() && !entry.isDirectory()) + { + String entryName = entry.getName(); + + // Check that the file has an appropriate extension before trying to read out of it. + if (exts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.')))) + { + GcGame game = new GcGame(NativeLibrary.GetTitle(entry.getAbsolutePath()), + NativeLibrary.GetDescription(entry.getAbsolutePath()).replace("\n", " "), + // TODO Some games might actually not be from this region, believe it or not. + "United States", + entry.getAbsolutePath(), + NativeLibrary.GetGameId(entry.getAbsolutePath()), + NativeLibrary.GetDate(entry.getAbsolutePath())); + + gameList.add(game); + } + + } + + } + } catch (Exception ignored) + { + } + } + + return gameList; + } +} 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 new file mode 100644 index 0000000000..30bc9daad6 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java @@ -0,0 +1,113 @@ +package org.dolphinemu.dolphinemu.adapters; + +import android.graphics.Rect; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.squareup.picasso.Picasso; + +import org.dolphinemu.dolphinemu.R; +import org.dolphinemu.dolphinemu.model.Game; +import org.dolphinemu.dolphinemu.viewholders.GameViewHolder; + +import java.util.ArrayList; + +public class GameAdapter extends RecyclerView.Adapter +{ + private ArrayList mGameList; + + /** + * Mostly just initializes the dataset to be displayed. + * + * @param gameList + */ + public GameAdapter(ArrayList gameList) + { + mGameList = gameList; + } + + /** + * Called by the LayoutManager when it is necessary to create a new view. + * + * @param parent The RecyclerView (I think?) the created view will be thrown into. + * @param viewType Not used here, but useful when more than one type of child will be used in the RecyclerView. + * @return The created ViewHolder with references to all the child view's members. + */ + @Override + public GameViewHolder onCreateViewHolder(ViewGroup parent, int viewType) + { + // Create a new view. + View gameCard = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.card_game, parent, false); + + // Use that view to create a ViewHolder. + GameViewHolder holder = new GameViewHolder(gameCard); + return holder; + } + + /** + * Called by the LayoutManager when a new view is not necessary because we can recycle + * an existing one (for example, if a view just scrolled onto the screen from the bottom, we + * can use the view that just scrolled off the top instead of inflating a new one.) + * + * @param holder A ViewHolder representing the view we're recycling. + * @param position The position of the 'new' view in the dataset. + */ + @Override + public void onBindViewHolder(GameViewHolder holder, int position) + { + // Get a reference to the item from the dataset; we'll use this to fill in the view contents. + final Game game = mGameList.get(position); + + // Fill in the view contents. + Picasso.with(holder.imageScreenshot.getContext()) + .load(game.getScreenPath()) + .error(R.drawable.no_banner) + .into(holder.imageScreenshot); + + holder.textGameTitle.setText(game.getTitle()); + if (game.getDescription() != null) + { + holder.textDescription.setText(game.getDescription()); + } + holder.buttonDetails.setTag(game.getGameId()); + + holder.path = game.getPath(); + holder.screenshotPath = game.getScreenPath(); + holder.game = game; + + } + + /** + * Called by the LayoutManager to find out how much data we have. + * + * @return Size of the dataset. + */ + @Override + public int getItemCount() + { + return mGameList.size(); + } + + public static class SpacesItemDecoration extends RecyclerView.ItemDecoration + { + private int space; + + public SpacesItemDecoration(int space) + { + this.space = space; + } + + @Override + public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) + { + outRect.left = space; + outRect.right = space; + outRect.bottom = space; + outRect.top = space; + + } + } +} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java new file mode 100644 index 0000000000..19c6621345 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java @@ -0,0 +1,96 @@ +package org.dolphinemu.dolphinemu.dialogs; + + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.TextView; + +import com.squareup.picasso.Picasso; + +import org.dolphinemu.dolphinemu.BuildConfig; +import org.dolphinemu.dolphinemu.R; +import org.dolphinemu.dolphinemu.emulation.EmulationActivity; +import org.dolphinemu.dolphinemu.model.Game; + +import de.hdodenhof.circleimageview.CircleImageView; + +public class GameDetailsDialog extends DialogFragment +{ + public static final String ARGUMENT_GAME_TITLE = BuildConfig.APPLICATION_ID + ".game_title"; + public static final String ARGUMENT_GAME_DESCRIPTION = BuildConfig.APPLICATION_ID + ".game_description"; + public static final String ARGUMENT_GAME_COUNTRY = BuildConfig.APPLICATION_ID + ".game_country"; + public static final String ARGUMENT_GAME_DATE = BuildConfig.APPLICATION_ID + ".game_date"; + public static final String ARGUMENT_GAME_PATH = BuildConfig.APPLICATION_ID + ".game_path"; + public static final String ARGUMENT_GAME_SCREENSHOT_PATH = BuildConfig.APPLICATION_ID + ".game_screenshot_path"; + + + public static GameDetailsDialog newInstance(Game game) + { + GameDetailsDialog fragment = new GameDetailsDialog(); + + Bundle arguments = new Bundle(); + arguments.putString(ARGUMENT_GAME_TITLE, game.getTitle()); + arguments.putString(ARGUMENT_GAME_DESCRIPTION, game.getDescription()); + arguments.putString(ARGUMENT_GAME_COUNTRY, game.getCountry()); + arguments.putString(ARGUMENT_GAME_DATE, game.getDate()); + arguments.putString(ARGUMENT_GAME_PATH, game.getPath()); + arguments.putString(ARGUMENT_GAME_SCREENSHOT_PATH, game.getScreenPath()); + fragment.setArguments(arguments); + + return fragment; + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) + { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + ViewGroup contents = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.dialog_game_details, null); + + final ImageView imageGameScreen = (ImageView) contents.findViewById(R.id.image_game_screen); + CircleImageView circleBanner = (CircleImageView) contents.findViewById(R.id.circle_banner); + + TextView textTitle = (TextView) contents.findViewById(R.id.text_game_title); + TextView textDescription = (TextView) contents.findViewById(R.id.text_game_description); + + TextView textCountry = (TextView) contents.findViewById(R.id.text_country); + TextView textDate = (TextView) contents.findViewById(R.id.text_date); + + ImageButton buttonLaunch = (ImageButton) contents.findViewById(R.id.button_launch); + + textTitle.setText(getArguments().getString(ARGUMENT_GAME_TITLE)); + textDescription.setText(getArguments().getString(ARGUMENT_GAME_DESCRIPTION)); + textCountry.setText(getArguments().getString(ARGUMENT_GAME_COUNTRY)); + textDate.setText(getArguments().getString(ARGUMENT_GAME_DATE)); + buttonLaunch.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View view) + { + // Start the emulation activity and send the path of the clicked ROM to it. + Intent intent = new Intent(view.getContext(), EmulationActivity.class); + + intent.putExtra("SelectedGame", getArguments().getString(ARGUMENT_GAME_PATH)); + startActivity(intent); + } + }); + + // Fill in the view contents. + Picasso.with(imageGameScreen.getContext()) + .load(getArguments().getString(ARGUMENT_GAME_SCREENSHOT_PATH)) + .noFade() + .noPlaceholder() + .into(imageGameScreen); + + circleBanner.setImageResource(R.drawable.no_banner); + + builder.setView(contents); + return builder.create(); + } +} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java new file mode 100644 index 0000000000..9d3e736841 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java @@ -0,0 +1,23 @@ +package org.dolphinemu.dolphinemu.model; + +public interface Game +{ + public static final int PLATFORM_GC = 0; + public static final int PLATFORM_WII = 1; + + public int getPlatform(); + + public String getDate(); + + public String getTitle(); + + public String getDescription(); + + public String getCountry(); + + public String getPath(); + + public String getGameId(); + + public String getScreenPath(); +} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GcGame.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GcGame.java new file mode 100644 index 0000000000..d682bee0b6 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GcGame.java @@ -0,0 +1,96 @@ +package org.dolphinemu.dolphinemu.model; + + +import java.io.File; + +public final class GcGame implements Game +{ + private String mTitle; + private String mDescription; + private String mCountry; + private String mPath; + private String mGameId; + + private String mScreenshotFolderPath; + + private String mDate; + private int mPlatform = PLATFORM_GC; + + private static final String PATH_SCREENSHOT_FOLDER = "file:///sdcard/dolphin-emu/ScreenShots/"; + + public GcGame(String title, String description, String country, String path, String gameId, String date) + { + mTitle = title; + mDescription = description; + mCountry = country; + mPath = path; + mGameId = gameId; + mDate = date; + mScreenshotFolderPath = PATH_SCREENSHOT_FOLDER + getGameId() + "/"; + } + + @Override + public int getPlatform() + { + return mPlatform; + } + + @Override + public String getTitle() + { + return mTitle; + } + + @Override + public String getDescription() + { + return mDescription; + } + + @Override + public String getDate() + { + return mDate; + } + + @Override + public String getCountry() + { + return mCountry; + } + + @Override + public String getPath() + { + return mPath; + } + + public String getGameId() + { + return mGameId; + } + + public String getScreenshotFolderPath() + { + return mScreenshotFolderPath; + } + + @Override + public String getScreenPath() + { + // Count how many screenshots are available, so we can use the most recent one. + File screenshotFolder = new File(mScreenshotFolderPath.substring(mScreenshotFolderPath.indexOf('s') - 1)); + int screenCount = 0; + + if (screenshotFolder.isDirectory()) + { + screenCount = screenshotFolder.list().length; + } + + String screenPath = mScreenshotFolderPath + + getGameId() + "-" + + screenCount + ".png"; + + return screenPath; + } +} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/WiiGame.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/WiiGame.java new file mode 100644 index 0000000000..c64de8d582 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/WiiGame.java @@ -0,0 +1,53 @@ +package org.dolphinemu.dolphinemu.model; + + +public final class WiiGame implements Game +{ + @Override + public int getPlatform() + { + return 0; + } + + @Override + public String getDate() + { + return null; + } + + @Override + public String getTitle() + { + return null; + } + + @Override + public String getDescription() + { + return null; + } + + @Override + public String getCountry() + { + return null; + } + + @Override + public String getPath() + { + return null; + } + + @Override + public String getGameId() + { + return null; + } + + @Override + public String getScreenPath() + { + return null; + } +} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/GameViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/GameViewHolder.java new file mode 100644 index 0000000000..47acf588de --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/GameViewHolder.java @@ -0,0 +1,83 @@ +package org.dolphinemu.dolphinemu.viewholders; + +import android.app.Activity; +import android.content.Intent; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.TextView; + +import org.dolphinemu.dolphinemu.R; +import org.dolphinemu.dolphinemu.dialogs.GameDetailsDialog; +import org.dolphinemu.dolphinemu.emulation.EmulationActivity; +import org.dolphinemu.dolphinemu.model.Game; + + +public class GameViewHolder extends RecyclerView.ViewHolder +{ + public ImageView imageScreenshot; + public TextView textGameTitle; + public TextView textDescription; + public ImageButton buttonDetails; + + // Used to handle onClick(). Set this in onBindViewHolder(). + public String path; + public String screenshotPath; + public Game game; + + public GameViewHolder(View itemView) + { + super(itemView); + + itemView.setOnClickListener(mCardClickListener); + + imageScreenshot = (ImageView) itemView.findViewById(R.id.image_game_screen); + textGameTitle = (TextView) itemView.findViewById(R.id.text_game_title); + textDescription = (TextView) itemView.findViewById(R.id.text_game_description); + buttonDetails = (ImageButton) itemView.findViewById(R.id.button_details); + + buttonDetails.setOnClickListener(mDetailsButtonListener); + } + + private View.OnClickListener mCardClickListener = new View.OnClickListener() + { + /** + * Launches the game that was clicked on. + * + * @param view The card representing the game the user wants to play. + */ + @Override + public void onClick(View view) + { + // Start the emulation activity and send the path of the clicked ROM to it. + Intent intent = new Intent(view.getContext(), EmulationActivity.class); + + intent.putExtra("SelectedGame", path); + + view.getContext().startActivity(intent); + } + }; + + private View.OnClickListener mDetailsButtonListener = new View.OnClickListener() + { + + /** + * Launches the details activity for this Game, using an ID stored in the + * details button's Tag. + * + * @param view The Details button that was clicked on. + */ + @Override + public void onClick(View view) + { + // Get the ID of the game we want to look at. + // TODO This should be all we need to pass in, eventually. + // String gameId = (String) view.getTag(); + + Activity activity = (Activity) view.getContext(); + GameDetailsDialog.newInstance(game).show(activity.getFragmentManager(), "game_details"); + } + }; + +} diff --git a/Source/Android/app/src/main/res/anim/button_elevation.xml b/Source/Android/app/src/main/res/anim/button_elevation.xml new file mode 100644 index 0000000000..d96b299541 --- /dev/null +++ b/Source/Android/app/src/main/res/anim/button_elevation.xml @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_country.png new file mode 100644 index 0000000000..2eec57e591 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_country.png differ diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png new file mode 100644 index 0000000000..590def8b80 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_date.png differ diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png new file mode 100644 index 0000000000..164385d047 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png differ diff --git a/Source/Android/app/src/main/res/drawable-ldpi/ic_date.png b/Source/Android/app/src/main/res/drawable-ldpi/ic_date.png new file mode 100644 index 0000000000..e6339193ea Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-ldpi/ic_date.png differ diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_action_overflow.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_action_overflow.png new file mode 100644 index 0000000000..6f0fb23f4d Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_action_overflow.png differ diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_country.png new file mode 100644 index 0000000000..34ab76ac9e Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_country.png differ diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_date.png new file mode 100644 index 0000000000..46c6a2ae4e Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_date.png differ diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_play.png new file mode 100644 index 0000000000..8d1e433a56 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_play.png differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png new file mode 100644 index 0000000000..7ba4e10ea2 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_country.png new file mode 100644 index 0000000000..e5cc9bc28b Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_country.png differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png new file mode 100644 index 0000000000..9ecb630740 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png differ diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png new file mode 100644 index 0000000000..a55d19922f Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png new file mode 100644 index 0000000000..5a603b6bc3 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_country.png new file mode 100644 index 0000000000..6fa2c3b33c Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_country.png differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png new file mode 100644 index 0000000000..076602cca3 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png differ diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png new file mode 100644 index 0000000000..043acd808e Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png differ diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png new file mode 100644 index 0000000000..f11d5351f3 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png differ diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png new file mode 100644 index 0000000000..7cc0084756 Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png differ diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple.xml b/Source/Android/app/src/main/res/drawable/oval_ripple.xml new file mode 100644 index 0000000000..554d5f834a --- /dev/null +++ b/Source/Android/app/src/main/res/drawable/oval_ripple.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/Source/Android/app/src/main/res/layout/activity_game_grid.xml b/Source/Android/app/src/main/res/layout/activity_game_grid.xml new file mode 100644 index 0000000000..f026322f3d --- /dev/null +++ b/Source/Android/app/src/main/res/layout/activity_game_grid.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/Source/Android/app/src/main/res/layout/card_game.xml b/Source/Android/app/src/main/res/layout/card_game.xml new file mode 100644 index 0000000000..a89e5bdb21 --- /dev/null +++ b/Source/Android/app/src/main/res/layout/card_game.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml new file mode 100644 index 0000000000..885dc91676 --- /dev/null +++ b/Source/Android/app/src/main/res/layout/dialog_game_details.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Android/app/src/main/res/values-w820dp/dimens.xml b/Source/Android/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000000..63fc816444 --- /dev/null +++ b/Source/Android/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000..608cc9afd7 --- /dev/null +++ b/Source/Android/app/src/main/res/values/colors.xml @@ -0,0 +1,8 @@ + + + #5bc0de + #428bca + + #663399 + #311b92 + \ No newline at end of file diff --git a/Source/Android/app/src/main/res/values/dimens.xml b/Source/Android/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..72b7d0fcaf --- /dev/null +++ b/Source/Android/app/src/main/res/values/dimens.xml @@ -0,0 +1,10 @@ + + + 16dp + 16dp + + 48dp + 1dp + 4dp + 16dp + diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000000..40d406b20f --- /dev/null +++ b/Source/Android/app/src/main/res/values/styles.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index e553a87d2e..9405f3fd18 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.0' + classpath 'com.android.tools.build:gradle:1.2.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 0d5f71dc99..a38f312f49 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -48,7 +48,7 @@ ANativeWindow* surf; std::string g_filename; std::string g_set_userpath = ""; -#define DOLPHIN_TAG "Dolphinemu" +#define DOLPHIN_TAG "DolphinEmuNative" void Host_NotifyMapLoaded() {} void Host_RefreshDSPDebuggerWindow() {} @@ -111,8 +111,6 @@ static bool MsgAlert(const char* caption, const char* text, bool /*yes_no*/, int #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 -std::map m_names; -bool m_is_wii_title; static inline u32 Average32(u32 a, u32 b) { return ((a >> 1) & 0x7f7f7f7f) + ((b >> 1) & 0x7f7f7f7f); @@ -131,9 +129,6 @@ static bool LoadBanner(std::string filename, u32 *Banner) if (pVolume != nullptr) { - m_names = pVolume->GetNames(); - m_is_wii_title = pVolume->IsWiiDisc() || pVolume->IsWadFile(); - int Width, Height; std::vector BannerVec = pVolume->GetBanner(&Width, &Height); // This code (along with above inlines) is moved from @@ -166,31 +161,148 @@ static bool LoadBanner(std::string filename, u32 *Banner) return false; } -static std::string GetName(std::string filename) +static bool IsWiiTitle(std::string filename) { - DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(m_is_wii_title); + std::unique_ptr pVolume(DiscIO::CreateVolumeFromFilename(filename)); - auto end = m_names.end(); - auto it = m_names.find(language); - if (it != end) - return it->second; - - // English tends to be a good fallback when the requested language isn't available - if (language != IVolume::ELanguage::LANGUAGE_ENGLISH) + if (pVolume != nullptr) { - it = m_names.find(IVolume::ELanguage::LANGUAGE_ENGLISH); - if (it != end) - return it->second; + bool is_wii_title = pVolume->IsWiiDisc() || pVolume->IsWadFile(); + + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Is %s a Wii Disc: %s", filename.c_str(), is_wii_title ? "Yes" : "No" ); + + return is_wii_title; } - // If English isn't available either, just pick something - if (!m_names.empty()) - return m_names.cbegin()->second; + // Technically correct. + return false; +} - // No usable name, return filename (better than nothing) - std::string name; - SplitPath(filename, nullptr, &name, nullptr); - return name; +static std::string GetTitle(std::string filename) +{ + __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Title for file: %s", filename.c_str()); + + std::unique_ptr pVolume(DiscIO::CreateVolumeFromFilename(filename)); + + if (pVolume != nullptr) { + std::map titles = pVolume->GetNames(); + + + /*bool is_wii_title = IsWiiTitle(filename); + + DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage( + is_wii_title); + + + + auto it = titles.find(language); + if (it != end) + return it->second;*/ + + auto end = titles.end(); + + // English tends to be a good fallback when the requested language isn't available + //if (language != IVolume::ELanguage::LANGUAGE_ENGLISH) { + auto it = titles.find(IVolume::ELanguage::LANGUAGE_ENGLISH); + if (it != end) + return it->second; + //} + + + // If English isn't available either, just pick something + if (!titles.empty()) + return titles.cbegin()->second; + + // No usable name, return filename (better than nothing) + std::string name; + SplitPath(filename, nullptr, &name, nullptr); + return name; + } + + return std::string ("Error"); +} + +static std::string GetDescription(std::string filename) +{ + __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Description for file: %s", filename.c_str()); + + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename); + + if (pVolume != nullptr) + { + std::map descriptions = pVolume->GetDescriptions(); + + /* + bool is_wii_title = IsWiiTitle(filename); + + DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage( + is_wii_title); + + auto it = descriptions.find(language); + if (it != end) + return it->second;*/ + + auto end = descriptions.end(); + + // English tends to be a good fallback when the requested language isn't available + //if (language != IVolume::ELanguage::LANGUAGE_ENGLISH) { + auto it = descriptions.find(IVolume::ELanguage::LANGUAGE_ENGLISH); + if (it != end) + return it->second; + //} + + // If English isn't available either, just pick something + if (!descriptions.empty()) + return descriptions.cbegin()->second; + } + + return std::string ("Error"); +} + +static std::string GetGameId(std::string filename) +{ + __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting ID for file: %s", filename.c_str()); + + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename); + if (pVolume != nullptr) + { + std::string id = pVolume->GetUniqueID(); + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Game ID: %s", id.c_str()); + + return id; + } + return std::string ("Error"); +} + +static std::string GetApploaderDate(std::string filename) +{ + __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Date for file: %s", filename.c_str()); + + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename); + if (pVolume != nullptr) + { + std::string date = pVolume->GetApploaderDate(); + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Date: %s", date.c_str()); + + return date; + } + return std::string ("Error"); +} + +static u64 GetFileSize(std::string filename) +{ + __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting size of file: %s", filename.c_str()); + + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename); + if (pVolume != nullptr) + { + u64 size = pVolume->GetSize(); + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Size: %lu", size); + + return size; + } + + return -1; } static std::string GetJString(JNIEnv *env, jstring jstr) @@ -215,8 +327,12 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulati JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj); JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value); -JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile); -JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFile); +JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile);JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFilename); +JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetDescription(JNIEnv *env, jobject obj, jstring jFilename); +JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGameId(JNIEnv *env, jobject obj, jstring jFilename); +JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetDate(JNIEnv *env, jobject obj, jstring jFilename); +JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetFilesize(JNIEnv *env, jobject obj, jstring jFilename); +JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsWiiTitle(JNIEnv *env, jobject obj, jstring jFilename); JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv *env, jobject obj); JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv *env, jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv *env, jobject obj); @@ -233,17 +349,17 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv * JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv *env, jobject obj) { - PowerPC::Start(); +PowerPC::Start(); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv *env, jobject obj) { - PowerPC::Pause(); +PowerPC::Pause(); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj) { - Core::Stop(); - updateMainFrameEvent.Set(); // Kick the waiting event +Core::Stop(); +updateMainFrameEvent.Set(); // Kick the waiting event } JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action) { @@ -251,7 +367,7 @@ JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePa } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value) { - ButtonManager::GamepadAxisEvent(GetJString(env, jDevice), Axis, Value); +ButtonManager::GamepadAxisEvent(GetJString(env, jDevice), Axis, Value); } JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile) @@ -266,15 +382,49 @@ JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBann } return Banner; } -JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFile) -{ - std::string file = GetJString(env, jFile); - std::string name = GetName(file); - m_names.clear(); +JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFilename) +{ + std::string filename = GetJString(env, jFilename); + std::string name = GetTitle(filename); return env->NewStringUTF(name.c_str()); } +JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetDescription(JNIEnv *env, jobject obj, jstring jFilename) +{ + std::string filename = GetJString(env, jFilename); + std::string description = GetDescription(filename); + return env->NewStringUTF(description.c_str()); +} + +JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetGameId(JNIEnv *env, jobject obj, jstring jFilename) +{ + std::string filename = GetJString(env, jFilename); + std::string id = GetGameId(filename); + return env->NewStringUTF(id.c_str()); +} + +JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetDate(JNIEnv *env, jobject obj, jstring jFilename) +{ + std::string filename = GetJString(env, jFilename); + std::string date = GetApploaderDate(filename); + return env->NewStringUTF(date.c_str()); +} + +JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetFilesize(JNIEnv *env, jobject obj, jstring jFilename) +{ + std::string filename = GetJString(env, jFilename); + u64 size = GetFileSize(filename); + return size; +} + +JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_IsWiiTitle(JNIEnv *env, jobject obj, jstring jFilename) +{ + std::string filename = GetJString(env, jFilename); + bool wiiDisc = IsWiiTitle(filename); + return wiiDisc; +} + JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv *env, jobject obj) { return env->NewStringUTF(scm_rev_str); @@ -287,12 +437,12 @@ JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Supports JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv *env, jobject obj) { - Core::SaveScreenShot(); +Core::SaveScreenShot(); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(JNIEnv *env, jobject obj, jint api) { - eglBindAPI(api); +eglBindAPI(api); } JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jSection, jstring jKey, jstring jDefault) @@ -313,56 +463,56 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jSection, jstring jKey, jstring jValue) { - IniFile ini; - std::string file = GetJString(env, jFile); - std::string section = GetJString(env, jSection); - std::string key = GetJString(env, jKey); - std::string value = GetJString(env, jValue); +IniFile ini; +std::string file = GetJString(env, jFile); +std::string section = GetJString(env, jSection); +std::string key = GetJString(env, jKey); +std::string value = GetJString(env, jValue); - ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(file)); +ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(file)); - ini.GetOrCreateSection(section)->Set(key, value); - ini.Save(File::GetUserPath(D_CONFIG_IDX) + std::string(file)); +ini.GetOrCreateSection(section)->Set(key, value); +ini.Save(File::GetUserPath(D_CONFIG_IDX) + std::string(file)); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetFilename(JNIEnv *env, jobject obj, jstring jFile) { - g_filename = GetJString(env, jFile); +g_filename = GetJString(env, jFile); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JNIEnv *env, jobject obj, jint slot) { - State::Save(slot); +State::Save(slot); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadState(JNIEnv *env, jobject obj, jint slot) { - State::Load(slot); +State::Load(slot); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CreateUserFolders(JNIEnv *env, jobject obj) { - File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX)); - File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX)); - File::CreateFullPath(File::GetUserPath(D_WIIUSER_IDX)); - File::CreateFullPath(File::GetUserPath(D_CACHE_IDX)); - File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX)); - File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX)); - File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX)); - File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX)); - File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX)); - File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX)); - File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX)); - File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP); - File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP); - File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP); +File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX)); +File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX)); +File::CreateFullPath(File::GetUserPath(D_WIIUSER_IDX)); +File::CreateFullPath(File::GetUserPath(D_CACHE_IDX)); +File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX)); +File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX)); +File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX)); +File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX)); +File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX)); +File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX)); +File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX)); +File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP); +File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP); +File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetUserDirectory(JNIEnv *env, jobject obj, jstring jDirectory) { - std::string directory = GetJString(env, jDirectory); - g_set_userpath = directory; - UICommon::SetUserDirectory(directory); +std::string directory = GetJString(env, jDirectory); +g_set_userpath = directory; +UICommon::SetUserDirectory(directory); } JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserDirectory(JNIEnv *env, jobject obj) @@ -372,24 +522,24 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserDi JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *env, jobject obj, jobject _surf) { - surf = ANativeWindow_fromSurface(env, _surf); +surf = ANativeWindow_fromSurface(env, _surf); - // Install our callbacks - OSD::AddCallback(OSD::OSD_INIT, ButtonManager::Init); - OSD::AddCallback(OSD::OSD_SHUTDOWN, ButtonManager::Shutdown); +// Install our callbacks +OSD::AddCallback(OSD::OSD_INIT, ButtonManager::Init); +OSD::AddCallback(OSD::OSD_SHUTDOWN, ButtonManager::Shutdown); - RegisterMsgAlertHandler(&MsgAlert); +RegisterMsgAlertHandler(&MsgAlert); - UICommon::SetUserDirectory(g_set_userpath); - UICommon::Init(); +UICommon::SetUserDirectory(g_set_userpath); +UICommon::Init(); - // No use running the loop when booting fails - if ( BootManager::BootCore( g_filename.c_str() ) ) - while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) - updateMainFrameEvent.Wait(); +// No use running the loop when booting fails +if ( BootManager::BootCore( g_filename.c_str() ) ) +while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) +updateMainFrameEvent.Wait(); - UICommon::Shutdown(); - ANativeWindow_release(surf); +UICommon::Shutdown(); +ANativeWindow_release(surf); }