fix android compilation an initial ishiiruka android version

.gitignore

@@ -36,3 +36,8 @@ CMakeLists.txt.user
 /.idea/
 /Externals/ed25519/ed25519.log
 /Externals/picojson/picojson.log
+/Source/Android/.gradle/
+/Source/Android/.idea/
+/Source/Android/build/
+/Source/Android/app/.cxx/
+/Source/Android/app/release/

Externals/wxWidgets3/src/common/string.cpp

@@ -207,7 +207,7 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedCharBuffer& str)
     return os << str.data();
 }
 
-#ifndef __BORLANDC__
+#if !defined(__BORLANDC__) && (!defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1926)) 
 wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedWCharBuffer& str)
 {
     return os << str.data();

Source/Android/app/.gitignore

@@ -1,2 +1,5 @@
 /build
 /.externalNativeBuild
+/.cxx
+/Debug
+/Release

Source/Android/app/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -21,23 +21,25 @@ android {
 
     defaultConfig {
         // TODO If this is ever modified, change application_id in strings.xml
-        applicationId "org.dolphinemu.dolphinemu"
+        applicationId "org.dolphinemu.ishiiruka"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 29
 
         versionCode(getBuildVersionCode())
 
         versionName "${getVersion()}"
     }
 
+    def keystorePropertiesFile = rootProject.file("../../../keystore.properties")
+    def keystoreProperties = new Properties()
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
     signingConfigs {
         release {
-            if (project.hasProperty('keystore')) {
-                storeFile file(project.property('keystore'))
-                storePassword project.property('storepass')
-                keyAlias project.property('keyalias')
-                keyPassword project.property('keypass')
-            }
+            storeFile file(keystoreProperties['keystore'])
+            storePassword keystoreProperties['storepass']
+            keyAlias keystoreProperties['keyalias']
+            keyPassword keystoreProperties['keypass']
         }
     }
 
@@ -63,6 +65,7 @@ android {
             path "../../../CMakeLists.txt"
         }
     }
+    ndkVersion '21.0.6113669'
 
     defaultConfig {
         externalNativeBuild {

Source/Android/app/src/androidTest/java/org/dolphinemu/ishiiruka/ApplicationTest.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu;
+package org.dolphinemu.ishiiruka;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
@@ -10,4 +10,4 @@ public class ApplicationTest extends ApplicationTestCase<Application> {
     public ApplicationTest() {
         super(Application.class);
     }
-}
+}

Source/Android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.dolphinemu.dolphinemu">
+          package="org.dolphinemu.ishiiruka">
 
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -18,7 +18,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".DolphinApplication"
+        android:name=".IshiirukaApplication"
         android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"
         android:allowBackup="true"

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragment.java

@@ -1,6 +0,0 @@
-package org.dolphinemu.dolphinemu.ui.input.gamecube;
-
-
-public class ControllerFragment
-{
-}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentPresenter.java

@@ -1,6 +0,0 @@
-package org.dolphinemu.dolphinemu.ui.input.gamecube;
-
-
-public class ControllerFragmentPresenter
-{
-}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentView.java

@@ -1,6 +0,0 @@
-package org.dolphinemu.dolphinemu.ui.input.gamecube;
-
-
-public interface ControllerFragmentView
-{
-}

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/IshiirukaApplication.java

@@ -1,12 +1,12 @@
-package org.dolphinemu.dolphinemu;
+package org.dolphinemu.ishiiruka;
 
 import android.app.Application;
 
-import org.dolphinemu.dolphinemu.model.GameDatabase;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.utils.PermissionsHandler;
+import org.dolphinemu.ishiiruka.model.GameDatabase;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.utils.PermissionsHandler;
 
-public class DolphinApplication extends Application
+public class IshiirukaApplication extends Application
 {
 	public static GameDatabase databaseHelper;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/NativeLibrary.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu;
+package org.dolphinemu.ishiiruka;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -15,8 +15,8 @@ import android.content.res.AssetManager;
 import android.view.Surface;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
-import org.dolphinemu.dolphinemu.utils.Log;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.utils.Log;
 
 import java.lang.ref.WeakReference;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/activities/CustomFilePickerActivity.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.activities;
+package org.dolphinemu.ishiiruka.activities;
 
 import android.os.Environment;
 import android.support.annotation.Nullable;
@@ -6,7 +6,7 @@ import android.support.annotation.Nullable;
 import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
-import org.dolphinemu.dolphinemu.fragments.CustomFilePickerFragment;
+import org.dolphinemu.ishiiruka.fragments.CustomFilePickerFragment;
 
 import java.io.File;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/activities/EmulationActivity.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.activities;
+package org.dolphinemu.ishiiruka.activities;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -31,19 +31,19 @@ import android.widget.Toast;
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.fragments.EmulationFragment;
-import org.dolphinemu.dolphinemu.fragments.MenuFragment;
-import org.dolphinemu.dolphinemu.fragments.SaveLoadStateFragment;
-import org.dolphinemu.dolphinemu.ui.main.MainActivity;
-import org.dolphinemu.dolphinemu.ui.main.MainPresenter;
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
-import org.dolphinemu.dolphinemu.utils.Animations;
-import org.dolphinemu.dolphinemu.utils.ControllerMappingHelper;
-import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
-import org.dolphinemu.dolphinemu.utils.Java_GCAdapter;
-import org.dolphinemu.dolphinemu.utils.Java_WiimoteAdapter;
+import org.dolphinemu.ishiiruka.NativeLibrary;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.fragments.EmulationFragment;
+import org.dolphinemu.ishiiruka.fragments.MenuFragment;
+import org.dolphinemu.ishiiruka.fragments.SaveLoadStateFragment;
+import org.dolphinemu.ishiiruka.ui.main.MainActivity;
+import org.dolphinemu.ishiiruka.ui.main.MainPresenter;
+import org.dolphinemu.ishiiruka.ui.platform.Platform;
+import org.dolphinemu.ishiiruka.utils.Animations;
+import org.dolphinemu.ishiiruka.utils.ControllerMappingHelper;
+import org.dolphinemu.ishiiruka.utils.FileBrowserHelper;
+import org.dolphinemu.ishiiruka.utils.Java_GCAdapter;
+import org.dolphinemu.ishiiruka.utils.Java_WiimoteAdapter;
 
 import java.lang.annotation.Retention;
 import java.util.List;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/adapters/GameAdapter.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.adapters;
+package org.dolphinemu.ishiiruka.adapters;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -12,15 +12,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
-import org.dolphinemu.dolphinemu.model.GameDatabase;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity;
-import org.dolphinemu.dolphinemu.utils.Log;
-import org.dolphinemu.dolphinemu.utils.PicassoUtils;
-import org.dolphinemu.dolphinemu.utils.SettingsFile;
-import org.dolphinemu.dolphinemu.viewholders.GameViewHolder;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.model.GameDatabase;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsActivity;
+import org.dolphinemu.ishiiruka.utils.Log;
+import org.dolphinemu.ishiiruka.utils.PicassoUtils;
+import org.dolphinemu.ishiiruka.utils.SettingsFile;
+import org.dolphinemu.ishiiruka.viewholders.GameViewHolder;
 
 import java.io.File;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/adapters/GameRowPresenter.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.adapters;
+package org.dolphinemu.ishiiruka.adapters;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -13,13 +13,13 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.Game;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity;
-import org.dolphinemu.dolphinemu.utils.PicassoUtils;
-import org.dolphinemu.dolphinemu.utils.SettingsFile;
-import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.Game;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsActivity;
+import org.dolphinemu.ishiiruka.utils.PicassoUtils;
+import org.dolphinemu.ishiiruka.utils.SettingsFile;
+import org.dolphinemu.ishiiruka.viewholders.TvGameViewHolder;
 
 import java.io.File;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/adapters/PlatformPagerAdapter.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.adapters;
+package org.dolphinemu.ishiiruka.adapters;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -9,9 +9,9 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.ImageSpan;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
-import org.dolphinemu.dolphinemu.ui.platform.PlatformGamesFragment;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.ui.platform.Platform;
+import org.dolphinemu.ishiiruka.ui.platform.PlatformGamesFragment;
 
 public class PlatformPagerAdapter extends FragmentPagerAdapter
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/adapters/SettingsRowPresenter.java

@@ -1,12 +1,12 @@
-package org.dolphinemu.dolphinemu.adapters;
+package org.dolphinemu.ishiiruka.adapters;
 
 import android.content.res.Resources;
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;
 import android.view.ViewGroup;
 
-import org.dolphinemu.dolphinemu.model.TvSettingsItem;
-import org.dolphinemu.dolphinemu.viewholders.TvSettingsViewHolder;
+import org.dolphinemu.ishiiruka.model.TvSettingsItem;
+import org.dolphinemu.ishiiruka.viewholders.TvSettingsViewHolder;
 
 public final class SettingsRowPresenter extends Presenter
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/dialogs/GameDetailsDialog.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.dialogs;
+package org.dolphinemu.ishiiruka.dialogs;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -12,8 +12,8 @@ import android.widget.TextView;
 
 import com.squareup.picasso.Picasso;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
 
 import de.hdodenhof.circleimageview.CircleImageView;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/dialogs/MotionAlertDialog.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.dialogs;
+package org.dolphinemu.ishiiruka.dialogs;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -8,9 +8,9 @@ import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
-import org.dolphinemu.dolphinemu.model.settings.view.InputBindingSetting;
-import org.dolphinemu.dolphinemu.utils.ControllerMappingHelper;
-import org.dolphinemu.dolphinemu.utils.Log;
+import org.dolphinemu.ishiiruka.model.settings.view.InputBindingSetting;
+import org.dolphinemu.ishiiruka.utils.ControllerMappingHelper;
+import org.dolphinemu.ishiiruka.utils.Log;
 
 import java.util.List;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/fragments/CustomFilePickerFragment.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.fragments;
+package org.dolphinemu.ishiiruka.fragments;
 
 import android.net.Uri;
 import android.support.annotation.NonNull;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/fragments/EmulationFragment.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.fragments;
+package org.dolphinemu.ishiiruka.fragments;
 
 import android.content.Context;
 import android.content.IntentFilter;
@@ -16,14 +16,14 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
-import org.dolphinemu.dolphinemu.overlay.InputOverlay;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService.DirectoryInitializationState;
-import org.dolphinemu.dolphinemu.utils.DirectoryStateReceiver;
-import org.dolphinemu.dolphinemu.utils.Log;
+import org.dolphinemu.ishiiruka.NativeLibrary;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.overlay.InputOverlay;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService.DirectoryInitializationState;
+import org.dolphinemu.ishiiruka.utils.DirectoryStateReceiver;
+import org.dolphinemu.ishiiruka.utils.Log;
 
 import java.io.File;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/fragments/MenuFragment.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.fragments;
+package org.dolphinemu.ishiiruka.fragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -11,8 +11,8 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
 
 public final class MenuFragment extends Fragment implements View.OnClickListener
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/fragments/SaveLoadStateFragment.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.fragments;
+package org.dolphinemu.ishiiruka.fragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -10,8 +10,8 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.GridLayout;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
 
 public final class SaveLoadStateFragment extends Fragment implements View.OnClickListener
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/FileListItem.java

@@ -1,6 +1,6 @@
-package org.dolphinemu.dolphinemu.model;
+package org.dolphinemu.ishiiruka.model;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.ishiiruka.NativeLibrary;
 
 import java.io.File;
 import java.util.Arrays;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/Game.java

@@ -1,10 +1,10 @@
-package org.dolphinemu.dolphinemu.model;
+package org.dolphinemu.ishiiruka.model;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.os.Environment;
 
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
+import org.dolphinemu.ishiiruka.ui.platform.Platform;
 
 public final class Game
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/GameDatabase.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model;
+package org.dolphinemu.ishiiruka.model;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -6,9 +6,9 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
-import org.dolphinemu.dolphinemu.utils.Log;
+import org.dolphinemu.ishiiruka.NativeLibrary;
+import org.dolphinemu.ishiiruka.ui.platform.Platform;
+import org.dolphinemu.ishiiruka.utils.Log;
 
 import java.io.File;
 import java.util.Arrays;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/GameProvider.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model;
+package org.dolphinemu.ishiiruka.model;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -7,8 +7,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 
-import org.dolphinemu.dolphinemu.BuildConfig;
-import org.dolphinemu.dolphinemu.utils.Log;
+import org.dolphinemu.ishiiruka.BuildConfig;
+import org.dolphinemu.ishiiruka.utils.Log;
 
 /**
  * Provides an interface allowing Activities to interact with the SQLite database.

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/TvSettingsItem.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model;
+package org.dolphinemu.ishiiruka.model;
 
 public final class TvSettingsItem
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/BooleanSetting.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model.settings;
+package org.dolphinemu.ishiiruka.model.settings;
 
 public final class BooleanSetting extends Setting
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/FloatSetting.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model.settings;
+package org.dolphinemu.ishiiruka.model.settings;
 
 public final class FloatSetting extends Setting
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/IntSetting.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model.settings;
+package org.dolphinemu.ishiiruka.model.settings;
 
 public final class IntSetting extends Setting
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/Setting.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model.settings;
+package org.dolphinemu.ishiiruka.model.settings;
 
 /**
  * Abstraction for a setting item as read from / written to Dolphin's configuration ini files.

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/SettingSection.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model.settings;
+package org.dolphinemu.ishiiruka.model.settings;
 
 import java.util.HashMap;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/StringSetting.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.model.settings;
+package org.dolphinemu.ishiiruka.model.settings;
 
 public final class StringSetting extends Setting
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/view/CheckBoxSetting.java

@@ -1,7 +1,7 @@
-package org.dolphinemu.dolphinemu.model.settings.view;
+package org.dolphinemu.ishiiruka.model.settings.view;
 
-import org.dolphinemu.dolphinemu.model.settings.BooleanSetting;
-import org.dolphinemu.dolphinemu.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.BooleanSetting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
 
 public final class CheckBoxSetting extends SettingsItem
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/view/HeaderSetting.java

@@ -1,6 +1,6 @@
-package org.dolphinemu.dolphinemu.model.settings.view;
+package org.dolphinemu.ishiiruka.model.settings.view;
 
-import org.dolphinemu.dolphinemu.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
 
 public final class HeaderSetting extends SettingsItem
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/view/InputBindingSetting.java

@@ -1,8 +1,8 @@
-package org.dolphinemu.dolphinemu.model.settings.view;
+package org.dolphinemu.ishiiruka.model.settings.view;
 
-import org.dolphinemu.dolphinemu.model.settings.BooleanSetting;
-import org.dolphinemu.dolphinemu.model.settings.Setting;
-import org.dolphinemu.dolphinemu.model.settings.StringSetting;
+import org.dolphinemu.ishiiruka.model.settings.BooleanSetting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.StringSetting;
 
 public final class InputBindingSetting extends SettingsItem
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/view/SettingsItem.java

@@ -1,6 +1,6 @@
-package org.dolphinemu.dolphinemu.model.settings.view;
+package org.dolphinemu.ishiiruka.model.settings.view;
 
-import org.dolphinemu.dolphinemu.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
 
 /**
  * ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments.
@@ -109,7 +109,7 @@ public abstract class SettingsItem
 	}
 
 	/**
-	 * Used by {@link org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter}'s onCreateViewHolder()
+	 * Used by {@link org.dolphinemu.ishiiruka.ui.settings.SettingsAdapter}'s onCreateViewHolder()
 	 * method to determine which type of ViewHolder should be created.
 	 *
 	 * @return An integer (ideally, one of the constants defined in this file)

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/view/SingleChoiceSetting.java

@@ -1,7 +1,7 @@
-package org.dolphinemu.dolphinemu.model.settings.view;
+package org.dolphinemu.ishiiruka.model.settings.view;
 
-import org.dolphinemu.dolphinemu.model.settings.IntSetting;
-import org.dolphinemu.dolphinemu.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.IntSetting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
 
 public final class SingleChoiceSetting extends SettingsItem
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/view/SliderSetting.java

@@ -1,10 +1,10 @@
-package org.dolphinemu.dolphinemu.model.settings.view;
+package org.dolphinemu.ishiiruka.model.settings.view;
 
-import org.dolphinemu.dolphinemu.model.settings.FloatSetting;
-import org.dolphinemu.dolphinemu.model.settings.IntSetting;
-import org.dolphinemu.dolphinemu.model.settings.Setting;
-import org.dolphinemu.dolphinemu.utils.Log;
-import org.dolphinemu.dolphinemu.utils.SettingsFile;
+import org.dolphinemu.ishiiruka.model.settings.FloatSetting;
+import org.dolphinemu.ishiiruka.model.settings.IntSetting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
+import org.dolphinemu.ishiiruka.utils.Log;
+import org.dolphinemu.ishiiruka.utils.SettingsFile;
 
 public final class SliderSetting extends SettingsItem
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/model/settings/view/SubmenuSetting.java

@@ -1,6 +1,6 @@
-package org.dolphinemu.dolphinemu.model.settings.view;
+package org.dolphinemu.ishiiruka.model.settings.view;
 
-import org.dolphinemu.dolphinemu.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
 
 public final class SubmenuSetting extends SettingsItem
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/overlay/InputOverlay.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.overlay;
+package org.dolphinemu.ishiiruka.overlay;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,11 +22,11 @@ import android.view.SurfaceView;
 import android.view.View;
 import android.view.View.OnTouchListener;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.NativeLibrary.ButtonState;
-import org.dolphinemu.dolphinemu.NativeLibrary.ButtonType;
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.NativeLibrary;
+import org.dolphinemu.ishiiruka.NativeLibrary.ButtonState;
+import org.dolphinemu.ishiiruka.NativeLibrary.ButtonType;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
 
 import java.util.HashSet;
 import java.util.Set;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/overlay/InputOverlayDrawableButton.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.overlay;
+package org.dolphinemu.ishiiruka.overlay;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/overlay/InputOverlayDrawableDpad.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.overlay;
+package org.dolphinemu.ishiiruka.overlay;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/overlay/InputOverlayDrawableJoystick.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.overlay;
+package org.dolphinemu.ishiiruka.overlay;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/services/DirectoryInitializationService.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.services;
+package org.dolphinemu.ishiiruka.services;
 
 import android.app.IntentService;
 import android.content.Context;
@@ -14,9 +14,9 @@ import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.utils.Log;
-import org.dolphinemu.dolphinemu.utils.PermissionsHandler;
+import org.dolphinemu.ishiiruka.NativeLibrary;
+import org.dolphinemu.ishiiruka.utils.Log;
+import org.dolphinemu.ishiiruka.utils.PermissionsHandler;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public final class DirectoryInitializationService extends IntentService
 {
-    public static final String BROADCAST_ACTION = "org.dolphinemu.dolphinemu.BROADCAST";
+    public static final String BROADCAST_ACTION = "org.dolphinemu.ishiiruka.BROADCAST";
 
     public static final String EXTRA_STATE = "directoryState";
     private static volatile DirectoryInitializationState directoryState = null;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/services/USBPermService.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.services;
+package org.dolphinemu.ishiiruka.services;
 
 import android.app.IntentService;
 import android.content.Intent;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/DividerItemDecoration.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui;
+package org.dolphinemu.ishiiruka.ui;
 
 import android.content.Context;
 import android.content.res.TypedArray;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/NVidiaShieldWorkaroundView.java

@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.ui;
+package org.dolphinemu.ishiiruka.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/input/gamecube/ControllerFragment.java

@@ -0,0 +1,6 @@
+package org.dolphinemu.ishiiruka.ui.input.gamecube;
+
+
+public class ControllerFragment
+{
+}

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/input/gamecube/ControllerFragmentPresenter.java

@@ -0,0 +1,6 @@
+package org.dolphinemu.ishiiruka.ui.input.gamecube;
+
+
+public class ControllerFragmentPresenter
+{
+}

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/input/gamecube/ControllerFragmentView.java

@@ -0,0 +1,6 @@
+package org.dolphinemu.ishiiruka.ui.input.gamecube;
+
+
+public interface ControllerFragmentView
+{
+}

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/main/CustomTitleView.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.main;
+package org.dolphinemu.ishiiruka.ui.main;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -9,7 +9,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.ishiiruka.R;
 
 public class CustomTitleView extends LinearLayout implements TitleViewAdapter.Provider {
     private final TextView mTitleView;
@@ -77,4 +77,4 @@ public class CustomTitleView extends LinearLayout implements TitleViewAdapter.Pr
     {
         return mTitleViewAdapter;
     }
-}
+}

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/main/MainActivity.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.main;
+package org.dolphinemu.ishiiruka.ui.main;
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -16,17 +16,17 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.adapters.PlatformPagerAdapter;
-import org.dolphinemu.dolphinemu.model.GameProvider;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
-import org.dolphinemu.dolphinemu.ui.platform.PlatformGamesView;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity;
-import org.dolphinemu.dolphinemu.utils.AddDirectoryHelper;
-import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
-import org.dolphinemu.dolphinemu.utils.PermissionsHandler;
-import org.dolphinemu.dolphinemu.utils.StartupHandler;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.adapters.PlatformPagerAdapter;
+import org.dolphinemu.ishiiruka.model.GameProvider;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.ui.platform.Platform;
+import org.dolphinemu.ishiiruka.ui.platform.PlatformGamesView;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsActivity;
+import org.dolphinemu.ishiiruka.utils.AddDirectoryHelper;
+import org.dolphinemu.ishiiruka.utils.FileBrowserHelper;
+import org.dolphinemu.ishiiruka.utils.PermissionsHandler;
+import org.dolphinemu.ishiiruka.utils.StartupHandler;
 
 /**
  * The main Activity of the Lollipop style UI. Manages several PlatformGamesFragments, which

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/main/MainPresenter.java

@@ -1,13 +1,13 @@
-package org.dolphinemu.dolphinemu.ui.main;
+package org.dolphinemu.ishiiruka.ui.main;
 
 
-import org.dolphinemu.dolphinemu.BuildConfig;
-import org.dolphinemu.dolphinemu.DolphinApplication;
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.GameDatabase;
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
-import org.dolphinemu.dolphinemu.utils.AddDirectoryHelper;
-import org.dolphinemu.dolphinemu.utils.SettingsFile;
+import org.dolphinemu.ishiiruka.BuildConfig;
+import org.dolphinemu.ishiiruka.IshiirukaApplication;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.GameDatabase;
+import org.dolphinemu.ishiiruka.ui.platform.Platform;
+import org.dolphinemu.ishiiruka.utils.AddDirectoryHelper;
+import org.dolphinemu.ishiiruka.utils.SettingsFile;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -57,7 +57,7 @@ public final class MainPresenter
 				return true;
 
 			case R.id.menu_refresh:
-				GameDatabase databaseHelper = DolphinApplication.databaseHelper;
+				GameDatabase databaseHelper = IshiirukaApplication.databaseHelper;
 				databaseHelper.scanLibrary(databaseHelper.getWritableDatabase());
 				mView.refresh();
 				return true;
@@ -93,7 +93,7 @@ public final class MainPresenter
 
 	public void loadGames(final Platform platform)
 	{
-		GameDatabase databaseHelper = DolphinApplication.databaseHelper;
+		GameDatabase databaseHelper = IshiirukaApplication.databaseHelper;
 
 		databaseHelper.getGamesForPlatform(platform)
 				.subscribeOn(Schedulers.io())

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/main/MainView.java

@@ -1,8 +1,8 @@
-package org.dolphinemu.dolphinemu.ui.main;
+package org.dolphinemu.ishiiruka.ui.main;
 
 import android.database.Cursor;
 
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
+import org.dolphinemu.ishiiruka.ui.platform.Platform;
 
 /**
  * Abstraction for the screen that shows on application launch.

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/main/TvMainActivity.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.main;
+package org.dolphinemu.ishiiruka.ui.main;
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -17,20 +17,20 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
-import org.dolphinemu.dolphinemu.adapters.GameRowPresenter;
-import org.dolphinemu.dolphinemu.adapters.SettingsRowPresenter;
-import org.dolphinemu.dolphinemu.model.Game;
-import org.dolphinemu.dolphinemu.model.TvSettingsItem;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity;
-import org.dolphinemu.dolphinemu.utils.AddDirectoryHelper;
-import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
-import org.dolphinemu.dolphinemu.utils.PermissionsHandler;
-import org.dolphinemu.dolphinemu.utils.StartupHandler;
-import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.adapters.GameRowPresenter;
+import org.dolphinemu.ishiiruka.adapters.SettingsRowPresenter;
+import org.dolphinemu.ishiiruka.model.Game;
+import org.dolphinemu.ishiiruka.model.TvSettingsItem;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.ui.platform.Platform;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsActivity;
+import org.dolphinemu.ishiiruka.utils.AddDirectoryHelper;
+import org.dolphinemu.ishiiruka.utils.FileBrowserHelper;
+import org.dolphinemu.ishiiruka.utils.PermissionsHandler;
+import org.dolphinemu.ishiiruka.utils.StartupHandler;
+import org.dolphinemu.ishiiruka.viewholders.TvGameViewHolder;
 
 public final class TvMainActivity extends FragmentActivity implements MainView
 {
@@ -72,7 +72,7 @@ public final class TvMainActivity extends FragmentActivity implements MainView
 
 		// Set display parameters for the BrowseFragment
 		mBrowseFragment.setHeadersState(BrowseFragment.HEADERS_ENABLED);
-		mBrowseFragment.setBrandColor(ContextCompat.getColor(this, R.color.dolphin_blue_dark));
+		mBrowseFragment.setBrandColor(ContextCompat.getColor(this, R.color.ishiiruka_red_dark));
 		buildRowsAdapter();
 
 		mBrowseFragment.setOnItemViewClickedListener(

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/platform/Platform.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.platform;
+package org.dolphinemu.ishiiruka.ui.platform;
 
 /** Enum to represent platform (eg GameCube, Wii). */
 public enum Platform
@@ -44,4 +44,4 @@ public enum Platform
 	{
 		return headerName;
 	}
-}
+}

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/platform/PlatformGamesFragment.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.platform;
+package org.dolphinemu.ishiiruka.ui.platform;
 
 import android.database.Cursor;
 import android.os.Bundle;
@@ -10,8 +10,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.adapters.GameAdapter;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.adapters.GameAdapter;
 
 public final class PlatformGamesFragment extends Fragment implements PlatformGamesView
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/platform/PlatformGamesPresenter.java

@@ -1,11 +1,11 @@
-package org.dolphinemu.dolphinemu.ui.platform;
+package org.dolphinemu.ishiiruka.ui.platform;
 
 
 import android.database.Cursor;
 
-import org.dolphinemu.dolphinemu.DolphinApplication;
-import org.dolphinemu.dolphinemu.model.GameDatabase;
-import org.dolphinemu.dolphinemu.utils.Log;
+import org.dolphinemu.ishiiruka.IshiirukaApplication;
+import org.dolphinemu.ishiiruka.model.GameDatabase;
+import org.dolphinemu.ishiiruka.utils.Log;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -42,7 +42,7 @@ public final class PlatformGamesPresenter
 	{
 		Log.debug("[PlatformGamesPresenter] " + mPlatform + ": Loading games...");
 
-		GameDatabase databaseHelper = DolphinApplication.databaseHelper;
+		GameDatabase databaseHelper = IshiirukaApplication.databaseHelper;
 
 		databaseHelper.getGamesForPlatform(mPlatform)
 				.subscribeOn(Schedulers.io())

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/platform/PlatformGamesView.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.platform;
+package org.dolphinemu.ishiiruka.ui.platform;
 
 import android.database.Cursor;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/SettingsActivity.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.settings;
+package org.dolphinemu.ishiiruka.ui.settings;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -14,11 +14,11 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.SettingSection;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.utils.DirectoryStateReceiver;
-import org.dolphinemu.dolphinemu.utils.Log;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.SettingSection;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.utils.DirectoryStateReceiver;
+import org.dolphinemu.ishiiruka.utils.Log;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/SettingsActivityPresenter.java

@@ -1,16 +1,16 @@
-package org.dolphinemu.dolphinemu.ui.settings;
+package org.dolphinemu.ishiiruka.ui.settings;
 
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.SettingSection;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService.DirectoryInitializationState;
-import org.dolphinemu.dolphinemu.utils.DirectoryStateReceiver;
-import org.dolphinemu.dolphinemu.utils.Log;
-import org.dolphinemu.dolphinemu.utils.SettingsFile;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.SettingSection;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService.DirectoryInitializationState;
+import org.dolphinemu.ishiiruka.utils.DirectoryStateReceiver;
+import org.dolphinemu.ishiiruka.utils.Log;
+import org.dolphinemu.ishiiruka.utils.SettingsFile;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/SettingsActivityView.java

@@ -1,9 +1,9 @@
-package org.dolphinemu.dolphinemu.ui.settings;
+package org.dolphinemu.ishiiruka.ui.settings;
 
 import android.content.IntentFilter;
 
-import org.dolphinemu.dolphinemu.model.settings.SettingSection;
-import org.dolphinemu.dolphinemu.utils.DirectoryStateReceiver;
+import org.dolphinemu.ishiiruka.model.settings.SettingSection;
+import org.dolphinemu.ishiiruka.utils.DirectoryStateReceiver;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/SettingsAdapter.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.settings;
+package org.dolphinemu.ishiiruka.ui.settings;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -12,27 +12,27 @@ import android.view.ViewGroup;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.dialogs.MotionAlertDialog;
-import org.dolphinemu.dolphinemu.model.settings.BooleanSetting;
-import org.dolphinemu.dolphinemu.model.settings.FloatSetting;
-import org.dolphinemu.dolphinemu.model.settings.IntSetting;
-import org.dolphinemu.dolphinemu.model.settings.StringSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.CheckBoxSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.InputBindingSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.model.settings.view.SingleChoiceSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.SliderSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.SubmenuSetting;
-import org.dolphinemu.dolphinemu.ui.settings.viewholder.CheckBoxSettingViewHolder;
-import org.dolphinemu.dolphinemu.ui.settings.viewholder.HeaderViewHolder;
-import org.dolphinemu.dolphinemu.ui.settings.viewholder.InputBindingSettingViewHolder;
-import org.dolphinemu.dolphinemu.ui.settings.viewholder.SettingViewHolder;
-import org.dolphinemu.dolphinemu.ui.settings.viewholder.SingleChoiceViewHolder;
-import org.dolphinemu.dolphinemu.ui.settings.viewholder.SliderViewHolder;
-import org.dolphinemu.dolphinemu.ui.settings.viewholder.SubmenuViewHolder;
-import org.dolphinemu.dolphinemu.utils.Log;
-import org.dolphinemu.dolphinemu.utils.SettingsFile;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.dialogs.MotionAlertDialog;
+import org.dolphinemu.ishiiruka.model.settings.BooleanSetting;
+import org.dolphinemu.ishiiruka.model.settings.FloatSetting;
+import org.dolphinemu.ishiiruka.model.settings.IntSetting;
+import org.dolphinemu.ishiiruka.model.settings.StringSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.CheckBoxSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.InputBindingSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.model.settings.view.SingleChoiceSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.SliderSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.SubmenuSetting;
+import org.dolphinemu.ishiiruka.ui.settings.viewholder.CheckBoxSettingViewHolder;
+import org.dolphinemu.ishiiruka.ui.settings.viewholder.HeaderViewHolder;
+import org.dolphinemu.ishiiruka.ui.settings.viewholder.InputBindingSettingViewHolder;
+import org.dolphinemu.ishiiruka.ui.settings.viewholder.SettingViewHolder;
+import org.dolphinemu.ishiiruka.ui.settings.viewholder.SingleChoiceViewHolder;
+import org.dolphinemu.ishiiruka.ui.settings.viewholder.SliderViewHolder;
+import org.dolphinemu.ishiiruka.ui.settings.viewholder.SubmenuViewHolder;
+import org.dolphinemu.ishiiruka.utils.Log;
+import org.dolphinemu.ishiiruka.utils.SettingsFile;
 
 import java.util.ArrayList;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/SettingsFragment.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.settings;
+package org.dolphinemu.ishiiruka.ui.settings;
 
 import android.app.Activity;
 import android.content.Context;
@@ -11,12 +11,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.Setting;
-import org.dolphinemu.dolphinemu.model.settings.SettingSection;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.ui.DividerItemDecoration;
-import org.dolphinemu.dolphinemu.utils.SettingsFile;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.SettingSection;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.ui.DividerItemDecoration;
+import org.dolphinemu.ishiiruka.utils.SettingsFile;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/SettingsFragmentPresenter.java

@@ -1,23 +1,23 @@
-package org.dolphinemu.dolphinemu.ui.settings;
+package org.dolphinemu.ishiiruka.ui.settings;
 
 import android.text.TextUtils;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.BooleanSetting;
-import org.dolphinemu.dolphinemu.model.settings.IntSetting;
-import org.dolphinemu.dolphinemu.model.settings.Setting;
-import org.dolphinemu.dolphinemu.model.settings.SettingSection;
-import org.dolphinemu.dolphinemu.model.settings.StringSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.CheckBoxSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.HeaderSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.InputBindingSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.model.settings.view.SingleChoiceSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.SliderSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.SubmenuSetting;
-import org.dolphinemu.dolphinemu.utils.EGLHelper;
-import org.dolphinemu.dolphinemu.utils.SettingsFile;
+import org.dolphinemu.ishiiruka.NativeLibrary;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.BooleanSetting;
+import org.dolphinemu.ishiiruka.model.settings.IntSetting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.SettingSection;
+import org.dolphinemu.ishiiruka.model.settings.StringSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.CheckBoxSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.HeaderSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.InputBindingSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.model.settings.view.SingleChoiceSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.SliderSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.SubmenuSetting;
+import org.dolphinemu.ishiiruka.utils.EGLHelper;
+import org.dolphinemu.ishiiruka.utils.SettingsFile;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -259,13 +259,15 @@ public final class SettingsFragmentPresenter
 	{
 		IntSetting videoBackend = new IntSetting(SettingsFile.KEY_VIDEO_BACKEND_INDEX, SettingsFile.SECTION_CORE, SettingsFile.SETTINGS_DOLPHIN, getVideoBackendValue());
 		Setting showFps = null;
-		Setting shaderCompilationMode = null;
+		Setting BackgroundShaderCompiling = null;
+		Setting DisableSpecializedShaders = null;
 		Setting waitForShaders = null;
 
 		if (!mSettings.get(SettingsFile.SETTINGS_GFX).isEmpty())
 		{
 			showFps = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_SHOW_FPS);
-			shaderCompilationMode = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_SHADER_COMPILATION_MODE);
+			BackgroundShaderCompiling = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_SHADER_BACKGROUND_COMPILING);
+			DisableSpecializedShaders = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_SHADER_DISABLE_SPECIALIZED);
 			waitForShaders = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_WAIT_FOR_SHADERS);
 		}
 		else
@@ -280,7 +282,8 @@ public final class SettingsFragmentPresenter
 
 		sl.add(new SingleChoiceSetting(SettingsFile.KEY_VIDEO_BACKEND_INDEX, SettingsFile.SECTION_CORE, SettingsFile.SETTINGS_DOLPHIN, R.string.video_backend, R.string.video_backend_descrip, R.array.videoBackendEntries, R.array.videoBackendValues, 0, videoBackend));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_SHOW_FPS, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.show_fps, 0, false, showFps));
-		sl.add(new SingleChoiceSetting(SettingsFile.KEY_SHADER_COMPILATION_MODE, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.shader_compilation_mode, R.string.shader_compilation_mode_descrip, R.array.shaderCompilationModeEntries, R.array.shaderCompilationModeValues, 0, shaderCompilationMode));
+		sl.add(new CheckBoxSetting(SettingsFile.KEY_SHADER_BACKGROUND_COMPILING, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.shader_background_compilation, R.string.shader_background_compilation_descrip, false, BackgroundShaderCompiling));
+		sl.add(new CheckBoxSetting(SettingsFile.KEY_SHADER_DISABLE_SPECIALIZED, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.shader_disable_specialized, R.string.shader_disable_specialized_descrip, false, BackgroundShaderCompiling));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_WAIT_FOR_SHADERS, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.wait_for_shaders, 0, false, waitForShaders));
 
 		sl.add(new SubmenuSetting(null, null, R.string.enhancements, 0, SettingsFile.SECTION_GFX_ENHANCEMENTS));
@@ -296,10 +299,9 @@ public final class SettingsFragmentPresenter
 		Setting perPixel = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_PER_PIXEL);
 		Setting forceFilter = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_ENHANCEMENTS).getSetting(SettingsFile.KEY_FORCE_FILTERING);
 		Setting disableFog = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_DISABLE_FOG);
-		Setting shaderCompilationMode = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_SHADER_COMPILATION_MODE);
-        Setting waitForShaders = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_WAIT_FOR_SHADERS);
+		Setting widescreenhack = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_WIDESCREEN_HACK);
 
-		sl.add(new SingleChoiceSetting(SettingsFile.KEY_INTERNAL_RES, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.internal_resolution, R.string.internal_resolution_descrip, R.array.internalResolutionEntries, R.array.internalResolutionValues, 0, resolution));
+		sl.add(new SingleChoiceSetting(SettingsFile.KEY_INTERNAL_RES, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.internal_resolution, R.string.internal_resolution_descrip, R.array.internalResolutionEntries, R.array.internalResolutionValues, 2, resolution));
 		sl.add(new SingleChoiceSetting(SettingsFile.KEY_FSAA, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.FSAA, R.string.FSAA_descrip, R.array.FSAAEntries, R.array.FSAAValues, 0, fsaa));
 		sl.add(new SingleChoiceSetting(SettingsFile.KEY_ANISOTROPY, SettingsFile.SECTION_GFX_ENHANCEMENTS, SettingsFile.SETTINGS_GFX, R.string.anisotropic_filtering, R.string.anisotropic_filtering_descrip, R.array.anisotropicFilteringEntries, R.array.anisotropicFilteringValues, 0, anisotropic));
 
@@ -311,6 +313,7 @@ public final class SettingsFragmentPresenter
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_PER_PIXEL, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.per_pixel_lighting, R.string.per_pixel_lighting_descrip, false, perPixel));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_FORCE_FILTERING, SettingsFile.SECTION_GFX_ENHANCEMENTS, SettingsFile.SETTINGS_GFX, R.string.force_texture_filtering, R.string.force_texture_filtering_descrip, false, forceFilter));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_DISABLE_FOG, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.disable_fog, R.string.disable_fog_descrip, false, disableFog));
+		sl.add(new CheckBoxSetting(SettingsFile.KEY_WIDESCREEN_HACK, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.widescreen_hack, R.string.widescreen_hack_desc, false, widescreenhack));
 
 		 /*
 		 Check if we support stereo
@@ -333,16 +336,18 @@ public final class SettingsFragmentPresenter
 
 		BooleanSetting skipEFB = new BooleanSetting(SettingsFile.KEY_SKIP_EFB, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, skipEFBValue);
 		BooleanSetting ignoreFormat = new BooleanSetting(SettingsFile.KEY_IGNORE_FORMAT, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, ignoreFormatValue);
+		Setting FastEFB = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_HACKS).getSetting(SettingsFile.KEY_FAST_EFB);
 		Setting efbToTexture = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_HACKS).getSetting(SettingsFile.KEY_EFB_TEXTURE);
 		Setting texCacheAccuracy = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_TEXCACHE_ACCURACY);
 		Setting gpuTextureDecoding = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_GPU_TEXTURE_DECODING);
-		Setting xfbToTexture = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_HACKS).getSetting(SettingsFile.KEY_XFB_TEXTURE);
-		Setting immediateXfb = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_HACKS).getSetting(SettingsFile.KEY_IMMEDIATE_XFB);
+		Setting xfbEnabled = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_HACKS).getSetting(SettingsFile.KEY_XFB_ENABLED);
+		Setting realXFB = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_HACKS).getSetting(SettingsFile.KEY_REAL_XFB);
 		Setting fastDepth = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_HACKS).getSetting(SettingsFile.KEY_FAST_DEPTH);
 		Setting aspectRatio = mSettings.get(SettingsFile.SETTINGS_GFX).get(SettingsFile.SECTION_GFX_SETTINGS).getSetting(SettingsFile.KEY_ASPECT_RATIO);
 
 		sl.add(new HeaderSetting(null, null, R.string.embedded_frame_buffer, 0));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_SKIP_EFB, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.skip_efb_access, R.string.skip_efb_access_descrip, false, skipEFB));
+		sl.add(new CheckBoxSetting(SettingsFile.KEY_FAST_EFB, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.fast_efb_access, R.string.fast_efb_access_descrip, false, FastEFB));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_IGNORE_FORMAT, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.ignore_format_changes, R.string.ignore_format_changes_descrip, true, ignoreFormat));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_EFB_TEXTURE, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.efb_copy_method, R.string.efb_copy_method_descrip, true, efbToTexture));
 
@@ -351,8 +356,8 @@ public final class SettingsFragmentPresenter
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_GPU_TEXTURE_DECODING, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.gpu_texture_decoding, R.string.gpu_texture_decoding_descrip, false, gpuTextureDecoding));
 
 		sl.add(new HeaderSetting(null, null, R.string.external_frame_buffer, 0));
-		sl.add(new CheckBoxSetting(SettingsFile.KEY_XFB_TEXTURE, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.xfb_copy_method, R.string.xfb_copy_method_descrip, true, xfbToTexture));
-		sl.add(new CheckBoxSetting(SettingsFile.KEY_IMMEDIATE_XFB, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.immediate_xfb, R.string.immediate_xfb_descrip, false, immediateXfb));
+		sl.add(new CheckBoxSetting(SettingsFile.KEY_XFB_ENABLED, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.xfb_enable, R.string.xfb_enable_descrip, false, xfbEnabled));
+		sl.add(new CheckBoxSetting(SettingsFile.KEY_REAL_XFB, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.real_xfb, R.string.real_xfb_descrip, false, realXFB));
 
 		sl.add(new HeaderSetting(null, null, R.string.other, 0));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_FAST_DEPTH, SettingsFile.SECTION_GFX_HACKS, SettingsFile.SETTINGS_GFX, R.string.fast_depth_calculation, R.string.fast_depth_calculation_descrip, true, fastDepth));

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/SettingsFragmentView.java

@@ -1,10 +1,10 @@
-package org.dolphinemu.dolphinemu.ui.settings;
+package org.dolphinemu.ishiiruka.ui.settings;
 
 import android.support.v4.app.FragmentActivity;
 
-import org.dolphinemu.dolphinemu.model.settings.Setting;
-import org.dolphinemu.dolphinemu.model.settings.SettingSection;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.SettingSection;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/SettingsFrameLayout.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.settings;
+package org.dolphinemu.ishiiruka.ui.settings;
 
 import android.content.Context;
 import android.util.AttributeSet;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/viewholder/CheckBoxSettingViewHolder.java

@@ -1,13 +1,13 @@
-package org.dolphinemu.dolphinemu.ui.settings.viewholder;
+package org.dolphinemu.ishiiruka.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.view.CheckBoxSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.view.CheckBoxSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsAdapter;
 
 public final class CheckBoxSettingViewHolder extends SettingViewHolder
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/viewholder/HeaderViewHolder.java

@@ -1,11 +1,11 @@
-package org.dolphinemu.dolphinemu.ui.settings.viewholder;
+package org.dolphinemu.ishiiruka.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsAdapter;
 
 public final class HeaderViewHolder extends SettingViewHolder
 {
@@ -34,4 +34,4 @@ public final class HeaderViewHolder extends SettingViewHolder
 	{
 		// no-op
 	}
-}
+}

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/viewholder/InputBindingSettingViewHolder.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.ui.settings.viewholder;
+package org.dolphinemu.ishiiruka.ui.settings.viewholder;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -6,10 +6,10 @@ import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.view.InputBindingSetting;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.view.InputBindingSetting;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsAdapter;
 
 public final class InputBindingSettingViewHolder extends SettingViewHolder
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/viewholder/SettingViewHolder.java

@@ -1,10 +1,10 @@
-package org.dolphinemu.dolphinemu.ui.settings.viewholder;
+package org.dolphinemu.ishiiruka.ui.settings.viewholder;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsAdapter;
 
 public abstract class SettingViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/viewholder/SingleChoiceViewHolder.java

@@ -1,12 +1,12 @@
-package org.dolphinemu.dolphinemu.ui.settings.viewholder;
+package org.dolphinemu.ishiiruka.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.model.settings.view.SingleChoiceSetting;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.model.settings.view.SingleChoiceSetting;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsAdapter;
 
 public final class SingleChoiceViewHolder extends SettingViewHolder
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/viewholder/SliderViewHolder.java

@@ -1,12 +1,12 @@
-package org.dolphinemu.dolphinemu.ui.settings.viewholder;
+package org.dolphinemu.ishiiruka.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.model.settings.view.SliderSetting;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.model.settings.view.SliderSetting;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsAdapter;
 
 public final class SliderViewHolder extends SettingViewHolder
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/ui/settings/viewholder/SubmenuViewHolder.java

@@ -1,12 +1,12 @@
-package org.dolphinemu.dolphinemu.ui.settings.viewholder;
+package org.dolphinemu.ishiiruka.ui.settings.viewholder;
 
 import android.view.View;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem;
-import org.dolphinemu.dolphinemu.model.settings.view.SubmenuSetting;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter;
+import org.dolphinemu.ishiiruka.R;
+import org.dolphinemu.ishiiruka.model.settings.view.SettingsItem;
+import org.dolphinemu.ishiiruka.model.settings.view.SubmenuSetting;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsAdapter;
 
 public final class SubmenuViewHolder extends SettingViewHolder
 {
@@ -45,4 +45,4 @@ public final class SubmenuViewHolder extends SettingViewHolder
 	{
 		getAdapter().onSubmenuClick(mItem);
 	}
-}
+}

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/AddDirectoryHelper.java

@@ -1,12 +1,12 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.content.AsyncQueryHandler;
 import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
 
-import org.dolphinemu.dolphinemu.model.GameDatabase;
-import org.dolphinemu.dolphinemu.model.GameProvider;
+import org.dolphinemu.ishiiruka.model.GameDatabase;
+import org.dolphinemu.ishiiruka.model.GameProvider;
 
 public class AddDirectoryHelper
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/Animations.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.view.View;
 import android.view.ViewPropertyAnimator;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/ControllerMappingHelper.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.view.InputDevice;
 import android.view.KeyEvent;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/DirectoryStateReceiver.java

@@ -1,11 +1,11 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService.DirectoryInitializationState;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService.DirectoryInitializationState;
 
 import rx.functions.Action1;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/EGLHelper.java

@@ -4,11 +4,11 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.opengl.GLES30;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.ishiiruka.NativeLibrary;
 
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/FileBrowserHelper.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -9,8 +9,8 @@ import android.support.v4.app.FragmentActivity;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 import com.nononsenseapps.filepicker.Utils;
 
-import org.dolphinemu.dolphinemu.activities.CustomFilePickerActivity;
-import org.dolphinemu.dolphinemu.ui.main.MainPresenter;
+import org.dolphinemu.ishiiruka.activities.CustomFilePickerActivity;
+import org.dolphinemu.ishiiruka.ui.main.MainPresenter;
 
 import java.io.File;
 import java.util.List;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/GameBannerRequestHandler.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.graphics.Bitmap;
 
@@ -6,7 +6,7 @@ import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Request;
 import com.squareup.picasso.RequestHandler;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.ishiiruka.NativeLibrary;
 
 import java.io.IOException;
 import java.nio.IntBuffer;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/Java_GCAdapter.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -13,8 +13,8 @@ import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.services.USBPermService;
+import org.dolphinemu.ishiiruka.NativeLibrary;
+import org.dolphinemu.ishiiruka.services.USBPermService;
 
 import java.util.HashMap;
 import java.util.Map;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/Java_WiimoteAdapter.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -10,8 +10,8 @@ import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
-import org.dolphinemu.dolphinemu.services.USBPermService;
+import org.dolphinemu.ishiiruka.NativeLibrary;
+import org.dolphinemu.ishiiruka.services.USBPermService;
 
 import java.util.Arrays;
 import java.util.HashMap;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/Log.java

@@ -1,6 +1,6 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
-import org.dolphinemu.dolphinemu.BuildConfig;
+import org.dolphinemu.ishiiruka.BuildConfig;
 
 /**
  * Contains methods that call through to {@link android.util.Log}, but

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/PermissionsHandler.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -10,7 +10,7 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v4.content.ContextCompat;
 import android.widget.Toast;
 
-import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.ishiiruka.R;
 
 import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/PicassoUtils.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -6,7 +6,7 @@ import android.widget.ImageView;
 
 import com.squareup.picasso.Picasso;
 
-import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.ishiiruka.R;
 
 import java.io.File;
 import java.net.URI;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/SettingsFile.java

@@ -1,15 +1,15 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.support.annotation.NonNull;
 
-import org.dolphinemu.dolphinemu.model.settings.BooleanSetting;
-import org.dolphinemu.dolphinemu.model.settings.FloatSetting;
-import org.dolphinemu.dolphinemu.model.settings.IntSetting;
-import org.dolphinemu.dolphinemu.model.settings.Setting;
-import org.dolphinemu.dolphinemu.model.settings.SettingSection;
-import org.dolphinemu.dolphinemu.model.settings.StringSetting;
-import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
-import org.dolphinemu.dolphinemu.ui.settings.SettingsActivityView;
+import org.dolphinemu.ishiiruka.model.settings.BooleanSetting;
+import org.dolphinemu.ishiiruka.model.settings.FloatSetting;
+import org.dolphinemu.ishiiruka.model.settings.IntSetting;
+import org.dolphinemu.ishiiruka.model.settings.Setting;
+import org.dolphinemu.ishiiruka.model.settings.SettingSection;
+import org.dolphinemu.ishiiruka.model.settings.StringSetting;
+import org.dolphinemu.ishiiruka.services.DirectoryInitializationService;
+import org.dolphinemu.ishiiruka.ui.settings.SettingsActivityView;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -84,7 +84,7 @@ public final class SettingsFile
 	public static final String KEY_SLOT_B_DEVICE = "SlotB";
 
 	public static final String KEY_SHOW_FPS = "ShowFPS";
-	public static final String KEY_INTERNAL_RES = "InternalResolution";
+	public static final String KEY_INTERNAL_RES = "EFBScale";
 	public static final String KEY_FSAA = "MSAA";
 	public static final String KEY_ANISOTROPY = "MaxAnisotropy";
 	public static final String KEY_POST_SHADER = "PostProcessingShader";
@@ -92,6 +92,7 @@ public final class SettingsFile
 	public static final String KEY_PER_PIXEL = "EnablePixelLighting";
 	public static final String KEY_FORCE_FILTERING = "ForceFiltering";
 	public static final String KEY_DISABLE_FOG = "DisableFog";
+	public static final String KEY_WIDESCREEN_HACK = "wideScreenHack";
 
 	public static final String KEY_STEREO_MODE = "StereoMode";
 	public static final String KEY_STEREO_DEPTH = "StereoDepth";
@@ -99,16 +100,18 @@ public final class SettingsFile
 	public static final String KEY_STEREO_SWAP = "StereoSwapEyes";
 
 	public static final String KEY_SKIP_EFB = "EFBAccessEnable";
+	public static final String KEY_FAST_EFB = "EFBFastAccess";
 	public static final String KEY_IGNORE_FORMAT = "EFBEmulateFormatChanges";
 	public static final String KEY_EFB_TEXTURE = "EFBToTextureEnable";
 	public static final String KEY_TEXCACHE_ACCURACY = "SafeTextureCacheColorSamples";
 	public static final String KEY_GPU_TEXTURE_DECODING = "EnableGPUTextureDecoding";
-	public static final String KEY_XFB_TEXTURE = "XFBToTextureEnable";
-	public static final String KEY_IMMEDIATE_XFB = "ImmediateXFBEnable";
+	public static final String KEY_XFB_ENABLED = "UseXFB";
+	public static final String KEY_REAL_XFB = "UseRealXFB";
 	public static final String KEY_FAST_DEPTH = "FastDepthCalc";
 	public static final String KEY_ASPECT_RATIO = "AspectRatio";
-	public static final String KEY_SHADER_COMPILATION_MODE = "ShaderCompilationMode";
-	public static final String KEY_WAIT_FOR_SHADERS = "WaitForShadersBeforeStarting";
+	public static final String KEY_SHADER_BACKGROUND_COMPILING = "BackgroundShaderCompiling";
+	public static final String KEY_SHADER_DISABLE_SPECIALIZED = "DisableSpecializedShaders";
+	public static final String KEY_WAIT_FOR_SHADERS = "CompileShaderOnStartup";
 
 	public static final String KEY_GCPAD_TYPE = "SIDevice";
 

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/utils/StartupHandler.java

@@ -1,11 +1,11 @@
-package org.dolphinemu.dolphinemu.utils;
+package org.dolphinemu.ishiiruka.utils;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 
-import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.ishiiruka.activities.EmulationActivity;
 
 public final class StartupHandler
 {

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/viewholders/FileViewHolder.java

@@ -1,11 +1,11 @@
-package org.dolphinemu.dolphinemu.viewholders;
+package org.dolphinemu.ishiiruka.viewholders;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.ishiiruka.R;
 
 /**
  * A simple class that stores references to views so that the FileAdapter doesn't need to

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/viewholders/GameViewHolder.java

@@ -1,11 +1,11 @@
-package org.dolphinemu.dolphinemu.viewholders;
+package org.dolphinemu.ishiiruka.viewholders;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.ishiiruka.R;
 
 /**
  * A simple class that stores references to views so that the GameAdapter doesn't need to

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/viewholders/TvGameViewHolder.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.viewholders;
+package org.dolphinemu.ishiiruka.viewholders;
 
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;

Source/Android/app/src/main/java/org/dolphinemu/ishiiruka/viewholders/TvSettingsViewHolder.java

@@ -1,4 +1,4 @@
-package org.dolphinemu.dolphinemu.viewholders;
+package org.dolphinemu.ishiiruka.viewholders;
 
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;

Source/Android/app/src/main/res/color/button_text_color.xml

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:color="@color/dolphin_blue_dark"
+        android:color="@color/ishiiruka_red_dark"
         android:state_focused="true"/>
     <item
         android:color="@android:color/white"/>

Source/Android/app/src/main/res/layout-television/activity_emulation.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <org.dolphinemu.dolphinemu.ui.NVidiaShieldWorkaroundView
+    <org.dolphinemu.ishiiruka.ui.NVidiaShieldWorkaroundView
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 

Source/Android/app/src/main/res/layout/activity_add_directory.xml

@@ -9,7 +9,7 @@
         android:id="@+id/toolbar_folder_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/dolphin_blue"
+        android:background="@color/ishiiruka_red"
         android:minHeight="?android:attr/actionBarSize"
         android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
         android:elevation="6dp"/>
@@ -24,4 +24,4 @@
         android:elevation="4dp"
         android:background="@android:color/white"/>
 
-</LinearLayout>
+</LinearLayout>