VERY experimental Nintendo Switch 2 emulator
C++
android: Apply ktlint codestyle
Charles Lombardo37cbf1632273
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.ktindex f3bfbe7eb4..f860cdd4bd 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt@@ -14,18 +14,18 @@ import android.widget.TextViewimport androidx.annotation.Keepimport androidx.fragment.app.DialogFragmentimport com.google.android.material.dialog.MaterialAlertDialogBuilder+import java.lang.ref.WeakReferenceimport org.yuzu.yuzu_emu.YuzuApplication.Companion.appContextimport org.yuzu.yuzu_emu.activities.EmulationActivityimport org.yuzu.yuzu_emu.utils.DocumentsTree.Companion.isNativePath-import org.yuzu.yuzu_emu.utils.FileUtil.getFileSize-import org.yuzu.yuzu_emu.utils.FileUtil.openContentUriimport org.yuzu.yuzu_emu.utils.FileUtil.exists+import org.yuzu.yuzu_emu.utils.FileUtil.getFileSizeimport org.yuzu.yuzu_emu.utils.FileUtil.isDirectory+import org.yuzu.yuzu_emu.utils.FileUtil.openContentUriimport org.yuzu.yuzu_emu.utils.Log.errorimport org.yuzu.yuzu_emu.utils.Log.verboseimport org.yuzu.yuzu_emu.utils.Log.warningimport org.yuzu.yuzu_emu.utils.SerializableHelper.serializable-import java.lang.ref.WeakReference/*** Class which contains methods that interact@@ -76,7 +76,9 @@ object NativeLibrary {fun openContentUri(path: String?, openmode: String?): Int {return if (isNativePath(path!!)) {YuzuApplication.documentsTree!!.openContentUri(path, openmode)- } else openContentUri(appContext, path, openmode)+ } else {+ openContentUri(appContext, path, openmode)+ }}@Keep@@ -84,7 +86,9 @@ object NativeLibrary {fun getSize(path: String?): Long {return if (isNativePath(path!!)) {YuzuApplication.documentsTree!!.getFileSize(path)- } else getFileSize(appContext, path)+ } else {+ getFileSize(appContext, path)+ }}@Keep@@ -92,7 +96,9 @@ object NativeLibrary {fun exists(path: String?): Boolean {return if (isNativePath(path!!)) {YuzuApplication.documentsTree!!.exists(path)- } else exists(appContext, path)+ } else {+ exists(appContext, path)+ }}@Keep@@ -100,7 +106,9 @@ object NativeLibrary {fun isDirectory(path: String?): Boolean {return if (isNativePath(path!!)) {YuzuApplication.documentsTree!!.isDirectory(path)- } else isDirectory(appContext, path)+ } else {+ isDirectory(appContext, path)+ }}/**@@ -454,7 +462,9 @@ object NativeLibrary {Html.FROM_HTML_MODE_LEGACY))- .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> emulationActivity.finish() }+ .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->+ emulationActivity.finish()+ }.setOnDismissListener { emulationActivity.finish() }emulationActivity.runOnUiThread {val alert = builder.create()diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.ktindex 4c947b7869..04ab6a220a 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt@@ -7,12 +7,12 @@ import android.app.Applicationimport android.app.NotificationChannelimport android.app.NotificationManagerimport android.content.Context+import java.io.Fileimport org.yuzu.yuzu_emu.utils.DirectoryInitializationimport org.yuzu.yuzu_emu.utils.DocumentsTreeimport org.yuzu.yuzu_emu.utils.GpuDriverHelper-import java.io.File-fun Context.getPublicFilesDir() : File = getExternalFilesDir(null) ?: filesDir+fun Context.getPublicFilesDir(): File = getExternalFilesDir(null) ?: filesDirclass YuzuApplication : Application() {private fun createNotificationChannels() {@@ -21,7 +21,9 @@ class YuzuApplication : Application() {getString(R.string.emulation_notification_channel_name),NotificationManager.IMPORTANCE_LOW)- emulationChannel.description = getString(R.string.emulation_notification_channel_description)+ emulationChannel.description = getString(+ R.string.emulation_notification_channel_description+ )emulationChannel.setSound(null, null)emulationChannel.vibrationPattern = null@@ -48,7 +50,7 @@ class YuzuApplication : Application() {GpuDriverHelper.initializeDriverParameters(applicationContext)NativeLibrary.logDeviceInfo()- createNotificationChannels();+ createNotificationChannels()}companion object {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.ktindex 5ca519f0ac..f0a6753a92 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt@@ -33,6 +33,7 @@ import androidx.core.view.WindowCompatimport androidx.core.view.WindowInsetsCompatimport androidx.core.view.WindowInsetsControllerCompatimport androidx.navigation.fragment.NavHostFragment+import kotlin.math.roundToIntimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.ActivityEmulationBinding@@ -45,7 +46,6 @@ import org.yuzu.yuzu_emu.utils.ForegroundServiceimport org.yuzu.yuzu_emu.utils.InputHandlerimport org.yuzu.yuzu_emu.utils.NfcReaderimport org.yuzu.yuzu_emu.utils.ThemeHelper-import kotlin.math.roundToIntclass EmulationActivity : AppCompatActivity(), SensorEventListener {private lateinit var binding: ActivityEmulationBinding@@ -256,7 +256,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {}}- private fun PictureInPictureParams.Builder.getPictureInPictureAspectBuilder(): PictureInPictureParams.Builder {+ private fun PictureInPictureParams.Builder.getPictureInPictureAspectBuilder():+ PictureInPictureParams.Builder {val aspectRatio = when (IntSetting.RENDERER_ASPECT_RATIO.int) {0 -> Rational(16, 9)1 -> Rational(4, 3)@@ -267,7 +268,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {return this.apply { aspectRatio?.let { setAspectRatio(it) } }}- private fun PictureInPictureParams.Builder.getPictureInPictureActionsBuilder(): PictureInPictureParams.Builder {+ private fun PictureInPictureParams.Builder.getPictureInPictureActionsBuilder():+ PictureInPictureParams.Builder {val pictureInPictureActions: MutableList<RemoteAction> = mutableListOf()val pendingFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE@@ -310,7 +312,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {val pictureInPictureParamsBuilder = PictureInPictureParams.Builder().getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {- pictureInPictureParamsBuilder.setAutoEnterEnabled(BooleanSetting.PICTURE_IN_PICTURE.boolean)+ pictureInPictureParamsBuilder.setAutoEnterEnabled(+ BooleanSetting.PICTURE_IN_PICTURE.boolean+ )}setPictureInPictureParams(pictureInPictureParamsBuilder.build())}@@ -341,7 +345,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {} else {try {unregisterReceiver(pictureInPictureReceiver)- } catch (ignored : Exception) {+ } catch (ignored: Exception) {}}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.ktindex 83d08841bc..e91277d359 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt@@ -28,10 +28,9 @@ import org.yuzu.yuzu_emu.HomeNavigationDirectionsimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplication+import org.yuzu.yuzu_emu.adapters.GameAdapter.GameViewHolderimport org.yuzu.yuzu_emu.databinding.CardGameBinding-import org.yuzu.yuzu_emu.activities.EmulationActivityimport org.yuzu.yuzu_emu.model.Game-import org.yuzu.yuzu_emu.adapters.GameAdapter.GameViewHolderimport org.yuzu.yuzu_emu.model.GamesViewModelclass GameAdapter(private val activity: AppCompatActivity) :@@ -60,7 +59,10 @@ class GameAdapter(private val activity: AppCompatActivity) :override fun onClick(view: View) {val holder = view.tag as GameViewHolder- val gameExists = DocumentFile.fromSingleUri(YuzuApplication.appContext, Uri.parse(holder.game.path))?.exists() == true+ val gameExists = DocumentFile.fromSingleUri(+ YuzuApplication.appContext,+ Uri.parse(holder.game.path)+ )?.exists() == trueif (!gameExists) {Toast.makeText(YuzuApplication.appContext,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.ktindex b719dd5394..d3df3bc81d 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt@@ -58,11 +58,12 @@ class HomeSettingAdapter(private val activity: AppCompatActivity, var options: L)when (option.titleId) {- R.string.get_early_access -> binding.optionLayout.background =- ContextCompat.getDrawable(- binding.optionCard.context,- R.drawable.premium_background- )+ R.string.get_early_access ->+ binding.optionLayout.background =+ ContextCompat.getDrawable(+ binding.optionCard.context,+ R.drawable.premium_background+ )}}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.ktindex 82a6712b68..e058067c97 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt@@ -12,10 +12,10 @@ import android.view.WindowInsetsimport android.view.inputmethod.InputMethodManagerimport androidx.annotation.Keepimport androidx.core.view.ViewCompat+import java.io.Serializableimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.applets.keyboard.ui.KeyboardDialogFragment-import java.io.Serializable@Keepobject SoftwareKeyboard {@@ -40,19 +40,22 @@ object SoftwareKeyboard {// There isn't a good way to know that the IMM is dismissed, so poll every 500ms to submit inline keyboard result.val handler = Handler(Looper.myLooper()!!)val delayMs = 500- handler.postDelayed(object : Runnable {- override fun run() {- val insets = ViewCompat.getRootWindowInsets(overlayView)- val isKeyboardVisible = insets!!.isVisible(WindowInsets.Type.ime())- if (isKeyboardVisible) {- handler.postDelayed(this, delayMs.toLong())- return- }+ handler.postDelayed(+ object : Runnable {+ override fun run() {+ val insets = ViewCompat.getRootWindowInsets(overlayView)+ val isKeyboardVisible = insets!!.isVisible(WindowInsets.Type.ime())+ if (isKeyboardVisible) {+ handler.postDelayed(this, delayMs.toLong())+ return+ }- // No longer visible, submit the result.- NativeLibrary.submitInlineKeyboardInput(KeyEvent.KEYCODE_ENTER)- }- }, delayMs.toLong())+ // No longer visible, submit the result.+ NativeLibrary.submitInlineKeyboardInput(KeyEvent.KEYCODE_ENTER)+ }+ },+ delayMs.toLong()+ )}@JvmStaticdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress.ktindex 3b1559c805..a18efef198 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress.kt@@ -20,7 +20,10 @@ object DiskShaderCacheProgress {emulationActivity.getString(R.string.loading),emulationActivity.getString(R.string.preparing_shaders))- fragment.show(emulationActivity.supportFragmentManager, ShaderProgressDialogFragment.TAG)+ fragment.show(+ emulationActivity.supportFragmentManager,+ ShaderProgressDialogFragment.TAG+ )}synchronized(finishLock) { finishLock.wait() }}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/ui/ShaderProgressDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/ui/ShaderProgressDialogFragment.ktindex 2c68c9ac3a..8a8e0a6e89 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/ui/ShaderProgressDialogFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/ui/ShaderProgressDialogFragment.kt@@ -62,7 +62,9 @@ class ShaderProgressDialogFragment : DialogFragment() {shaderProgressViewModel.message.observe(viewLifecycleOwner) { msg ->alertDialog.setMessage(msg)}- synchronized(DiskShaderCacheProgress.finishLock) { DiskShaderCacheProgress.finishLock.notifyAll() }+ synchronized(DiskShaderCacheProgress.finishLock) {+ DiskShaderCacheProgress.finishLock.notifyAll()+ }}override fun onDestroyView() {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.ktindex 4c3a9ca806..f3be156b5e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt@@ -13,11 +13,11 @@ import android.os.ParcelFileDescriptorimport android.provider.DocumentsContractimport android.provider.DocumentsProviderimport android.webkit.MimeTypeMap+import java.io.*import org.yuzu.yuzu_emu.BuildConfigimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.getPublicFilesDir-import java.io.*class DocumentProvider : DocumentsProvider() {private val baseDirectory: File@@ -44,7 +44,7 @@ class DocumentProvider : DocumentsProvider() {DocumentsContract.Document.COLUMN_SIZE)- const val AUTHORITY : String = BuildConfig.APPLICATION_ID + ".user"+ const val AUTHORITY: String = BuildConfig.APPLICATION_ID + ".user"const val ROOT_ID: String = "root"}@@ -58,7 +58,11 @@ class DocumentProvider : DocumentsProvider() {private fun getFile(documentId: String): File {if (documentId.startsWith(ROOT_ID)) {val file = baseDirectory.resolve(documentId.drop(ROOT_ID.length + 1))- if (!file.exists()) throw FileNotFoundException("${file.absolutePath} ($documentId) not found")+ if (!file.exists()) {+ throw FileNotFoundException(+ "${file.absolutePath} ($documentId) not found"+ )+ }return file} else {throw FileNotFoundException("'$documentId' is not in any known root")@@ -80,7 +84,8 @@ class DocumentProvider : DocumentsProvider() {add(DocumentsContract.Root.COLUMN_SUMMARY, null)add(DocumentsContract.Root.COLUMN_FLAGS,- DocumentsContract.Root.FLAG_SUPPORTS_CREATE or DocumentsContract.Root.FLAG_SUPPORTS_IS_CHILD+ DocumentsContract.Root.FLAG_SUPPORTS_CREATE or+ DocumentsContract.Root.FLAG_SUPPORTS_IS_CHILD)add(DocumentsContract.Root.COLUMN_TITLE, context!!.getString(R.string.app_name))add(DocumentsContract.Root.COLUMN_DOCUMENT_ID, getDocumentId(baseDirectory))@@ -127,11 +132,13 @@ class DocumentProvider : DocumentsProvider() {try {if (DocumentsContract.Document.MIME_TYPE_DIR == mimeType) {- if (!newFile.mkdir())+ if (!newFile.mkdir()) {throw IOException("Failed to create directory")+ }} else {- if (!newFile.createNewFile())+ if (!newFile.createNewFile()) {throw IOException("Failed to create file")+ }}} catch (e: IOException) {throw FileNotFoundException("Couldn't create document '${newFile.path}': ${e.message}")@@ -142,8 +149,9 @@ class DocumentProvider : DocumentsProvider() {override fun deleteDocument(documentId: String?) {val file = getFile(documentId!!)- if (!file.delete())+ if (!file.delete()) {throw FileNotFoundException("Couldn't delete document with ID '$documentId'")+ }}override fun removeDocument(documentId: String, parentDocumentId: String?) {@@ -151,38 +159,55 @@ class DocumentProvider : DocumentsProvider() {val file = getFile(documentId)if (parent == file || file.parentFile == null || file.parentFile!! == parent) {- if (!file.delete())+ if (!file.delete()) {throw FileNotFoundException("Couldn't delete document with ID '$documentId'")+ }} else {throw FileNotFoundException("Couldn't delete document with ID '$documentId'")}}override fun renameDocument(documentId: String?, displayName: String?): String {- if (displayName == null)- throw FileNotFoundException("Couldn't rename document '$documentId' as the new name is null")+ if (displayName == null) {+ throw FileNotFoundException(+ "Couldn't rename document '$documentId' as the new name is null"+ )+ }val sourceFile = getFile(documentId!!)val sourceParentFile = sourceFile.parentFile- ?: throw FileNotFoundException("Couldn't rename document '$documentId' as it has no parent")+ ?: throw FileNotFoundException(+ "Couldn't rename document '$documentId' as it has no parent"+ )val destFile = sourceParentFile.resolve(displayName)try {- if (!sourceFile.renameTo(destFile))- throw FileNotFoundException("Couldn't rename document from '${sourceFile.name}' to '${destFile.name}'")+ if (!sourceFile.renameTo(destFile)) {+ throw FileNotFoundException(+ "Couldn't rename document from '${sourceFile.name}' to '${destFile.name}'"+ )+ }} catch (e: Exception) {- throw FileNotFoundException("Couldn't rename document from '${sourceFile.name}' to '${destFile.name}': ${e.message}")+ throw FileNotFoundException(+ "Couldn't rename document from '${sourceFile.name}' to '${destFile.name}': " ++ "${e.message}"+ )}return getDocumentId(destFile)}private fun copyDocument(- sourceDocumentId: String, sourceParentDocumentId: String,+ sourceDocumentId: String,+ sourceParentDocumentId: String,targetParentDocumentId: String?): String {- if (!isChildDocument(sourceParentDocumentId, sourceDocumentId))- throw FileNotFoundException("Couldn't copy document '$sourceDocumentId' as its parent is not '$sourceParentDocumentId'")+ if (!isChildDocument(sourceParentDocumentId, sourceDocumentId)) {+ throw FileNotFoundException(+ "Couldn't copy document '$sourceDocumentId' as its parent is not " ++ "'$sourceParentDocumentId'"+ )+ }return copyDocument(sourceDocumentId, targetParentDocumentId)}@@ -193,8 +218,13 @@ class DocumentProvider : DocumentsProvider() {val newFile = parent.resolveWithoutConflict(oldFile.name)try {- if (!(newFile.createNewFile() && newFile.setWritable(true) && newFile.setReadable(true)))+ if (!(+ newFile.createNewFile() && newFile.setWritable(true) &&+ newFile.setReadable(true)+ )+ ) {throw IOException("Couldn't create new file")+ }FileInputStream(oldFile).use { inStream ->FileOutputStream(newFile).use { outStream ->@@ -209,12 +239,14 @@ class DocumentProvider : DocumentsProvider() {}override fun moveDocument(- sourceDocumentId: String, sourceParentDocumentId: String?,+ sourceDocumentId: String,+ sourceParentDocumentId: String?,targetParentDocumentId: String?): String {try {val newDocumentId = copyDocument(- sourceDocumentId, sourceParentDocumentId!!,+ sourceDocumentId,+ sourceParentDocumentId!!,targetParentDocumentId)removeDocument(sourceDocumentId, sourceParentDocumentId)@@ -245,24 +277,30 @@ class DocumentProvider : DocumentsProvider() {add(DocumentsContract.Document.COLUMN_DOCUMENT_ID, localDocumentId)add(DocumentsContract.Document.COLUMN_DISPLAY_NAME,- if (localFile == baseDirectory) context!!.getString(R.string.app_name) else localFile.name+ if (localFile == baseDirectory) {+ context!!.getString(R.string.app_name)+ } else {+ localFile.name+ })add(DocumentsContract.Document.COLUMN_SIZE, localFile.length())add(DocumentsContract.Document.COLUMN_MIME_TYPE, getTypeForFile(localFile))add(DocumentsContract.Document.COLUMN_LAST_MODIFIED, localFile.lastModified())add(DocumentsContract.Document.COLUMN_FLAGS, flags)- if (localFile == baseDirectory)+ if (localFile == baseDirectory) {add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_yuzu)+ }}return cursor}private fun getTypeForFile(file: File): Any {- return if (file.isDirectory)+ return if (file.isDirectory) {DocumentsContract.Document.MIME_TYPE_DIR- else+ } else {getTypeForName(file.name)+ }}private fun getTypeForName(name: String): Any {@@ -270,8 +308,9 @@ class DocumentProvider : DocumentsProvider() {if (lastDot >= 0) {val extension = name.substring(lastDot + 1)val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)- if (mime != null)+ if (mime != null) {return mime+ }}return "application/octect-stream"}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.ktindex 6bcb7bee07..88afb2223c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt@@ -4,11 +4,11 @@package org.yuzu.yuzu_emu.features.settings.modelimport android.text.TextUtils+import java.util.*import org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.features.settings.ui.SettingsActivityViewimport org.yuzu.yuzu_emu.features.settings.utils.SettingsFile-import java.util.*class Settings {private var gameId: String? = nulldiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.ktindex 9eac9904e8..7306ec458e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt@@ -4,7 +4,6 @@package org.yuzu.yuzu_emu.features.settings.model.viewimport org.yuzu.yuzu_emu.features.settings.model.AbstractIntSetting-import org.yuzu.yuzu_emu.features.settings.model.IntSettingclass SingleChoiceSetting(setting: AbstractIntSetting?,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.ktindex 842648ce45..92d0167ae0 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt@@ -3,13 +3,11 @@package org.yuzu.yuzu_emu.features.settings.model.view+import kotlin.math.roundToIntimport org.yuzu.yuzu_emu.features.settings.model.AbstractFloatSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractIntSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractSetting-import org.yuzu.yuzu_emu.features.settings.model.FloatSetting-import org.yuzu.yuzu_emu.features.settings.model.IntSettingimport org.yuzu.yuzu_emu.utils.Log-import kotlin.math.roundToIntclass SliderSetting(setting: AbstractSetting?,@@ -19,7 +17,7 @@ class SliderSetting(val max: Int,val units: String,val key: String? = null,- val defaultValue: Int? = null,+ val defaultValue: Int? = null) : SettingsItem(setting, titleId, descriptionId) {override val type = TYPE_SLIDERdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.ktindex 9e9b00d10d..bad34fd88e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt@@ -5,7 +5,6 @@ package org.yuzu.yuzu_emu.features.settings.model.viewimport org.yuzu.yuzu_emu.features.settings.model.AbstractSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractStringSetting-import org.yuzu.yuzu_emu.features.settings.model.StringSettingclass StringSingleChoiceSetting(val key: String? = null,@@ -22,7 +21,9 @@ class StringSingleChoiceSetting(if (valuesId == null) return nullreturn if (index >= 0 && index < valuesId.size) {valuesId[index]- } else ""+ } else {+ ""+ }}val selectedValue: Stringdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.ktindex a3ef59c2f4..8a9d13a92e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt@@ -3,8 +3,6 @@package org.yuzu.yuzu_emu.features.settings.model.view-import org.yuzu.yuzu_emu.features.settings.model.AbstractSetting-class SubmenuSetting(titleId: Int,descriptionId: Int,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.ktindex da7062b87f..a5af5a7aec 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt@@ -8,18 +8,18 @@ import android.content.Intentimport android.os.Bundleimport android.view.Menuimport android.view.View+import android.view.ViewGroup.MarginLayoutParamsimport android.widget.Toast+import androidx.activity.OnBackPressedCallback+import androidx.activity.result.ActivityResultLauncherimport androidx.activity.viewModelsimport androidx.appcompat.app.AppCompatActivityimport androidx.core.view.ViewCompatimport androidx.core.view.WindowCompatimport androidx.core.view.WindowInsetsCompat-import android.view.ViewGroup.MarginLayoutParams-import androidx.activity.OnBackPressedCallback-import androidx.activity.result.ActivityResultLauncherimport androidx.core.view.updatePaddingimport com.google.android.material.color.MaterialColors-import org.yuzu.yuzu_emu.NativeLibrary+import java.io.IOExceptionimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.ActivitySettingsBindingimport org.yuzu.yuzu_emu.features.settings.model.BooleanSetting@@ -30,7 +30,6 @@ import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModelimport org.yuzu.yuzu_emu.features.settings.model.StringSettingimport org.yuzu.yuzu_emu.features.settings.utils.SettingsFileimport org.yuzu.yuzu_emu.utils.*-import java.io.IOExceptionclass SettingsActivity : AppCompatActivity(), SettingsActivityView {private val presenter = SettingsActivityPresenter(this)@@ -60,7 +59,9 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {setSupportActionBar(binding.toolbarSettings)supportActionBar!!.setDisplayHomeAsUpEnabled(true)- if (InsetsHelper.getSystemGestureType(applicationContext) != InsetsHelper.GESTURE_NAVIGATION) {+ if (InsetsHelper.getSystemGestureType(applicationContext) !=+ InsetsHelper.GESTURE_NAVIGATION+ ) {binding.navigationBarShade.setBackgroundColor(ThemeHelper.getColorWithOpacity(MaterialColors.getColor(@@ -76,7 +77,8 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {this,object : OnBackPressedCallback(true) {override fun handleOnBackPressed() = navigateBack()- })+ }+ )setInsets()}@@ -149,11 +151,13 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {private fun areSystemAnimationsEnabled(): Boolean {val duration = android.provider.Settings.Global.getFloat(contentResolver,- android.provider.Settings.Global.ANIMATOR_DURATION_SCALE, 1f+ android.provider.Settings.Global.ANIMATOR_DURATION_SCALE,+ 1f)val transition = android.provider.Settings.Global.getFloat(contentResolver,- android.provider.Settings.Global.TRANSITION_ANIMATION_SCALE, 1f+ android.provider.Settings.Global.TRANSITION_ANIMATION_SCALE,+ 1f)return duration != 0f && transition != 0f}@@ -208,7 +212,9 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {get() = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG) as SettingsFragment?private fun setInsets() {- ViewCompat.setOnApplyWindowInsetsListener(binding.frameContent) { view: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.frameContent+ ) { view: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())view.updatePadding(diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.ktindex 4361d95fbb..93e677b21b 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.kt@@ -6,12 +6,12 @@ package org.yuzu.yuzu_emu.features.settings.uiimport android.content.Contextimport android.os.Bundleimport android.text.TextUtils+import java.io.Fileimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.features.settings.utils.SettingsFileimport org.yuzu.yuzu_emu.utils.DirectoryInitializationimport org.yuzu.yuzu_emu.utils.Log-import java.io.Fileclass SettingsActivityPresenter(private val activityView: SettingsActivityView) {val settings: Settings get() = activityView.settings@@ -46,9 +46,15 @@ class SettingsActivityPresenter(private val activityView: SettingsActivityView)private fun prepareDirectoriesIfNeeded() {val configFile =- File(DirectoryInitialization.userDirectory + "/config/" + SettingsFile.FILE_NAME_CONFIG + ".ini")+ File(+ "${DirectoryInitialization.userDirectory}/config/" ++ "${SettingsFile.FILE_NAME_CONFIG}.ini"+ )if (!configFile.exists()) {- Log.error(DirectoryInitialization.userDirectory + "/config/" + SettingsFile.FILE_NAME_CONFIG + ".ini")+ Log.error(+ "${DirectoryInitialization.userDirectory}/config/" ++ "${SettingsFile.FILE_NAME_CONFIG}.ini"+ )Log.error("yuzu config file could not be found!")}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.ktindex 1eb4899fcb..eac6a134bb 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt@@ -13,7 +13,6 @@ import android.view.ViewGroupimport android.widget.TextViewimport androidx.appcompat.app.AlertDialogimport androidx.appcompat.app.AppCompatActivity-import androidx.fragment.app.setFragmentResultListenerimport androidx.recyclerview.widget.RecyclerViewimport com.google.android.material.datepicker.MaterialDatePickerimport com.google.android.material.dialog.MaterialAlertDialogBuilderdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.ktindex 8671479502..70a74c4dda 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt@@ -50,7 +50,10 @@ class SettingsFragment : Fragment(), SettingsFragmentView {override fun onViewCreated(view: View, savedInstanceState: Bundle?) {settingsAdapter = SettingsAdapter(this, requireActivity())- val dividerDecoration = MaterialDividerItemDecoration(requireContext(), LinearLayoutManager.VERTICAL)+ val dividerDecoration = MaterialDividerItemDecoration(+ requireContext(),+ LinearLayoutManager.VERTICAL+ )dividerDecoration.isLastItemDecorated = falsebinding.listSettings.apply {adapter = settingsAdapter@@ -99,7 +102,9 @@ class SettingsFragment : Fragment(), SettingsFragmentView {}private fun setInsets() {- ViewCompat.setOnApplyWindowInsetsListener(binding.listSettings) { view: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.listSettings+ ) { view: View, windowInsets: WindowInsetsCompat ->val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())view.updatePadding(bottom = insets.bottom)windowInsetsdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.ktindex b611389a15..c8c85dd7a9 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt@@ -7,7 +7,6 @@ import android.content.SharedPreferencesimport android.os.Buildimport android.text.TextUtilsimport androidx.preference.PreferenceManager-import com.google.android.material.dialog.MaterialAlertDialogBuilderimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.features.settings.model.AbstractBooleanSetting@@ -236,7 +235,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_graphics))sl.apply {-add(SingleChoiceSetting(IntSetting.RENDERER_ACCURACY,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.ktindex 04c045e774..7955532eee 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt@@ -4,15 +4,15 @@package org.yuzu.yuzu_emu.features.settings.ui.viewholderimport android.view.View-import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding-import org.yuzu.yuzu_emu.features.settings.model.view.DateTimeSetting-import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem-import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterimport java.time.Instantimport java.time.ZoneIdimport java.time.ZonedDateTimeimport java.time.format.DateTimeFormatterimport java.time.format.FormatStyle+import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding+import org.yuzu.yuzu_emu.features.settings.model.view.DateTimeSetting+import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem+import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterclass DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :SettingViewHolder(binding.root, adapter) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.ktindex b163bd6ca3..54f531795c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt@@ -6,8 +6,8 @@ package org.yuzu.yuzu_emu.features.settings.ui.viewholderimport android.view.Viewimport android.widget.CompoundButtonimport org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBinding-import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSettingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem+import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSettingimport org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterclass SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) :diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.ktindex e29bca11df..20a0636dff 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt@@ -3,6 +3,8 @@package org.yuzu.yuzu_emu.features.settings.utils+import java.io.*+import java.util.*import org.ini4j.Winiimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.R@@ -13,8 +15,6 @@ import org.yuzu.yuzu_emu.features.settings.ui.SettingsActivityViewimport org.yuzu.yuzu_emu.utils.BiMapimport org.yuzu.yuzu_emu.utils.DirectoryInitializationimport org.yuzu.yuzu_emu.utils.Log-import java.io.*-import java.util.*/*** Contains static methods for interacting with .ini files in which settings are stored.@@ -137,9 +137,12 @@ object SettingsFile {for (settingKey in sortedKeySet) {val setting = settings[settingKey]NativeLibrary.setUserSetting(- gameId, mapSectionNameFromIni(+ gameId,+ mapSectionNameFromIni(section.name- ), setting!!.key, setting.valueAsString+ ),+ setting!!.key,+ setting.valueAsString)}}@@ -148,13 +151,17 @@ object SettingsFile {private fun mapSectionNameFromIni(generalSectionName: String): String? {return if (sectionsMap.getForward(generalSectionName) != null) {sectionsMap.getForward(generalSectionName)- } else generalSectionName+ } else {+ generalSectionName+ }}private fun mapSectionNameToIni(generalSectionName: String): String {return if (sectionsMap.getBackward(generalSectionName) != null) {sectionsMap.getBackward(generalSectionName).toString()- } else generalSectionName+ } else {+ generalSectionName+ }}fun getSettingsFile(fileName: String): File {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.ktindex c92e2755c2..2ff827c6b0 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt@@ -66,7 +66,11 @@ class AboutFragment : Fragment() {true}- binding.buttonContributors.setOnClickListener { openLink(getString(R.string.contributors_link)) }+ binding.buttonContributors.setOnClickListener {+ openLink(+ getString(R.string.contributors_link)+ )+ }binding.buttonLicenses.setOnClickListener {exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment)@@ -101,7 +105,9 @@ class AboutFragment : Fragment() {}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.root+ ) { _: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.ktindex d8bbc1ce40..dbc16da4af 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt@@ -49,7 +49,11 @@ class EarlyAccessFragment : Fragment() {parentFragmentManager.primaryNavigationFragment?.findNavController()?.popBackStack()}- binding.getEarlyAccessButton.setOnClickListener { openLink(getString(R.string.play_store_link)) }+ binding.getEarlyAccessButton.setOnClickListener {+ openLink(+ getString(R.string.play_store_link)+ )+ }setInsets()}@@ -60,7 +64,9 @@ class EarlyAccessFragment : Fragment() {}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.root+ ) { _: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 4b23058928..42e2e5b750 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt@@ -83,7 +83,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {}onReturnFromSettings = context.activityResultRegistry.register(- "SettingsResult", ActivityResultContracts.StartActivityForResult()+ "SettingsResult",+ ActivityResultContracts.StartActivityForResult()) {binding.surfaceEmulation.setAspectRatio(when (IntSetting.RENDERER_ASPECT_RATIO.int) {@@ -191,9 +192,14 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {requireActivity(),object : OnBackPressedCallback(true) {override fun handleOnBackPressed() {- if (binding.drawerLayout.isOpen) binding.drawerLayout.close() else binding.drawerLayout.open()+ if (binding.drawerLayout.isOpen) {+ binding.drawerLayout.close()+ } else {+ binding.drawerLayout.open()+ }}- })+ }+ )viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {@@ -312,8 +318,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {private fun updateScreenLayout() {emulationActivity?.let {it.requestedOrientation = when (IntSetting.RENDERER_SCREEN_LAYOUT.int) {- Settings.LayoutOption_MobileLandscape -> ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE- Settings.LayoutOption_MobilePortrait -> ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT+ Settings.LayoutOption_MobileLandscape ->+ ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE+ Settings.LayoutOption_MobilePortrait ->+ ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAITSettings.LayoutOption_Unspecified -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIEDelse -> ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE}@@ -321,25 +329,30 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {onConfigurationChanged(resources.configuration)}- private fun updateFoldableLayout(emulationActivity: EmulationActivity, newLayoutInfo: WindowLayoutInfo) {- val isFolding = (newLayoutInfo.displayFeatures.find { it is FoldingFeature } as? FoldingFeature)?.let {- if (it.isSeparating) {- emulationActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED- if (it.orientation == FoldingFeature.Orientation.HORIZONTAL) {- // Restrict emulation and overlays to the top of the screen- binding.emulationContainer.layoutParams.height = it.bounds.top- binding.overlayContainer.layoutParams.height = it.bounds.top- // Restrict input and menu drawer to the bottom of the screen- binding.inputContainer.layoutParams.height = it.bounds.bottom- binding.inGameMenu.layoutParams.height = it.bounds.bottom-- isInFoldableLayout = true- binding.surfaceInputOverlay.orientation = InputOverlay.FOLDABLE- refreshInputOverlay()+ private fun updateFoldableLayout(+ emulationActivity: EmulationActivity,+ newLayoutInfo: WindowLayoutInfo+ ) {+ val isFolding =+ (newLayoutInfo.displayFeatures.find { it is FoldingFeature } as? FoldingFeature)?.let {+ if (it.isSeparating) {+ emulationActivity.requestedOrientation =+ ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED+ if (it.orientation == FoldingFeature.Orientation.HORIZONTAL) {+ // Restrict emulation and overlays to the top of the screen+ binding.emulationContainer.layoutParams.height = it.bounds.top+ binding.overlayContainer.layoutParams.height = it.bounds.top+ // Restrict input and menu drawer to the bottom of the screen+ binding.inputContainer.layoutParams.height = it.bounds.bottom+ binding.inGameMenu.layoutParams.height = it.bounds.bottom++ isInFoldableLayout = true+ binding.surfaceInputOverlay.orientation = InputOverlay.FOLDABLE+ refreshInputOverlay()+ }}- }- it.isSeparating- } ?: false+ it.isSeparating+ } ?: falseif (!isFolding) {binding.emulationContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENTbinding.inputContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT@@ -516,18 +529,22 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {inputScaleSlider.apply {valueTo = 150Fvalue = preferences.getInt(Settings.PREF_CONTROL_SCALE, 50).toFloat()- addOnChangeListener(Slider.OnChangeListener { _, value, _ ->- inputScaleValue.text = "${value.toInt()}%"- setControlScale(value.toInt())- })+ addOnChangeListener(+ Slider.OnChangeListener { _, value, _ ->+ inputScaleValue.text = "${value.toInt()}%"+ setControlScale(value.toInt())+ }+ )}inputOpacitySlider.apply {valueTo = 100Fvalue = preferences.getInt(Settings.PREF_CONTROL_OPACITY, 100).toFloat()- addOnChangeListener(Slider.OnChangeListener { _, value, _ ->- inputOpacityValue.text = "${value.toInt()}%"- setControlOpacity(value.toInt())- })+ addOnChangeListener(+ Slider.OnChangeListener { _, value, _ ->+ inputOpacityValue.text = "${value.toInt()}%"+ setControlOpacity(value.toInt())+ }+ )}inputScaleValue.text = "${inputScaleSlider.value.toInt()}%"inputOpacityValue.text = "${inputOpacitySlider.value.toInt()}%"@@ -559,7 +576,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {}private fun setInsets() {- ViewCompat.setOnApplyWindowInsetsListener(binding.inGameMenu) { v: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.inGameMenu+ ) { v: View, windowInsets: WindowInsetsCompat ->val cutInsets: Insets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())var left = 0var right = 0@@ -679,8 +698,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {state = State.PAUSED}- State.PAUSED -> Log.warning("[EmulationFragment] Surface cleared while emulation paused.")- else -> Log.warning("[EmulationFragment] Surface cleared while emulation stopped.")+ State.PAUSED -> Log.warning(+ "[EmulationFragment] Surface cleared while emulation paused."+ )+ else -> Log.warning(+ "[EmulationFragment] Surface cleared while emulation stopped."+ )}}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.ktindex 536163eb6e..6f8adbba53 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt@@ -103,7 +103,9 @@ class HomeSettingsFragment : Fragment() {R.string.select_games_folder,R.string.select_games_folder_description,R.drawable.ic_add- ) { mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data) },+ ) {+ mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data)+ },HomeSetting(R.string.manage_save_data,R.string.import_export_saves_description,@@ -225,7 +227,11 @@ class HomeSettingsFragment : Fragment() {val intent = Intent(action)intent.addCategory(Intent.CATEGORY_DEFAULT)intent.data = DocumentsContract.buildRootUri(authority, DocumentProvider.ROOT_ID)- intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or Intent.FLAG_GRANT_PREFIX_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)+ intent.addFlags(+ Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or+ Intent.FLAG_GRANT_PREFIX_URI_PERMISSION or+ Intent.FLAG_GRANT_WRITE_URI_PERMISSION+ )return intent}@@ -307,7 +313,9 @@ class HomeSettingsFragment : Fragment() {}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.root+ ) { view: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())val spacingNavigation = resources.getDimensionPixelSize(R.dimen.spacing_navigation)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.ktindex 36e63bb9e6..e1495ee8c4 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt@@ -15,6 +15,14 @@ import androidx.appcompat.app.AppCompatActivityimport androidx.documentfile.provider.DocumentFileimport androidx.fragment.app.DialogFragmentimport com.google.android.material.dialog.MaterialAlertDialogBuilder+import java.io.BufferedOutputStream+import java.io.File+import java.io.FileOutputStream+import java.io.FilenameFilter+import java.time.LocalDateTime+import java.time.format.DateTimeFormatter+import java.util.zip.ZipEntry+import java.util.zip.ZipOutputStreamimport kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.launch@@ -24,14 +32,6 @@ import org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.features.DocumentProviderimport org.yuzu.yuzu_emu.getPublicFilesDirimport org.yuzu.yuzu_emu.utils.FileUtil-import java.io.BufferedOutputStream-import java.io.File-import java.io.FileOutputStream-import java.io.FilenameFilter-import java.time.LocalDateTime-import java.time.format.DateTimeFormatter-import java.util.zip.ZipEntry-import java.util.zip.ZipOutputStreamclass ImportExportSavesFragment : DialogFragment() {private val context = YuzuApplication.appContext@@ -98,7 +98,7 @@ class ImportExportSavesFragment : DialogFragment() {val outputZipFile = File(tempFolder,"yuzu saves - ${- LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))+ LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))}.zip")outputZipFile.createNewFile()@@ -106,12 +106,14 @@ class ImportExportSavesFragment : DialogFragment() {saveFolder.walkTopDown().forEach { file ->val zipFileName =file.absolutePath.removePrefix(savesFolderRoot).removePrefix("/")- if (zipFileName == "")+ if (zipFileName == "") {return@forEach+ }val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")zos.putNextEntry(entry)- if (file.isFile)+ if (file.isFile) {file.inputStream().use { fis -> fis.copyTo(zos) }+ }}}lastZipCreated = outputZipFile@@ -137,7 +139,8 @@ class ImportExportSavesFragment : DialogFragment() {withContext(Dispatchers.Main) {val file = DocumentFile.fromSingleUri(- context, DocumentsContract.buildDocumentUri(+ context,+ DocumentsContract.buildDocumentUri(DocumentProvider.AUTHORITY,"${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}")diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.ktindex c7880d8ccd..739b26f995 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt@@ -14,7 +14,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilderimport org.yuzu.yuzu_emu.databinding.DialogProgressBarBindingimport org.yuzu.yuzu_emu.model.TaskViewModel-class IndeterminateProgressDialogFragment : DialogFragment() {private val taskViewModel: TaskViewModel by activityViewModels()diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.ktindex 59141e8236..b6e9129f7d 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt@@ -113,7 +113,9 @@ class LicensesFragment : Fragment() {}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.root+ ) { _: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.ktindex adbe3696b4..dd6c895fde 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt@@ -20,6 +20,7 @@ import androidx.fragment.app.activityViewModelsimport androidx.preference.PreferenceManagerimport info.debatty.java.stringsimilarity.Jaccardimport info.debatty.java.stringsimilarity.JaroWinkler+import java.util.Localeimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.adapters.GameAdapter@@ -29,8 +30,6 @@ import org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.model.GamesViewModelimport org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.utils.FileUtil-import org.yuzu.yuzu_emu.utils.Log-import java.util.Localeclass SearchFragment : Fragment() {private var _binding: FragmentSearchBinding? = null@@ -130,15 +129,15 @@ class SearchFragment : Fragment() {R.id.chip_homebrew -> baseList.filter { it.isHomebrew }R.id.chip_retail -> baseList.filter {- FileUtil.hasExtension(it.path, "xci")- || FileUtil.hasExtension(it.path, "nsp")+ FileUtil.hasExtension(it.path, "xci") ||+ FileUtil.hasExtension(it.path, "nsp")}else -> baseList}- if (binding.searchText.text.toString().isEmpty()- && binding.chipGroup.checkedChipId != View.NO_ID+ if (binding.searchText.text.toString().isEmpty() &&+ binding.chipGroup.checkedChipId != View.NO_ID) {gamesViewModel.setSearchedGames(filteredList)return@@ -173,14 +172,16 @@ class SearchFragment : Fragment() {private fun focusSearch() {if (_binding != null) {binding.searchText.requestFocus()- val imm =- requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?+ val imm = requireActivity()+ .getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?imm?.showSoftInput(binding.searchText, InputMethodManager.SHOW_IMPLICIT)}}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.root+ ) { view: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())val extraListSpacing = resources.getDimensionPixelSize(R.dimen.spacing_med)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.ktindex 2587733800..6c4ddaf6b6 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt@@ -25,6 +25,7 @@ import androidx.navigation.findNavControllerimport androidx.preference.PreferenceManagerimport androidx.viewpager2.widget.ViewPager2.OnPageChangeCallbackimport com.google.android.material.transition.MaterialFadeThrough+import java.io.Fileimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.adapters.SetupAdapter@@ -35,7 +36,6 @@ import org.yuzu.yuzu_emu.model.SetupPageimport org.yuzu.yuzu_emu.ui.main.MainActivityimport org.yuzu.yuzu_emu.utils.DirectoryInitializationimport org.yuzu.yuzu_emu.utils.GameHelper-import java.io.Fileclass SetupFragment : Fragment() {private var _binding: FragmentSetupBinding? = null@@ -82,7 +82,8 @@ class SetupFragment : Fragment() {requireActivity().finish()}}- })+ }+ )requireActivity().window.navigationBarColor =ContextCompat.getColor(requireContext(), android.R.color.transparent)@@ -148,14 +149,20 @@ class SetupFragment : Fragment() {R.drawable.ic_add,true,R.string.add_games,- { mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data) },+ {+ mainActivity.getGamesDirectory.launch(+ Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data+ )+ },true,R.string.add_games_warning,R.string.add_games_warning_description,R.string.add_games_warning_help,{val preferences =- PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)+ PreferenceManager.getDefaultSharedPreferences(+ YuzuApplication.appContext+ )preferences.getString(GameHelper.KEY_GAME_PATH, "")!!.isNotEmpty()})@@ -260,7 +267,9 @@ class SetupFragment : Fragment() {@RequiresApi(Build.VERSION_CODES.TIRAMISU)private val permissionLauncher =registerForActivityResult(ActivityResultContracts.RequestPermission()) {- if (!it && !shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)) {+ if (!it &&+ !shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)+ ) {PermissionDeniedDialogFragment().show(childFragmentManager,PermissionDeniedDialogFragment.TAG@@ -315,7 +324,9 @@ class SetupFragment : Fragment() {}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.root+ ) { view: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())view.setPadding(diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/layout/AutofitGridLayoutManager.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/layout/AutofitGridLayoutManager.ktindex be5e4c86c7..bdd6ea628f 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/layout/AutofitGridLayoutManager.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/layout/AutofitGridLayoutManager.kt@@ -44,7 +44,9 @@ class AutofitGridLayoutManager(override fun onLayoutChildren(recycler: Recycler, state: RecyclerView.State) {val width = widthval height = height- if (columnWidth > 0 && width > 0 && height > 0 && (isColumnWidthChanged || lastWidth != width || lastHeight != height)) {+ if (columnWidth > 0 && width > 0 && height > 0 &&+ (isColumnWidthChanged || lastWidth != width || lastHeight != height)+ ) {val totalSpace: Int = if (orientation == VERTICAL) {width - paddingRight - paddingLeft} else {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.ktindex 35d8000c50..6a048e39fa 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt@@ -4,9 +4,9 @@package org.yuzu.yuzu_emu.modelimport android.os.Parcelable+import java.util.HashSetimport kotlinx.parcelize.Parcelizeimport kotlinx.serialization.Serializable-import java.util.HashSet@Parcelize@Serializable@@ -23,8 +23,9 @@ class Game(val keyLastPlayedTime get() = "${gameId}_LastPlayed"override fun equals(other: Any?): Boolean {- if (other !is Game)+ if (other !is Game) {return false+ }return hashCode() == other.hashCode()}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.ktindex d9b301210d..1fe42f9229 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt@@ -10,6 +10,7 @@ import androidx.lifecycle.MutableLiveDataimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScopeimport androidx.preference.PreferenceManager+import java.util.Localeimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.launchimport kotlinx.coroutines.withContext@@ -20,7 +21,6 @@ import kotlinx.serialization.json.Jsonimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.utils.GameHelper-import java.util.Locale@OptIn(ExperimentalSerializationApi::class)class GamesViewModel : ViewModel() {@@ -99,8 +99,9 @@ class GamesViewModel : ViewModel() {}fun reloadGames(directoryChanged: Boolean) {- if (isReloading.value == true)+ if (isReloading.value == true) {return+ }_isReloading.postValue(true)viewModelScope.launch {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.ktindex d12d08e9fe..6251ec7838 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt@@ -6,7 +6,6 @@ package org.yuzu.yuzu_emu.overlayimport android.app.Activityimport android.content.Contextimport android.content.SharedPreferences-import android.content.res.Configurationimport android.graphics.Bitmapimport android.graphics.Canvasimport android.graphics.Point@@ -24,6 +23,8 @@ import android.view.WindowInsetsimport androidx.core.content.ContextCompatimport androidx.preference.PreferenceManagerimport androidx.window.layout.WindowMetricsCalculator+import kotlin.math.max+import kotlin.math.minimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.NativeLibrary.ButtonTypeimport org.yuzu.yuzu_emu.NativeLibrary.StickType@@ -31,14 +32,13 @@ import org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.utils.EmulationMenuSettings-import kotlin.math.max-import kotlin.math.min/*** Draws the interactive input overlay on top of the* [SurfaceView] that is rendering emulation.*/-class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context, attrs),+class InputOverlay(context: Context, attrs: AttributeSet?) :+ SurfaceView(context, attrs),OnTouchListener {private val overlayButtons: MutableSet<InputOverlayDrawableButton> = HashSet()private val overlayDpads: MutableSet<InputOverlayDrawableDpad> = HashSet()@@ -95,7 +95,11 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(contextvar shouldUpdateView = falseval playerIndex =- if (NativeLibrary.isHandheldOnly()) NativeLibrary.ConsoleDevice else NativeLibrary.Player1Device+ if (NativeLibrary.isHandheldOnly()) {+ NativeLibrary.ConsoleDevice+ } else {+ NativeLibrary.Player1Device+ }for (button in overlayButtons) {if (!button.updateStatus(event)) {@@ -158,8 +162,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(contextshouldUpdateView = true}- if (shouldUpdateView)+ if (shouldUpdateView) {invalidate()+ }if (!preferences.getBoolean(Settings.PREF_TOUCH_ENABLED, true)) {return true@@ -243,9 +248,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context// If no button is being moved now, remember the currently touched button to move.if (buttonBeingConfigured == null &&button.bounds.contains(- fingerPositionX,- fingerPositionY- )+ fingerPositionX,+ fingerPositionY+ )) {buttonBeingConfigured = buttonbuttonBeingConfigured!!.onConfigureTouch(event)@@ -309,9 +314,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(contextMotionEvent.ACTION_DOWN,MotionEvent.ACTION_POINTER_DOWN -> if (joystickBeingConfigured == null &&joystick.bounds.contains(- fingerPositionX,- fingerPositionY- )+ fingerPositionX,+ fingerPositionY+ )) {joystickBeingConfigured = joystickjoystickBeingConfigured!!.onConfigureTouch(event)@@ -668,7 +673,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(contextR.integer.SWITCH_STICK_L_Y_FOLDABLE)- private fun getResourceValue(orientation: String, position: Int) : Float {+ private fun getResourceValue(orientation: String, position: Int): Float {return when (orientation) {PORTRAIT -> resources.getInteger(portraitResources[position]).toFloat() / 1000FOLDABLE -> resources.getInteger(foldableResources[position]).toFloat() / 1000@@ -820,7 +825,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context* @param context Context for getting the vector drawable* @param drawableId The ID of the drawable to scale.* @param scale The scale factor for the bitmap.- * @return The scaled [Bitmap]+ * @return The scaled [Bitmap]*/private fun getBitmap(context: Context, drawableId: Int, scale: Float): Bitmap {val vectorDrawable = ContextCompat.getDrawable(context, drawableId) as VectorDrawable@@ -854,7 +859,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context* Gets the safe screen size for drawing the overlay** @param context Context for getting the window metrics- * @return A pair of points, the first being the top left corner of the safe area,+ * @return A pair of points, the first being the top left corner of the safe area,* the second being the bottom right corner of the safe area*/private fun getSafeScreenSize(context: Context): Pair<Point, Point> {@@ -872,10 +877,16 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(contextif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {val insets = context.windowManager.currentWindowMetrics.windowInsets.displayCutoutif (insets != null) {- if (insets.boundingRectTop.bottom != 0 && insets.boundingRectTop.bottom > maxY / 2)+ if (insets.boundingRectTop.bottom != 0 &&+ insets.boundingRectTop.bottom > maxY / 2+ ) {maxY = insets.boundingRectTop.bottom.toFloat()- if (insets.boundingRectRight.left != 0 && insets.boundingRectRight.left > maxX / 2)+ }+ if (insets.boundingRectRight.left != 0 &&+ insets.boundingRectRight.left > maxX / 2+ ) {maxX = insets.boundingRectRight.left.toFloat()+ }minX = insets.boundingRectLeft.right - insets.boundingRectLeft.leftminY = insets.boundingRectBottom.top - insets.boundingRectBottom.bottomdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.ktindex 43d664d218..8aef6f5a5d 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.kt@@ -133,7 +133,10 @@ class InputOverlayDrawableDpad(downButtonState = axisY > VIRT_AXIS_DEADZONEleftButtonState = axisX < -VIRT_AXIS_DEADZONErightButtonState = axisX > VIRT_AXIS_DEADZONE- return oldUpState != upButtonState || oldDownState != downButtonState || oldLeftState != leftButtonState || oldRightState != rightButtonState+ return oldUpState != upButtonState ||+ oldDownState != downButtonState ||+ oldLeftState != leftButtonState ||+ oldRightState != rightButtonState}return false}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.ktindex f1d32192a9..fb48f584db 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt@@ -9,12 +9,12 @@ import android.graphics.Canvasimport android.graphics.Rectimport android.graphics.drawable.BitmapDrawableimport android.view.MotionEvent-import org.yuzu.yuzu_emu.NativeLibrary-import org.yuzu.yuzu_emu.utils.EmulationMenuSettingsimport kotlin.math.atan2import kotlin.math.cosimport kotlin.math.sinimport kotlin.math.sqrt+import org.yuzu.yuzu_emu.NativeLibrary+import org.yuzu.yuzu_emu.utils.EmulationMenuSettings/*** Custom [BitmapDrawable] that is capable@@ -241,14 +241,22 @@ class InputOverlayDrawableJoystick(private fun setInnerBounds() {var x = virtBounds.centerX() + (xAxis * (virtBounds.width() / 2)).toInt()var y = virtBounds.centerY() + (yAxis * (virtBounds.height() / 2)).toInt()- if (x > virtBounds.centerX() + virtBounds.width() / 2) x =- virtBounds.centerX() + virtBounds.width() / 2- if (x < virtBounds.centerX() - virtBounds.width() / 2) x =- virtBounds.centerX() - virtBounds.width() / 2- if (y > virtBounds.centerY() + virtBounds.height() / 2) y =- virtBounds.centerY() + virtBounds.height() / 2- if (y < virtBounds.centerY() - virtBounds.height() / 2) y =- virtBounds.centerY() - virtBounds.height() / 2+ if (x > virtBounds.centerX() + virtBounds.width() / 2) {+ x =+ virtBounds.centerX() + virtBounds.width() / 2+ }+ if (x < virtBounds.centerX() - virtBounds.width() / 2) {+ x =+ virtBounds.centerX() - virtBounds.width() / 2+ }+ if (y > virtBounds.centerY() + virtBounds.height() / 2) {+ y =+ virtBounds.centerY() + virtBounds.height() / 2+ }+ if (y < virtBounds.centerY() - virtBounds.height() / 2) {+ y =+ virtBounds.centerY() - virtBounds.height() / 2+ }val width = pressedStateInnerBitmap.bounds.width() / 2val height = pressedStateInnerBitmap.bounds.height() / 2defaultStateInnerBitmap.setBounds(diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.ktindex 97eef40d20..b0156dca5e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt@@ -99,7 +99,9 @@ class GamesFragment : Fragment() {}shouldSwapData.observe(viewLifecycleOwner) { shouldSwapData ->if (shouldSwapData) {- (binding.gridGames.adapter as GameAdapter).submitList(gamesViewModel.games.value!!)+ (binding.gridGames.adapter as GameAdapter).submitList(+ gamesViewModel.games.value!!+ )gamesViewModel.setShouldSwapData(false)}}@@ -128,7 +130,9 @@ class GamesFragment : Fragment() {}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.root+ ) { view: View, windowInsets: WindowInsetsCompat ->val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())val extraListSpacing = resources.getDimensionPixelSize(R.dimen.spacing_large)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.ktindex 041d16f3a6..cc1d87f1b4 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt@@ -26,6 +26,9 @@ import androidx.preference.PreferenceManagerimport com.google.android.material.color.MaterialColorsimport com.google.android.material.dialog.MaterialAlertDialogBuilderimport com.google.android.material.navigation.NavigationBarView+import java.io.File+import java.io.FilenameFilter+import java.io.IOExceptionimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.launchimport kotlinx.coroutines.withContext@@ -43,9 +46,6 @@ import org.yuzu.yuzu_emu.fragments.MessageDialogFragmentimport org.yuzu.yuzu_emu.model.GamesViewModelimport org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.utils.*-import java.io.File-import java.io.FilenameFilter-import java.io.IOExceptionclass MainActivity : AppCompatActivity(), ThemeProvider {private lateinit var binding: ActivityMainBinding@@ -86,7 +86,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {ThemeHelper.SYSTEM_BAR_ALPHA))- if (InsetsHelper.getSystemGestureType(applicationContext) != InsetsHelper.GESTURE_NAVIGATION) {+ if (InsetsHelper.getSystemGestureType(applicationContext) !=+ InsetsHelper.GESTURE_NAVIGATION+ ) {binding.navigationBarShade.setBackgroundColor(ThemeHelper.getColorWithOpacity(MaterialColors.getColor(@@ -172,7 +174,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {binding.navigationView.height.toFloat() * 2translationY(0f)} else {- if (ViewCompat.getLayoutDirection(binding.navigationView) == ViewCompat.LAYOUT_DIRECTION_LTR) {+ if (ViewCompat.getLayoutDirection(binding.navigationView) ==+ ViewCompat.LAYOUT_DIRECTION_LTR+ ) {binding.navigationView.translationX =binding.navigationView.width.toFloat() * -2translationX(0f)@@ -189,7 +193,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {if (smallLayout) {translationY(binding.navigationView.height.toFloat() * 2)} else {- if (ViewCompat.getLayoutDirection(binding.navigationView) == ViewCompat.LAYOUT_DIRECTION_LTR) {+ if (ViewCompat.getLayoutDirection(binding.navigationView) ==+ ViewCompat.LAYOUT_DIRECTION_LTR+ ) {translationX(binding.navigationView.width.toFloat() * -2)} else {translationX(binding.navigationView.width.toFloat() * 2)@@ -234,7 +240,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {}private fun setInsets() =- ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->+ ViewCompat.setOnApplyWindowInsetsListener(+ binding.root+ ) { _: View, windowInsets: WindowInsetsCompat ->val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())val mlpStatusShade = binding.statusBarShade.layoutParams as MarginLayoutParamsmlpStatusShade.height = insets.top@@ -256,8 +264,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val getGamesDirectory =registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->- if (result == null)+ if (result == null) {return@registerForActivityResult+ }contentResolver.takePersistableUriPermission(result,@@ -281,8 +290,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val getProdKey =registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->- if (result == null)+ if (result == null) {return@registerForActivityResult+ }if (!FileUtil.hasExtension(result, "keys")) {MessageDialogFragment.newInstance(@@ -324,8 +334,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val getFirmware =registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->- if (result == null)+ if (result == null) {return@registerForActivityResult+ }val inputZip = contentResolver.openInputStream(result)if (inputZip == null) {@@ -376,8 +387,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val getAmiiboKey =registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->- if (result == null)+ if (result == null) {return@registerForActivityResult+ }if (!FileUtil.hasExtension(result, "bin")) {MessageDialogFragment.newInstance(@@ -418,8 +430,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val getDriver =registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->- if (result == null)+ if (result == null) {return@registerForActivityResult+ }val takeFlags =Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION@@ -470,8 +483,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val installGameUpdate =registerForActivityResult(ActivityResultContracts.OpenDocument()) {- if (it == null)+ if (it == null) {return@registerForActivityResult+ }IndeterminateProgressDialogFragment.newInstance(this@MainActivity,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ControllerMappingHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ControllerMappingHelper.ktindex 791cea9049..eeefcdf205 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ControllerMappingHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ControllerMappingHelper.kt@@ -19,7 +19,9 @@ class ControllerMappingHelper {// The two analog triggers generate analog motion events as well as a keycode.// We always prefer to use the analog values, so throw away the button presskeyCode == KeyEvent.KEYCODE_BUTTON_L2 || keyCode == KeyEvent.KEYCODE_BUTTON_R2- } else false+ } else {+ false+ }}/**diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.ktindex 36c479e6c5..2ee63697eb 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt@@ -4,8 +4,8 @@package org.yuzu.yuzu_emu.utilsimport android.content.Context-import org.yuzu.yuzu_emu.NativeLibraryimport java.io.IOException+import org.yuzu.yuzu_emu.NativeLibraryobject DirectoryInitialization {private var userPath: String? = nulldiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.ktindex f8abae445f..cf226ad945 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.kt@@ -5,10 +5,10 @@ package org.yuzu.yuzu_emu.utilsimport android.net.Uriimport androidx.documentfile.provider.DocumentFile-import org.yuzu.yuzu_emu.YuzuApplication-import org.yuzu.yuzu_emu.model.MinimalDocumentFileimport java.io.Fileimport java.util.*+import org.yuzu.yuzu_emu.YuzuApplication+import org.yuzu.yuzu_emu.model.MinimalDocumentFileclass DocumentsTree {private var root: DocumentsNode? = null@@ -29,7 +29,9 @@ class DocumentsTree {val node = resolvePath(filepath)return if (node == null || node.isDirectory) {0- } else FileUtil.getFileSize(YuzuApplication.appContext, node.uri.toString())+ } else {+ FileUtil.getFileSize(YuzuApplication.appContext, node.uri.toString())+ }}fun exists(filepath: String): Boolean {@@ -111,7 +113,9 @@ class DocumentsTree {fun isNativePath(path: String): Boolean {return if (path.isNotEmpty()) {path[0] == '/'- } else false+ } else {+ false+ }}}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.ktindex 492b1ad91e..9f3bbe56f9 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt@@ -9,8 +9,6 @@ import android.net.Uriimport android.provider.DocumentsContractimport android.provider.OpenableColumnsimport androidx.documentfile.provider.DocumentFile-import org.yuzu.yuzu_emu.YuzuApplication-import org.yuzu.yuzu_emu.model.MinimalDocumentFileimport java.io.BufferedInputStreamimport java.io.Fileimport java.io.FileOutputStream@@ -19,6 +17,8 @@ import java.io.InputStreamimport java.net.URLDecoderimport java.util.zip.ZipEntryimport java.util.zip.ZipInputStream+import org.yuzu.yuzu_emu.YuzuApplication+import org.yuzu.yuzu_emu.model.MinimalDocumentFileobject FileUtil {const val PATH_TREE = "tree"diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ForegroundService.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ForegroundService.ktindex dc9b7c7447..086d176065 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ForegroundService.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ForegroundService.kt@@ -54,7 +54,7 @@ class ForegroundService : Service() {override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {if (intent == null) {- return START_NOT_STICKY;+ return START_NOT_STICKY}if (intent.action == ACTION_STOP) {NotificationManagerCompat.from(this).cancel(EMULATION_RUNNING_NOTIFICATION)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.ktindex 42b2076184..ee9f3e5701 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt@@ -6,12 +6,12 @@ package org.yuzu.yuzu_emu.utilsimport android.content.SharedPreferencesimport android.net.Uriimport androidx.preference.PreferenceManager+import java.util.*import kotlinx.serialization.encodeToStringimport kotlinx.serialization.json.Jsonimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.model.Game-import java.util.*object GameHelper {const val KEY_GAME_PATH = "game_path"diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.ktindex 528011d7f8..dad1594813 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt@@ -5,14 +5,14 @@ package org.yuzu.yuzu_emu.utilsimport android.content.Contextimport android.net.Uri-import org.yuzu.yuzu_emu.NativeLibrary-import org.yuzu.yuzu_emu.utils.FileUtil.copyUriToInternalStorageimport java.io.BufferedInputStreamimport java.io.Fileimport java.io.FileInputStreamimport java.io.FileOutputStreamimport java.io.IOExceptionimport java.util.zip.ZipInputStream+import org.yuzu.yuzu_emu.NativeLibrary+import org.yuzu.yuzu_emu.utils.FileUtil.copyUriToInternalStorageobject GpuDriverHelper {private const val META_JSON_FILENAME = "meta.json"diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverMetadata.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverMetadata.ktindex 70bdb40973..a4e64070a8 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverMetadata.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverMetadata.kt@@ -3,12 +3,12 @@package org.yuzu.yuzu_emu.utils-import org.json.JSONException-import org.json.JSONObjectimport java.io.IOExceptionimport java.nio.charset.StandardCharsetsimport java.nio.file.Filesimport java.nio.file.Paths+import org.json.JSONException+import org.json.JSONObjectclass GpuDriverMetadata(metadataFilePath: String) {var name: String? = nulldiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.ktindex 24e999b292..e963dfbc17 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt@@ -5,8 +5,8 @@ package org.yuzu.yuzu_emu.utilsimport android.view.KeyEventimport android.view.MotionEvent-import org.yuzu.yuzu_emu.NativeLibraryimport kotlin.math.sqrt+import org.yuzu.yuzu_emu.NativeLibraryclass InputHandler {fun initialize() {@@ -68,7 +68,11 @@ class InputHandler {6 -> NativeLibrary.Player6Device7 -> NativeLibrary.Player7Device8 -> NativeLibrary.Player8Device- else -> if (NativeLibrary.isHandheldOnly()) NativeLibrary.ConsoleDevice else NativeLibrary.Player1Device+ else -> if (NativeLibrary.isHandheldOnly()) {+ NativeLibrary.ConsoleDevice+ } else {+ NativeLibrary.Player1Device+ }}}@@ -107,7 +111,11 @@ class InputHandler {}private fun getAxisToButton(axis: Float): Int {- return if (axis > 0.5f) NativeLibrary.ButtonState.PRESSED else NativeLibrary.ButtonState.RELEASED+ return if (axis > 0.5f) {+ NativeLibrary.ButtonState.PRESSED+ } else {+ NativeLibrary.ButtonState.RELEASED+ }}private fun setAxisDpadState(playerNumber: Int, xAxis: Float, yAxis: Float) {@@ -287,7 +295,6 @@ class InputHandler {}}-private fun setJoyconAxisInput(event: MotionEvent, axis: Int) {// Joycon support is half dead. Right joystick doesn't workval playerNumber = getPlayerNumber(event.device.controllerNumber)@@ -355,6 +362,4 @@ class InputHandler {)}}---}\ No newline at end of file+}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.ktindex 19c53c4814..595f0d2847 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt@@ -4,9 +4,7 @@package org.yuzu.yuzu_emu.utilsimport android.annotation.SuppressLint-import android.app.Activityimport android.content.Context-import android.graphics.Rectobject InsetsHelper {const val THREE_BUTTON_NAVIGATION = 0@@ -20,12 +18,8 @@ object InsetsHelper {resources.getIdentifier("config_navBarInteractionMode", "integer", "android")return if (resourceId != 0) {resources.getInteger(resourceId)- } else 0- }-- fun getBottomPaddingRequired(activity: Activity): Int {- val visibleFrame = Rect()- activity.window.decorView.getWindowVisibleDisplayFrame(visibleFrame)- return visibleFrame.bottom - visibleFrame.top - activity.resources.displayMetrics.heightPixels+ } else {+ 0+ }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.ktindex 344dd8a0ad..68ed66565a 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt@@ -13,8 +13,8 @@ import android.nfc.tech.NfcAimport android.os.Buildimport android.os.Handlerimport android.os.Looper-import org.yuzu.yuzu_emu.NativeLibraryimport java.io.IOException+import org.yuzu.yuzu_emu.NativeLibraryclass NfcReader(private val activity: Activity) {private var nfcAdapter: NfcAdapter? = null@@ -25,10 +25,13 @@ class NfcReader(private val activity: Activity) {pendingIntent = PendingIntent.getActivity(activity,- 0, Intent(activity, activity.javaClass),- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)+ 0,+ Intent(activity, activity.javaClass),+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE- else PendingIntent.FLAG_UPDATE_CURRENT+ } else {+ PendingIntent.FLAG_UPDATE_CURRENT+ })val tagDetected = IntentFilter(NfcAdapter.ACTION_TAG_DISCOVERED)@@ -45,9 +48,9 @@ class NfcReader(private val activity: Activity) {fun onNewIntent(intent: Intent) {val action = intent.action- if (NfcAdapter.ACTION_TAG_DISCOVERED != action- && NfcAdapter.ACTION_TECH_DISCOVERED != action- && NfcAdapter.ACTION_NDEF_DISCOVERED != action+ if (NfcAdapter.ACTION_TAG_DISCOVERED != action &&+ NfcAdapter.ACTION_TECH_DISCOVERED != action &&+ NfcAdapter.ACTION_NDEF_DISCOVERED != action) {return}@@ -84,7 +87,7 @@ class NfcReader(private val activity: Activity) {}private fun ntag215ReadAll(amiibo: NfcA): ByteArray? {- val bufferSize = amiibo.maxTransceiveLength;+ val bufferSize = amiibo.maxTransceiveLengthval tagSize = 0x21Cval pageSize = 4val lastPage = tagSize / pageSize - 1@@ -103,7 +106,7 @@ class NfcReader(private val activity: Activity) {val data = ntag215FastRead(amiibo, dataStart, dataEnd - 1)System.arraycopy(data, 0, tagData, i, (dataEnd - dataStart) * pageSize)} catch (e: IOException) {- return null;+ return null}}return tagDatadiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.ktindex 87ee7f2e61..00e58faec7 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt@@ -11,30 +11,34 @@ import java.io.Serializableobject SerializableHelper {inline fun <reified T : Serializable> Bundle.serializable(key: String): T? {- return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {getSerializable(key, T::class.java)- else+ } else {getSerializable(key) as? T+ }}inline fun <reified T : Serializable> Intent.serializable(key: String): T? {- return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {getSerializableExtra(key, T::class.java)- else+ } else {getSerializableExtra(key) as? T+ }}inline fun <reified T : Parcelable> Bundle.parcelable(key: String): T? {- return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {getParcelable(key, T::class.java)- else+ } else {getParcelable(key) as? T+ }}inline fun <reified T : Parcelable> Intent.parcelable(key: String): T? {- return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {getParcelableExtra(key, T::class.java)- else+ } else {getParcelableExtra(key) as? T+ }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.ktindex e55767c0fe..f312e24cf1 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt@@ -3,21 +3,19 @@package org.yuzu.yuzu_emu.utils-import android.app.Activityimport android.content.res.Configurationimport android.graphics.Colorimport androidx.annotation.ColorIntimport androidx.appcompat.app.AppCompatActivityimport androidx.appcompat.app.AppCompatDelegate-import androidx.core.content.ContextCompatimport androidx.core.view.WindowCompatimport androidx.core.view.WindowInsetsControllerCompatimport androidx.preference.PreferenceManager+import kotlin.math.roundToIntimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.ui.main.ThemeProvider-import kotlin.math.roundToIntobject ThemeHelper {const val SYSTEM_BAR_ALPHA = 0.9f@@ -36,8 +34,8 @@ object ThemeHelper {// Using a specific night mode check because this could apply incorrectly when using the// light app mode, dark system mode, and black backgrounds. Launching the settings activity// will then show light mode colors/navigation bars but with black backgrounds.- if (preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false)- && isNightMode(activity)+ if (preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false) &&+ isNightMode(activity)) {activity.setTheme(R.style.ThemeOverlay_Yuzu_Dark)}@@ -46,8 +44,10 @@ object ThemeHelper {@ColorIntfun getColorWithOpacity(@ColorInt color: Int, alphaFactor: Float): Int {return Color.argb(- (alphaFactor * Color.alpha(color)).roundToInt(), Color.red(color),- Color.green(color), Color.blue(color)+ (alphaFactor * Color.alpha(color)).roundToInt(),+ Color.red(color),+ Color.green(color),+ Color.blue(color))}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/views/FixedRatioSurfaceView.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/views/FixedRatioSurfaceView.ktindex d89a899836..685ccaa76e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/views/FixedRatioSurfaceView.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/views/FixedRatioSurfaceView.kt@@ -38,8 +38,8 @@ class FixedRatioSurfaceView @JvmOverloads constructor(newWidth = widthnewHeight = (width / aspectRatio).roundToInt()}- val left = (width - newWidth) / 2;- val top = (height - newHeight) / 2;+ val left = (width - newWidth) / 2+ val top = (height - newHeight) / 2setLeftTopRightBottom(left, top, left + newWidth, top + newHeight)} else {setLeftTopRightBottom(0, 0, width, height)