diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index 3daaa19cf..e67778dba 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml @@ -33,7 +33,7 @@ @@ -61,13 +61,13 @@ @@ -87,7 +87,7 @@ diff --git a/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.kt b/src/android/app/src/main/java/io/github/lime3ds/CitraApplication.kt similarity index 96% rename from src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.kt rename to src/android/app/src/main/java/io/github/lime3ds/CitraApplication.kt index 86c33c8c3..6efe4a366 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/CitraApplication.kt @@ -17,7 +17,7 @@ import io.github.lime3ds.utils.PermissionsHandler import io.github.lime3ds.utils.Log import io.github.lime3ds.utils.MemoryUtil -class CitraApplication : Application() { +class LimeApplication : Application() { private fun createNotificationChannel() { with(getSystemService(NotificationManager::class.java)) { // General notification @@ -71,7 +71,7 @@ class CitraApplication : Application() { } companion object { - private var application: CitraApplication? = null + private var application: LimeApplication? = null val appContext: Context get() = application!!.applicationContext diff --git a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt b/src/android/app/src/main/java/io/github/lime3ds/NativeLibrary.kt similarity index 96% rename from src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt rename to src/android/app/src/main/java/io/github/lime3ds/NativeLibrary.kt index 7c8300023..b001fd2e9 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/NativeLibrary.kt @@ -247,7 +247,7 @@ object NativeLibrary { @get:Keep @get:JvmStatic val isPortraitMode: Boolean - get() = CitraApplication.appContext.resources.configuration.orientation == + get() = LimeApplication.appContext.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT @Keep @@ -369,7 +369,7 @@ object NativeLibrary { .setTitle(captionId) .setMessage( Html.fromHtml( - CitraApplication.appContext.resources.getString(R.string.redump_games), + LimeApplication.appContext.resources.getString(R.string.redump_games), Html.FROM_HTML_MODE_LEGACY ) ) @@ -519,7 +519,7 @@ object NativeLibrary { @JvmStatic fun createFile(directory: String, filename: String): Boolean = if (FileUtil.isNativePath(directory)) { - CitraApplication.documentsTree.createFile(directory, filename) + LimeApplication.documentsTree.createFile(directory, filename) } else { FileUtil.createFile(directory, filename) != null } @@ -528,7 +528,7 @@ object NativeLibrary { @JvmStatic fun createDir(directory: String, directoryName: String): Boolean = if (FileUtil.isNativePath(directory)) { - CitraApplication.documentsTree.createDir(directory, directoryName) + LimeApplication.documentsTree.createDir(directory, directoryName) } else { FileUtil.createDir(directory, directoryName) != null } @@ -537,7 +537,7 @@ object NativeLibrary { @JvmStatic fun openContentUri(path: String, openMode: String): Int = if (FileUtil.isNativePath(path)) { - CitraApplication.documentsTree.openContentUri(path, openMode) + LimeApplication.documentsTree.openContentUri(path, openMode) } else { FileUtil.openContentUri(path, openMode) } @@ -546,7 +546,7 @@ object NativeLibrary { @JvmStatic fun getFilesName(path: String): Array = if (FileUtil.isNativePath(path)) { - CitraApplication.documentsTree.getFilesName(path) + LimeApplication.documentsTree.getFilesName(path) } else { FileUtil.getFilesName(path) } @@ -555,7 +555,7 @@ object NativeLibrary { @JvmStatic fun getSize(path: String): Long = if (FileUtil.isNativePath(path)) { - CitraApplication.documentsTree.getFileSize(path) + LimeApplication.documentsTree.getFileSize(path) } else { FileUtil.getFileSize(path) } @@ -564,7 +564,7 @@ object NativeLibrary { @JvmStatic fun fileExists(path: String): Boolean = if (FileUtil.isNativePath(path)) { - CitraApplication.documentsTree.exists(path) + LimeApplication.documentsTree.exists(path) } else { FileUtil.exists(path) } @@ -573,7 +573,7 @@ object NativeLibrary { @JvmStatic fun isDirectory(path: String): Boolean = if (FileUtil.isNativePath(path)) { - CitraApplication.documentsTree.isDirectory(path) + LimeApplication.documentsTree.isDirectory(path) } else { FileUtil.isDirectory(path) } @@ -588,7 +588,7 @@ object NativeLibrary { if (FileUtil.isNativePath(sourcePath) && FileUtil.isNativePath(destinationParentPath) ) { - CitraApplication.documentsTree + LimeApplication.documentsTree .copyFile(sourcePath, destinationParentPath, destinationFilename) } else { FileUtil.copyFile( @@ -602,7 +602,7 @@ object NativeLibrary { @JvmStatic fun renameFile(path: String, destinationFilename: String): Boolean = if (FileUtil.isNativePath(path)) { - CitraApplication.documentsTree.renameFile(path, destinationFilename) + LimeApplication.documentsTree.renameFile(path, destinationFilename) } else { FileUtil.renameFile(path, destinationFilename) } @@ -611,7 +611,7 @@ object NativeLibrary { @JvmStatic fun deleteDocument(path: String): Boolean = if (FileUtil.isNativePath(path)) { - CitraApplication.documentsTree.deleteDocument(path) + LimeApplication.documentsTree.deleteDocument(path) } else { FileUtil.deleteDocument(path) } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/activities/EmulationActivity.kt similarity index 99% rename from src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt rename to src/android/app/src/main/java/io/github/lime3ds/activities/EmulationActivity.kt index f72347394..2f17bb7f1 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/activities/EmulationActivity.kt @@ -25,7 +25,7 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.navigation.fragment.NavHostFragment import androidx.preference.PreferenceManager -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.NativeLibrary import io.github.lime3ds.R import io.github.lime3ds.camera.StillImageCameraHelper.OnFilePickerResult @@ -46,7 +46,7 @@ import io.github.lime3ds.viewmodel.EmulationViewModel class EmulationActivity : AppCompatActivity() { private val preferences: SharedPreferences - get() = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + get() = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) private var foregroundService: Intent? = null var isActivityRecreated = false diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/DriverAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/adapters/DriverAdapter.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/adapters/DriverAdapter.kt rename to src/android/app/src/main/java/io/github/lime3ds/adapters/DriverAdapter.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/adapters/GameAdapter.kt similarity index 97% rename from src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.kt rename to src/android/app/src/main/java/io/github/lime3ds/adapters/GameAdapter.kt index 377707ffb..874ad5061 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/adapters/GameAdapter.kt @@ -24,7 +24,7 @@ import androidx.recyclerview.widget.RecyclerView import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import io.github.lime3ds.HomeNavigationDirections -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.adapters.GameAdapter.GameViewHolder import io.github.lime3ds.databinding.CardGameBinding @@ -70,7 +70,7 @@ class GameAdapter(private val activity: AppCompatActivity) : gameExists(holder) val preferences = - PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) preferences.edit() .putLong( holder.game.keyLastPlayedTime, @@ -112,12 +112,12 @@ class GameAdapter(private val activity: AppCompatActivity) : } val gameExists = DocumentFile.fromSingleUri( - CitraApplication.appContext, + LimeApplication.appContext, Uri.parse(holder.game.path) )?.exists() == true return if (!gameExists) { Toast.makeText( - CitraApplication.appContext, + LimeApplication.appContext, R.string.loader_error_file_not_found, Toast.LENGTH_LONG ).show() diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/HomeSettingAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/adapters/HomeSettingAdapter.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/adapters/HomeSettingAdapter.kt rename to src/android/app/src/main/java/io/github/lime3ds/adapters/HomeSettingAdapter.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/LicenseAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/adapters/LicenseAdapter.kt similarity index 95% rename from src/android/app/src/main/java/org/citra/citra_emu/adapters/LicenseAdapter.kt rename to src/android/app/src/main/java/io/github/lime3ds/adapters/LicenseAdapter.kt index 8a68d3211..f54d35f39 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/adapters/LicenseAdapter.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/adapters/LicenseAdapter.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ViewHolder -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.databinding.ListItemSettingBinding import io.github.lime3ds.fragments.LicenseBottomSheetDialogFragment import io.github.lime3ds.model.License @@ -47,7 +47,7 @@ class LicenseAdapter(private val activity: AppCompatActivity, var licenses: List fun bind(license: License) { this.license = license - val context = CitraApplication.appContext + val context = LimeApplication.appContext binding.textSettingName.text = context.getString(license.titleId) binding.textSettingDescription.text = context.getString(license.descriptionId) } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/SetupAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/adapters/SetupAdapter.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/adapters/SetupAdapter.kt rename to src/android/app/src/main/java/io/github/lime3ds/adapters/SetupAdapter.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.kt b/src/android/app/src/main/java/io/github/lime3ds/applets/MiiSelector.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.kt rename to src/android/app/src/main/java/io/github/lime3ds/applets/MiiSelector.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.kt b/src/android/app/src/main/java/io/github/lime3ds/applets/SoftwareKeyboard.kt similarity index 98% rename from src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.kt rename to src/android/app/src/main/java/io/github/lime3ds/applets/SoftwareKeyboard.kt index 8ebccbf01..c6febaa30 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/applets/SoftwareKeyboard.kt @@ -7,7 +7,7 @@ package io.github.lime3ds.applets import android.text.InputFilter import android.text.Spanned import androidx.annotation.Keep -import io.github.lime3ds.CitraApplication.Companion.appContext +import io.github.lime3ds.LimeApplication.Companion.appContext import io.github.lime3ds.NativeLibrary import io.github.lime3ds.R import io.github.lime3ds.fragments.KeyboardDialogFragment diff --git a/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/camera/StillImageCameraHelper.kt similarity index 95% rename from src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/camera/StillImageCameraHelper.kt index 7bc3d1451..6309884e8 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/camera/StillImageCameraHelper.kt @@ -12,7 +12,7 @@ import androidx.core.graphics.drawable.toBitmap import coil.executeBlocking import coil.imageLoader import coil.request.ImageRequest -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.NativeLibrary // Used in native code. @@ -53,7 +53,7 @@ object StillImageCameraHelper { @Keep @JvmStatic fun LoadImageFromFile(uri: String?, width: Int, height: Int): Bitmap? { - val context = CitraApplication.appContext + val context = LimeApplication.appContext val request = ImageRequest.Builder(context) .data(uri) .size(width, height) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/contracts/OpenFileResultContract.kt b/src/android/app/src/main/java/io/github/lime3ds/contracts/OpenFileResultContract.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/contracts/OpenFileResultContract.kt rename to src/android/app/src/main/java/io/github/lime3ds/contracts/OpenFileResultContract.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/display/ScreenAdjustmentUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/display/ScreenAdjustmentUtil.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/display/ScreenAdjustmentUtil.kt rename to src/android/app/src/main/java/io/github/lime3ds/display/ScreenAdjustmentUtil.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/display/ScreenLayout.kt b/src/android/app/src/main/java/io/github/lime3ds/display/ScreenLayout.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/display/ScreenLayout.kt rename to src/android/app/src/main/java/io/github/lime3ds/display/ScreenLayout.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/Cheat.kt b/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/Cheat.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/Cheat.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/Cheat.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatEngine.kt b/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatEngine.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatEngine.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatEngine.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatsViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatsViewModel.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatsViewModel.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/cheats/model/CheatsViewModel.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatDetailsFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatDetailsFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatListFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatListFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatListFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatListFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsActivity.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsActivity.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsAdapter.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsAdapter.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsAdapter.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/cheats/ui/CheatsFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/Hotkey.kt b/src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/Hotkey.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/Hotkey.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/Hotkey.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt b/src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/HotkeyUtility.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/hotkeys/HotkeyUtility.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractBooleanSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractBooleanSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractBooleanSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractBooleanSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractFloatSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractFloatSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractFloatSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractFloatSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractIntSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractIntSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractIntSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractIntSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractShortSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractShortSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractShortSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractShortSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractStringSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractStringSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractStringSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/AbstractStringSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/BooleanSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/BooleanSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/FloatSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/FloatSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/IntSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/IntSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/ScaledFloatSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/ScaledFloatSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/ScaledFloatSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/ScaledFloatSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingSection.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingSection.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingSection.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingSection.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/Settings.kt similarity index 98% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/Settings.kt index e8f35ab3d..57111a844 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/Settings.kt @@ -5,7 +5,7 @@ package io.github.lime3ds.features.settings.model import android.text.TextUtils -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.features.settings.ui.SettingsActivityView import io.github.lime3ds.features.settings.utils.SettingsFile @@ -79,7 +79,7 @@ class Settings { fun saveSettings(view: SettingsActivityView) { if (TextUtils.isEmpty(gameId)) { view.showToastMessage( - CitraApplication.appContext.getString(R.string.ini_saved), + LimeApplication.appContext.getString(R.string.ini_saved), false ) for ((fileName, sectionNames) in configFileSectionsMap.entries) { diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingsViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingsViewModel.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingsViewModel.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/SettingsViewModel.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/StringSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/StringSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/StringSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/StringSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/DateTimeSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/DateTimeSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/DateTimeSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/DateTimeSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/HeaderSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/HeaderSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/InputBindingSetting.kt similarity index 99% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/InputBindingSetting.kt index 7d1d64943..9de098b58 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/InputBindingSetting.kt @@ -11,7 +11,7 @@ import android.view.InputDevice.MotionRange import android.view.KeyEvent import android.widget.Toast import androidx.preference.PreferenceManager -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.NativeLibrary import io.github.lime3ds.R import io.github.lime3ds.features.hotkeys.Hotkey @@ -22,7 +22,7 @@ class InputBindingSetting( val abstractSetting: AbstractSetting, titleId: Int ) : SettingsItem(abstractSetting, titleId, 0) { - private val context: Context get() = CitraApplication.appContext + private val context: Context get() = LimeApplication.appContext private val preferences: SharedPreferences get() = PreferenceManager.getDefaultSharedPreferences(context) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/RunnableSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/RunnableSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/RunnableSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/RunnableSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SettingsItem.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SettingsItem.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SingleChoiceSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SingleChoiceSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SingleChoiceSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SingleChoiceSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SliderSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SliderSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringInputSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringInputSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringInputSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringInputSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringSingleChoiceSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/StringSingleChoiceSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SubmenuSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SubmenuSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SubmenuSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SubmenuSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SwitchSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SwitchSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SwitchSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/model/view/SwitchSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivity.kt similarity index 97% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivity.kt index 7e0a71d9d..88065df5f 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivity.kt @@ -21,7 +21,7 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.updatePadding import androidx.preference.PreferenceManager import com.google.android.material.color.MaterialColors -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.NativeLibrary import io.github.lime3ds.R import io.github.lime3ds.databinding.ActivitySettingsBinding @@ -193,7 +193,7 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { val controllerKeys = Settings.buttonKeys + Settings.circlePadKeys + Settings.cStickKeys + Settings.dPadKeys + Settings.triggerKeys val editor = - PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext).edit() + PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext).edit() controllerKeys.forEach { editor.remove(it) } editor.apply() @@ -213,7 +213,7 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { // Set the root of the document tree before we create a new config file or the native code // will fail when creating the file. if (DirectoryInitialization.setCitraUserDirectory()) { - CitraApplication.documentsTree.setRoot(Uri.parse(DirectoryInitialization.userPath)) + LimeApplication.documentsTree.setRoot(Uri.parse(DirectoryInitialization.userPath)) NativeLibrary.createConfigFile() } else { throw IllegalStateException("Citra directory unavailable when accessing config file!") diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityPresenter.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityPresenter.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityView.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsActivityView.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsAdapter.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsAdapter.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentPresenter.kt similarity index 99% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentPresenter.kt index 7d397e6fc..ac2a07b45 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentPresenter.kt @@ -12,7 +12,7 @@ import android.hardware.camera2.CameraManager import android.os.Build import android.text.TextUtils import androidx.preference.PreferenceManager -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.features.settings.model.AbstractBooleanSetting import io.github.lime3ds.features.settings.model.AbstractIntSetting @@ -60,7 +60,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) fun onViewCreated(settingsAdapter: SettingsAdapter) { this.settingsAdapter = settingsAdapter - preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + preferences = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) loadSettingsList() } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentView.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentView.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentView.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/SettingsFragmentView.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/DateTimeViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/DateTimeViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/HeaderViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/HeaderViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt similarity index 96% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt index 89336988d..c27836379 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt @@ -6,7 +6,7 @@ package io.github.lime3ds.features.settings.ui.viewholder import android.view.View import androidx.preference.PreferenceManager -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.databinding.ListItemSettingBinding import io.github.lime3ds.features.settings.model.view.InputBindingSetting import io.github.lime3ds.features.settings.model.view.SettingsItem @@ -17,7 +17,7 @@ class InputBindingSettingViewHolder(val binding: ListItemSettingBinding, adapter private lateinit var setting: InputBindingSetting override fun bind(item: SettingsItem) { - val preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + val preferences = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) setting = item as InputBindingSetting binding.textSettingName.setText(item.nameId) val uiString = preferences.getString(setting.abstractSetting.key, "")!! diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/RunnableViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/RunnableViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/RunnableViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/RunnableViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SettingViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SettingViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SettingViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SettingViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SingleChoiceViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SingleChoiceViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SliderViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SliderViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/StringInputViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/StringInputViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/StringInputViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/StringInputViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SubmenuViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SubmenuViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SwitchSettingViewHolder.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/ui/viewholder/SwitchSettingViewHolder.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.kt b/src/android/app/src/main/java/io/github/lime3ds/features/settings/utils/SettingsFile.kt similarity index 95% rename from src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.kt rename to src/android/app/src/main/java/io/github/lime3ds/features/settings/utils/SettingsFile.kt index 1c02047c1..22f7d39ad 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/features/settings/utils/SettingsFile.kt @@ -7,7 +7,7 @@ package io.github.lime3ds.features.settings.utils import android.content.Context import android.net.Uri import androidx.documentfile.provider.DocumentFile -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.BooleanSetting @@ -55,7 +55,7 @@ object SettingsFile { val sections: HashMap = SettingsSectionMap() var reader: BufferedReader? = null try { - val context: Context = CitraApplication.appContext + val context: Context = LimeApplication.appContext val inputStream = context.contentResolver.openInputStream(ini.uri) reader = BufferedReader(InputStreamReader(inputStream)) var current: SettingSection? = null @@ -125,7 +125,7 @@ object SettingsFile { ) { val ini = getSettingsFile(fileName) try { - val context: Context = CitraApplication.appContext + val context: Context = LimeApplication.appContext val inputStream = context.contentResolver.openInputStream(ini.uri) val writer = Wini(inputStream) val keySet: Set = sections.keys @@ -141,7 +141,7 @@ object SettingsFile { } catch (e: Exception) { Log.error("[SettingsFile] File not found: $fileName.ini: ${e.message}") view.showToastMessage( - CitraApplication.appContext + LimeApplication.appContext .getString(R.string.error_saving, fileName, e.message), false ) } @@ -153,7 +153,7 @@ object SettingsFile { ) { val ini = getSettingsFile(fileName) try { - val context: Context = CitraApplication.appContext + val context: Context = LimeApplication.appContext val inputStream = context.contentResolver.openInputStream(ini.uri) val writer = Wini(inputStream) writer.put(setting.section, setting.key, setting.valueAsString) @@ -184,13 +184,13 @@ object SettingsFile { } fun getSettingsFile(fileName: String): DocumentFile { - val root = DocumentFile.fromTreeUri(CitraApplication.appContext, Uri.parse(userDirectory)) + val root = DocumentFile.fromTreeUri(LimeApplication.appContext, Uri.parse(userDirectory)) val configDirectory = root!!.findFile("config") return configDirectory!!.findFile("$fileName.ini")!! } private fun getCustomGameSettingsFile(gameId: String): DocumentFile { - val root = DocumentFile.fromTreeUri(CitraApplication.appContext, Uri.parse(userDirectory)) + val root = DocumentFile.fromTreeUri(LimeApplication.appContext, Uri.parse(userDirectory)) val configDirectory = root!!.findFile("GameSettings") return configDirectory!!.findFile("$gameId.ini")!! } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/AboutFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/AboutFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/AboutFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/CitraDirectoryDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/CitraDirectoryDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/CitraDirectoryDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/CitraDirectoryDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/CopyDirProgressDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/CopyDirProgressDialogFragment.kt similarity index 96% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/CopyDirProgressDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/CopyDirProgressDialogFragment.kt index 89ce0a6fe..8ac00f6fa 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/CopyDirProgressDialogFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/fragments/CopyDirProgressDialogFragment.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.databinding.DialogCopyDirBinding import io.github.lime3ds.model.SetupCallback @@ -125,14 +125,14 @@ class CopyDirProgressDialog : DialogFragment() { object : FileUtil.CopyDirListener { override fun onSearchProgress(directoryName: String) { viewModel.onUpdateSearchProgress( - CitraApplication.appContext.resources, + LimeApplication.appContext.resources, directoryName ) } override fun onCopyProgress(filename: String, progress: Int, max: Int) { viewModel.onUpdateCopyProgress( - CitraApplication.appContext.resources, + LimeApplication.appContext.resources, filename, progress, max diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/DownloadSystemFilesDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/DownloadSystemFilesDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/DownloadSystemFilesDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/DownloadSystemFilesDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/DriverManagerFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/DriverManagerFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/DriverManagerFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/DriverManagerFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/DriversLoadingDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/DriversLoadingDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/DriversLoadingDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/DriversLoadingDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/EmulationFragment.kt similarity index 99% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/EmulationFragment.kt index d7de4ae7c..7dd0f8378 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/fragments/EmulationFragment.kt @@ -43,7 +43,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.slider.Slider import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.EmulationNavigationDirections import io.github.lime3ds.NativeLibrary import io.github.lime3ds.R @@ -70,7 +70,7 @@ import io.github.lime3ds.viewmodel.EmulationViewModel class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.FrameCallback { private val preferences: SharedPreferences - get() = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + get() = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) private lateinit var emulationState: EmulationState private var perfStatsUpdater: Runnable? = null diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/GamesFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/GamesFragment.kt similarity index 98% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/GamesFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/GamesFragment.kt index 3e9bd8a49..bf5b4fe43 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/GamesFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/fragments/GamesFragment.kt @@ -25,7 +25,7 @@ import com.google.android.material.color.MaterialColors import com.google.android.material.transition.MaterialFadeThrough import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.adapters.GameAdapter import io.github.lime3ds.databinding.FragmentGamesBinding @@ -147,7 +147,7 @@ class GamesFragment : Fragment() { } private fun setAdapter(games: List) { - val preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + val preferences = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) if (preferences.getBoolean(Settings.PREF_SHOW_HOME_APPS, false)) { (binding.gridGames.adapter as GameAdapter).submitList(games) } else { diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/HomeSettingsFragment.kt similarity index 98% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/HomeSettingsFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/HomeSettingsFragment.kt index 761ea6eda..2c9bceb0e 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/HomeSettingsFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/fragments/HomeSettingsFragment.kt @@ -24,7 +24,7 @@ import androidx.navigation.fragment.findNavController import androidx.preference.PreferenceManager import androidx.recyclerview.widget.GridLayoutManager import com.google.android.material.transition.MaterialSharedAxis -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.adapters.HomeSettingAdapter import io.github.lime3ds.databinding.FragmentHomeSettingsBinding @@ -50,7 +50,7 @@ class HomeSettingsFragment : Fragment() { private val driverViewModel: DriverViewModel by activityViewModels() private val preferences get() = - PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -188,7 +188,7 @@ class HomeSettingsFragment : Fragment() { .apply() Toast.makeText( - CitraApplication.appContext, + LimeApplication.appContext, R.string.games_dir_selected, Toast.LENGTH_LONG ).show() diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/IndeterminateProgressDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/IndeterminateProgressDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/IndeterminateProgressDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/IndeterminateProgressDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/KeyboardDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/KeyboardDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/KeyboardDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/KeyboardDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/LicenseBottomSheetDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/LicenseBottomSheetDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/LicenseBottomSheetDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/LicenseBottomSheetDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/LicensesFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/LicensesFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/LicensesFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/LicensesFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/MessageDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/MessageDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/MessageDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/MessageDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/MiiSelectorDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/MiiSelectorDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/MiiSelectorDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/MiiSelectorDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/MotionBottomSheetDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/MotionBottomSheetDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/MotionBottomSheetDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/MotionBottomSheetDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/ResetSettingsDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/ResetSettingsDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/ResetSettingsDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/ResetSettingsDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SearchFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/SearchFragment.kt similarity index 99% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/SearchFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/SearchFragment.kt index f98199654..90974b997 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SearchFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/fragments/SearchFragment.kt @@ -27,7 +27,7 @@ import androidx.recyclerview.widget.GridLayoutManager import info.debatty.java.stringsimilarity.Jaccard import info.debatty.java.stringsimilarity.JaroWinkler import kotlinx.coroutines.launch -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.adapters.GameAdapter import io.github.lime3ds.databinding.FragmentSearchBinding @@ -65,7 +65,7 @@ class SearchFragment : Fragment() { homeViewModel.setNavigationVisibility(visible = true, animated = true) homeViewModel.setStatusBarShadeVisibility(visible = true) - preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + preferences = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) if (savedInstanceState != null) { binding.searchText.setText(savedInstanceState.getString(SEARCH_TEXT)) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SelectUserDirectoryDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/SelectUserDirectoryDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/SelectUserDirectoryDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/SelectUserDirectoryDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/SetupFragment.kt similarity index 99% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/SetupFragment.kt index f5ca0403a..c244a4265 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/fragments/SetupFragment.kt @@ -30,7 +30,7 @@ import androidx.preference.PreferenceManager import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback import com.google.android.material.snackbar.Snackbar import com.google.android.material.transition.MaterialFadeThrough -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.adapters.SetupAdapter import io.github.lime3ds.databinding.FragmentSetupBinding @@ -60,7 +60,7 @@ class SetupFragment : Fragment() { private lateinit var pages: MutableList private val preferences: SharedPreferences - get() = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + get() = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) companion object { const val KEY_NEXT_VISIBILITY = "NextButtonVisibility" diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupWarningDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/SetupWarningDialogFragment.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupWarningDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/SetupWarningDialogFragment.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SystemFilesFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/fragments/SystemFilesFragment.kt similarity index 99% rename from src/android/app/src/main/java/org/citra/citra_emu/fragments/SystemFilesFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/fragments/SystemFilesFragment.kt index 77bdb21cf..a4b86c0d1 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/SystemFilesFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/fragments/SystemFilesFragment.kt @@ -26,7 +26,7 @@ import androidx.preference.PreferenceManager import com.google.android.material.textfield.MaterialAutoCompleteTextView import com.google.android.material.transition.MaterialSharedAxis import kotlinx.coroutines.launch -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.HomeNavigationDirections import io.github.lime3ds.NativeLibrary import io.github.lime3ds.R @@ -92,7 +92,7 @@ class SystemFilesFragment : Fragment() { homeViewModel.setNavigationVisibility(visible = false, animated = true) homeViewModel.setStatusBarShadeVisibility(visible = false) - val preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + val preferences = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) if (!preferences.getBoolean(WARNING_SHOWN, false)) { MessageDialogFragment.newInstance( R.string.home_menu_warning, @@ -155,7 +155,7 @@ class SystemFilesFragment : Fragment() { } private fun reloadUi() { - val preferences = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + val preferences = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) binding.switchRunSystemSetup.isChecked = SystemSaveGame.getIsSystemSetupNeeded() binding.switchRunSystemSetup.setOnCheckedChangeListener { _, isChecked -> diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/CheapDocument.kt b/src/android/app/src/main/java/io/github/lime3ds/model/CheapDocument.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/model/CheapDocument.kt rename to src/android/app/src/main/java/io/github/lime3ds/model/CheapDocument.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/Game.kt b/src/android/app/src/main/java/io/github/lime3ds/model/Game.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/model/Game.kt rename to src/android/app/src/main/java/io/github/lime3ds/model/Game.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/GameInfo.kt b/src/android/app/src/main/java/io/github/lime3ds/model/GameInfo.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/model/GameInfo.kt rename to src/android/app/src/main/java/io/github/lime3ds/model/GameInfo.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/HomeSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/model/HomeSetting.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/model/HomeSetting.kt rename to src/android/app/src/main/java/io/github/lime3ds/model/HomeSetting.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/License.kt b/src/android/app/src/main/java/io/github/lime3ds/model/License.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/model/License.kt rename to src/android/app/src/main/java/io/github/lime3ds/model/License.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/SetupPage.kt b/src/android/app/src/main/java/io/github/lime3ds/model/SetupPage.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/model/SetupPage.kt rename to src/android/app/src/main/java/io/github/lime3ds/model/SetupPage.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlay.kt similarity index 99% rename from src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt rename to src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlay.kt index a452403b6..855ccabab 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlay.kt @@ -21,7 +21,7 @@ import android.view.View import android.view.View.OnTouchListener import androidx.core.content.ContextCompat import androidx.preference.PreferenceManager -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.NativeLibrary import io.github.lime3ds.R import io.github.lime3ds.utils.EmulationMenuSettings @@ -778,7 +778,7 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex companion object { private val preferences - get() = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + get() = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) /** * Resizes a [Bitmap] by a given scale factor diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableButton.kt b/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableButton.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableButton.kt rename to src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableButton.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableDpad.kt b/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableDpad.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableDpad.kt rename to src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableDpad.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableJoystick.kt b/src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableJoystick.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableJoystick.kt rename to src/android/app/src/main/java/io/github/lime3ds/overlay/InputOverlayDrawableJoystick.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/TwoPaneOnBackPressedCallback.kt b/src/android/app/src/main/java/io/github/lime3ds/ui/TwoPaneOnBackPressedCallback.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/ui/TwoPaneOnBackPressedCallback.kt rename to src/android/app/src/main/java/io/github/lime3ds/ui/TwoPaneOnBackPressedCallback.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/ui/main/MainActivity.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt rename to src/android/app/src/main/java/io/github/lime3ds/ui/main/MainActivity.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/ThemeProvider.kt b/src/android/app/src/main/java/io/github/lime3ds/ui/main/ThemeProvider.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/ui/main/ThemeProvider.kt rename to src/android/app/src/main/java/io/github/lime3ds/ui/main/ThemeProvider.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/BiMap.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/BiMap.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/BiMap.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/BiMap.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/CiaInstallWorker.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/CiaInstallWorker.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/CiaInstallWorker.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/CiaInstallWorker.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/CitraDirectoryHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/CitraDirectoryHelper.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/CitraDirectoryHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/CitraDirectoryHelper.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/ControllerMappingHelper.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/ControllerMappingHelper.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/DirectoryInitialization.kt similarity index 95% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/DirectoryInitialization.kt index 519e8ae3c..5526cf78d 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/DirectoryInitialization.kt @@ -8,7 +8,7 @@ import android.content.Context import android.net.Uri import androidx.preference.PreferenceManager import io.github.lime3ds.BuildConfig -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.NativeLibrary import io.github.lime3ds.utils.PermissionsHandler.hasWriteAccess import java.io.File @@ -29,10 +29,10 @@ object DirectoryInitialization { private var directoryState: DirectoryInitializationState? = null var userPath: String? = null val internalUserPath - get() = CitraApplication.appContext.getExternalFilesDir(null)!!.canonicalPath + get() = LimeApplication.appContext.getExternalFilesDir(null)!!.canonicalPath private val isCitraDirectoryInitializationRunning = AtomicBoolean(false) - val context: Context get() = CitraApplication.appContext + val context: Context get() = LimeApplication.appContext @JvmStatic fun start(): DirectoryInitializationState? { @@ -43,7 +43,7 @@ object DirectoryInitialization { if (directoryState != DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED) { directoryState = if (hasWriteAccess(context)) { if (setCitraUserDirectory()) { - CitraApplication.documentsTree.setRoot(Uri.parse(userPath)) + LimeApplication.documentsTree.setRoot(Uri.parse(userPath)) NativeLibrary.createLogFile() NativeLibrary.logUserDirectory(userPath.toString()) NativeLibrary.createConfigFile() diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/DiskShaderCacheProgress.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/DiskShaderCacheProgress.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/DiskShaderCacheProgress.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/DiskShaderCacheProgress.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/DocumentsTree.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/DocumentsTree.kt similarity index 98% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/DocumentsTree.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/DocumentsTree.kt index b4d732b79..7a5a193d8 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/DocumentsTree.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/DocumentsTree.kt @@ -7,7 +7,7 @@ package io.github.lime3ds.utils import android.net.Uri import android.provider.DocumentsContract import androidx.documentfile.provider.DocumentFile -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.model.CheapDocument import java.net.URLDecoder import java.util.StringTokenizer @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap */ class DocumentsTree { private var root: DocumentsNode? = null - private val context get() = CitraApplication.appContext + private val context get() = LimeApplication.appContext fun setRoot(rootUri: Uri?) { root = null diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationLifecycleUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/EmulationLifecycleUtil.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationLifecycleUtil.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/EmulationLifecycleUtil.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/EmulationMenuSettings.kt similarity index 95% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/EmulationMenuSettings.kt index 02189e621..0fdfd4ae8 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/EmulationMenuSettings.kt @@ -6,12 +6,12 @@ package io.github.lime3ds.utils import androidx.drawerlayout.widget.DrawerLayout import androidx.preference.PreferenceManager -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.display.ScreenLayout object EmulationMenuSettings { private val preferences = - PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) var joystickRelCenter: Boolean get() = preferences.getBoolean("EmulationMenuSettings_JoystickRelCenter", true) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/FileBrowserHelper.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/FileBrowserHelper.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/FileUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/FileUtil.kt similarity index 97% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/FileUtil.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/FileUtil.kt index fc1fa937e..c17ac76b9 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/FileUtil.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/FileUtil.kt @@ -12,7 +12,7 @@ import android.provider.DocumentsContract import android.system.Os import android.util.Pair import androidx.documentfile.provider.DocumentFile -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.model.CheapDocument import java.io.BufferedInputStream import java.io.File @@ -31,7 +31,7 @@ object FileUtil { const val APPLICATION_OCTET_STREAM = "application/octet-stream" const val TEXT_PLAIN = "text/plain" - val context: Context get() = CitraApplication.appContext + val context: Context get() = LimeApplication.appContext /** * Create a file from directory with filename. @@ -576,19 +576,19 @@ object FileUtil { } fun DocumentFile.inputStream(): InputStream = - CitraApplication.appContext.contentResolver.openInputStream(uri)!! + LimeApplication.appContext.contentResolver.openInputStream(uri)!! fun DocumentFile.outputStream(): OutputStream = - CitraApplication.appContext.contentResolver.openOutputStream(uri)!! + LimeApplication.appContext.contentResolver.openOutputStream(uri)!! fun Uri.inputStream(): InputStream = - CitraApplication.appContext.contentResolver.openInputStream(this)!! + LimeApplication.appContext.contentResolver.openInputStream(this)!! fun Uri.outputStream(): OutputStream = - CitraApplication.appContext.contentResolver.openOutputStream(this)!! + LimeApplication.appContext.contentResolver.openOutputStream(this)!! fun Uri.asDocumentFile(): DocumentFile? = - DocumentFile.fromSingleUri(CitraApplication.appContext, this) + DocumentFile.fromSingleUri(LimeApplication.appContext, this) interface CopyDirListener { fun onSearchProgress(directoryName: String) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ForegroundService.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/ForegroundService.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/ForegroundService.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/ForegroundService.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/GameHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/GameHelper.kt similarity index 95% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/GameHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/GameHelper.kt index 1c220976e..2eba65d3c 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/GameHelper.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/GameHelper.kt @@ -9,7 +9,7 @@ import android.net.Uri import androidx.preference.PreferenceManager import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.NativeLibrary import io.github.lime3ds.model.CheapDocument import io.github.lime3ds.model.Game @@ -24,7 +24,7 @@ object GameHelper { fun getGames(): List { val games = mutableListOf() - val context = CitraApplication.appContext + val context = LimeApplication.appContext preferences = PreferenceManager.getDefaultSharedPreferences(context) val gamesDir = preferences.getString(KEY_GAME_PATH, "") val gamesUri = Uri.parse(gamesDir) @@ -87,7 +87,7 @@ object GameHelper { gameInfo?.getIsVisibleSystemTitle() ?: false, gameInfo?.getIcon(), if (FileUtil.isNativePath(filePath)) { - CitraApplication.documentsTree.getFilename(filePath) + LimeApplication.documentsTree.getFilename(filePath) } else { FileUtil.getFilename(Uri.parse(filePath)) } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/GameIconUtils.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/GameIconUtils.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/GameIconUtils.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/GameIconUtils.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/GpuDriverHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverHelper.kt similarity index 97% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/GpuDriverHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverHelper.kt index fe5c0b889..f292d7b51 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/GpuDriverHelper.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverHelper.kt @@ -7,7 +7,7 @@ package io.github.lime3ds.utils import android.net.Uri import android.os.Build import androidx.documentfile.provider.DocumentFile -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.NativeLibrary import io.github.lime3ds.utils.FileUtil.asDocumentFile import io.github.lime3ds.utils.FileUtil.inputStream @@ -30,7 +30,7 @@ object GpuDriverHelper { get() { // Bypass directory initialization checks val root = DocumentFile.fromTreeUri( - CitraApplication.appContext, + LimeApplication.appContext, Uri.parse(DirectoryInitialization.userPath) )!! var driverDirectory = root.findFile("gpu_drivers") @@ -47,7 +47,7 @@ object GpuDriverHelper { DirectoryInitialization.internalUserPath + "/gpu/vk_file_redirect/" // Initialize the driver installation directory. - driverInstallationPath = CitraApplication.appContext + driverInstallationPath = LimeApplication.appContext .filesDir.canonicalPath + "/gpu_driver/" } catch (e: IOException) { throw RuntimeException(e) @@ -57,7 +57,7 @@ object GpuDriverHelper { initializeDirectories() // Initialize hook libraries directory. - hookLibPath = CitraApplication.appContext.applicationInfo.nativeLibraryDir + "/" + hookLibPath = LimeApplication.appContext.applicationInfo.nativeLibraryDir + "/" // Initialize GPU driver. NativeLibrary.initializeGpuDriver( diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/GpuDriverMetadata.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverMetadata.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/GpuDriverMetadata.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/GpuDriverMetadata.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/InsetsHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/InsetsHelper.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/InsetsHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/InsetsHelper.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/Log.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/Log.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/Log.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/Log.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/MemoryUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/MemoryUtil.kt similarity index 97% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/MemoryUtil.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/MemoryUtil.kt index ab4abdea1..44c2eb4fe 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/MemoryUtil.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/MemoryUtil.kt @@ -6,13 +6,13 @@ package io.github.lime3ds.utils import android.app.ActivityManager import android.content.Context import android.os.Build -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import java.util.Locale import kotlin.math.ceil object MemoryUtil { - private val context get() = CitraApplication.appContext + private val context get() = LimeApplication.appContext private val Float.hundredths: String get() = String.format(Locale.ROOT, "%.2f", this) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/PermissionsHandler.kt similarity index 92% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/PermissionsHandler.kt index 3c7e8f463..32fd1e94b 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/PermissionsHandler.kt @@ -10,12 +10,12 @@ import android.content.SharedPreferences import android.net.Uri import androidx.preference.PreferenceManager import androidx.documentfile.provider.DocumentFile -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication object PermissionsHandler { const val CITRA_DIRECTORY = "CITRA_DIRECTORY" val preferences: SharedPreferences = - PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) fun hasWriteAccess(context: Context): Boolean { try { diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/SerializableHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/SerializableHelper.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/SerializableHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/SerializableHelper.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/SystemSaveGame.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/SystemSaveGame.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/SystemSaveGame.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/SystemSaveGame.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/ThemeUtil.kt similarity index 93% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/ThemeUtil.kt index 6d3256382..446faf555 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/ThemeUtil.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/utils/ThemeUtil.kt @@ -13,7 +13,7 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.preference.PreferenceManager -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.features.settings.model.Settings import io.github.lime3ds.ui.main.ThemeProvider @@ -23,14 +23,14 @@ object ThemeUtil { const val SYSTEM_BAR_ALPHA = 0.9f private val preferences: SharedPreferences get() = - PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) fun setTheme(activity: AppCompatActivity) { setThemeMode(activity) if (preferences.getBoolean(Settings.PREF_MATERIAL_YOU, false)) { - activity.setTheme(R.style.Theme_Citra_Main_MaterialYou) + activity.setTheme(R.style.Theme_Lime_Main_MaterialYou) } else { - activity.setTheme(R.style.Theme_Citra_Main) + activity.setTheme(R.style.Theme_Lime_Main) } // Using a specific night mode check because this could apply incorrectly when using the diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ViewUtils.kt b/src/android/app/src/main/java/io/github/lime3ds/utils/ViewUtils.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/utils/ViewUtils.kt rename to src/android/app/src/main/java/io/github/lime3ds/utils/ViewUtils.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/DriverViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/DriverViewModel.kt similarity index 94% rename from src/android/app/src/main/java/org/citra/citra_emu/viewmodel/DriverViewModel.kt rename to src/android/app/src/main/java/io/github/lime3ds/viewmodel/DriverViewModel.kt index bdd834e84..8f27acc9e 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/DriverViewModel.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/DriverViewModel.kt @@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.utils.FileUtil.asDocumentFile import io.github.lime3ds.utils.GpuDriverMetadata @@ -38,7 +38,7 @@ class DriverViewModel : ViewModel() { private val _selectedDriverMetadata = MutableStateFlow( GpuDriverHelper.customDriverData.name - ?: CitraApplication.appContext.getString(R.string.system_gpu_driver) + ?: LimeApplication.appContext.getString(R.string.system_gpu_driver) ) val selectedDriverMetadata: StateFlow get() = _selectedDriverMetadata @@ -86,7 +86,7 @@ class DriverViewModel : ViewModel() { setSelectedDriverIndex(_driverList.value.size) _driverList.value.add(driverData) _selectedDriverMetadata.value = driverData.second.name - ?: CitraApplication.appContext.getString(R.string.system_gpu_driver) + ?: LimeApplication.appContext.getString(R.string.system_gpu_driver) } else { setSelectedDriverIndex(driverIndex) } @@ -145,6 +145,6 @@ class DriverViewModel : ViewModel() { private fun setDriverReady() { _isDriverReady.value = true _selectedDriverMetadata.value = GpuDriverHelper.customDriverData.name - ?: CitraApplication.appContext.getString(R.string.system_gpu_driver) + ?: LimeApplication.appContext.getString(R.string.system_gpu_driver) } } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/EmulationViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/EmulationViewModel.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/viewmodel/EmulationViewModel.kt rename to src/android/app/src/main/java/io/github/lime3ds/viewmodel/EmulationViewModel.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/GamesViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/GamesViewModel.kt similarity index 95% rename from src/android/app/src/main/java/org/citra/citra_emu/viewmodel/GamesViewModel.kt rename to src/android/app/src/main/java/io/github/lime3ds/viewmodel/GamesViewModel.kt index 86778234b..04970b142 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/GamesViewModel.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/GamesViewModel.kt @@ -17,7 +17,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.model.Game import io.github.lime3ds.utils.GameHelper @@ -42,7 +42,7 @@ class GamesViewModel : ViewModel() { init { // Retrieve list of cached games - val storedGames = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + val storedGames = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) .getStringSet(GameHelper.KEY_GAMES, emptySet()) if (storedGames!!.isNotEmpty()) { val deserializedGames = mutableSetOf() @@ -55,7 +55,7 @@ class GamesViewModel : ViewModel() { } val gameExists = - DocumentFile.fromSingleUri(CitraApplication.appContext, Uri.parse(game.path)) + DocumentFile.fromSingleUri(LimeApplication.appContext, Uri.parse(game.path)) ?.exists() if (gameExists == true) { deserializedGames.add(game) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/HomeViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/HomeViewModel.kt similarity index 94% rename from src/android/app/src/main/java/org/citra/citra_emu/viewmodel/HomeViewModel.kt rename to src/android/app/src/main/java/io/github/lime3ds/viewmodel/HomeViewModel.kt index c7aa83cec..149fe8f3a 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/HomeViewModel.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/HomeViewModel.kt @@ -12,7 +12,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.preference.PreferenceManager import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow -import io.github.lime3ds.CitraApplication +import io.github.lime3ds.LimeApplication import io.github.lime3ds.R import io.github.lime3ds.fragments.CitraDirectoryDialogFragment import io.github.lime3ds.utils.GameHelper @@ -31,7 +31,7 @@ class HomeViewModel : ViewModel() { val userDir get() = _userDir.asStateFlow() private val _userDir = MutableStateFlow( Uri.parse( - PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) .getString(PermissionsHandler.CITRA_DIRECTORY, "") ).path ?: "" ) @@ -39,7 +39,7 @@ class HomeViewModel : ViewModel() { val gamesDir get() = _gamesDir.asStateFlow() private val _gamesDir = MutableStateFlow( Uri.parse( - PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) .getString(GameHelper.KEY_GAME_PATH, "") ).path ?: "" ) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/SystemFilesViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/SystemFilesViewModel.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/viewmodel/SystemFilesViewModel.kt rename to src/android/app/src/main/java/io/github/lime3ds/viewmodel/SystemFilesViewModel.kt diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewmodel/TaskViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/viewmodel/TaskViewModel.kt similarity index 100% rename from src/android/app/src/main/java/org/citra/citra_emu/viewmodel/TaskViewModel.kt rename to src/android/app/src/main/java/io/github/lime3ds/viewmodel/TaskViewModel.kt diff --git a/src/android/app/src/main/jni/applets/mii_selector.cpp b/src/android/app/src/main/jni/applets/mii_selector.cpp index 3a9c66ef8..8b93e25ef 100644 --- a/src/android/app/src/main/jni/applets/mii_selector.cpp +++ b/src/android/app/src/main/jni/applets/mii_selector.cpp @@ -66,16 +66,16 @@ void AndroidMiiSelector::Setup(const Frontend::MiiSelectorConfig& config) { void InitJNI(JNIEnv* env) { s_mii_selector_class = reinterpret_cast( - env->NewGlobalRef(env->FindClass("org/citra/citra_emu/applets/MiiSelector"))); + env->NewGlobalRef(env->FindClass("io/github/lime3ds/applets/MiiSelector"))); s_mii_selector_config_class = reinterpret_cast(env->NewGlobalRef( - env->FindClass("org/citra/citra_emu/applets/MiiSelector$MiiSelectorConfig"))); + env->FindClass("io/github/lime3ds/applets/MiiSelector$MiiSelectorConfig"))); s_mii_selector_data_class = reinterpret_cast(env->NewGlobalRef( - env->FindClass("org/citra/citra_emu/applets/MiiSelector$MiiSelectorData"))); + env->FindClass("io/github/lime3ds/applets/MiiSelector$MiiSelectorData"))); s_mii_selector_execute = env->GetStaticMethodID(s_mii_selector_class, "Execute", - "(Lorg/citra/citra_emu/applets/MiiSelector$MiiSelectorConfig;)Lorg/" - "citra/citra_emu/applets/MiiSelector$MiiSelectorData;"); + "(Lio/github/lime3ds/applets/MiiSelector$MiiSelectorConfig;)Lio/" + "github/lime3ds/applets/MiiSelector$MiiSelectorData;"); } void CleanupJNI(JNIEnv* env) { diff --git a/src/android/app/src/main/jni/applets/swkbd.cpp b/src/android/app/src/main/jni/applets/swkbd.cpp index 0a8337672..de97d19b5 100644 --- a/src/android/app/src/main/jni/applets/swkbd.cpp +++ b/src/android/app/src/main/jni/applets/swkbd.cpp @@ -75,17 +75,17 @@ void AndroidKeyboard::ShowError(const std::string& error) { void InitJNI(JNIEnv* env) { s_software_keyboard_class = reinterpret_cast( - env->NewGlobalRef(env->FindClass("org/citra/citra_emu/applets/SoftwareKeyboard"))); + env->NewGlobalRef(env->FindClass("io/github/lime3ds/applets/SoftwareKeyboard"))); s_keyboard_config_class = reinterpret_cast(env->NewGlobalRef( - env->FindClass("org/citra/citra_emu/applets/SoftwareKeyboard$KeyboardConfig"))); + env->FindClass("io/github/lime3ds/applets/SoftwareKeyboard$KeyboardConfig"))); s_keyboard_data_class = reinterpret_cast(env->NewGlobalRef( - env->FindClass("org/citra/citra_emu/applets/SoftwareKeyboard$KeyboardData"))); + env->FindClass("io/github/lime3ds/applets/SoftwareKeyboard$KeyboardData"))); s_validation_error_class = reinterpret_cast(env->NewGlobalRef( - env->FindClass("org/citra/citra_emu/applets/SoftwareKeyboard$ValidationError"))); + env->FindClass("io/github/lime3ds/applets/SoftwareKeyboard$ValidationError"))); s_swkbd_execute = env->GetStaticMethodID( s_software_keyboard_class, "Execute", - "(Lorg/citra/citra_emu/applets/SoftwareKeyboard$KeyboardConfig;)Lorg/citra/citra_emu/" + "(Lio/github/lime3ds/applets/SoftwareKeyboard$KeyboardConfig;)Lio/github/lime3ds/" "applets/SoftwareKeyboard$KeyboardData;"); s_swkbd_show_error = env->GetStaticMethodID(s_software_keyboard_class, "ShowError", "(Ljava/lang/String;)V"); @@ -121,10 +121,10 @@ jobject ToJavaValidationError(Frontend::ValidationError error) { return env->GetStaticObjectField( s_validation_error_class, env->GetStaticFieldID(s_validation_error_class, ValidationErrorNameMap.at(error), - "Lorg/citra/citra_emu/applets/SoftwareKeyboard$ValidationError;")); + "Lio/github/lime3ds/applets/SoftwareKeyboard$ValidationError;")); } -jobject Java_org_citra_citra_1emu_applets_SoftwareKeyboard_ValidateFilters(JNIEnv* env, +jobject Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateFilters(JNIEnv* env, jclass clazz, jstring text) { @@ -133,7 +133,7 @@ jobject Java_org_citra_citra_1emu_applets_SoftwareKeyboard_ValidateFilters(JNIEn return ToJavaValidationError(ret); } -jobject Java_org_citra_citra_1emu_applets_SoftwareKeyboard_ValidateInput(JNIEnv* env, jclass clazz, +jobject Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateInput(JNIEnv* env, jclass clazz, jstring text) { const auto ret = diff --git a/src/android/app/src/main/jni/applets/swkbd.h b/src/android/app/src/main/jni/applets/swkbd.h index 664626695..f191690fc 100644 --- a/src/android/app/src/main/jni/applets/swkbd.h +++ b/src/android/app/src/main/jni/applets/swkbd.h @@ -27,9 +27,9 @@ void CleanupJNI(JNIEnv* env); // Native function calls extern "C" { -JNIEXPORT jobject JNICALL Java_org_citra_citra_1emu_applets_SoftwareKeyboard_ValidateFilters( +JNIEXPORT jobject JNICALL Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateFilters( JNIEnv* env, jclass clazz, jstring text); -JNIEXPORT jobject JNICALL Java_org_citra_citra_1emu_applets_SoftwareKeyboard_ValidateInput( +JNIEXPORT jobject JNICALL Java_io_github_lime3ds_applets_SoftwareKeyboard_ValidateInput( JNIEnv* env, jclass clazz, jstring text); } diff --git a/src/android/app/src/main/jni/camera/still_image_camera.cpp b/src/android/app/src/main/jni/camera/still_image_camera.cpp index 496b51fa8..c9f7fcf02 100644 --- a/src/android/app/src/main/jni/camera/still_image_camera.cpp +++ b/src/android/app/src/main/jni/camera/still_image_camera.cpp @@ -16,7 +16,7 @@ namespace Camera::StillImage { void InitJNI(JNIEnv* env) { s_still_image_camera_helper_class = reinterpret_cast( - env->NewGlobalRef(env->FindClass("org/citra/citra_emu/camera/StillImageCameraHelper"))); + env->NewGlobalRef(env->FindClass("io/github/lime3ds/camera/StillImageCameraHelper"))); s_open_file_picker = env->GetStaticMethodID(s_still_image_camera_helper_class, "OpenFilePicker", "()Ljava/lang/String;"); s_load_image_from_file = diff --git a/src/android/app/src/main/jni/cheats/cheat.cpp b/src/android/app/src/main/jni/cheats/cheat.cpp index 5a5c2c1e9..5d332da43 100644 --- a/src/android/app/src/main/jni/cheats/cheat.cpp +++ b/src/android/app/src/main/jni/cheats/cheat.cpp @@ -29,37 +29,37 @@ jobject CheatToJava(JNIEnv* env, std::shared_ptr cheat) { extern "C" { -JNIEXPORT void JNICALL Java_org_citra_citra_1emu_features_cheats_model_Cheat_finalize(JNIEnv* env, +JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_finalize(JNIEnv* env, jobject obj) { delete CheatFromJava(env, obj); } JNIEXPORT jstring JNICALL -Java_org_citra_citra_1emu_features_cheats_model_Cheat_getName(JNIEnv* env, jobject obj) { +Java_io_github_lime3ds_features_cheats_model_Cheat_getName(JNIEnv* env, jobject obj) { return ToJString(env, (*CheatFromJava(env, obj))->GetName()); } JNIEXPORT jstring JNICALL -Java_org_citra_citra_1emu_features_cheats_model_Cheat_getNotes(JNIEnv* env, jobject obj) { +Java_io_github_lime3ds_features_cheats_model_Cheat_getNotes(JNIEnv* env, jobject obj) { return ToJString(env, (*CheatFromJava(env, obj))->GetComments()); } JNIEXPORT jstring JNICALL -Java_org_citra_citra_1emu_features_cheats_model_Cheat_getCode(JNIEnv* env, jobject obj) { +Java_io_github_lime3ds_features_cheats_model_Cheat_getCode(JNIEnv* env, jobject obj) { return ToJString(env, (*CheatFromJava(env, obj))->GetCode()); } JNIEXPORT jboolean JNICALL -Java_org_citra_citra_1emu_features_cheats_model_Cheat_getEnabled(JNIEnv* env, jobject obj) { +Java_io_github_lime3ds_features_cheats_model_Cheat_getEnabled(JNIEnv* env, jobject obj) { return static_cast((*CheatFromJava(env, obj))->IsEnabled()); } -JNIEXPORT void JNICALL Java_org_citra_citra_1emu_features_cheats_model_Cheat_setEnabledImpl( +JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_setEnabledImpl( JNIEnv* env, jobject obj, jboolean j_enabled) { (*CheatFromJava(env, obj))->SetEnabled(static_cast(j_enabled)); } -JNIEXPORT jint JNICALL Java_org_citra_citra_1emu_features_cheats_model_Cheat_isValidGatewayCode( +JNIEXPORT jint JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_isValidGatewayCode( JNIEnv* env, jclass, jstring j_code) { const std::string code = GetJString(env, j_code); const auto code_lines = Common::SplitString(code, '\n'); @@ -74,7 +74,7 @@ JNIEXPORT jint JNICALL Java_org_citra_citra_1emu_features_cheats_model_Cheat_isV return 0; } -JNIEXPORT jobject JNICALL Java_org_citra_citra_1emu_features_cheats_model_Cheat_createGatewayCode( +JNIEXPORT jobject JNICALL Java_io_github_lime3ds_features_cheats_model_Cheat_createGatewayCode( JNIEnv* env, jclass, jstring j_name, jstring j_notes, jstring j_code) { return CheatToJava(env, std::make_shared(GetJString(env, j_name), GetJString(env, j_code), diff --git a/src/android/app/src/main/jni/cheats/cheat_engine.cpp b/src/android/app/src/main/jni/cheats/cheat_engine.cpp index 9a6a6f37f..0f0cb0d41 100644 --- a/src/android/app/src/main/jni/cheats/cheat_engine.cpp +++ b/src/android/app/src/main/jni/cheats/cheat_engine.cpp @@ -20,18 +20,18 @@ static Cheats::CheatEngine& GetEngine() { return system.CheatEngine(); } -JNIEXPORT void JNICALL Java_org_citra_citra_1emu_features_cheats_model_CheatEngine_loadCheatFile( +JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_loadCheatFile( JNIEnv* env, jclass, jlong title_id) { GetEngine().LoadCheatFile(title_id); } -JNIEXPORT void JNICALL Java_org_citra_citra_1emu_features_cheats_model_CheatEngine_saveCheatFile( +JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_saveCheatFile( JNIEnv* env, jclass, jlong title_id) { GetEngine().SaveCheatFile(title_id); } JNIEXPORT jobjectArray JNICALL -Java_org_citra_citra_1emu_features_cheats_model_CheatEngine_getCheats(JNIEnv* env, jclass) { +Java_io_github_lime3ds_features_cheats_model_CheatEngine_getCheats(JNIEnv* env, jclass) { auto cheats = GetEngine().GetCheats(); const jobjectArray array = @@ -44,18 +44,18 @@ Java_org_citra_citra_1emu_features_cheats_model_CheatEngine_getCheats(JNIEnv* en return array; } -JNIEXPORT void JNICALL Java_org_citra_citra_1emu_features_cheats_model_CheatEngine_addCheat( +JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_addCheat( JNIEnv* env, jclass, jobject j_cheat) { auto cheat = *CheatFromJava(env, j_cheat); GetEngine().AddCheat(std::move(cheat)); } -JNIEXPORT void JNICALL Java_org_citra_citra_1emu_features_cheats_model_CheatEngine_removeCheat( +JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_removeCheat( JNIEnv* env, jclass, jint index) { GetEngine().RemoveCheat(index); } -JNIEXPORT void JNICALL Java_org_citra_citra_1emu_features_cheats_model_CheatEngine_updateCheat( +JNIEXPORT void JNICALL Java_io_github_lime3ds_features_cheats_model_CheatEngine_updateCheat( JNIEnv* env, jclass, jint index, jobject j_new_cheat) { auto cheat = *CheatFromJava(env, j_new_cheat); GetEngine().UpdateCheat(index, std::move(cheat)); diff --git a/src/android/app/src/main/jni/game_info.cpp b/src/android/app/src/main/jni/game_info.cpp index d9b7c8f12..2bf7d5d1c 100644 --- a/src/android/app/src/main/jni/game_info.cpp +++ b/src/android/app/src/main/jni/game_info.cpp @@ -60,7 +60,7 @@ static Loader::SMDH* GetPointer(JNIEnv* env, jobject obj) { return reinterpret_cast(env->GetLongField(obj, IDCache::GetGameInfoPointer())); } -JNIEXPORT jlong JNICALL Java_org_citra_citra_1emu_model_GameInfo_initialize(JNIEnv* env, jclass, +JNIEXPORT jlong JNICALL Java_io_github_lime3ds_model_GameInfo_initialize(JNIEnv* env, jclass, jstring j_path) { std::vector smdh_data = GetSMDHData(GetJString(env, j_path)); @@ -72,11 +72,11 @@ JNIEXPORT jlong JNICALL Java_org_citra_citra_1emu_model_GameInfo_initialize(JNIE return reinterpret_cast(smdh); } -JNIEXPORT void JNICALL Java_org_citra_citra_1emu_model_GameInfo_finalize(JNIEnv* env, jobject obj) { +JNIEXPORT void JNICALL Java_io_github_lime3ds_model_GameInfo_finalize(JNIEnv* env, jobject obj) { delete GetPointer(env, obj); } -jstring Java_org_citra_citra_1emu_model_GameInfo_getTitle(JNIEnv* env, jobject obj) { +jstring Java_io_github_lime3ds_model_GameInfo_getTitle(JNIEnv* env, jobject obj) { Loader::SMDH* smdh = GetPointer(env, obj); Loader::SMDH::TitleLanguage language = Loader::SMDH::TitleLanguage::English; @@ -87,7 +87,7 @@ jstring Java_org_citra_citra_1emu_model_GameInfo_getTitle(JNIEnv* env, jobject o return ToJString(env, Common::UTF16ToUTF8(title).data()); } -jstring Java_org_citra_citra_1emu_model_GameInfo_getCompany(JNIEnv* env, jobject obj) { +jstring Java_io_github_lime3ds_model_GameInfo_getCompany(JNIEnv* env, jobject obj) { Loader::SMDH* smdh = GetPointer(env, obj); Loader::SMDH::TitleLanguage language = Loader::SMDH::TitleLanguage::English; @@ -99,7 +99,7 @@ jstring Java_org_citra_citra_1emu_model_GameInfo_getCompany(JNIEnv* env, jobject return ToJString(env, Common::UTF16ToUTF8(publisher).data()); } -jstring Java_org_citra_citra_1emu_model_GameInfo_getRegions(JNIEnv* env, jobject obj) { +jstring Java_io_github_lime3ds_model_GameInfo_getRegions(JNIEnv* env, jobject obj) { Loader::SMDH* smdh = GetPointer(env, obj); using GameRegion = Loader::SMDH::GameRegion; @@ -132,7 +132,7 @@ jstring Java_org_citra_citra_1emu_model_GameInfo_getRegions(JNIEnv* env, jobject return ToJString(env, result); } -jintArray Java_org_citra_citra_1emu_model_GameInfo_getIcon(JNIEnv* env, jobject obj) { +jintArray Java_io_github_lime3ds_model_GameInfo_getIcon(JNIEnv* env, jobject obj) { Loader::SMDH* smdh = GetPointer(env, obj); // Always get a 48x48(large) icon @@ -148,7 +148,7 @@ jintArray Java_org_citra_citra_1emu_model_GameInfo_getIcon(JNIEnv* env, jobject return icon; } -jboolean Java_org_citra_citra_1emu_model_GameInfo_getIsVisibleSystemTitle(JNIEnv* env, +jboolean Java_io_github_lime3ds_model_GameInfo_getIsVisibleSystemTitle(JNIEnv* env, jobject obj) { Loader::SMDH* smdh = GetPointer(env, obj); if (smdh == nullptr) { diff --git a/src/android/app/src/main/jni/id_cache.cpp b/src/android/app/src/main/jni/id_cache.cpp index f1c16fc9f..06635f4bd 100644 --- a/src/android/app/src/main/jni/id_cache.cpp +++ b/src/android/app/src/main/jni/id_cache.cpp @@ -161,16 +161,16 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { // Initialize misc classes s_savestate_info_class = reinterpret_cast( - env->NewGlobalRef(env->FindClass("org/citra/citra_emu/NativeLibrary$SaveStateInfo"))); + env->NewGlobalRef(env->FindClass("io/github/lime3ds/NativeLibrary$SaveStateInfo"))); s_core_error_class = reinterpret_cast( - env->NewGlobalRef(env->FindClass("org/citra/citra_emu/NativeLibrary$CoreError"))); + env->NewGlobalRef(env->FindClass("io/github/lime3ds/NativeLibrary$CoreError"))); // Initialize NativeLibrary - const jclass native_library_class = env->FindClass("org/citra/citra_emu/NativeLibrary"); + const jclass native_library_class = env->FindClass("io/github/lime3ds/NativeLibrary"); s_native_library_class = reinterpret_cast(env->NewGlobalRef(native_library_class)); s_on_core_error = env->GetStaticMethodID( s_native_library_class, "onCoreError", - "(Lorg/citra/citra_emu/NativeLibrary$CoreError;Ljava/lang/String;)Z"); + "(Lio/github/lime3ds/NativeLibrary$CoreError;Ljava/lang/String;)Z"); s_is_portrait_mode = env->GetStaticMethodID(s_native_library_class, "isPortraitMode", "()Z"); s_landscape_screen_layout = env->GetStaticMethodID(s_native_library_class, "landscapeScreenLayout", "()I"); @@ -183,32 +183,32 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->DeleteLocalRef(native_library_class); // Initialize Cheat - const jclass cheat_class = env->FindClass("org/citra/citra_emu/features/cheats/model/Cheat"); + const jclass cheat_class = env->FindClass("io/github/lime3ds/features/cheats/model/Cheat"); s_cheat_class = reinterpret_cast(env->NewGlobalRef(cheat_class)); s_cheat_pointer = env->GetFieldID(cheat_class, "mPointer", "J"); s_cheat_constructor = env->GetMethodID(cheat_class, "", "(J)V"); env->DeleteLocalRef(cheat_class); // Initialize GameInfo - const jclass game_info_class = env->FindClass("org/citra/citra_emu/model/GameInfo"); + const jclass game_info_class = env->FindClass("io/github/lime3ds/model/GameInfo"); s_game_info_pointer = env->GetFieldID(game_info_class, "pointer", "J"); env->DeleteLocalRef(game_info_class); // Initialize Disk Shader Cache Progress Dialog s_disk_cache_progress_class = reinterpret_cast( - env->NewGlobalRef(env->FindClass("org/citra/citra_emu/utils/DiskShaderCacheProgress"))); + env->NewGlobalRef(env->FindClass("io/github/lime3ds/utils/DiskShaderCacheProgress"))); jclass load_callback_stage_class = - env->FindClass("org/citra/citra_emu/utils/DiskShaderCacheProgress$LoadCallbackStage"); + env->FindClass("io/github/lime3ds/utils/DiskShaderCacheProgress$LoadCallbackStage"); s_disk_cache_load_progress = env->GetStaticMethodID( s_disk_cache_progress_class, "loadProgress", - "(Lorg/citra/citra_emu/utils/DiskShaderCacheProgress$LoadCallbackStage;II)V"); + "(Lio/github/lime3ds/utils/DiskShaderCacheProgress$LoadCallbackStage;II)V"); // Initialize LoadCallbackStage map const auto to_java_load_callback_stage = [env, load_callback_stage_class](const std::string& stage) { return env->NewGlobalRef(env->GetStaticObjectField( load_callback_stage_class, env->GetStaticFieldID(load_callback_stage_class, stage.c_str(), - "Lorg/citra/citra_emu/utils/" + "Lio/github/lime3ds/utils/" "DiskShaderCacheProgress$LoadCallbackStage;"))); }; s_java_load_callback_stages.emplace(VideoCore::LoadCallbackStage::Prepare, @@ -223,17 +223,17 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { // CIA Install s_cia_install_helper_class = reinterpret_cast( - env->NewGlobalRef(env->FindClass("org/citra/citra_emu/utils/CiaInstallWorker"))); + env->NewGlobalRef(env->FindClass("io/github/lime3ds/utils/CiaInstallWorker"))); s_cia_install_helper_set_progress = env->GetMethodID(s_cia_install_helper_class, "setProgressCallback", "(II)V"); // Initialize CIA InstallStatus map jclass cia_install_status_class = - env->FindClass("org/citra/citra_emu/NativeLibrary$InstallStatus"); + env->FindClass("io/github/lime3ds/NativeLibrary$InstallStatus"); const auto to_java_cia_install_status = [env, cia_install_status_class](const std::string& stage) { return env->NewGlobalRef(env->GetStaticObjectField( cia_install_status_class, env->GetStaticFieldID(cia_install_status_class, stage.c_str(), - "Lorg/citra/citra_emu/" + "Lio/github/lime3ds/" "NativeLibrary$InstallStatus;"))); }; s_java_cia_install_status.emplace(Service::AM::InstallStatus::Success, diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index c670f7d19..6512ed1cf 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -92,7 +92,7 @@ static jobject ToJavaCoreError(Core::System::ResultStatus result) { const jclass core_error_class = IDCache::GetCoreErrorClass(); return env->GetStaticObjectField( core_error_class, env->GetStaticFieldID(core_error_class, name, - "Lorg/citra/citra_emu/NativeLibrary$CoreError;")); + "Lio/github/lime3ds/NativeLibrary$CoreError;")); } static bool HandleCoreError(Core::System::ResultStatus result, const std::string& details) { @@ -287,7 +287,7 @@ void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& cus extern "C" { -void Java_org_citra_citra_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_surfaceChanged(JNIEnv* env, [[maybe_unused]] jobject obj, jobject surf) { s_surf = ANativeWindow_fromSurface(env, surf); @@ -304,7 +304,7 @@ void Java_org_citra_citra_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, LOG_INFO(Frontend, "Surface changed"); } -void Java_org_citra_citra_1emu_NativeLibrary_surfaceDestroyed([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_surfaceDestroyed([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { ANativeWindow_release(s_surf); s_surf = nullptr; @@ -313,7 +313,7 @@ void Java_org_citra_citra_1emu_NativeLibrary_surfaceDestroyed([[maybe_unused]] J } } -void Java_org_citra_citra_1emu_NativeLibrary_doFrame([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_doFrame([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { if (stop_run || pause_emulation) { return; @@ -321,14 +321,14 @@ void Java_org_citra_citra_1emu_NativeLibrary_doFrame([[maybe_unused]] JNIEnv* en window->TryPresenting(); } -void JNICALL Java_org_citra_citra_1emu_NativeLibrary_initializeGpuDriver( +void JNICALL Java_io_github_lime3ds_NativeLibrary_initializeGpuDriver( JNIEnv* env, jobject obj, jstring hook_lib_dir, jstring custom_driver_dir, jstring custom_driver_name, jstring file_redirect_dir) { InitializeGpuDriver(GetJString(env, hook_lib_dir), GetJString(env, custom_driver_dir), GetJString(env, custom_driver_name), GetJString(env, file_redirect_dir)); } -void Java_org_citra_citra_1emu_NativeLibrary_notifyOrientationChange([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_notifyOrientationChange([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jint layout_option, jint rotation) { @@ -341,7 +341,7 @@ void Java_org_citra_citra_1emu_NativeLibrary_notifyOrientationChange([[maybe_unu Camera::NDK::g_rotation = rotation; } -void Java_org_citra_citra_1emu_NativeLibrary_swapScreens([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_swapScreens([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jboolean swap_screens, jint rotation) { Settings::values.swap_screen = swap_screens; @@ -353,14 +353,14 @@ void Java_org_citra_citra_1emu_NativeLibrary_swapScreens([[maybe_unused]] JNIEnv Camera::NDK::g_rotation = rotation; } -jboolean Java_org_citra_citra_1emu_NativeLibrary_areKeysAvailable([[maybe_unused]] JNIEnv* env, +jboolean Java_io_github_lime3ds_NativeLibrary_areKeysAvailable([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { HW::AES::InitKeys(); return HW::AES::IsKeyXAvailable(HW::AES::KeySlotID::NCCHSecure1) && HW::AES::IsKeyXAvailable(HW::AES::KeySlotID::NCCHSecure2); } -jstring Java_org_citra_citra_1emu_NativeLibrary_getHomeMenuPath(JNIEnv* env, +jstring Java_io_github_lime3ds_NativeLibrary_getHomeMenuPath(JNIEnv* env, [[maybe_unused]] jobject obj, jint region) { const std::string path = Core::GetHomeMenuNcchPath(region); @@ -370,13 +370,13 @@ jstring Java_org_citra_citra_1emu_NativeLibrary_getHomeMenuPath(JNIEnv* env, return ToJString(env, ""); } -void Java_org_citra_citra_1emu_NativeLibrary_setUserDirectory(JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_setUserDirectory(JNIEnv* env, [[maybe_unused]] jobject obj, jstring j_directory) { FileUtil::SetCurrentDir(GetJString(env, j_directory)); } -jobjectArray Java_org_citra_citra_1emu_NativeLibrary_getInstalledGamePaths( +jobjectArray Java_io_github_lime3ds_NativeLibrary_getInstalledGamePaths( JNIEnv* env, [[maybe_unused]] jclass clazz) { std::vector games; const FileUtil::DirectoryEntryCallable ScanDir = @@ -414,7 +414,7 @@ jobjectArray Java_org_citra_citra_1emu_NativeLibrary_getInstalledGamePaths( return jgames; } -jlongArray Java_org_citra_citra_1emu_NativeLibrary_getSystemTitleIds(JNIEnv* env, +jlongArray Java_io_github_lime3ds_NativeLibrary_getSystemTitleIds(JNIEnv* env, [[maybe_unused]] jobject obj, jint system_type, jint region) { @@ -426,7 +426,7 @@ jlongArray Java_org_citra_citra_1emu_NativeLibrary_getSystemTitleIds(JNIEnv* env return jTitles; } -jobject Java_org_citra_citra_1emu_NativeLibrary_downloadTitleFromNus([[maybe_unused]] JNIEnv* env, +jobject Java_io_github_lime3ds_NativeLibrary_downloadTitleFromNus([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jlong title) { const auto title_id = static_cast(title); @@ -447,7 +447,7 @@ jobject Java_org_citra_citra_1emu_NativeLibrary_downloadTitleFromNus([[maybe_unu return android_get_device_api_level() >= 28 && CheckKgslPresent(); } -jboolean JNICALL Java_org_citra_citra_1emu_utils_GpuDriverHelper_supportsCustomDriverLoading( +jboolean JNICALL Java_io_github_lime3ds_utils_GpuDriverHelper_supportsCustomDriverLoading( JNIEnv* env, jobject instance) { #ifdef CITRA_ARCH_arm64 // If the KGSL device exists custom drivers can be loaded using adrenotools @@ -458,20 +458,20 @@ jboolean JNICALL Java_org_citra_citra_1emu_utils_GpuDriverHelper_supportsCustomD } // TODO(xperia64): ensure these cannot be called in an invalid state (e.g. after StopEmulation) -void Java_org_citra_citra_1emu_NativeLibrary_unPauseEmulation([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_unPauseEmulation([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { pause_emulation = false; running_cv.notify_all(); InputManager::NDKMotionHandler()->EnableSensors(); } -void Java_org_citra_citra_1emu_NativeLibrary_pauseEmulation([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_pauseEmulation([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { pause_emulation = true; InputManager::NDKMotionHandler()->DisableSensors(); } -void Java_org_citra_citra_1emu_NativeLibrary_stopEmulation([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_stopEmulation([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { stop_run = true; pause_emulation = false; @@ -479,19 +479,19 @@ void Java_org_citra_citra_1emu_NativeLibrary_stopEmulation([[maybe_unused]] JNIE running_cv.notify_all(); } -jboolean Java_org_citra_citra_1emu_NativeLibrary_isRunning([[maybe_unused]] JNIEnv* env, +jboolean Java_io_github_lime3ds_NativeLibrary_isRunning([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { return static_cast(!stop_run); } -jlong Java_org_citra_citra_1emu_NativeLibrary_getRunningTitleId([[maybe_unused]] JNIEnv* env, +jlong Java_io_github_lime3ds_NativeLibrary_getRunningTitleId([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { u64 title_id{}; Core::System::GetInstance().GetAppLoader().ReadProgramId(title_id); return static_cast(title_id); } -jboolean Java_org_citra_citra_1emu_NativeLibrary_onGamePadEvent([[maybe_unused]] JNIEnv* env, +jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadEvent([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, [[maybe_unused]] jstring j_device, jint j_button, jint action) { @@ -505,7 +505,7 @@ jboolean Java_org_citra_citra_1emu_NativeLibrary_onGamePadEvent([[maybe_unused]] return static_cast(consumed); } -jboolean Java_org_citra_citra_1emu_NativeLibrary_onGamePadMoveEvent( +jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadMoveEvent( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, [[maybe_unused]] jstring j_device, jint axis, jfloat x, jfloat y) { // Clamp joystick movement to supported minimum and maximum @@ -524,14 +524,14 @@ jboolean Java_org_citra_citra_1emu_NativeLibrary_onGamePadMoveEvent( return static_cast(InputManager::AnalogHandler()->MoveJoystick(axis, x, y)); } -jboolean Java_org_citra_citra_1emu_NativeLibrary_onGamePadAxisEvent( +jboolean Java_io_github_lime3ds_NativeLibrary_onGamePadAxisEvent( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, [[maybe_unused]] jstring j_device, jint axis_id, jfloat axis_val) { return static_cast( InputManager::ButtonHandler()->AnalogButtonEvent(axis_id, axis_val)); } -jboolean Java_org_citra_citra_1emu_NativeLibrary_onTouchEvent([[maybe_unused]] JNIEnv* env, +jboolean Java_io_github_lime3ds_NativeLibrary_onTouchEvent([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jfloat x, jfloat y, jboolean pressed) { @@ -539,13 +539,13 @@ jboolean Java_org_citra_citra_1emu_NativeLibrary_onTouchEvent([[maybe_unused]] J window->OnTouchEvent(static_cast(x + 0.5), static_cast(y + 0.5), pressed)); } -void Java_org_citra_citra_1emu_NativeLibrary_onTouchMoved([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_onTouchMoved([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jfloat x, jfloat y) { window->OnTouchMoved((int)x, (int)y); } -jlong Java_org_citra_citra_1emu_NativeLibrary_getTitleId(JNIEnv* env, [[maybe_unused]] jobject obj, +jlong Java_io_github_lime3ds_NativeLibrary_getTitleId(JNIEnv* env, [[maybe_unused]] jobject obj, jstring j_filename) { std::string filepath = GetJString(env, j_filename); const auto loader = Loader::GetLoader(filepath); @@ -557,7 +557,7 @@ jlong Java_org_citra_citra_1emu_NativeLibrary_getTitleId(JNIEnv* env, [[maybe_un return static_cast(title_id); } -jboolean Java_org_citra_citra_1emu_NativeLibrary_getIsSystemTitle(JNIEnv* env, +jboolean Java_io_github_lime3ds_NativeLibrary_getIsSystemTitle(JNIEnv* env, [[maybe_unused]] jobject obj, jstring path) { const std::string filepath = GetJString(env, path); @@ -573,19 +573,19 @@ jboolean Java_org_citra_citra_1emu_NativeLibrary_getIsSystemTitle(JNIEnv* env, return ((program_id >> 32) & 0xFFFFFFFF) == 0x00040010; } -void Java_org_citra_citra_1emu_NativeLibrary_createConfigFile([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_createConfigFile([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { Config{}; } -void Java_org_citra_citra_1emu_NativeLibrary_createLogFile([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_createLogFile([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { Common::Log::Initialize(); Common::Log::Start(); LOG_INFO(Frontend, "Logging backend initialised"); } -void Java_org_citra_citra_1emu_NativeLibrary_logUserDirectory(JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_logUserDirectory(JNIEnv* env, [[maybe_unused]] jobject obj, jstring j_path) { std::string_view path = env->GetStringUTFChars(j_path, 0); @@ -593,7 +593,7 @@ void Java_org_citra_citra_1emu_NativeLibrary_logUserDirectory(JNIEnv* env, env->ReleaseStringUTFChars(j_path, path.data()); } -void Java_org_citra_citra_1emu_NativeLibrary_reloadSettings([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_reloadSettings([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { Config{}; Core::System& system{Core::System::GetInstance()}; @@ -608,7 +608,7 @@ void Java_org_citra_citra_1emu_NativeLibrary_reloadSettings([[maybe_unused]] JNI system.ApplySettings(); } -jdoubleArray Java_org_citra_citra_1emu_NativeLibrary_getPerfStats(JNIEnv* env, +jdoubleArray Java_io_github_lime3ds_NativeLibrary_getPerfStats(JNIEnv* env, [[maybe_unused]] jobject obj) { auto& core = Core::System::GetInstance(); jdoubleArray j_stats = env->NewDoubleArray(4); @@ -626,7 +626,7 @@ jdoubleArray Java_org_citra_citra_1emu_NativeLibrary_getPerfStats(JNIEnv* env, return j_stats; } -void Java_org_citra_citra_1emu_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* env, [[maybe_unused]] jobject obj, jstring j_path) { const std::string path = GetJString(env, j_path); @@ -643,14 +643,14 @@ void Java_org_citra_citra_1emu_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* en } } -void Java_org_citra_citra_1emu_NativeLibrary_reloadCameraDevices([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_reloadCameraDevices([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { if (g_ndk_factory) { g_ndk_factory->ReloadCameraDevices(); } } -jboolean Java_org_citra_citra_1emu_NativeLibrary_loadAmiibo(JNIEnv* env, +jboolean Java_io_github_lime3ds_NativeLibrary_loadAmiibo(JNIEnv* env, [[maybe_unused]] jobject obj, jstring j_file) { std::string filepath = GetJString(env, j_file); @@ -664,7 +664,7 @@ jboolean Java_org_citra_citra_1emu_NativeLibrary_loadAmiibo(JNIEnv* env, return static_cast(nfc->LoadAmiibo(filepath)); } -void Java_org_citra_citra_1emu_NativeLibrary_removeAmiibo([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_removeAmiibo([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { Core::System& system{Core::System::GetInstance()}; Service::SM::ServiceManager& sm = system.ServiceManager(); @@ -676,7 +676,7 @@ void Java_org_citra_citra_1emu_NativeLibrary_removeAmiibo([[maybe_unused]] JNIEn nfc->RemoveAmiibo(); } -JNIEXPORT jobject JNICALL Java_org_citra_citra_1emu_utils_CiaInstallWorker_installCIA( +JNIEXPORT jobject JNICALL Java_io_github_lime3ds_utils_CiaInstallWorker_installCIA( JNIEnv* env, jobject jobj, jstring jpath) { std::string path = GetJString(env, jpath); Service::AM::InstallStatus res = Service::AM::InstallCIA( @@ -688,7 +688,7 @@ JNIEXPORT jobject JNICALL Java_org_citra_citra_1emu_utils_CiaInstallWorker_insta return IDCache::GetJavaCiaInstallStatus(res); } -jobjectArray Java_org_citra_citra_1emu_NativeLibrary_getSavestateInfo( +jobjectArray Java_io_github_lime3ds_NativeLibrary_getSavestateInfo( JNIEnv* env, [[maybe_unused]] jobject obj) { const jclass date_class = env->FindClass("java/util/Date"); const auto date_constructor = env->GetMethodID(date_class, "", "(J)V"); @@ -722,17 +722,17 @@ jobjectArray Java_org_citra_citra_1emu_NativeLibrary_getSavestateInfo( return array; } -void Java_org_citra_citra_1emu_NativeLibrary_saveState([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_saveState([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jint slot) { Core::System::GetInstance().SendSignal(Core::System::Signal::Save, slot); } -void Java_org_citra_citra_1emu_NativeLibrary_loadState([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_loadState([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jint slot) { Core::System::GetInstance().SendSignal(Core::System::Signal::Load, slot); } -void Java_org_citra_citra_1emu_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); diff --git a/src/android/app/src/main/jni/native_log.cpp b/src/android/app/src/main/jni/native_log.cpp index 86a57b99f..78e858a89 100644 --- a/src/android/app/src/main/jni/native_log.cpp +++ b/src/android/app/src/main/jni/native_log.cpp @@ -7,23 +7,23 @@ extern "C" { -void Java_org_citra_citra_1emu_utils_Log_debug(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_io_github_lime3ds_utils_Log_debug(JNIEnv* env, jobject obj, jstring jmessage) { LOG_DEBUG(Frontend, "{}", GetJString(env, jmessage)); } -void Java_org_citra_citra_1emu_utils_Log_warning(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_io_github_lime3ds_utils_Log_warning(JNIEnv* env, jobject obj, jstring jmessage) { LOG_WARNING(Frontend, "{}", GetJString(env, jmessage)); } -void Java_org_citra_citra_1emu_utils_Log_info(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_io_github_lime3ds_utils_Log_info(JNIEnv* env, jobject obj, jstring jmessage) { LOG_INFO(Frontend, "{}", GetJString(env, jmessage)); } -void Java_org_citra_citra_1emu_utils_Log_error(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_io_github_lime3ds_utils_Log_error(JNIEnv* env, jobject obj, jstring jmessage) { LOG_ERROR(Frontend, "{}", GetJString(env, jmessage)); } -void Java_org_citra_citra_1emu_utils_Log_critical(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_io_github_lime3ds_utils_Log_critical(JNIEnv* env, jobject obj, jstring jmessage) { LOG_CRITICAL(Frontend, "{}", GetJString(env, jmessage)); } diff --git a/src/android/app/src/main/jni/system_save_game.cpp b/src/android/app/src/main/jni/system_save_game.cpp index bdf97c8bc..3d80edd73 100644 --- a/src/android/app/src/main/jni/system_save_game.cpp +++ b/src/android/app/src/main/jni/system_save_game.cpp @@ -12,38 +12,38 @@ std::shared_ptr cfg; extern "C" { -void Java_org_citra_citra_1emu_utils_SystemSaveGame_save([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_utils_SystemSaveGame_save([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { cfg->UpdateConfigNANDSavegame(); } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_load([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_utils_SystemSaveGame_load([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { cfg = Service::CFG::GetModule(Core::System::GetInstance()); } -jboolean Java_org_citra_citra_1emu_utils_SystemSaveGame_getIsSystemSetupNeeded( +jboolean Java_io_github_lime3ds_utils_SystemSaveGame_getIsSystemSetupNeeded( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { return cfg->IsSystemSetupNeeded(); } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_setSystemSetupNeeded( +void Java_io_github_lime3ds_utils_SystemSaveGame_setSystemSetupNeeded( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jboolean needed) { cfg->SetSystemSetupNeeded(needed); } -jstring Java_org_citra_citra_1emu_utils_SystemSaveGame_getUsername([[maybe_unused]] JNIEnv* env, +jstring Java_io_github_lime3ds_utils_SystemSaveGame_getUsername([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { return ToJString(env, Common::UTF16ToUTF8(cfg->GetUsername())); } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_setUsername([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_utils_SystemSaveGame_setUsername([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jstring username) { cfg->SetUsername(Common::UTF8ToUTF16(GetJString(env, username))); } -jshortArray Java_org_citra_citra_1emu_utils_SystemSaveGame_getBirthday( +jshortArray Java_io_github_lime3ds_utils_SystemSaveGame_getBirthday( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { jshortArray jbirthdayArray = env->NewShortArray(2); auto birthday = cfg->GetBirthday(); @@ -53,62 +53,62 @@ jshortArray Java_org_citra_citra_1emu_utils_SystemSaveGame_getBirthday( return jbirthdayArray; } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_setBirthday([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_utils_SystemSaveGame_setBirthday([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jshort jmonth, jshort jday) { cfg->SetBirthday(static_cast(jmonth), static_cast(jday)); } -jint Java_org_citra_citra_1emu_utils_SystemSaveGame_getSystemLanguage( +jint Java_io_github_lime3ds_utils_SystemSaveGame_getSystemLanguage( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { return cfg->GetSystemLanguage(); } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_setSystemLanguage([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_utils_SystemSaveGame_setSystemLanguage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jint jsystemLanguage) { cfg->SetSystemLanguage(static_cast(jsystemLanguage)); } -jint Java_org_citra_citra_1emu_utils_SystemSaveGame_getSoundOutputMode( +jint Java_io_github_lime3ds_utils_SystemSaveGame_getSoundOutputMode( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { return cfg->GetSoundOutputMode(); } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_setSoundOutputMode([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_utils_SystemSaveGame_setSoundOutputMode([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jint jmode) { cfg->SetSoundOutputMode(static_cast(jmode)); } -jshort Java_org_citra_citra_1emu_utils_SystemSaveGame_getCountryCode([[maybe_unused]] JNIEnv* env, +jshort Java_io_github_lime3ds_utils_SystemSaveGame_getCountryCode([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { return cfg->GetCountryCode(); } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_setCountryCode([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_utils_SystemSaveGame_setCountryCode([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jshort jmode) { cfg->SetCountryCode(static_cast(jmode)); } -jint Java_org_citra_citra_1emu_utils_SystemSaveGame_getPlayCoins([[maybe_unused]] JNIEnv* env, +jint Java_io_github_lime3ds_utils_SystemSaveGame_getPlayCoins([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { return Service::PTM::Module::GetPlayCoins(); } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_setPlayCoins([[maybe_unused]] JNIEnv* env, +void Java_io_github_lime3ds_utils_SystemSaveGame_setPlayCoins([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, jint jcoins) { Service::PTM::Module::SetPlayCoins(static_cast(jcoins)); } -jlong Java_org_citra_citra_1emu_utils_SystemSaveGame_getConsoleId([[maybe_unused]] JNIEnv* env, +jlong Java_io_github_lime3ds_utils_SystemSaveGame_getConsoleId([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { return cfg->GetConsoleUniqueId(); } -void Java_org_citra_citra_1emu_utils_SystemSaveGame_regenerateConsoleId( +void Java_io_github_lime3ds_utils_SystemSaveGame_regenerateConsoleId( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { const auto [random_number, console_id] = cfg->GenerateConsoleUniqueId(); cfg->SetConsoleUniqueId(random_number, console_id); diff --git a/src/android/app/src/main/res/values-night-v31/themes.xml b/src/android/app/src/main/res/values-night-v31/themes.xml index c0b82149b..d1454bfa8 100644 --- a/src/android/app/src/main/res/values-night-v31/themes.xml +++ b/src/android/app/src/main/res/values-night-v31/themes.xml @@ -1,7 +1,7 @@ - - -