From a1ca84f95ef968b112754287cca8f2e612b190f6 Mon Sep 17 00:00:00 2001
From: lynxnb <niccolo.betto@gmail.com>
Date: Tue, 14 Feb 2023 14:17:17 +0100
Subject: [PATCH] Move Kotlin settings to a dedicate package

---
 .idea/runConfigurations/Settings.xml                        | 2 +-
 app/src/main/AndroidManifest.xml                            | 6 +++---
 app/src/main/cpp/emu_jni.cpp                                | 4 ++--
 app/src/main/java/emu/skyline/EmulationActivity.kt          | 4 ++--
 app/src/main/java/emu/skyline/MainActivity.kt               | 3 ++-
 app/src/main/java/emu/skyline/di/EntryPoints.kt             | 2 +-
 app/src/main/java/emu/skyline/input/ControllerActivity.kt   | 2 +-
 app/src/main/java/emu/skyline/input/InputHandler.kt         | 2 +-
 .../java/emu/skyline/input/onscreen/OnScreenEditActivity.kt | 2 +-
 .../emu/skyline/preference/DocumentsProviderPreference.kt   | 2 +-
 .../main/java/emu/skyline/preference/GpuDriverActivity.kt   | 2 +-
 .../main/java/emu/skyline/preference/GpuDriverPreference.kt | 2 +-
 .../main/java/emu/skyline/preference/KeyPickerPreference.kt | 2 +-
 .../main/java/emu/skyline/preference/LogLevelPreference.kt  | 2 +-
 .../java/emu/skyline/{utils => settings}/NativeSettings.kt  | 3 ++-
 .../emu/skyline/{utils => settings}/PreferenceSettings.kt   | 5 +++--
 .../java/emu/skyline/{ => settings}/SettingsActivity.kt     | 5 +++--
 17 files changed, 27 insertions(+), 23 deletions(-)
 rename app/src/main/java/emu/skyline/{utils => settings}/NativeSettings.kt (96%)
 rename app/src/main/java/emu/skyline/{utils => settings}/PreferenceSettings.kt (97%)
 rename app/src/main/java/emu/skyline/{ => settings}/SettingsActivity.kt (98%)

diff --git a/.idea/runConfigurations/Settings.xml b/.idea/runConfigurations/Settings.xml
index f8680921..f9c15d86 100644
--- a/.idea/runConfigurations/Settings.xml
+++ b/.idea/runConfigurations/Settings.xml
@@ -50,7 +50,7 @@
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>
     <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="emu.skyline.SettingsActivity" />
+    <option name="ACTIVITY_CLASS" value="emu.skyline.settings.SettingsActivity" />
     <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
     <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
     <method v="2">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a0ba2cca..9700d9d2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
         </activity>
 
         <activity
-            android:name=".SettingsActivity"
+            android:name=".settings.SettingsActivity"
             android:exported="true"
             android:label="@string/settings"
             android:launchMode="singleTop"
@@ -47,13 +47,13 @@
         <activity
             android:name=".input.ControllerActivity"
             android:exported="true"
-            android:parentActivityName=".SettingsActivity">
+            android:parentActivityName=".settings.SettingsActivity">
         </activity>
 
         <activity
             android:name=".preference.GpuDriverActivity"
             android:exported="true"
-            android:parentActivityName=".SettingsActivity">
+            android:parentActivityName=".settings.SettingsActivity">
         </activity>
 
         <activity
diff --git a/app/src/main/cpp/emu_jni.cpp b/app/src/main/cpp/emu_jni.cpp
index 0b040692..f2495a61 100644
--- a/app/src/main/cpp/emu_jni.cpp
+++ b/app/src/main/cpp/emu_jni.cpp
@@ -243,13 +243,13 @@ extern "C" JNIEXPORT void JNICALL Java_emu_skyline_input_InputHandler_00024Compa
     env->ReleaseIntArrayElements(pointsJni, reinterpret_cast<jint *>(points.data()), JNI_ABORT);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_emu_skyline_utils_NativeSettings_updateNative(JNIEnv *env, jobject) {
+extern "C" JNIEXPORT void JNICALL Java_emu_skyline_settings_NativeSettings_updateNative(JNIEnv *env, jobject) {
     auto settings{SettingsWeak.lock()};
     if (!settings)
         return; // We don't mind if we miss settings updates while settings haven't been initialized
     settings->Update();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_emu_skyline_utils_NativeSettings_00024Companion_setLogLevel(JNIEnv *, jobject, jint logLevel) {
+extern "C" JNIEXPORT void JNICALL Java_emu_skyline_settings_NativeSettings_00024Companion_setLogLevel(JNIEnv *, jobject, jint logLevel) {
     skyline::Logger::configLevel = static_cast<skyline::Logger::LogLevel>(logLevel);
 }
diff --git a/app/src/main/java/emu/skyline/EmulationActivity.kt b/app/src/main/java/emu/skyline/EmulationActivity.kt
index 1fce15cb..7141c9eb 100644
--- a/app/src/main/java/emu/skyline/EmulationActivity.kt
+++ b/app/src/main/java/emu/skyline/EmulationActivity.kt
@@ -31,8 +31,8 @@ import emu.skyline.input.*
 import emu.skyline.loader.getRomFormat
 import emu.skyline.utils.ByteBufferSerializable
 import emu.skyline.utils.GpuDriverHelper
-import emu.skyline.utils.NativeSettings
-import emu.skyline.utils.PreferenceSettings
+import emu.skyline.settings.NativeSettings
+import emu.skyline.settings.PreferenceSettings
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.util.concurrent.FutureTask
diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt
index 19ef8284..8fcb2d88 100644
--- a/app/src/main/java/emu/skyline/MainActivity.kt
+++ b/app/src/main/java/emu/skyline/MainActivity.kt
@@ -38,7 +38,8 @@ import emu.skyline.loader.LoaderResult
 import emu.skyline.loader.RomFormat
 import emu.skyline.provider.DocumentsProvider
 import emu.skyline.utils.GpuDriverHelper
-import emu.skyline.utils.PreferenceSettings
+import emu.skyline.settings.PreferenceSettings
+import emu.skyline.settings.SettingsActivity
 import emu.skyline.utils.WindowInsetsHelper
 import javax.inject.Inject
 import kotlin.math.ceil
diff --git a/app/src/main/java/emu/skyline/di/EntryPoints.kt b/app/src/main/java/emu/skyline/di/EntryPoints.kt
index ef4d2484..a06ca7ec 100644
--- a/app/src/main/java/emu/skyline/di/EntryPoints.kt
+++ b/app/src/main/java/emu/skyline/di/EntryPoints.kt
@@ -11,7 +11,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
 import emu.skyline.input.InputManager
-import emu.skyline.utils.PreferenceSettings
+import emu.skyline.settings.PreferenceSettings
 
 @EntryPoint
 @InstallIn(SingletonComponent::class)
diff --git a/app/src/main/java/emu/skyline/input/ControllerActivity.kt b/app/src/main/java/emu/skyline/input/ControllerActivity.kt
index 09e48b81..04351f18 100644
--- a/app/src/main/java/emu/skyline/input/ControllerActivity.kt
+++ b/app/src/main/java/emu/skyline/input/ControllerActivity.kt
@@ -29,7 +29,7 @@ import emu.skyline.input.dialog.ButtonDialog
 import emu.skyline.input.dialog.RumbleDialog
 import emu.skyline.input.dialog.StickDialog
 import emu.skyline.input.onscreen.OnScreenEditActivity
-import emu.skyline.utils.PreferenceSettings
+import emu.skyline.settings.PreferenceSettings
 import emu.skyline.utils.WindowInsetsHelper
 import javax.inject.Inject
 
diff --git a/app/src/main/java/emu/skyline/input/InputHandler.kt b/app/src/main/java/emu/skyline/input/InputHandler.kt
index 7e665ca1..f4f6b868 100644
--- a/app/src/main/java/emu/skyline/input/InputHandler.kt
+++ b/app/src/main/java/emu/skyline/input/InputHandler.kt
@@ -17,7 +17,7 @@ import android.view.OrientationEventListener
 import android.view.View
 import androidx.core.content.getSystemService
 import emu.skyline.utils.ByteBufferSerializable
-import emu.skyline.utils.PreferenceSettings
+import emu.skyline.settings.PreferenceSettings
 import emu.skyline.utils.u64
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
diff --git a/app/src/main/java/emu/skyline/input/onscreen/OnScreenEditActivity.kt b/app/src/main/java/emu/skyline/input/onscreen/OnScreenEditActivity.kt
index 85d9058d..89caef6c 100644
--- a/app/src/main/java/emu/skyline/input/onscreen/OnScreenEditActivity.kt
+++ b/app/src/main/java/emu/skyline/input/onscreen/OnScreenEditActivity.kt
@@ -15,7 +15,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import dagger.hilt.android.AndroidEntryPoint
 import emu.skyline.R
 import emu.skyline.databinding.OnScreenEditActivityBinding
-import emu.skyline.utils.PreferenceSettings
+import emu.skyline.settings.PreferenceSettings
 import javax.inject.Inject
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/emu/skyline/preference/DocumentsProviderPreference.kt b/app/src/main/java/emu/skyline/preference/DocumentsProviderPreference.kt
index bc9ac53a..0e22cfb2 100644
--- a/app/src/main/java/emu/skyline/preference/DocumentsProviderPreference.kt
+++ b/app/src/main/java/emu/skyline/preference/DocumentsProviderPreference.kt
@@ -14,7 +14,7 @@ import androidx.preference.Preference
 import androidx.preference.R
 import com.google.android.material.snackbar.Snackbar
 import emu.skyline.R as SkylineR
-import emu.skyline.SettingsActivity
+import emu.skyline.settings.SettingsActivity
 import emu.skyline.provider.DocumentsProvider
 
 class DocumentsProviderPreference @JvmOverloads constructor(context : Context, attrs : AttributeSet? = null, defStyleAttr : Int = R.attr.preferenceStyle) : Preference(context, attrs, defStyleAttr) {
diff --git a/app/src/main/java/emu/skyline/preference/GpuDriverActivity.kt b/app/src/main/java/emu/skyline/preference/GpuDriverActivity.kt
index cd1a9858..a92a132f 100644
--- a/app/src/main/java/emu/skyline/preference/GpuDriverActivity.kt
+++ b/app/src/main/java/emu/skyline/preference/GpuDriverActivity.kt
@@ -25,7 +25,7 @@ import emu.skyline.adapter.SpacingItemDecoration
 import emu.skyline.databinding.GpuDriverActivityBinding
 import emu.skyline.utils.GpuDriverHelper
 import emu.skyline.utils.GpuDriverInstallResult
-import emu.skyline.utils.PreferenceSettings
+import emu.skyline.settings.PreferenceSettings
 import emu.skyline.utils.WindowInsetsHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/emu/skyline/preference/GpuDriverPreference.kt b/app/src/main/java/emu/skyline/preference/GpuDriverPreference.kt
index 8624e196..3ad6c124 100644
--- a/app/src/main/java/emu/skyline/preference/GpuDriverPreference.kt
+++ b/app/src/main/java/emu/skyline/preference/GpuDriverPreference.kt
@@ -14,7 +14,7 @@ import androidx.preference.Preference
 import androidx.preference.Preference.SummaryProvider
 import androidx.preference.R
 import emu.skyline.utils.GpuDriverHelper
-import emu.skyline.utils.PreferenceSettings
+import emu.skyline.settings.PreferenceSettings
 import emu.skyline.R as SkylineR
 
 /**
diff --git a/app/src/main/java/emu/skyline/preference/KeyPickerPreference.kt b/app/src/main/java/emu/skyline/preference/KeyPickerPreference.kt
index 79529e6a..c074d20a 100644
--- a/app/src/main/java/emu/skyline/preference/KeyPickerPreference.kt
+++ b/app/src/main/java/emu/skyline/preference/KeyPickerPreference.kt
@@ -14,7 +14,7 @@ import androidx.preference.Preference
 import com.google.android.material.snackbar.Snackbar
 import emu.skyline.KeyReader
 import emu.skyline.R
-import emu.skyline.SettingsActivity
+import emu.skyline.settings.SettingsActivity
 import emu.skyline.di.getSettings
 
 class KeyPickerPreference @JvmOverloads constructor(context : Context, attrs : AttributeSet? = null, defStyleAttr : Int = androidx.preference.R.attr.preferenceStyle) : Preference(context, attrs, defStyleAttr) {
diff --git a/app/src/main/java/emu/skyline/preference/LogLevelPreference.kt b/app/src/main/java/emu/skyline/preference/LogLevelPreference.kt
index 42883a15..3aa1fe6d 100644
--- a/app/src/main/java/emu/skyline/preference/LogLevelPreference.kt
+++ b/app/src/main/java/emu/skyline/preference/LogLevelPreference.kt
@@ -8,7 +8,7 @@ package emu.skyline.preference
 import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.R
-import emu.skyline.utils.NativeSettings
+import emu.skyline.settings.NativeSettings
 
 class LogLevelPreference @JvmOverloads constructor(context : Context, attrs : AttributeSet? = null, defStyleAttr : Int = R.attr.dialogPreferenceStyle) : IntegerListPreference(context, attrs, defStyleAttr) {
     init {
diff --git a/app/src/main/java/emu/skyline/utils/NativeSettings.kt b/app/src/main/java/emu/skyline/settings/NativeSettings.kt
similarity index 96%
rename from app/src/main/java/emu/skyline/utils/NativeSettings.kt
rename to app/src/main/java/emu/skyline/settings/NativeSettings.kt
index 9faa96e3..85323f9a 100644
--- a/app/src/main/java/emu/skyline/utils/NativeSettings.kt
+++ b/app/src/main/java/emu/skyline/settings/NativeSettings.kt
@@ -3,10 +3,11 @@
  * Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/)
  */
 
-package emu.skyline.utils
+package emu.skyline.settings
 
 import android.content.Context
 import emu.skyline.BuildConfig
+import emu.skyline.utils.GpuDriverHelper
 
 /**
  * The settings that will be passed to libskyline when running and executable
diff --git a/app/src/main/java/emu/skyline/utils/PreferenceSettings.kt b/app/src/main/java/emu/skyline/settings/PreferenceSettings.kt
similarity index 97%
rename from app/src/main/java/emu/skyline/utils/PreferenceSettings.kt
rename to app/src/main/java/emu/skyline/settings/PreferenceSettings.kt
index 46d53e79..94d509a8 100644
--- a/app/src/main/java/emu/skyline/utils/PreferenceSettings.kt
+++ b/app/src/main/java/emu/skyline/settings/PreferenceSettings.kt
@@ -3,14 +3,15 @@
  * Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
  */
 
-package emu.skyline.utils
+package emu.skyline.settings
 
 import android.content.Context
 import android.content.pm.ActivityInfo
 import dagger.hilt.android.qualifiers.ApplicationContext
+import emu.skyline.R
+import emu.skyline.utils.sharedPreferences
 import javax.inject.Inject
 import javax.inject.Singleton
-import emu.skyline.R
 
 @Singleton
 class PreferenceSettings @Inject constructor(@ApplicationContext private val context : Context) {
diff --git a/app/src/main/java/emu/skyline/SettingsActivity.kt b/app/src/main/java/emu/skyline/settings/SettingsActivity.kt
similarity index 98%
rename from app/src/main/java/emu/skyline/SettingsActivity.kt
rename to app/src/main/java/emu/skyline/settings/SettingsActivity.kt
index 1900f097..e176629e 100644
--- a/app/src/main/java/emu/skyline/SettingsActivity.kt
+++ b/app/src/main/java/emu/skyline/settings/SettingsActivity.kt
@@ -3,7 +3,7 @@
  * Copyright © 2020 Skyline Team and Contributors (https://github.com/skyline-emu/)
  */
 
-package emu.skyline
+package emu.skyline.settings
 
 import android.os.Bundle
 import android.view.*
@@ -14,11 +14,12 @@ import androidx.preference.CheckBoxPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
+import emu.skyline.BuildConfig
+import emu.skyline.R
 import emu.skyline.databinding.SettingsActivityBinding
 import emu.skyline.preference.IntegerListPreference
 import emu.skyline.utils.GpuDriverHelper
 import emu.skyline.utils.WindowInsetsHelper
-import emu.skyline.utils.sharedPreferences
 
 class SettingsActivity : AppCompatActivity() {
     val binding by lazy { SettingsActivityBinding.inflate(layoutInflater) }