From 7842b38c15e63ef6404a92bab44cfacbbb586331 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Fri, 30 Aug 2019 22:52:06 -0400
Subject: [PATCH] android: Rename main entry class to CitraApplication.

---
 src/android/app/src/main/AndroidManifest.xml     |  2 +-
 ...hinApplication.java => CitraApplication.java} |  8 ++++++--
 .../org/citra/citra_android/NativeLibrary.java   |  6 +++---
 .../model/settings/view/InputBindingSetting.java | 16 ++++++++--------
 .../citra_android/ui/main/MainPresenter.java     |  6 +++---
 .../ui/platform/PlatformGamesFragment.java       |  4 ++--
 .../ui/platform/PlatformGamesPresenter.java      |  4 ++--
 7 files changed, 25 insertions(+), 21 deletions(-)
 rename src/android/app/src/main/java/org/citra/citra_android/{DolphinApplication.java => CitraApplication.java} (76%)

diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml
index 0a9f45cb4..d653c3816 100644
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
 
 
     <application
-        android:name=".DolphinApplication"
+        android:name=".CitraApplication"
         android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"
         android:allowBackup="true"
diff --git a/src/android/app/src/main/java/org/citra/citra_android/DolphinApplication.java b/src/android/app/src/main/java/org/citra/citra_android/CitraApplication.java
similarity index 76%
rename from src/android/app/src/main/java/org/citra/citra_android/DolphinApplication.java
rename to src/android/app/src/main/java/org/citra/citra_android/CitraApplication.java
index bb8a85365..9318ff4b0 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/DolphinApplication.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/CitraApplication.java
@@ -1,3 +1,7 @@
+// Copyright 2019 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
 package org.citra.citra_android;
 
 import android.app.Application;
@@ -7,9 +11,9 @@ import org.citra.citra_android.model.GameDatabase;
 import org.citra.citra_android.services.DirectoryInitializationService;
 import org.citra.citra_android.utils.PermissionsHandler;
 
-public class DolphinApplication extends Application {
+public class CitraApplication extends Application {
     public static GameDatabase databaseHelper;
-    private static DolphinApplication application;
+    private static CitraApplication application;
 
     @Override
     public void onCreate() {
diff --git a/src/android/app/src/main/java/org/citra/citra_android/NativeLibrary.java b/src/android/app/src/main/java/org/citra/citra_android/NativeLibrary.java
index 1aeb727df..762c95c25 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/NativeLibrary.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/NativeLibrary.java
@@ -290,12 +290,12 @@ public final class NativeLibrary {
     public static native void SwapScreens(boolean is_portrait_mode);
 
     public static boolean isPortraitMode() {
-        return DolphinApplication.getAppContext().getResources().getConfiguration().orientation ==
+        return CitraApplication.getAppContext().getResources().getConfiguration().orientation ==
                 Configuration.ORIENTATION_PORTRAIT;
     }
 
     public static int landscapeScreenLayout() {
-        return PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext())
+        return PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext())
                 .getInt("LandscapeScreenLayout", EmulationActivity.LayoutOption_MobileLandscape);
     }
 
@@ -400,7 +400,7 @@ public final class NativeLibrary {
         params.leftMargin = params.rightMargin = CitraApplication.getAppContext().getResources().getDimensionPixelSize(R.dimen.dialog_margin);
 
         // Set up the input
-        alertPromptEditText = new EditText(DolphinApplication.getAppContext());
+        alertPromptEditText = new EditText(CitraApplication.getAppContext());
         alertPromptEditText.setText(text);
         alertPromptEditText.setSingleLine();
         alertPromptEditText.setLayoutParams(params);
diff --git a/src/android/app/src/main/java/org/citra/citra_android/model/settings/view/InputBindingSetting.java b/src/android/app/src/main/java/org/citra/citra_android/model/settings/view/InputBindingSetting.java
index 0281c0101..50fab75b6 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/model/settings/view/InputBindingSetting.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/model/settings/view/InputBindingSetting.java
@@ -8,7 +8,7 @@ import android.widget.Toast;
 
 import org.citra.citra_android.NativeLibrary;
 import org.citra.citra_android.R;
-import org.citra.citra_android.DolphinApplication;
+import org.citra.citra_android.CitraApplication;
 import org.citra.citra_android.model.settings.Setting;
 import org.citra.citra_android.model.settings.StringSetting;
 import org.citra.citra_android.utils.SettingsFile;
@@ -207,7 +207,7 @@ public final class InputBindingSetting extends SettingsItem {
      */
     public void removeOldMapping() {
         // Get preferences editor
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext());
         SharedPreferences.Editor editor = preferences.edit();
 
         // Try remove all possible keys we wrote for this setting
@@ -256,7 +256,7 @@ public final class InputBindingSetting extends SettingsItem {
      */
     private void WriteButtonMapping(String key) {
         // Get preferences editor
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext());
         SharedPreferences.Editor editor = preferences.edit();
 
         // Remove mapping for another setting using this input
@@ -284,7 +284,7 @@ public final class InputBindingSetting extends SettingsItem {
      */
     private void WriteAxisMapping(int axis, int value) {
         // Get preferences editor
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext());
         SharedPreferences.Editor editor = preferences.edit();
 
         // Cleanup old mapping
@@ -309,7 +309,7 @@ public final class InputBindingSetting extends SettingsItem {
     public void onKeyInput(KeyEvent keyEvent)
     {
         if (!IsButtonMappingSupported()) {
-            Toast.makeText(DolphinApplication.getAppContext(), R.string.input_message_analog_only, Toast.LENGTH_LONG).show();
+            Toast.makeText(CitraApplication.getAppContext(), R.string.input_message_analog_only, Toast.LENGTH_LONG).show();
             return;
         }
 
@@ -332,11 +332,11 @@ public final class InputBindingSetting extends SettingsItem {
                               char axisDir)
     {
         if (!IsAxisMappingSupported()) {
-             Toast.makeText(DolphinApplication.getAppContext(), R.string.input_message_button_only, Toast.LENGTH_LONG).show();
+             Toast.makeText(CitraApplication.getAppContext(), R.string.input_message_button_only, Toast.LENGTH_LONG).show();
              return;
          }
 
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext());
         SharedPreferences.Editor editor = preferences.edit();
 
         int button;
@@ -362,7 +362,7 @@ public final class InputBindingSetting extends SettingsItem {
      * Sets the string to use in the configuration UI for the gamepad input.
      */
     private StringSetting setUiString(String ui) {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.getAppContext());
         SharedPreferences.Editor editor = preferences.edit();
 
         if (getSetting() == null) {
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainPresenter.java b/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainPresenter.java
index fad33735d..316a87702 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainPresenter.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainPresenter.java
@@ -2,7 +2,7 @@ package org.citra.citra_android.ui.main;
 
 
 import org.citra.citra_android.BuildConfig;
-import org.citra.citra_android.DolphinApplication;
+import org.citra.citra_android.CitraApplication;
 import org.citra.citra_android.R;
 import org.citra.citra_android.model.GameDatabase;
 import org.citra.citra_android.utils.AddDirectoryHelper;
@@ -63,7 +63,7 @@ public final class MainPresenter {
     }
 
     public void loadGames() {
-        GameDatabase databaseHelper = DolphinApplication.databaseHelper;
+        GameDatabase databaseHelper = CitraApplication.databaseHelper;
         databaseHelper.getGames()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -71,7 +71,7 @@ public final class MainPresenter {
     }
 
     private void refeshGameList() {
-        GameDatabase databaseHelper = DolphinApplication.databaseHelper;
+        GameDatabase databaseHelper = CitraApplication.databaseHelper;
         databaseHelper.scanLibrary(databaseHelper.getWritableDatabase());
         mView.refresh();
     }
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/platform/PlatformGamesFragment.java b/src/android/app/src/main/java/org/citra/citra_android/ui/platform/PlatformGamesFragment.java
index 9b3f21aba..f6fc0846b 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/platform/PlatformGamesFragment.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/platform/PlatformGamesFragment.java
@@ -11,7 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.citra.citra_android.DolphinApplication;
+import org.citra.citra_android.CitraApplication;
 import org.citra.citra_android.R;
 import org.citra.citra_android.adapters.GameAdapter;
 import org.citra.citra_android.model.GameDatabase;
@@ -54,7 +54,7 @@ public final class PlatformGamesFragment extends Fragment implements PlatformGam
         pullToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                GameDatabase databaseHelper = DolphinApplication.databaseHelper;
+                GameDatabase databaseHelper = CitraApplication.databaseHelper;
                 databaseHelper.scanLibrary(databaseHelper.getWritableDatabase());
                 refresh();
                 pullToRefresh.setRefreshing(false);
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/platform/PlatformGamesPresenter.java b/src/android/app/src/main/java/org/citra/citra_android/ui/platform/PlatformGamesPresenter.java
index 6addc7d9e..8a08c6b05 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/platform/PlatformGamesPresenter.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/platform/PlatformGamesPresenter.java
@@ -1,7 +1,7 @@
 package org.citra.citra_android.ui.platform;
 
 
-import org.citra.citra_android.DolphinApplication;
+import org.citra.citra_android.CitraApplication;
 import org.citra.citra_android.model.GameDatabase;
 import org.citra.citra_android.utils.Log;
 
@@ -27,7 +27,7 @@ public final class PlatformGamesPresenter {
     private void loadGames() {
         Log.debug("[PlatformGamesPresenter] : Loading games...");
 
-        GameDatabase databaseHelper = DolphinApplication.databaseHelper;
+        GameDatabase databaseHelper = CitraApplication.databaseHelper;
 
         databaseHelper.getGames()
                 .subscribeOn(Schedulers.io())