From b47835fc07371964816938c982c5aea3a9f564bb Mon Sep 17 00:00:00 2001
From: Eder Bastos <bastos.eder@gmail.com>
Date: Wed, 6 May 2015 20:12:58 -0400
Subject: [PATCH] Implement first few screens of Android 5.0-based UI.

---
 Source/Android/app/build.gradle               |  14 +-
 .../Android/app/src/main/AndroidManifest.xml  |  17 +-
 .../dolphinemu/dolphinemu/NativeLibrary.java  |   6 +
 .../activities/GameGridActivity.java          | 131 ++++++++
 .../dolphinemu/adapters/GameAdapter.java      | 113 +++++++
 .../dolphinemu/dialogs/GameDetailsDialog.java |  96 ++++++
 .../org/dolphinemu/dolphinemu/model/Game.java |  23 ++
 .../dolphinemu/dolphinemu/model/GcGame.java   |  96 ++++++
 .../dolphinemu/dolphinemu/model/WiiGame.java  |  53 +++
 .../viewholders/GameViewHolder.java           |  83 +++++
 .../src/main/res/anim/button_elevation.xml    |  19 ++
 .../src/main/res/drawable-hdpi/ic_country.png | Bin 0 -> 1055 bytes
 .../src/main/res/drawable-hdpi/ic_date.png    | Bin 0 -> 917 bytes
 .../src/main/res/drawable-hdpi/ic_play.png    | Bin 0 -> 282 bytes
 .../src/main/res/drawable-ldpi/ic_date.png    | Bin 0 -> 346 bytes
 .../res/drawable-mdpi/ic_action_overflow.png  | Bin 0 -> 197 bytes
 .../src/main/res/drawable-mdpi/ic_country.png | Bin 0 -> 743 bytes
 .../src/main/res/drawable-mdpi/ic_date.png    | Bin 0 -> 717 bytes
 .../src/main/res/drawable-mdpi/ic_play.png    | Bin 0 -> 257 bytes
 .../res/drawable-xhdpi/ic_action_overflow.png | Bin 0 -> 267 bytes
 .../main/res/drawable-xhdpi/ic_country.png    | Bin 0 -> 1390 bytes
 .../src/main/res/drawable-xhdpi/ic_date.png   | Bin 0 -> 1157 bytes
 .../src/main/res/drawable-xhdpi/ic_play.png   | Bin 0 -> 318 bytes
 .../drawable-xxhdpi/ic_action_overflow.png    | Bin 0 -> 264 bytes
 .../main/res/drawable-xxhdpi/ic_country.png   | Bin 0 -> 2053 bytes
 .../src/main/res/drawable-xxhdpi/ic_date.png  | Bin 0 -> 1479 bytes
 .../src/main/res/drawable-xxhdpi/ic_play.png  | Bin 0 -> 399 bytes
 .../main/res/drawable-xxxhdpi/ic_country.png  | Bin 0 -> 2783 bytes
 .../src/main/res/drawable-xxxhdpi/ic_play.png | Bin 0 -> 477 bytes
 .../app/src/main/res/drawable/oval_ripple.xml |   9 +
 .../main/res/layout/activity_game_grid.xml    |  24 ++
 .../app/src/main/res/layout/card_game.xml     |  71 ++++
 .../main/res/layout/dialog_game_details.xml   | 135 ++++++++
 .../app/src/main/res/values-w820dp/dimens.xml |   6 +
 .../app/src/main/res/values/colors.xml        |   8 +
 .../app/src/main/res/values/dimens.xml        |  10 +
 .../app/src/main/res/values/styles.xml        |  27 ++
 Source/Android/build.gradle                   |   2 +-
 Source/Core/DolphinWX/MainAndroid.cpp         | 310 +++++++++++++-----
 39 files changed, 1167 insertions(+), 86 deletions(-)
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GcGame.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/WiiGame.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/GameViewHolder.java
 create mode 100644 Source/Android/app/src/main/res/anim/button_elevation.xml
 create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_country.png
 create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_date.png
 create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_play.png
 create mode 100644 Source/Android/app/src/main/res/drawable-ldpi/ic_date.png
 create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_action_overflow.png
 create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_country.png
 create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_date.png
 create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_play.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_action_overflow.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_country.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_date.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_country.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_date.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_country.png
 create mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png
 create mode 100644 Source/Android/app/src/main/res/drawable/oval_ripple.xml
 create mode 100644 Source/Android/app/src/main/res/layout/activity_game_grid.xml
 create mode 100644 Source/Android/app/src/main/res/layout/card_game.xml
 create mode 100644 Source/Android/app/src/main/res/layout/dialog_game_details.xml
 create mode 100644 Source/Android/app/src/main/res/values-w820dp/dimens.xml
 create mode 100644 Source/Android/app/src/main/res/values/colors.xml
 create mode 100644 Source/Android/app/src/main/res/values/dimens.xml
 create mode 100644 Source/Android/app/src/main/res/values/styles.xml

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 @@
 
     <application
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
         android:allowBackup="true"
         android:supportsRtl="true">
+
+        <activity
+            android:name=".activities.GameGridActivity"
+            android:label="Dolphin New UI"
+            android:theme="@style/DolphinWii">
+
+            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
         <activity
             android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Holo.Light" >
 
-            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
+            <!-- Having a second activity with this intent-filter means we have two choices from the home screen. -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
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<Game> getGameList()
+	{
+		ArrayList<Game> gameList = new ArrayList<Game>();
+
+		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<String> exts = new HashSet<String>(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<GameViewHolder>
+{
+	private ArrayList<Game> mGameList;
+
+	/**
+	 * Mostly just initializes the dataset to be displayed.
+	 *
+	 * @param gameList
+	 */
+	public GameAdapter(ArrayList<Game> 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 @@
+<!-- res/anim/button_elevation.xml -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <objectAnimator
+            android:propertyName="translationZ"
+            android:duration="@android:integer/config_shortAnimTime"
+            android:valueFrom="@dimen/elevation_low"
+            android:valueTo="@dimen/elevation_high"
+            android:valueType="floatType"/>
+    </item>
+    <item>
+        <objectAnimator
+            android:propertyName="translationZ"
+            android:duration="@android:integer/config_shortAnimTime"
+            android:valueFrom="@dimen/elevation_high"
+            android:valueTo="@dimen/elevation_low"
+            android:valueType="floatType"/>
+    </item>
+</selector>
\ 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 0000000000000000000000000000000000000000..2eec57e591dab910a469227028b5ed73dc2b1b66
GIT binary patch
literal 1055
zcmeAS@N?(olHy`uVBq!ia0y~yU@!w=4i*Lm1~s2WVGIlm3dtTpz6=aiY77hwEes65
z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q
zL70(Y)*J~22IlFWE{-7)hu_YK_vs6iIqt7L>D2yD`C`S*k)N(bd+jjK?d%nL-G9qx
z?WT{WqKgz0iv?$MKR(tfdF`0cSypkei+{3}&T<KMe$@I~8*A}*Uh%x=Ht&CjyuaPL
zwYb!7|NY8+=Zojv|2g-*B~Q*9DQR)(>Wv9U6hwb&I0=5*z*@#q>8!)19@x)lQMy*X
zRHON9aFX!EUbg0reYVb4f84aUNv_RnZHqF#)*q82wn~SacdJ)Rk4ui}Eg$*H%SW^K
zxW6elI_ZLL>p|5e3;Vy<CCVLo@L;dpl1E)4R{J;RStNPB5N8WdHk8l{s@Ip0=vooa
z*j8{y)a{Gn!Bsb;9<JUsftRgq=ZmLHME@lua2#;|G?S67ZSD`{n%Fs_8*lz_alR#Z
z_GMkt&L=y&Z{+zs`Vjh~T=Ct}JkFr*4zuEGjSNYSKMub1PI}lBv($Q{?~_}+))y@n
zEmwKZ_2_iRS`jtli&Jl~Y?+X}?ZD~IHt&CdN4!~PDeDy57jM)l+O7NX`J8=5K2^fo
zuXu%YpD`)k*p`^i^WE~Yi_WdbL4Fn+V|2?7X(t`OlH|Wf>6?eDn9t9*a(td^Cx3R6
z{eOK{M(C+Oj8CsRES~Z0_@q+7?~^|lpR%cHjNbpELd{nHlE$>GP1Do_?H7nxpIO_y
zYwoSQn#!{?+>foiw7~L6@sy-nI|4e}r8cijyRwZ(KJx<8qnTbC-=^?S-l6}|>3nBu
zuZz#@zRX>^$G@69n;d&D$SKA*d6iPLvB3{v`xPSEPp>iln5FVEC4AxhMb&r8y%+wE
zJZ>D*S~ub4qIVDeY%L1hFMD#)x3FDRE6(*kjT5w9CAPWRRp(I7=bDFwE0;gB-a5@@
z^^{b{#foC>haPWq$$nvZJ4V#z{Rv&~2ggGvEBV%}-1H!G()D@&e9gJG7MNU&ShQUA
zz44LUQ$czMV<%QQYXnV~ShiYta;NXYxqhp6DShZY7GE4Mcz%i0z0R^V54OyRV61$1
zQPxx<j5A1gM&8o|L46sWT^pO1KbG^mRlz9NQ8w#?fWeOi4K;HL6pp=`s2ONwbTvU!
z;#}~42_7EREB4%M((kyHt2UNdv>$XS;cR9vh_v9bGLYv!d9S-9=J<jKZv(t{T0J}V
zxcOz!+GDc8(cM{0cjX^Ax1QK?Yn{~LL%*&bVN0C3J3If(xl7mdWB*J@R7}5?ygF~W
z+|kk?l~V!B_xP<kDj2);<-+bw3NDJQJ2j5jJyDW0Q=H#(-~8Y7q<Y4mDN{=3eP+GQ
Qz`(%Z>FVdQ&MBb@0LsVWoB#j-

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..590def8b802c90bef08a5b9e40b058f3a86dc10b
GIT binary patch
literal 917
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<aeF`h1tAr-gYMn-1`J4)m%
z`r7nkMMZ5ub5rZFm{}&vZgudp#&@mV*d@lYbj3lnTfY`e3EC5=zjTVy!TQ%dXQqAq
z@@8Z1Hh10K1}Zmi=6|2P`FHK^^vl=9y)+iKe7Zk1Xl2Q!2%UXLpO-J-w#hY-YTuSL
z`}9-3X{Vna-?aFz)7B{4$+JE?J3FTvzEEOsS6<yBQ_1?}zhi~{t^F-OzIMD-`ei%6
z?Y|^Xm4CCII9Kayi3*YX`%kWn&Uw7ab++L)=ij1Raxcium%l0hDqSe&FXw@T;u5Bc
zhWn9B_vK%9-t!k?xUIH<&1Q4Xa+Rz?bJh)yeKy~`(|$1SGACcotA{^KSQorgygj2z
zdehuVZ+lX$SKf?vl6kv5XAkQe-UVmX`OjqUy1tmn$7jXa7@lWmXY~s&STOH0Px*#D
zdEazevZa13I%obsNFevQ!z2dj_`v$@;f(f==6HBIOn>~oi^1|^v_QUlgK|f(=z+)|
zJ*82HzYF?(7n^Gyk@$;sossPBTW?n}@Ftioepj|pG<rUhSy`;Kn%pCc!|DaudiQkP
z<C$*UEVi)fQ4Kb`@TERUXF=@IXB-8g1@b>6pWcwWll$(_o8!+c_;TjGSol@X!GEdT
z<jIl^bG?=pU7Wc7<aUuYv(4Nr>X`iYbv&$mqLCS6&m^&?Z?U5^(>c{SwNdNNa@5LA
zZt&rm&d>C13PU(g0K=R!Kl>Q3i0|dRu<mxywUtr<BIb&6%3BuRl-Yd7U^CBtVYBn!
zR_tEvn{(uu1z*3^y-gFoHJZODVcLIO*GDUT`&6OayqMC}dVT8`R-KwGnCImFZQXX&
z7QXeFs}?{1&G*Bb^ZEa2um3V^F6i>sXgi;^p2Jaw<&QDb49O(6Q!he4AM#`2;p3Al
z=R8mmUb8H4UrYbhtgVNcnVH#n9vl!%<DM5?u`;!o<+X-E-{YrZ=L2f~r`iWv@6-Mv
z^5OMU*O!};7c4(7@>}mz=X_Cn>BASx9BcC*m4sjUx>MM^<mp6HgY7vH>!(lU+H7`X
zp0`Gp`-Z)FKW^<h+kK07x!4iT@FqoWR>tZ~d5Kb1!}CtooR4bk>Z4|61q-}pxxJfV
zp3_?C&ZQb>L=$Avf3W1;Jo@>bNA3Rio($&te+xJM5jTimf4#qIXH>d-rgE>nwG*f6
flz=LId&V&CkB80$2WT-cFfe$!`njxgN@xNA5$~oB

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..164385d047ab7a9a86438c8abed5c3d570e72bdc
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2
z3=9knFBlj~4Hy_+B``2p&0t^<FPO6{(1wA5fhoz`-G$+Qd;gjJ3=9mM1s;*b3=G`D
zAk4@xYmNj11H&Xw7sn8f<8QAX<aKorX?^JVW{v3rma2+ao6vyP>#U&~PMjtQx#~Yn
z6U3hQtMs4w=l$&5&UB`OmJeJ1acSvhJa*4=U@(?vXL@l`hC@t?ok`+^EJv7>5Hpj+
z<AoONg8WA#HKe+<FC=QLbDGQOd+e%NRPqhwR>2duIF@Wu;*L+wv|j9{w)n;({@UoD
g`|aN{FObbO*?xTDk)>Z57#J8lUHx3vIVCg!00~rBB>(^b

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..e6339193eafdcc1d66a698bdd1d30f46686a56cd
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s76+K-XLn>~aowVDF*-@lz
zvc|*;&ZI<@TsGHhI@PDw&CV5b5{OQm@1WzO@3{KG(hJ9|@?U>{%@J)8xLf9jrS<bq
zh0orYNWD&5Yti?9vBs{4yEBu|s(7yJv<(T}`tVIiQ43?og$c_x8}R&Yu@NcYYn)@P
zD57(b+bh$j!RFG3uKJ+GkIeSRutr=kaNhpQ?fuppXO7jey?A$Q##)`zyDI0&Pf6Xm
zGW!I(;|Bf8dDoZay<^GfG%44(bM=$N-4l~<PkS@zKc9lx5B`L8yw@4ln)vqTURHOg
zT(+xN_havqmoH8qo8xa0&$-B+K_NJ<bidyM*K6t@YU|yjEEzkWFVgs?VRMC9$fN%h
zQ?*a&lGQI`cQCNU8axVNGCCL^W&d~D+^pU=%uaWcHs8!}zRkeEz~JfX=d#Wzp$Pz=
C+?VhG

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..6f0fb23f4d9a2bad32b82ee41e079395e27f51a3
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O
z`AMk?p1FzXsX?iUDV2pMQ*9U+7}7mm978H@B_&9(E>2j&>{etdB`y6sNzktB+nbx)
zm&`cq)cCk|L&sf~q)9RdOfCc(ykhXWbU;@p>Aw4CQ`^&xGb3868=oFndojk~6+_ij
z=DiU|=JkXfUwrjrhMCOTKKFwf3Ze`w5)AooB$Ab@wR9O67#KWV{an^LB{Ts5j^;-b

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..34ab76ac9e5caa373fe4cda33ef844ce75ef82e6
GIT binary patch
literal 743
zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm^Ug=CK)Uj~LMH3o);76yi2
z3=9knFBlj~4Hy_+B``2p&0t^<FPO6{(1wA5fhoz`-G$+Qd;gjJ3=9mM1s;*b3=G`D
zAk4@xYmNj115>=Gi(`n#@vC8;*&>c2a>jmog*}!MAv}!!j~wfp-7W+^-qH8^;A#bq
zL*>HL6(q!ClH3CQlP(CTF4Bl|5t#mDnfQAt-x(=iUKkyeh_C;<YuD<vFD;s<f8hJO
zuWJ4Nb#>99Tr2-8uZ(oL(qYpj;U+m*Nm#;(-%K%BI*{A%q4qM_pksw5|FtjL70&mY
zAjD-XeD)~s=R@i~AAbt;|NPS`nEcw+s#BxavGh;F-A}RpzuU~VJZAs8_C|C6E5n4~
zn=aR{uH^S^YFjyf*;AXZ(-)-{hVSjV+VO4GVaY|ISN10>UQ7z<2p5PAIN#L0!ZqlP
zWWM%0wOy%i{vL@H(`uFE>D*;v=G%2&c)jsAzenX=o1}gu7cO$E@${)Q)nr$d63AWG
zeQa{CS>XE1nO<4yQ||lCKW%nVK>YfQjyo!L8KTD%*TtGv*nZ5Oed7ELrN>`7Eb;|&
zpWk9`o-WjX+huYLPxe>Kk6GO-nzPR<y?ye~>#a+6vWukn#NXGqMYve+Fv}>I{rdW!
zgz_UzwI18#Pfd*2P`oZ7e&y~yy_+s`ONDbgws%x(xp7}goj)PI&-5*4?ybtO%g=gj
z{r`krteH7q&hA(FcXRJQe;10$D%T#fbEuj0OXiNU)MU*E5;?4Q-&ro2dZm8R)Qrxs
zTSb>xR^ANDy&`t?A>aNd(~m?(=>^pvoO^%!?W?wbn3oH_IqoOB?QMjb_2=sM3~pB!
z%kz3350tv@<7W4|@C%E-Y4hTV4=);gX58t0IL`OjqK%$*o5Vc~cf8Ju5t_I5t<c1Y
x+Rps<POKK~4B%Y9M6$^7=h=6^1A9NQm+f{uJHwcDEdv7sgQu&X%Q~loCIH{3Ly7<Z

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..46c6a2ae4eb97d61e9f7fedc0a9ddf954313cf31
GIT binary patch
literal 717
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANM!Q#@T9Ln>~)4U6^;36z*y
z{L1u=QmXjrH6pD$@6TZS>eAWPrP0G?d&Rj+=<4Jy@k8xZ846A=ZU1t!58gU_J*~y^
z_{sJeyz;;2Y~8>2+xGppEmwxre{mOI9HV!Bir3QnN0UCT30m1RcX|6)^(zbW?B>_s
zTz$BmtMw3LM|?uu!9CMYKV4UDQNzIg-YH$Qn8k8U*lK>gsyc>8Cj7mNUSzEe+wGa0
za7E+#8o3^+i3^*r9NojechmCgUpXGWI(}n5^ULZ9vVyCxzrOzAkLV4nm^oXSa(K7f
zEmL2iy_YwkvTfPLjF^|dN^*YmoVDNZQ~X)5kTrA33C<_#*EMU@*zV?^V|Y2&b9v|1
zx$AfX4sD$?p(oFG`DJsLJFiqCe)FBbyJ+2d_j5<sK9q4B*M4w%SM6(=h2mk6jGugp
zn4kPwCfvFt)AiV#A3N4-ue-sv=cun->gJojb<`6!?~$A@yX>DpB+u_<3dMZN>?QY(
zm@x#ItBS19YSV4Ieg7!qcb#SXK3++Bu<D2zgUk6`-p%L!9y@e6qvhy=;`Y?%A61PK
z+_p-u(C=Bv*vhxqz2Js(Gb`8Omcu6;^VL>1)u!2=5L5K7_}}tVc|Pwp-kX~wQiN}a
z@715wtZS9Yacg@j$Di9(mI6Cu0yu6}|Ig$L(3y5JCGWT8f&4>D)fTQ&C|#)a;Q4gj
zt2+u~j?}ldCK<MICeAF8u)HBXNn!(g<bluG0%wdFXO`5IA8J_~!DA&qWzFZR_y_G8
z+ZcBo-J<J!Z(p$FD$A{grDqGH+j!FbiyYcx{rJ9Y5LPp8Pz(@i^V*UA?7UhDXL^<M
z2~&L*Ma!gih9&QRNH62twpzvNTK=`Z!$0nEE?#$7<4Mx-p0CDU;h%zUaR+Yp`ciyL
e{{R0U%zd1p&FqCwnHU%t7(8A5T-G@yGywpDjZiEA

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..8d1e433a5632a27efa3d68fddf1a88416e14ba77
GIT binary patch
literal 257
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#3dtTpz6=aiY77hwEes65
z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q
zL70(Y)*O)8m7Xq+Ar_~T|D1P_N=TCEle%W;@$l+LdD(ye|39ohR)6e2&kaR0UWI}m
z`_(d~{{8>|bN@qoX-z4I2e<08FPZ%L|Ns5}FaK+nWH2-?|IaM=N#!_mqPnm0QBRf1
zU(f$n1vP#BP|y2F`Q73FB|(#p?fM_IL!?>ZvB#N343|ohn;m|n2r)1)FnGH9xvX<a
GXaWFV$Y9+7

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..7ba4e10ea218fd516a1106a72e709b91c6bd359a
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$BuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFs$`-aSW-r_2%YA-a`fg4uQ>=3|ykbKIlcNL|;6_
z<N1{F5Z@bt%?C|YPSp83nM~t|ce-;@laYa;<VDdJ_GfdJ|1x9i(_1>_>-F=-a|HhW
ze)_(#_`R~+vs=IY9T*r{1RNL`t;&umY+-4ib9MpWmK}WO59WRdz5a0den*Hbi-1Ez
z+qH-8wRf4G+p(1{I9ht+Z9$QBj(`wEe}muk#O;R}82&WIHZU?QXq6CKaQf6n1_lNO
MPgg&ebxsLQ00#tR2mk;8

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..e5cc9bc28b3826946cc85a32393c17d168f593f1
GIT binary patch
literal 1390
zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BC?tCX`7$t6sWC7#v@kII
zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?<kJ
z24O~qS#u;97+9Wpx;Tbp+<QAKIw#asq^(?EBq#Ir-muPxi-c+elh!zjuxg&_c1v1p
z8kdx`h?67iua;{_i;F9>$}E#C-{>Iy&g<8%BsfGzYqEZH>k(S$a4|#J+m%xzSMxY~
zb!7IpH<s1gm#f!iT)Q0k|BTiBnYPB&XJ<Wr*sJ^bSR)9s<rsBGxbj+Cx`^ABTz0iy
z8xriMIP)aSDfXxrs?Rp$&5Af@xtPC1dA8+Cmx<TBWv}<j1t_jv7`VjL*!-hIa7BKE
z0rNMt%1)MD-HVkEbqYS_=oV%+>Fg4S-`=`bF>0^RF^|Tg%uOu+CWrrYudzGU>hpBR
z2bt%l|F$*x%W($C-T&=WwxP#IE@a>Fj~^ly)_gafdHl!W>-FO4{NftZ@49V}o2Sg(
zU&6=r{=CnD!^+Kn5AB{FVzVjo{cW|foo**h%g?lLZIAqWYwoG~-wE@Rp6*|JKiXlo
zU}pA*7%sM|yBtB<b>ZC~-m9fvn18C@DN`VM?@jZ)%1oltjHf(hujmDzl3jJ*)@ygg
zh52q%1q%yB7I62}E{|EM&$V=}$x`13<_p(}dUZ9H9N8CotMOiFti90U#}g0fJ4L^I
zy*p|}u9v5|T#RqT0@h<8*RmHmWYo@i|JrtH@S>xl$9COapLCv={mLq_UpmgQ*>ksD
z+SV!NFL~=~mT(3avx)!THu0KY;ZCthtWkPVTYg;O)%v&fW22qq$83|Xt4Eow^qqc9
z<#=tn*-QAv#U+o9bZk7s`z7^K<GupM)Qgi#76{J~<0%PV5}+<Crs|hyaKY>18{N}Q
z^EAKQpF1;Td4{F!x!nn_1{c&W=Im5GQ?oF?oT*kf>K309$6hUojP{Ie2WGwDfBD|J
zG0XL|Qg>bP1^>%uZ$0Mua_Ioi0h3CDiW7_CmA)_^bckIvQ}?Wn@UPE)3#PlA4$7{w
zSyIl%eA0D(66fch3*pv{^F(#$Z+nrsif;nT0@F@Lsp5VgzgLortyZSD&At*i?Jv9E
z0;|`CnJ2_rqrVj;*QlI3w&O78mtJko!;3>+Ozo^JEt&9c!{J3wO}tei?^G&DWF%g?
z|8?KVg^fnXqkcWSIHzQRTlukwNhJ%~?>ba^`hBWClQpsa-*tD6>*;63ek-}G=&je=
z9akFh+(tuh>pMr)bIp(3ME}n+aDSQm>Q2eh#~ODtSa0b?tufkiGwYAk;kj?WCRXX+
z^xErXyGe83z00BRPfsmt(_)>M<aeX!jJ4K_<8Hh!CM=$@z`bC8VBgI}kHXs5^FRGO
z{Z-V$O^ZvNeoig9YTV4XaGju+mZ?_S^uJkZFP=uEtZCyi^qQ`<G~(-Sf7?mjM_yc!
z5X|q5`l4gbbY*g~ZNdKqUGwZYpKf;iKl9k(u8oFOqGru($|vl&);u;3`L-weXa39Y
z=K?$9dnD$63*V+JcCPrxx$=rQe?Ga)RVLT3#h1=ov9E%EWyPFx+WUHo)FTh?jk1`Y
zUt686KH)6$sqgh}pO<{P>#din<t=}}GFxT3zU4l4aphxy_X4KtAD?-Q=Wy^zL+|rv
z*Inc+w>7<JzBl*VPSHDCcn=n<-(roMxKW??_%1f}N~d)epDU|b43@9ps&<xrDpWDA
z>TTP0w%gX)f!Cjy2gpA^7PmZJ-l+P^e~$_7oM%g{1OF{;RDHMmu*?6eN|Rfs1o~>T
zTl$!*zj(r+8xnM?My>b1WU5StOvW0fzwEvz*)JY@TD*gSfq}u()z4*}Q$iB}_YQpf

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..9ecb630740378a6fc9d91f51119b90191285d49b
GIT binary patch
literal 1157
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS#hd^}woLn>~)jr!{?;wZ6i
z>zn3%r|&P)->TC0JK+58C%+81yqFg|ylAgGaj8S$rE@p8rOVq3dV-vmfAXv6J)SEu
zZSGCmz0u(_#pS-0%&#necJt=U@_REwPR%q<KR3s+_*u^TYo<0fe*{)A-*#Y*IP?6o
zdHL%N5jyu8`n!HCI&bgn?CigM*|I*BRZnO7JY&)_57!VeTe^ws_KFWyA2uEJDnEE#
z<<$DjB&{6A_{Moh_Eee){8$~jVcmBYuIAtV2fi+{VEHb0DmSAy?^iI>>CMZ2ys6Fq
z`{Kn5&yWm9)4GC!4}$AzU+mjn@OQ!9gI+F-HfQCJ{#M%e%gxPAE@SVSS$@m?-|uF4
zTJ)1gYpcrCD95FJE88CYXa1A7RMA_P<3sRQnFT9OUEKa{jcJem^Y5_?Ay4M464Bb%
zmA!peyZN=<;fxm+7ri=m<Hn7^ScWhAx(l~ofBpWw{W-^ee)sEpTHKbUZrH@daOFgJ
zYO_LfCjSN*#|GYe%JEZ={uK^9J~LKQs-pe=l8}Pd2O8`5T^C@Ks<Pysw)OpeH3#Q;
zYp4HZ`}eocM6P$I5`X3l0mp`E0%{G6rdJ-9-DW+|T;CdMp~z%%y40y*F0;ykbNe_B
z__s8tTrk<e&dAl4X;8^z;KUr4P`B^gfurIaZ`pLLkAG#U^{Uu2^@-eqLsxd?2VS|c
zn8UX|YRB9d#z_r3SZ-`n;97onPXz0V2k*-r5A2nEx$5+ebGIrsJyK3{s_1@n`Pgs4
z=?tao&ZTI+`gyQ)KSzjJp$Pw+?JZBZY?yahh&Fw{dyM(Hl*RtX0u7Nf>uy&$3LoH(
z{IZ8}+2Kd!KTdz(y<H)+@*4jfhBu6fObydZnJgIjRx$)0YdFHGu(=`Kv)_1Xt@)Bf
zpJjgD{2NrwZB6v_nPya+ja1NM-1g!3P8H2+)o1U6>%EyatMy7>c>mhwo08xvp(oyr
z{~kP_8ugsrcJjUhGXq|?STHGur8O3BmfvB%zKZL9lt6nzWu%SaftltXTXyU5ZvGk7
zt1Xap*hpwf$<KqP*7vpUok{-3_eem<z%Xmh){jTxJ*&L7pPc?>+hI#?k589<oBbHn
z8-x$IHhBsx$m?bawQGpJqbL}6dg6koJ&tRBGAx^K_h|{+_dkCVT-0{&;^~^lTG(QK
z?yT6s9j)e#uhVaeng2|Vy_fx5&`OST)9TQfi@!JjzrJnTbRU6vr=Ev8?~u-Fzxl*_
z@83Rd1zzpXF%D+4ZJ)ZY46)J{tvdJjw*ue6PY-I9eD+PTcbobp^V9K9cN{LZbfubR
z$g(J}VYAKU+3;zROVf_}t1yT1HWm6c+bn<1?%#XT#NuS8c8Bwcl9QPQefxcFeofxo
z9y)n{#4^Xq)&KqLjC93V-fEnk*17oOti}m{wiTK`-Dx(jZqt@)WsDUfy|bs}-unDr
zMB`bI-t^sbUbT3#eKVarV^W8Yl*J0ZC004}G#h6!RA@r7`I(uUJHGL^MW~eYN=XYc
QFfcH9y85}Sb4q9e0ALX)zyJUM

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..a55d19922f71c313b6613fd661d95a4ad6c2738a
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsB3dtTpz6=aiY77hwEes65
z7#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~915=W>y9>kr_Wm>b85kHi3p^r=85p>Q
zL70(Y)*J~228L~(E{-7)hu>b?$lGin;P&wNh9!&IITKnZC>|0@VKZX1osy>~eM9Wo
zbeWfX4yfPsf1b_rHdChHK%-QHx$JHs13tDiA9jW{HaDg)u&B8;@iE-U_^H8YkXGd<
z%dp|{Mh(UWRr7nR8Fqe*V>f!N%WU*Wmvz#|dyFoR_p)~!`K{jYG37$+#4i(>l_%?6
zo;q!PUdWd{C5xS`-Yj`+C6w|tKF#RFrLC%xDJLII6;0W?dhz=Ad=>%rADH<$`WPRn
T>)c>qU|{fc^>bP0l+XkKjb&|$

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..5a603b6bc32763878eb8c5b952d25dd3d4b61cdf
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RWBuiW)N`mv#O3D+9QW+dm
z@{>{(JaZG%Q-e|yQz{EjrrIztFs$-)aSW-r_2$-Y&ISV!hl?6{Q%p;?tVx~DSRxp0
z?A$fsyrn`|<B6@6ADkE<AR+9whIp@G+|$x9x%%RBE04dw^|zUcqk(}*p@D%zfdRri
zAk^3Ru4?-8l{UXUc^NJUM+>qUPBwtZA(UNcSj)k{5YfL?Wb%hwECLP;ECLLSEDj8e
lU}l5cnx$Yn5B#ZPWMfEo6jw8{)jtIi@^tlcS?83{1OSGSPQ(BJ

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..6fa2c3b33c37c236dd4eb8022d39b9280399e79e
GIT binary patch
literal 2053
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
O3=E#GelF{r5}E)uN3(|j

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..076602cca305d7f8a789d610d9fdbe18165530ae
GIT binary patch
literal 1479
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^SB`#fD7Ln>~)o%=Rh#Z}<g
z=8ub>zy8@)wV++!(ck&oCeJiyo;g1s6n=LUXi-p_7jI)9XA{tOSRv6|^4qso0TrEp
z+ph^{Em=P!WmkIHUC-y58k25&mwvyJzijvNUAxNj`kWR9XozsN!l;>(boBK0O;9;G
zJv%$w-^D*HJp6y#srSkk<6ZK7R_AH{-u2@ABIo7zgfH%2;v0YR{Pd)6wan*QA78(I
zz5mOh<8B{sI(&Kf?Af#K$t`_GOYiNox_iyqZMMsQk-t2-z2|;QOH02$-TLlnY|Xr`
z#dXn9QC0i0_TIjIJN!Y-{VG>$E=4&(^_Z#L)iMuSHkJwA57{Fv{pd`t=6j1Jc{ZF(
z|EFd!Jm|Y*cW-Zi#nQ<uEq)&;^G@2{|8DW4yZfg<e&D=4@2$}Mmwi!duT`1U?zi}E
zefhiGY1Vsf%}@S6Uns%w^pL!y`<K~gpIN7B-@A3ID)f}++q=EzH&>OHmCc*HZLK7S
z`lt85H}<f;V5>7KFV{*wlx?}--K=*>H}baIuQhmG8GWkeRnzga39_p{@SmN$Nm{t!
zx0pkmyms)x^|}pO%!^nXmIs{rea%WNc?xTTr^6Nh2K@$4JI3jZ4u`dV-O%!H=n;+2
zsK3h*`tsSmsYX?)3<)+)x6f<rj#J`|J8*lg$uIWW*?;|?E|Pz8rlE$>;ro)F_}rbY
zT+$cq-(0yS-q0t`Uv%nkpt?YK_QRUOTh*5~+`n3=p8jG7Q^QBgr(!R6Fg1LB<ti=j
zU2Q+(=Un+;O`$>uT(+<@DAgKW{xLD;!rn=I-K-3|R=!XF*>+q1WlsddoL4%Ge~NE1
z9$;s2V0g%Ij>GlNY_o=j0GB-sCbxEEHWhN4Ntmm;mXs*27S9#XI6J3&>WcXdIjmXt
zul_&y^WCEE==UoQmB#omY}8;BU;rT->jOVmbzYTkxiKp<S^r4bme)7>N)*1WEZ+Z)
z!79SVUFNR)L=9Gs0=u{~HE$PaYiqB6U6s#Y_+KFUiHs(T#s1cn854cYQnw0Zu`={>
zM{WpEfAsF{D{IGqRo!;1EA=*2cOQEH;>+i>2e0H9Ls%E+*ReP-pdbTFhR^%HeRBJi
z#->nW%yuu$n89*&_C5WiS(Vp2m>Q0itvkHYwQG;>&L7cId@oL4{;;rLcFWzo{i>z9
zugcWkeE%i$^yjVQ?S0$6M!eehIJ>*5_|o0iqCJ;y_$_=j*S_dG(~n!L{vJ51$h&c?
z=Ie~^<-SqBGgic=+4!GjEoI8x{jP7iK=kEa9`9RMi+L^_yrNxwvvP^`F42?LpDnvH
zURf0A9=X<;#Wz_ca@OZF`_fFV2r|q*qN7p3%&~mooHikF7(zl4LWXd->+9?9pU8M&
z&fg%0RV|AJJ$u<0jPA@j`|NbbTk)0il1iP;e=Tizm^}UFBax{(U7a6{>^^U0H{gAc
z*za`vdf0i}SJ!N1Y9Fjlo1Q9_l-;LLAr<j{;qE|{1?S$mdYtoRE=dr|*_-R@Q!fya
zfBwxC%P$*G-*yi(XV47myTB`|IjQigimt`_c4ht#GuN-(yvp>zD+#tF`Dl%>0|Cq5
zh3<Zv-M#;`<rU>V(}x!vD-LBJn$uP!<%Jq21%-?+runV!zIbF!(8-<W1dUg!rL`W|
z9b{x#zV8~tgv>T;uFh?)vs6wV=U{#@^K8KpUB*un`*r{EJ-5wHy87~>xyJeHVt&`R
z&67*jvA6%2yV-VG?lOiCXN4^f?pS!Noa?I04BJmzgG+_0`<Zgv)hw@X-}`q@a(UWM
zmMw2CzMuYPPKR>M*OPa6SmV7nRd+Jla7lb#rhM-E<`iw8i>v))%G7__nun&!8CGRp
vF`D)xDeUgmVqKLteyAnm!hkG=|4a+M&1BoYb)psn0|SGntDnm{r-UW|X}GwV

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..043acd808ec133c8353be75d77ce9afeea456c9b
GIT binary patch
literal 399
zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BC?tCX`7$t6sWC7#v@kII
zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?<kJ
z24O~qS#u;97#P_-T^vI)?!CRSQLxEDp!MPWBtxa+Tw7Q-a%3`PAK*G+s$yBJ+;@9#
zrSfjk8siW5?!`{NFiXvWkt?8qNn`;7>x*=`5*@DvM`jx{d$O|_6efi+9XvIado>?N
z!m_6;S(=VGoOfqu*>J&7tC7KNwb2Hq#89>}g~di2SS6=4ny%QvW8>hO`hZzWgW3MV
zIinA(Z#9_n1Ii??Fr-d(lnro`yuzHT(>!Z|Z)!nCz@uZ4&nJ8Sy`n9?&T8ZQjLMg5
z`sVFE_i94ax}f9zzKr%S1kIEml&*7>Wc<EgBaQ8kLwM%O<84h1)eTGJ)^suFaT{^$
tkUgRCAWUIrd+~Els1Gz8{`37}(v7*sxMkI1Z3YGg22WQ%mvv4FO#u5&i*^72

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f11d5351f3742c1fb2df91a358274ab259cdc6e8
GIT binary patch
literal 2783
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
E07Z}(#sB~S

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..7cc0084756bfcb034ebd471394ef3c59c518de00
GIT binary patch
literal 477
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWC?tCX`7$t6sWC7#v@kII
zVqjosc)`F>YQVtoDuIE)Y6b&?c)^@qfi?^b3`|Mh?k)`f+xyS#XJBC9EbxddW?<kJ
z24O~qS#u;97#Kr6T^vIyZoR#Ay7!QSfa^u?4QIM+T@r#MIG83iNX+24arlz7KTlqG
z==aHS=>;mkSN+-?eId@8naAJ&12XY~bw}ZYwLB3&3LYI=#LZCg;jp(PgK@fAS}enX
zZd?CU2Avp-PghwP_E;8#voYLR{b&~J0<CqG4U2X>W8!)=i`Sz+n^nPdooU079oHBq
zJ&NM?=*Tuzuvurzu(0qgGe=Lhy+c4uHIvh$ThbdW*C{iY9WCWK(6*zGIiu&bN5irm
zeQXi3*FQ37KhAPEr2gf!=Xc>r|2osv&h3({-SFJMe2PWURaw;~?UpYKt5Oa2F6Fs<
z#hj&B#v$3@I71G{GY*EAi(OwHzB?h|8?#4z0Snt^b_J6eR~tSgTw_|Izia7yDHXQO
zObUPRsM*fg+0c~mjIpa}ChLUyvYVBX2@Q;F5=ex@<6rDSt#Sf)&)B|VU|?YIboFyt
I=akR{0P;+(@&Et;

literal 0
HcmV?d00001

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 @@
+<!-- res/drawable/oval_ripple.xml -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dolphin_wii"/>
+        </shape>
+    </item>
+</ripple>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <Toolbar
+        android:id="@+id/toolbar_game_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/dolphin_wii"
+        android:minHeight="?android:attr/actionBarSize"
+        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"/>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/grid_games"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/grid_card_game"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"/>
+
+</LinearLayout>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                                    xmlns:tools="http://schemas.android.com/tools"
+                                    android:layout_width="200dp"
+                                    android:layout_height="250dp"
+                                    android:transitionName="card_game">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/image_game_screen"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:scaleType="centerCrop"
+            android:transitionName="image_game_screen"
+            android:layout_weight="1"
+            tools:src="@drawable/placeholder_screenshot"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="72dp">
+
+
+            <TextView
+                android:id="@+id/text_game_title"
+                style="@android:style/TextAppearance.Material.Subhead"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/image_game_screen"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_toStartOf="@+id/button_details"
+                android:ellipsize="end"
+                android:lines="1"
+                android:maxLines="1"
+                tools:text="Rhythm Heaven Fever"/>
+
+            <TextView
+                android:id="@+id/text_game_description"
+                style="@android:style/TextAppearance.Material.Caption"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignEnd="@+id/text_game_title"
+                android:layout_alignParentBottom="true"
+                android:layout_alignStart="@+id/text_game_title"
+                android:layout_marginBottom="16dp"
+                android:layout_toStartOf="@+id/button_details"
+                android:ellipsize="end"
+                android:lines="1"
+                android:maxLines="1"
+                android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus sed odio vel quam auctor euismod. Pellentesque odio nibh, fermentum ut hendrerit id, ultrices et justo. "
+                tools:text="Zany rhythm action!"/>
+
+            <ImageButton
+                android:id="@+id/button_details"
+                style="@android:style/Widget.Material.Light.Button.Borderless.Small"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_alignParentEnd="true"
+                android:layout_alignTop="@+id/text_game_title"
+                android:src="@drawable/ic_action_overflow"/>
+        </RelativeLayout>
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
+
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_height="match_parent"
+             android:layout_width="match_parent"
+             android:transitionName="card_game">
+
+    <RelativeLayout
+        android:layout_width="480dp"
+        android:layout_height="match_parent">
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/circle_banner"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_below="@+id/image_game_screen"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="24dp"
+            tools:src="@drawable/placeholder_banner"
+            app:border_color="#ffcccccc"
+            app:border_width="2dp"
+            />
+
+        <ImageView
+            android:id="@+id/image_game_screen"
+            android:layout_width="match_parent"
+            android:layout_height="320dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:scaleType="centerCrop"
+            android:transitionName="image_game_screen"
+            tools:src="@drawable/placeholder_screenshot"/>
+
+        <TextView
+            android:id="@+id/text_game_title"
+            style="@android:style/TextAppearance.Material.Headline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_below="@+id/image_game_screen"
+            android:layout_marginLeft="36dp"
+            android:layout_marginRight="36dp"
+            android:layout_marginTop="24dp"
+            android:layout_toEndOf="@+id/circle_banner"
+            android:ellipsize="end"
+            android:lines="1"
+            android:maxLines="1"
+            tools:text="Rhythm Heaven Fever"/>
+
+        <TextView
+            android:id="@+id/text_game_description"
+            style="@android:style/TextAppearance.Material.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignEnd="@+id/text_game_title"
+            android:layout_alignStart="@+id/text_game_title"
+            android:layout_below="@+id/text_game_title"
+            android:layout_marginTop="8dp"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus sed odio vel quam auctor euismod. Pellentesque odio nibh, fermentum ut hendrerit id, ultrices et justo. "
+            tools:text="Zany rhythm action!"
+            />
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/text_game_description"
+            android:layout_marginTop="16dp"
+
+            android:background="#1F000000"/>
+
+        <ImageView
+            android:id="@+id/icon_country"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignStart="@+id/circle_banner"
+            android:layout_alignTop="@+id/divider"
+            android:layout_marginTop="24dp"
+            android:padding="6dp"
+            android:src="@drawable/ic_country"/>
+
+        <ImageView
+            android:id="@+id/icon_year"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignStart="@+id/icon_country"
+            android:layout_below="@+id/icon_country"
+            android:layout_marginTop="16dp"
+            android:padding="6dp"
+            android:src="@drawable/ic_date"
+            android:layout_marginBottom="16dp"/>
+
+        <TextView
+            android:id="@+id/text_country"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/icon_country"
+            android:layout_alignStart="@+id/text_game_description"
+            android:layout_alignTop="@+id/icon_country"
+            android:gravity="center_vertical"
+            android:text="United States"
+            tools:text="United States"/>
+
+        <TextView
+            android:id="@+id/text_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/icon_year"
+            android:layout_alignStart="@+id/text_country"
+            android:layout_alignTop="@+id/icon_year"
+            android:gravity="center_vertical"
+            android:text="2010"
+            tools:text="2010"/>
+
+        <ImageButton
+            android:id="@+id/button_launch"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_alignBottom="@+id/image_game_screen"
+            android:layout_alignEnd="@+id/text_game_title"
+            android:layout_marginBottom="-28dp"
+            android:background="@drawable/oval_ripple"
+            android:src="@drawable/ic_play"
+            android:stateListAnimator="@anim/button_elevation"
+            android:elevation="4dp"/>
+    </RelativeLayout>
+
+
+</FrameLayout>
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 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="dolphin_wii">#5bc0de</color>
+    <color name="dolphin_wii_dark">#428bca</color>
+
+    <color name="dolphin_gamecube">#663399</color>
+    <color name="dolphin_gamecube_dark">#311b92</color>
+</resources>
\ 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 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="diameter">48dp</dimen>
+    <dimen name="elevation_low">1dp</dimen>
+    <dimen name="elevation_high">4dp</dimen>
+    <dimen name="add_button_margin">16dp</dimen>
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- inherit from the material theme -->
+    <style name="DolphinWii" parent="android:Theme.Material.Light.NoActionBar">
+        <!-- Main theme colors -->
+        <!--   your app branding color for the app bar -->
+        <item name="android:colorPrimary">@color/dolphin_wii</item>
+        <!--   darker variant for the status bar and contextual app bars -->
+        <item name="android:colorPrimaryDark">@color/dolphin_wii_dark</item>
+        <!--   theme UI controls like checkboxes and text fields -->
+        <item name="android:colorAccent">@color/dolphin_gamecube</item>
+    </style>
+
+    <style name="DolphinGamecube" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="android:colorPrimary">@color/dolphin_gamecube</item>
+        <item name="android:colorPrimaryDark">@color/dolphin_gamecube_dark</item>
+        <item name="android:colorAccent">@color/dolphin_wii</item>
+
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+    </style>
+
+    <style name="DolphinWiiTransparent" parent="android:Theme.Material.Light.NoActionBar.TranslucentDecor">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
+</resources>
\ 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<DiscIO::IVolume::ELanguage, std::string> 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<u32> 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<DiscIO::IVolume> 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<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename));
+
+	if (pVolume != nullptr) {
+		std::map <DiscIO::IVolume::ELanguage, std::string> 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 <DiscIO::IVolume::ELanguage, std::string> 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);
 }