Android 188

.ci/scripts/format/script.sh

@@ -5,7 +5,8 @@
 
 shopt -s nullglob globstar
 
-if git grep -nrI '\s$' src **/*.yml **/*.txt **/*.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop dist/*.svg dist/*.xml; then
+if grep -nrI '\s$' src **/*.yml **/*.txt **/*.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop \
+                 dist/*.svg dist/*.xml; then
     echo Trailing whitespace found, aborting
     exit 1
 fi
@@ -25,13 +26,10 @@ for f in $FILES_TO_LINT; do
     "$CLANG_FORMAT" -i "$f"
 done
 
-DIFF=$(git -c core.fileMode=false diff)
+DIFF=$(git diff)
 
 if [ ! -z "$DIFF" ]; then
     echo "!!! Not compliant to coding style, here is the fix:"
     echo "$DIFF"
     exit 1
 fi
-
-cd src/android
-./gradlew ktlintCheck

.ci/yuzu-mainline-step2.yml

@@ -8,7 +8,17 @@ variables:
   DisplayVersion: $[counter(variables['DisplayPrefix'], 1)]
 
 stages:
+- stage: format
+  displayName: 'format'
+  jobs:
+  - job: format
+    displayName: 'clang'
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - template: ./templates/format-check.yml
 - stage: build
+  dependsOn: format
   displayName: 'build'
   jobs:
   - job: build
@@ -33,6 +43,7 @@ stages:
         cache: 'true'
         version: $(DisplayVersion)
 - stage: build_win
+  dependsOn: format
   displayName: 'build-windows'
   jobs:
   - job: build

.github/workflows/verify.yml

@@ -13,15 +13,13 @@ jobs:
   format:
     name: 'verify format'
     runs-on: ubuntu-latest
+    container:
+      image: yuzuemu/build-environments:linux-clang-format
+      options: -u 1001
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: false
-      - name: set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
       - name: 'Verify Formatting'
         run: bash -ex ./.ci/scripts/format/script.sh
   build:

.reuse/dep5

@@ -155,7 +155,3 @@ License: MIT
 Files: externals/gamemode/*
 Copyright: Copyright 2017-2019 Feral Interactive
 License: BSD-3-Clause
-
-Files: src/android/app/debug.keystore
-Copyright: 2023 yuzu Emulator Project
-License: GPL-3.0-or-later

README.md

@@ -1,8 +1,6 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`e3171486d`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12579](https://github.com/yuzu-emu/yuzu-android//pull/12579) | [`66ae60a9e`](https://github.com/yuzu-emu/yuzu-android//pull/12579/files) | Core: Implement Device Mapping & GPU SMMU | [FernandoS27](https://github.com/FernandoS27/) | Yes |
-| [12769](https://github.com/yuzu-emu/yuzu-android//pull/12769) | [`ad4622da2`](https://github.com/yuzu-emu/yuzu-android//pull/12769/files) | core: hid: Reduce controller requests | [german77](https://github.com/german77/) | Yes |
-| [12796](https://github.com/yuzu-emu/yuzu-android//pull/12796) | [`677c2c2cd`](https://github.com/yuzu-emu/yuzu-android//pull/12796/files) | android: Controller focus optimizations | [t895](https://github.com/t895/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

externals/CMakeLists.txt

@@ -178,9 +178,6 @@ if (NOT TARGET stb::headers)
     add_library(stb::headers ALIAS stb)
 endif()
 
-add_library(tz tz/tz/tz.cpp)
-target_include_directories(tz PUBLIC ./tz)
-
 add_library(bc_decoder bc_decoder/bc_decoder.cpp)
 target_include_directories(bc_decoder PUBLIC ./bc_decoder)
 

externals/tz/tz/tz.h

@@ -1,81 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-FileCopyrightText: 1996 Arthur David Olson
-// SPDX-License-Identifier: BSD-2-Clause
-
-#pragma once
-
-#include <cstdint>
-#include <limits>
-#include <span>
-#include <array>
-#include <time.h>
-
-namespace Tz {
-using u8 = uint8_t;
-using s8 = int8_t;
-using u16 = uint16_t;
-using s16 = int16_t;
-using u32 = uint32_t;
-using s32 = int32_t;
-using u64 = uint64_t;
-using s64 = int64_t;
-
-constexpr size_t TZ_MAX_TIMES = 1000;
-constexpr size_t TZ_MAX_TYPES = 128;
-constexpr size_t TZ_MAX_CHARS = 50;
-constexpr size_t MY_TZNAME_MAX = 255;
-constexpr size_t TZNAME_MAXIMUM = 255;
-constexpr size_t TZ_MAX_LEAPS = 50;
-constexpr s64 TIME_T_MAX = std::numeric_limits<s64>::max();
-constexpr s64 TIME_T_MIN = std::numeric_limits<s64>::min();
-constexpr size_t CHARS_EXTRA = 3;
-constexpr size_t MAX_ZONE_CHARS = std::max(TZ_MAX_CHARS + CHARS_EXTRA, sizeof("UTC"));
-constexpr size_t MAX_TZNAME_CHARS = 2 * (MY_TZNAME_MAX + 1);
-
-struct ttinfo {
-    s32 tt_utoff;
-    bool tt_isdst;
-    s32 tt_desigidx;
-    bool tt_ttisstd;
-    bool tt_ttisut;
-};
-static_assert(sizeof(ttinfo) == 0x10, "ttinfo has the wrong size!");
-
-struct Rule {
-    s32 timecnt;
-    s32 typecnt;
-    s32 charcnt;
-    bool goback;
-    bool goahead;
-    std::array <u8, 0x2> padding0;
-    std::array<s64, TZ_MAX_TIMES> ats;
-    std::array<u8, TZ_MAX_TIMES> types;
-    std::array<ttinfo, TZ_MAX_TYPES> ttis;
-    std::array<char, std::max(MAX_ZONE_CHARS, MAX_TZNAME_CHARS)> chars;
-    s32 defaulttype;
-    std::array <u8, 0x12C4> padding1;
-};
-static_assert(sizeof(Rule) == 0x4000, "Rule has the wrong size!");
-
-struct CalendarTimeInternal {
-    s32 tm_sec;
-    s32 tm_min;
-    s32 tm_hour;
-    s32 tm_mday;
-    s32 tm_mon;
-    s32 tm_year;
-    s32 tm_wday;
-    s32 tm_yday;
-    s32 tm_isdst;
-    std::array<char, 16> tm_zone;
-    s32 tm_utoff;
-    s32 time_index;
-};
-static_assert(sizeof(CalendarTimeInternal) == 0x3C, "CalendarTimeInternal has the wrong size!");
-
-s32 ParseTimeZoneBinary(Rule& out_rule, std::span<const u8> binary);
-
-bool localtime_rz(CalendarTimeInternal* tmp, Rule* sp, time_t* timep);
-u32 mktime_tzname(time_t* out_time, Rule* sp, CalendarTimeInternal* tmp);
-
-} // namespace Tz

src/android/app/build.gradle.kts

@@ -82,8 +82,8 @@ android {
     }
 
     val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
-    signingConfigs {
+    if (keystoreFile != null) {
-        if (keystoreFile != null) {
+        signingConfigs {
             create("release") {
                 storeFile = file(keystoreFile)
                 storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
@@ -91,12 +91,6 @@ android {
                 keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
             }
         }
-        create("default") {
-            storeFile = file("$projectDir/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
-        }
     }
 
     // Define build types, which are orthogonal to product flavors.
@@ -107,7 +101,7 @@ android {
             signingConfig = if (keystoreFile != null) {
                 signingConfigs.getByName("release")
             } else {
-                signingConfigs.getByName("default")
+                signingConfigs.getByName("debug")
             }
 
             resValue("string", "app_name_suffixed", "yuzu")
@@ -124,7 +118,7 @@ android {
         register("relWithDebInfo") {
             isDefault = true
             resValue("string", "app_name_suffixed", "yuzu Debug Release")
-            signingConfig = signingConfigs.getByName("default")
+            signingConfig = signingConfigs.getByName("debug")
             isMinifyEnabled = true
             isDebuggable = true
             proguardFiles(
@@ -139,7 +133,6 @@ android {
         // Signed by debug key disallowing distribution on Play Store.
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         debug {
-            signingConfig = signingConfigs.getByName("default")
             resValue("string", "app_name_suffixed", "yuzu Debug")
             isDebuggable = true
             isJniDebuggable = true
@@ -195,15 +188,8 @@ tasks.create<Delete>("ktlintReset") {
     delete(File(buildDir.path + File.separator + "intermediates/ktLint"))
 }
 
-val showFormatHelp = {
-    logger.lifecycle(
-        "If this check fails, please try running \"gradlew ktlintFormat\" for automatic " +
-            "codestyle fixes"
-    )
-}
-tasks.getByPath("ktlintKotlinScriptCheck").doFirst { showFormatHelp.invoke() }
-tasks.getByPath("ktlintMainSourceSetCheck").doFirst { showFormatHelp.invoke() }
 tasks.getByPath("loadKtlintReporters").dependsOn("ktlintReset")
+tasks.getByPath("preBuild").dependsOn("ktlintCheck")
 
 ktlint {
     version.set("0.47.1")
@@ -242,33 +228,71 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
 }
 
-fun runGitCommand(command: List<String>): String {
+fun getGitVersion(): String {
-    return try {
+    var versionName = "0.0"
-        ProcessBuilder(command)
+
+    try {
+        versionName = ProcessBuilder("git", "describe", "--always", "--long")
             .directory(project.rootDir)
             .redirectOutput(ProcessBuilder.Redirect.PIPE)
             .redirectError(ProcessBuilder.Redirect.PIPE)
             .start().inputStream.bufferedReader().use { it.readText() }
             .trim()
-    } catch (e: Exception) {
-        logger.error("Cannot find git")
-        ""
-    }
-}
-
-fun getGitVersion(): String {
-    val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {
-        val gitTag = System.getenv("GIT_TAG_NAME") ?: ""
-        gitTag
-    } else {
-        runGitCommand(listOf("git", "describe", "--always", "--long"))
             .replace(Regex("(-0)?-[^-]+$"), "")
+    } catch (e: Exception) {
+        logger.error("Cannot find git, defaulting to dummy version number")
     }
-    return versionName.ifEmpty { "0.0" }
+
+    if (System.getenv("GITHUB_ACTIONS") != null) {
+        val gitTag = System.getenv("GIT_TAG_NAME")
+        versionName = gitTag ?: versionName
+    }
+
+    return versionName
 }
 
-fun getGitHash(): String =
+fun getGitHash(): String {
-    runGitCommand(listOf("git", "rev-parse", "--short", "HEAD")).ifEmpty { "dummy-hash" }
+    try {
+        val processBuilder = ProcessBuilder("git", "rev-parse", "--short", "HEAD")
+        processBuilder.directory(project.rootDir)
+        val process = processBuilder.start()
+        val inputStream = process.inputStream
+        val errorStream = process.errorStream
+        process.waitFor()
 
-fun getBranch(): String =
+        return if (process.exitValue() == 0) {
-    runGitCommand(listOf("git", "rev-parse", "--abbrev-ref", "HEAD")).ifEmpty { "dummy-hash" }
+            inputStream.bufferedReader()
+                .use { it.readText().trim() } // return the value of gitHash
+        } else {
+            val errorMessage = errorStream.bufferedReader().use { it.readText().trim() }
+            logger.error("Error running git command: $errorMessage")
+            "dummy-hash" // return a dummy hash value in case of an error
+        }
+    } catch (e: Exception) {
+        logger.error("$e: Cannot find git, defaulting to dummy build hash")
+        return "dummy-hash" // return a dummy hash value in case of an error
+    }
+}
+
+fun getBranch(): String {
+    try {
+        val processBuilder = ProcessBuilder("git", "rev-parse", "--abbrev-ref", "HEAD")
+        processBuilder.directory(project.rootDir)
+        val process = processBuilder.start()
+        val inputStream = process.inputStream
+        val errorStream = process.errorStream
+        process.waitFor()
+
+        return if (process.exitValue() == 0) {
+            inputStream.bufferedReader()
+                .use { it.readText().trim() } // return the value of gitHash
+        } else {
+            val errorMessage = errorStream.bufferedReader().use { it.readText().trim() }
+            logger.error("Error running git command: $errorMessage")
+            "dummy-hash" // return a dummy hash value in case of an error
+        }
+    } catch (e: Exception) {
+        logger.error("$e: Cannot find git, defaulting to dummy build hash")
+        return "dummy-hash" // return a dummy hash value in case of an error
+    }
+}

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -21,9 +21,6 @@ import org.yuzu.yuzu_emu.utils.DocumentsTree
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
-import org.yuzu.yuzu_emu.model.InstallResult
-import org.yuzu.yuzu_emu.model.Patch
-import org.yuzu.yuzu_emu.model.GameVerificationResult
 
 /**
  * Class which contains methods that interact
@@ -238,12 +235,9 @@ object NativeLibrary {
     /**
      * Installs a nsp or xci file to nand
      * @param filename String representation of file uri
-     * @return int representation of [InstallResult]
+     * @param extension Lowercase string representation of file extension without "."
      */
-    external fun installFileToNand(
+    external fun installFileToNand(filename: String, extension: String): Int
-        filename: String,
-        callback: (max: Long, progress: Long) -> Boolean
-    ): Int
 
     external fun doesUpdateMatchProgram(programId: String, updatePath: String): Boolean
 
@@ -303,11 +297,6 @@ object NativeLibrary {
      */
     external fun getCpuBackend(): String
 
-    /**
-     * Returns the current GPU Driver.
-     */
-    external fun getGpuDriver(): String
-
     external fun applySettings()
 
     external fun logSettings()
@@ -546,49 +535,9 @@ object NativeLibrary {
      *
      * @param path Path to game file. Can be a [Uri].
      * @param programId String representation of a game's program ID
-     * @return Array of available patches
+     * @return Array of pairs where the first value is the name of an addon and the second is the version
      */
-    external fun getPatchesForFile(path: String, programId: String): Array<Patch>?
+    external fun getAddonsForFile(path: String, programId: String): Array<Pair<String, String>>?
-
-    /**
-     * Removes an update for a given [programId]
-     * @param programId String representation of a game's program ID
-     */
-    external fun removeUpdate(programId: String)
-
-    /**
-     * Removes all DLC for a  [programId]
-     * @param programId String representation of a game's program ID
-     */
-    external fun removeDLC(programId: String)
-
-    /**
-     * Removes a mod installed for a given [programId]
-     * @param programId String representation of a game's program ID
-     * @param name The name of a mod as given by [getPatchesForFile]. This corresponds with the name
-     * of the mod's directory in a game's load folder.
-     */
-    external fun removeMod(programId: String, name: String)
-
-    /**
-     * Verifies all installed content
-     * @param callback UI callback for verification progress. Return true in the callback to cancel.
-     * @return Array of content that failed verification. Successful if empty.
-     */
-    external fun verifyInstalledContents(
-        callback: (max: Long, progress: Long) -> Boolean
-    ): Array<String>
-
-    /**
-     * Verifies the contents of a game
-     * @param path String path to a game
-     * @param callback UI callback for verification progress. Return true in the callback to cancel.
-     * @return Int that is meant to be converted to a [GameVerificationResult]
-     */
-    external fun verifyGameContents(
-        path: String,
-        callback: (max: Long, progress: Long) -> Boolean
-    ): Int
 
     /**
      * Gets the save location for a specific game
@@ -619,11 +568,6 @@ object NativeLibrary {
      */
     external fun clearFilesystemProvider()
 
-    /**
-     * Checks if all necessary keys are present for decryption
-     */
-    external fun areKeysPresent(): Boolean
-
     /**
      * Button type for use in onTouchEvent
      */
@@ -665,4 +609,15 @@ object NativeLibrary {
         const val RELEASED = 0
         const val PRESSED = 1
     }
+
+    /**
+     * Result from installFileToNand
+     */
+    object InstallFileToNandResult {
+        const val Success = 0
+        const val SuccessFileOverwritten = 1
+        const val Error = 2
+        const val ErrorBaseGame = 3
+        const val ErrorFilenameExtension = 4
+    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@@ -49,6 +49,7 @@ import org.yuzu.yuzu_emu.utils.ForegroundService
 import org.yuzu.yuzu_emu.utils.InputHandler
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.MemoryUtil
+import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.NfcReader
 import org.yuzu.yuzu_emu.utils.ThemeHelper
 import java.text.NumberFormat
@@ -170,6 +171,11 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         stopMotionSensorListener()
     }
 
+    override fun onStop() {
+        super.onStop()
+        NativeConfig.saveGlobalConfig()
+    }
+
     override fun onUserLeaveHint() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
             if (BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && !isInPictureInPictureMode) {
@@ -193,10 +199,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             return super.dispatchKeyEvent(event)
         }
 
-        if (emulationViewModel.drawerOpen.value) {
-            return super.dispatchKeyEvent(event)
-        }
-
         return InputHandler.dispatchKeyEvent(event)
     }
 
@@ -207,10 +209,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             return super.dispatchGenericMotionEvent(event)
         }
 
-        if (emulationViewModel.drawerOpen.value) {
-            return super.dispatchGenericMotionEvent(event)
-        }
-
         // Don't attempt to do anything if we are disconnecting a device.
         if (event.actionMasked == MotionEvent.ACTION_CANCEL) {
             return true

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractDiffAdapter.kt

@@ -1,38 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.annotation.SuppressLint
-import androidx.recyclerview.widget.AsyncDifferConfig
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
-import androidx.recyclerview.widget.RecyclerView
-
-/**
- * Generic adapter that implements an [AsyncDifferConfig] and covers some of the basic boilerplate
- * code used in every [RecyclerView].
- * Type assigned to [Model] must inherit from [Object] in order to be compared properly.
- * @param exact Decides whether each item will be compared by reference or by their contents
- */
-abstract class AbstractDiffAdapter<Model : Any, Holder : AbstractViewHolder<Model>>(
-    exact: Boolean = true
-) : ListAdapter<Model, Holder>(AsyncDifferConfig.Builder(DiffCallback<Model>(exact)).build()) {
-    override fun onBindViewHolder(holder: Holder, position: Int) =
-        holder.bind(currentList[position])
-
-    private class DiffCallback<Model>(val exact: Boolean) : DiffUtil.ItemCallback<Model>() {
-        override fun areItemsTheSame(oldItem: Model & Any, newItem: Model & Any): Boolean {
-            if (exact) {
-                return oldItem === newItem
-            }
-            return oldItem == newItem
-        }
-
-        @SuppressLint("DiffUtilEquals")
-        override fun areContentsTheSame(oldItem: Model & Any, newItem: Model & Any): Boolean {
-            return oldItem == newItem
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractListAdapter.kt

@@ -1,98 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.annotation.SuppressLint
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
-
-/**
- * Generic list class meant to take care of basic lists
- * @param currentList The list to show initially
- */
-abstract class AbstractListAdapter<Model : Any, Holder : AbstractViewHolder<Model>>(
-    open var currentList: List<Model>
-) : RecyclerView.Adapter<Holder>() {
-    override fun onBindViewHolder(holder: Holder, position: Int) =
-        holder.bind(currentList[position])
-
-    override fun getItemCount(): Int = currentList.size
-
-    /**
-     * Adds an item to [currentList] and notifies the underlying adapter of the change. If no parameter
-     * is passed in for position, [item] is added to the end of the list. Invokes [callback] last.
-     * @param item The item to add to the list
-     * @param position Index where [item] will be added
-     * @param callback Lambda that's called at the end of the list changes and has the added list
-     * position passed in as a parameter
-     */
-    open fun addItem(item: Model, position: Int = -1, callback: ((position: Int) -> Unit)? = null) {
-        val newList = currentList.toMutableList()
-        val positionToUpdate: Int
-        if (position == -1) {
-            newList.add(item)
-            currentList = newList
-            positionToUpdate = currentList.size - 1
-        } else {
-            newList.add(position, item)
-            currentList = newList
-            positionToUpdate = position
-        }
-        onItemAdded(positionToUpdate, callback)
-    }
-
-    protected fun onItemAdded(position: Int, callback: ((Int) -> Unit)? = null) {
-        notifyItemInserted(position)
-        callback?.invoke(position)
-    }
-
-    /**
-     * Replaces the [item] at [position] in the [currentList] and notifies the underlying adapter
-     * of the change. Invokes [callback] last.
-     * @param item New list item
-     * @param position Index where [item] will replace the existing list item
-     * @param callback Lambda that's called at the end of the list changes and has the changed list
-     * position passed in as a parameter
-     */
-    fun changeItem(item: Model, position: Int, callback: ((position: Int) -> Unit)? = null) {
-        val newList = currentList.toMutableList()
-        newList[position] = item
-        currentList = newList
-        onItemChanged(position, callback)
-    }
-
-    protected fun onItemChanged(position: Int, callback: ((Int) -> Unit)? = null) {
-        notifyItemChanged(position)
-        callback?.invoke(position)
-    }
-
-    /**
-     * Removes the list item at [position] in [currentList] and notifies the underlying adapter
-     * of the change. Invokes [callback] last.
-     * @param position Index where the list item will be removed
-     * @param callback Lambda that's called at the end of the list changes and has the removed list
-     * position passed in as a parameter
-     */
-    fun removeItem(position: Int, callback: ((position: Int) -> Unit)? = null) {
-        val newList = currentList.toMutableList()
-        newList.removeAt(position)
-        currentList = newList
-        onItemRemoved(position, callback)
-    }
-
-    protected fun onItemRemoved(position: Int, callback: ((Int) -> Unit)? = null) {
-        notifyItemRemoved(position)
-        callback?.invoke(position)
-    }
-
-    /**
-     * Replaces [currentList] with [newList] and notifies the underlying adapter of the change.
-     * @param newList The new list to replace [currentList]
-     */
-    @SuppressLint("NotifyDataSetChanged")
-    open fun replaceList(newList: List<Model>) {
-        currentList = newList
-        notifyDataSetChanged()
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractSingleSelectionList.kt

@@ -1,105 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import org.yuzu.yuzu_emu.model.SelectableItem
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
-
-/**
- * Generic list class meant to take care of single selection UI updates
- * @param currentList The list to show initially
- * @param defaultSelection The default selection to use if no list items are selected by
- * [SelectableItem.selected] or if the currently selected item is removed from the list
- */
-abstract class AbstractSingleSelectionList<
-    Model : SelectableItem,
-    Holder : AbstractViewHolder<Model>
-    >(
-    final override var currentList: List<Model>,
-    private val defaultSelection: DefaultSelection = DefaultSelection.Start
-) : AbstractListAdapter<Model, Holder>(currentList) {
-    var selectedItem = getDefaultSelection()
-
-    init {
-        findSelectedItem()
-    }
-
-    /**
-     * Changes the selection state of the [SelectableItem] that was selected and the previously selected
-     * item and notifies the underlying adapter of the change for those items. Invokes [callback] last.
-     * Does nothing if [position] is the same as the currently selected item.
-     * @param position Index of the item that was selected
-     * @param callback Lambda that's called at the end of the list changes and has the selected list
-     * position passed in as a parameter
-     */
-    fun selectItem(position: Int, callback: ((position: Int) -> Unit)? = null) {
-        if (position == selectedItem) {
-            return
-        }
-
-        val previouslySelectedItem = selectedItem
-        selectedItem = position
-        if (currentList.indices.contains(selectedItem)) {
-            currentList[selectedItem].onSelectionStateChanged(true)
-        }
-        if (currentList.indices.contains(previouslySelectedItem)) {
-            currentList[previouslySelectedItem].onSelectionStateChanged(false)
-        }
-        onItemChanged(previouslySelectedItem)
-        onItemChanged(selectedItem)
-        callback?.invoke(position)
-    }
-
-    /**
-     * Removes a given item from the list and notifies the underlying adapter of the change. If the
-     * currently selected item was the item that was removed, the item at the position provided
-     * by [defaultSelection] will be made the new selection. Invokes [callback] last.
-     * @param position Index of the item that was removed
-     * @param callback Lambda that's called at the end of the list changes and has the removed and
-     * selected list positions passed in as parameters
-     */
-    fun removeSelectableItem(
-        position: Int,
-        callback: ((removedPosition: Int, selectedPosition: Int) -> Unit)?
-    ) {
-        removeItem(position)
-        if (position == selectedItem) {
-            selectedItem = getDefaultSelection()
-            currentList[selectedItem].onSelectionStateChanged(true)
-            onItemChanged(selectedItem)
-        } else if (position < selectedItem) {
-            selectedItem--
-        }
-        callback?.invoke(position, selectedItem)
-    }
-
-    override fun addItem(item: Model, position: Int, callback: ((Int) -> Unit)?) {
-        super.addItem(item, position, callback)
-        if (position <= selectedItem && position != -1) {
-            selectedItem++
-        }
-    }
-
-    override fun replaceList(newList: List<Model>) {
-        super.replaceList(newList)
-        findSelectedItem()
-    }
-
-    private fun findSelectedItem() {
-        for (i in currentList.indices) {
-            if (currentList[i].selected) {
-                selectedItem = i
-                break
-            }
-        }
-    }
-
-    private fun getDefaultSelection(): Int =
-        when (defaultSelection) {
-            DefaultSelection.Start -> currentList.indices.first
-            DefaultSelection.End -> currentList.indices.last
-        }
-
-    enum class DefaultSelection { Start, End }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt

@@ -5,33 +5,48 @@ package org.yuzu.yuzu_emu.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import org.yuzu.yuzu_emu.databinding.ListItemAddonBinding
-import org.yuzu.yuzu_emu.model.Patch
+import org.yuzu.yuzu_emu.model.Addon
-import org.yuzu.yuzu_emu.model.AddonViewModel
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
-class AddonAdapter(val addonViewModel: AddonViewModel) :
+class AddonAdapter : ListAdapter<Addon, AddonAdapter.AddonViewHolder>(
-    AbstractDiffAdapter<Patch, AddonAdapter.AddonViewHolder>() {
+    AsyncDifferConfig.Builder(DiffCallback()).build()
+) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AddonViewHolder {
         ListItemAddonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
             .also { return AddonViewHolder(it) }
     }
 
+    override fun getItemCount(): Int = currentList.size
+
+    override fun onBindViewHolder(holder: AddonViewHolder, position: Int) =
+        holder.bind(currentList[position])
+
     inner class AddonViewHolder(val binding: ListItemAddonBinding) :
-        AbstractViewHolder<Patch>(binding) {
+        RecyclerView.ViewHolder(binding.root) {
-        override fun bind(model: Patch) {
+        fun bind(addon: Addon) {
             binding.root.setOnClickListener {
-                binding.addonCheckbox.isChecked = !binding.addonCheckbox.isChecked
+                binding.addonSwitch.isChecked = !binding.addonSwitch.isChecked
             }
-            binding.title.text = model.name
+            binding.title.text = addon.title
-            binding.version.text = model.version
+            binding.version.text = addon.version
-            binding.addonCheckbox.setOnCheckedChangeListener { _, checked ->
+            binding.addonSwitch.setOnCheckedChangeListener { _, checked ->
-                model.enabled = checked
+                addon.enabled = checked
-            }
-            binding.addonCheckbox.isChecked = model.enabled
-            binding.buttonDelete.setOnClickListener {
-                addonViewModel.setAddonToDelete(model)
             }
+            binding.addonSwitch.isChecked = addon.enabled
+        }
+    }
+
+    private class DiffCallback : DiffUtil.ItemCallback<Addon>() {
+        override fun areItemsTheSame(oldItem: Addon, newItem: Addon): Boolean {
+            return oldItem == newItem
+        }
+
+        override fun areContentsTheSame(oldItem: Addon, newItem: Addon): Boolean {
+            return oldItem == newItem
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AppletAdapter.kt

@@ -4,11 +4,13 @@
 package org.yuzu.yuzu_emu.adapters
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
+import androidx.recyclerview.widget.RecyclerView
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
@@ -17,58 +19,72 @@ import org.yuzu.yuzu_emu.databinding.CardSimpleOutlinedBinding
 import org.yuzu.yuzu_emu.model.Applet
 import org.yuzu.yuzu_emu.model.AppletInfo
 import org.yuzu.yuzu_emu.model.Game
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
-class AppletAdapter(val activity: FragmentActivity, applets: List<Applet>) :
+class AppletAdapter(val activity: FragmentActivity, var applets: List<Applet>) :
-    AbstractListAdapter<Applet, AppletAdapter.AppletViewHolder>(applets) {
+    RecyclerView.Adapter<AppletAdapter.AppletViewHolder>(),
+    View.OnClickListener {
+
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
     ): AppletAdapter.AppletViewHolder {
         CardSimpleOutlinedBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+            .apply { root.setOnClickListener(this@AppletAdapter) }
             .also { return AppletViewHolder(it) }
     }
 
+    override fun onBindViewHolder(holder: AppletViewHolder, position: Int) =
+        holder.bind(applets[position])
+
+    override fun getItemCount(): Int = applets.size
+
+    override fun onClick(view: View) {
+        val applet = (view.tag as AppletViewHolder).applet
+        val appletPath = NativeLibrary.getAppletLaunchPath(applet.appletInfo.entryId)
+        if (appletPath.isEmpty()) {
+            Toast.makeText(
+                YuzuApplication.appContext,
+                R.string.applets_error_applet,
+                Toast.LENGTH_SHORT
+            ).show()
+            return
+        }
+
+        if (applet.appletInfo == AppletInfo.Cabinet) {
+            view.findNavController()
+                .navigate(R.id.action_appletLauncherFragment_to_cabinetLauncherDialogFragment)
+            return
+        }
+
+        NativeLibrary.setCurrentAppletId(applet.appletInfo.appletId)
+        val appletGame = Game(
+            title = YuzuApplication.appContext.getString(applet.titleId),
+            path = appletPath
+        )
+        val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
+        view.findNavController().navigate(action)
+    }
+
     inner class AppletViewHolder(val binding: CardSimpleOutlinedBinding) :
-        AbstractViewHolder<Applet>(binding) {
+        RecyclerView.ViewHolder(binding.root) {
-        override fun bind(model: Applet) {
+        lateinit var applet: Applet
-            binding.title.setText(model.titleId)
+
-            binding.description.setText(model.descriptionId)
+        init {
+            itemView.tag = this
+        }
+
+        fun bind(applet: Applet) {
+            this.applet = applet
+
+            binding.title.setText(applet.titleId)
+            binding.description.setText(applet.descriptionId)
             binding.icon.setImageDrawable(
                 ResourcesCompat.getDrawable(
                     binding.icon.context.resources,
-                    model.iconId,
+                    applet.iconId,
                     binding.icon.context.theme
                 )
             )
-
-            binding.root.setOnClickListener { onClick(model) }
-        }
-
-        fun onClick(applet: Applet) {
-            val appletPath = NativeLibrary.getAppletLaunchPath(applet.appletInfo.entryId)
-            if (appletPath.isEmpty()) {
-                Toast.makeText(
-                    binding.root.context,
-                    R.string.applets_error_applet,
-                    Toast.LENGTH_SHORT
-                ).show()
-                return
-            }
-
-            if (applet.appletInfo == AppletInfo.Cabinet) {
-                binding.root.findNavController()
-                    .navigate(R.id.action_appletLauncherFragment_to_cabinetLauncherDialogFragment)
-                return
-            }
-
-            NativeLibrary.setCurrentAppletId(applet.appletInfo.appletId)
-            val appletGame = Game(
-                title = YuzuApplication.appContext.getString(applet.titleId),
-                path = appletPath
-            )
-            val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
-            binding.root.findNavController().navigate(action)
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/CabinetLauncherDialogAdapter.kt

@@ -4,10 +4,12 @@
 package org.yuzu.yuzu_emu.adapters
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
@@ -17,43 +19,54 @@ import org.yuzu.yuzu_emu.model.CabinetMode
 import org.yuzu.yuzu_emu.adapters.CabinetLauncherDialogAdapter.CabinetModeViewHolder
 import org.yuzu.yuzu_emu.model.AppletInfo
 import org.yuzu.yuzu_emu.model.Game
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
 class CabinetLauncherDialogAdapter(val fragment: Fragment) :
-    AbstractListAdapter<CabinetMode, CabinetModeViewHolder>(
+    RecyclerView.Adapter<CabinetModeViewHolder>(),
-        CabinetMode.values().copyOfRange(1, CabinetMode.entries.size).toList()
+    View.OnClickListener {
-    ) {
+    private val cabinetModes = CabinetMode.values().copyOfRange(1, CabinetMode.values().size)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CabinetModeViewHolder {
         DialogListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+            .apply { root.setOnClickListener(this@CabinetLauncherDialogAdapter) }
             .also { return CabinetModeViewHolder(it) }
     }
 
+    override fun getItemCount(): Int = cabinetModes.size
+
+    override fun onBindViewHolder(holder: CabinetModeViewHolder, position: Int) =
+        holder.bind(cabinetModes[position])
+
+    override fun onClick(view: View) {
+        val mode = (view.tag as CabinetModeViewHolder).cabinetMode
+        val appletPath = NativeLibrary.getAppletLaunchPath(AppletInfo.Cabinet.entryId)
+        NativeLibrary.setCurrentAppletId(AppletInfo.Cabinet.appletId)
+        NativeLibrary.setCabinetMode(mode.id)
+        val appletGame = Game(
+            title = YuzuApplication.appContext.getString(R.string.cabinet_applet),
+            path = appletPath
+        )
+        val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
+        fragment.findNavController().navigate(action)
+    }
+
     inner class CabinetModeViewHolder(val binding: DialogListItemBinding) :
-        AbstractViewHolder<CabinetMode>(binding) {
+        RecyclerView.ViewHolder(binding.root) {
-        override fun bind(model: CabinetMode) {
+        lateinit var cabinetMode: CabinetMode
+
+        init {
+            itemView.tag = this
+        }
+
+        fun bind(cabinetMode: CabinetMode) {
+            this.cabinetMode = cabinetMode
             binding.icon.setImageDrawable(
                 ResourcesCompat.getDrawable(
                     binding.icon.context.resources,
-                    model.iconId,
+                    cabinetMode.iconId,
                     binding.icon.context.theme
                 )
             )
-            binding.title.setText(model.titleId)
+            binding.title.setText(cabinetMode.titleId)
-
-            binding.root.setOnClickListener { onClick(model) }
-        }
-
-        private fun onClick(mode: CabinetMode) {
-            val appletPath = NativeLibrary.getAppletLaunchPath(AppletInfo.Cabinet.entryId)
-            NativeLibrary.setCurrentAppletId(AppletInfo.Cabinet.appletId)
-            NativeLibrary.setCabinetMode(mode.id)
-            val appletGame = Game(
-                title = YuzuApplication.appContext.getString(R.string.cabinet_applet),
-                path = appletPath
-            )
-            val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
-            fragment.findNavController().navigate(action)
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/DriverAdapter.kt

@@ -7,39 +7,65 @@ import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.CardDriverOptionBinding
-import org.yuzu.yuzu_emu.features.settings.model.StringSetting
-import org.yuzu.yuzu_emu.model.Driver
 import org.yuzu.yuzu_emu.model.DriverViewModel
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
+import org.yuzu.yuzu_emu.utils.GpuDriverHelper
+import org.yuzu.yuzu_emu.utils.GpuDriverMetadata
 
 class DriverAdapter(private val driverViewModel: DriverViewModel) :
-    AbstractSingleSelectionList<Driver, DriverAdapter.DriverViewHolder>(
+    ListAdapter<Pair<String, GpuDriverMetadata>, DriverAdapter.DriverViewHolder>(
-        driverViewModel.driverList.value
+        AsyncDifferConfig.Builder(DiffCallback()).build()
     ) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DriverViewHolder {
-        CardDriverOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        val binding =
-            .also { return DriverViewHolder(it) }
+            CardDriverOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return DriverViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = currentList.size
+
+    override fun onBindViewHolder(holder: DriverViewHolder, position: Int) =
+        holder.bind(currentList[position])
+
+    private fun onSelectDriver(position: Int) {
+        driverViewModel.setSelectedDriverIndex(position)
+        notifyItemChanged(driverViewModel.previouslySelectedDriver)
+        notifyItemChanged(driverViewModel.selectedDriver)
+    }
+
+    private fun onDeleteDriver(driverData: Pair<String, GpuDriverMetadata>, position: Int) {
+        if (driverViewModel.selectedDriver > position) {
+            driverViewModel.setSelectedDriverIndex(driverViewModel.selectedDriver - 1)
+        }
+        if (GpuDriverHelper.customDriverSettingData == driverData.second) {
+            driverViewModel.setSelectedDriverIndex(0)
+        }
+        driverViewModel.driversToDelete.add(driverData.first)
+        driverViewModel.removeDriver(driverData)
+        notifyItemRemoved(position)
+        notifyItemChanged(driverViewModel.selectedDriver)
     }
 
     inner class DriverViewHolder(val binding: CardDriverOptionBinding) :
-        AbstractViewHolder<Driver>(binding) {
+        RecyclerView.ViewHolder(binding.root) {
-        override fun bind(model: Driver) {
+        private lateinit var driverData: Pair<String, GpuDriverMetadata>
+
+        fun bind(driverData: Pair<String, GpuDriverMetadata>) {
+            this.driverData = driverData
+            val driver = driverData.second
+
             binding.apply {
-                radioButton.isChecked = model.selected
+                radioButton.isChecked = driverViewModel.selectedDriver == bindingAdapterPosition
                 root.setOnClickListener {
-                    selectItem(bindingAdapterPosition) {
+                    onSelectDriver(bindingAdapterPosition)
-                        driverViewModel.onDriverSelected(it)
-                        driverViewModel.showClearButton(!StringSetting.DRIVER_PATH.global)
-                    }
                 }
                 buttonDelete.setOnClickListener {
-                    removeSelectableItem(
+                    onDeleteDriver(driverData, bindingAdapterPosition)
-                        bindingAdapterPosition
-                    ) { removedPosition: Int, selectedPosition: Int ->
-                        driverViewModel.onDriverRemoved(removedPosition, selectedPosition)
-                        driverViewModel.showClearButton(!StringSetting.DRIVER_PATH.global)
-                    }
                 }
 
                 // Delay marquee by 3s
@@ -54,19 +80,38 @@ class DriverAdapter(private val driverViewModel: DriverViewModel) :
                     },
                     3000
                 )
-                title.text = model.title
+                if (driver.name == null) {
-                version.text = model.version
+                    title.setText(R.string.system_gpu_driver)
-                description.text = model.description
+                    description.text = ""
-                if (model.description.isNotEmpty()) {
+                    version.text = ""
-                    version.visibility = View.VISIBLE
-                    description.visibility = View.VISIBLE
-                    buttonDelete.visibility = View.VISIBLE
-                } else {
                     version.visibility = View.GONE
                     description.visibility = View.GONE
                     buttonDelete.visibility = View.GONE
+                } else {
+                    title.text = driver.name
+                    version.text = driver.version
+                    description.text = driver.description
+                    version.visibility = View.VISIBLE
+                    description.visibility = View.VISIBLE
+                    buttonDelete.visibility = View.VISIBLE
                 }
             }
         }
     }
+
+    private class DiffCallback : DiffUtil.ItemCallback<Pair<String, GpuDriverMetadata>>() {
+        override fun areItemsTheSame(
+            oldItem: Pair<String, GpuDriverMetadata>,
+            newItem: Pair<String, GpuDriverMetadata>
+        ): Boolean {
+            return oldItem.first == newItem.first
+        }
+
+        override fun areContentsTheSame(
+            oldItem: Pair<String, GpuDriverMetadata>,
+            newItem: Pair<String, GpuDriverMetadata>
+        ): Boolean {
+            return oldItem.second == newItem.second
+        }
+    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/FolderAdapter.kt

@@ -8,14 +8,19 @@ import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import org.yuzu.yuzu_emu.databinding.CardFolderBinding
 import org.yuzu.yuzu_emu.fragments.GameFolderPropertiesDialogFragment
 import org.yuzu.yuzu_emu.model.GameDir
 import org.yuzu.yuzu_emu.model.GamesViewModel
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
 class FolderAdapter(val activity: FragmentActivity, val gamesViewModel: GamesViewModel) :
-    AbstractDiffAdapter<GameDir, FolderAdapter.FolderViewHolder>() {
+    ListAdapter<GameDir, FolderAdapter.FolderViewHolder>(
+        AsyncDifferConfig.Builder(DiffCallback()).build()
+    ) {
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
@@ -24,11 +29,18 @@ class FolderAdapter(val activity: FragmentActivity, val gamesViewModel: GamesVie
             .also { return FolderViewHolder(it) }
     }
 
+    override fun onBindViewHolder(holder: FolderAdapter.FolderViewHolder, position: Int) =
+        holder.bind(currentList[position])
+
     inner class FolderViewHolder(val binding: CardFolderBinding) :
-        AbstractViewHolder<GameDir>(binding) {
+        RecyclerView.ViewHolder(binding.root) {
-        override fun bind(model: GameDir) {
+        private lateinit var gameDir: GameDir
+
+        fun bind(gameDir: GameDir) {
+            this.gameDir = gameDir
+
             binding.apply {
-                path.text = Uri.parse(model.uriString).path
+                path.text = Uri.parse(gameDir.uriString).path
                 path.postDelayed(
                     {
                         path.isSelected = true
@@ -38,7 +50,7 @@ class FolderAdapter(val activity: FragmentActivity, val gamesViewModel: GamesVie
                 )
 
                 buttonEdit.setOnClickListener {
-                    GameFolderPropertiesDialogFragment.newInstance(model)
+                    GameFolderPropertiesDialogFragment.newInstance(this@FolderViewHolder.gameDir)
                         .show(
                             activity.supportFragmentManager,
                             GameFolderPropertiesDialogFragment.TAG
@@ -46,9 +58,19 @@ class FolderAdapter(val activity: FragmentActivity, val gamesViewModel: GamesVie
                 }
 
                 buttonDelete.setOnClickListener {
-                    gamesViewModel.removeFolder(model)
+                    gamesViewModel.removeFolder(this@FolderViewHolder.gameDir)
                 }
             }
         }
     }
+
+    private class DiffCallback : DiffUtil.ItemCallback<GameDir>() {
+        override fun areItemsTheSame(oldItem: GameDir, newItem: GameDir): Boolean {
+            return oldItem == newItem
+        }
+
+        override fun areContentsTheSame(oldItem: GameDir, newItem: GameDir): Boolean {
+            return oldItem == newItem
+        }
+    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt

@@ -3,46 +3,155 @@
 
 package org.yuzu.yuzu_emu.adapters
 
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.LayerDrawable
 import android.net.Uri
 import android.text.TextUtils
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.core.graphics.drawable.toBitmap
+import androidx.core.graphics.drawable.toDrawable
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.activities.EmulationActivity
+import org.yuzu.yuzu_emu.adapters.GameAdapter.GameViewHolder
 import org.yuzu.yuzu_emu.databinding.CardGameBinding
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.utils.GameIconUtils
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
 class GameAdapter(private val activity: AppCompatActivity) :
-    AbstractDiffAdapter<Game, GameAdapter.GameViewHolder>(exact = false) {
+    ListAdapter<Game, GameViewHolder>(AsyncDifferConfig.Builder(DiffCallback()).build()),
+    View.OnClickListener,
+    View.OnLongClickListener {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameViewHolder {
-        CardGameBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        // Create a new view.
-            .also { return GameViewHolder(it) }
+        val binding = CardGameBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        binding.cardGame.setOnClickListener(this)
+        binding.cardGame.setOnLongClickListener(this)
+
+        // Use that view to create a ViewHolder.
+        return GameViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: GameViewHolder, position: Int) =
+        holder.bind(currentList[position])
+
+    override fun getItemCount(): Int = currentList.size
+
+    /**
+     * Launches the game that was clicked on.
+     *
+     * @param view The card representing the game the user wants to play.
+     */
+    override fun onClick(view: View) {
+        val holder = view.tag as GameViewHolder
+
+        val gameExists = DocumentFile.fromSingleUri(
+            YuzuApplication.appContext,
+            Uri.parse(holder.game.path)
+        )?.exists() == true
+        if (!gameExists) {
+            Toast.makeText(
+                YuzuApplication.appContext,
+                R.string.loader_error_file_not_found,
+                Toast.LENGTH_LONG
+            ).show()
+
+            ViewModelProvider(activity)[GamesViewModel::class.java].reloadGames(true)
+            return
+        }
+
+        val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
+        preferences.edit()
+            .putLong(
+                holder.game.keyLastPlayedTime,
+                System.currentTimeMillis()
+            )
+            .apply()
+
+        val openIntent = Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply {
+            action = Intent.ACTION_VIEW
+            data = Uri.parse(holder.game.path)
+        }
+
+        activity.lifecycleScope.launch {
+            withContext(Dispatchers.IO) {
+                val layerDrawable = ResourcesCompat.getDrawable(
+                    YuzuApplication.appContext.resources,
+                    R.drawable.shortcut,
+                    null
+                ) as LayerDrawable
+                layerDrawable.setDrawableByLayerId(
+                    R.id.shortcut_foreground,
+                    GameIconUtils.getGameIcon(activity, holder.game)
+                        .toDrawable(YuzuApplication.appContext.resources)
+                )
+                val inset = YuzuApplication.appContext.resources
+                    .getDimensionPixelSize(R.dimen.icon_inset)
+                layerDrawable.setLayerInset(1, inset, inset, inset, inset)
+                val shortcut =
+                    ShortcutInfoCompat.Builder(YuzuApplication.appContext, holder.game.path)
+                        .setShortLabel(holder.game.title)
+                        .setIcon(
+                            IconCompat.createWithAdaptiveBitmap(
+                                layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
+                            )
+                        )
+                        .setIntent(openIntent)
+                        .build()
+                ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut)
+            }
+        }
+
+        val action = HomeNavigationDirections.actionGlobalEmulationActivity(holder.game, true)
+        view.findNavController().navigate(action)
+    }
+
+    override fun onLongClick(view: View): Boolean {
+        val holder = view.tag as GameViewHolder
+        val action = HomeNavigationDirections.actionGlobalPerGamePropertiesFragment(holder.game)
+        view.findNavController().navigate(action)
+        return true
     }
 
     inner class GameViewHolder(val binding: CardGameBinding) :
-        AbstractViewHolder<Game>(binding) {
+        RecyclerView.ViewHolder(binding.root) {
-        override fun bind(model: Game) {
+        lateinit var game: Game
-            binding.imageGameScreen.scaleType = ImageView.ScaleType.CENTER_CROP
-            GameIconUtils.loadGameIcon(model, binding.imageGameScreen)
 
-            binding.textGameTitle.text = model.title.replace("[\\t\\n\\r]+".toRegex(), " ")
+        init {
+            binding.cardGame.tag = this
+        }
+
+        fun bind(game: Game) {
+            this.game = game
+
+            binding.imageGameScreen.scaleType = ImageView.ScaleType.CENTER_CROP
+            GameIconUtils.loadGameIcon(game, binding.imageGameScreen)
+
+            binding.textGameTitle.text = game.title.replace("[\\t\\n\\r]+".toRegex(), " ")
 
             binding.textGameTitle.postDelayed(
                 {
@@ -51,56 +160,16 @@ class GameAdapter(private val activity: AppCompatActivity) :
                 },
                 3000
             )
+        }
+    }
 
-            binding.cardGame.setOnClickListener { onClick(model) }
+    private class DiffCallback : DiffUtil.ItemCallback<Game>() {
-            binding.cardGame.setOnLongClickListener { onLongClick(model) }
+        override fun areItemsTheSame(oldItem: Game, newItem: Game): Boolean {
+            return oldItem == newItem
         }
 
-        fun onClick(game: Game) {
+        override fun areContentsTheSame(oldItem: Game, newItem: Game): Boolean {
-            val gameExists = DocumentFile.fromSingleUri(
+            return oldItem == newItem
-                YuzuApplication.appContext,
-                Uri.parse(game.path)
-            )?.exists() == true
-            if (!gameExists) {
-                Toast.makeText(
-                    YuzuApplication.appContext,
-                    R.string.loader_error_file_not_found,
-                    Toast.LENGTH_LONG
-                ).show()
-
-                ViewModelProvider(activity)[GamesViewModel::class.java].reloadGames(true)
-                return
-            }
-
-            val preferences =
-                PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
-            preferences.edit()
-                .putLong(
-                    game.keyLastPlayedTime,
-                    System.currentTimeMillis()
-                )
-                .apply()
-
-            activity.lifecycleScope.launch {
-                withContext(Dispatchers.IO) {
-                    val shortcut =
-                        ShortcutInfoCompat.Builder(YuzuApplication.appContext, game.path)
-                            .setShortLabel(game.title)
-                            .setIcon(GameIconUtils.getShortcutIcon(activity, game))
-                            .setIntent(game.launchIntent)
-                            .build()
-                    ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut)
-                }
-            }
-
-            val action = HomeNavigationDirections.actionGlobalEmulationActivity(game, true)
-            binding.root.findNavController().navigate(action)
-        }
-
-        fun onLongClick(game: Game): Boolean {
-            val action = HomeNavigationDirections.actionGlobalPerGamePropertiesFragment(game)
-            binding.root.findNavController().navigate(action)
-            return true
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GamePropertiesAdapter.kt

@@ -12,22 +12,23 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.databinding.CardInstallableIconBinding
 import org.yuzu.yuzu_emu.databinding.CardSimpleOutlinedBinding
 import org.yuzu.yuzu_emu.model.GameProperty
 import org.yuzu.yuzu_emu.model.InstallableProperty
 import org.yuzu.yuzu_emu.model.SubmenuProperty
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
 class GamePropertiesAdapter(
     private val viewLifecycle: LifecycleOwner,
     private var properties: List<GameProperty>
-) : AbstractListAdapter<GameProperty, AbstractViewHolder<GameProperty>>(properties) {
+) :
+    RecyclerView.Adapter<GamePropertiesAdapter.GamePropertyViewHolder>() {
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
-    ): AbstractViewHolder<GameProperty> {
+    ): GamePropertyViewHolder {
         val inflater = LayoutInflater.from(parent.context)
         return when (viewType) {
             PropertyType.Submenu.ordinal -> {
@@ -50,6 +51,11 @@ class GamePropertiesAdapter(
         }
     }
 
+    override fun getItemCount(): Int = properties.size
+
+    override fun onBindViewHolder(holder: GamePropertyViewHolder, position: Int) =
+        holder.bind(properties[position])
+
     override fun getItemViewType(position: Int): Int {
         return when (properties[position]) {
             is SubmenuProperty -> PropertyType.Submenu.ordinal
@@ -57,10 +63,14 @@ class GamePropertiesAdapter(
         }
     }
 
+    sealed class GamePropertyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        abstract fun bind(property: GameProperty)
+    }
+
     inner class SubmenuPropertyViewHolder(val binding: CardSimpleOutlinedBinding) :
-        AbstractViewHolder<GameProperty>(binding) {
+        GamePropertyViewHolder(binding.root) {
-        override fun bind(model: GameProperty) {
+        override fun bind(property: GameProperty) {
-            val submenuProperty = model as SubmenuProperty
+            val submenuProperty = property as SubmenuProperty
 
             binding.root.setOnClickListener {
                 submenuProperty.action.invoke()
@@ -98,9 +108,9 @@ class GamePropertiesAdapter(
     }
 
     inner class InstallablePropertyViewHolder(val binding: CardInstallableIconBinding) :
-        AbstractViewHolder<GameProperty>(binding) {
+        GamePropertyViewHolder(binding.root) {
-        override fun bind(model: GameProperty) {
+        override fun bind(property: GameProperty) {
-            val installableProperty = model as InstallableProperty
+            val installableProperty = property as InstallableProperty
 
             binding.title.setText(installableProperty.titleId)
             binding.description.setText(installableProperty.descriptionId)

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt

@@ -14,37 +14,69 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.CardHomeOptionBinding
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
 import org.yuzu.yuzu_emu.model.HomeSetting
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
 class HomeSettingAdapter(
     private val activity: AppCompatActivity,
     private val viewLifecycle: LifecycleOwner,
-    options: List<HomeSetting>
+    var options: List<HomeSetting>
-) : AbstractListAdapter<HomeSetting, HomeSettingAdapter.HomeOptionViewHolder>(options) {
+) :
+    RecyclerView.Adapter<HomeSettingAdapter.HomeOptionViewHolder>(),
+    View.OnClickListener {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HomeOptionViewHolder {
-        CardHomeOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        val binding =
-            .also { return HomeOptionViewHolder(it) }
+            CardHomeOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        binding.root.setOnClickListener(this)
+        return HomeOptionViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int {
+        return options.size
+    }
+
+    override fun onBindViewHolder(holder: HomeOptionViewHolder, position: Int) {
+        holder.bind(options[position])
+    }
+
+    override fun onClick(view: View) {
+        val holder = view.tag as HomeOptionViewHolder
+        if (holder.option.isEnabled.invoke()) {
+            holder.option.onClick.invoke()
+        } else {
+            MessageDialogFragment.newInstance(
+                activity,
+                titleId = holder.option.disabledTitleId,
+                descriptionId = holder.option.disabledMessageId
+            ).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
+        }
     }
 
     inner class HomeOptionViewHolder(val binding: CardHomeOptionBinding) :
-        AbstractViewHolder<HomeSetting>(binding) {
+        RecyclerView.ViewHolder(binding.root) {
-        override fun bind(model: HomeSetting) {
+        lateinit var option: HomeSetting
-            binding.optionTitle.text = activity.resources.getString(model.titleId)
+
-            binding.optionDescription.text = activity.resources.getString(model.descriptionId)
+        init {
+            itemView.tag = this
+        }
+
+        fun bind(option: HomeSetting) {
+            this.option = option
+            binding.optionTitle.text = activity.resources.getString(option.titleId)
+            binding.optionDescription.text = activity.resources.getString(option.descriptionId)
             binding.optionIcon.setImageDrawable(
                 ResourcesCompat.getDrawable(
                     activity.resources,
-                    model.iconId,
+                    option.iconId,
                     activity.theme
                 )
             )
 
-            when (model.titleId) {
+            when (option.titleId) {
                 R.string.get_early_access ->
                     binding.optionLayout.background =
                         ContextCompat.getDrawable(
@@ -53,7 +85,7 @@ class HomeSettingAdapter(
                         )
             }
 
-            if (!model.isEnabled.invoke()) {
+            if (!option.isEnabled.invoke()) {
                 binding.optionTitle.alpha = 0.5f
                 binding.optionDescription.alpha = 0.5f
                 binding.optionIcon.alpha = 0.5f
@@ -61,7 +93,7 @@ class HomeSettingAdapter(
 
             viewLifecycle.lifecycleScope.launch {
                 viewLifecycle.repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    model.details.collect { updateOptionDetails(it) }
+                    option.details.collect { updateOptionDetails(it) }
                 }
             }
             binding.optionDetail.postDelayed(
@@ -71,20 +103,6 @@ class HomeSettingAdapter(
                 },
                 3000
             )
-
-            binding.root.setOnClickListener { onClick(model) }
-        }
-
-        private fun onClick(model: HomeSetting) {
-            if (model.isEnabled.invoke()) {
-                model.onClick.invoke()
-            } else {
-                MessageDialogFragment.newInstance(
-                    activity,
-                    titleId = model.disabledTitleId,
-                    descriptionId = model.disabledMessageId
-                ).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
-            }
         }
 
         private fun updateOptionDetails(detailString: String) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/InstallableAdapter.kt

@@ -6,33 +6,43 @@ package org.yuzu.yuzu_emu.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import org.yuzu.yuzu_emu.databinding.CardInstallableBinding
 import org.yuzu.yuzu_emu.model.Installable
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
-class InstallableAdapter(installables: List<Installable>) :
+class InstallableAdapter(private val installables: List<Installable>) :
-    AbstractListAdapter<Installable, InstallableAdapter.InstallableViewHolder>(installables) {
+    RecyclerView.Adapter<InstallableAdapter.InstallableViewHolder>() {
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
     ): InstallableAdapter.InstallableViewHolder {
-        CardInstallableBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        val binding =
-            .also { return InstallableViewHolder(it) }
+            CardInstallableBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return InstallableViewHolder(binding)
     }
 
-    inner class InstallableViewHolder(val binding: CardInstallableBinding) :
+    override fun getItemCount(): Int = installables.size
-        AbstractViewHolder<Installable>(binding) {
-        override fun bind(model: Installable) {
-            binding.title.setText(model.titleId)
-            binding.description.setText(model.descriptionId)
 
-            if (model.install != null) {
+    override fun onBindViewHolder(holder: InstallableAdapter.InstallableViewHolder, position: Int) =
+        holder.bind(installables[position])
+
+    inner class InstallableViewHolder(val binding: CardInstallableBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        lateinit var installable: Installable
+
+        fun bind(installable: Installable) {
+            this.installable = installable
+
+            binding.title.setText(installable.titleId)
+            binding.description.setText(installable.descriptionId)
+
+            if (installable.install != null) {
                 binding.buttonInstall.visibility = View.VISIBLE
-                binding.buttonInstall.setOnClickListener { model.install.invoke() }
+                binding.buttonInstall.setOnClickListener { installable.install.invoke() }
             }
-            if (model.export != null) {
+            if (installable.export != null) {
                 binding.buttonExport.visibility = View.VISIBLE
-                binding.buttonExport.setOnClickListener { model.export.invoke() }
+                binding.buttonExport.setOnClickListener { installable.export.invoke() }
             }
         }
     }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/LicenseAdapter.kt

@@ -7,33 +7,49 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
 import org.yuzu.yuzu_emu.fragments.LicenseBottomSheetDialogFragment
 import org.yuzu.yuzu_emu.model.License
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
-class LicenseAdapter(private val activity: AppCompatActivity, licenses: List<License>) :
+class LicenseAdapter(private val activity: AppCompatActivity, var licenses: List<License>) :
-    AbstractListAdapter<License, LicenseAdapter.LicenseViewHolder>(licenses) {
+    RecyclerView.Adapter<LicenseAdapter.LicenseViewHolder>(),
+    View.OnClickListener {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LicenseViewHolder {
-        ListItemSettingBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        val binding =
-            .also { return LicenseViewHolder(it) }
+            ListItemSettingBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        binding.root.setOnClickListener(this)
+        return LicenseViewHolder(binding)
     }
 
-    inner class LicenseViewHolder(val binding: ListItemSettingBinding) :
+    override fun getItemCount(): Int = licenses.size
-        AbstractViewHolder<License>(binding) {
-        override fun bind(model: License) {
-            binding.apply {
-                textSettingName.text = root.context.getString(model.titleId)
-                textSettingDescription.text = root.context.getString(model.descriptionId)
-                textSettingValue.visibility = View.GONE
 
-                root.setOnClickListener { onClick(model) }
+    override fun onBindViewHolder(holder: LicenseViewHolder, position: Int) {
-            }
+        holder.bind(licenses[position])
+    }
+
+    override fun onClick(view: View) {
+        val license = (view.tag as LicenseViewHolder).license
+        LicenseBottomSheetDialogFragment.newInstance(license)
+            .show(activity.supportFragmentManager, LicenseBottomSheetDialogFragment.TAG)
+    }
+
+    inner class LicenseViewHolder(val binding: ListItemSettingBinding) : ViewHolder(binding.root) {
+        lateinit var license: License
+
+        init {
+            itemView.tag = this
         }
 
-        private fun onClick(license: License) {
+        fun bind(license: License) {
-            LicenseBottomSheetDialogFragment.newInstance(license)
+            this.license = license
-                .show(activity.supportFragmentManager, LicenseBottomSheetDialogFragment.TAG)
+
+            val context = YuzuApplication.appContext
+            binding.textSettingName.text = context.getString(license.titleId)
+            binding.textSettingDescription.text = context.getString(license.descriptionId)
+            binding.textSettingValue.visibility = View.GONE
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/SetupAdapter.kt

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
 import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.button.MaterialButton
 import org.yuzu.yuzu_emu.databinding.PageSetupBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
@@ -17,19 +18,31 @@ import org.yuzu.yuzu_emu.model.SetupCallback
 import org.yuzu.yuzu_emu.model.SetupPage
 import org.yuzu.yuzu_emu.model.StepState
 import org.yuzu.yuzu_emu.utils.ViewUtils
-import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder
 
-class SetupAdapter(val activity: AppCompatActivity, pages: List<SetupPage>) :
+class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>) :
-    AbstractListAdapter<SetupPage, SetupAdapter.SetupPageViewHolder>(pages) {
+    RecyclerView.Adapter<SetupAdapter.SetupPageViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SetupPageViewHolder {
-        PageSetupBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        val binding = PageSetupBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            .also { return SetupPageViewHolder(it) }
+        return SetupPageViewHolder(binding)
     }
 
+    override fun getItemCount(): Int = pages.size
+
+    override fun onBindViewHolder(holder: SetupPageViewHolder, position: Int) =
+        holder.bind(pages[position])
+
     inner class SetupPageViewHolder(val binding: PageSetupBinding) :
-        AbstractViewHolder<SetupPage>(binding), SetupCallback {
+        RecyclerView.ViewHolder(binding.root), SetupCallback {
-        override fun bind(model: SetupPage) {
+        lateinit var page: SetupPage
-            if (model.stepCompleted.invoke() == StepState.COMPLETE) {
+
+        init {
+            itemView.tag = this
+        }
+
+        fun bind(page: SetupPage) {
+            this.page = page
+
+            if (page.stepCompleted.invoke() == StepState.COMPLETE) {
                 binding.buttonAction.visibility = View.INVISIBLE
                 binding.textConfirmation.visibility = View.VISIBLE
             }
@@ -37,31 +50,31 @@ class SetupAdapter(val activity: AppCompatActivity, pages: List<SetupPage>) :
             binding.icon.setImageDrawable(
                 ResourcesCompat.getDrawable(
                     activity.resources,
-                    model.iconId,
+                    page.iconId,
                     activity.theme
                 )
             )
-            binding.textTitle.text = activity.resources.getString(model.titleId)
+            binding.textTitle.text = activity.resources.getString(page.titleId)
             binding.textDescription.text =
-                Html.fromHtml(activity.resources.getString(model.descriptionId), 0)
+                Html.fromHtml(activity.resources.getString(page.descriptionId), 0)
 
             binding.buttonAction.apply {
-                text = activity.resources.getString(model.buttonTextId)
+                text = activity.resources.getString(page.buttonTextId)
-                if (model.buttonIconId != 0) {
+                if (page.buttonIconId != 0) {
                     icon = ResourcesCompat.getDrawable(
                         activity.resources,
-                        model.buttonIconId,
+                        page.buttonIconId,
                         activity.theme
                     )
                 }
                 iconGravity =
-                    if (model.leftAlignedIcon) {
+                    if (page.leftAlignedIcon) {
                         MaterialButton.ICON_GRAVITY_START
                     } else {
                         MaterialButton.ICON_GRAVITY_END
                     }
                 setOnClickListener {
-                    model.buttonAction.invoke(this@SetupPageViewHolder)
+                    page.buttonAction.invoke(this@SetupPageViewHolder)
                 }
             }
         }

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt

@@ -23,8 +23,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     THEME("theme"),
     THEME_MODE("theme_mode"),
     OVERLAY_SCALE("control_scale"),
-    OVERLAY_OPACITY("control_opacity"),
+    OVERLAY_OPACITY("control_opacity");
-    LOCK_DRAWER("lock_drawer");
 
     override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal)
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt

@@ -76,8 +76,8 @@ class AboutFragment : Fragment() {
             binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment)
         }
 
-        binding.textVersionName.text = BuildConfig.VERSION_NAME
+        binding.textBuildHash.text = BuildConfig.GIT_HASH
-        binding.buttonVersionName.setOnClickListener {
+        binding.buttonBuildHash.setOnClickListener {
             val clipBoard =
                 requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             val clip = ClipData.newPlainText(getString(R.string.build), BuildConfig.GIT_HASH)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt

@@ -74,7 +74,7 @@ class AddonsFragment : Fragment() {
 
         binding.listAddons.apply {
             layoutManager = LinearLayoutManager(requireContext())
-            adapter = AddonAdapter(addonViewModel)
+            adapter = AddonAdapter()
         }
 
         viewLifecycleOwner.lifecycleScope.apply {
@@ -110,21 +110,6 @@ class AddonsFragment : Fragment() {
                     }
                 }
             }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    addonViewModel.addonToDelete.collect {
-                        if (it != null) {
-                            MessageDialogFragment.newInstance(
-                                requireActivity(),
-                                titleId = R.string.confirm_uninstall,
-                                descriptionId = R.string.confirm_uninstall_description,
-                                positiveAction = { addonViewModel.onDeleteAddon(it) }
-                            ).show(parentFragmentManager, MessageDialogFragment.TAG)
-                            addonViewModel.setAddonToDelete(null)
-                        }
-                    }
-                }
-            }
         }
 
         binding.buttonInstall.setOnClickListener {
@@ -171,22 +156,22 @@ class AddonsFragment : Fragment() {
                 descriptionId = R.string.invalid_directory_description
             )
             if (isValid) {
-                ProgressDialogFragment.newInstance(
+                IndeterminateProgressDialogFragment.newInstance(
                     requireActivity(),
                     R.string.installing_game_content,
                     false
-                ) { progressCallback, _ ->
+                ) {
                     val parentDirectoryName = externalAddonDirectory.name
                     val internalAddonDirectory =
                         File(args.game.addonDir + parentDirectoryName)
                     try {
-                        externalAddonDirectory.copyFilesTo(internalAddonDirectory, progressCallback)
+                        externalAddonDirectory.copyFilesTo(internalAddonDirectory)
                     } catch (_: Exception) {
                         return@newInstance errorMessage
                     }
                     addonViewModel.refreshAddons()
                     return@newInstance getString(R.string.addon_installed_successfully)
-                }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+                }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
             } else {
                 errorMessage.show(parentFragmentManager, MessageDialogFragment.TAG)
             }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt

@@ -3,7 +3,6 @@
 
 package org.yuzu.yuzu_emu.fragments
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -14,26 +13,20 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.adapters.DriverAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentDriverManagerBinding
-import org.yuzu.yuzu_emu.features.settings.model.StringSetting
-import org.yuzu.yuzu_emu.model.Driver.Companion.toDriver
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
-import org.yuzu.yuzu_emu.utils.NativeConfig
 import java.io.File
 import java.io.IOException
 
@@ -62,43 +55,12 @@ class DriverManagerFragment : Fragment() {
         return binding.root
     }
 
-    // This is using the correct scope, lint is just acting up
-    @SuppressLint("UnsafeRepeatOnLifecycleDetector")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         homeViewModel.setNavigationVisibility(visible = false, animated = true)
         homeViewModel.setStatusBarShadeVisibility(visible = false)
 
         driverViewModel.onOpenDriverManager(args.game)
-        if (NativeConfig.isPerGameConfigLoaded()) {
-            binding.toolbarDrivers.inflateMenu(R.menu.menu_driver_manager)
-            driverViewModel.showClearButton(!StringSetting.DRIVER_PATH.global)
-            binding.toolbarDrivers.setOnMenuItemClickListener {
-                when (it.itemId) {
-                    R.id.menu_driver_use_global -> {
-                        StringSetting.DRIVER_PATH.global = true
-                        driverViewModel.updateDriverList()
-                        (binding.listDrivers.adapter as DriverAdapter)
-                            .replaceList(driverViewModel.driverList.value)
-                        driverViewModel.showClearButton(false)
-                        true
-                    }
-
-                    else -> false
-                }
-            }
-
-            viewLifecycleOwner.lifecycleScope.apply {
-                launch {
-                    repeatOnLifecycle(Lifecycle.State.STARTED) {
-                        driverViewModel.showClearButton.collect {
-                            binding.toolbarDrivers.menu
-                                .findItem(R.id.menu_driver_use_global).isVisible = it
-                        }
-                    }
-                }
-            }
-        }
 
         if (!driverViewModel.isInteractionAllowed.value) {
             DriversLoadingDialogFragment().show(
@@ -123,6 +85,25 @@ class DriverManagerFragment : Fragment() {
             adapter = DriverAdapter(driverViewModel)
         }
 
+        viewLifecycleOwner.lifecycleScope.apply {
+            launch {
+                driverViewModel.driverList.collectLatest {
+                    (binding.listDrivers.adapter as DriverAdapter).submitList(it)
+                }
+            }
+            launch {
+                driverViewModel.newDriverInstalled.collect {
+                    if (_binding != null && it) {
+                        (binding.listDrivers.adapter as DriverAdapter).apply {
+                            notifyItemChanged(driverViewModel.previouslySelectedDriver)
+                            notifyItemChanged(driverViewModel.selectedDriver)
+                            driverViewModel.setNewDriverInstalled(false)
+                        }
+                    }
+                }
+            }
+        }
+
         setInsets()
     }
 
@@ -173,13 +154,13 @@ class DriverManagerFragment : Fragment() {
                 return@registerForActivityResult
             }
 
-            ProgressDialogFragment.newInstance(
+            IndeterminateProgressDialogFragment.newInstance(
                 requireActivity(),
                 R.string.installing_driver,
                 false
-            ) { _, _ ->
+            ) {
                 val driverPath =
-                    "${GpuDriverHelper.driverStoragePath}${FileUtil.getFilename(result)}"
+                    "${GpuDriverHelper.driverStoragePath}/${FileUtil.getFilename(result)}"
                 val driverFile = File(driverPath)
 
                 // Ignore file exceptions when a user selects an invalid zip
@@ -196,23 +177,14 @@ class DriverManagerFragment : Fragment() {
 
                 val driverData = GpuDriverHelper.getMetadataFromZip(driverFile)
                 val driverInList =
-                    driverViewModel.driverData.firstOrNull { it.second == driverData }
+                    driverViewModel.driverList.value.firstOrNull { it.second == driverData }
                 if (driverInList != null) {
                     return@newInstance getString(R.string.driver_already_installed)
                 } else {
-                    driverViewModel.onDriverAdded(Pair(driverPath, driverData))
+                    driverViewModel.addDriver(Pair(driverPath, driverData))
-                    withContext(Dispatchers.Main) {
+                    driverViewModel.setNewDriverInstalled(true)
-                        if (_binding != null) {
-                            val adapter = binding.listDrivers.adapter as DriverAdapter
-                            adapter.addItem(driverData.toDriver())
-                            adapter.selectItem(adapter.currentList.indices.last)
-                            driverViewModel.showClearButton(!StringSetting.DRIVER_PATH.global)
-                            binding.listDrivers
-                                .smoothScrollToPosition(adapter.currentList.indices.last)
-                        }
-                    }
                 }
                 return@newInstance Any()
-            }.show(childFragmentManager, ProgressDialogFragment.TAG)
+            }.show(childFragmentManager, IndeterminateProgressDialogFragment.TAG)
         }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt

@@ -141,9 +141,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
         // So this fragment doesn't restart on configuration changes; i.e. rotation.
         retainInstance = true
-        emulationState = EmulationState(game.path) {
+        emulationState = EmulationState(game.path)
-            return@EmulationState driverViewModel.isInteractionAllowed.value
-        }
     }
 
     /**
@@ -184,14 +182,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             }
 
             override fun onDrawerOpened(drawerView: View) {
-                binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+                // No op
-                binding.inGameMenu.requestFocus()
-                emulationViewModel.setDrawerOpen(true)
             }
 
             override fun onDrawerClosed(drawerView: View) {
-                binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt())
+                // No op
-                emulationViewModel.setDrawerOpen(false)
             }
 
             override fun onDrawerStateChanged(newState: Int) {
@@ -201,28 +196,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
         binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =
             game.title
-
-        binding.inGameMenu.menu.findItem(R.id.menu_lock_drawer).apply {
-            val lockMode = IntSetting.LOCK_DRAWER.getInt()
-            val titleId = if (lockMode == DrawerLayout.LOCK_MODE_LOCKED_CLOSED) {
-                R.string.unlock_drawer
-            } else {
-                R.string.lock_drawer
-            }
-            val iconId = if (lockMode == DrawerLayout.LOCK_MODE_UNLOCKED) {
-                R.drawable.ic_unlock
-            } else {
-                R.drawable.ic_lock
-            }
-
-            title = getString(titleId)
-            icon = ResourcesCompat.getDrawable(
-                resources,
-                iconId,
-                requireContext().theme
-            )
-        }
-
         binding.inGameMenu.setNavigationItemSelectedListener {
             when (it.itemId) {
                 R.id.menu_pause_emulation -> {
@@ -243,7 +216,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                             requireContext().theme
                         )
                     }
-                    binding.inGameMenu.requestFocus()
                     true
                 }
 
@@ -252,7 +224,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         null,
                         Settings.MenuTag.SECTION_ROOT
                     )
-                    binding.inGameMenu.requestFocus()
                     binding.root.findNavController().navigate(action)
                     true
                 }
@@ -262,7 +233,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         args.game,
                         Settings.MenuTag.SECTION_ROOT
                     )
-                    binding.inGameMenu.requestFocus()
                     binding.root.findNavController().navigate(action)
                     true
                 }
@@ -272,38 +242,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     true
                 }
 
-                R.id.menu_lock_drawer -> {
-                    when (IntSetting.LOCK_DRAWER.getInt()) {
-                        DrawerLayout.LOCK_MODE_UNLOCKED -> {
-                            IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
-                            it.title = resources.getString(R.string.unlock_drawer)
-                            it.icon = ResourcesCompat.getDrawable(
-                                resources,
-                                R.drawable.ic_lock,
-                                requireContext().theme
-                            )
-                        }
-
-                        DrawerLayout.LOCK_MODE_LOCKED_CLOSED -> {
-                            IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_UNLOCKED)
-                            it.title = resources.getString(R.string.lock_drawer)
-                            it.icon = ResourcesCompat.getDrawable(
-                                resources,
-                                R.drawable.ic_unlock,
-                                requireContext().theme
-                            )
-                        }
-                    }
-                    binding.inGameMenu.requestFocus()
-                    NativeConfig.saveGlobalConfig()
-                    true
-                }
-
                 R.id.menu_exit -> {
                     emulationState.stop()
                     emulationViewModel.setIsEmulationStopping(true)
                     binding.drawerLayout.close()
-                    binding.inGameMenu.requestFocus()
+                    binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
                     true
                 }
 
@@ -320,7 +263,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     if (!NativeLibrary.isRunning()) {
                         return
                     }
-                    emulationViewModel.setDrawerOpen(!binding.drawerLayout.isOpen)
+
+                    if (binding.drawerLayout.isOpen) {
+                        binding.drawerLayout.close()
+                    } else {
+                        binding.drawerLayout.open()
+                    }
                 }
             }
         )
@@ -374,20 +322,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     }
                 }
             }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    driverViewModel.isInteractionAllowed.collect {
-                        if (it) {
-                            startEmulation()
-                        }
-                    }
-                }
-            }
             launch {
                 repeatOnLifecycle(Lifecycle.State.CREATED) {
                     emulationViewModel.emulationStarted.collectLatest {
                         if (it) {
-                            binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt())
+                            binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
                             ViewUtils.showView(binding.surfaceInputOverlay)
                             ViewUtils.hideView(binding.loadingIndicator)
 
@@ -412,13 +351,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 }
             }
             launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                    emulationViewModel.drawerOpen.collect {
+                    driverViewModel.isInteractionAllowed.collect {
                         if (it) {
-                            binding.drawerLayout.open()
+                            onEmulationStart()
-                            binding.inGameMenu.requestFocus()
-                        } else {
-                            binding.drawerLayout.close()
                         }
                     }
                 }
@@ -426,7 +362,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    private fun startEmulation() {
+    private fun onEmulationStart() {
         if (!NativeLibrary.isRunning() && !NativeLibrary.isPaused()) {
             if (!DirectoryInitialization.areDirectoriesReady) {
                 DirectoryInitialization.start()
@@ -501,15 +437,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             val FRAMETIME = 2
             val SPEED = 3
             perfStatsUpdater = {
-                if (emulationViewModel.emulationStarted.value &&
+                if (emulationViewModel.emulationStarted.value) {
-                    !emulationViewModel.isEmulationStopping.value
-                ) {
                     val perfStats = NativeLibrary.getPerfStats()
                     val cpuBackend = NativeLibrary.getCpuBackend()
-                    val gpuDriver = NativeLibrary.getGpuDriver()
                     if (_binding != null) {
                         binding.showFpsText.text =
-                            String.format("FPS: %.1f\n%s/%s", perfStats[FPS], cpuBackend, gpuDriver)
+                            String.format("FPS: %.1f\n%s", perfStats[FPS], cpuBackend)
                     }
                     perfStatsUpdateHandler.postDelayed(perfStatsUpdater!!, 800)
                 }
@@ -621,7 +554,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             findItem(R.id.menu_touchscreen).isChecked = BooleanSetting.TOUCHSCREEN.getBoolean()
         }
 
-        popup.setOnDismissListener { NativeConfig.saveGlobalConfig() }
         popup.setOnMenuItemClickListener {
             when (it.itemId) {
                 R.id.menu_toggle_fps -> {
@@ -788,9 +720,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.emulation_control_adjust)
             .setView(adjustBinding.root)
-            .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
+            .setPositiveButton(android.R.string.ok, null)
-                NativeConfig.saveGlobalConfig()
-            }
             .setNeutralButton(R.string.slider_default) { _: DialogInterface?, _: Int ->
                 setControlScale(50)
                 setControlOpacity(100)
@@ -826,10 +756,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    private class EmulationState(
+    private class EmulationState(private val gamePath: String) {
-        private val gamePath: String,
-        private val emulationCanStart: () -> Boolean
-    ) {
         private var state: State
         private var surface: Surface? = null
 
@@ -923,7 +850,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     State.PAUSED -> Log.warning(
                         "[EmulationFragment] Surface cleared while emulation paused."
                     )
-
                     else -> Log.warning(
                         "[EmulationFragment] Surface cleared while emulation stopped."
                     )
@@ -933,10 +859,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
         private fun runWithValidSurface() {
             NativeLibrary.surfaceChanged(surface)
-            if (!emulationCanStart.invoke()) {
-                return
-            }
-
             when (state) {
                 State.STOPPED -> {
                     val emulationThread = Thread({

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameInfoFragment.kt

@@ -21,10 +21,8 @@ import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.transition.MaterialSharedAxis
-import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBinding
-import org.yuzu.yuzu_emu.model.GameVerificationResult
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.GameMetadata
 
@@ -103,38 +101,6 @@ class GameInfoFragment : Fragment() {
                 """.trimIndent()
                 copyToClipboard(args.game.title, details)
             }
-
-            buttonVerifyIntegrity.setOnClickListener {
-                ProgressDialogFragment.newInstance(
-                    requireActivity(),
-                    R.string.verifying,
-                    true
-                ) { progressCallback, _ ->
-                    val result = GameVerificationResult.from(
-                        NativeLibrary.verifyGameContents(
-                            args.game.path,
-                            progressCallback
-                        )
-                    )
-                    return@newInstance when (result) {
-                        GameVerificationResult.Success ->
-                            MessageDialogFragment.newInstance(
-                                titleId = R.string.verify_success,
-                                descriptionId = R.string.operation_completed_successfully
-                            )
-                        GameVerificationResult.Failed ->
-                            MessageDialogFragment.newInstance(
-                                titleId = R.string.verify_failure,
-                                descriptionId = R.string.verify_failure_description
-                            )
-                        GameVerificationResult.NotImplemented ->
-                            MessageDialogFragment.newInstance(
-                                titleId = R.string.verify_no_result,
-                                descriptionId = R.string.verify_no_result_description
-                            )
-                    }
-                }.show(parentFragmentManager, ProgressDialogFragment.TAG)
-            }
         }
 
         setInsets()

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt

@@ -4,8 +4,6 @@
 package org.yuzu.yuzu_emu.fragments
 
 import android.annotation.SuppressLint
-import android.content.pm.ShortcutInfo
-import android.content.pm.ShortcutManager
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -46,6 +44,7 @@ import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GameIconUtils
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.MemoryUtil
+import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 import java.io.File
 
@@ -86,24 +85,6 @@ class GamePropertiesFragment : Fragment() {
             view.findNavController().popBackStack()
         }
 
-        val shortcutManager = requireActivity().getSystemService(ShortcutManager::class.java)
-        binding.buttonShortcut.isEnabled = shortcutManager.isRequestPinShortcutSupported
-        binding.buttonShortcut.setOnClickListener {
-            viewLifecycleOwner.lifecycleScope.launch {
-                withContext(Dispatchers.IO) {
-                    val shortcut = ShortcutInfo.Builder(requireContext(), args.game.title)
-                        .setShortLabel(args.game.title)
-                        .setIcon(
-                            GameIconUtils.getShortcutIcon(requireActivity(), args.game)
-                                .toIcon(requireContext())
-                        )
-                        .setIntent(args.game.launchIntent)
-                        .build()
-                    shortcutManager.requestPinShortcut(shortcut, null)
-                }
-            }
-        }
-
         GameIconUtils.loadGameIcon(args.game, binding.imageGameScreen)
         binding.title.text = args.game.title
         binding.title.postDelayed(
@@ -376,17 +357,27 @@ class GamePropertiesFragment : Fragment() {
                 return@registerForActivityResult
             }
 
+            val inputZip = requireContext().contentResolver.openInputStream(result)
             val savesFolder = File(args.game.saveDir)
             val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
             cacheSaveDir.mkdir()
 
-            ProgressDialogFragment.newInstance(
+            if (inputZip == null) {
+                Toast.makeText(
+                    YuzuApplication.appContext,
+                    getString(R.string.fatal_error),
+                    Toast.LENGTH_LONG
+                ).show()
+                return@registerForActivityResult
+            }
+
+            IndeterminateProgressDialogFragment.newInstance(
                 requireActivity(),
                 R.string.save_files_importing,
                 false
-            ) { _, _ ->
+            ) {
                 try {
-                    FileUtil.unzipToInternalStorage(result.toString(), cacheSaveDir)
+                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
                     val files = cacheSaveDir.listFiles()
                     var savesFolderFile: File? = null
                     if (files != null) {
@@ -431,7 +422,7 @@ class GamePropertiesFragment : Fragment() {
                         Toast.LENGTH_LONG
                     ).show()
                 }
-            }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+            }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
         }
 
     /**
@@ -445,11 +436,11 @@ class GamePropertiesFragment : Fragment() {
             return@registerForActivityResult
         }
 
-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
             requireActivity(),
             R.string.save_files_exporting,
             false
-        ) { _, _ ->
+        ) {
             val saveLocation = args.game.saveDir
             val zipResult = FileUtil.zipFromInternalStorage(
                 File(saveLocation),
@@ -461,6 +452,6 @@ class GamePropertiesFragment : Fragment() {
                 TaskState.Completed -> getString(R.string.export_success)
                 TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed)
             }
-        }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+        }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt

@@ -32,7 +32,6 @@ import org.yuzu.yuzu_emu.BuildConfig
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
 import org.yuzu.yuzu_emu.features.DocumentProvider
@@ -141,38 +140,6 @@ class HomeSettingsFragment : Fragment() {
                     }
                 )
             )
-            add(
-                HomeSetting(
-                    R.string.verify_installed_content,
-                    R.string.verify_installed_content_description,
-                    R.drawable.ic_check_circle,
-                    {
-                        ProgressDialogFragment.newInstance(
-                            requireActivity(),
-                            titleId = R.string.verifying,
-                            cancellable = true
-                        ) { progressCallback, _ ->
-                            val result = NativeLibrary.verifyInstalledContents(progressCallback)
-                            return@newInstance if (result.isEmpty()) {
-                                MessageDialogFragment.newInstance(
-                                    titleId = R.string.verify_success,
-                                    descriptionId = R.string.operation_completed_successfully
-                                )
-                            } else {
-                                val failedNames = result.joinToString("\n")
-                                val errorMessage = YuzuApplication.appContext.getString(
-                                    R.string.verification_failed_for,
-                                    failedNames
-                                )
-                                MessageDialogFragment.newInstance(
-                                    titleId = R.string.verify_failure,
-                                    descriptionString = errorMessage
-                                )
-                            }
-                        }.show(parentFragmentManager, ProgressDialogFragment.TAG)
-                    }
-                )
-            )
             add(
                 HomeSetting(
                     R.string.share_log,

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt

@@ -23,13 +23,11 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 import org.yuzu.yuzu_emu.model.TaskViewModel
 
-class ProgressDialogFragment : DialogFragment() {
+class IndeterminateProgressDialogFragment : DialogFragment() {
     private val taskViewModel: TaskViewModel by activityViewModels()
 
     private lateinit var binding: DialogProgressBarBinding
 
-    private val PROGRESS_BAR_RESOLUTION = 1000
-
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val titleId = requireArguments().getInt(TITLE)
         val cancellable = requireArguments().getBoolean(CANCELLABLE)
@@ -63,7 +61,6 @@ class ProgressDialogFragment : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.message.isSelected = true
         viewLifecycleOwner.lifecycleScope.apply {
             launch {
                 repeatOnLifecycle(Lifecycle.State.CREATED) {
@@ -100,35 +97,6 @@ class ProgressDialogFragment : DialogFragment() {
                     }
                 }
             }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    taskViewModel.progress.collect {
-                        if (it != 0.0) {
-                            binding.progressBar.apply {
-                                isIndeterminate = false
-                                progress = (
-                                    (it / taskViewModel.maxProgress.value) *
-                                        PROGRESS_BAR_RESOLUTION
-                                    ).toInt()
-                                min = 0
-                                max = PROGRESS_BAR_RESOLUTION
-                            }
-                        }
-                    }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    taskViewModel.message.collect {
-                        if (it.isEmpty()) {
-                            binding.message.visibility = View.GONE
-                        } else {
-                            binding.message.visibility = View.VISIBLE
-                            binding.message.text = it
-                        }
-                    }
-                }
-            }
         }
     }
 
@@ -140,7 +108,6 @@ class ProgressDialogFragment : DialogFragment() {
         val negativeButton = alertDialog.getButton(Dialog.BUTTON_NEGATIVE)
         negativeButton.setOnClickListener {
             alertDialog.setTitle(getString(R.string.cancelling))
-            binding.progressBar.isIndeterminate = true
             taskViewModel.setCancelled(true)
         }
     }
@@ -155,12 +122,9 @@ class ProgressDialogFragment : DialogFragment() {
             activity: FragmentActivity,
             titleId: Int,
             cancellable: Boolean = false,
-            task: suspend (
+            task: suspend () -> Any
-                progressCallback: (max: Long, progress: Long) -> Boolean,
+        ): IndeterminateProgressDialogFragment {
-                messageCallback: (message: String) -> Unit
+            val dialog = IndeterminateProgressDialogFragment()
-            ) -> Any
-        ): ProgressDialogFragment {
-            val dialog = ProgressDialogFragment()
             val args = Bundle()
             ViewModelProvider(activity)[TaskViewModel::class.java].task = task
             args.putInt(TITLE, titleId)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt

@@ -34,6 +34,7 @@ import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
+import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 import java.io.File
 import java.math.BigInteger
@@ -194,20 +195,26 @@ class InstallableFragment : Fragment() {
                 return@registerForActivityResult
             }
 
+            val inputZip = requireContext().contentResolver.openInputStream(result)
             val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
             cacheSaveDir.mkdir()
 
-            ProgressDialogFragment.newInstance(
+            if (inputZip == null) {
+                Toast.makeText(
+                    YuzuApplication.appContext,
+                    getString(R.string.fatal_error),
+                    Toast.LENGTH_LONG
+                ).show()
+                return@registerForActivityResult
+            }
+
+            IndeterminateProgressDialogFragment.newInstance(
                 requireActivity(),
                 R.string.save_files_importing,
                 false
-            ) { progressCallback, _ ->
+            ) {
                 try {
-                    FileUtil.unzipToInternalStorage(
+                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
-                        result.toString(),
-                        cacheSaveDir,
-                        progressCallback
-                    )
                     val files = cacheSaveDir.listFiles()
                     var successfulImports = 0
                     var failedImports = 0
@@ -280,7 +287,7 @@ class InstallableFragment : Fragment() {
                         Toast.LENGTH_LONG
                     ).show()
                 }
-            }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+            }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
         }
 
     private val exportSaves = registerForActivityResult(
@@ -290,11 +297,11 @@ class InstallableFragment : Fragment() {
             return@registerForActivityResult
         }
 
-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
             requireActivity(),
             R.string.save_files_exporting,
             false
-        ) { _, _ ->
+        ) {
             val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
             cacheSaveDir.mkdir()
 
@@ -331,6 +338,6 @@ class InstallableFragment : Fragment() {
                 TaskState.Completed -> getString(R.string.export_success)
                 TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed)
             }
-        }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+        }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt

@@ -26,15 +26,9 @@ class MessageDialogFragment : DialogFragment() {
         val descriptionId = requireArguments().getInt(DESCRIPTION_ID)
         val descriptionString = requireArguments().getString(DESCRIPTION_STRING)!!
         val helpLinkId = requireArguments().getInt(HELP_LINK)
-        val dismissible = requireArguments().getBoolean(DISMISSIBLE)
-        val clearPositiveAction = requireArguments().getBoolean(CLEAR_POSITIVE_ACTION)
 
         val builder = MaterialAlertDialogBuilder(requireContext())
 
-        if (clearPositiveAction) {
-            messageDialogViewModel.positiveAction = null
-        }
-
         if (messageDialogViewModel.positiveAction == null) {
             builder.setPositiveButton(R.string.close, null)
         } else {
@@ -57,8 +51,6 @@ class MessageDialogFragment : DialogFragment() {
             }
         }
 
-        isCancelable = dismissible
-
         return builder.show()
     }
 
@@ -75,38 +67,28 @@ class MessageDialogFragment : DialogFragment() {
         private const val DESCRIPTION_ID = "DescriptionId"
         private const val DESCRIPTION_STRING = "DescriptionString"
         private const val HELP_LINK = "Link"
-        private const val DISMISSIBLE = "Dismissible"
-        private const val CLEAR_POSITIVE_ACTION = "ClearPositiveAction"
 
         fun newInstance(
-            activity: FragmentActivity? = null,
+            activity: FragmentActivity,
             titleId: Int = 0,
             titleString: String = "",
             descriptionId: Int = 0,
             descriptionString: String = "",
             helpLinkId: Int = 0,
-            dismissible: Boolean = true,
             positiveAction: (() -> Unit)? = null
         ): MessageDialogFragment {
-            var clearPositiveAction = false
-            if (activity != null) {
-                ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
-                    clear()
-                    this.positiveAction = positiveAction
-                }
-            } else {
-                clearPositiveAction = true
-            }
-
             val dialog = MessageDialogFragment()
-            val bundle = Bundle().apply {
+            val bundle = Bundle()
+            bundle.apply {
                 putInt(TITLE_ID, titleId)
                 putString(TITLE_STRING, titleString)
                 putInt(DESCRIPTION_ID, descriptionId)
                 putString(DESCRIPTION_STRING, descriptionString)
                 putInt(HELP_LINK, helpLinkId)
-                putBoolean(DISMISSIBLE, dismissible)
+            }
-                putBoolean(CLEAR_POSITIVE_ACTION, clearPositiveAction)
+            ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
+                clear()
+                this.positiveAction = positiveAction
             }
             dialog.arguments = bundle
             return dialog

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt

@@ -136,14 +136,14 @@ class SearchFragment : Fragment() {
                 baseList.filter {
                     val lastPlayedTime = preferences.getLong(it.keyLastPlayedTime, 0L)
                     lastPlayedTime > (System.currentTimeMillis() - 24 * 60 * 60 * 1000)
-                }.sortedByDescending { preferences.getLong(it.keyLastPlayedTime, 0L) }
+                }
             }
 
             R.id.chip_recently_added -> {
                 baseList.filter {
                     val addedTime = preferences.getLong(it.keyAddedToLibraryTime, 0L)
                     addedTime > (System.currentTimeMillis() - 24 * 60 * 60 * 1000)
-                }.sortedByDescending { preferences.getLong(it.keyAddedToLibraryTime, 0L) }
+                }
             }
 
             R.id.chip_homebrew -> baseList.filter { it.isHomebrew }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt

@@ -31,7 +31,6 @@ import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.transition.MaterialFadeThrough
 import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.NativeLibrary
 import java.io.File
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@@ -163,7 +162,7 @@ class SetupFragment : Fragment() {
                     R.string.install_prod_keys_warning_help,
                     {
                         val file = File(DirectoryInitialization.userDirectory + "/keys/prod.keys")
-                        if (file.exists() && NativeLibrary.areKeysPresent()) {
+                        if (file.exists()) {
                             StepState.COMPLETE
                         } else {
                             StepState.INCOMPLETE
@@ -348,8 +347,7 @@ class SetupFragment : Fragment() {
     val getProdKey =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
             if (result != null) {
-                mainActivity.processKey(result)
+                if (mainActivity.processKey(result)) {
-                if (NativeLibrary.areKeysPresent()) {
                     keyCallback.onStepCompleted()
                 }
             }

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Addon.kt

@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.model
+
+data class Addon(
+    var enabled: Boolean,
+    val title: String,
+    val version: String
+)

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt

@@ -15,8 +15,8 @@ import org.yuzu.yuzu_emu.utils.NativeConfig
 import java.util.concurrent.atomic.AtomicBoolean
 
 class AddonViewModel : ViewModel() {
-    private val _patchList = MutableStateFlow(mutableListOf<Patch>())
+    private val _addonList = MutableStateFlow(mutableListOf<Addon>())
-    val addonList get() = _patchList.asStateFlow()
+    val addonList get() = _addonList.asStateFlow()
 
     private val _showModInstallPicker = MutableStateFlow(false)
     val showModInstallPicker get() = _showModInstallPicker.asStateFlow()
@@ -24,9 +24,6 @@ class AddonViewModel : ViewModel() {
     private val _showModNoticeDialog = MutableStateFlow(false)
     val showModNoticeDialog get() = _showModNoticeDialog.asStateFlow()
 
-    private val _addonToDelete = MutableStateFlow<Patch?>(null)
-    val addonToDelete = _addonToDelete.asStateFlow()
-
     var game: Game? = null
 
     private val isRefreshing = AtomicBoolean(false)
@@ -43,47 +40,36 @@ class AddonViewModel : ViewModel() {
         isRefreshing.set(true)
         viewModelScope.launch {
             withContext(Dispatchers.IO) {
-                val patchList = (
+                val addonList = mutableListOf<Addon>()
-                    NativeLibrary.getPatchesForFile(game!!.path, game!!.programId)
+                val disabledAddons = NativeConfig.getDisabledAddons(game!!.programId)
-                        ?: emptyArray()
+                NativeLibrary.getAddonsForFile(game!!.path, game!!.programId)?.forEach {
-                    ).toMutableList()
+                    val name = it.first.replace("[D] ", "")
-                patchList.sortBy { it.name }
+                    addonList.add(Addon(!disabledAddons.contains(name), name, it.second))
-                _patchList.value = patchList
+                }
+                addonList.sortBy { it.title }
+                _addonList.value = addonList
                 isRefreshing.set(false)
             }
         }
     }
 
-    fun setAddonToDelete(patch: Patch?) {
-        _addonToDelete.value = patch
-    }
-
-    fun onDeleteAddon(patch: Patch) {
-        when (PatchType.from(patch.type)) {
-            PatchType.Update -> NativeLibrary.removeUpdate(patch.programId)
-            PatchType.DLC -> NativeLibrary.removeDLC(patch.programId)
-            PatchType.Mod -> NativeLibrary.removeMod(patch.programId, patch.name)
-        }
-        refreshAddons()
-    }
-
     fun onCloseAddons() {
-        if (_patchList.value.isEmpty()) {
+        if (_addonList.value.isEmpty()) {
             return
         }
 
         NativeConfig.setDisabledAddons(
             game!!.programId,
-            _patchList.value.mapNotNull {
+            _addonList.value.mapNotNull {
                 if (it.enabled) {
                     null
                 } else {
-                    it.name
+                    it.title
                 }
             }.toTypedArray()
         )
         NativeConfig.saveGlobalConfig()
-        _patchList.value.clear()
+        _addonList.value.clear()
         game = null
     }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Driver.kt

@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import org.yuzu.yuzu_emu.utils.GpuDriverMetadata
-
-data class Driver(
-    override var selected: Boolean,
-    val title: String,
-    val version: String = "",
-    val description: String = ""
-) : SelectableItem {
-    override fun onSelectionStateChanged(selected: Boolean) {
-        this.selected = selected
-    }
-
-    companion object {
-        fun GpuDriverMetadata.toDriver(selected: Boolean = false): Driver =
-            Driver(
-                selected,
-                this.name ?: "",
-                this.version ?: "",
-                this.description ?: ""
-            )
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt

@@ -9,7 +9,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
@@ -18,10 +17,11 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
-import org.yuzu.yuzu_emu.model.Driver.Companion.toDriver
+import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.GpuDriverMetadata
 import org.yuzu.yuzu_emu.utils.NativeConfig
+import java.io.BufferedOutputStream
 import java.io.File
 
 class DriverViewModel : ViewModel() {
@@ -38,81 +38,97 @@ class DriverViewModel : ViewModel() {
             !loading && ready && !deleting
         }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), initialValue = false)
 
-    var driverData = GpuDriverHelper.getDrivers()
+    private val _driverList = MutableStateFlow(GpuDriverHelper.getDrivers())
+    val driverList: StateFlow<MutableList<Pair<String, GpuDriverMetadata>>> get() = _driverList
 
-    private val _driverList = MutableStateFlow(emptyList<Driver>())
+    var previouslySelectedDriver = 0
-    val driverList: StateFlow<List<Driver>> get() = _driverList
+    var selectedDriver = -1
 
     // Used for showing which driver is currently installed within the driver manager card
     private val _selectedDriverTitle = MutableStateFlow("")
     val selectedDriverTitle: StateFlow<String> get() = _selectedDriverTitle
 
-    private val _showClearButton = MutableStateFlow(false)
+    private val _newDriverInstalled = MutableStateFlow(false)
-    val showClearButton = _showClearButton.asStateFlow()
+    val newDriverInstalled: StateFlow<Boolean> get() = _newDriverInstalled
 
-    private val driversToDelete = mutableListOf<String>()
+    val driversToDelete = mutableListOf<String>()
 
     init {
-        updateDriverList()
+        val currentDriverMetadata = GpuDriverHelper.installedCustomDriverData
+        findSelectedDriver(currentDriverMetadata)
+
+        // If a user had installed a driver before the manager was implemented, this zips
+        // the installed driver to UserData/gpu_drivers/CustomDriver.zip so that it can
+        // be indexed and exported as expected.
+        if (selectedDriver == -1) {
+            val driverToSave =
+                File(GpuDriverHelper.driverStoragePath, "CustomDriver.zip")
+            driverToSave.createNewFile()
+            FileUtil.zipFromInternalStorage(
+                File(GpuDriverHelper.driverInstallationPath!!),
+                GpuDriverHelper.driverInstallationPath!!,
+                BufferedOutputStream(driverToSave.outputStream())
+            )
+            _driverList.value.add(Pair(driverToSave.path, currentDriverMetadata))
+            setSelectedDriverIndex(_driverList.value.size - 1)
+        }
+
+        // If a user had installed a driver before the config was reworked to be multiplatform,
+        // we have save the path of the previously selected driver to the new setting.
+        if (StringSetting.DRIVER_PATH.getString(true).isEmpty() && selectedDriver > 0 &&
+            StringSetting.DRIVER_PATH.global
+        ) {
+            StringSetting.DRIVER_PATH.setString(_driverList.value[selectedDriver].first)
+            NativeConfig.saveGlobalConfig()
+        } else {
+            findSelectedDriver(GpuDriverHelper.customDriverSettingData)
+        }
         updateDriverNameForGame(null)
     }
 
-    fun reloadDriverData() {
+    fun setSelectedDriverIndex(value: Int) {
-        _areDriversLoading.value = true
+        if (selectedDriver != -1) {
-        driverData = GpuDriverHelper.getDrivers()
+            previouslySelectedDriver = selectedDriver
-        updateDriverList()
+        }
-        _areDriversLoading.value = false
+        selectedDriver = value
     }
 
-    fun updateDriverList() {
+    fun setNewDriverInstalled(value: Boolean) {
-        val selectedDriver = GpuDriverHelper.customDriverSettingData
+        _newDriverInstalled.value = value
-        val newDriverList = mutableListOf(
+    }
-            Driver(
+
-                selectedDriver == GpuDriverMetadata(),
+    fun addDriver(driverData: Pair<String, GpuDriverMetadata>) {
-                YuzuApplication.appContext.getString(R.string.system_gpu_driver)
+        val driverIndex = _driverList.value.indexOfFirst { it == driverData }
-            )
+        if (driverIndex == -1) {
-        )
+            _driverList.value.add(driverData)
-        driverData.forEach {
+            setSelectedDriverIndex(_driverList.value.size - 1)
-            newDriverList.add(it.second.toDriver(it.second == selectedDriver))
+            _selectedDriverTitle.value = driverData.second.name
+                ?: YuzuApplication.appContext.getString(R.string.system_gpu_driver)
+        } else {
+            setSelectedDriverIndex(driverIndex)
         }
-        _driverList.value = newDriverList
+    }
+
+    fun removeDriver(driverData: Pair<String, GpuDriverMetadata>) {
+        _driverList.value.remove(driverData)
     }
 
     fun onOpenDriverManager(game: Game?) {
         if (game != null) {
             SettingsFile.loadCustomConfig(game)
         }
-        updateDriverList()
-    }
 
-    fun showClearButton(value: Boolean) {
+        val driverPath = StringSetting.DRIVER_PATH.getString()
-        _showClearButton.value = value
+        if (driverPath.isEmpty()) {
-    }
+            setSelectedDriverIndex(0)
-
-    fun onDriverSelected(position: Int) {
-        if (position == 0) {
-            StringSetting.DRIVER_PATH.setString("")
         } else {
-            StringSetting.DRIVER_PATH.setString(driverData[position - 1].first)
+            findSelectedDriver(GpuDriverHelper.getMetadataFromZip(File(driverPath)))
         }
     }
 
-    fun onDriverRemoved(removedPosition: Int, selectedPosition: Int) {
-        driversToDelete.add(driverData[removedPosition - 1].first)
-        driverData.removeAt(removedPosition - 1)
-        onDriverSelected(selectedPosition)
-    }
-
-    fun onDriverAdded(driver: Pair<String, GpuDriverMetadata>) {
-        if (driversToDelete.contains(driver.first)) {
-            driversToDelete.remove(driver.first)
-        }
-        driverData.add(driver)
-        onDriverSelected(driverData.size)
-    }
-
     fun onCloseDriverManager(game: Game?) {
         _isDeletingDrivers.value = true
+        StringSetting.DRIVER_PATH.setString(driverList.value[selectedDriver].first)
         updateDriverNameForGame(game)
         if (game == null) {
             NativeConfig.saveGlobalConfig()
@@ -144,7 +160,6 @@ class DriverViewModel : ViewModel() {
         val selectedDriverFile = File(StringSetting.DRIVER_PATH.getString())
         val selectedDriverMetadata = GpuDriverHelper.customDriverSettingData
         if (GpuDriverHelper.installedCustomDriverData == selectedDriverMetadata) {
-            setDriverReady()
             return
         }
 
@@ -166,6 +181,20 @@ class DriverViewModel : ViewModel() {
         }
     }
 
+    private fun findSelectedDriver(currentDriverMetadata: GpuDriverMetadata) {
+        if (driverList.value.size == 1) {
+            setSelectedDriverIndex(0)
+            return
+        }
+
+        driverList.value.forEachIndexed { i: Int, driver: Pair<String, GpuDriverMetadata> ->
+            if (driver.second == currentDriverMetadata) {
+                setSelectedDriverIndex(i)
+                return
+            }
+        }
+    }
+
     fun updateDriverNameForGame(game: Game?) {
         if (!GpuDriverHelper.supportsCustomDriverLoading()) {
             return
@@ -188,6 +217,7 @@ class DriverViewModel : ViewModel() {
 
     private fun setDriverReady() {
         _isDriverReady.value = true
-        updateName()
+        _selectedDriverTitle.value = GpuDriverHelper.customDriverSettingData.name
+            ?: YuzuApplication.appContext.getString(R.string.system_gpu_driver)
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/EmulationViewModel.kt

@@ -6,7 +6,6 @@ package org.yuzu.yuzu_emu.model
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 
 class EmulationViewModel : ViewModel() {
     val emulationStarted: StateFlow<Boolean> get() = _emulationStarted
@@ -24,9 +23,6 @@ class EmulationViewModel : ViewModel() {
     val shaderMessage: StateFlow<String> get() = _shaderMessage
     private val _shaderMessage = MutableStateFlow("")
 
-    private val _drawerOpen = MutableStateFlow(false)
-    val drawerOpen = _drawerOpen.asStateFlow()
-
     fun setEmulationStarted(started: Boolean) {
         _emulationStarted.value = started
     }
@@ -53,10 +49,6 @@ class EmulationViewModel : ViewModel() {
         setTotalShaders(max)
     }
 
-    fun setDrawerOpen(value: Boolean) {
-        _drawerOpen.value = value
-    }
-
     fun clear() {
         setEmulationStarted(false)
         setIsEmulationStopping(false)

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt

@@ -3,7 +3,6 @@
 
 package org.yuzu.yuzu_emu.model
 
-import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
 import java.util.HashSet
@@ -12,7 +11,6 @@ import kotlinx.serialization.Serializable
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
 import java.time.LocalDateTime
@@ -63,26 +61,12 @@ class Game(
     val addonDir: String
         get() = DirectoryInitialization.userDirectory + "/load/" + programIdHex + "/"
 
-    val launchIntent: Intent
+    override fun equals(other: Any?): Boolean {
-        get() = Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply {
+        if (other !is Game) {
-            action = Intent.ACTION_VIEW
+            return false
-            data = Uri.parse(path)
         }
 
-    override fun equals(other: Any?): Boolean {
+        return hashCode() == other.hashCode()
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Game
-
-        if (title != other.title) return false
-        if (path != other.path) return false
-        if (programId != other.programId) return false
-        if (developer != other.developer) return false
-        if (version != other.version) return false
-        if (isHomebrew != other.isHomebrew) return false
-
-        return true
     }
 
     override fun hashCode(): Int {

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameVerificationResult.kt

@@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-enum class GameVerificationResult(val int: Int) {
-    Success(0),
-    Failed(1),
-    NotImplemented(2);
-
-    companion object {
-        fun from(int: Int): GameVerificationResult =
-            entries.firstOrNull { it.int == int } ?: Success
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt

@@ -31,9 +31,6 @@ class HomeViewModel : ViewModel() {
     private val _reloadPropertiesList = MutableStateFlow(false)
     val reloadPropertiesList get() = _reloadPropertiesList.asStateFlow()
 
-    private val _checkKeys = MutableStateFlow(false)
-    val checkKeys = _checkKeys.asStateFlow()
-
     var navigatedToSetup = false
 
     fun setNavigationVisibility(visible: Boolean, animated: Boolean) {
@@ -69,8 +66,4 @@ class HomeViewModel : ViewModel() {
     fun reloadPropertiesList(reload: Boolean) {
         _reloadPropertiesList.value = reload
     }
-
-    fun setCheckKeys(value: Boolean) {
-        _checkKeys.value = value
-    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/InstallResult.kt

@@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-enum class InstallResult(val int: Int) {
-    Success(0),
-    Overwrite(1),
-    Failure(2),
-    BaseInstallAttempted(3);
-
-    companion object {
-        fun from(int: Int): InstallResult = entries.firstOrNull { it.int == int } ?: Success
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Patch.kt

@@ -1,16 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import androidx.annotation.Keep
-
-@Keep
-data class Patch(
-    var enabled: Boolean,
-    val name: String,
-    val version: String,
-    val type: Int,
-    val programId: String,
-    val titleId: String
-)

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/PatchType.kt

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-enum class PatchType(val int: Int) {
-    Update(0),
-    DLC(1),
-    Mod(2);
-
-    companion object {
-        fun from(int: Int): PatchType = entries.firstOrNull { it.int == int } ?: Update
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SelectableItem.kt

@@ -1,9 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-interface SelectableItem {
-    var selected: Boolean
-    fun onSelectionStateChanged(selected: Boolean)
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt

@@ -8,7 +8,6 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
 class TaskViewModel : ViewModel() {
@@ -24,28 +23,13 @@ class TaskViewModel : ViewModel() {
     val cancelled: StateFlow<Boolean> get() = _cancelled
     private val _cancelled = MutableStateFlow(false)
 
-    private val _progress = MutableStateFlow(0.0)
+    lateinit var task: suspend () -> Any
-    val progress = _progress.asStateFlow()
-
-    private val _maxProgress = MutableStateFlow(0.0)
-    val maxProgress = _maxProgress.asStateFlow()
-
-    private val _message = MutableStateFlow("")
-    val message = _message.asStateFlow()
-
-    lateinit var task: suspend (
-        progressCallback: (max: Long, progress: Long) -> Boolean,
-        messageCallback: (message: String) -> Unit
-    ) -> Any
 
     fun clear() {
         _result.value = Any()
         _isComplete.value = false
         _isRunning.value = false
         _cancelled.value = false
-        _progress.value = 0.0
-        _maxProgress.value = 0.0
-        _message.value = ""
     }
 
     fun setCancelled(value: Boolean) {
@@ -59,16 +43,7 @@ class TaskViewModel : ViewModel() {
         _isRunning.value = true
 
         viewModelScope.launch(Dispatchers.IO) {
-            val res = task(
+            val res = task()
-                { max, progress ->
-                    _maxProgress.value = max.toDouble()
-                    _progress.value = progress.toDouble()
-                    return@task cancelled.value
-                },
-                { message ->
-                    _message.value = message
-                }
-            )
             _result.value = res
             _isComplete.value = true
             _isRunning.value = false

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt

@@ -38,13 +38,11 @@ import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.fragments.AddGameFolderDialogFragment
-import org.yuzu.yuzu_emu.fragments.ProgressDialogFragment
+import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
 import org.yuzu.yuzu_emu.model.AddonViewModel
-import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.model.InstallResult
 import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.model.TaskViewModel
 import org.yuzu.yuzu_emu.utils.*
@@ -60,13 +58,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
     private val gamesViewModel: GamesViewModel by viewModels()
     private val taskViewModel: TaskViewModel by viewModels()
     private val addonViewModel: AddonViewModel by viewModels()
-    private val driverViewModel: DriverViewModel by viewModels()
 
     override var themeId: Int = 0
 
-    private val CHECKED_DECRYPTION = "CheckedDecryption"
-    private var checkedDecryption = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         val splashScreen = installSplashScreen()
         splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
@@ -78,18 +72,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        if (savedInstanceState != null) {
-            checkedDecryption = savedInstanceState.getBoolean(CHECKED_DECRYPTION)
-        }
-        if (!checkedDecryption) {
-            val firstTimeSetup = PreferenceManager.getDefaultSharedPreferences(applicationContext)
-                .getBoolean(Settings.PREF_FIRST_APP_LAUNCH, true)
-            if (!firstTimeSetup) {
-                checkKeys()
-            }
-            checkedDecryption = true
-        }
-
         WindowCompat.setDecorFitsSystemWindows(window, false)
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING)
 
@@ -165,16 +147,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     }
                 }
             }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    homeViewModel.checkKeys.collect {
-                        if (it) {
-                            checkKeys()
-                            homeViewModel.setCheckKeys(false)
-                        }
-                    }
-                }
-            }
         }
 
         // Dismiss previous notifications (should not happen unless a crash occurred)
@@ -183,21 +155,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         setInsets()
     }
 
-    private fun checkKeys() {
-        if (!NativeLibrary.areKeysPresent()) {
-            MessageDialogFragment.newInstance(
-                titleId = R.string.keys_missing,
-                descriptionId = R.string.keys_missing_description,
-                helpLinkId = R.string.keys_missing_help
-            ).show(supportFragmentManager, MessageDialogFragment.TAG)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putBoolean(CHECKED_DECRYPTION, checkedDecryption)
-    }
-
     fun finishSetup(navController: NavController) {
         navController.navigate(R.id.action_firstTimeSetupFragment_to_gamesFragment)
         (binding.navigationView as NavigationBarView).setupWithNavController(navController)
@@ -389,7 +346,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     R.string.install_keys_success,
                     Toast.LENGTH_SHORT
                 ).show()
-                homeViewModel.setCheckKeys(true)
                 gamesViewModel.reloadGames(true)
                 return true
             } else {
@@ -411,23 +367,26 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 return@registerForActivityResult
             }
 
+            val inputZip = contentResolver.openInputStream(result)
+            if (inputZip == null) {
+                Toast.makeText(
+                    applicationContext,
+                    getString(R.string.fatal_error),
+                    Toast.LENGTH_LONG
+                ).show()
+                return@registerForActivityResult
+            }
+
             val filterNCA = FilenameFilter { _, dirName -> dirName.endsWith(".nca") }
 
             val firmwarePath =
                 File(DirectoryInitialization.userDirectory + "/nand/system/Contents/registered/")
             val cacheFirmwareDir = File("${cacheDir.path}/registered/")
 
-            ProgressDialogFragment.newInstance(
+            val task: () -> Any = {
-                this,
-                R.string.firmware_installing
-            ) { progressCallback, _ ->
                 var messageToShow: Any
                 try {
-                    FileUtil.unzipToInternalStorage(
+                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheFirmwareDir)
-                        result.toString(),
-                        cacheFirmwareDir,
-                        progressCallback
-                    )
                     val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
                     val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
                     messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
@@ -440,17 +399,21 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                         firmwarePath.deleteRecursively()
                         cacheFirmwareDir.copyRecursively(firmwarePath, true)
                         NativeLibrary.initializeSystem(true)
-                        homeViewModel.setCheckKeys(true)
                         getString(R.string.save_file_imported_success)
                     }
                 } catch (e: Exception) {
-                    Log.error("[MainActivity] Firmware install failed - ${e.message}")
                     messageToShow = getString(R.string.fatal_error)
                 } finally {
                     cacheFirmwareDir.deleteRecursively()
                 }
                 messageToShow
-            }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+            }
+
+            IndeterminateProgressDialogFragment.newInstance(
+                this,
+                R.string.firmware_installing,
+                task = task
+            ).show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
         }
 
     val getAmiiboKey =
@@ -509,11 +472,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             return@registerForActivityResult
         }
 
-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
             this@MainActivity,
             R.string.verifying_content,
             false
-        ) { _, _ ->
+        ) {
             var updatesMatchProgram = true
             for (document in documents) {
                 val valid = NativeLibrary.doesUpdateMatchProgram(
@@ -536,42 +499,44 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     positiveAction = { homeViewModel.setContentToInstall(documents) }
                 )
             }
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
     }
 
     private fun installContent(documents: List<Uri>) {
-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
             this@MainActivity,
             R.string.installing_game_content
-        ) { progressCallback, messageCallback ->
+        ) {
             var installSuccess = 0
             var installOverwrite = 0
             var errorBaseGame = 0
-            var error = 0
+            var errorExtension = 0
+            var errorOther = 0
             documents.forEach {
-                messageCallback.invoke(FileUtil.getFilename(it))
                 when (
-                    InstallResult.from(
+                    NativeLibrary.installFileToNand(
-                        NativeLibrary.installFileToNand(
+                        it.toString(),
-                            it.toString(),
+                        FileUtil.getExtension(it)
-                            progressCallback
-                        )
                     )
                 ) {
-                    InstallResult.Success -> {
+                    NativeLibrary.InstallFileToNandResult.Success -> {
                         installSuccess += 1
                     }
 
-                    InstallResult.Overwrite -> {
+                    NativeLibrary.InstallFileToNandResult.SuccessFileOverwritten -> {
                         installOverwrite += 1
                     }
 
-                    InstallResult.BaseInstallAttempted -> {
+                    NativeLibrary.InstallFileToNandResult.ErrorBaseGame -> {
                         errorBaseGame += 1
                     }
 
-                    InstallResult.Failure -> {
+                    NativeLibrary.InstallFileToNandResult.ErrorFilenameExtension -> {
-                        error += 1
+                        errorExtension += 1
+                    }
+
+                    else -> {
+                        errorOther += 1
                     }
                 }
             }
@@ -598,7 +563,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 )
                 installResult.append(separator)
             }
-            val errorTotal: Int = errorBaseGame + error
+            val errorTotal: Int = errorBaseGame + errorExtension + errorOther
             if (errorTotal > 0) {
                 installResult.append(separator)
                 installResult.append(
@@ -615,7 +580,14 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     )
                     installResult.append(separator)
                 }
-                if (error > 0) {
+                if (errorExtension > 0) {
+                    installResult.append(separator)
+                    installResult.append(
+                        getString(R.string.install_game_content_failure_file_extension)
+                    )
+                    installResult.append(separator)
+                }
+                if (errorOther > 0) {
                     installResult.append(
                         getString(R.string.install_game_content_failure_description)
                     )
@@ -634,7 +606,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                     descriptionString = installResult.toString().trim()
                 )
             }
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
     }
 
     val exportUserData = registerForActivityResult(
@@ -644,16 +616,16 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             return@registerForActivityResult
         }
 
-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
             this,
             R.string.exporting_user_data,
             true
-        ) { progressCallback, _ ->
+        ) {
             val zipResult = FileUtil.zipFromInternalStorage(
                 File(DirectoryInitialization.userDirectory!!),
                 DirectoryInitialization.userDirectory!!,
                 BufferedOutputStream(contentResolver.openOutputStream(result)),
-                progressCallback,
+                taskViewModel.cancelled,
                 compression = false
             )
             return@newInstance when (zipResult) {
@@ -661,7 +633,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 TaskState.Failed -> R.string.export_failed
                 TaskState.Cancelled -> R.string.user_data_export_cancelled
             }
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
     }
 
     val importUserData =
@@ -670,10 +642,10 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 return@registerForActivityResult
             }
 
-            ProgressDialogFragment.newInstance(
+            IndeterminateProgressDialogFragment.newInstance(
                 this,
                 R.string.importing_user_data
-            ) { progressCallback, _ ->
+            ) {
                 val checkStream =
                     ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result)))
                 var isYuzuBackup = false
@@ -702,9 +674,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 // Copy archive to internal storage
                 try {
                     FileUtil.unzipToInternalStorage(
-                        result.toString(),
+                        BufferedInputStream(contentResolver.openInputStream(result)),
-                        File(DirectoryInitialization.userDirectory!!),
+                        File(DirectoryInitialization.userDirectory!!)
-                        progressCallback
                     )
                 } catch (e: Exception) {
                     return@newInstance MessageDialogFragment.newInstance(
@@ -718,9 +689,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 NativeLibrary.initializeSystem(true)
                 NativeConfig.initializeGlobalConfig()
                 gamesViewModel.reloadGames(false)
-                driverViewModel.reloadDriverData()
 
                 return@newInstance getString(R.string.user_data_import_success)
-            }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+            }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
         }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt

@@ -7,6 +7,7 @@ import android.database.Cursor
 import android.net.Uri
 import android.provider.DocumentsContract
 import androidx.documentfile.provider.DocumentFile
+import kotlinx.coroutines.flow.StateFlow
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.IOException
@@ -18,7 +19,6 @@ import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.MinimalDocumentFile
 import org.yuzu.yuzu_emu.model.TaskState
 import java.io.BufferedOutputStream
-import java.io.OutputStream
 import java.lang.NullPointerException
 import java.nio.charset.StandardCharsets
 import java.util.zip.Deflater
@@ -104,7 +104,7 @@ object FileUtil {
 
     /**
      * Reference:  https://stackoverflow.com/questions/42186820/documentfile-is-very-slow
-     * This function will be faster than DocumentFile.listFiles
+     * This function will be faster than DoucmentFile.listFiles
      * @param uri Directory uri.
      * @return CheapDocument lists.
      */
@@ -283,34 +283,12 @@ object FileUtil {
 
     /**
      * Extracts the given zip file into the given directory.
-     * @param path String representation of a [Uri] or a typical path delimited by '/'
-     * @param destDir Location to unzip the contents of [path] into
-     * @param progressCallback Lambda that is called with the total number of files and the current
-     * progress through the process. Stops execution as soon as possible if this returns true.
      */
     @Throws(SecurityException::class)
-    fun unzipToInternalStorage(
+    fun unzipToInternalStorage(zipStream: BufferedInputStream, destDir: File) {
-        path: String,
+        ZipInputStream(zipStream).use { zis ->
-        destDir: File,
-        progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false }
-    ) {
-        var totalEntries = 0L
-        ZipInputStream(getInputStream(path)).use { zis ->
-            var tempEntry = zis.nextEntry
-            while (tempEntry != null) {
-                tempEntry = zis.nextEntry
-                totalEntries++
-            }
-        }
-
-        var progress = 0L
-        ZipInputStream(getInputStream(path)).use { zis ->
             var entry: ZipEntry? = zis.nextEntry
             while (entry != null) {
-                if (progressCallback.invoke(totalEntries, progress)) {
-                    return@use
-                }
-
                 val newFile = File(destDir, entry.name)
                 val destinationDirectory = if (entry.isDirectory) newFile else newFile.parentFile
 
@@ -326,7 +304,6 @@ object FileUtil {
                     newFile.outputStream().use { fos -> zis.copyTo(fos) }
                 }
                 entry = zis.nextEntry
-                progress++
             }
         }
     }
@@ -336,15 +313,14 @@ object FileUtil {
      * @param inputFile File representation of the item that will be zipped
      * @param rootDir Directory containing the inputFile
      * @param outputStream Stream where the zip file will be output
-     * @param progressCallback Lambda that is called with the total number of files and the current
+     * @param cancelled [StateFlow] that reports whether this process has been cancelled
-     * progress through the process. Stops execution as soon as possible if this returns true.
      * @param compression Disables compression if true
      */
     fun zipFromInternalStorage(
         inputFile: File,
         rootDir: String,
         outputStream: BufferedOutputStream,
-        progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false },
+        cancelled: StateFlow<Boolean>? = null,
         compression: Boolean = true
     ): TaskState {
         try {
@@ -354,10 +330,8 @@ object FileUtil {
                     zos.setLevel(Deflater.NO_COMPRESSION)
                 }
 
-                var count = 0L
-                val totalFiles = inputFile.walkTopDown().count().toLong()
                 inputFile.walkTopDown().forEach { file ->
-                    if (progressCallback.invoke(totalFiles, count)) {
+                    if (cancelled?.value == true) {
                         return TaskState.Cancelled
                     }
 
@@ -369,7 +343,6 @@ object FileUtil {
                         if (file.isFile) {
                             file.inputStream().use { fis -> fis.copyTo(zos) }
                         }
-                        count++
                     }
                 }
             }
@@ -383,14 +356,9 @@ object FileUtil {
     /**
      * Helper function that copies the contents of a DocumentFile folder into a [File]
      * @param file [File] representation of the folder to copy into
-     * @param progressCallback Lambda that is called with the total number of files and the current
-     * progress through the process. Stops execution as soon as possible if this returns true.
      * @throws IllegalStateException Fails when trying to copy a folder into a file and vice versa
      */
-    fun DocumentFile.copyFilesTo(
+    fun DocumentFile.copyFilesTo(file: File) {
-        file: File,
-        progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false }
-    ) {
         file.mkdirs()
         if (!this.isDirectory || !file.isDirectory) {
             throw IllegalStateException(
@@ -398,13 +366,7 @@ object FileUtil {
             )
         }
 
-        var count = 0L
-        val totalFiles = this.listFiles().size.toLong()
         this.listFiles().forEach {
-            if (progressCallback.invoke(totalFiles, count)) {
-                return
-            }
-
             val newFile = File(file, it.name!!)
             if (it.isDirectory) {
                 newFile.mkdirs()
@@ -419,7 +381,6 @@ object FileUtil {
                     newFile.outputStream().use { os -> bos.copyTo(os) }
                 }
             }
-            count++
         }
     }
 
@@ -466,18 +427,6 @@ object FileUtil {
         }
     }
 
-    fun getInputStream(path: String) = if (path.contains("content://")) {
-        Uri.parse(path).inputStream()
-    } else {
-        File(path).inputStream()
-    }
-
-    fun getOutputStream(path: String) = if (path.contains("content://")) {
-        Uri.parse(path).outputStream()
-    } else {
-        File(path).outputStream()
-    }
-
     @Throws(IOException::class)
     fun getStringFromFile(file: File): String =
         String(file.readBytes(), StandardCharsets.UTF_8)
@@ -485,19 +434,4 @@ object FileUtil {
     @Throws(IOException::class)
     fun getStringFromInputStream(stream: InputStream): String =
         String(stream.readBytes(), StandardCharsets.UTF_8)
-
-    fun DocumentFile.inputStream(): InputStream =
-        YuzuApplication.appContext.contentResolver.openInputStream(uri)!!
-
-    fun DocumentFile.outputStream(): OutputStream =
-        YuzuApplication.appContext.contentResolver.openOutputStream(uri)!!
-
-    fun Uri.inputStream(): InputStream =
-        YuzuApplication.appContext.contentResolver.openInputStream(this)!!
-
-    fun Uri.outputStream(): OutputStream =
-        YuzuApplication.appContext.contentResolver.openOutputStream(this)!!
-
-    fun Uri.asDocumentFile(): DocumentFile? =
-        DocumentFile.fromSingleUri(YuzuApplication.appContext, this)
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt

@@ -5,10 +5,7 @@ package org.yuzu.yuzu_emu.utils
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.drawable.LayerDrawable
 import android.widget.ImageView
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.drawable.toDrawable
 import androidx.lifecycle.LifecycleOwner
@@ -88,22 +85,4 @@ object GameIconUtils {
         return imageLoader.execute(request)
             .drawable!!.toBitmap(config = Bitmap.Config.ARGB_8888)
     }
-
-    suspend fun getShortcutIcon(lifecycleOwner: LifecycleOwner, game: Game): IconCompat {
-        val layerDrawable = ResourcesCompat.getDrawable(
-            YuzuApplication.appContext.resources,
-            R.drawable.shortcut,
-            null
-        ) as LayerDrawable
-        layerDrawable.setDrawableByLayerId(
-            R.id.shortcut_foreground,
-            getGameIcon(lifecycleOwner, game).toDrawable(YuzuApplication.appContext.resources)
-        )
-        val inset = YuzuApplication.appContext.resources
-            .getDimensionPixelSize(R.dimen.icon_inset)
-        layerDrawable.setLayerInset(1, inset, inset, inset, inset)
-        return IconCompat.createWithAdaptiveBitmap(
-            layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
-        )
-    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt

@@ -5,6 +5,7 @@ package org.yuzu.yuzu_emu.utils
 
 import android.net.Uri
 import android.os.Build
+import java.io.BufferedInputStream
 import java.io.File
 import java.io.IOException
 import org.yuzu.yuzu_emu.NativeLibrary
@@ -61,6 +62,9 @@ object GpuDriverHelper {
                 ?.sortedByDescending { it: Pair<String, GpuDriverMetadata> -> it.second.name }
                 ?.distinct()
                 ?.toMutableList() ?: mutableListOf()
+
+        // TODO: Get system driver information
+        drivers.add(0, Pair("", GpuDriverMetadata()))
         return drivers
     }
 
@@ -122,7 +126,7 @@ object GpuDriverHelper {
         // Unzip the driver.
         try {
             FileUtil.unzipToInternalStorage(
-                copiedFile.path,
+                BufferedInputStream(copiedFile.inputStream()),
                 File(driverInstallationPath!!)
             )
         } catch (e: SecurityException) {
@@ -155,7 +159,7 @@ object GpuDriverHelper {
         // Unzip the driver to the private installation directory
         try {
             FileUtil.unzipToInternalStorage(
-                driver.path,
+                BufferedInputStream(driver.inputStream()),
                 File(driverInstallationPath!!)
             )
         } catch (e: SecurityException) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/viewholder/AbstractViewHolder.kt

@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.viewholder
-
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
-import org.yuzu.yuzu_emu.adapters.AbstractDiffAdapter
-import org.yuzu.yuzu_emu.adapters.AbstractListAdapter
-
-/**
- * [RecyclerView.ViewHolder] meant to work together with a [AbstractDiffAdapter] or a
- * [AbstractListAdapter] so we can run [bind] on each list item without needing a manual hookup.
- */
-abstract class AbstractViewHolder<Model>(binding: ViewBinding) :
-    RecyclerView.ViewHolder(binding.root) {
-    abstract fun bind(model: Model)
-}

src/android/app/src/main/jni/android_common/android_common.cpp

@@ -42,19 +42,3 @@ double GetJDouble(JNIEnv* env, jobject jdouble) {
 jobject ToJDouble(JNIEnv* env, double value) {
     return env->NewObject(IDCache::GetDoubleClass(), IDCache::GetDoubleConstructor(), value);
 }
-
-s32 GetJInteger(JNIEnv* env, jobject jinteger) {
-    return env->GetIntField(jinteger, IDCache::GetIntegerValueField());
-}
-
-jobject ToJInteger(JNIEnv* env, s32 value) {
-    return env->NewObject(IDCache::GetIntegerClass(), IDCache::GetIntegerConstructor(), value);
-}
-
-bool GetJBoolean(JNIEnv* env, jobject jboolean) {
-    return env->GetBooleanField(jboolean, IDCache::GetBooleanValueField());
-}
-
-jobject ToJBoolean(JNIEnv* env, bool value) {
-    return env->NewObject(IDCache::GetBooleanClass(), IDCache::GetBooleanConstructor(), value);
-}

src/android/app/src/main/jni/android_common/android_common.h

@@ -6,7 +6,6 @@
 #include <string>
 
 #include <jni.h>
-#include "common/common_types.h"
 
 std::string GetJString(JNIEnv* env, jstring jstr);
 jstring ToJString(JNIEnv* env, std::string_view str);
@@ -14,9 +13,3 @@ jstring ToJString(JNIEnv* env, std::u16string_view str);
 
 double GetJDouble(JNIEnv* env, jobject jdouble);
 jobject ToJDouble(JNIEnv* env, double value);
-
-s32 GetJInteger(JNIEnv* env, jobject jinteger);
-jobject ToJInteger(JNIEnv* env, s32 value);
-
-bool GetJBoolean(JNIEnv* env, jobject jboolean);
-jobject ToJBoolean(JNIEnv* env, bool value);

src/android/app/src/main/jni/android_config.cpp

@@ -21,7 +21,7 @@ void AndroidConfig::ReloadAllValues() {
 }
 
 void AndroidConfig::SaveAllValues() {
-    SaveValues();
+    Save();
     SaveAndroidValues();
 }
 

src/android/app/src/main/jni/android_settings.h

@@ -63,7 +63,6 @@ struct Values {
     Settings::Setting<bool> show_input_overlay{linkage, true, "show_input_overlay",
                                                Settings::Category::Overlay};
     Settings::Setting<bool> touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay};
-    Settings::Setting<s32> lock_drawer{linkage, false, "lock_drawer", Settings::Category::Overlay};
 };
 
 extern Values values;

src/android/app/src/main/jni/id_cache.cpp

@@ -43,27 +43,10 @@ static jfieldID s_overlay_control_data_landscape_position_field;
 static jfieldID s_overlay_control_data_portrait_position_field;
 static jfieldID s_overlay_control_data_foldable_position_field;
 
-static jclass s_patch_class;
-static jmethodID s_patch_constructor;
-static jfieldID s_patch_enabled_field;
-static jfieldID s_patch_name_field;
-static jfieldID s_patch_version_field;
-static jfieldID s_patch_type_field;
-static jfieldID s_patch_program_id_field;
-static jfieldID s_patch_title_id_field;
-
 static jclass s_double_class;
 static jmethodID s_double_constructor;
 static jfieldID s_double_value_field;
 
-static jclass s_integer_class;
-static jmethodID s_integer_constructor;
-static jfieldID s_integer_value_field;
-
-static jclass s_boolean_class;
-static jmethodID s_boolean_constructor;
-static jfieldID s_boolean_value_field;
-
 static constexpr jint JNI_VERSION = JNI_VERSION_1_6;
 
 namespace IDCache {
@@ -203,38 +186,6 @@ jfieldID GetOverlayControlDataFoldablePositionField() {
     return s_overlay_control_data_foldable_position_field;
 }
 
-jclass GetPatchClass() {
-    return s_patch_class;
-}
-
-jmethodID GetPatchConstructor() {
-    return s_patch_constructor;
-}
-
-jfieldID GetPatchEnabledField() {
-    return s_patch_enabled_field;
-}
-
-jfieldID GetPatchNameField() {
-    return s_patch_name_field;
-}
-
-jfieldID GetPatchVersionField() {
-    return s_patch_version_field;
-}
-
-jfieldID GetPatchTypeField() {
-    return s_patch_type_field;
-}
-
-jfieldID GetPatchProgramIdField() {
-    return s_patch_program_id_field;
-}
-
-jfieldID GetPatchTitleIdField() {
-    return s_patch_title_id_field;
-}
-
 jclass GetDoubleClass() {
     return s_double_class;
 }
@@ -247,30 +198,6 @@ jfieldID GetDoubleValueField() {
     return s_double_value_field;
 }
 
-jclass GetIntegerClass() {
-    return s_integer_class;
-}
-
-jmethodID GetIntegerConstructor() {
-    return s_integer_constructor;
-}
-
-jfieldID GetIntegerValueField() {
-    return s_integer_value_field;
-}
-
-jclass GetBooleanClass() {
-    return s_boolean_class;
-}
-
-jmethodID GetBooleanConstructor() {
-    return s_boolean_constructor;
-}
-
-jfieldID GetBooleanValueField() {
-    return s_boolean_value_field;
-}
-
 } // namespace IDCache
 
 #ifdef __cplusplus
@@ -351,37 +278,12 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
         env->GetFieldID(overlay_control_data_class, "foldablePosition", "Lkotlin/Pair;");
     env->DeleteLocalRef(overlay_control_data_class);
 
-    const jclass patch_class = env->FindClass("org/yuzu/yuzu_emu/model/Patch");
-    s_patch_class = reinterpret_cast<jclass>(env->NewGlobalRef(patch_class));
-    s_patch_constructor = env->GetMethodID(
-        patch_class, "<init>",
-        "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V");
-    s_patch_enabled_field = env->GetFieldID(patch_class, "enabled", "Z");
-    s_patch_name_field = env->GetFieldID(patch_class, "name", "Ljava/lang/String;");
-    s_patch_version_field = env->GetFieldID(patch_class, "version", "Ljava/lang/String;");
-    s_patch_type_field = env->GetFieldID(patch_class, "type", "I");
-    s_patch_program_id_field = env->GetFieldID(patch_class, "programId", "Ljava/lang/String;");
-    s_patch_title_id_field = env->GetFieldID(patch_class, "titleId", "Ljava/lang/String;");
-    env->DeleteLocalRef(patch_class);
-
     const jclass double_class = env->FindClass("java/lang/Double");
     s_double_class = reinterpret_cast<jclass>(env->NewGlobalRef(double_class));
     s_double_constructor = env->GetMethodID(double_class, "<init>", "(D)V");
     s_double_value_field = env->GetFieldID(double_class, "value", "D");
     env->DeleteLocalRef(double_class);
 
-    const jclass int_class = env->FindClass("java/lang/Integer");
-    s_integer_class = reinterpret_cast<jclass>(env->NewGlobalRef(int_class));
-    s_integer_constructor = env->GetMethodID(int_class, "<init>", "(I)V");
-    s_integer_value_field = env->GetFieldID(int_class, "value", "I");
-    env->DeleteLocalRef(int_class);
-
-    const jclass boolean_class = env->FindClass("java/lang/Boolean");
-    s_boolean_class = reinterpret_cast<jclass>(env->NewGlobalRef(boolean_class));
-    s_boolean_constructor = env->GetMethodID(boolean_class, "<init>", "(Z)V");
-    s_boolean_value_field = env->GetFieldID(boolean_class, "value", "Z");
-    env->DeleteLocalRef(boolean_class);
-
     // Initialize Android Storage
     Common::FS::Android::RegisterCallbacks(env, s_native_library_class);
 
@@ -407,10 +309,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
     env->DeleteGlobalRef(s_string_class);
     env->DeleteGlobalRef(s_pair_class);
     env->DeleteGlobalRef(s_overlay_control_data_class);
-    env->DeleteGlobalRef(s_patch_class);
     env->DeleteGlobalRef(s_double_class);
-    env->DeleteGlobalRef(s_integer_class);
-    env->DeleteGlobalRef(s_boolean_class);
 
     // UnInitialize applets
     SoftwareKeyboard::CleanupJNI(env);

src/android/app/src/main/jni/id_cache.h

@@ -43,25 +43,8 @@ jfieldID GetOverlayControlDataLandscapePositionField();
 jfieldID GetOverlayControlDataPortraitPositionField();
 jfieldID GetOverlayControlDataFoldablePositionField();
 
-jclass GetPatchClass();
-jmethodID GetPatchConstructor();
-jfieldID GetPatchEnabledField();
-jfieldID GetPatchNameField();
-jfieldID GetPatchVersionField();
-jfieldID GetPatchTypeField();
-jfieldID GetPatchProgramIdField();
-jfieldID GetPatchTitleIdField();
-
 jclass GetDoubleClass();
 jmethodID GetDoubleConstructor();
 jfieldID GetDoubleValueField();
 
-jclass GetIntegerClass();
-jmethodID GetIntegerConstructor();
-jfieldID GetIntegerValueField();
-
-jclass GetBooleanClass();
-jmethodID GetBooleanConstructor();
-jfieldID GetBooleanValueField();
-
 } // namespace IDCache

src/android/app/src/main/jni/native.cpp

@@ -17,7 +17,6 @@
 #include <core/file_sys/patch_manager.h>
 #include <core/file_sys/savedata_factory.h>
 #include <core/loader/nro.h>
-#include <frontend_common/content_manager.h>
 #include <jni.h>
 
 #include "common/detached_tasks.h"
@@ -101,6 +100,67 @@ void EmulationSession::SetNativeWindow(ANativeWindow* native_window) {
     m_native_window = native_window;
 }
 
+int EmulationSession::InstallFileToNand(std::string filename, std::string file_extension) {
+    jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
+                          std::size_t block_size) {
+        if (src == nullptr || dest == nullptr) {
+            return false;
+        }
+        if (!dest->Resize(src->GetSize())) {
+            return false;
+        }
+
+        using namespace Common::Literals;
+        [[maybe_unused]] std::vector<u8> buffer(1_MiB);
+
+        for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) {
+            jconst read = src->Read(buffer.data(), buffer.size(), i);
+            dest->Write(buffer.data(), read, i);
+        }
+        return true;
+    };
+
+    enum InstallResult {
+        Success = 0,
+        SuccessFileOverwritten = 1,
+        InstallError = 2,
+        ErrorBaseGame = 3,
+        ErrorFilenameExtension = 4,
+    };
+
+    [[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
+    if (file_extension == "nsp") {
+        nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
+        if (nsp->IsExtractedType()) {
+            return InstallError;
+        }
+    } else {
+        return ErrorFilenameExtension;
+    }
+
+    if (!nsp) {
+        return InstallError;
+    }
+
+    if (nsp->GetStatus() != Loader::ResultStatus::Success) {
+        return InstallError;
+    }
+
+    jconst res = m_system.GetFileSystemController().GetUserNANDContents()->InstallEntry(*nsp, true,
+                                                                                        copy_func);
+
+    switch (res) {
+    case FileSys::InstallResult::Success:
+        return Success;
+    case FileSys::InstallResult::OverwriteExisting:
+        return SuccessFileOverwritten;
+    case FileSys::InstallResult::ErrorBaseInstall:
+        return ErrorBaseGame;
+    default:
+        return InstallError;
+    }
+}
+
 void EmulationSession::InitializeGpuDriver(const std::string& hook_lib_dir,
                                            const std::string& custom_driver_dir,
                                            const std::string& custom_driver_name,
@@ -247,7 +307,6 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
     m_system.GetCpuManager().OnGpuReady();
     m_system.RegisterExitCallback([&] { HaltEmulation(); });
 
-    OnEmulationStarted();
     return Core::SystemResultStatus::Success;
 }
 
@@ -351,8 +410,8 @@ void EmulationSession::OnGamepadConnectEvent([[maybe_unused]] int index) {
         jauto handheld = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);
 
         if (controller->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::Handheld) {
-            handheld->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Fullkey);
+            handheld->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController);
-            controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Fullkey);
+            controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController);
             handheld->Disconnect();
         }
     }
@@ -453,20 +512,10 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject
 }
 
 int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
-                                                            jstring j_file, jobject jcallback) {
+                                                            jstring j_file,
-    auto jlambdaClass = env->GetObjectClass(jcallback);
+                                                            jstring j_file_extension) {
-    auto jlambdaInvokeMethod = env->GetMethodID(
+    return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file),
-        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+                                                             GetJString(env, j_file_extension));
-    const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
-        auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
-                                                   ToJDouble(env, max), ToJDouble(env, progress));
-        return GetJBoolean(env, jwasCancelled);
-    };
-
-    return static_cast<int>(
-        ContentManager::InstallNSP(EmulationSession::GetInstance().System(),
-                                   *EmulationSession::GetInstance().System().GetFilesystem(),
-                                   GetJString(env, j_file), callback));
 }
 
 jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_doesUpdateMatchProgram(JNIEnv* env, jobject jobj,
@@ -675,11 +724,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuBackend(JNIEnv* env, jclass
     return ToJString(env, "JIT");
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGpuDriver(JNIEnv* env, jobject jobj) {
-    return ToJString(env,
-                     EmulationSession::GetInstance().System().GPU().Renderer().GetDeviceVendor());
-}
-
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_applySettings(JNIEnv* env, jobject jobj) {
     EmulationSession::GetInstance().System().ApplySettings();
 }
@@ -726,8 +770,8 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv*
     ASSERT(user_id);
 
     const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
-        {}, vfs_nand_dir, FileSys::SaveDataSpaceId::NandUser, FileSys::SaveDataType::SaveData, 1,
+        EmulationSession::GetInstance().System(), vfs_nand_dir, FileSys::SaveDataSpaceId::NandUser,
-        user_id->AsU128(), 0);
+        FileSys::SaveDataType::SaveData, 1, user_id->AsU128(), 0);
 
     const auto full_path = Common::FS::ConcatPathSafe(nand_dir, user_save_data_path);
     if (!Common::FS::CreateParentDirs(full_path)) {
@@ -780,9 +824,9 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isFirmwareAvailable(JNIEnv* env,
     return true;
 }
 
-jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env, jobject jobj,
+jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getAddonsForFile(JNIEnv* env, jobject jobj,
-                                                                     jstring jpath,
+                                                                    jstring jpath,
-                                                                     jstring jprogramId) {
+                                                                    jstring jprogramId) {
     const auto path = GetJString(env, jpath);
     const auto vFile =
         Core::GetGameFileFromPath(EmulationSession::GetInstance().System().GetFilesystem(), path);
@@ -799,78 +843,20 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env
     FileSys::VirtualFile update_raw;
     loader->ReadUpdateRaw(update_raw);
 
-    auto patches = pm.GetPatches(update_raw);
+    auto addons = pm.GetPatchVersionNames(update_raw);
-    jobjectArray jpatchArray =
+    auto jemptyString = ToJString(env, "");
-        env->NewObjectArray(patches.size(), IDCache::GetPatchClass(), nullptr);
+    auto jemptyStringPair = env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(),
+                                           jemptyString, jemptyString);
+    jobjectArray jaddonsArray =
+        env->NewObjectArray(addons.size(), IDCache::GetPairClass(), jemptyStringPair);
     int i = 0;
-    for (const auto& patch : patches) {
+    for (const auto& addon : addons) {
-        jobject jpatch = env->NewObject(
+        jobject jaddon = env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(),
-            IDCache::GetPatchClass(), IDCache::GetPatchConstructor(), patch.enabled,
+                                        ToJString(env, addon.first), ToJString(env, addon.second));
-            ToJString(env, patch.name), ToJString(env, patch.version),
+        env->SetObjectArrayElement(jaddonsArray, i, jaddon);
-            static_cast<jint>(patch.type), ToJString(env, std::to_string(patch.program_id)),
-            ToJString(env, std::to_string(patch.title_id)));
-        env->SetObjectArrayElement(jpatchArray, i, jpatch);
         ++i;
     }
-    return jpatchArray;
+    return jaddonsArray;
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject jobj,
-                                                        jstring jprogramId) {
-    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveUpdate(EmulationSession::GetInstance().System().GetFileSystemController(),
-                                 program_id);
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj,
-                                                     jstring jprogramId) {
-    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveAllDLC(EmulationSession::GetInstance().System(), program_id);
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId,
-                                                     jstring jname) {
-    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveMod(EmulationSession::GetInstance().System().GetFileSystemController(),
-                              program_id, GetJString(env, jname));
-}
-
-jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env,
-                                                                           jobject jobj,
-                                                                           jobject jcallback) {
-    auto jlambdaClass = env->GetObjectClass(jcallback);
-    auto jlambdaInvokeMethod = env->GetMethodID(
-        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-    const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
-        auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
-                                                   ToJDouble(env, max), ToJDouble(env, progress));
-        return GetJBoolean(env, jwasCancelled);
-    };
-
-    auto& session = EmulationSession::GetInstance();
-    std::vector<std::string> result = ContentManager::VerifyInstalledContents(
-        session.System(), *session.GetContentProvider(), callback);
-    jobjectArray jresult =
-        env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, ""));
-    for (size_t i = 0; i < result.size(); ++i) {
-        env->SetObjectArrayElement(jresult, i, ToJString(env, result[i]));
-    }
-    return jresult;
-}
-
-jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobject jobj,
-                                                              jstring jpath, jobject jcallback) {
-    auto jlambdaClass = env->GetObjectClass(jcallback);
-    auto jlambdaInvokeMethod = env->GetMethodID(
-        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-    const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
-        auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
-                                                   ToJDouble(env, max), ToJDouble(env, progress));
-        return GetJBoolean(env, jwasCancelled);
-    };
-    auto& session = EmulationSession::GetInstance();
-    return static_cast<jint>(
-        ContentManager::VerifyGameContents(session.System(), GetJString(env, jpath), callback));
 }
 
 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
@@ -892,7 +878,7 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject j
                                                             FileSys::Mode::Read);
 
     const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
-        {}, vfsNandDir, FileSys::SaveDataSpaceId::NandUser, FileSys::SaveDataType::SaveData,
+        system, vfsNandDir, FileSys::SaveDataSpaceId::NandUser, FileSys::SaveDataType::SaveData,
         program_id, user_id->AsU128(), 0);
     return ToJString(env, user_save_data_path);
 }
@@ -919,10 +905,4 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_clearFilesystemProvider(JNIEnv* env,
     EmulationSession::GetInstance().GetContentProvider()->ClearAllEntries();
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_areKeysPresent(JNIEnv* env, jobject jobj) {
-    auto& system = EmulationSession::GetInstance().System();
-    system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
-    return ContentManager::AreKeysPresent();
-}
-
 } // extern "C"

src/android/app/src/main/jni/native.h

@@ -7,7 +7,6 @@
 #include "core/file_sys/registered_cache.h"
 #include "core/hle/service/acc/profile_manager.h"
 #include "core/perf_stats.h"
-#include "frontend_common/content_manager.h"
 #include "jni/applets/software_keyboard.h"
 #include "jni/emu_window/emu_window.h"
 #include "video_core/rasterizer_interface.h"
@@ -30,6 +29,7 @@ public:
     void SetNativeWindow(ANativeWindow* native_window);
     void SurfaceChanged();
 
+    int InstallFileToNand(std::string filename, std::string file_extension);
     void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir,
                              const std::string& custom_driver_name,
                              const std::string& file_redirect_dir);

src/android/app/src/main/jni/native_config.cpp

@@ -205,7 +205,7 @@ jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_getIsRuntimeModifiable(JNIEn
                                                                            jstring jkey) {
     auto setting = getSetting<std::string>(env, jkey);
     if (setting != nullptr) {
-        return setting->RuntimeModifiable();
+        return setting->RuntimeModfiable();
     }
     return true;
 }

src/android/app/src/main/res/drawable/ic_lock.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="24dp">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
-</vector>

src/android/app/src/main/res/drawable/ic_shortcut.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v160h-80v-40L280,240v480h400v-40h80v160q0,33 -23.5,56.5T680,920L280,920ZM686,520L480,520v120h-80v-120q0,-33 23.5,-56.5T480,440h206l-62,-64 56,-56 160,160 -160,160 -56,-56 62,-64Z" />
-</vector>

src/android/app/src/main/res/layout-w600dp/fragment_about.xml

@@ -11,14 +11,12 @@
         android:id="@+id/appbar_about"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_about"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back"
             app:title="@string/about" />
 
@@ -30,7 +28,6 @@
         android:layout_height="match_parent"
         android:fadeScrollbars="false"
         android:scrollbars="vertical"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
@@ -150,7 +147,7 @@
                     android:layout_marginHorizontal="20dp" />
 
                 <LinearLayout
-                    android:id="@+id/button_version_name"
+                    android:id="@+id/button_build_hash"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackground"
@@ -167,7 +164,7 @@
                         android:textAlignment="viewStart" />
 
                     <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/text_version_name"
+                        android:id="@+id/text_build_hash"
                         style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

src/android/app/src/main/res/layout-w600dp/fragment_game_info.xml

@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinator_about"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_info"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
-            app:navigationIcon="@drawable/ic_back" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scroll_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:defaultFocusHighlightEnabled="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:id="@+id/content_info"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingHorizontal="16dp"
-            android:baselineAligned="false">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_weight="3"
-                android:gravity="top|center_horizontal"
-                android:paddingHorizontal="16dp">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_copy"
-                    style="@style/Widget.Material3.Button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/copy_details" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_verify_integrity"
-                    style="@style/Widget.Material3.Button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/verify_integrity" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_weight="1">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/path"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/path_field"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:editable="false"
-                        android:importantForAutofill="no"
-                        android:inputType="none"
-                        android:minHeight="48dp"
-                        android:textAlignment="viewStart"
-                        tools:text="1.0.0" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/program_id"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/program_id_field"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:editable="false"
-                        android:importantForAutofill="no"
-                        android:inputType="none"
-                        android:minHeight="48dp"
-                        android:textAlignment="viewStart"
-                        tools:text="1.0.0" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/developer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/developer_field"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:editable="false"
-                        android:importantForAutofill="no"
-                        android:inputType="none"
-                        android:minHeight="48dp"
-                        android:textAlignment="viewStart"
-                        tools:text="1.0.0" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/version"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/version_field"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:editable="false"
-                        android:importantForAutofill="no"
-                        android:inputType="none"
-                        android:minHeight="48dp"
-                        android:textAlignment="viewStart"
-                        tools:text="1.0.0" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml

@@ -14,7 +14,6 @@
         android:clipToPadding="false"
         android:fadeScrollbars="false"
         android:scrollbars="vertical"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/icon_layout"
         app:layout_constraintTop_toTopOf="parent">
@@ -44,35 +43,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <Button
-            android:layout_width="match_parent"
+            android:id="@+id/button_back"
+            style="?attr/materialIconButtonStyle"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="start"
             android:layout_margin="8dp"
-            android:orientation="horizontal">
+            app:icon="@drawable/ic_back"
-
+            app:iconSize="24dp"
-            <Button
+            app:iconTint="?attr/colorOnSurface" />
-                android:id="@+id/button_back"
-                style="?attr/materialIconButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_back"
-                app:iconSize="24dp"
-                app:iconTint="?attr/colorOnSurface"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <Button
-                android:id="@+id/button_shortcut"
-                style="?attr/materialIconButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_shortcut"
-                app:iconSize="24dp"
-                app:iconTint="?attr/colorOnSurface"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             style="?attr/materialCardViewElevatedStyle"

src/android/app/src/main/res/layout/card_driver_option.xml

@@ -23,7 +23,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:focusable="false"
             android:clickable="false"
             android:checked="false" />
 

src/android/app/src/main/res/layout/card_folder.xml

@@ -6,14 +6,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
-    android:layout_marginVertical="12dp">
+    android:layout_marginVertical="12dp"
+    android:focusable="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:padding="16dp"
-        android:layout_gravity="center_vertical">
+        android:layout_gravity="center_vertical"
+        android:animateLayoutChanges="true">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/path"

src/android/app/src/main/res/layout/card_home_option.xml

@@ -2,16 +2,16 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    style="?attr/materialCardViewElevatedStyle"
+    style="?attr/materialCardViewFilledStyle"
     android:id="@+id/option_card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="24dp"
     android:layout_marginHorizontal="12dp"
     android:background="?attr/selectableItemBackground"
+    android:backgroundTint="?attr/colorSurfaceVariant"
     android:clickable="true"
-    android:focusable="true"
+    android:focusable="true">
-    app:cardElevation="4dp">
 
     <LinearLayout
         android:id="@+id/option_layout"

src/android/app/src/main/res/layout/dialog_progress_bar.xml

@@ -1,30 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.progressindicator.LinearProgressIndicator xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/progress_bar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:padding="24dp"
-
+    app:trackCornerRadius="4dp" />
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/message"
-        style="@style/TextAppearance.Material3.BodyMedium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="6dp"
-        android:ellipsize="marquee"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:requiresFadingEdge="horizontal"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        android:visibility="gone" />
-
-    <com.google.android.material.progressindicator.LinearProgressIndicator
-        android:id="@+id/progress_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="24dp"
-        app:trackCornerRadius="4dp" />
-
-</LinearLayout>

src/android/app/src/main/res/layout/fragment_about.xml

@@ -11,14 +11,12 @@
         android:id="@+id/appbar_about"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_about"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:title="@string/about"
             app:navigationIcon="@drawable/ic_back" />
 
@@ -30,7 +28,6 @@
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
@@ -151,7 +148,7 @@
                 android:layout_marginHorizontal="20dp" />
 
             <LinearLayout
-                android:id="@+id/button_version_name"
+                android:id="@+id/button_build_hash"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingVertical="16dp"
@@ -168,7 +165,7 @@
                     android:text="@string/build" />
 
                 <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/text_version_name"
+                    android:id="@+id/text_build_hash"
                     style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

src/android/app/src/main/res/layout/fragment_addons.xml

@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -20,7 +19,6 @@
             android:id="@+id/toolbar_addons"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -30,8 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
-        android:defaultFocusHighlightEnabled="false"
-        android:nextFocusDown="@id/button_install"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

src/android/app/src/main/res/layout/fragment_applet_launcher.xml

@@ -10,14 +10,12 @@
         android:id="@+id/appbar_applets"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_applets"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back"
             app:title="@string/applets" />
 

src/android/app/src/main/res/layout/fragment_driver_manager.xml

@@ -15,14 +15,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
-            android:touchscreenBlocksFocus="false"
             app:liftOnScrollTargetViewId="@id/list_drivers">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar_drivers"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:touchscreenBlocksFocus="false"
                 app:navigationIcon="@drawable/ic_back"
                 app:title="@string/gpu_driver_manager" />
 

src/android/app/src/main/res/layout/fragment_early_access.xml

@@ -11,14 +11,12 @@
         android:id="@+id/appbar_ea"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_about"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back"
             app:title="@string/early_access" />
 
@@ -32,7 +30,6 @@
         android:paddingBottom="20dp"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout

src/android/app/src/main/res/layout/fragment_emulation.xml

@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true"
-    android:defaultFocusHighlightEnabled="false"
     tools:context="org.yuzu.yuzu_emu.fragments.EmulationFragment"
     tools:openDrawer="start">
 
@@ -25,8 +24,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:focusable="false"
-                android:focusableInTouchMode="false"
+                android:focusableInTouchMode="false" />
-                android:defaultFocusHighlightEnabled="false" />
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/loading_indicator"
@@ -34,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:defaultFocusHighlightEnabled="false"
+                android:focusable="false"
                 android:clickable="false">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -120,7 +118,6 @@
                 android:layout_gravity="center"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:defaultFocusHighlightEnabled="false"
                 android:visibility="invisible" />
 
             <Button
@@ -163,7 +160,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:focusedByDefault="true"
         app:headerLayout="@layout/header_in_game"
         app:menu="@menu/menu_in_game"
         tools:visibility="gone" />

src/android/app/src/main/res/layout/fragment_folders.xml

@@ -15,14 +15,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
-            android:touchscreenBlocksFocus="false"
             app:liftOnScrollTargetViewId="@id/list_folders">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar_folders"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:touchscreenBlocksFocus="false"
                 app:navigationIcon="@drawable/ic_back"
                 app:title="@string/game_folders" />
 
@@ -33,7 +31,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clipToPadding="false"
-            android:defaultFocusHighlightEnabled="false"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>

src/android/app/src/main/res/layout/fragment_game_info.xml

@@ -11,14 +11,12 @@
         android:id="@+id/appbar_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:touchscreenBlocksFocus="false"
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_info"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:navigationIcon="@drawable/ic_back" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -27,7 +25,6 @@
         android:id="@+id/scroll_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:defaultFocusHighlightEnabled="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
@@ -121,14 +118,6 @@
                 android:layout_marginTop="16dp"
                 android:text="@string/copy_details" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/button_verify_integrity"
-                style="@style/Widget.Material3.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/verify_integrity" />
-
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>

src/android/app/src/main/res/layout/fragment_game_properties.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,8 +13,7 @@
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
-        android:clipToPadding="false"
+        android:clipToPadding="false">
-        android:defaultFocusHighlightEnabled="false">
 
         <LinearLayout
             android:id="@+id/layout_all"
@@ -22,35 +22,16 @@
             android:orientation="vertical"
             android:gravity="center_horizontal">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <Button
-                android:layout_width="match_parent"
+                android:id="@+id/button_back"
+                style="?attr/materialIconButtonStyle"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
-                android:orientation="horizontal">
+                android:layout_gravity="start"
-
+                app:icon="@drawable/ic_back"
-                <Button
+                app:iconSize="24dp"
-                    android:id="@+id/button_back"
+                app:iconTint="?attr/colorOnSurface" />
-                    style="?attr/materialIconButtonStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:icon="@drawable/ic_back"
-                    app:iconSize="24dp"
-                    app:iconTint="?attr/colorOnSurface"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <Button
-                    android:id="@+id/button_shortcut"
-                    style="?attr/materialIconButtonStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:icon="@drawable/ic_shortcut"
-                    app:iconSize="24dp"
-                    app:iconTint="?attr/colorOnSurface"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <com.google.android.material.card.MaterialCardView
                 style="?attr/materialCardViewElevatedStyle"
@@ -64,7 +45,7 @@
                     android:id="@+id/image_game_screen"
                     android:layout_width="175dp"
                     android:layout_height="175dp"
-                    tools:src="@drawable/default_icon" />
+                    tools:src="@drawable/default_icon"/>
 
             </com.google.android.material.card.MaterialCardView>
 
@@ -87,7 +68,7 @@
                 android:id="@+id/list_properties"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:defaultFocusHighlightEnabled="false" />
+                tools:listitem="@layout/card_simple_outlined" />
 
         </LinearLayout>
 

src/android/app/src/main/res/layout/fragment_games.xml

@@ -27,7 +27,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            android:defaultFocusHighlightEnabled="false"
             tools:listitem="@layout/card_game" />
 
     </RelativeLayout>

src/android/app/src/main/res/layout/fragment_home_settings.xml

@@ -7,8 +7,7 @@
     android:background="?attr/colorSurface"
     android:scrollbars="vertical"
     android:fadeScrollbars="false"
-    android:clipToPadding="false"
+    android:clipToPadding="false">
-    android:defaultFocusHighlightEnabled="false">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/linear_layout_settings"

src/android/app/src/main/res/layout/fragment_installables.xml

@@ -10,14 +10,12 @@
         android:id="@+id/appbar_installables"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_installables"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:title="@string/manage_yuzu_data"
             app:navigationIcon="@drawable/ic_back" />
 

src/android/app/src/main/res/layout/fragment_licenses.xml

@@ -10,14 +10,12 @@
         android:id="@+id/appbar_licenses"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="true">
-        android:touchscreenBlocksFocus="false">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_licenses"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
             app:title="@string/licenses"
             app:navigationIcon="@drawable/ic_back" />
 

src/android/app/src/main/res/layout/fragment_settings.xml

@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false"
         app:elevation="0dp">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -25,7 +24,6 @@
                 android:id="@+id/toolbar_settings"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:touchscreenBlocksFocus="false"
                 app:layout_collapseMode="pin"
                 app:navigationIcon="@drawable/ic_back" />
 

src/android/app/src/main/res/layout/list_item_addon.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:focusable="false"
+    android:focusable="true"
     android:paddingHorizontal="20dp"
     android:paddingVertical="16dp">
 
@@ -14,11 +14,12 @@
         android:id="@+id/text_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:layout_marginEnd="16dp"
-        app:layout_constraintEnd_toStartOf="@+id/addon_checkbox"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="@+id/addon_switch"
+        app:layout_constraintEnd_toStartOf="@+id/addon_switch"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="@+id/addon_switch">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
@@ -41,29 +42,16 @@
 
     </LinearLayout>
 
-    <com.google.android.material.checkbox.MaterialCheckBox
+    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/addon_checkbox"
+        android:id="@+id/addon_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:focusable="true"
         android:gravity="center"
-        android:layout_marginEnd="8dp"
+        android:nextFocusLeft="@id/addon_container"
-        app:layout_constraintTop_toTopOf="@+id/text_container"
+        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintBottom_toBottomOf="@+id/text_container"
-        app:layout_constraintEnd_toStartOf="@+id/button_delete" />
-
-    <Button
-        android:id="@+id/button_delete"
-        style="@style/Widget.Material3.Button.IconButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/delete"
-        android:tooltipText="@string/delete"
-        app:icon="@drawable/ic_delete"
-        app:iconTint="?attr/colorControlNormal"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/addon_checkbox"
+        app:layout_constraintStart_toEndOf="@id/text_container"
-        app:layout_constraintBottom_toBottomOf="@+id/addon_checkbox" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

src/android/app/src/main/res/layout/list_item_setting.xml

@@ -69,7 +69,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:visibility="gone"
-                android:text="@string/use_global_setting"
+                android:text="@string/clear"
                 tools:visibility="visible" />
 
         </LinearLayout>

src/android/app/src/main/res/layout/list_item_setting_switch.xml

@@ -63,7 +63,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="@string/use_global_setting"
+            android:text="@string/clear"
             android:visibility="gone"
             tools:visibility="visible" />
 

src/android/app/src/main/res/layout/list_item_settings_header.xml

@@ -12,5 +12,4 @@
     android:textAlignment="viewStart"
     android:textColor="?attr/colorPrimary"
     android:textStyle="bold"
-    android:focusable="false"
     tools:text="CPU Settings" />

src/android/app/src/main/res/menu/menu_driver_manager.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_driver_use_global"
-        android:title="@string/use_global_setting" />
-
-</menu>

src/android/app/src/main/res/menu/menu_in_game.xml

@@ -21,11 +21,6 @@
         android:icon="@drawable/ic_controller"
         android:title="@string/emulation_input_overlay" />
 
-    <item
-        android:id="@+id/menu_lock_drawer"
-        android:icon="@drawable/ic_unlock"
-        android:title="@string/emulation_input_overlay" />
-
     <item
         android:id="@+id/menu_exit"
         android:icon="@drawable/ic_exit"

src/android/app/src/main/res/values-ar/strings.xml

@@ -3,39 +3,38 @@
 
     <string name="emulation_notification_channel_name">المحاكي نشط</string>
     <string name="emulation_notification_channel_description">اظهار اشعار دائم عندما يكون المحاكي نشطاً</string>
-    <string name="emulation_notification_running">يوزو قيد التشغيل</string>
+    <string name="emulation_notification_running">يوزو يعمل</string>
     <string name="notice_notification_channel_name">الإشعارات والأخطاء</string>
     <string name="notice_notification_channel_description">اظهار اشعار عند حصول اي مشكلة.</string>
     <string name="notification_permission_not_granted">لم يتم منح إذن الإشعار</string>
 
     <!-- Setup strings -->
-    <string name="welcome">مرحبا</string>
+    <string name="welcome">مرحبًا</string>
-    <string name="welcome_description">تعرف على كيفية إعداد  <b>يوزو</b> والانتقال إلى المحاكاة</string>
+    <string name="welcome_description">والانتقال إلى المحاكاة <b>يوزو</b> تعرف على كيفية إعداد.</string>
     <string name="get_started">لنبدأ</string>
     <string name="keys">المفاتيح</string>
     <string name="keys_description">اختر ملف &lt;b>prod.keys&lt;/b> من الزر ادناه</string>
     <string name="select_keys">إختيار المفاتيح</string>
     <string name="games">الألعاب</string>
-    <string name="games_description">حدد مجلد &lt;b>العابك&lt;/b> من الزر ادناه.</string>
+    <string name="games_description">اختر مجلد &lt;b>العابك&lt;/b> من الزر ادناه.</string>
     <string name="done">إنهاء</string>
-    <string name="done_description">أنت جاهز تمامًا. استمتع بألعابك!</string>
+    <string name="done_description">كل شيء جاهز./n استمتع بألعابك!</string>
     <string name="text_continue">استمر</string>
     <string name="next">التالي</string>
     <string name="back">عودة</string>
     <string name="add_games">إضافة ألعاب</string>
-    <string name="add_games_description">حدد مجلد الألعاب الخاص بك</string>
+    <string name="add_games_description">إختار مجلد ألعابك</string>
     <string name="step_complete">مكتمل</string>
 
     <!-- Home strings -->
     <string name="home_games">الألعاب</string>
     <string name="home_search">البحث</string>
     <string name="home_settings">الإعدادات</string>
-    <string name="empty_gamelist">لم يتم العثور على ملفات أو لم يتم تحديد مجلد الألعاب حتى الآن.</string>
+    <string name="empty_gamelist">لم يتم العثور على ملفات او لم يتم تحديد مسار العاب.</string>
-    <string name="search_and_filter_games">البحث وتصفية الألعاب</string>
+    <string name="search_and_filter_games">بحث وتصفية الألعاب</string>
-    <string name="select_games_folder">حدد مجلد الألعاب</string>
+    <string name="select_games_folder">تحديد مجلد الألعاب</string>
-    <string name="manage_game_folders">إدارة مجلدات اللعبة</string>
     <string name="select_games_folder_description">يسمح لـ يوزو بملء قائمة الألعاب</string>
-    <string name="add_games_warning">تخطي تحديد مجلد الألعاب؟</string>
+    <string name="add_games_warning">تخطُ اختيار مجلد الالعاب؟</string>
     <string name="add_games_warning_description">لن يتم عرض الألعاب في قائمة الألعاب إذا لم يتم تحديد مجلد</string>
     <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string>
     <string name="home_search_games">البحث عن ألعاب</string>
@@ -46,7 +45,7 @@
     <string name="install_prod_keys_warning">تخطي إضافة المفاتيح؟</string>
     <string name="install_prod_keys_warning_description">مطلوب مفاتيح صالحة لمحاكاة ألعاب البيع بالتجزئة. ستعمل تطبيقات البيرة المنزلية فقط إذا تابعت</string>
     <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string>
-    <string name="notifications">الإشعارات</string>
+    <string name="notifications">التنبيهات</string>
     <string name="notifications_description">امنح إذن الإشعار باستخدام الزر أدناه</string>
     <string name="give_permission">منح الإذن</string>
     <string name="notification_warning">تخطي منح إذن الإشعارات؟</string>
@@ -63,12 +62,9 @@
     <string name="invalid_keys_file">تم تحديد ملف مفاتيح غير صالح</string>
     <string name="install_keys_success">تم تثبيت المفاتيح بنجاح</string>
     <string name="reading_keys_failure">خطأ في قراءة مفاتيح التشفير</string>
-    <string name="install_prod_keys_failure_extension_description">وحاول مرة أخر keys تحقق من أن ملف المفاتيح له امتداد</string>
-    <string name="install_amiibo_keys_failure_extension_description">وحاول مرة أخر bin تحقق من أن ملف المفاتيح له امتداد</string>
     <string name="invalid_keys_error">مفاتيح التشفير غير صالحة</string>
     <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
     <string name="install_keys_failure_description">الملف المحدد غير صحيح أو تالف. يرجى إعادة المفاتيح الخاصة بك</string>
-    <string name="gpu_driver_manager">GPU مدير برنامج تشغيل</string>
     <string name="install_gpu_driver">GPU تثبيت برنامج تشغيل</string>
     <string name="install_gpu_driver_description">قم بتثبيت برامج تشغيل بديلة للحصول على أداء أو دقة أفضل</string>
     <string name="advanced_settings">إعدادات متقدمة</string>
@@ -86,27 +82,22 @@
     <string name="notification_no_directory_link_description">الرجاء تحديد موقع مجلد المستخدم باستخدام اللوحة الجانبية لمدير الملفات يدويًا</string>
     <string name="manage_save_data">إدارة حفظ البيانات</string>
     <string name="manage_save_data_description">حفظ البيانات التي تم العثور عليها. يرجى اختيار أحد الخيارات التالية</string>
-    <string name="import_save_warning">استيراد حفظ البيانات</string>
-    <string name="import_save_warning_description">سيؤدي هذا إلى استبدال جميع بيانات الحفظ الموجودة بالملف المقدم. هل أنت متأكد أنك تريد الاستمرار؟</string>
     <string name="import_export_saves_description">استيراد أو تصدير ملفات الحفظ</string>
-    <string name="save_files_importing">جاري استيراد ملفات الحفظ</string>
-    <string name="save_files_exporting">جاري تصدير ملفات الحفظ</string>
     <string name="save_file_imported_success">تم الاستيراد بنجاح</string>
     <string name="save_file_invalid_zip_structure">بنية مجلد الحفظ غير صالحة</string>
     <string name="save_file_invalid_zip_structure_description">يجب أن يكون اسم المجلد الفرعي الأول هو معرف عنوان اللعبة.</string>
     <string name="import_saves">استيراد</string>
     <string name="export_saves">تصدير</string>
-    <string name="install_firmware">تثبيت فيرموير</string>
+    <string name="install_firmware">تثبيت البرامج الثابتة</string>
-    <string name="install_firmware_description">يجب أن يكون فيرموير في أرشيف مضغوط وهو ضروري لتشغيل بعض الألعاب</string>
+    <string name="firmware_installing">تثبيت البرامج الثابتة</string>
-    <string name="firmware_installing">تثبيت فيرموير</string>
+    <string name="firmware_installed_success">تم تثبيت البرامج الثابتة بنجاح</string>
-    <string name="firmware_installed_success">تم تثبيت فيرموير بنجاح</string>
+    <string name="firmware_installed_failure">فشل تثبيت البرامج الثابتة</string>
-    <string name="firmware_installed_failure">فشل تثبيت فيرموير</string>
     <string name="share_log">مشاركة سجلات التصحيح</string>
     <string name="share_log_description">مشاركة ملف سجل يوزو لتصحيح المشكلات</string>
     <string name="share_log_missing">لم يتم العثور على ملف السجل</string>
     <string name="install_game_content">تثبيت محتوى اللعبة</string>
     <string name="install_game_content_description">DLC قم بتثبيت تحديثات اللعبة أو</string>
-    <string name="installing_game_content">جاري تثبيت المحتوى</string>
+    <string name="installing_game_content">جارٍ تثبيت المحتوى</string>
     <string name="install_game_content_failure_base">لا يُسمح بتثبيت الألعاب الأساسية لتجنب التعارضات المحتملة.</string>
     <string name="install_game_content_success_install">%1$d تم التثبيت بنجاح</string>
     <string name="install_game_content_success_overwrite">%1$d تمت الكتابة فوقه بنجاح</string>
@@ -114,39 +105,19 @@
     <string name="custom_driver_not_supported">برامج التشغيل المخصصة غير مدعومة</string>
     <string name="custom_driver_not_supported_description">تحميل برنامج التشغيل المخصص غير معتمد حاليًا لهذا الجهاز.\nحدد هذا الخيار مرة أخرى في المستقبل لمعرفة ما إذا تمت إضافة الدعم!</string>
     <string name="manage_yuzu_data">إدارة بيانات يوزو</string>
-    <string name="manage_yuzu_data_description">استيراد/تصدير فيرموير والمفاتيح وبيانات المستخدم والمزيد</string>
+    <string name="manage_yuzu_data_description">استيراد/تصدير البرامج الثابتة والمفاتيح وبيانات المستخدم والمزيد!</string>
     <string name="share_save_file">مشاركة ملف الحفظ</string>
     <string name="export_save_failed">فشل تصدير الحفظ</string>
-    <string name="game_folders">مجلدات اللعبة</string>
-    <string name="deep_scan">فحص عميق</string>
-    <string name="add_game_folder">إضافة مجلد اللعبة</string>
-    <string name="folder_already_added">تمت إضافة هذا المجلد بالفعل</string>
-    <string name="game_folder_properties">خصائص مجلد اللعبة</string>
-    <string name="no_save_data_found">لم يتم العثور على بيانات الحفظ</string>
 
-    <!-- Applet launcher strings -->
-    <string name="applets">قائمة التطبيقات المصغرة</string>
-    <string name="applets_description">قم بتشغيل تطبيقات النظام باستخدام فيرموير المثبت</string>
-    <string name="applets_error_firmware">فيرموير غير مثبت</string>
-    <string name="applets_error_applet">التطبيق المصغر غير متوفر</string>
-    <string name="album_applet">الألبوم</string>
-    <string name="album_applet_description">شاهد الصور المخزنة في مجلد لقطات شاشة المستخدم باستخدام عارض صور النظام</string>
-    <string name="mii_edit_applet">تحرير Mii</string>
-    <string name="mii_edit_applet_description">باستخدام محرر النظام Miis عرض وتحرير</string>
-    <string name="cabinet_applet_description">تحرير وحذف البيانات المخزنة على أميبو</string>
-    <string name="cabinet_nickname_and_owner">إعدادات الاسم المستعار والمالك</string>
-    <string name="cabinet_game_data_eraser">ممحاة بيانات اللعبة</string>
     <string name="copied_to_clipboard">نسخ إلى الحافظة</string>
     <string name="about_app_description">محاكي سويتش مفتوح المصدر</string>
     <string name="contributors">المساهمين</string>
-    <string name="contributors_description">مصنوع من فريق يوزو</string>
     <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
     <string name="licenses_description">المشاريع التي تجعل تطبيق يوزو لنظام أندرويد ممكنًا</string>
     <string name="build">البناء</string>
     <string name="user_data">بيانات المستخدم</string>
-    <string name="user_data_description">استيراد/تصدير جميع بيانات التطبيق. عند استيراد بيانات المستخدم، سيتم حذف جميع بيانات المستخدم الحالية!</string>
+    <string name="exporting_user_data">جارٍ تصدير بيانات المستخدم</string>
-    <string name="exporting_user_data">جاري تصدير بيانات المستخدم</string>
+    <string name="importing_user_data">جارٍ استيراد بيانات المستخدم</string>
-    <string name="importing_user_data">جاري استيراد بيانات المستخدم</string>
     <string name="import_user_data">استيراد بيانات المستخدم</string>
     <string name="invalid_yuzu_backup">نسخة احتياطية يوزو غير صالحة</string>
     <string name="user_data_export_success">تم تصدير بيانات المستخدم بنجاح</string>
@@ -182,7 +153,7 @@
     <string name="use_docked_mode">وضع الإرساء</string>
     <string name="use_docked_mode_description">زيادة الدقة، وانخفاض الأداء. يتم استخدام الوضع المحمول عند تعطيله، مما يؤدي إلى خفض الدقة وزيادة الأداء.</string>
     <string name="emulated_region">المنطقة التي تمت محاكاتها</string>
-    <string name="emulated_language">لغة المحاكاة</string>
+    <string name="emulated_language">لغة المحاكاه</string>
     <string name="select_rtc_date">حدد التاريخ و الساعة في الوقت الحقيقي</string>
     <string name="select_rtc_time">حدد وقت الساعة في الوقت الفعلي</string>
     <string name="use_custom_rtc">ساعة مخصصة في الوقت الحقيقي</string>
@@ -193,7 +164,7 @@
     <string name="renderer_accuracy">مستوى الدقة</string>
     <string name="renderer_resolution">(Handheld/Docked) الدقة</string>
     <string name="renderer_vsync">VSync وضع</string>
-    <string name="renderer_screen_layout">اتجاه العرض</string>
+    <string name="renderer_screen_layout">الاتجاه</string>
     <string name="renderer_aspect_ratio">تناسب الابعاد</string>
     <string name="renderer_anti_aliasing">طريقة مكافحة التعرج</string>
     <string name="renderer_asynchronous_shaders">استخدم تظليل غير متزامن</string>
@@ -201,32 +172,31 @@
     <string name="renderer_reactive_flushing">استخدم التنظيف التفاعلي</string>
     <string name="renderer_reactive_flushing_description">تحسين دقة العرض في بعض الألعاب على حساب الأداء</string>
     <string name="use_disk_shader_cache_description">يقلل من التأتأة عن طريق تخزين وتحميل التظليلات التي تم إنشاؤها محليًا.</string>
+
     <!-- Debug settings strings -->
     <string name="cpu">وحدة المعالج المركزية</string>
     <string name="cpu_debug_mode">تصحيح أخطاء وحدة المعالجة المركزية</string>
     <string name="cpu_debug_mode_description">يضع وحدة المعالجة المركزية في وضع التصحيح البطيء.</string>
-    <string name="gpu">وحدة معالجة الرسومات</string>
+    <string name="gpu">GPU</string>
-    <string name="renderer_api">واجهة برمجة التطبيقات</string>
+    <string name="renderer_api">API</string>
     <string name="renderer_debug">تصحيح الأخطاء الرسومية</string>
     <string name="renderer_debug_description">يضبط واجهة برمجة تطبيقات الرسومات على وضع تصحيح الأخطاء البطيء.</string>
     <string name="fastmem">Fastmem</string>
 
     <!-- Audio settings strings -->
     <string name="audio_output_engine">محرك الإخراج</string>
-    <string name="audio_volume">مستوى الصوت</string>
+    <string name="audio_volume">حجم</string>
-    <string name="audio_volume_description">يحدد مستوى إخراج الصوت</string>
+    <string name="audio_volume_description">يحدد حجم إخراج الصوت</string>
 
     <!-- Miscellaneous -->
     <string name="slider_default">افتراضي</string>
     <string name="ini_saved">الإعدادات المحفوظة</string>
     <string name="gameid_saved">الإعدادات المحفوظة لـ %1$s</string>
-    <string name="error_saving">خطأ في حفظ %1$s.ini: %2$s</string>
     <string name="unimplemented_menu">القائمة غير المنفذة</string>
-    <string name="loading">جاري التحميل</string>
+    <string name="loading">جاري تحميل</string>
-    <string name="shutting_down">إيقاف التشغيل</string>
+    <string name="shutting_down">إيقاف تشغيل</string>
     <string name="reset_setting_confirmation">هل تريد إعادة تعيين هذا الإعداد مرة أخرى إلى قيمته الافتراضية؟</string>
-    <string name="reset_to_default">إعادة التعيين إلى الوضع الافتراضي</string>
+    <string name="reset_to_default">إعادة تعيين إلى الافتراضي</string>
-    <string name="reset_to_default_description">إعادة تعيين جميع الإعدادات المتقدمة</string>
     <string name="reset_all_settings">إعادة تعيين جميع الإعدادات؟</string>
     <string name="reset_all_settings_description">سيتم إعادة تعيين كافة الإعدادات المتقدمة إلى تكوينها الافتراضي. هذا لا يمكن التراجع عنها.</string>
     <string name="settings_reset">إعادة تعيين الأعدادات</string>
@@ -234,77 +204,32 @@
     <string name="learn_more">معرفة المزيد</string>
     <string name="auto">تلقائي</string>
     <string name="submit">إرسال</string>
-    <string name="string_null">لا شيء</string>
+    <string name="string_null">قيمه خاليه</string>
     <string name="string_import">استيراد</string>
     <string name="export">تصدير</string>
     <string name="export_failed">فشل التصدير</string>
     <string name="import_failed">فشل الاستيراد</string>
     <string name="cancelling">إلغاء</string>
-    <string name="install">تثبيت</string>
+
-    <string name="delete">حذف</string>
-    <string name="edit">حرر</string>
-    <string name="export_success">تم التصدير بنجاح</string>
-    <string name="start">Start</string>
-    <string name="clear">مسح</string>
-    <string name="global">عالمي</string>
-    <string name="custom">مخصص</string>
-    <string name="notice">إشعار</string>
-    <string name="import_complete">اكتمل الاستيراد</string>
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">GPU حدد برنامج تشغيل</string>
     <string name="select_gpu_driver_title">الحالي الخاص بك؟ GPU هل ترغب في استبدال برنامج تشغيل</string>
     <string name="select_gpu_driver_install">تثبيت</string>
     <string name="select_gpu_driver_default">افتراضي</string>
-    <string name="select_gpu_driver_use_default">يستخدم تعريف معالج الرسومات الافتراضي</string>
+    <string name="select_gpu_driver_use_default">يستخدم تعريف معالج الرسوميات الافتراضي</string>
-    <string name="select_gpu_driver_error">تم تحديد برنامج تشغيل غير صالح</string>
+    <string name="select_gpu_driver_error">تم تحديد برنامج تشغيل غير صالح ، باستخدام النظام الافتراضي</string>
-    <string name="driver_already_installed">برنامج التشغيل مثبت بالفعل</string>
+    <string name="system_gpu_driver">تعريف معالج الرسوميات الخاص بالنظام</string>
-    <string name="system_gpu_driver">تعريف معالج الرسومات الخاص بالنظام</string>
+    <string name="installing_driver">جارٍ تثبيت برنامج التشغيل…</string>
-    <string name="installing_driver">جاري تثبيت برنامج التشغيل…</string>
 
     <!-- Preferences Screen -->
     <string name="preferences_settings">إعدادات</string>
     <string name="preferences_general">عام</string>
     <string name="preferences_system">النظام</string>
-    <string name="preferences_system_description">وضع الإرساء ،المنطقة ،اللغة</string>
+    <string name="preferences_graphics">الرسوميات</string>
-    <string name="preferences_graphics">الرسومات</string>
-    <string name="preferences_graphics_description">مستوى الدقة ،الدقة ،ذاكرة التخزين المؤقت للتظليل</string>
     <string name="preferences_audio">الصوت</string>
-    <string name="preferences_audio_description">محرك الإخراج ، حجم الصوت</string>
     <string name="preferences_theme">السمة واللون</string>
     <string name="preferences_debug">تصحيح الأخطاء</string>
-    <!-- Game properties -->
+
-    <string name="info">معلومات</string>
-    <string name="info_description">معرف البرنامج، المطور، الإصدار</string>
-    <string name="per_game_settings">إعدادات كل لعبة</string>
-    <string name="per_game_settings_description">تحرير الإعدادات الخاصة بهذه اللعبة</string>
-    <string name="launch_options">تشغيل الإعدادات</string>
-    <string name="path">المسار</string>
-    <string name="program_id">معرف البرنامج</string>
-    <string name="developer">المطور</string>
-    <string name="version">إصدار</string>
-    <string name="copy_details">نسخ التفاصيل</string>
-    <string name="add_ons">الإضافات</string>
-    <string name="add_ons_description">DLCالتعديلات والتحديثات و</string>
-    <string name="clear_shader_cache">مسح ذاكرة التخزين المؤقت للتظليل</string>
-    <string name="clear_shader_cache_description">يزيل جميع التظليلات التي تم إنشاؤها أثناء لعب هذه اللعبة</string>
-    <string name="clear_shader_cache_warning_description">سوف تواجه المزيد من التأتأة مع تجديد ذاكرة التخزين المؤقت للتظليل</string>
-    <string name="cleared_shaders_successfully">تم مسح التظليل بنجاح</string>
-    <string name="addons_game">إضافات: %1$s</string>
-    <string name="save_data">حفظ البيانات</string>
-    <string name="save_data_description">إدارة حفظ البيانات الخاصة بهذه اللعبة</string>
-    <string name="delete_save_data">حذف حفظ البيانات</string>
-    <string name="delete_save_data_description">يزيل كافة البيانات المحفوظة الخاصة بهذه اللعبة</string>
-    <string name="delete_save_data_warning_description">يؤدي هذا إلى إزالة كافة البيانات المحفوظة لهذه اللعبة بشكل لا يمكن استرداده. هل أنت متأكد أنك تريد الاستمرار؟</string>
-    <string name="save_data_deleted_successfully">حفظ البيانات تم حذفها بنجاح</string>
-    <string name="select_content_type">نوع المحتوى</string>
-    <string name="updates_and_dlc">DLC التحديثات والمحتوى القابل للتنزيل  </string>
-    <string name="mods_and_cheats">تعديل وغش</string>
-    <string name="addon_notice">إشعار إضافي مهم</string>
-    <string name="invalid_directory">مجلد غير صالح</string>
-    <string name="addon_installed_successfully">تم تثبيت الملحق بنجاح</string>
-    <string name="verifying_content">جاري التحقق من المحتوى</string>
-    <string name="content_install_notice">إشعار تثبيت المحتوى</string>
-    <string name="content_install_notice_description">المحتوى الذي حددته لا يتطابق مع هذه اللعبة.هل تريد التثبيت على أية حال؟</string>
     <!-- ROM loading errors -->
     <string name="loader_error_encrypted">الخاص بك ROM تم تشفير</string>
     <string name="loader_error_video_core">حدث خطأ أثناء تهيئة مركز الفيديو</string>
@@ -313,25 +238,24 @@
 
     <!-- Emulation Menu -->
     <string name="emulation_exit">الخروج من المحاكاة</string>
-    <string name="emulation_done">إنهاء</string>
+    <string name="emulation_done">منجز</string>
     <string name="emulation_fps_counter">عداد إطار/ثانية</string>
-    <string name="emulation_toggle_controls">عناصر التحكم</string>
+    <string name="emulation_toggle_controls">تبديل عناصر التحكم</string>
     <string name="emulation_rel_stick_center">مركز العصا النسبي</string>
-    <string name="emulation_dpad_slide">مزلاق الأسهم</string>
+    <string name="emulation_dpad_slide">مزلاق أزرار الاتجاهات</string>
     <string name="emulation_haptics">الاهتزازات الديناميكية</string>
     <string name="emulation_show_overlay">عرض التراكب</string>
-    <string name="emulation_toggle_all">الكل</string>
+    <string name="emulation_toggle_all">تبديل الكل</string>
     <string name="emulation_control_adjust">ضبط التراكب</string>
-    <string name="emulation_control_scale">الحجم</string>
+    <string name="emulation_control_scale">حجم</string>
-    <string name="emulation_control_opacity">الشفافية</string>
+    <string name="emulation_control_opacity">العتامه</string>
     <string name="emulation_touch_overlay_reset">إعادة تعيين التراكب</string>
     <string name="emulation_touch_overlay_edit">تحرير التراكب</string>
     <string name="emulation_pause">إيقاف المحاكاة مؤقتًا</string>
-    <string name="emulation_unpause">إلغاء الإيقاف المؤقت للمحاكاة</string>
+    <string name="emulation_unpause">إلغاء الإيقاف المؤقت للمضاهاة</string>
     <string name="emulation_input_overlay">خيارات التراكب</string>
-    <string name="touchscreen">شاشة اللمس</string>
 
-    <string name="load_settings">جاري تحميل الإعدادات</string>
+    <string name="load_settings">جارٍ تحميل الإعدادات</string>
 
     <!-- Software keyboard -->
     <string name="software_keyboard">لوحة المفاتيح البرمجية</string>
@@ -358,7 +282,6 @@
 
     <!-- Memory Sizes -->
     <string name="memory_byte">Byte</string>
-    <string name="memory_byte_shorthand">B</string>
     <string name="memory_kilobyte">KB</string>
     <string name="memory_megabyte">MB</string>
     <string name="memory_gigabyte">GB</string>
@@ -403,9 +326,10 @@
     <string name="anti_aliasing_smaa">SMAA</string>
 
     <!-- Screen Layouts -->
-    <string name="screen_layout_auto">تلقائي</string>
+    <string name="screen_layout_landscape">افقي</string>
-    <string name="screen_layout_landscape">أفقي</string>
     <string name="screen_layout_portrait">عمودي</string>
+    <string name="screen_layout_auto">تلقائي</string>
+
     <!-- Aspect Ratios -->
     <string name="ratio_default">(16:9) افتراضي</string>
     <string name="ratio_force_four_three">4:3 فرض</string>
@@ -413,20 +337,16 @@
     <string name="ratio_force_sixteen_ten">16:10 فرض</string>
     <string name="ratio_stretch">تمتد إلى النافذة</string>
 
-    <!-- CPU Backend -->
-    <string name="cpu_backend_dynarmic">Dynarmic (بطيء)</string>
-    <string name="cpu_backend_nce">تنفيذ التعليمات البرمجية الأصلية (NCE)</string>
-
     <!-- CPU Accuracy -->
     <string name="cpu_accuracy_accurate">دقه</string>
     <string name="cpu_accuracy_unsafe">غير آمن</string>
-    <string name="cpu_accuracy_paranoid">Paranoid (بطيء)</string>
+    <string name="cpu_accuracy_paranoid">Paranoid (Slow)</string>
 
     <!-- Gamepad Buttons -->
-    <string name="gamepad_d_pad">الأسهم</string>
+    <string name="gamepad_d_pad">أزرار الاتجاهات</string>
     <string name="gamepad_left_stick">العصا اليسرى</string>
     <string name="gamepad_right_stick">العصا اليمنى</string>
-    <string name="gamepad_home">شاشة الرئيسية</string>
+    <string name="gamepad_home">شاشة الإستقبال</string>
     <string name="gamepad_screenshot">لقطة شاشة</string>
 
     <!-- Disk shader cache -->
@@ -442,16 +362,11 @@
     <string name="change_theme_mode">تغيير وضع السمة</string>
     <string name="theme_mode_follow_system">اتبع النظام</string>
     <string name="theme_mode_light">فاتح</string>
-    <string name="theme_mode_dark">داكن</string>
+    <string name="theme_mode_dark">غامق</string>
 
+    <!-- Audio output engines -->
     <string name="cubeb">cubeb</string>
 
-    <!-- Anisotropic filtering options -->
-    <string name="multiplier_two">2x</string>
-    <string name="multiplier_four">4x</string>
-    <string name="multiplier_eight">8x</string>
-    <string name="multiplier_sixteen">16x</string>
-
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">خلفيات سوداء</string>
     <string name="use_black_backgrounds_description">عند استخدام المظهر الداكن، قم بتطبيق خلفيات سوداء.</string>

src/android/app/src/main/res/values-ckb/strings.xml

@@ -157,6 +157,7 @@
     <string name="renderer_reactive_flushing_description">وردی ڕێندەرکردن لە هەندێک یاریدا باشتر دەکات لەسەر تێچووی کارایی.</string>
     <string name="use_disk_shader_cache">بیرگەخێرای سێبەری دیسک</string>
     <string name="use_disk_shader_cache_description">پچڕپچڕی کەمدەکاتەوە بە هەڵگرتن و بارکردنی سێبەری دروستکراو لە ناوخۆدا.</string>
+
     <!-- Debug settings strings -->
     <string name="cpu">CPU</string>
     <string name="renderer_api">API گرافیک</string>
@@ -182,15 +183,13 @@
     <string name="submit">پێشکەشکردن</string>
     <string name="string_import">هاوردەکردن</string>
     <string name="export">هەناردەکردن</string>
-    <string name="install">دامەزراندن</string>
-    <string name="delete">سڕینەوە</string>
-    <string name="clear">سڕینەوە</string>
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">هەڵبژاردنی وەگەڕخەری GPU</string>
     <string name="select_gpu_driver_title">حەز دەکەیت وەگەڕخەری GPU ی ئێستات بگۆڕیت؟</string>
     <string name="select_gpu_driver_install">دامەزراندن</string>
     <string name="select_gpu_driver_default">بنەڕەت</string>
     <string name="select_gpu_driver_use_default">بەکارهێنانی وەگەڕخەری GPU ی بنەڕەت</string>
+    <string name="select_gpu_driver_error">وەگەڕخەری نادروست هەڵبژێردرا، بە بەکارهێنانی بنەڕەتی سیستەم!</string>
     <string name="system_gpu_driver">وەگەڕخەری GPU ی سیستەم</string>
     <string name="installing_driver">دامەزراندنی وەگەڕخەر...</string>
 
@@ -202,8 +201,7 @@
     <string name="preferences_audio">دەنگ</string>
     <string name="preferences_theme">ڕەنگ و ڕووکار</string>
     <string name="preferences_debug">چاککردنەوە</string>
-    <string name="path">ڕێڕەو</string>
+
-    <string name="version">وەشان</string>
     <!-- ROM loading errors -->
     <string name="loader_error_encrypted">ڕۆمەکەت کۆدکراوە</string>
     <string name="loader_error_encrypted_keys_description"><![CDATA[تکایە دڵنیابەوە لەدامەزراوی <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> فایلەکەت بۆ ئەوەی بتوانرێت یارییەکان کۆد بکرێنەوە.]]></string>
@@ -230,7 +228,6 @@
     <string name="emulation_pause">وەستاندنی ئیمولەیشن</string>
     <string name="emulation_unpause">لادانی وەستاندنی ئیمولەیشن</string>
     <string name="emulation_input_overlay">هەڵبژاردەکانی داپۆشەر</string>
-    <string name="touchscreen">رووکاری لەمسی</string>
 
     <string name="load_settings">بارکردنی ڕێکخستنەکان...</string>
 
@@ -256,7 +253,6 @@
     <string name="region_korea">کۆریا</string>
     <string name="region_taiwan">تایوان</string>
 
-    <string name="memory_byte_shorthand">B</string>
     <string name="memory_gigabyte">GB</string>
     <!-- Renderer APIs -->
     <string name="renderer_vulkan">ڤوڵکان</string>
@@ -294,8 +290,8 @@
     <string name="anti_aliasing_fxaa">FXAA</string>
     <string name="anti_aliasing_smaa">SMAA</string>
 
-    <!-- Screen Layouts -->
     <string name="screen_layout_auto">خودکار</string>
+
     <!-- Aspect Ratios -->
     <string name="ratio_default">بنەڕەت (16:9)</string>
     <string name="ratio_force_four_three">ڕووبەری 4:3</string>
@@ -330,12 +326,6 @@
     <string name="theme_mode_light">ڕوناکی</string>
     <string name="theme_mode_dark">تاریک</string>
 
-    <!-- Anisotropic filtering options -->
-    <string name="multiplier_two">2x</string>
-    <string name="multiplier_four">4x</string>
-    <string name="multiplier_eight">8x</string>
-    <string name="multiplier_sixteen">16x</string>
-
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">پاشبنەمای ڕەش</string>
     <string name="use_black_backgrounds_description">لە کاتی بەکارهێنانی ڕووکاری تاریکدا، پاشبنەمای ڕەش دادەنێ.</string>

src/android/app/src/main/res/values-cs/strings.xml

@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-
-    <string name="emulation_notification_channel_name">Emulace je aktivní</string>
-    <string name="notice_notification_channel_name">Upozornění a chyby</string>
-    <string name="notice_notification_channel_description">Ukáže oznámení v případě chyby.</string>
-    <string name="notification_permission_not_granted">Oznámení nejsou oprávněna!</string>
-
-    <!-- Setup strings -->
-    <string name="welcome">Vítejte!</string>
-    <string name="get_started">Začít</string>
-    <string name="keys">Klíče</string>
-    <string name="select_keys">Vybrat klíče</string>
-    <string name="games">Hry</string>
-    <string name="done">Hotovo</string>
-    <string name="done_description">Vše je připraveno.\nUžijte si vaše hry!</string>
-    <string name="text_continue">Pokračovat</string>
-    <string name="next">Další</string>
-    <string name="back">Zpět</string>
-    <string name="add_games">Přidat hry</string>
-    <string name="add_games_description">Vyber svoji složku se hrami</string>
-    <!-- Home strings -->
-    <string name="home_games">Hry</string>
-    <string name="home_search">Hledat</string>
-    <string name="home_settings">Nastavení</string>
-    <string name="empty_gamelist">Nebyly nalezeny žádné soubory nebo ještě nebyl vybrán žádný adresář s hrami.</string>
-    <string name="search_and_filter_games">Hledat a filtrovat hry</string>
-    <string name="select_games_folder">Vybrat složku s hrami</string>
-    <string name="manage_game_folders">Spravovat složky s hrami</string>
-    <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string>
-    <string name="install_prod_keys">Instalovat prod.keys</string>
-    <string name="install_prod_keys_warning">Přeskočit přidávání klíčů?</string>
-    <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string>
-    <string name="notifications">Oznámení</string>
-    <string name="give_permission">Udělit oprávnění</string>
-    <string name="notification_warning">Přeskočit udělení oprávnění k oznámení?</string>
-    <string name="notification_warning_description">yuzu vám nebude schopno oznámit důležité informace.</string>
-    <string name="permission_denied">Oprávnění zamítnuto</string>
-    <string name="permission_denied_description">Zamítnul jste toto oprávnění příliš mnohokrát, musíte manuálně udělit oprávnění v nastavení systému.</string>
-    <string name="about">O aplikaci</string>
-    <string name="about_description">Verze sestavení, titulky a více</string>
-    <string name="warning_help">Pomoc</string>
-    <string name="warning_skip">Přeskočit</string>
-    <string name="warning_cancel">Zrušit</string>
-    <string name="install_amiibo_keys">Instalovat Amiibo klíče</string>
-    <string name="install_amiibo_keys_description">Povinné použití Amiibo ve hře</string>
-    <string name="invalid_keys_file">Vybrané klíče jsou neplatné</string>
-    <string name="install_keys_success">Klíče úspěšně nainstalovány</string>
-    <string name="reading_keys_failure">Chyba při čtení šifrovacích klíčů</string>
-    <string name="invalid_keys_error">Neplatné šifrovací klíče</string>
-    <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
-    <string name="gpu_driver_manager">Správce ovladače GPU</string>
-    <string name="install_gpu_driver">Instalovat GPU ovladač</string>
-    <string name="advanced_settings">Pokročilé nastavení</string>
-    <string name="settings_description">Konfigurovat nastavení emulátoru</string>
-    <string name="search_recently_played">Nedávno hrané</string>
-    <string name="search_recently_added">Nedávno přidané</string>
-    <string name="search_homebrew">Homebrew</string>
-    <string name="open_user_folder">Otevřít yuzu složku</string>
-    <string name="open_user_folder_description">Spravovat soubory yuzu</string>
-    <string name="no_file_manager">Nenalezen žádný správce souborů</string>
-    <string name="notification_no_directory_link">Nepovedlo se otevřít yuzu složku</string>
-    <string name="manage_save_data">Spravovat data postupu ve hře</string>
-    <string name="manage_save_data_description">Data postupu nalezeny. Prosím vyberte možnost.</string>
-    <string name="import_export_saves_description">Importovat nebo exportovat data postupu</string>
-    <string name="save_file_imported_success">Uspěšně importováno</string>
-    <string name="save_file_invalid_zip_structure">Neplatná struktura dat postupu</string>
-    <string name="import_saves">Importovat</string>
-    <string name="export_saves">Exportovat</string>
-    <string name="install_firmware">Nainstalovat firmware</string>
-    <string name="firmware_installing">Instalování firmwaru</string>
-    <string name="firmware_installed_success">Firmware byl úspěšně nainstalován</string>
-    <string name="firmware_installed_failure">Instalace firmwaru selhala</string>
-    <string name="install_game_content">Nainstalovat obsah hry</string>
-    <string name="install_game_content_description">Nainstalovat aktualizace hry nebo DLC</string>
-    <string name="installing_game_content">Instalování obsahu...</string>
-    <string name="install_game_content_failure">Chyba při instalaci soubor(ů) do NAND</string>
-    <string name="manage_yuzu_data">Spravovat data yuzu</string>
-    <string name="game_folders">Složky s hrami</string>
-    <string name="folder_already_added">Tato složka byla již přidána!</string>
-    <string name="game_folder_properties">Vlastnosti složky s hrami</string>
-    <string name="album_applet_description">Zobrazovat obrázky uložené v uživatelské složce se snímky obrazovky pomocí systémového prohlížeče fotografií</string>
-    <string name="cabinet_nickname_and_owner">Nastavení přezdívky a vlastníka</string>
-    <!-- About screen strings -->
-    <string name="gaia_is_not_real">Gaia není skutečná</string>
-    <string name="copied_to_clipboard">Zkopírováno do schránky</string>
-    <string name="about_app_description">Open-source Switch emulátor</string>
-    <string name="contributors">Přispěvatelé</string>
-    <string name="contributors_description">Vyrobeno s \u2764 od yuzu týmu</string>
-    <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
-    <string name="build">Číslo sestavení</string>
-    <string name="user_data">Uživatelská data</string>
-    <string name="exporting_user_data">Exportování uživatelských dat...</string>
-    <string name="importing_user_data">Importování uživatelských dat...</string>
-    <string name="import_user_data">Importovat uživatelská data</string>
-    <string name="invalid_yuzu_backup">Neplatná záloha yuzu</string>
-    <string name="user_data_export_success">Uživatelská data byla úspěšně exportována.</string>
-    <string name="user_data_import_success">Uživatelská data byla úspěšně importována.</string>
-    <string name="user_data_export_cancelled">Export zrušen</string>
-    <string name="support_link">https://discord.gg/u77vRWY</string>
-    <string name="website_link">https://yuzu-emu.org/</string>
-    <string name="github_link">https://github.com/yuzu-emu</string>
-
-    <string name="play_store_link">https://play.google.com/store/apps/details?id=org.yuzu.yuzu_emu.ea</string>
-    <string name="no_manual_installation">Žádná manuální instalace</string>
-    <string name="prioritized_support">Prioritní podpora</string>
-    <string name="our_eternal_gratitude">Naše věčná vděčnost</string>
-    <string name="are_you_interested">Máte zájem?</string>
-
-    <!-- General settings strings -->
-    <string name="frame_limit_enable">Omezit rychlost</string>
-    <string name="cpu_accuracy">CPU přesnost</string>
-    <string name="emulated_region">Emulovaná oblast</string>
-    <string name="emulated_language">Emulovaný jazyk</string>
-    <string name="use_custom_rtc">Vlastní RTC</string>
-    <!-- Graphics settings strings -->
-    <string name="renderer_accuracy">Úroveň přesnosti</string>
-    <string name="renderer_vsync">VSync režim</string>
-    <string name="renderer_screen_layout">Orientace</string>
-    <string name="renderer_aspect_ratio">Poměr stran</string>
-    <!-- Debug settings strings -->
-    <string name="cpu">CPU</string>
-    <string name="renderer_api">API</string>
-    <!-- Audio settings strings -->
-    <string name="audio_output_engine">Výstupní engine</string>
-    <string name="audio_volume">Hlasitost</string>
-    <string name="audio_volume_description">Udává hlasitost zvukového výstupu.</string>
-
-    <!-- Miscellaneous -->
-    <string name="slider_default">Výchozí</string>
-    <string name="ini_saved">Nastavení uložena</string>
-    <string name="gameid_saved">Uložena nastavení pro %1$s</string>
-    <string name="loading">Načítání...</string>
-    <string name="shutting_down">Vypínání...</string>
-    <string name="reset_setting_confirmation">Chcete obnovit toto nastavení zpět na jeho výchozí hodnotu?</string>
-    <string name="reset_to_default">Navrátit k výchozímu</string>
-    <string name="reset_all_settings">Resetovat všechna nastavení?</string>
-    <string name="reset_all_settings_description">Všechna pokročilá nastavení budou obnovena na jejich výchozí konfiguraci. Toto nelze vrátit zpět.</string>
-    <string name="close">Zavřít</string>
-    <string name="learn_more">Zjistit více</string>
-    <string name="auto">Automatické</string>
-    <string name="string_import">Importovat</string>
-    <string name="export">Exportovat</string>
-    <string name="install">Nainstalovat</string>
-    <string name="delete">Smazat</string>
-    <string name="export_success">Úspěšně exportováno</string>
-    <string name="start">Start</string>
-    <string name="clear">Vymazat</string>
-    <string name="custom">Vlastní</string>
-    <!-- GPU driver installation -->
-    <string name="select_gpu_driver">Vybrat GPU ovladač</string>
-    <string name="select_gpu_driver_title">Chcete nahradit váš aktuální ovladač GPU?</string>
-    <string name="select_gpu_driver_install">Nainstalovat</string>
-    <string name="select_gpu_driver_default">Výchozí</string>
-    <string name="select_gpu_driver_error">Vybrán neplatný ovladač</string>
-    <string name="driver_already_installed">Ovladač již nainstalován</string>
-    <string name="system_gpu_driver">Systémový ovladač GPU</string>
-    <string name="installing_driver">Instalování ovladače...</string>
-
-    <!-- Preferences Screen -->
-    <string name="preferences_settings">Nastavení</string>
-    <string name="preferences_general">Obecné</string>
-    <string name="preferences_system">Systém</string>
-    <string name="preferences_graphics">Grafika</string>
-    <string name="preferences_audio">Zvuk</string>
-    <string name="preferences_audio_description">Výstupní engine, hlasitost</string>
-    <string name="preferences_theme">Vzhled a barva</string>
-    <string name="preferences_debug">Ladění</string>
-    <!-- Game properties -->
-    <string name="info">Info</string>
-    <string name="path">Cesta</string>
-    <string name="developer">Vývojář</string>
-    <string name="version">Verze</string>
-    <string name="copy_details">Zkopírovat podrobnosti</string>
-    <string name="add_ons">Modifkace</string>
-    <string name="addons_game">Rozšíření: %1$s</string>
-    <string name="select_content_type">Typ obsahu</string>
-    <string name="updates_and_dlc">Aktualizace a DLC</string>
-    <string name="mods_and_cheats">Módy a cheaty</string>
-    <string name="addon_installed_successfully">Rozšíření úspěšně nainstalováno</string>
-    <string name="verifying_content">Ověřování obsahu...</string>
-    <string name="emulation_done">Hotovo</string>
-    <string name="emulation_control_scale">Měřítko</string>
-    <string name="emulation_control_opacity">Průhlednost</string>
-    <string name="touchscreen">Dotyková obrazovka</string>
-
-    <!-- Errors and warnings -->
-    <string name="abort_button">Přerušit</string>
-    <string name="continue_button">Pokračovat</string>
-    <string name="system_archive_not_found">Systémový Archív Nenalezen</string>
-    <string name="save_load_error">Ukládací/Načítací chyba</string>
-    <string name="fatal_error">Fatální Chyba</string>
-    <!-- Region Names -->
-    <string name="region_japan">Japonsko</string>
-    <string name="region_usa">USA</string>
-    <string name="region_europe">Evropa</string>
-    <string name="region_australia">Austrálie</string>
-    <string name="region_china">Čína</string>
-    <string name="region_korea">Korea</string>
-    <string name="region_taiwan">Taiwan</string>
-
-    <string name="memory_byte_shorthand">B</string>
-    <string name="memory_gigabyte">GB</string>
-    <!-- Renderer APIs -->
-    <string name="renderer_vulkan">Vulkan</string>
-    <string name="renderer_none">Žádné</string>
-
-    <!-- Renderer Accuracy -->
-    <string name="renderer_accuracy_normal">Normální</string>
-    <string name="renderer_accuracy_high">Vysoká</string>
-    <!-- Resolutions -->
-    <string name="resolution_half">0.5X (360p/540p)</string>
-    <string name="resolution_three_quarter">0.75X (540p/810p)</string>
-    <string name="resolution_one">1X (720p/1080p)</string>
-    <string name="resolution_two">2X (1440p/2160p) (Pomalé)</string>
-    <string name="resolution_three">3X (2160p/3240p) (Pomalé)</string>
-    <string name="resolution_four">4X (2880p/4320p) (Pomalé)</string>
-
-    <string name="scaling_filter_bilinear">Bilineární</string>
-    <string name="scaling_filter_fsr">AMD FidelityFX™ Super Resolution</string>
-
-    <!-- Anti-Aliasing -->
-    <string name="anti_aliasing_none">Žádné</string>
-    <string name="anti_aliasing_fxaa">FXAA</string>
-    <string name="anti_aliasing_smaa">SMAA</string>
-
-    <!-- Screen Layouts -->
-    <string name="screen_layout_auto">Automatické</string>
-    <!-- Aspect Ratios -->
-    <string name="ratio_default">Výchozí (16:9)</string>
-    <string name="ratio_force_four_three">Vynutit 4:3</string>
-    <string name="ratio_force_twenty_one_nine">Vynutit 21:9</string>
-    <!-- CPU Accuracy -->
-    <string name="cpu_accuracy_accurate">Přesné</string>
-    <string name="cpu_accuracy_unsafe">Nebezpečné</string>
-    <string name="gamepad_home">Home</string>
-    <string name="building_shaders">Budování shaderů</string>
-
-    <!-- Theme options -->
-    <string name="change_app_theme">Změnit vzhled aplikace</string>
-    <string name="theme_default">Výchozí</string>
-    <string name="theme_material_you">Material You</string>
-
-    <!-- Theme Modes -->
-    <string name="change_theme_mode">Změnit styl vzhledu</string>
-    <string name="theme_mode_follow_system">Podle systému</string>
-    <string name="theme_mode_light">Světlé</string>
-    <string name="theme_mode_dark">Tmavé</string>
-
-    <!-- Anisotropic filtering options -->
-    <string name="multiplier_two">2x</string>
-    <string name="multiplier_four">4x</string>
-    <string name="multiplier_eight">8x</string>
-    <string name="multiplier_sixteen">16x</string>
-
-    <!-- Black backgrounds theme -->
-    <string name="use_black_backgrounds">Černá pozadí</string>
-    <!-- Picture-In-Picture -->
-    <string name="picture_in_picture">Obraz v obraze</string>
-    <string name="mute">Ztlumit</string>
-    <string name="unmute">Vypnout ztlumení</string>
-
-    <!-- Licenses screen strings -->
-    <string name="licenses">Licence</string>
-    </resources>

src/android/app/src/main/res/values-de/strings.xml

@@ -34,7 +34,6 @@
     <string name="empty_gamelist">Es wurden keine Dateien gefunden oder es wurde noch kein Spielverzeichnis ausgewählt.</string>
     <string name="search_and_filter_games">Spiele suchen und filtern</string>
     <string name="select_games_folder">Spieleverzeichnis auswählen</string>
-    <string name="manage_game_folders">Spiele-Ordner verwalten</string>
     <string name="select_games_folder_description">Erlaubt yuzu die Spieleliste zu füllen</string>
     <string name="add_games_warning">Auswahl des Spieleverzeichnisses überspringen?</string>
     <string name="add_games_warning_description">Spiele werden in der Spieleliste nicht angezeigt, wenn kein Ordner ausgewählt ist.</string>
@@ -68,11 +67,9 @@
     <string name="invalid_keys_error">Ungültige Schlüssel</string>
     <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
     <string name="install_keys_failure_description">Die ausgewählte Datei ist falsch oder beschädigt. Bitte kopieren Sie Ihre Schlüssel erneut.</string>
-    <string name="gpu_driver_manager">GPU-Treiber Verwaltung</string>
     <string name="install_gpu_driver">GPU-Treiber installieren</string>
     <string name="install_gpu_driver_description">Alternative Treiber für eventuell bessere Leistung oder Genauigkeit installieren</string>
     <string name="advanced_settings">Erweiterte Einstellungen</string>
-    <string name="advanced_settings_game">Erweiterte Einstellungen: %1$s</string>
     <string name="settings_description">Emulatoreinstellungen konfigurieren</string>
     <string name="search_recently_played">Kürzlich gespielt</string>
     <string name="search_recently_added">Kürzlich hinzugefügt</string>
@@ -86,11 +83,7 @@
     <string name="notification_no_directory_link_description">Bitte suche den Benutzerordner manuell über die Seitenleiste des Dateimanagers.</string>
     <string name="manage_save_data">Speicherdaten verwalten</string>
     <string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
-    <string name="import_save_warning">Speicherdaten importieren</string>
-    <string name="import_save_warning_description">Das überschreibt alle existierenden Speicherdaten für dieses Spiel mit der ausgewählten Datei. Wirklich fortfahren?</string>
     <string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string>
-    <string name="save_files_importing">Importiere Speicherdaten...</string>
-    <string name="save_files_exporting">Exportiere Speicherdaten...</string>
     <string name="save_file_imported_success">Erfolgreich importiert</string>
     <string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
     <string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>
@@ -105,17 +98,8 @@
     <string name="share_log_description">Debug-Logs an yuzu zur Untersuchung absenden</string>
     <string name="share_log_missing">Keine Log-Datei gefunden</string>
     <string name="install_game_content">Spiel installieren</string>
-    <string name="install_game_content_description">Spiel-Updates oder DLCs installieren</string>
+    <string name="install_game_content_description">Spiel Update oder DLC installieren</string>
-    <string name="installing_game_content">Installiere...</string>
-    <string name="install_game_content_failed_count">%1$d Installationsfehler</string>
-    <string name="install_game_content_success_install">%1$d erfolgreich installiert</string>
-    <string name="install_game_content_success_overwrite">%1$d erfolgreich überschrieben</string>
     <string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string>
-    <string name="manage_yuzu_data">yuzu-Daten Verwalten</string>
-    <string name="share_save_file">Speicherdaten teilen</string>
-    <string name="game_folders">Spiele-Ordner</string>
-    <string name="add_game_folder">Spiele-Ordner hinzufügen</string>
-    <string name="applets_error_firmware">Firmware nicht installiert</string>
     <!-- About screen strings -->
     <string name="gaia_is_not_real">Gaia ist nicht real</string>
     <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
@@ -126,10 +110,6 @@
     <string name="licenses_description">Projekte, die yuzu für Android möglich machen </string>
     <string name="build">Build</string>
     <string name="user_data">Nutzerdaten</string>
-    <string name="importing_user_data">Importiere Nutzerdaten...</string>
-    <string name="import_user_data">Nutzerdaten importieren</string>
-    <string name="user_data_export_success">Nutzerdaten erfolgreich exportiert</string>
-    <string name="user_data_import_success">Nutzerdaten erfolgreich importiert</string>
     <string name="user_data_export_cancelled">Export abgebrochen</string>
     <string name="support_link">https://discord.gg/u77vRWY</string>
     <string name="website_link">https://yuzu-emu.org/</string>
@@ -157,7 +137,7 @@
     <string name="cpu_accuracy">CPU-Genauigkeit</string>
     <!-- System settings strings -->
     <string name="use_docked_mode">Gedockter Modus</string>
-    <string name="use_docked_mode_description">Der Gedockte-Modus erhöht die Auflösung, verringert aber die Leistung. Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die Leistung.</string>
+    <string name="use_docked_mode_description">Der Docked Modus erhöht die Auflösung, verringert die aber die Leistung. Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die Leistung.</string>
     <string name="emulated_region">Emulierte Region</string>
     <string name="emulated_language">Emulierte Sprache</string>
     <string name="select_rtc_date">RTC-Datum auswählen</string>
@@ -165,12 +145,10 @@
     <string name="use_custom_rtc">Benutzerdefinierte Echtzeituhr</string>
     <!-- Graphics settings strings -->
     <string name="renderer_accuracy">Genauigkeitsstufe</string>
-    <string name="renderer_resolution">Auflösung (Mobil/Gedockt)</string>
     <string name="renderer_vsync">VSync-Modus</string>
     <string name="renderer_screen_layout">Orientierung</string>
     <string name="renderer_aspect_ratio">Seitenverhältnis</string>
     <string name="renderer_scaling_filter">Fensteranpassungsfilter</string>
-    <string name="renderer_anti_aliasing">Kantenglättung</string>
     <string name="renderer_force_max_clock">Maximale Taktfrequenz erzwingen (nur Adreno)</string>
     <string name="renderer_force_max_clock_description">Erzwingt den Betrieb der GPU mit der maximal möglichen Taktfrequenz (Temperaturbeschränkungen werden weiterhin angewendet).</string>
     <string name="renderer_asynchronous_shaders">Asynchrone Shader nutzen</string>
@@ -190,12 +168,9 @@
     <string name="error_saving">Fehler beim Speichern von %1$s.ini: %2$s</string>
     <string name="unimplemented_menu">Unimplementiertes Menü</string>
     <string name="loading">Lädt...</string>
-    <string name="shutting_down">Beendet...</string>
     <string name="reset_setting_confirmation">Möchtest du diese Einstellung auf den Standardwert zurücksetzen?</string>
     <string name="reset_to_default">Auf Standard zurücksetzen</string>
-    <string name="reset_to_default_description">Setzt alle erweiterten Einstellungen zurück</string>
     <string name="reset_all_settings">Alle Einstellungen zurücksetzen?</string>
-    <string name="reset_all_settings_description">Alle erweiterten Einstellungen werden auf ihren Standardwert zurückgesetzt. Dies kann nicht rückgängig gemacht werden.</string>
     <string name="settings_reset">Einstellungen zurückgesetzt</string>
     <string name="close">Schließen</string>
     <string name="learn_more">Mehr erfahren</string>
@@ -207,20 +182,14 @@
     <string name="export_failed">Export fehlgeschlagen</string>
     <string name="import_failed">Import fehlgeschlagen</string>
     <string name="cancelling">Abbrechen</string>
-    <string name="install">Installieren</string>
+
-    <string name="delete">Löschen</string>
-    <string name="edit">Bearbeiten</string>
-    <string name="export_success">Erfolgreich exportiert</string>
-    <string name="start">Start</string>
-    <string name="clear">Löschen</string>
-    <string name="custom">Benutzerdefiniert</string>
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">GPU-Treiber auswählen</string>
     <string name="select_gpu_driver_title">Möchtest du deinen aktuellen GPU-Treiber ersetzen?</string>
     <string name="select_gpu_driver_install">Installieren</string>
     <string name="select_gpu_driver_default">Standard</string>
     <string name="select_gpu_driver_use_default">Standard GPU-Treiber wird verwendet</string>
-    <string name="driver_already_installed">Treiber bereits installiert</string>
+    <string name="select_gpu_driver_error">Ungültiger Treiber ausgewählt, Standard-Treiber wird verwendet!</string>
     <string name="system_gpu_driver">System GPU-Treiber</string>
     <string name="installing_driver">Treiber wird installiert...</string>
 
@@ -228,37 +197,11 @@
     <string name="preferences_settings">Einstellungen</string>
     <string name="preferences_general">Allgemein</string>
     <string name="preferences_system">System</string>
-    <string name="preferences_system_description">Gedockter Modus, Region, Sprache</string>
     <string name="preferences_graphics">Grafik</string>
-    <string name="preferences_graphics_description">Genauigkeitsstufe, Auflösung, Shader-Cache</string>
     <string name="preferences_audio">Audio</string>
-    <string name="preferences_audio_description">Ausgabe-Engine, Lautstärke</string>
     <string name="preferences_theme">Theme und Farbe</string>
     <string name="preferences_debug">Debug</string>
-    <!-- Game properties -->
+
-    <string name="info">Info</string>
-    <string name="info_description">Programm-ID, Entwickler, Version</string>
-    <string name="per_game_settings">Spieleinstellungen</string>
-    <string name="per_game_settings_description">Einstellungen für dieses Spiel ändern</string>
-    <string name="path">Pfad</string>
-    <string name="program_id">Programm-ID</string>
-    <string name="developer">Entwickler</string>
-    <string name="version">Version</string>
-    <string name="copy_details">Details kopieren</string>
-    <string name="add_ons">Add-ons</string>
-    <string name="add_ons_description">Mods, Updates und DLC aktivieren oder deaktivieren</string>
-    <string name="clear_shader_cache">Shader-Cache löschen</string>
-    <string name="clear_shader_cache_description">Löscht alle für dieses Spiel erstellten Shader</string>
-    <string name="cleared_shaders_successfully">Shader erfolgreich gelöscht</string>
-    <string name="addons_game">Add-ons: %1$s</string>
-    <string name="save_data">Speicherdaten</string>
-    <string name="save_data_description">Importiert oder exportiert Speicherdaten für dieses Spiel</string>
-    <string name="delete_save_data">Speicherdaten löschen</string>
-    <string name="delete_save_data_description">Löscht alle Speicherdaten für dieses Spiel</string>
-    <string name="delete_save_data_warning_description">Das löscht unwiederbringlich alle Speicherdaten für dieses Spiel. Wirklich fortfahren?</string>
-    <string name="save_data_deleted_successfully">Speicherdaten erfolgreich gelöscht</string>
-    <string name="invalid_directory">Ungültiges Verzeichnis</string>
-    <string name="addon_installed_successfully">Add-on erfolgreich installiert</string>
     <!-- ROM loading errors -->
     <string name="loader_error_encrypted">Das ROM ist verschlüsselt</string>
     <string name="loader_error_encrypted_keys_description"><![CDATA[Bitte stelle sicher dass die <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> Datei installiert ist, damit Spiele entschlüsselt werden können.]]></string>
@@ -277,10 +220,7 @@
     <string name="emulation_control_opacity">Transparenz</string>
     <string name="emulation_touch_overlay_reset">Overlay zurücksetzen</string>
     <string name="emulation_touch_overlay_edit">Overlay bearbeiten</string>
-    <string name="emulation_pause">Emulation pausieren</string>
-    <string name="emulation_unpause">Emulation fortsetzen</string>
     <string name="emulation_input_overlay">Overlay-Optionen</string>
-    <string name="touchscreen">Touchscreen</string>
 
     <string name="load_settings">Lade Einstellungen...</string>
 
@@ -308,7 +248,6 @@
 
     <!-- Memory Sizes -->
     <string name="memory_byte">Byte</string>
-    <string name="memory_byte_shorthand">B</string>
     <string name="memory_kilobyte">KB</string>
     <string name="memory_megabyte">MB</string>
     <string name="memory_gigabyte">GB</string>
@@ -352,10 +291,9 @@
     <string name="anti_aliasing_fxaa">FXAA</string>
     <string name="anti_aliasing_smaa">SMAA</string>
 
-    <!-- Screen Layouts -->
+    <string name="screen_layout_portrait">Portrait</string>
     <string name="screen_layout_auto">Auto</string>
-    <string name="screen_layout_landscape">Horizontal</string>
+
-    <string name="screen_layout_portrait">Vertikal</string>
     <!-- Aspect Ratios -->
     <string name="ratio_default">Standard (16:9)</string>
     <string name="ratio_force_four_three">4:3 erzwingen</string>
@@ -380,27 +318,22 @@
     <string name="building_shaders">Shader werden erstellt</string>
 
     <!-- Theme options -->
-    <string name="change_app_theme">Theme</string>
+    <string name="change_app_theme">App-Thema ändern</string>
     <string name="theme_default">Standard</string>
     <string name="theme_material_you">Material You</string>
 
     <!-- Theme Modes -->
-    <string name="change_theme_mode">Design</string>
+    <string name="change_theme_mode">Themen-Modus ändern</string>
     <string name="theme_mode_follow_system">System folgen</string>
     <string name="theme_mode_light">Hell</string>
     <string name="theme_mode_dark">Dunkel</string>
 
+    <!-- Audio output engines -->
     <string name="cubeb">cubeb</string>
 
-    <!-- Anisotropic filtering options -->
-    <string name="multiplier_two">2x</string>
-    <string name="multiplier_four">4x</string>
-    <string name="multiplier_eight">8x</string>
-    <string name="multiplier_sixteen">16x</string>
-
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Schwarze Hintergründe</string>
-    <string name="use_black_backgrounds_description">Bei Verwendung des dunklen Designs, schwarze Hintergründe verwenden.</string>
+    <string name="use_black_backgrounds_description">Bei Verwendung des dunklen Themes, schwarze Hintergründe verwenden.</string>
 
     <!-- Picture-In-Picture -->
     <string name="picture_in_picture">Bild im Bild</string>

src/android/app/src/main/res/values-es/strings.xml

@@ -4,7 +4,7 @@
     <string name="app_disclaimer">Este software ejecuta juegos para la videoconsola Nintendo Switch. Los videojuegos o claves no vienen incluidos.&lt;br /&gt;&lt;br /&gt;Antes de empezar, por favor, localice el archivo <![CDATA[<b> prod.keys </b>]]>en el almacenamiento de su dispositivo..&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Saber más</a>]]></string>
     <string name="emulation_notification_channel_name">Emulación activa</string>
     <string name="emulation_notification_channel_description">Muestra una notificación persistente cuando la emulación está activa.</string>
-    <string name="emulation_notification_running">yuzu está ejecutándose</string>
+    <string name="emulation_notification_running">yuzu esta ejecutándose</string>
     <string name="notice_notification_channel_name">Avisos y errores</string>
     <string name="notice_notification_channel_description">Mostrar notificaciones cuándo algo vaya mal.</string>
     <string name="notification_permission_not_granted">¡Permisos de notificación no concedidos!</string>
@@ -34,7 +34,6 @@
     <string name="empty_gamelist">No se ha encontrado ningún archivo o aún no se ha seleccionado ningún directorio de juegos.</string>
     <string name="search_and_filter_games">Busca y filtra juegos</string>
     <string name="select_games_folder">Seleccionar carpeta de juegos</string>
-    <string name="manage_game_folders">Gestionar carpetas de juegos</string>
     <string name="select_games_folder_description">Permite que yuzu llene la lista de juegos</string>
     <string name="add_games_warning">¿Omitir la selección de la carpeta de juegos?</string>
     <string name="add_games_warning_description">No se mostrará ningún juego si no se ha seleccionado una carpeta de juegos.</string>
@@ -45,23 +44,23 @@
     <string name="install_prod_keys">Instalar prod.keys</string>
     <string name="install_prod_keys_description">Requerido para descifrar juegos</string>
     <string name="install_prod_keys_warning">¿Omitir agregar claves?</string>
-    <string name="install_prod_keys_warning_description">Se requieren claves válidas para emular juegos. Solo las aplicaciones homebrew funcionarán si continúas.</string>
+    <string name="install_prod_keys_warning_description">Se requieren claves válidas para emular juegos.  Solo las aplicaciones homebrew funcionarán si continúas.</string>
     <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string>
     <string name="notifications">Notificaciones</string>
-    <string name="notifications_description">Otorga el permiso de notificación con el botón de abajo.</string>
+    <string name="notifications_description">Otorgue el permiso de notificación con el botón de abajo.</string>
     <string name="give_permission">Conceder permiso</string>
     <string name="notification_warning">¿Omitir conceder el permiso de notificación?</string>
     <string name="notification_warning_description">yuzu no podrá notificarte información importante.</string>
     <string name="permission_denied">Permiso denegado</string>
-    <string name="permission_denied_description">Se ha denegado este permiso demasiadas veces y ahora debes otorgarlo de forma manual en la configuración del sistema.</string>
+    <string name="permission_denied_description">Negó este permiso demasiadas veces y ahora debe otorgarlo manualmente en la configuración del sistema.</string>
     <string name="about">Acerca de</string>
     <string name="about_description">Versión, créditos y más</string>
     <string name="warning_help">Ayuda</string>
     <string name="warning_skip">Siguiente</string>
     <string name="warning_cancel">Cancelar</string>
-    <string name="install_amiibo_keys">Instalar claves de Amiibo</string>
+    <string name="install_amiibo_keys">Instalar clave de Amiiboo</string>
-    <string name="install_amiibo_keys_description">Necesario para usar Amiibos en el juego</string>
+    <string name="install_amiibo_keys_description">Necesario para usar Amiibo en el juego</string>
-    <string name="invalid_keys_file">Archivo de claves seleccionado no válido</string>
+    <string name="invalid_keys_file">Archivo de claves seleccionado inválido</string>
     <string name="install_keys_success">Claves instaladas correctamente</string>
     <string name="reading_keys_failure">Error al leer las claves de cifrado</string>
     <string name="install_prod_keys_failure_extension_description">Compruebe que el archivo de claves tenga una extensión .keys y pruebe otra vez.</string>
@@ -69,7 +68,6 @@
     <string name="invalid_keys_error">Claves de cifrado no válidas</string>
     <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
     <string name="install_keys_failure_description">El archivo seleccionado es incorrecto o está corrupto. Vuelva a redumpear sus claves.</string>
-    <string name="gpu_driver_manager">Explorador de drivers de GPU</string>
     <string name="install_gpu_driver">Instalar driver de GPU</string>
     <string name="install_gpu_driver_description">Instale drivers alternativos para obtener un rendimiento o una precisión potencialmente mejores</string>
     <string name="advanced_settings">Opciones avanzadas</string>
@@ -87,11 +85,7 @@
     <string name="notification_no_directory_link_description">Por favor, busque la carpeta user con el panel lateral del explorador de archivos de forma manual.</string>
     <string name="manage_save_data">Administrar datos de guardado</string>
     <string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
-    <string name="import_save_warning">Importar datos de guardado</string>
-    <string name="import_save_warning_description">Ésto sobreescribirá todos los datos de guardado existentes con el archivo proporcionado. ¿Está seguro de querer continuar?</string>
     <string name="import_export_saves_description">Importar o exportar archivos de guardado</string>
-    <string name="save_files_importing">Importando archivos de guardado...</string>
-    <string name="save_files_exporting">Exportando archivos de guardado...</string>
     <string name="save_file_imported_success">Importado correctamente</string>
     <string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string>
     <string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string>
@@ -101,7 +95,7 @@
     <string name="install_firmware_description">El firmware debe estar en un archivo ZIP y es necesario para ejecutar algunos juegos</string>
     <string name="firmware_installing">Instalando firmware</string>
     <string name="firmware_installed_success">Firmware instalado con éxito</string>
-    <string name="firmware_installed_failure">Error en la instalación de firmware</string>
+    <string name="firmware_installed_failure">Falló la instalación de firmware</string>
     <string name="firmware_installed_failure_description">Asegúrese de que los archivos nca del firmware estén en la raíz del zip e inténtelo de nuevo.</string>
     <string name="share_log">Compartir registros de depuración</string>
     <string name="share_log_description">Comparta el archivo de registro de yuzu para depurar problemas</string>
@@ -121,43 +115,9 @@
     <string name="custom_driver_not_supported">Drivers personalizados no soportados</string>
     <string name="custom_driver_not_supported_description">En estos momentos, la carga de drivers personalizados no está disponible para este dispositivo..\n¡Comprueba esta opción en el futuro para ver si ya está añadido el soporte a ese dispositivo!</string>
     <string name="manage_yuzu_data">Administrar datos de yuzu</string>
-    <string name="manage_yuzu_data_description">Importa/exporta el firmware, las claves, los datos de usuario, ¡y más!</string>
+    <string name="manage_yuzu_data_description">Importa/exporta el firmware, las keys, los datos de usuario, ¡y más!</string>
     <string name="share_save_file">Compartir archivo de guardado</string>
-    <string name="export_save_failed">Error al exportar el archivo de guardado</string>
+    <string name="export_save_failed">La exportación del guardado falló</string>
-    <string name="game_folders">Carpetas de juegos</string>
-    <string name="deep_scan">Escaneo recursivo </string>
-    <string name="add_game_folder">Añadir carpeta con juegos</string>
-    <string name="folder_already_added">¡Está carpeta ya se había añadido!</string>
-    <string name="game_folder_properties">Propiedades de la carpeta de juegos</string>
-    <plurals name="saves_import_failed">
-        <item quantity="one">No se ha podido importar %d archivo de guardado.</item>
-        <item quantity="many">No se han podido importar %d archivos de guardado.</item>
-        <item quantity="other">No se han podido importar %d archivos de guardado.</item>
-    </plurals>
-    <plurals name="saves_import_success">
-        <item quantity="one">%d archivo de guardado importado con éxito.</item>
-        <item quantity="many">%d archivos de guardado importados con éxito.</item>
-        <item quantity="other">%d archivos de guardado importados con éxito.</item>
-    </plurals>
-    <string name="no_save_data_found">No hay archivos de guardado</string>
-
-    <!-- Applet launcher strings -->
-    <string name="applets">Ejecutador de applet</string>
-    <string name="applets_description">Ejecutar applets de sistema usando el firmware instalado</string>
-    <string name="applets_error_firmware">Firmware no instalado</string>
-    <string name="applets_error_applet">Applet no disponible</string>
-    <string name="applets_error_description"><![CDATA[Asegúrese de que el archivo<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> y el <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-system-firmware\">firmware</a> estén instalados e inténtelo de nuevo.]]></string>
-    <string name="album_applet">Álbum</string>
-    <string name="album_applet_description">Ver las imágenes que están en la carpeta \"screenshots\" del usuario con el visor de fotos del sistema</string>
-    <string name="mii_edit_applet">Editor de Mii</string>
-    <string name="mii_edit_applet_description">Mira y edita Mii con el editor del sistema</string>
-    <string name="cabinet_applet">Cabinet</string>
-    <string name="cabinet_applet_description">Edita y borra los datos guardado del amiibo</string>
-    <string name="cabinet_launcher">Ejecutador de Cabinet</string>
-    <string name="cabinet_nickname_and_owner">Configuración del apodo y propietario</string>
-    <string name="cabinet_game_data_eraser">Borrador de datos de juego</string>
-    <string name="cabinet_restorer">Restaurador</string>
-    <string name="cabinet_formatter">Formateador</string>
 
     <!-- About screen strings -->
     <string name="gaia_is_not_real">Gaia no es real</string>
@@ -201,7 +161,6 @@
     <string name="frame_limit_enable_description">Limita la velocidad de emulación a un porcentaje específico de la velocidad normal.</string>
     <string name="frame_limit_slider">Limitar porcentaje de velocidad</string>
     <string name="frame_limit_slider_description">Especifica el porcentaje para limitar la velocidad de emulación. 100% es la velocidad normal. Valores más altos o bajos incrementarán o disminuirán el límite de velocidad.</string>
-    <string name="cpu_backend">Motor de CPU</string>
     <string name="cpu_accuracy">Precisión de CPU</string>
     <string name="value_with_units">%1$s%2$s</string>
 
@@ -227,13 +186,11 @@
     <string name="renderer_force_max_clock">Forzar velocidad al máximo (solo Adreno)</string>
     <string name="renderer_force_max_clock_description">Fuerza a la GPU a ejecutarse a la velocidad máxima de reloj posible (se seguirán aplicando restricciones térmicas).</string>
     <string name="renderer_asynchronous_shaders">Usar shaders asíncronos</string>
-    <string name="renderer_asynchronous_shaders_description">Compila shaders de manera asíncrona, reduce los parones pero puede introducir fallos.</string>
+    <string name="renderer_asynchronous_shaders_description">Compila shaders de manera asíncrona, reduciendo los parones, pero puede introducir fallos.</string>
     <string name="renderer_reactive_flushing">Usar limpieza reactiva</string>
     <string name="renderer_reactive_flushing_description">Mejora la precisión de renderizado en algunos juegos, pero reduce el rendimiento.</string>
     <string name="use_disk_shader_cache">Caché de shaders en disco</string>
     <string name="use_disk_shader_cache_description">Reduce los parones almacenando y cargando shaders generados.</string>
-    <string name="anisotropic_filtering">Filtrado anisotrópico</string>
-    <string name="anisotropic_filtering_description">Mejora la calidad de las texturas al ser observadas desde ángulos oblicuos</string>
 
     <!-- Debug settings strings -->
     <string name="cpu">CPU</string>
@@ -260,7 +217,6 @@
     <string name="shutting_down">Saliendo...</string>
     <string name="reset_setting_confirmation">¿Desea restablecer esta configuración a su valor predeterminado?</string>
     <string name="reset_to_default">Restablecer a predeterminado</string>
-    <string name="reset_to_default_description">Reinicia todos los ajustes avanzados</string>
     <string name="reset_all_settings">¿Restablecer todas las configuraciones?</string>
     <string name="reset_all_settings_description">Todas las opciones avanzadas se restablecerán a su configuración predeterminada. Esta acción no se puede deshacer.</string>
     <string name="settings_reset">Reiniciar la configuracion</string>
@@ -274,24 +230,14 @@
     <string name="export_failed">La exportación falló</string>
     <string name="import_failed">La importación falló</string>
     <string name="cancelling">Cancelando</string>
-    <string name="install">Instalar</string>
+
-    <string name="delete">Borrar</string>
-    <string name="edit">Editar</string>
-    <string name="export_success">Exportado correctamente</string>
-    <string name="start">Comenzar</string>
-    <string name="clear">Limpiar</string>
-    <string name="global">Global</string>
-    <string name="custom">Perzonalizado</string>
-    <string name="notice">Aviso</string>
-    <string name="import_complete">La importación se completó</string>
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">Seleccionar driver GPU</string>
     <string name="select_gpu_driver_title">¿Quiere reemplazar el driver de GPU actual?</string>
     <string name="select_gpu_driver_install">Instalar</string>
     <string name="select_gpu_driver_default">Predeterminado</string>
     <string name="select_gpu_driver_use_default">Usando el driver de GPU por defecto </string>
-    <string name="select_gpu_driver_error">Driver no válido seleccionado</string>
+    <string name="select_gpu_driver_error">¡Driver no válido, utilizando el predeterminado del sistema!</string>
-    <string name="driver_already_installed">Driver ya instalado</string>
     <string name="system_gpu_driver">Driver GPU del sistema</string>
     <string name="installing_driver">Instalando driver...</string>
 
@@ -299,52 +245,11 @@
     <string name="preferences_settings">Ajustes</string>
     <string name="preferences_general">General</string>
     <string name="preferences_system">Sistema</string>
-    <string name="preferences_system_description">Modo en Dock, región, idioma</string>
     <string name="preferences_graphics">Gráficos</string>
-    <string name="preferences_graphics_description">Nivel de precisión, resolución, caché de shaders</string>
     <string name="preferences_audio">Audio</string>
-    <string name="preferences_audio_description">Motor de salida, volumen</string>
     <string name="preferences_theme">Tema y color</string>
     <string name="preferences_debug">Depuración</string>
-    <string name="preferences_debug_description">CPU/GPU debug, API gráfica, fastMEM</string>
 
-    <!-- Game properties -->
-    <string name="info">Información</string>
-    <string name="info_description">ID de programa, desarrollador, versión</string>
-    <string name="per_game_settings">Configuración por juego</string>
-    <string name="per_game_settings_description">Editar opciones específicas para este juego</string>
-    <string name="launch_options">Ejecutar configuración</string>
-    <string name="path">Ruta</string>
-    <string name="program_id">ID de programa</string>
-    <string name="developer">Desarrollador</string>
-    <string name="version">Versión</string>
-    <string name="copy_details">Copiar detalles</string>
-    <string name="add_ons">Extras/Add-ons</string>
-    <string name="add_ons_description">Activa/desactiva mods, actualizaciones y DLC</string>
-    <string name="clear_shader_cache">Limpiar la caché de shaders</string>
-    <string name="clear_shader_cache_description">Elimina todos los shaders construidos mientras se jugaba al juego</string>
-    <string name="clear_shader_cache_warning_description">Experimentarás más parones mientras que la caché de shaders se regenera</string>
-    <string name="cleared_shaders_successfully">Shaders limpiados con éxito</string>
-    <string name="addons_game">Addons: %1$s</string>
-    <string name="save_data">Datos de guardado</string>
-    <string name="save_data_description">Controla los datos de guardado de este juego</string>
-    <string name="delete_save_data">Borrar datos de guardado</string>
-    <string name="delete_save_data_description">Elimina todos los datos de guardado de este juego</string>
-    <string name="delete_save_data_warning_description">Ésto elimina de manera permanente todos los datos de guardado de este juego. ¿Seguro que quieres continuar?</string>
-    <string name="save_data_deleted_successfully">Datos de guardado eliminados con éxito</string>
-    <string name="select_content_type">Tipo de contenido</string>
-    <string name="updates_and_dlc">Actualizaciones y DLC</string>
-    <string name="mods_and_cheats">Mods y trucos</string>
-    <string name="addon_notice">Aviso importante de addons</string>
-    <!-- "cheats/" "romfs/" and "exefs/ should not be translated -->
-    <string name="addon_notice_description">Para instalar mods y trucos, debes seleccionar una carpeta que contiene los directorios cheats/, romfs/, o exefs/ . ¡No podemos confirmar si éstos serán compatibles con tu juego, así que ten cuidado!</string>
-    <string name="invalid_directory">Directorio no válido</string>
-    <!-- "cheats/" "romfs/" and "exefs/ should not be translated -->
-    <string name="invalid_directory_description">Por favor, asegúrese de que el directorio que ha selecionado incluye las carpetas cheats/, romfs/, o exefs/ e inténtelo de nuevo.</string>
-    <string name="addon_installed_successfully">Addon instalado con éxito</string>
-    <string name="verifying_content">Verificando contenido...</string>
-    <string name="content_install_notice">Aviso importante de contenido</string>
-    <string name="content_install_notice_description">El contenido seleccionado no es de este juego.\n¿Instalar de todas maneras?</string>
     <!-- ROM loading errors -->
     <string name="loader_error_encrypted">Su ROM está encriptada</string>
     <string name="loader_error_encrypted_roms_description"><![CDATA[Por favor, siga las guías para redumpear<a href=\"https://yuzu-emu.org/help/quickstart/#dumping-physical-titles-game-cards\">cartuchos de juegos</a> o <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-digital-titles-eshop\">títulos instalados</a>.]]></string>
@@ -372,7 +277,6 @@
     <string name="emulation_pause">Pausar emulación</string>
     <string name="emulation_unpause">Despausar emulación</string>
     <string name="emulation_input_overlay">Opciones de overlay</string>
-    <string name="touchscreen">Pantalla táctil</string>
 
     <string name="load_settings">Cargando configuración...</string>
 
@@ -404,7 +308,6 @@
 
     <!-- Memory Sizes -->
     <string name="memory_byte">Byte</string>
-    <string name="memory_byte_shorthand">B</string>
     <string name="memory_kilobyte">KB</string>
     <string name="memory_megabyte">MB</string>
     <string name="memory_gigabyte">GB</string>
@@ -449,13 +352,9 @@
     <string name="anti_aliasing_smaa">SMAA</string>
 
     <!-- Screen Layouts -->
-    <string name="screen_layout_auto">Auto</string>
-    <string name="screen_layout_sensor_landscape">Sensor paisaje</string>
     <string name="screen_layout_landscape">Paisaje</string>
-    <string name="screen_layout_reverse_landscape">Paisaje inverso</string>
-    <string name="screen_layout_sensor_portrait">Sensor retrato</string>
     <string name="screen_layout_portrait">Retrato</string>
-    <string name="screen_layout_reverse_portrait">Retrato inverso</string>
+    <string name="screen_layout_auto">Auto</string>
 
     <!-- Aspect Ratios -->
     <string name="ratio_default">Predeterminado (16:9)</string>
@@ -464,10 +363,6 @@
     <string name="ratio_force_sixteen_ten">Forzar 16:10</string>
     <string name="ratio_stretch">Ajustar a la ventana</string>
 
-    <!-- CPU Backend -->
-    <string name="cpu_backend_dynarmic">DynARMic (lento)</string>
-    <string name="cpu_backend_nce">Ejecución nativa de código (NCE)</string>
-
     <!-- CPU Accuracy -->
     <string name="cpu_accuracy_accurate">Preciso</string>
     <string name="cpu_accuracy_unsafe">Impreciso</string>
@@ -496,15 +391,8 @@
     <string name="theme_mode_dark">Oscuro</string>
 
     <!-- Audio output engines -->
-    <string name="oboe">oboe</string>
     <string name="cubeb">cubeb</string>
 
-    <!-- Anisotropic filtering options -->
-    <string name="multiplier_two">x2</string>
-    <string name="multiplier_four">x4</string>
-    <string name="multiplier_eight">x8</string>
-    <string name="multiplier_sixteen">x16</string>
-
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Fondos oscuros</string>
     <string name="use_black_backgrounds_description">Cuando utilice el modo oscuro, aplique fondos negros.</string>