Add per-title vulkan pipeline cache (#1118)

* Fix aac_decoder memory leak

Only call NeAACDecInit on the first AAC frame and create new NeAACDecoder on DecoderCommand::Init request

* update license headers

* fix oversight

* reorganized code

-put open new FAAD2 AAC decoder code into a separate function
-removed LOG_INFO for open/close FAAD2 AAC decoder
-added LOG_ERROR when no decoder is created to handle decode request, either decoder creation failed or DecoderCommand::Init command not received

* Update aac_decoder.cpp

fix clang coding style check

* fix load savestate

Loading a savestate creates a situation where decode requests aren't preceded by an init request, so we open a new decoder by default in the constructor. A new AACDecoder instance is always constructed on load savestate.

.ci/linux.sh

@@ -2,7 +2,10 @@
 
 if [ "$TARGET" = "appimage" ]; then
     # Compile the AppImage we distribute with Clang.
-    export EXTRA_CMAKE_FLAGS=(-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_LINKER=/etc/bin/ld.lld)
+    export EXTRA_CMAKE_FLAGS=(-DCMAKE_CXX_COMPILER=clang++
+                              -DCMAKE_C_COMPILER=clang
+                              -DCMAKE_LINKER=/etc/bin/ld.lld
+                              -DENABLE_ROOM_STANDALONE=OFF)
     # Bundle required QT wayland libraries
     export EXTRA_QT_PLUGINS="waylandcompositor"
     export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
@@ -12,7 +15,7 @@ else
 fi
 
 if [ "$GITHUB_REF_TYPE" == "tag" ]; then
-	export EXTRA_CMAKE_FLAGS=($EXTRA_CMAKE_FLAGS -DENABLE_QT_UPDATE_CHECKER=ON)
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_QT_UPDATE_CHECKER=ON)
 fi
 
 mkdir build && cd build
@@ -20,9 +23,10 @@ cmake .. -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-    "${EXTRA_CMAKE_FLAGS[@]}" \
     -DENABLE_QT_TRANSLATION=ON \
-    -DUSE_DISCORD_PRESENCE=ON
+    -DENABLE_ROOM_STANDALONE=OFF \
+    -DUSE_DISCORD_PRESENCE=ON \
+    "${EXTRA_CMAKE_FLAGS[@]}"
 ninja
 strip -s bin/Release/*
 

.ci/macos-universal.sh

@@ -11,7 +11,7 @@ BASE_ARTIFACT_ARCH="${BASE_ARTIFACT##*-}"
 mv $BASE_ARTIFACT $BUNDLE_DIR
 
 # Executable binary paths that need to be combined.
-BIN_PATHS=(azahar-room Azahar.app/Contents/MacOS/azahar)
+BIN_PATHS=(Azahar.app/Contents/MacOS/azahar)
 
 # Dylib paths that need to be combined.
 IFS=$'\n'
@@ -36,8 +36,11 @@ for OTHER_ARTIFACT in "${ARTIFACTS_LIST[@]:1}"; do
     done
 done
 
+# Remove leftover libs so that they aren't distributed
+rm -rf "${BUNDLE_DIR}/libs"
+
 # Re-sign executables and bundles after combining.
-APP_PATHS=(azahar-room Azahar.app)
+APP_PATHS=(Azahar.app)
 for APP_PATH in "${APP_PATHS[@]}"; do
     codesign --deep -fs - $BUNDLE_DIR/$APP_PATH
 done

.ci/macos.sh

@@ -1,5 +1,9 @@
 #!/bin/bash -ex
 
+if [ "$GITHUB_REF_TYPE" == "tag" ]; then
+	export EXTRA_CMAKE_FLAGS=(-DENABLE_QT_UPDATE_CHECKER=ON)
+fi
+
 mkdir build && cd build
 cmake .. -GNinja \
     -DCMAKE_BUILD_TYPE=Release \
@@ -7,7 +11,9 @@ cmake .. -GNinja \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
     -DENABLE_QT_TRANSLATION=ON \
-    -DUSE_DISCORD_PRESENCE=ON
+    -DENABLE_ROOM_STANDALONE=OFF \
+    -DUSE_DISCORD_PRESENCE=ON \
+	"${EXTRA_CMAKE_FLAGS[@]}"
 ninja
 ninja bundle
 mv ./bundle/azahar.app ./bundle/Azahar.app # TODO: Can this be done in CMake?

.ci/pack.sh

@@ -14,7 +14,7 @@ else
 fi
 
 # Archive and upload the artifacts.
-mkdir artifacts
+mkdir -p artifacts
 
 function pack_artifacts() {
     ARTIFACTS_PATH="$1"
@@ -50,11 +50,6 @@ function pack_artifacts() {
     rm -rf "$REV_NAME"
 }
 
-if [ "$OS" = "windows" ] && [ "$GITHUB_REF_TYPE" = "tag" ]; then
-    # Move the installer to the artifacts directory
-    mv src/installer/bin/*.exe artifacts/
-fi
-
 if [ -n "$UNPACKED" ]; then
     # Copy the artifacts to be uploaded unpacked.
     for ARTIFACT in build/bundle/*; do

.ci/source.sh

@@ -4,6 +4,10 @@ GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
 GITREV="`git show -s --format='%h'`"
 REV_NAME="azahar-unified-source-${GITDATE}-${GITREV}"
 
+if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+    REV_NAME="azahar-unified-source-$GITHUB_REF_NAME"
+fi
+
 COMPAT_LIST='dist/compatibility_list/compatibility_list.json'
 
 mkdir artifacts

.ci/windows.sh

@@ -1,12 +1,18 @@
 #!/bin/sh -ex
 
 mkdir build && cd build
+
+if [ "$GITHUB_REF_TYPE" == "tag" ]; then
+	export EXTRA_CMAKE_FLAGS=(-DENABLE_QT_UPDATE_CHECKER=ON)
+fi
+
 cmake .. -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
     -DENABLE_QT_TRANSLATION=ON \
-    -DUSE_DISCORD_PRESENCE=ON
+    -DUSE_DISCORD_PRESENCE=ON \
+	"${EXTRA_CMAKE_FLAGS[@]}"
 ninja
 ninja bundle
 strip -s bundle/*.exe

.github/workflows/build.yml

@@ -49,12 +49,14 @@ jobs:
             ${{ runner.os }}-${{ matrix.target }}-
       - name: Build
         run: ./.ci/linux.sh
-      - name: Pack
-        run: ./.ci/pack.sh
+      - name: Move AppImage to artifacts directory
         if: ${{ matrix.target == 'appimage' }}
+        run: |
+          mkdir -p artifacts
+          mv build/bundle/*.AppImage artifacts/
       - name: Upload
-        uses: actions/upload-artifact@v4
         if: ${{ matrix.target == 'appimage' }}
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.OS }}-${{ env.TARGET }}
           path: artifacts/
@@ -148,19 +150,19 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ matrix.target }}-
       - name: Set up MSVC
+        if: ${{ matrix.target == 'msvc' }}
         uses: ilammy/msvc-dev-cmd@v1
-        if: ${{ matrix.target == 'msvc' }}
       - name: Install extra tools (MSVC)
-        run: choco install ccache ninja wget
         if: ${{ matrix.target == 'msvc' }}
+        run: choco install ccache ninja ptime wget
       - name: Install vulkan-sdk (MSVC)
-        run: |
-          wget https://sdk.lunarg.com/sdk/download/1.3.296.0/windows/VulkanSDK-1.3.296.0-Installer.exe -O D:/a/_temp/vulkan.exe
-          D:/a/_temp/vulkan.exe --accept-licenses --default-answer --confirm-command install
         if: ${{ matrix.target == 'msvc' }}
+        run: |
+          wget https://sdk.lunarg.com/sdk/download/1.4.304.1/windows/VulkanSDK-1.4.304.1-Installer.exe -O D:/a/_temp/vulkan.exe
+          D:/a/_temp/vulkan.exe --accept-licenses --default-answer --confirm-command install
       - name: Set up MSYS2
-        uses: msys2/setup-msys2@v2
         if: ${{ matrix.target == 'msys2' }}
+        uses: msys2/setup-msys2@v2
         with:
           msystem: clang64
           update: true
@@ -168,10 +170,16 @@ jobs:
           pacboy: >-
             toolchain:p ccache:p cmake:p ninja:p spirv-tools:p
             qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p
+      - name: Install extra tools (MSYS2)
+        if: ${{ matrix.target == 'msys2' }}
+        uses: crazy-max/ghaction-chocolatey@v3
+        with:
+          args: install ptime wget
       - name: Install NSIS
+        if: ${{ github.ref_type == 'tag' }}
         run: |
-          Invoke-WebRequest https://deac-riga.dl.sourceforge.net/project/nsis/NSIS%203/3.10/nsis-3.10-setup.exe?viasf=1 -OutFile C:\WINDOWS\Temp\nsis-3.10-setup.exe
-          Invoke-Expression "& C:\WINDOWS\Temp\nsis-3.10-setup.exe \S"
+          wget https://download.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11-setup.exe -O D:/a/_temp/nsis-setup.exe
+          ptime D:/a/_temp/nsis-setup.exe /S
         shell: pwsh
       - name: Disable line ending translation
         run: git config --global core.autocrlf input
@@ -182,8 +190,8 @@ jobs:
         run: |
           cd src\installer
           "C:\Program Files (x86)\NSIS\makensis.exe" /DPRODUCT_VARIANT=${{ matrix.target }} /DPRODUCT_VERSION=${{ github.ref_name }} citra.nsi
-          mkdir bin
-          move /y *.exe bin\
+          mkdir ..\..\artifacts 2> NUL
+          move /y *.exe ..\..\artifacts\
         shell: cmd
       - name: Pack
         run: ./.ci/pack.sh
@@ -224,6 +232,9 @@ jobs:
         run: |
           sudo apt-get update -y
           sudo apt-get install ccache apksigner -y
+      - name: Update Android SDK CMake version
+        run: |
+          echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3"
       - name: Build
         run: JAVA_HOME=$JAVA_HOME_17_X64 ./.ci/android.sh
         env:
@@ -241,8 +252,8 @@ jobs:
           name: ${{ env.OS }}-${{ env.TARGET }}
           path: src/android/app/artifacts/
   ios:
-    runs-on: macos-14
     if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+    runs-on: macos-14
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPILERCHECK: content

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: azahar-stale
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  stale-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/stale@v9.1.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-issue-stale: 90
+          days-before-issue-close: 10
+          stale-issue-message: "This issue has been marked as stale. If there is no activity within the next 10 days, this issue will be closed."
+          close-issue-message: "This issue has been closed as stale."
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          remove-issue-stale-when-updated: true
+          exempt-issue-labels: "priority - low,priority - medium,priority - high,priority - urgent,documentation,enhancement,miscellaneous,task,refactor"

.gitignore

@@ -13,6 +13,7 @@ src/common/scm_rev.cpp
 # Project/editor files
 *.swp
 *.kdev4
+.markdown-preview.html
 .idea/
 .vs/
 .vscode/

.gitmodules

@@ -6,7 +6,7 @@
     url = https://github.com/neobrain/nihstro.git
 [submodule "soundtouch"]
     path = externals/soundtouch
-    url = https://codeberg.org/soundtouch/soundtouch.git
+    url = https://github.com/azahar-emu/soundtouch.git
 [submodule "catch2"]
     path = externals/catch2
     url = https://github.com/catchorg/Catch2

CMakeLists.txt

@@ -1,5 +1,6 @@
-# CMake 3.12 required for 20 to be a valid value for CXX_STANDARD
-cmake_minimum_required(VERSION 3.15)
+# CMake >=3.12 required for 20 to be a valid value for CXX_STANDARD,
+# and >=3.25 required to make LTO work on Android.
+cmake_minimum_required(VERSION 3.25)
 
 # Don't override the warning flags in MSVC:
 cmake_policy(SET CMP0092 NEW)
@@ -41,8 +42,8 @@ if (APPLE)
         set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
         set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
     else()
-        # Minimum macOS 11
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
+        # Minimum macOS 13
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "13.4")
     endif()
 endif()
 
@@ -54,6 +55,13 @@ else()
     set(IS_RELEASE_BUILD ON)
 endif()
 
+if (MSVC)
+    add_compile_options(
+        /wd4711 # Suppresses `function 'xxxxx' selected for automatic inline expansion` messages
+        /wd5045 # Suppresses `Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified` messages
+    )
+endif()
+
 # LTO takes too much memory and time using MSVC.
 if (NOT MSVC AND IS_RELEASE_BUILD)
     set(DEFAULT_ENABLE_LTO ON)
@@ -61,6 +69,14 @@ else()
     set(DEFAULT_ENABLE_LTO OFF)
 endif()
 
+# Disable OpenGL by default on Linux aarch64.
+# Some aarch64 devices running Linux don't support OpenGL, and users may encounter issues.
+if (LINUX AND CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+    set(DEFAULT_ENABLE_OPENGL OFF)
+else()
+    set(DEFAULT_ENABLE_OPENGL ON)
+endif()
+
 option(ENABLE_SDL2 "Enable using SDL2" ON)
 CMAKE_DEPENDENT_OPTION(ENABLE_SDL2_FRONTEND "Enable the SDL2 frontend" OFF "ENABLE_SDL2;NOT ANDROID AND NOT IOS" OFF)
 option(USE_SYSTEM_SDL2 "Use the system SDL2 lib (instead of the bundled one)" OFF)
@@ -71,7 +87,8 @@ option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
 option(ENABLE_QT_UPDATE_CHECKER "Enable built-in update checker for the Qt frontend" OFF)
 
 CMAKE_DEPENDENT_OPTION(ENABLE_TESTS "Enable generating tests executable" ON "NOT IOS" OFF)
-CMAKE_DEPENDENT_OPTION(ENABLE_ROOM "Enable generating dedicated room executable" ON "NOT ANDROID AND NOT IOS" OFF)
+CMAKE_DEPENDENT_OPTION(ENABLE_ROOM "Enable dedicated room functionality" ON "NOT ANDROID AND NOT IOS" OFF)
+CMAKE_DEPENDENT_OPTION(ENABLE_ROOM_STANDALONE "Enable generating a standalone dedicated room executable" ON "ENABLE_ROOM" OFF)
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 option(ENABLE_SCRIPTING "Enable RPC server for scripting" ON)
@@ -82,13 +99,15 @@ option(ENABLE_OPENAL "Enables the OpenAL audio backend" ON)
 CMAKE_DEPENDENT_OPTION(ENABLE_LIBUSB "Enable libusb for GameCube Adapter support" ON "NOT IOS" OFF)
 
 CMAKE_DEPENDENT_OPTION(ENABLE_SOFTWARE_RENDERER "Enables the software renderer" ON "NOT ANDROID" OFF)
-CMAKE_DEPENDENT_OPTION(ENABLE_OPENGL "Enables the OpenGL renderer" ON "NOT APPLE AND NOT (LINUX AND CMAKE_SYSTEM_PROCESSOR STREQUAL \"aarch64\")" OFF)
+CMAKE_DEPENDENT_OPTION(ENABLE_OPENGL "Enables the OpenGL renderer" ${DEFAULT_ENABLE_OPENGL} "NOT APPLE" OFF)
 option(ENABLE_VULKAN "Enables the Vulkan renderer" ON)
 
 option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 
 option(ENABLE_MICROPROFILE "Enables microprofile capabilities" OFF)
 
+option(ENABLE_SSE42 "Enable SSE4.2 optimizations on x86_64" ON)
+
 # Compile options
 CMAKE_DEPENDENT_OPTION(COMPILE_WITH_DWARF "Add DWARF debugging information" ${IS_DEBUG_BUILD} "MINGW" OFF)
 option(ENABLE_LTO "Enable link time optimization" ${DEFAULT_ENABLE_LTO})
@@ -103,10 +122,22 @@ endif()
 if (ENABLE_QT_TRANSLATION)
     add_definitions(-DENABLE_QT_TRANSLATION)
 endif()
+if (ENABLE_ROOM)
+    add_definitions(-DENABLE_ROOM)
+endif()
 if (ENABLE_SDL2_FRONTEND)
     add_definitions(-DENABLE_SDL2_FRONTEND)
 endif()
 
+if(ENABLE_SSE42 AND (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64"))
+    message(STATUS "SSE4.2 enabled for x86_64")
+    if(MSVC)
+        SET(SSE42_COMPILE_OPTION /arch:SSE4.2)
+    else()
+        SET(SSE42_COMPILE_OPTION -msse4.1 -msse4.2)
+    endif()
+endif()
+
 include(CitraHandleSystemLibs)
 
 if (CITRA_USE_PRECOMPILED_HEADERS)
@@ -469,9 +500,8 @@ if (NOT ANDROID AND NOT IOS)
     elseif (ENABLE_SDL2_FRONTEND)
         bundle_target(citra_meta)
     endif()
-
-    if (ENABLE_ROOM)
-        bundle_target(citra_room)
+    if (ENABLE_ROOM_STANDALONE)
+        bundle_target(citra_room_standalone)
     endif()
 endif()
 
@@ -484,9 +514,14 @@ endif()
 # http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 if(ENABLE_QT AND UNIX AND NOT APPLE)
     install(FILES "${PROJECT_SOURCE_DIR}/dist/azahar.desktop"
-            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
-    install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.svg"
-            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
-    install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.xml"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications"
+            RENAME "org.azahar_emu.Azahar.desktop")
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/azahar.svg"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps"
+            RENAME "org.azahar_emu.Azahar.svg")
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/azahar.png"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps"
+            RENAME "org.azahar_emu.Azahar.png")
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/org.azahar_emu.Azahar.xml"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/mime/packages")
 endif()

CMakeModules/BundleTarget.cmake

@@ -117,6 +117,9 @@ if (BUNDLE_TARGET_EXECUTE)
             set(extra_linuxdeploy_args --plugin qt)
         endif()
 
+        # Set up app icon
+        file(COPY_FILE "${source_path}/dist/azahar.svg" "${CMAKE_BINARY_DIR}/dist/org.azahar_emu.Azahar.svg")
+
         message(STATUS "Creating AppDir for executable ${executable_path}")
         execute_process(COMMAND ${CMAKE_COMMAND} -E env
             ${extra_linuxdeploy_env}
@@ -124,7 +127,7 @@ if (BUNDLE_TARGET_EXECUTE)
             ${extra_linuxdeploy_args}
             --plugin checkrt
             --executable "${executable_path}"
-            --icon-file "${source_path}/dist/citra.svg"
+            --icon-file "${CMAKE_BINARY_DIR}/dist/org.azahar_emu.Azahar.svg"
             --desktop-file "${source_path}/dist/${executable_name}.desktop"
             --appdir "${appdir_path}"
             RESULT_VARIABLE linuxdeploy_appdir_result)
@@ -276,22 +279,12 @@ else()
         add_custom_target(bundle)
         add_custom_command(
             TARGET bundle
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/")
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/"
+            POST_BUILD)
         add_custom_command(
             TARGET bundle
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/dist/")
-        add_custom_command(
-            TARGET bundle
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dist/icon.png" "${CMAKE_BINARY_DIR}/bundle/dist/citra.png")
-        add_custom_command(
-            TARGET bundle
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/license.txt" "${CMAKE_BINARY_DIR}/bundle/")
-        add_custom_command(
-            TARGET bundle
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/README.md" "${CMAKE_BINARY_DIR}/bundle/")
-        add_custom_command(
-            TARGET bundle
-            COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/dist/scripting" "${CMAKE_BINARY_DIR}/bundle/scripting")
+            COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/dist/scripting" "${CMAKE_BINARY_DIR}/bundle/scripting"
+            POST_BUILD)
 
         # On Linux, add a command to prepare linuxdeploy and any required plugins before any bundling occurs.
         if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
@@ -302,7 +295,8 @@ else()
                 "-DLINUXDEPLOY_PATH=${CMAKE_BINARY_DIR}/externals/linuxdeploy"
                 "-DLINUXDEPLOY_ARCH=${CMAKE_HOST_SYSTEM_PROCESSOR}"
                 -P "${CMAKE_SOURCE_DIR}/CMakeModules/BundleTarget.cmake"
-                WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
+                WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+                POST_BUILD)
         endif()
     endfunction()
 

CMakeModules/DownloadExternals.cmake

@@ -171,16 +171,16 @@ endfunction()
 
 function(download_moltenvk)
     if (IOS)
-        set(MOLTENVK_PLATFORM "iOS")
+        set(MOLTENVK_PLATFORM "static/MoltenVK.xcframework/ios-arm64")
     else()
-        set(MOLTENVK_PLATFORM "macOS")
+        set(MOLTENVK_PLATFORM "dynamic/dylib/macOS")
     endif()
 
     set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
     set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
     if (NOT EXISTS ${MOLTENVK_DIR})
         if (NOT EXISTS ${MOLTENVK_TAR})
-            file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.7-rc2/MoltenVK-all.tar
+            file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.9/MoltenVK-all.tar
                 ${MOLTENVK_TAR} SHOW_PROGRESS)
         endif()
 
@@ -189,7 +189,7 @@ function(download_moltenvk)
     endif()
 
     # Add the MoltenVK library path to the prefix so find_library can locate it.
-    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${MOLTENVK_PLATFORM}")
+    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/${MOLTENVK_PLATFORM}")
     set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()
 

README.md

@@ -10,28 +10,32 @@ It was created from the merging of PabloMK7's Citra fork and the Lime3DS project
 
 The goal of this project is to be the de-facto platform for future development.
 
-> [!NOTE]
-> Azahar has not fully released yet. For this reason, there are no compiled binaries available for download.
-> 
-> It is recommended that only developers and early adopters should use the emulator until our first stable release.
->
-> Here be dragons.
-
-<!--
 # Installation
 
-### Windows & MacOS
+### Windows
 
 Download the latest release from [Releases](https://github.com/azahar-emu/azahar/releases).
 
+If you are unsure of whether you want to use MSYS2 or MSVC, use MSYS2.
+
+---
+
+### MacOS
+
+Download the latest release from [Releases](https://github.com/azahar-emu/azahar/releases).
+
+The `macos-universal` download will work on both Intel and Apple Silicon Macs.
+
 ---
 ### Android
-The recommended method of downloading Azahar on Android is via the [Google Play store](https://play.google.com/store/apps/details?id=io.github.lime3ds.android).
+The recommended method of downloading Azahar on Android is via the Google Play store:
+
+<a href='https://play.google.com/store/apps/details?id=io.github.lime3ds.android'><img width='180' alt='Get it on Google Play' src='https://raw.githubusercontent.com/pioug/google-play-badges/06ccd9252af1501613da2ca28eaffe31307a4e6d/svg/English.svg'/></a>
 
 Alternatively, you can install the app using Obtainium:
 1. Download and install Obtainium from [here](https://github.com/ImranR98/Obtainium/releases) (use the file named `app-release.apk`)
 2. Open Obtainium and click 'Add App'
-3. Type `https://github.com/azahar/azahar-emu` into the 'App Source URL' section
+3. Type `https://github.com/azahar-emu/azahar` into the 'App Source URL' section
 4. Click 'Add'
 5. Click 'Install'
 
@@ -42,12 +46,12 @@ Keep in mind that you will not recieve automatic updates when installing via the
 ---
 ### Linux
 
-Azahar is available as an AppImage on the [Releases](https://github.com/azahar-emu/azahar/releases) page.
+The recommended format for using Azahar on Linux is the Flatpak available on Flathub:
 
-We are also on Flathub:
+<a href='https://flathub.org/apps/org.azahar_emu.Azahar'><img width='180' alt='Download on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-en.png'/></a>
+
+Azahar is also available as an AppImage on the [Releases](https://github.com/azahar-emu/azahar/releases) page.
 
-<a href=https://flathub.org/apps/org.azahar-emu.azahar><img width='180' alt='Download on Flathub' src='https://dl.flathub.org/assets/badges/flathub-badge-en.png'/></a>
--->
 
 # Build instructions
 
@@ -83,14 +87,14 @@ Below are the minimum requirements to run Azahar:
 
 ### Desktop
 ```
-Operating System: Windows 10 (64-bit), MacOS 13 (Ventura), or modern 64-bit Linux
-CPU: x86-64 (64-bit) CPU. Single core performance higher than 1,800 on Passmark
+Operating System: Windows 10 (64-bit), MacOS 13.4 (Ventura), or modern 64-bit Linux
+CPU: x86-64/ARM64 CPU (Windows for ARM not supported). Single core performance higher than 1,800 on Passmark
 GPU: OpenGL 4.3 or Vulkan 1.1 support
 Memory: 2GB of RAM. 4GB is recommended
 ```
 ### Android
 ```
-Operating System: Android 9.0+
+Operating System: Android 9.0+ (64-bit)
 CPU: Snapdragon 835 SoC or better
 GPU: OpenGL ES 3.2 or Vulkan 1.1 support
 Memory: 2GB of RAM. 4GB is recommended

dist/azahar-room.desktop

@@ -3,7 +3,7 @@ Version=1.0
 Type=Application
 Name=Azahar Room
 Comment=Multiplayer room host for Azahar
-Icon=citra
+Icon=org.azahar_emu.Azahar
 TryExec=azahar-room
 Exec=azahar-room %f
 Categories=Game;Emulator;

dist/azahar.desktop

@@ -6,10 +6,9 @@ GenericName=3DS Emulator
 GenericName[fr]=Émulateur 3DS
 Comment=Nintendo 3DS video game console emulator
 Comment[fr]=Émulateur de console de jeu Nintendo 3DS
-Icon=citra
+Icon=org.azahar_emu.Azahar
 TryExec=azahar
 Exec=azahar %f
 Categories=Game;Emulator;
 MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;
 Keywords=3DS;Nintendo;
-PrefersNonDefaultGPU=true

dist/compatibility_list

@@ -1 +1 @@
-Subproject commit 955c560089186a86a90b67f0427f6dfdabc1f177
+Subproject commit 31c12299126baf892b965defc6ba7810b9c42ccf

dist/languages/.tx/config

@@ -6,9 +6,10 @@ file_filter = <lang>.ts
 source_file = en.ts
 source_lang = en
 type        = QT
+lang_map    = ca@valencia:ca_ES_valencia
 
 [o:azahar:p:azahar:r:android]
 file_filter = ../../src/android/app/src/main/res/values-<lang>/strings.xml
 source_file = ../../src/android/app/src/main/res/values/strings.xml
 type = ANDROID
-lang_map = es_ES:es, hu_HU:hu, ru_RU:ru, pt_BR:pt, zh_CN:zh, pl_PL:pl
+lang_map = es_ES:b+es+ES, hu_HU:b+hu+HU, ru_RU:b+ru+RU, pt_BR:b+pt+BR, zh_CN:b+zh+CN, pl_PL:b+pl+PL, ca@valencia:b+ca+ES+valencia, ko_KR:b+ko+KR, da_DK:b+da+DK, ja_JP:b+ja+JP, lt_LT:b+lt+LT, ro_RO:b+ro+RO, tr_TR:b+tr+TR, vi_VN:b+vi+VN, zh_TW:b+zh+TW

dist/org.azahar_emu.Azahar.xml

@@ -4,7 +4,7 @@
         <comment>Nintendo 3DS homebrew executable</comment>
         <comment xml:lang="fr">Exécutable non-officiel pour Nintendo 3DS </comment>
         <acronym>3DSX</acronym>
-        <icon name="citra"/>
+        <icon name="azahar"/>
         <glob pattern="*.3dsx"/>
         <magic><match value="3DSX" type="string" offset="0"/></magic>
     </mime-type>
@@ -14,7 +14,7 @@
         <comment xml:lang="fr">Image de cartouche Nintendo 3DS</comment>
         <acronym>CCI</acronym>
         <expanded-acronym>CTR Cart Image</expanded-acronym>
-        <icon name="citra"/>
+        <icon name="azahar"/>
         <glob pattern="*.cci"/>
         <magic><match value="NCSD" type="string" offset="256"/></magic>
     </mime-type>
@@ -24,7 +24,7 @@
         <comment xml:lang="fr">Exécutable Nintendo 3DS</comment>
         <acronym>CXI</acronym>
         <expanded-acronym>CTR eXecutable Image</expanded-acronym>
-        <icon name="citra"/>
+        <icon name="azahar"/>
         <glob pattern="*.cxi"/>
         <magic><match value="NCCH" type="string" offset="256"/></magic>
     </mime-type>
@@ -34,7 +34,7 @@
         <comment xml:lang="fr">Archive installable Nintendo 3DS</comment>
         <acronym>CIA</acronym>
         <expanded-acronym>CTR Importable Archive</expanded-acronym>
-        <icon name="citra"/>
+        <icon name="azahar"/>
         <glob pattern="*.cia"/>
     </mime-type>
 

dist/qt_themes/default/theme_default.qrc

@@ -13,7 +13,7 @@
         <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
         <file alias="48x48/plus.png">icons/48x48/plus.png</file>
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
-        <file alias="256x256/citra.png">icons/256x256/citra.png</file>
+        <file alias="256x256/azahar.png">icons/256x256/azahar.png</file>
         <file alias="48x48/star.png">icons/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
     </qresource>
@@ -31,7 +31,7 @@
         <file alias="48x48/no_avatar.png">icons_light/48x48/no_avatar.png</file>
         <file alias="48x48/plus.png">icons_light/48x48/plus.png</file>
         <file alias="48x48/sd_card.png">icons_light/48x48/sd_card.png</file>
-        <file alias="256x256/citra.png">icons_light/256x256/citra.png</file>
+        <file alias="256x256/azahar.png">icons_light/256x256/azahar.png</file>
         <file alias="48x48/star.png">icons_light/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons_light/256x256/plus_folder.png</file>
     </qresource>

dist/scripting/citra.py

@@ -1,15 +1,21 @@
+# Copyright Citra Emulator Project / Azahar Emulator Project
+# Licensed under GPLv2 or any later version
+# Refer to the license.txt file included.
+
 import struct
 import random
 import enum
 import socket
 
 CURRENT_REQUEST_VERSION = 1
-MAX_REQUEST_DATA_SIZE = 32
-MAX_PACKET_SIZE = 48
+MAX_REQUEST_DATA_SIZE = 1024
+MAX_PACKET_SIZE = 1024 + 0x10
 
 class RequestType(enum.IntEnum):
     ReadMemory = 1,
-    WriteMemory = 2
+    WriteMemory = 2,
+    ProcessList = 3,
+    SetGetProcess = 4,
 
 CITRA_PORT = 45987
 
@@ -34,6 +40,55 @@ class Citra:
             return raw_reply[4*4:]
         return None
 
+    def process_list(self):
+        processes = {}
+        read_processes = 0
+        while True:
+            request_data = struct.pack("II", read_processes, 0x7FFFFFFF)
+            request, request_id = self._generate_header(RequestType.ProcessList, len(request_data))
+            request += request_data
+            self.socket.sendto(request, (self.address, CITRA_PORT))
+
+            raw_reply = self.socket.recv(MAX_PACKET_SIZE)
+            reply_data = self._read_and_validate_header(raw_reply, request_id, RequestType.ProcessList)
+
+            if reply_data:
+                read_count = struct.unpack("I", reply_data[0:4])[0]
+                reply_data = reply_data[4:]
+                if read_count == 0:
+                    break
+                read_processes += read_count
+                for i in range(read_count):
+                    proc_data = reply_data[i * 0x14 : (i + 1) * 0x14]
+                    proc_id, title_id, proc_name = struct.unpack("<IQ8s", proc_data)
+                    proc_name = proc_name.rstrip(b"\x00").decode("ascii")
+                    processes[proc_id] = (title_id, proc_name)
+            else:
+                break
+        return processes
+
+    def get_process(self):
+        request_data = struct.pack("II", 0, 0)
+        request, request_id = self._generate_header(RequestType.SetGetProcess, len(request_data))
+        request += request_data
+        self.socket.sendto(request, (self.address, CITRA_PORT))
+
+        raw_reply = self.socket.recv(MAX_PACKET_SIZE)
+        reply_data = self._read_and_validate_header(raw_reply, request_id, RequestType.SetGetProcess)
+
+        if reply_data:
+            return struct.unpack("I", reply_data)[0]
+        else:
+            return None
+
+    def set_process(self, process_id):
+        request_data = struct.pack("II", 1, process_id)
+        request, request_id = self._generate_header(RequestType.SetGetProcess, len(request_data))
+        request += request_data
+        self.socket.sendto(request, (self.address, CITRA_PORT))
+
+        self.socket.recv(MAX_PACKET_SIZE)
+
     def read_memory(self, read_address, read_size):
         """
         >>> c.read_memory(0x100000, 4)

externals/discord-rpc

@@ -1 +1 @@
-Subproject commit 54eb03c20351f94850bfca3955cb87465a860ef6
+Subproject commit cb50201fc09290cd078c7ab27917504491f7f96a

externals/dynarmic

@@ -1 +1 @@
-Subproject commit ef8380aef149fe39b2913c4a1678470db2eac1d4
+Subproject commit 278405bd71999ed3f3c77c5f78344a06fef798b9

externals/libressl

@@ -1 +1 @@
-Subproject commit d4fc7348a3fbe9c659a373e28a3b50f052f7c50a
+Subproject commit 88b8e41b71099fabc57813bc06d8bc1aba050a19

externals/libyuv

@@ -1 +1 @@
-Subproject commit c060118bea3f28ceb837d3c85e479d3bb4c21726
+Subproject commit 6f729fbe658a40dfd993fa8b22bd612bb17cde5c

externals/sdl2/SDL

@@ -1 +1 @@
-Subproject commit e11183ea6caa3ae4895f4bc54cad2bbb0e365417
+Subproject commit 2359383fc187386204c3bb22de89655a494cd128

externals/sirit

@@ -1 +1 @@
-Subproject commit 4ab79a8c023aa63caaa93848b09b9fe8b183b1a9
+Subproject commit 37d49d2aa4c0a62f872720d6e5f2eaf90b2c95fa

externals/soundtouch

@@ -1 +1 @@
-Subproject commit dd2252e9af3f2d6b749378173a4ae89551e06faf
+Subproject commit 9ef8458d8561d9471dd20e9619e3be4cfe564796

src/CMakeLists.txt

@@ -115,7 +115,10 @@ else()
         -fstack-clash-protection
     )
 
-    if (NOT CMAKE_BUILD_TYPE STREQUAL Debug)
+    # If we define _FORTIFY_SOURCE when it is already defined, compilation will fail
+    string(FIND "-D_FORTIFY_SOURCE" "${CMAKE_CXX_FLAGS} " FORTIFY_SOURCE_DEFINED)
+
+    if (NOT CMAKE_BUILD_TYPE STREQUAL Debug AND NOT FORTIFY_SOURCE_DEFINED)
         # _FORTIFY_SOURCE can't be used without optimizations.
         add_compile_options(-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2)
     endif()
@@ -133,6 +136,9 @@ else()
         # which is a problem for older versions (e.g. GCC 11).
         add_compile_options("-Wno-attributes")
         add_compile_options("-Wno-interference-size")
+        # Suppress irrelevant ABI warnings generated by GCC
+        add_compile_options("-Wno-psabi")
+        add_link_options("-Wno-psabi")
     endif()
 
     if (MINGW)
@@ -196,6 +202,10 @@ if (ENABLE_ROOM)
     add_subdirectory(citra_room)
 endif()
 
+if (ENABLE_ROOM_STANDALONE)
+    add_subdirectory(citra_room_standalone)
+endif()
+
 if (ANDROID)
     add_subdirectory(android/app/src/main/jni)
     target_include_directories(citra-android PRIVATE android/app/src/main)

src/android/app/build.gradle.kts

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -22,7 +22,7 @@ plugins {
 val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toInt()
 val abiFilter = listOf("arm64-v8a", "x86_64")
 
-val downloadedJniLibsPath = "${buildDir}/downloadedJniLibs"
+val downloadedJniLibsPath = "${layout.buildDirectory.get().asFile.path}/downloadedJniLibs"
 
 @Suppress("UnstableApiUsage")
 android {
@@ -51,6 +51,7 @@ android {
 
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 
     lint {
@@ -124,7 +125,6 @@ android {
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
             signingConfig = signingConfigs.getByName("debug")
-            isMinifyEnabled = true
             isShrinkResources = true
             isDebuggable = true
             isJniDebuggable = true
@@ -150,7 +150,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version = "3.22.1"
+            version = "3.25.0+"
             path = file("../../../CMakeLists.txt")
         }
     }
@@ -186,8 +186,8 @@ dependencies {
 
 // Download Vulkan Validation Layers from the KhronosGroup GitHub.
 val downloadVulkanValidationLayers = tasks.register<Download>("downloadVulkanValidationLayers") {
-    src("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/sdk-1.3.261.1/android-binaries-sdk-1.3.261.1-android.zip")
-    dest(file("${buildDir}/tmp/Vulkan-ValidationLayers.zip"))
+    src("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/vulkan-sdk-1.4.304.1/android-binaries-1.4.304.1.zip")
+    dest(file("${layout.buildDirectory.get().asFile.path}/tmp/Vulkan-ValidationLayers.zip"))
     onlyIfModified(true)
 }
 

src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt

@@ -182,6 +182,14 @@ object NativeLibrary {
 
     external fun uninstallSystemFiles(old3DS: Boolean)
 
+    external fun isFullConsoleLinked(): Boolean
+
+    external fun unlinkConsole()
+
+    external fun setTemporaryFrameLimit(speed: Double)
+
+    external fun disableTemporaryFrameLimit()
+
     private var coreErrorAlertResult = false
     private val coreErrorAlertLock = Object()
 
@@ -769,6 +777,7 @@ object NativeLibrary {
         const val BUTTON_DEBUG = 781
         const val BUTTON_GPIO14 = 782
         const val BUTTON_SWAP = 800
+        const val BUTTON_TURBO = 801
     }
 
     /**

src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -15,6 +15,7 @@ import android.os.Bundle
 import android.view.InputDevice
 import android.view.KeyEvent
 import android.view.MotionEvent
+import android.view.Window
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -44,6 +45,7 @@ import org.citra.citra_emu.utils.FileBrowserHelper
 import org.citra.citra_emu.utils.EmulationLifecycleUtil
 import org.citra.citra_emu.utils.EmulationMenuSettings
 import org.citra.citra_emu.utils.ThemeUtil
+import org.citra.citra_emu.utils.TurboHelper
 import org.citra.citra_emu.viewmodel.EmulationViewModel
 
 class EmulationActivity : AppCompatActivity() {
@@ -51,7 +53,7 @@ class EmulationActivity : AppCompatActivity() {
         get() = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
     var isActivityRecreated = false
     private val emulationViewModel: EmulationViewModel by viewModels()
-    private val settingsViewModel: SettingsViewModel by viewModels()
+    val settingsViewModel: SettingsViewModel by viewModels()
 
     private lateinit var binding: ActivityEmulationBinding
     private lateinit var screenAdjustmentUtil: ScreenAdjustmentUtil
@@ -67,6 +69,8 @@ class EmulationActivity : AppCompatActivity() {
     private var isEmulationRunning: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+
         ThemeUtil.setTheme(this)
 
         settingsViewModel.settings.loadSettings()
@@ -192,9 +196,16 @@ class EmulationActivity : AppCompatActivity() {
     }
 
     private fun enableFullscreenImmersive() {
-        // TODO: Remove this once we properly account for display insets in the input overlay
-        window.attributes.layoutInDisplayCutoutMode =
-            WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER
+        val attributes = window.attributes
+
+        attributes.layoutInDisplayCutoutMode =
+            if (BooleanSetting.EXPAND_TO_CUTOUT_AREA.boolean) {
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+            } else {
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER
+            }
+
+        window.attributes = attributes
 
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
@@ -227,20 +238,26 @@ class EmulationActivity : AppCompatActivity() {
             preferences.getInt(InputBindingSetting.getInputButtonKey(event.keyCode), event.keyCode)
         val action: Int = when (event.action) {
             KeyEvent.ACTION_DOWN -> {
+                hotkeyUtility.handleHotkey(button)
+
                 // On some devices, the back gesture / button press is not intercepted by androidx
                 // and fails to open the emulation menu. So we're stuck running deprecated code to
                 // cover for either a fault on androidx's side or in OEM skins (MIUI at least)
                 if (event.keyCode == KeyEvent.KEYCODE_BACK) {
-                    onBackPressed()
+                    // If the hotkey is pressed, we don't want to open the drawer
+                    if (!hotkeyUtility.HotkeyIsPressed) {
+                        onBackPressed()
+                    }
                 }
 
-                hotkeyUtility.handleHotkey(button)
-
                 // Normal key events.
                 NativeLibrary.ButtonState.PRESSED
             }
 
-            KeyEvent.ACTION_UP -> NativeLibrary.ButtonState.RELEASED
+            KeyEvent.ACTION_UP -> {
+                hotkeyUtility.HotkeyIsPressed = false
+                NativeLibrary.ButtonState.RELEASED
+            }
             else -> return false
         }
         val input = event.device

src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.kt

@@ -1,10 +1,11 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 package org.citra.citra_emu.adapters
 
 import android.graphics.drawable.Icon
+import android.content.Intent
 import android.net.Uri
 import android.os.SystemClock
 import android.text.TextUtils
@@ -19,7 +20,12 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.Bitmap
 import android.content.pm.ShortcutInfo
 import android.content.pm.ShortcutManager
+import android.graphics.BitmapFactory
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.edit
+import androidx.core.graphics.scale
+import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.findNavController
@@ -28,6 +34,7 @@ import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import android.widget.PopupMenu
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
@@ -41,17 +48,29 @@ import org.citra.citra_emu.CitraApplication
 import org.citra.citra_emu.R
 import org.citra.citra_emu.adapters.GameAdapter.GameViewHolder
 import org.citra.citra_emu.databinding.CardGameBinding
+import org.citra.citra_emu.databinding.DialogShortcutBinding
 import org.citra.citra_emu.features.cheats.ui.CheatsFragmentDirections
-import org.citra.citra_emu.features.settings.ui.SettingsActivity
-import org.citra.citra_emu.features.settings.utils.SettingsFile
+import org.citra.citra_emu.fragments.IndeterminateProgressDialogFragment
 import org.citra.citra_emu.model.Game
+import org.citra.citra_emu.utils.FileUtil
 import org.citra.citra_emu.utils.GameIconUtils
 import org.citra.citra_emu.viewmodel.GamesViewModel
 
-class GameAdapter(private val activity: AppCompatActivity, private val inflater: LayoutInflater) :
+class GameAdapter(private val activity: AppCompatActivity, private val inflater: LayoutInflater,  private val openImageLauncher: ActivityResultLauncher<String>?) :
     ListAdapter<Game, GameViewHolder>(AsyncDifferConfig.Builder(DiffCallback()).build()),
     View.OnClickListener, View.OnLongClickListener {
     private var lastClickTime = 0L
+    private var imagePath: String? = null
+    private var dialogShortcutBinding: DialogShortcutBinding? = null
+
+    fun handleShortcutImageResult(uri: Uri?) {
+        val path = uri?.toString()
+        if (path != null) {
+            imagePath = path
+            dialogShortcutBinding!!.imageScaleSwitch.isEnabled = imagePath != null
+            refreshShortcutDialogIcon()
+        }
+    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameViewHolder {
         // Create a new view.
@@ -203,6 +222,117 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
         }
     }
 
+    private data class GameDirectories(
+        val gameDir: String,
+        val saveDir: String,
+        val modsDir: String,
+        val texturesDir: String,
+        val appDir: String,
+        val dlcDir: String,
+        val updatesDir: String,
+        val extraDir: String
+    )
+    private fun getGameDirectories(game: Game): GameDirectories {
+        val basePath = "sdmc/Nintendo 3DS/00000000000000000000000000000000/00000000000000000000000000000000"
+        return GameDirectories(
+            gameDir = game.path.substringBeforeLast("/"),
+            saveDir = basePath + "/title/${String.format("%016x", game.titleId).lowercase().substring(0, 8)}/${String.format("%016x", game.titleId).lowercase().substring(8)}/data/00000001",
+            modsDir = "load/mods/${String.format("%016X", game.titleId)}",
+            texturesDir = "load/textures/${String.format("%016X", game.titleId)}",
+            appDir = game.path.substringBeforeLast("/").split("/").filter { it.isNotEmpty() }.joinToString("/"),
+            dlcDir = basePath + "/title/0004008c/${String.format("%016x", game.titleId).lowercase().substring(8)}/content",
+            updatesDir = basePath + "/title/0004000e/${String.format("%016x", game.titleId).lowercase().substring(8)}/content",
+            extraDir = basePath + "/extdata/00000000/${String.format("%016X", game.titleId).substring(8, 14).padStart(8, '0')}"
+        )
+    }
+
+    private fun showOpenContextMenu(view: View, game: Game) {
+        val dirs = getGameDirectories(game)
+
+        val popup = PopupMenu(view.context, view).apply {
+            menuInflater.inflate(R.menu.game_context_menu_open, menu)
+            listOf(
+                R.id.game_context_open_app to dirs.appDir,
+                R.id.game_context_open_save_dir to dirs.saveDir,
+                R.id.game_context_open_updates to dirs.updatesDir,
+                R.id.game_context_open_dlc to dirs.dlcDir,
+                R.id.game_context_open_extra to dirs.extraDir
+            ).forEach { (id, dir) ->
+                menu.findItem(id)?.isEnabled =
+                    CitraApplication.documentsTree.folderUriHelper(dir)?.let {
+                        DocumentFile.fromTreeUri(view.context, it)?.exists()
+                    } ?: false
+            }
+        }
+
+        popup.setOnMenuItemClickListener { menuItem ->
+            val intent = Intent(Intent.ACTION_VIEW)
+                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .setType("*/*")
+
+            val uri = when (menuItem.itemId) {
+                R.id.game_context_open_app -> CitraApplication.documentsTree.folderUriHelper(dirs.appDir)
+                R.id.game_context_open_save_dir -> CitraApplication.documentsTree.folderUriHelper(dirs.saveDir)
+                R.id.game_context_open_updates -> CitraApplication.documentsTree.folderUriHelper(dirs.updatesDir)
+                R.id.game_context_open_dlc -> CitraApplication.documentsTree.folderUriHelper(dirs.dlcDir)
+                R.id.game_context_open_extra -> CitraApplication.documentsTree.folderUriHelper(dirs.extraDir)
+                R.id.game_context_open_textures -> CitraApplication.documentsTree.folderUriHelper(dirs.texturesDir, true)
+                R.id.game_context_open_mods -> CitraApplication.documentsTree.folderUriHelper(dirs.modsDir, true)
+                else -> null
+            }
+
+            uri?.let {
+                intent.data = it
+                view.context.startActivity(intent)
+                true
+            } ?: false
+        }
+
+        popup.show()
+    }
+
+    private fun showUninstallContextMenu(view: View, game: Game, bottomSheetDialog: BottomSheetDialog) {
+        val dirs = getGameDirectories(game)
+        val popup = PopupMenu(view.context, view).apply {
+            menuInflater.inflate(R.menu.game_context_menu_uninstall, menu)
+            listOf(
+                R.id.game_context_uninstall to dirs.gameDir,
+                R.id.game_context_uninstall_dlc to dirs.dlcDir,
+                R.id.game_context_uninstall_updates to dirs.updatesDir
+            ).forEach { (id, dir) ->
+                menu.findItem(id)?.isEnabled =
+                    CitraApplication.documentsTree.folderUriHelper(dir)?.let {
+                        DocumentFile.fromTreeUri(view.context, it)?.exists()
+                    } ?: false
+            }
+        }
+
+        popup.setOnMenuItemClickListener { menuItem ->
+            val uninstallAction: () -> Unit = {
+                when (menuItem.itemId) {
+                    R.id.game_context_uninstall -> CitraApplication.documentsTree.deleteDocument(dirs.gameDir)
+                    R.id.game_context_uninstall_dlc -> FileUtil.deleteDocument(CitraApplication.documentsTree.folderUriHelper(dirs.dlcDir)
+                        .toString())
+                    R.id.game_context_uninstall_updates -> FileUtil.deleteDocument(CitraApplication.documentsTree.folderUriHelper(dirs.updatesDir)
+                        .toString())
+                }
+                ViewModelProvider(activity)[GamesViewModel::class.java].reloadGames(true)
+                bottomSheetDialog.dismiss()
+            }
+
+            if (menuItem.itemId in listOf(R.id.game_context_uninstall, R.id.game_context_uninstall_dlc, R.id.game_context_uninstall_updates)) {
+                IndeterminateProgressDialogFragment.newInstance(activity, R.string.uninstalling, false, uninstallAction)
+                    .show(activity.supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
+                true
+            } else {
+                false
+            }
+        }
+
+        popup.show()
+    }
+
     private fun showAboutGameDialog(context: Context, game: Game, holder: GameViewHolder, view: View) {
         val bottomSheetView = inflater.inflate(R.layout.dialog_about_game, null)
 
@@ -222,21 +352,67 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
         }
 
         bottomSheetView.findViewById<MaterialButton>(R.id.game_shortcut).setOnClickListener {
-            val shortcutManager = activity.getSystemService(ShortcutManager::class.java)
+            val preferences = PreferenceManager.getDefaultSharedPreferences(context)
 
-            CoroutineScope(Dispatchers.IO).launch {
-                val bitmap = (bottomSheetView.findViewById<ImageView>(R.id.game_icon).drawable as BitmapDrawable).bitmap
-                val icon = Icon.createWithBitmap(bitmap)
-
-                val shortcut = ShortcutInfo.Builder(context, game.title)
-                    .setShortLabel(game.title)
-                    .setIcon(icon)
-                    .setIntent(game.launchIntent.apply {
-                        putExtra("launched_from_shortcut", true)
-                    })
-                    .build()
-                shortcutManager.requestPinShortcut(shortcut, null)
+            // Default to false for zoomed in shortcut icons
+            preferences.edit() {
+                putBoolean(
+                    "shouldStretchIcon",
+                    false
+                )
             }
+
+            dialogShortcutBinding = DialogShortcutBinding.inflate(activity.layoutInflater)
+
+            dialogShortcutBinding!!.shortcutNameInput.setText(game.title)
+            GameIconUtils.loadGameIcon(activity, game, dialogShortcutBinding!!.shortcutIcon)
+
+            dialogShortcutBinding!!.shortcutIcon.setOnClickListener {
+                openImageLauncher?.launch("image/*")
+            }
+
+            dialogShortcutBinding!!.imageScaleSwitch.setOnCheckedChangeListener { _, isChecked ->
+                preferences.edit {
+                    putBoolean(
+                        "shouldStretchIcon",
+                        isChecked
+                    )
+                }
+                refreshShortcutDialogIcon()
+            }
+
+            MaterialAlertDialogBuilder(context)
+                .setTitle(R.string.create_shortcut)
+                .setView(dialogShortcutBinding!!.root)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    val shortcutName = dialogShortcutBinding!!.shortcutNameInput.text.toString()
+                    if (shortcutName.isEmpty()) {
+                        Toast.makeText(context, R.string.shortcut_name_empty, Toast.LENGTH_LONG).show()
+                        return@setPositiveButton
+                    }
+                    val iconBitmap = (dialogShortcutBinding!!.shortcutIcon.drawable as BitmapDrawable).bitmap
+                    val shortcutManager = activity.getSystemService(ShortcutManager::class.java)
+
+                    CoroutineScope(Dispatchers.IO).launch {
+                        val icon = Icon.createWithBitmap(iconBitmap)
+                        val shortcut = ShortcutInfo.Builder(context, shortcutName)
+                            .setShortLabel(shortcutName)
+                            .setIcon(icon)
+                            .setIntent(game.launchIntent.apply {
+                                putExtra("launchedFromShortcut", true)
+                            })
+                            .build()
+
+                        shortcutManager?.requestPinShortcut(shortcut, null)
+                        imagePath = null
+                    }
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    imagePath = null
+                }
+                .show()
+
+            bottomSheetDialog.dismiss()
         }
 
         bottomSheetView.findViewById<MaterialButton>(R.id.cheats).setOnClickListener {
@@ -245,6 +421,14 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
             bottomSheetDialog.dismiss()
         }
 
+        bottomSheetView.findViewById<MaterialButton>(R.id.menu_button_open).setOnClickListener {
+            showOpenContextMenu(it, game)
+        }
+
+        bottomSheetView.findViewById<MaterialButton>(R.id.menu_button_uninstall).setOnClickListener {
+            showUninstallContextMenu(it, game, bottomSheetDialog)
+        }
+
         val bottomSheetBehavior = bottomSheetDialog.getBehavior()
         bottomSheetBehavior.skipCollapsed = true
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
@@ -252,6 +436,47 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
         bottomSheetDialog.show()
     }
 
+    private fun refreshShortcutDialogIcon() {
+        if (imagePath != null) {
+            val originalBitmap = BitmapFactory.decodeStream(
+                CitraApplication.appContext.contentResolver.openInputStream(
+                    imagePath!!.toUri()
+                )
+            )
+            val scaledBitmap = {
+                val preferences =
+                    PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
+                if (preferences.getBoolean("shouldStretchIcon", true)) {
+                    // stretch to fit
+                    originalBitmap.scale(108, 108)
+                } else {
+                    // Zoom in to fit the bitmap while keeping the aspect ratio
+                    val width = originalBitmap.width
+                    val height = originalBitmap.height
+                    val targetSize = 108
+
+                    if (width > height) {
+                        // Landscape orientation
+                        val scaleFactor = targetSize.toFloat() / height
+                        val scaledWidth = (width * scaleFactor).toInt()
+                        val scaledBmp = originalBitmap.scale(scaledWidth, targetSize)
+
+                        val startX = (scaledWidth - targetSize) / 2
+                        Bitmap.createBitmap(scaledBmp, startX, 0, targetSize, targetSize)
+                    } else {
+                        val scaleFactor = targetSize.toFloat() / width
+                        val scaledHeight = (height * scaleFactor).toInt()
+                        val scaledBmp = originalBitmap.scale(targetSize, scaledHeight)
+
+                        val startY = (scaledHeight - targetSize) / 2
+                        Bitmap.createBitmap(scaledBmp, 0, startY, targetSize, targetSize)
+                    }
+                }
+            }()
+            dialogShortcutBinding!!.shortcutIcon.setImageBitmap(scaledBitmap)
+        }
+    }
+
     private fun isValidGame(extension: String): Boolean {
         return Game.badExtensions.stream()
             .noneMatch { extension == it.lowercase() }

src/android/app/src/main/java/org/citra/citra_emu/adapters/SetupAdapter.kt

@@ -1,9 +1,10 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 package org.citra.citra_emu.adapters
 
+import android.content.res.ColorStateList
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
@@ -14,9 +15,11 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.button.MaterialButton
 import org.citra.citra_emu.databinding.PageSetupBinding
+import org.citra.citra_emu.model.ButtonState
+import org.citra.citra_emu.model.PageState
 import org.citra.citra_emu.model.SetupCallback
 import org.citra.citra_emu.model.SetupPage
-import org.citra.citra_emu.model.StepState
+import org.citra.citra_emu.R
 import org.citra.citra_emu.utils.ViewUtils
 
 class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>) :
@@ -42,8 +45,40 @@ class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>)
         fun bind(page: SetupPage) {
             this.page = page
 
-            if (page.stepCompleted.invoke() == StepState.STEP_COMPLETE) {
-                onStepCompleted()
+            if (page.pageSteps.invoke() == PageState.PAGE_STEPS_COMPLETE) {
+                onStepCompleted(0, pageFullyCompleted = true)
+            }
+
+            if (page.pageButtons != null && page.pageSteps.invoke() != PageState.PAGE_STEPS_COMPLETE) {
+                for (pageButton in page.pageButtons) {
+                    val pageButtonView = LayoutInflater.from(activity)
+                        .inflate(
+                            R.layout.page_button,
+                            binding.pageButtonContainer,
+                            false
+                        ) as MaterialButton
+
+                    pageButtonView.apply {
+                        id = pageButton.titleId
+                        icon = ResourcesCompat.getDrawable(
+                            activity.resources,
+                            pageButton.iconId,
+                            activity.theme
+                        )
+                        text = activity.resources.getString(pageButton.titleId)
+                    }
+
+                    pageButtonView.setOnClickListener {
+                        pageButton.buttonAction.invoke(this@SetupPageViewHolder)
+                    }
+
+                    binding.pageButtonContainer.addView(pageButtonView)
+
+                    // Disable buton add if its already completed
+                    if (pageButton.buttonState.invoke() == ButtonState.BUTTON_ACTION_COMPLETE) {
+                        onStepCompleted(pageButton.titleId, pageFullyCompleted = false)
+                    }
+                }
             }
 
             binding.icon.setImageDrawable(
@@ -57,31 +92,26 @@ class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>)
             binding.textDescription.text =
                 Html.fromHtml(activity.resources.getString(page.descriptionId), 0)
             binding.textDescription.movementMethod = LinkMovementMethod.getInstance()
-
-            binding.buttonAction.apply {
-                text = activity.resources.getString(page.buttonTextId)
-                if (page.buttonIconId != 0) {
-                    icon = ResourcesCompat.getDrawable(
-                        activity.resources,
-                        page.buttonIconId,
-                        activity.theme
-                    )
-                }
-                iconGravity =
-                    if (page.leftAlignedIcon) {
-                        MaterialButton.ICON_GRAVITY_START
-                    } else {
-                        MaterialButton.ICON_GRAVITY_END
-                    }
-                setOnClickListener {
-                    page.buttonAction.invoke(this@SetupPageViewHolder)
-                }
-            }
         }
 
-        override fun onStepCompleted() {
-            ViewUtils.hideView(binding.buttonAction, 200)
-            ViewUtils.showView(binding.textConfirmation, 200)
+        override fun onStepCompleted(pageButtonId: Int, pageFullyCompleted: Boolean) {
+            val button = binding.pageButtonContainer.findViewById<MaterialButton>(pageButtonId)
+
+            if (pageFullyCompleted) {
+                ViewUtils.hideView(binding.pageButtonContainer, 200)
+                ViewUtils.showView(binding.textConfirmation, 200)
+            }
+
+            if (button != null) {
+                button.isEnabled = false
+                button.animate()
+                    .alpha(0.38f)
+                    .setDuration(200)
+                    .start()
+                button.setTextColor(button.context.getColor(com.google.android.material.R.color.material_on_surface_disabled))
+                button.iconTint =
+                    ColorStateList.valueOf(button.context.getColor(com.google.android.material.R.color.material_on_surface_disabled))
+            }
         }
     }
 }

src/android/app/src/main/java/org/citra/citra_emu/display/ScreenAdjustmentUtil.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -68,4 +68,13 @@ class ScreenAdjustmentUtil(
         settings.saveSetting(IntSetting.ORIENTATION_OPTION, SettingsFile.FILE_NAME_CONFIG)
         activity.requestedOrientation = orientationOption
     }
+
+    fun toggleScreenUpright() {
+        val uprightBoolean = BooleanSetting.UPRIGHT_SCREEN.boolean
+        BooleanSetting.UPRIGHT_SCREEN.boolean = !uprightBoolean
+        settings.saveSetting(BooleanSetting.UPRIGHT_SCREEN, SettingsFile.FILE_NAME_CONFIG)
+        NativeLibrary.reloadSettings()
+        NativeLibrary.updateFramebuffer(NativeLibrary.isPortraitMode)
+
+    }
 }

src/android/app/src/main/java/org/citra/citra_emu/display/ScreenLayout.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -41,7 +41,8 @@ enum class SmallScreenPosition(val int: Int) {
 enum class PortraitScreenLayout(val int: Int) {
     // These must match what is defined in src/common/settings.h
     TOP_FULL_WIDTH(0),
-    CUSTOM_PORTRAIT_LAYOUT(1);
+    CUSTOM_PORTRAIT_LAYOUT(1),
+    ORIGINAL(2);
 
     companion object {
         fun from(int: Int): PortraitScreenLayout {

src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/Hotkey.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -10,5 +10,6 @@ enum class Hotkey(val button: Int) {
     CLOSE_GAME(10003),
     PAUSE_OR_RESUME(10004),
     QUICKSAVE(10005),
-    QUICKLOAD(10006);
+    QUICKLOAD(10006),
+    TURBO_LIMIT(10007);
 }

src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -9,11 +9,15 @@ import android.widget.Toast
 import org.citra.citra_emu.NativeLibrary
 import org.citra.citra_emu.R
 import org.citra.citra_emu.utils.EmulationLifecycleUtil
+import org.citra.citra_emu.utils.TurboHelper
 import org.citra.citra_emu.display.ScreenAdjustmentUtil
 
-class HotkeyUtility(private val screenAdjustmentUtil: ScreenAdjustmentUtil, private val context: Context) {
+class HotkeyUtility(
+    private val screenAdjustmentUtil: ScreenAdjustmentUtil,
+    private val context: Context) {
 
-    val hotkeyButtons = Hotkey.entries.map { it.button }
+    private val hotkeyButtons = Hotkey.entries.map { it.button }
+    var HotkeyIsPressed = false
 
     fun handleHotkey(bindedButton: Int): Boolean {
         if(hotkeyButtons.contains(bindedButton)) {
@@ -22,16 +26,17 @@ class HotkeyUtility(private val screenAdjustmentUtil: ScreenAdjustmentUtil, priv
                 Hotkey.CYCLE_LAYOUT.button -> screenAdjustmentUtil.cycleLayouts()
                 Hotkey.CLOSE_GAME.button -> EmulationLifecycleUtil.closeGame()
                 Hotkey.PAUSE_OR_RESUME.button -> EmulationLifecycleUtil.pauseOrResume()
+                Hotkey.TURBO_LIMIT.button -> TurboHelper.toggleTurbo(true)
                 Hotkey.QUICKSAVE.button -> {
                     NativeLibrary.saveState(NativeLibrary.QUICKSAVE_SLOT)
                     Toast.makeText(context,
-                        context.getString(R.string.quicksave_saving),
+                        context.getString(R.string.saving),
                         Toast.LENGTH_SHORT).show()
                 }
                 Hotkey.QUICKLOAD.button -> {
                     val wasLoaded = NativeLibrary.loadStateIfAvailable(NativeLibrary.QUICKSAVE_SLOT)
                     val stringRes = if(wasLoaded) {
-                        R.string.quickload_loading
+                        R.string.loading
                     } else {
                         R.string.quickload_not_found
                     }
@@ -41,6 +46,7 @@ class HotkeyUtility(private val screenAdjustmentUtil: ScreenAdjustmentUtil, priv
                 }
                 else -> {}
             }
+            HotkeyIsPressed = true
             return true
         }
         return false

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt

@@ -9,16 +9,46 @@ enum class BooleanSetting(
     override val section: String,
     override val defaultValue: Boolean
 ) : AbstractBooleanSetting {
+    EXPAND_TO_CUTOUT_AREA("expand_to_cutout_area", Settings.SECTION_LAYOUT, false),
     SPIRV_SHADER_GEN("spirv_shader_gen", Settings.SECTION_RENDERER, true),
     ASYNC_SHADERS("async_shader_compilation", Settings.SECTION_RENDERER, false),
+    DISABLE_SPIRV_OPTIMIZER("disable_spirv_optimizer", Settings.SECTION_RENDERER, true),
     PLUGIN_LOADER("plugin_loader", Settings.SECTION_SYSTEM, false),
     ALLOW_PLUGIN_LOADER("allow_plugin_loader", Settings.SECTION_SYSTEM, true),
     SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false),
     INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
+    ENABLE_RPC_SERVER("enable_rpc_server", Settings.SECTION_DEBUG, false),
     CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false),
+    OVERLAY_SHOW_FPS("overlay_show_fps", Settings.SECTION_LAYOUT, true),
+    OVERLAY_SHOW_FRAMETIME("overlay_show_frame_time", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_SPEED("overlay_show_speed", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_APP_RAM_USAGE("overlay_show_app_ram_usage", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_AVAILABLE_RAM("overlay_show_available_ram", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_BATTERY_TEMP("overlay_show_battery_temp", Settings.SECTION_LAYOUT, false),
+    OVERLAY_BACKGROUND("overlay_background", Settings.SECTION_LAYOUT, false),
     DELAY_START_LLE_MODULES("delay_start_for_lle_modules", Settings.SECTION_DEBUG, true),
     DETERMINISTIC_ASYNC_OPERATIONS("deterministic_async_operations", Settings.SECTION_DEBUG, false),
-    REQUIRED_ONLINE_LLE_MODULES("enable_required_online_lle_modules", Settings.SECTION_SYSTEM, false);
+    REQUIRED_ONLINE_LLE_MODULES("enable_required_online_lle_modules", Settings.SECTION_SYSTEM, false),
+    LLE_APPLETS("lle_applets", Settings.SECTION_SYSTEM, false),
+    NEW_3DS("is_new_3ds", Settings.SECTION_SYSTEM, true),
+    LINEAR_FILTERING("filter_mode", Settings.SECTION_RENDERER, true),
+    SHADERS_ACCURATE_MUL("shaders_accurate_mul", Settings.SECTION_RENDERER, false),
+    DISK_SHADER_CACHE("use_disk_shader_cache", Settings.SECTION_RENDERER, true),
+    DUMP_TEXTURES("dump_textures", Settings.SECTION_UTILITY, false),
+    CUSTOM_TEXTURES("custom_textures", Settings.SECTION_UTILITY, false),
+    ASYNC_CUSTOM_LOADING("async_custom_loading", Settings.SECTION_UTILITY, true),
+    PRELOAD_TEXTURES("preload_textures", Settings.SECTION_UTILITY, false),
+    ENABLE_AUDIO_STRETCHING("enable_audio_stretching", Settings.SECTION_AUDIO, true),
+    ENABLE_REALTIME_AUDIO("enable_realtime_audio", Settings.SECTION_AUDIO, false),
+    CPU_JIT("use_cpu_jit", Settings.SECTION_CORE, true),
+    HW_SHADER("use_hw_shader", Settings.SECTION_RENDERER, true),
+    SHADER_JIT("use_shader_jit", Settings.SECTION_RENDERER, true),
+    VSYNC("use_vsync_new", Settings.SECTION_RENDERER, true),
+    USE_FRAME_LIMIT("use_frame_limit", Settings.SECTION_RENDERER, true),
+    DEBUG_RENDERER("renderer_debug", Settings.SECTION_DEBUG, false),
+    DISABLE_RIGHT_EYE_RENDER("disable_right_eye_render", Settings.SECTION_RENDERER, false),
+    USE_ARTIC_BASE_CONTROLLER("use_artic_base_controller", Settings.SECTION_CONTROLS, false),
+    UPRIGHT_SCREEN("upright_screen", Settings.SECTION_LAYOUT, false);
 
     override var boolean: Boolean = defaultValue
 
@@ -43,6 +73,14 @@ enum class BooleanSetting(
             DELAY_START_LLE_MODULES,
             DETERMINISTIC_ASYNC_OPERATIONS,
             REQUIRED_ONLINE_LLE_MODULES,
+            NEW_3DS,
+            LLE_APPLETS,
+            VSYNC,
+            DEBUG_RENDERER,
+            CPU_JIT,
+            ASYNC_CUSTOM_LOADING,
+            SHADERS_ACCURATE_MUL,
+            USE_ARTIC_BASE_CONTROLLER
         )
 
         fun from(key: String): BooleanSetting? =

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.kt

@@ -33,6 +33,7 @@ enum class IntSetting(
     LANDSCAPE_BOTTOM_Y("custom_bottom_y",Settings.SECTION_LAYOUT,480),
     LANDSCAPE_BOTTOM_WIDTH("custom_bottom_width",Settings.SECTION_LAYOUT,640),
     LANDSCAPE_BOTTOM_HEIGHT("custom_bottom_height",Settings.SECTION_LAYOUT,480),
+    SCREEN_GAP("screen_gap",Settings.SECTION_LAYOUT,0),
     PORTRAIT_SCREEN_LAYOUT("portrait_layout_option",Settings.SECTION_LAYOUT,0),
     PORTRAIT_TOP_X("custom_portrait_top_x",Settings.SECTION_LAYOUT,0),
     PORTRAIT_TOP_Y("custom_portrait_top_y",Settings.SECTION_LAYOUT,0),
@@ -42,29 +43,17 @@ enum class IntSetting(
     PORTRAIT_BOTTOM_Y("custom_portrait_bottom_y",Settings.SECTION_LAYOUT,480),
     PORTRAIT_BOTTOM_WIDTH("custom_portrait_bottom_width",Settings.SECTION_LAYOUT,640),
     PORTRAIT_BOTTOM_HEIGHT("custom_portrait_bottom_height",Settings.SECTION_LAYOUT,480),
-    AUDIO_INPUT_TYPE("output_type", Settings.SECTION_AUDIO, 0),
-    NEW_3DS("is_new_3ds", Settings.SECTION_SYSTEM, 1),
-    LLE_APPLETS("lle_applets", Settings.SECTION_SYSTEM, 1),
+    AUDIO_INPUT_TYPE("input_type", Settings.SECTION_AUDIO, 0),
     CPU_CLOCK_SPEED("cpu_clock_percentage", Settings.SECTION_CORE, 100),
-    LINEAR_FILTERING("filter_mode", Settings.SECTION_RENDERER, 1),
-    SHADERS_ACCURATE_MUL("shaders_accurate_mul", Settings.SECTION_RENDERER, 0),
-    DISK_SHADER_CACHE("use_disk_shader_cache", Settings.SECTION_RENDERER, 1),
-    DUMP_TEXTURES("dump_textures", Settings.SECTION_UTILITY, 0),
-    CUSTOM_TEXTURES("custom_textures", Settings.SECTION_UTILITY, 0),
-    ASYNC_CUSTOM_LOADING("async_custom_loading", Settings.SECTION_UTILITY, 1),
-    PRELOAD_TEXTURES("preload_textures", Settings.SECTION_UTILITY, 0),
-    ENABLE_AUDIO_STRETCHING("enable_audio_stretching", Settings.SECTION_AUDIO, 1),
-    ENABLE_REALTIME_AUDIO("enable_realtime_audio", Settings.SECTION_AUDIO, 0),
-    CPU_JIT("use_cpu_jit", Settings.SECTION_CORE, 1),
-    HW_SHADER("use_hw_shader", Settings.SECTION_RENDERER, 1),
-    VSYNC("use_vsync_new", Settings.SECTION_RENDERER, 1),
-    DEBUG_RENDERER("renderer_debug", Settings.SECTION_DEBUG, 0),
     TEXTURE_FILTER("texture_filter", Settings.SECTION_RENDERER, 0),
+    TEXTURE_SAMPLING("texture_sampling", Settings.SECTION_RENDERER, 0),
     USE_FRAME_LIMIT("use_frame_limit", Settings.SECTION_RENDERER, 1),
     DELAY_RENDER_THREAD_US("delay_game_render_thread_us", Settings.SECTION_RENDERER, 0),
-    USE_ARTIC_BASE_CONTROLLER("use_artic_base_controller", Settings.SECTION_CONTROLS, 0),
     ORIENTATION_OPTION("screen_orientation", Settings.SECTION_LAYOUT, 2),
-    DISABLE_RIGHT_EYE_RENDER("disable_right_eye_render", Settings.SECTION_RENDERER, 0);
+    TURBO_LIMIT("turbo_limit", Settings.SECTION_CORE, 200),
+    PERFORMANCE_OVERLAY_POSITION("performance_overlay_position", Settings.SECTION_LAYOUT, 0),
+    ASPECT_RATIO("aspect_ratio", Settings.SECTION_LAYOUT, 0);
+
     override var int: Int = defaultValue
 
     override val valueAsString: String
@@ -84,16 +73,8 @@ enum class IntSetting(
         private val NOT_RUNTIME_EDITABLE = listOf(
             EMULATED_REGION,
             INIT_CLOCK,
-            NEW_3DS,
-            LLE_APPLETS,
             GRAPHICS_API,
-            VSYNC,
-            DEBUG_RENDERER,
-            CPU_JIT,
-            ASYNC_CUSTOM_LOADING,
             AUDIO_INPUT_TYPE,
-            USE_ARTIC_BASE_CONTROLLER,
-            SHADERS_ACCURATE_MUL,
         )
 
         fun from(key: String): IntSetting? = IntSetting.values().firstOrNull { it.key == key }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -111,6 +111,7 @@ class Settings {
         const val SECTION_THEME = "Theme"
         const val SECTION_CUSTOM_LANDSCAPE = "Custom Landscape Layout"
         const val SECTION_CUSTOM_PORTRAIT = "Custom Portrait Layout"
+        const val SECTION_PERFORMANCE_OVERLAY = "Performance Overlay"
 
         const val KEY_BUTTON_A = "button_a"
         const val KEY_BUTTON_B = "button_b"
@@ -139,6 +140,7 @@ class Settings {
         const val HOTKEY_PAUSE_OR_RESUME = "hotkey_pause_or_resume_game"
         const val HOTKEY_QUICKSAVE = "hotkey_quickload"
         const val HOTKEY_QUICKlOAD = "hotkey_quickpause"
+        const val HOTKEY_TURBO_LIMIT = "hotkey_turbo_limit"
 
         val buttonKeys = listOf(
             KEY_BUTTON_A,
@@ -204,7 +206,8 @@ class Settings {
             HOTKEY_CLOSE_GAME,
             HOTKEY_PAUSE_OR_RESUME,
             HOTKEY_QUICKSAVE,
-            HOTKEY_QUICKlOAD
+            HOTKEY_QUICKlOAD,
+            HOTKEY_TURBO_LIMIT
         )
         val hotkeyTitles = listOf(
             R.string.emulation_swap_screens,
@@ -213,6 +216,7 @@ class Settings {
             R.string.emulation_toggle_pause,
             R.string.emulation_quicksave,
             R.string.emulation_quickload,
+            R.string.turbo_limit_hotkey
         )
 
         const val PREF_FIRST_APP_LAUNCH = "FirstApplicationLaunch"

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/DateTimeSetting.kt

@@ -12,7 +12,8 @@ class DateTimeSetting(
     titleId: Int,
     descriptionId: Int,
     val key: String? = null,
-    private val defaultValue: String? = null
+    private val defaultValue: String? = null,
+    override var isEnabled: Boolean = true
 ) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_DATETIME_SETTING
 

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -133,6 +133,7 @@ class InputBindingSetting(
                 Settings.HOTKEY_PAUSE_OR_RESUME -> Hotkey.PAUSE_OR_RESUME.button
                 Settings.HOTKEY_QUICKSAVE -> Hotkey.QUICKSAVE.button
                 Settings.HOTKEY_QUICKlOAD -> Hotkey.QUICKLOAD.button
+                Settings.HOTKEY_TURBO_LIMIT -> Hotkey.TURBO_LIMIT.button
                 else -> -1
             }
 

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -28,6 +28,13 @@ abstract class SettingsItem(
             return setting?.isRuntimeEditable ?: false
         }
 
+    open var isEnabled: Boolean = true
+
+    val isActive: Boolean
+        get() {
+            return this.isEditable && this.isEnabled
+        }
+
     companion object {
         const val TYPE_HEADER = 0
         const val TYPE_SWITCH = 1

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SingleChoiceSetting.kt

@@ -15,7 +15,8 @@ class SingleChoiceSetting(
     val choicesId: Int,
     val valuesId: Int,
     val key: String? = null,
-    val defaultValue: Int? = null
+    val defaultValue: Int? = null,
+    override var isEnabled: Boolean = true
 ) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_SINGLE_CHOICE
 

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.kt

@@ -20,7 +20,8 @@ class SliderSetting(
     val max: Int,
     val units: String,
     val key: String? = null,
-    val defaultValue: Float? = null
+    val defaultValue: Float? = null,
+    override var isEnabled: Boolean = true
 ) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_SLIDER
     val selectedFloat: Float

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringInputSetting.kt

@@ -12,7 +12,8 @@ class StringInputSetting(
     titleId: Int,
     descriptionId: Int,
     val defaultValue: String,
-    val characterLimit: Int = 0
+    val characterLimit: Int = 0,
+    override var isEnabled: Boolean = true
 ) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_STRING_INPUT
 

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.kt

@@ -15,7 +15,8 @@ class StringSingleChoiceSetting(
     val choices: Array<String>,
     val values: Array<String>?,
     val key: String? = null,
-    private val defaultValue: String? = null
+    private val defaultValue: String? = null,
+    override var isEnabled: Boolean = true
 ) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_STRING_SINGLE_CHOICE
 

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SwitchSetting.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -9,53 +9,31 @@ import org.citra.citra_emu.features.settings.model.AbstractIntSetting
 import org.citra.citra_emu.features.settings.model.AbstractSetting
 
 class SwitchSetting(
-    setting: AbstractSetting,
+    setting: AbstractBooleanSetting,
     titleId: Int,
     descriptionId: Int,
     val key: String? = null,
-    val defaultValue: Any? = null
+    val defaultValue: Boolean = false,
+    override var isEnabled: Boolean = true
 ) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_SWITCH
 
     val isChecked: Boolean
         get() {
             if (setting == null) {
-                return defaultValue as Boolean
+                return defaultValue
             }
-
-            // Try integer setting
-            try {
-                val setting = setting as AbstractIntSetting
-                return setting.int == 1
-            } catch (_: ClassCastException) {
-            }
-
-            // Try boolean setting
-            try {
-                val setting = setting as AbstractBooleanSetting
-                return setting.boolean
-            } catch (_: ClassCastException) {
-            }
-            return defaultValue as Boolean
+            val setting = setting as AbstractBooleanSetting
+            return setting.boolean
         }
 
     /**
-     * Write a value to the backing boolean. If that boolean was previously null,
-     * initializes a new one and returns it, so it can be added to the Hashmap.
+     * Write a value to the backing boolean.
      *
      * @param checked Pretty self explanatory.
      * @return the existing setting with the new value applied.
      */
-    fun setChecked(checked: Boolean): AbstractSetting {
-        // Try integer setting
-        try {
-            val setting = setting as AbstractIntSetting
-            setting.int = if (checked) 1 else 0
-            return setting
-        } catch (_: ClassCastException) {
-        }
-
-        // Try boolean setting
+    fun setChecked(checked: Boolean): AbstractBooleanSetting {
         val setting = setting as AbstractBooleanSetting
         setting.boolean = checked
         return setting

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.kt

@@ -12,6 +12,7 @@ import org.citra.citra_emu.features.settings.model.Settings
 import org.citra.citra_emu.utils.SystemSaveGame
 import org.citra.citra_emu.utils.DirectoryInitialization
 import org.citra.citra_emu.utils.Log
+import org.citra.citra_emu.utils.TurboHelper
 
 class SettingsActivityPresenter(private val activityView: SettingsActivityView) {
     val settings: Settings get() = activityView.settings
@@ -66,6 +67,7 @@ class SettingsActivityPresenter(private val activityView: SettingsActivityView)
             //added to ensure that layout changes take effect as soon as settings window closes
             NativeLibrary.reloadSettings()
             NativeLibrary.updateFramebuffer(NativeLibrary.isPortraitMode)
+            TurboHelper.reloadTurbo(false) // TODO: Can this go somewhere else? -OS
         }
         NativeLibrary.reloadSettings()
     }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt

@@ -7,7 +7,6 @@ package org.citra.citra_emu.features.settings.ui
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
-import android.graphics.Color
 import android.icu.util.Calendar
 import android.icu.util.TimeZone
 import android.text.Editable
@@ -17,11 +16,11 @@ import android.text.TextWatcher
 import android.text.format.DateFormat
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.FragmentActivity
+import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -66,14 +65,13 @@ import org.citra.citra_emu.features.settings.ui.viewholder.SwitchSettingViewHold
 import org.citra.citra_emu.fragments.MessageDialogFragment
 import org.citra.citra_emu.fragments.MotionBottomSheetDialogFragment
 import org.citra.citra_emu.utils.SystemSaveGame
-import java.lang.IllegalStateException
 import java.lang.NumberFormatException
 import java.text.SimpleDateFormat
 import kotlin.math.roundToInt
 
 class SettingsAdapter(
     private val fragmentView: SettingsFragmentView,
-    private val context: Context
+    public val context: Context
 ) : RecyclerView.Adapter<SettingViewHolder?>(), DialogInterface.OnClickListener {
     private var settings: ArrayList<SettingsItem>? = null
     private var clickedItem: SettingsItem? = null
@@ -153,15 +151,71 @@ class SettingsAdapter(
         return getItem(position)?.type ?: -1
     }
 
-    fun setSettingsList(settings: ArrayList<SettingsItem>?) {
-        this.settings = settings ?: arrayListOf()
-        notifyDataSetChanged()
+    fun setSettingsList(newSettings: ArrayList<SettingsItem>?) {
+        if (settings == null) {
+            settings = newSettings ?: arrayListOf()
+            notifyDataSetChanged()
+            return
+        }
+
+        val oldSettings = settings
+        val diffResult = DiffUtil.calculateDiff(object : DiffUtil.Callback() {
+            override fun getOldListSize() = oldSettings?.size ?: 0
+            override fun getNewListSize() = newSettings?.size ?: 0
+
+            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+                val oldItem = oldSettings?.get(oldItemPosition)?.setting
+                val newItem = newSettings?.get(newItemPosition)?.setting
+                return oldItem?.key == newItem?.key
+            }
+
+            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+                val oldItem = oldSettings?.get(oldItemPosition)
+                val newItem = newSettings?.get(newItemPosition)
+
+                if (oldItem == null || newItem == null || oldItem.type != newItem.type) {
+                    return false
+                }
+
+                return when (oldItem.type) {
+                    SettingsItem.TYPE_SLIDER -> {
+                        (oldItem as SliderSetting).isEnabled == (newItem as SliderSetting).isEnabled
+                    }
+                    SettingsItem.TYPE_SWITCH -> {
+                        (oldItem as SwitchSetting).isEnabled == (newItem as SwitchSetting).isEnabled
+                    }
+                    SettingsItem.TYPE_SINGLE_CHOICE -> {
+                        (oldItem as SingleChoiceSetting).isEnabled == (newItem as SingleChoiceSetting).isEnabled
+                    }
+                    SettingsItem.TYPE_DATETIME_SETTING -> {
+                        (oldItem as DateTimeSetting).isEnabled == (newItem as DateTimeSetting).isEnabled
+                    }
+                    SettingsItem.TYPE_STRING_SINGLE_CHOICE -> {
+                        (oldItem as StringSingleChoiceSetting).isEnabled == (newItem as StringSingleChoiceSetting).isEnabled
+                    }
+                    SettingsItem.TYPE_STRING_INPUT -> {
+                        (oldItem as StringInputSetting).isEnabled == (newItem as StringInputSetting).isEnabled
+                    }
+                    else -> {
+                        oldItem == newItem
+                    }
+                }
+            }
+        })
+
+        settings = newSettings ?: arrayListOf()
+        diffResult.dispatchUpdatesTo(this)
     }
 
     fun onBooleanClick(item: SwitchSetting, position: Int, checked: Boolean) {
         val setting = item.setChecked(checked)
         fragmentView.putSetting(setting)
         fragmentView.onSettingChanged()
+
+        // If statement is required otherwise the app will crash on activity recreate ex. theme settings
+        if (fragmentView.activityView != null)
+            // Reload the settings list to update the UI
+            fragmentView.loadSettingsList()
     }
 
     private fun onSingleChoiceClick(item: SingleChoiceSetting) {
@@ -247,6 +301,7 @@ class SettingsAdapter(
             notifyItemChanged(clickedPosition)
             val setting = item.setSelectedValue(rtcString)
             fragmentView.putSetting(setting)
+            fragmentView.loadSettingsList()
             clickedItem = null
         }
         datePicker.show(
@@ -402,6 +457,7 @@ class SettingsAdapter(
                         else -> throw IllegalStateException("Unrecognized type used for SingleChoiceSetting!")
                     }
                     fragmentView?.putSetting(setting)
+                    fragmentView.loadSettingsList()
                     closeDialog()
                 }
             }
@@ -425,6 +481,7 @@ class SettingsAdapter(
                     }
 
                     fragmentView?.putSetting(setting)
+                    fragmentView.loadSettingsList()
                     closeDialog()
                 }
             }
@@ -447,6 +504,7 @@ class SettingsAdapter(
                             fragmentView?.putSetting(setting)
                         }
                    }
+                    fragmentView.loadSettingsList()
                     closeDialog()
                 }
             }
@@ -459,6 +517,7 @@ class SettingsAdapter(
                     }
                     val setting = it.setSelectedValue(textInputValue ?: "")
                     fragmentView?.putSetting(setting)
+                    fragmentView.loadSettingsList()
                     closeDialog()
                }
             }
@@ -488,6 +547,7 @@ class SettingsAdapter(
                 }
                 notifyItemChanged(position)
                 fragmentView.onSettingChanged()
+                fragmentView.loadSettingsList()
             }
             .setNegativeButton(android.R.string.cancel, null)
             .show()
@@ -495,10 +555,19 @@ class SettingsAdapter(
         return true
     }
 
-    fun onClickDisabledSetting() {
-        MessageDialogFragment.newInstance(
-            R.string.setting_not_editable,
+    fun onClickDisabledSetting(isRuntimeDisabled: Boolean) {
+        val titleId = if (isRuntimeDisabled)
+            R.string.setting_not_editable
+        else
+            R.string.setting_disabled
+        val messageId = if (isRuntimeDisabled)
             R.string.setting_not_editable_description
+        else
+            R.string.setting_disabled_description
+
+        MessageDialogFragment.newInstance(
+            titleId,
+            messageId
         ).show((fragmentView as SettingsFragment).childFragmentManager, MessageDialogFragment.TAG)
     }
 

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -13,6 +13,7 @@ import android.hardware.camera2.CameraManager
 import android.os.Build
 import android.text.TextUtils
 import androidx.preference.PreferenceManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlin.math.min
 import org.citra.citra_emu.CitraApplication
 import org.citra.citra_emu.R
@@ -46,6 +47,7 @@ import org.citra.citra_emu.utils.BirthdayMonth
 import org.citra.citra_emu.utils.Log
 import org.citra.citra_emu.utils.SystemSaveGame
 import org.citra.citra_emu.utils.ThemeUtil
+import org.citra.citra_emu.utils.EmulationMenuSettings
 
 class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) {
     private var menuTag: String? = null
@@ -101,6 +103,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             Settings.SECTION_THEME -> addThemeSettings(sl)
             Settings.SECTION_CUSTOM_LANDSCAPE -> addCustomLandscapeSettings(sl)
             Settings.SECTION_CUSTOM_PORTRAIT -> addCustomPortraitSettings(sl)
+            Settings.SECTION_PERFORMANCE_OVERLAY -> addPerformanceOverlaySettings(sl)
             else -> {
                 fragmentView.showToastMessage("Unimplemented menu", false)
                 return
@@ -217,11 +220,11 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
         sl.apply {
             add(
                 SwitchSetting(
-                    IntSetting.USE_FRAME_LIMIT,
+                    BooleanSetting.USE_FRAME_LIMIT,
                     R.string.frame_limit_enable,
                     R.string.frame_limit_enable_description,
-                    IntSetting.USE_FRAME_LIMIT.key,
-                    IntSetting.USE_FRAME_LIMIT.defaultValue
+                    BooleanSetting.USE_FRAME_LIMIT.key,
+                    BooleanSetting.USE_FRAME_LIMIT.defaultValue
                 )
             )
             add(
@@ -236,6 +239,42 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.FRAME_LIMIT.defaultValue.toFloat()
                 )
             )
+            add(
+                SliderSetting(
+                    IntSetting.TURBO_LIMIT,
+                    R.string.turbo_limit,
+                    R.string.turbo_limit_description,
+                    100,
+                    400,
+                    "%",
+                    IntSetting.TURBO_LIMIT.key,
+                    IntSetting.TURBO_LIMIT.defaultValue.toFloat()
+                )
+            )
+        }
+    }
+
+    private var countryCompatibilityChanged = true
+
+    private fun checkCountryCompatibility() {
+        if (countryCompatibilityChanged) {
+            countryCompatibilityChanged = false
+            val compatFlags = SystemSaveGame.getCountryCompatibility(IntSetting.EMULATED_REGION.int)
+            if (compatFlags != 0) {
+                var message = ""
+                if (compatFlags and 1 != 0) {
+                    message += settingsAdapter.context.getString(R.string.region_mismatch_emulated)
+                }
+                if (compatFlags and 2 != 0) {
+                    if (message.isNotEmpty()) message += "\n\n"
+                    message += settingsAdapter.context.getString(R.string.region_mismatch_console)
+                }
+                MaterialAlertDialogBuilder(settingsAdapter.context)
+                    .setTitle(R.string.region_mismatch)
+                    .setMessage(message)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .show()
+            }
         }
     }
 
@@ -256,20 +295,20 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             add(HeaderSetting(R.string.emulation_settings))
             add(
                 SwitchSetting(
-                    IntSetting.NEW_3DS,
+                    BooleanSetting.NEW_3DS,
                     R.string.new_3ds,
                     0,
-                    IntSetting.NEW_3DS.key,
-                    IntSetting.NEW_3DS.defaultValue
+                    BooleanSetting.NEW_3DS.key,
+                    BooleanSetting.NEW_3DS.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.LLE_APPLETS,
+                    BooleanSetting.LLE_APPLETS,
                     R.string.lle_applets,
                     0,
-                    IntSetting.LLE_APPLETS.key,
-                    IntSetting.LLE_APPLETS.defaultValue
+                    BooleanSetting.LLE_APPLETS.key,
+                    BooleanSetting.LLE_APPLETS.defaultValue
                 )
             )
             add(
@@ -282,51 +321,45 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                 )
             )
             add(HeaderSetting(R.string.profile_settings))
-            add(
-                StringInputSetting(
-                    usernameSetting,
-                    R.string.username,
-                    0,
-                    "AZAHAR",
-                    10
-                )
-            )
+            val regionSetting = object : AbstractIntSetting {
+                override var int: Int
+                    get() {
+                        val ret = IntSetting.EMULATED_REGION.int
+                        checkCountryCompatibility()
+                        return ret
+                    }
+                    set(value) {
+                        IntSetting.EMULATED_REGION.int = value
+                        countryCompatibilityChanged = true
+                        checkCountryCompatibility()
+                    }
+                override val key = IntSetting.EMULATED_REGION.key
+                override val section = null
+                override val isRuntimeEditable = false
+                override val valueAsString get() = int.toString()
+                override val defaultValue = IntSetting.EMULATED_REGION.defaultValue
+            }
             add(
                 SingleChoiceSetting(
-                    IntSetting.EMULATED_REGION,
+                    regionSetting,
                     R.string.emulated_region,
                     0,
                     R.array.regionNames,
                     R.array.regionValues,
-                    IntSetting.EMULATED_REGION.key,
-                    IntSetting.EMULATED_REGION.defaultValue
                 )
             )
-
-            val systemLanguageSetting = object : AbstractIntSetting {
-                override var int: Int
-                    get() = SystemSaveGame.getSystemLanguage()
-                    set(value) = SystemSaveGame.setSystemLanguage(value)
-                override val key = null
-                override val section = null
-                override val isRuntimeEditable = false
-                override val valueAsString get() = int.toString()
-                override val defaultValue = 1
-            }
-            add(
-                SingleChoiceSetting(
-                    systemLanguageSetting,
-                    R.string.emulated_language,
-                    0,
-                    R.array.languageNames,
-                    R.array.languageValues
-                )
-            )
-
             val systemCountrySetting = object : AbstractShortSetting {
                 override var short: Short
-                    get() = SystemSaveGame.getCountryCode()
-                    set(value) = SystemSaveGame.setCountryCode(value)
+                    get() {
+                        val ret = SystemSaveGame.getCountryCode()
+                        checkCountryCompatibility()
+                        return ret;
+                    }
+                    set(value) {
+                        SystemSaveGame.setCountryCode(value)
+                        countryCompatibilityChanged = true
+                        checkCountryCompatibility()
+                    }
                 override val key = null
                 override val section = null
                 override val isRuntimeEditable = false
@@ -348,7 +381,34 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     countries.map { it.second }.toTypedArray()
                 )
             )
-
+            val systemLanguageSetting = object : AbstractIntSetting {
+                override var int: Int
+                    get() = SystemSaveGame.getSystemLanguage()
+                    set(value) = SystemSaveGame.setSystemLanguage(value)
+                override val key = null
+                override val section = null
+                override val isRuntimeEditable = false
+                override val valueAsString get() = int.toString()
+                override val defaultValue = 1
+            }
+            add(
+                SingleChoiceSetting(
+                    systemLanguageSetting,
+                    R.string.emulated_language,
+                    0,
+                    R.array.languageNames,
+                    R.array.languageValues
+                )
+            )
+            add(
+                StringInputSetting(
+                    usernameSetting,
+                    R.string.username,
+                    0,
+                    "AZAHAR",
+                    10
+                )
+            )
             val playCoinSettings = object : AbstractIntSetting {
                 override var int: Int
                     get() = SystemSaveGame.getPlayCoins()
@@ -480,7 +540,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                 DateTimeSetting(
                     StringSetting.INIT_TIME,
                     R.string.simulated_clock,
-                    R.string.init_time_description,
+                    R.string.simulated_clock_description,
                     StringSetting.INIT_TIME.key,
                     StringSetting.INIT_TIME.defaultValue
                 )
@@ -728,11 +788,11 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             add(HeaderSetting(R.string.miscellaneous))
             add(
                 SwitchSetting(
-                    IntSetting.USE_ARTIC_BASE_CONTROLLER,
+                    BooleanSetting.USE_ARTIC_BASE_CONTROLLER,
                     R.string.use_artic_base_controller,
                     R.string.use_artic_base_controller_description,
-                    IntSetting.USE_ARTIC_BASE_CONTROLLER.key,
-                    IntSetting.USE_ARTIC_BASE_CONTROLLER.defaultValue
+                    BooleanSetting.USE_ARTIC_BASE_CONTROLLER.key,
+                    BooleanSetting.USE_ARTIC_BASE_CONTROLLER.defaultValue
                 )
             )
         }
@@ -779,6 +839,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     BooleanSetting.SPIRV_SHADER_GEN.defaultValue,
                 )
             )
+            add(
+                SwitchSetting(
+                    BooleanSetting.DISABLE_SPIRV_OPTIMIZER,
+                    R.string.disable_spirv_optimizer,
+                    R.string.disable_spirv_optimizer_description,
+                    BooleanSetting.DISABLE_SPIRV_OPTIMIZER.key,
+                    BooleanSetting.DISABLE_SPIRV_OPTIMIZER.defaultValue,
+                )
+            )
             add(
                 SwitchSetting(
                     BooleanSetting.ASYNC_SHADERS,
@@ -801,29 +870,29 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             )
             add(
                 SwitchSetting(
-                    IntSetting.LINEAR_FILTERING,
+                    BooleanSetting.LINEAR_FILTERING,
                     R.string.linear_filtering,
                     R.string.linear_filtering_description,
-                    IntSetting.LINEAR_FILTERING.key,
-                    IntSetting.LINEAR_FILTERING.defaultValue
+                    BooleanSetting.LINEAR_FILTERING.key,
+                    BooleanSetting.LINEAR_FILTERING.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.SHADERS_ACCURATE_MUL,
+                    BooleanSetting.SHADERS_ACCURATE_MUL,
                     R.string.shaders_accurate_mul,
                     R.string.shaders_accurate_mul_description,
-                    IntSetting.SHADERS_ACCURATE_MUL.key,
-                    IntSetting.SHADERS_ACCURATE_MUL.defaultValue
+                    BooleanSetting.SHADERS_ACCURATE_MUL.key,
+                    BooleanSetting.SHADERS_ACCURATE_MUL.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.DISK_SHADER_CACHE,
+                    BooleanSetting.DISK_SHADER_CACHE,
                     R.string.use_disk_shader_cache,
                     R.string.use_disk_shader_cache_description,
-                    IntSetting.DISK_SHADER_CACHE.key,
-                    IntSetting.DISK_SHADER_CACHE.defaultValue
+                    BooleanSetting.DISK_SHADER_CACHE.key,
+                    BooleanSetting.DISK_SHADER_CACHE.defaultValue
                 )
             )
             add(
@@ -868,7 +937,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     R.string.factor3d,
                     R.string.factor3d_description,
                     0,
-                    100,
+                    255,
                     "%",
                     IntSetting.STEREOSCOPIC_3D_DEPTH.key,
                     IntSetting.STEREOSCOPIC_3D_DEPTH.defaultValue.toFloat()
@@ -876,11 +945,11 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             )
             add(
                 SwitchSetting(
-                    IntSetting.DISABLE_RIGHT_EYE_RENDER,
+                    BooleanSetting.DISABLE_RIGHT_EYE_RENDER,
                     R.string.disable_right_eye_render,
                     R.string.disable_right_eye_render_description,
-                    IntSetting.DISABLE_RIGHT_EYE_RENDER.key,
-                    IntSetting.DISABLE_RIGHT_EYE_RENDER.defaultValue
+                    BooleanSetting.DISABLE_RIGHT_EYE_RENDER.key,
+                    BooleanSetting.DISABLE_RIGHT_EYE_RENDER.defaultValue
                 )
             )
 
@@ -925,29 +994,42 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             add(HeaderSetting(R.string.utility))
             add(
                 SwitchSetting(
-                    IntSetting.DUMP_TEXTURES,
+                    BooleanSetting.DUMP_TEXTURES,
                     R.string.dump_textures,
                     R.string.dump_textures_description,
-                    IntSetting.DUMP_TEXTURES.key,
-                    IntSetting.DUMP_TEXTURES.defaultValue
+                    BooleanSetting.DUMP_TEXTURES.key,
+                    BooleanSetting.DUMP_TEXTURES.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.CUSTOM_TEXTURES,
+                    BooleanSetting.CUSTOM_TEXTURES,
                     R.string.custom_textures,
                     R.string.custom_textures_description,
-                    IntSetting.CUSTOM_TEXTURES.key,
-                    IntSetting.CUSTOM_TEXTURES.defaultValue
+                    BooleanSetting.CUSTOM_TEXTURES.key,
+                    BooleanSetting.CUSTOM_TEXTURES.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.ASYNC_CUSTOM_LOADING,
+                    BooleanSetting.ASYNC_CUSTOM_LOADING,
                     R.string.async_custom_loading,
                     R.string.async_custom_loading_description,
-                    IntSetting.ASYNC_CUSTOM_LOADING.key,
-                    IntSetting.ASYNC_CUSTOM_LOADING.defaultValue
+                    BooleanSetting.ASYNC_CUSTOM_LOADING.key,
+                    BooleanSetting.ASYNC_CUSTOM_LOADING.defaultValue
+                )
+            )
+
+            add(HeaderSetting(R.string.advanced))
+            add(
+                SingleChoiceSetting(
+                    IntSetting.TEXTURE_SAMPLING,
+                    R.string.texture_sampling_name,
+                    R.string.texture_sampling_description,
+                    R.array.textureSamplingNames,
+                    R.array.textureSamplingValues,
+                    IntSetting.TEXTURE_SAMPLING.key,
+                    IntSetting.TEXTURE_SAMPLING.defaultValue
                 )
             )
 
@@ -979,6 +1061,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.ORIENTATION_OPTION.defaultValue
                 )
             )
+            add(
+                SwitchSetting(
+                    BooleanSetting.EXPAND_TO_CUTOUT_AREA,
+                    R.string.expand_to_cutout_area,
+                    R.string.expand_to_cutout_area_description,
+                    BooleanSetting.EXPAND_TO_CUTOUT_AREA.key,
+                    BooleanSetting.EXPAND_TO_CUTOUT_AREA.defaultValue
+                )
+            )
             add(
                 SingleChoiceSetting(
                     IntSetting.SCREEN_LAYOUT,
@@ -990,6 +1081,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.SCREEN_LAYOUT.defaultValue
                 )
             )
+            add(
+                SwitchSetting(
+                    BooleanSetting.UPRIGHT_SCREEN,
+                    R.string.emulation_rotate_upright,
+                    0,
+                    BooleanSetting.UPRIGHT_SCREEN.key,
+                    BooleanSetting.UPRIGHT_SCREEN.defaultValue
+                )
+            )
             add(
                 SingleChoiceSetting(
                     IntSetting.PORTRAIT_SCREEN_LAYOUT,
@@ -1001,6 +1101,18 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.PORTRAIT_SCREEN_LAYOUT.defaultValue
                 )
             )
+            add(
+                SingleChoiceSetting(
+                    IntSetting.ASPECT_RATIO,
+                    R.string.emulation_aspect_ratio,
+                    0,
+                    R.array.aspectRatioNames,
+                    R.array.aspectRatioValues,
+                    IntSetting.ASPECT_RATIO.key,
+                    IntSetting.ASPECT_RATIO.defaultValue,
+                    isEnabled = IntSetting.SCREEN_LAYOUT.int == 1,
+                )
+            )
             add(
                 SingleChoiceSetting(
                     IntSetting.SMALL_SCREEN_POSITION,
@@ -1012,6 +1124,18 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.SMALL_SCREEN_POSITION.defaultValue
                 )
             )
+            add(
+                SliderSetting(
+                    IntSetting.SCREEN_GAP,
+                    R.string.screen_gap,
+                    R.string.screen_gap_description,
+                    0,
+                    480,
+                    "px",
+                    IntSetting.SCREEN_GAP.key,
+                    IntSetting.SCREEN_GAP.defaultValue.toFloat()
+                )
+            )
             add(
                 SliderSetting(
                     FloatSetting.LARGE_SCREEN_PROPORTION,
@@ -1024,6 +1148,14 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     FloatSetting.LARGE_SCREEN_PROPORTION.defaultValue
                 )
             )
+            add(
+                SubmenuSetting(
+                    R.string.performance_overlay_options,
+                    R.string.performance_overlay_options_description,
+                    R.drawable.ic_stats,
+                    Settings.SECTION_PERFORMANCE_OVERLAY
+                )
+            )
             add(
                 SubmenuSetting(
                     R.string.emulation_landscape_custom_layout,
@@ -1043,6 +1175,116 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
         }
     }
 
+    private fun addPerformanceOverlaySettings(sl: ArrayList<SettingsItem>) {
+        settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.performance_overlay_options))
+        sl.apply {
+
+            add(HeaderSetting(R.string.visibility))
+
+            add(
+                SwitchSetting(
+                    object : AbstractBooleanSetting {
+                        override val key = "EmulationMenuSettings_showPerfPerformanceOverlay"
+                        override val section = Settings.SECTION_LAYOUT
+                        override val defaultValue = false
+                        override var boolean: Boolean
+                            get() = EmulationMenuSettings.showPerformanceOverlay
+                            set(value) { EmulationMenuSettings.showPerformanceOverlay = value }
+                        override val isRuntimeEditable = true
+                        override val valueAsString: String get() = boolean.toString()
+                    },
+                    R.string.performance_overlay_enable,
+                    0,
+                    "EmulationMenuSettings_showPerfPerformanceOverlay",
+                    false
+                )
+            )
+
+            add(
+                SwitchSetting(
+                    BooleanSetting.OVERLAY_BACKGROUND,
+                    R.string.overlay_background,
+                    R.string.overlay_background_description,
+                    "overlay_background",
+                    false
+                )
+            )
+
+            add(
+                SingleChoiceSetting(
+                    IntSetting.PERFORMANCE_OVERLAY_POSITION,
+                    R.string.overlay_position,
+                    R.string.overlay_position_description,
+                    R.array.statsPosition,
+                    R.array.statsPositionValues,
+                )
+            )
+
+
+            add(HeaderSetting(R.string.information))
+
+            add(
+                SwitchSetting(
+                    BooleanSetting.OVERLAY_SHOW_FPS,
+                    R.string.overlay_show_fps,
+                    R.string.overlay_show_fps_description,
+                    "overlay_show_fps",
+                    true
+                )
+            )
+
+            add(
+                SwitchSetting(
+                    BooleanSetting.OVERLAY_SHOW_FRAMETIME,
+                    R.string.overlay_show_frametime,
+                    R.string.overlay_show_frametime_description,
+                    "overlay_show_frame_time",
+                    true
+                )
+            )
+
+            add(
+                SwitchSetting(
+                    BooleanSetting.OVERLAY_SHOW_SPEED,
+                    R.string.overlay_show_speed,
+                    R.string.overlay_show_speed_description,
+                    "overlay_show_speed",
+                    false
+                )
+            )
+
+            add(
+                SwitchSetting(
+                    BooleanSetting.OVERLAY_SHOW_APP_RAM_USAGE,
+                    R.string.overlay_show_app_ram_usage,
+                    R.string.overlay_show_app_ram_usage_description,
+                    "overlay_show_app_ram_usage",
+                    false
+                )
+            )
+
+            add(
+                SwitchSetting(
+                    BooleanSetting.OVERLAY_SHOW_AVAILABLE_RAM,
+                    R.string.overlay_show_available_ram,
+                    R.string.overlay_show_available_ram_description,
+                    "overlay_show_available_ram",
+                    false
+                )
+            )
+
+            add(
+                SwitchSetting(
+                    BooleanSetting.OVERLAY_SHOW_BATTERY_TEMP,
+                    R.string.overlay_show_battery_temp,
+                    R.string.overlay_show_battery_temp_description,
+                    "overlay_show_battery_temp",
+                    false
+                )
+            )
+        }
+    }
+
     private fun addCustomLandscapeSettings(sl: ArrayList<SettingsItem>) {
         settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.emulation_landscape_custom_layout))
         sl.apply {
@@ -1270,20 +1512,20 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             )
             add(
                 SwitchSetting(
-                    IntSetting.ENABLE_AUDIO_STRETCHING,
+                    BooleanSetting.ENABLE_AUDIO_STRETCHING,
                     R.string.audio_stretch,
                     R.string.audio_stretch_description,
-                    IntSetting.ENABLE_AUDIO_STRETCHING.key,
-                    IntSetting.ENABLE_AUDIO_STRETCHING.defaultValue
+                    BooleanSetting.ENABLE_AUDIO_STRETCHING.key,
+                    BooleanSetting.ENABLE_AUDIO_STRETCHING.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.ENABLE_REALTIME_AUDIO,
+                    BooleanSetting.ENABLE_REALTIME_AUDIO,
                     R.string.realtime_audio,
                     R.string.realtime_audio_description,
-                    IntSetting.ENABLE_REALTIME_AUDIO.key,
-                    IntSetting.ENABLE_REALTIME_AUDIO.defaultValue
+                    BooleanSetting.ENABLE_REALTIME_AUDIO.key,
+                    BooleanSetting.ENABLE_REALTIME_AUDIO.defaultValue
                 )
             )
             add(
@@ -1338,38 +1580,47 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
             )
             add(
                 SwitchSetting(
-                    IntSetting.CPU_JIT,
+                    BooleanSetting.CPU_JIT,
                     R.string.cpu_jit,
                     R.string.cpu_jit_description,
-                    IntSetting.CPU_JIT.key,
-                    IntSetting.CPU_JIT.defaultValue
+                    BooleanSetting.CPU_JIT.key,
+                    BooleanSetting.CPU_JIT.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.HW_SHADER,
+                    BooleanSetting.HW_SHADER,
                     R.string.hw_shaders,
                     R.string.hw_shaders_description,
-                    IntSetting.HW_SHADER.key,
-                    IntSetting.HW_SHADER.defaultValue
+                    BooleanSetting.HW_SHADER.key,
+                    BooleanSetting.HW_SHADER.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.VSYNC,
+                    BooleanSetting.SHADER_JIT,
+                    R.string.shader_jit,
+                    R.string.shader_jit_description,
+                    BooleanSetting.SHADER_JIT.key,
+                    BooleanSetting.SHADER_JIT.defaultValue
+                )
+            )
+            add(
+                SwitchSetting(
+                    BooleanSetting.VSYNC,
                     R.string.vsync,
                     R.string.vsync_description,
-                    IntSetting.VSYNC.key,
-                    IntSetting.VSYNC.defaultValue
+                    BooleanSetting.VSYNC.key,
+                    BooleanSetting.VSYNC.defaultValue
                 )
             )
             add(
                 SwitchSetting(
-                    IntSetting.DEBUG_RENDERER,
+                    BooleanSetting.DEBUG_RENDERER,
                     R.string.renderer_debug,
                     R.string.renderer_debug_description,
-                    IntSetting.DEBUG_RENDERER.key,
-                    IntSetting.DEBUG_RENDERER.defaultValue
+                    BooleanSetting.DEBUG_RENDERER.key,
+                    BooleanSetting.DEBUG_RENDERER.defaultValue
                 )
             )
             add(
@@ -1381,6 +1632,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     BooleanSetting.INSTANT_DEBUG_LOG.defaultValue
                 )
             )
+            add(
+                SwitchSetting(
+                    BooleanSetting.ENABLE_RPC_SERVER,
+                    R.string.enable_rpc_server,
+                    R.string.enable_rpc_server_desc,
+                    BooleanSetting.ENABLE_RPC_SERVER.key,
+                    BooleanSetting.ENABLE_RPC_SERVER.defaultValue
+                )
+            )
             add(
                 SwitchSetting(
                     BooleanSetting.DELAY_START_LLE_MODULES,

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -47,7 +47,7 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA
         val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
         binding.textSettingValue.text = dateFormatter.format(zonedTime)
 
-        if (setting.isEditable) {
+        if (setting.isActive) {
             binding.textSettingName.alpha = 1f
             binding.textSettingDescription.alpha = 1f
             binding.textSettingValue.alpha = 1f
@@ -59,18 +59,18 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA
     }
 
     override fun onClick(clicked: View) {
-        if (setting.isEditable) {
+        if (setting.isActive) {
             adapter.onDateTimeClick(setting, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
     }
 
     override fun onLongClick(clicked: View): Boolean {
-        if (setting.isEditable) {
+        if (setting.isActive) {
             return adapter.onLongClick(setting.setting!!, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
         return false
     }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -45,7 +45,7 @@ class InputBindingSettingViewHolder(val binding: ListItemSettingBinding, adapter
         if (setting.isEditable) {
             adapter.onInputBindingClick(setting, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
     }
 
@@ -53,7 +53,7 @@ class InputBindingSettingViewHolder(val binding: ListItemSettingBinding, adapter
         if (setting.isEditable) {
             adapter.onLongClick(setting.setting!!, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
         return false
     }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/RunnableViewHolder.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -60,7 +60,7 @@ class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA
 
     override fun onClick(clicked: View) {
         if (!setting.isRuntimeRunnable && EmulationActivity.isRunning()) {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(true)
         } else {
             setting.runnable.invoke()
         }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -27,7 +27,7 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti
         binding.textSettingValue.visibility = View.VISIBLE
         binding.textSettingValue.text = getTextSetting()
 
-        if (setting.isEditable) {
+        if (setting.isActive) {
             binding.textSettingName.alpha = 1f
             binding.textSettingDescription.alpha = 1f
             binding.textSettingValue.alpha = 1f
@@ -65,8 +65,8 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti
     }
 
     override fun onClick(clicked: View) {
-        if (!setting.isEditable) {
-            adapter.onClickDisabledSetting()
+        if (!setting.isEditable || !setting.isEnabled) {
+            adapter.onClickDisabledSetting(!setting.isEditable)
             return
         }
 
@@ -84,10 +84,10 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti
     }
 
     override fun onLongClick(clicked: View): Boolean {
-        if (setting.isEditable) {
+        if (setting.isActive) {
             return adapter.onLongClick(setting.setting!!, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
         return false
     }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -35,7 +35,7 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda
             else -> "${(setting.setting as AbstractIntSetting).int}${setting.units}"
         }
 
-        if (setting.isEditable) {
+        if (setting.isActive) {
             binding.textSettingName.alpha = 1f
             binding.textSettingDescription.alpha = 1f
             binding.textSettingValue.alpha = 1f
@@ -47,18 +47,18 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda
     }
 
     override fun onClick(clicked: View) {
-        if (setting.isEditable) {
+        if (setting.isActive) {
             adapter.onSliderClick(setting, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
     }
 
     override fun onLongClick(clicked: View): Boolean {
-        if (setting.isEditable) {
+        if (setting.isActive) {
             return adapter.onLongClick(setting.setting!!, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
         return false
     }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/StringInputViewHolder.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -25,21 +25,31 @@ class StringInputViewHolder(val binding: ListItemSettingBinding, adapter: Settin
         }
         binding.textSettingValue.visibility = View.VISIBLE
         binding.textSettingValue.text = setting.setting?.valueAsString
+
+        if (setting.isActive) {
+            binding.textSettingName.alpha = 1f
+            binding.textSettingDescription.alpha = 1f
+            binding.textSettingValue.alpha = 1f
+        } else {
+            binding.textSettingName.alpha = 0.5f
+            binding.textSettingDescription.alpha = 0.5f
+            binding.textSettingValue.alpha = 0.5f
+        }
     }
 
     override fun onClick(clicked: View) {
-        if (!setting.isEditable) {
-            adapter.onClickDisabledSetting()
+        if (!setting.isEditable || !setting.isEnabled) {
+            adapter.onClickDisabledSetting(!setting.isEditable)
             return
         }
         adapter.onStringInputClick((setting as StringInputSetting), bindingAdapterPosition)
     }
 
     override fun onLongClick(clicked: View): Boolean {
-        if (setting.isEditable) {
+        if (setting.isActive) {
             return adapter.onLongClick(setting.setting!!, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
         return false
     }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -33,26 +33,26 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter
             adapter.onBooleanClick(item, bindingAdapterPosition, binding.switchWidget.isChecked)
         }
 
-        binding.switchWidget.isEnabled = setting.isEditable
+        binding.switchWidget.isEnabled = setting.isActive
 
-        val textAlpha = if (setting.isEditable) 1f else 0.5f
+        val textAlpha = if (setting.isActive) 1f else 0.5f
         binding.textSettingName.alpha = textAlpha
         binding.textSettingDescription.alpha = textAlpha
     }
 
     override fun onClick(clicked: View) {
-        if (setting.isEditable) {
+        if (setting.isActive) {
             binding.switchWidget.toggle()
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
     }
 
     override fun onLongClick(clicked: View): Boolean {
-        if (setting.isEditable) {
+        if (setting.isActive) {
             return adapter.onLongClick(setting.setting!!, bindingAdapterPosition)
         } else {
-            adapter.onClickDisabledSetting()
+            adapter.onClickDisabledSetting(!setting.isEditable)
         }
         return false
     }

src/android/app/src/main/java/org/citra/citra_emu/fragments/CopyDirProgressDialogFragment.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -141,7 +141,7 @@ class CopyDirProgressDialog : DialogFragment() {
 
                             override fun onComplete() {
                                 CitraDirectoryHelper.initializeCitraDirectory(path)
-                                callback?.onStepCompleted()
+                                callback?.onStepCompleted(0, false)
                                 viewModel.setCopyComplete(true)
                             }
                         })

src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt

@@ -1,14 +1,18 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 package org.citra.citra_emu.fragments
 
 import android.annotation.SuppressLint
+import android.app.ActivityManager
 import android.content.Context
 import android.content.DialogInterface
+import android.content.Intent
+import android.content.IntentFilter
 import android.content.SharedPreferences
 import android.net.Uri
+import android.os.BatteryManager
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -16,16 +20,19 @@ import android.os.SystemClock
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.Choreographer
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.Surface
 import android.view.SurfaceHolder
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.PopupMenu
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
@@ -43,6 +50,7 @@ import androidx.navigation.fragment.navArgs
 import androidx.preference.PreferenceManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
+import java.io.File
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.citra.citra_emu.CitraApplication
@@ -56,6 +64,7 @@ import org.citra.citra_emu.databinding.FragmentEmulationBinding
 import org.citra.citra_emu.display.PortraitScreenLayout
 import org.citra.citra_emu.display.ScreenAdjustmentUtil
 import org.citra.citra_emu.display.ScreenLayout
+import org.citra.citra_emu.features.settings.model.BooleanSetting
 import org.citra.citra_emu.features.settings.model.IntSetting
 import org.citra.citra_emu.features.settings.model.SettingsViewModel
 import org.citra.citra_emu.features.settings.ui.SettingsActivity
@@ -174,8 +183,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
             binding.surfaceInputOverlay.setIsInEditMode(false)
         }
 
-        // Show/hide the "Show FPS" overlay
-        updateShowFpsOverlay()
+        // Show/hide the "Stats" overlay
+        updateShowPerformanceOverlay()
+
+        val position = IntSetting.PERFORMANCE_OVERLAY_POSITION.int
+        updateStatsPosition(position)
 
         binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
         binding.drawerLayout.addDrawerListener(object : DrawerListener {
@@ -232,8 +244,15 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
             )
         }
 
-        binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =
-            game.title
+        binding.inGameMenu.getHeaderView(0).apply {
+            val titleView = findViewById<TextView>(R.id.text_game_title)
+            val iconView = findViewById<ImageView>(R.id.game_icon)
+
+            titleView.text = game.title
+
+            GameIconUtils.loadGameIcon(requireActivity(), game, iconView)
+        }
+
         binding.inGameMenu.setNavigationItemSelectedListener {
             when (it.itemId) {
                 R.id.menu_emulation_pause -> {
@@ -287,6 +306,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                     true
                 }
 
+                R.id.menu_rotate_upright -> {
+                    screenAdjustmentUtil.toggleScreenUpright()
+                    true
+                }
+
                 R.id.menu_lock_drawer -> {
                     when (EmulationMenuSettings.drawerLockMode) {
                         DrawerLayout.LOCK_MODE_UNLOCKED -> {
@@ -447,6 +471,19 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         Choreographer.getInstance().postFrameCallback(this)
         if (NativeLibrary.isRunning()) {
             NativeLibrary.unPauseEmulation()
+
+            // If the overlay is enabled, we need to update the position if changed
+            val position = IntSetting.PERFORMANCE_OVERLAY_POSITION.int
+            updateStatsPosition(position)
+
+            binding.inGameMenu.menu.findItem(R.id.menu_emulation_pause)?.let { menuItem ->
+                menuItem.title = resources.getString(R.string.pause_emulation)
+                menuItem.icon = ResourcesCompat.getDrawable(
+                    resources,
+                    R.drawable.ic_pause,
+                    requireContext().theme
+                )
+            }
             return
         }
 
@@ -533,7 +570,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                 val slot = i
                 var enableClick = isSaving
                 val text = if (slot == NativeLibrary.QUICKSAVE_SLOT) {
-                    enableClick = false
                     getString(R.string.emulation_quicksave_slot)
                 } else {
                     getString(R.string.emulation_empty_state_slot, slot)
@@ -542,11 +578,14 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                 add(text).setEnabled(enableClick).setOnMenuItemClickListener {
                     if(isSaving) {
                         NativeLibrary.saveState(slot)
+                        Toast.makeText(context,
+                            getString(R.string.saving),
+                            Toast.LENGTH_SHORT).show()
                     } else {
                         NativeLibrary.loadState(slot)
                         binding.drawerLayout.close()
                         Toast.makeText(context,
-                            getString(R.string.quickload_loading),
+                            getString(R.string.loading),
                             Toast.LENGTH_SHORT).show()
                     }
                     true
@@ -557,8 +596,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         savestates?.forEach {
             var enableClick = true
             val text = if(it.slot == NativeLibrary.QUICKSAVE_SLOT) {
-                // do not allow saving in quicksave slot
-                enableClick = !isSaving
                 getString(R.string.emulation_occupied_quicksave_slot, it.time)
             } else{
                 getString(R.string.emulation_occupied_state_slot, it.slot, it.time)
@@ -624,7 +661,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
 
         popupMenu.menu.apply {
             findItem(R.id.menu_show_overlay).isChecked = EmulationMenuSettings.showOverlay
-            findItem(R.id.menu_show_fps).isChecked = EmulationMenuSettings.showFps
+            findItem(R.id.menu_performance_overlay_show).isChecked =
+                EmulationMenuSettings.showPerformanceOverlay
             findItem(R.id.menu_haptic_feedback).isChecked = EmulationMenuSettings.hapticFeedback
             findItem(R.id.menu_emulation_joystick_rel_center).isChecked =
                 EmulationMenuSettings.joystickRelCenter
@@ -640,15 +678,14 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                     true
                 }
 
-                R.id.menu_show_fps -> {
-                    EmulationMenuSettings.showFps = !EmulationMenuSettings.showFps
-                    updateShowFpsOverlay()
+                R.id.menu_performance_overlay_show -> {
+                    EmulationMenuSettings.showPerformanceOverlay = !EmulationMenuSettings.showPerformanceOverlay
+                    updateShowPerformanceOverlay()
                     true
                 }
 
                 R.id.menu_haptic_feedback -> {
                     EmulationMenuSettings.hapticFeedback = !EmulationMenuSettings.hapticFeedback
-                    updateShowFpsOverlay()
                     true
                 }
 
@@ -886,10 +923,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         val layoutOptionMenuItem = when (IntSetting.PORTRAIT_SCREEN_LAYOUT.int) {
             PortraitScreenLayout.TOP_FULL_WIDTH.int ->
                 R.id.menu_portrait_layout_top_full
-
+            PortraitScreenLayout.ORIGINAL.int ->
+                R.id.menu_portrait_layout_original
             PortraitScreenLayout.CUSTOM_PORTRAIT_LAYOUT.int ->
                 R.id.menu_portrait_layout_custom
-
             else ->
                 R.id.menu_portrait_layout_top_full
 
@@ -904,6 +941,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                     true
                 }
 
+                R.id.menu_portrait_layout_original -> {
+                    screenAdjustmentUtil.changePortraitOrientation(PortraitScreenLayout.ORIGINAL.int)
+                    true
+                }
+
                 R.id.menu_portrait_layout_custom -> {
                     Toast.makeText(
                         requireContext(),
@@ -933,12 +975,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
 
     private fun showToggleControlsDialog() {
         val editor = preferences.edit()
-        val enabledButtons = BooleanArray(15)
+        val enabledButtons = BooleanArray(16)
         enabledButtons.forEachIndexed { i: Int, _: Boolean ->
             // Buttons that are disabled by default
             var defaultValue = true
             when (i) {
-                6, 7, 12, 13, 14 -> defaultValue = false
+                6, 7, 12, 13, 14, 15 -> defaultValue = false
             }
             enabledButtons[i] = preferences.getBoolean("buttonToggle$i", defaultValue)
         }
@@ -1116,10 +1158,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
             .apply()
 
         val editor = preferences.edit()
-        for (i in 0 until 15) {
+        for (i in 0 until 16) {
             var defaultValue = true
             when (i) {
-                6, 7, 12, 13, 14 -> defaultValue = false
+                6, 7, 12, 13, 14, 15 -> defaultValue = false
             }
             editor.putBoolean("buttonToggle$i", defaultValue)
         }
@@ -1128,34 +1170,150 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         binding.surfaceInputOverlay.resetButtonPlacement()
     }
 
-    fun updateShowFpsOverlay() {
-        if (EmulationMenuSettings.showFps) {
+    fun updateShowPerformanceOverlay() {
+        if (perfStatsUpdater != null) {
+            perfStatsUpdateHandler.removeCallbacks(perfStatsUpdater!!)
+        }
+
+        if (EmulationMenuSettings.showPerformanceOverlay) {
             val SYSTEM_FPS = 0
             val FPS = 1
-            val FRAMETIME = 2
-            val SPEED = 3
+            val SPEED = 2
+            val FRAMETIME = 3
+            val TIME_SVC = 4
+            val TIME_IPC = 5
+            val TIME_GPU = 6
+            val TIME_SWAP = 7
+            val TIME_REM = 8
             perfStatsUpdater = Runnable {
+                val sb = StringBuilder()
                 val perfStats = NativeLibrary.getPerfStats()
+                val dividerString = "\u00A0\u2502 "
                 if (perfStats[FPS] > 0) {
-                    binding.showFpsText.text = String.format(
-                        "FPS: %d Speed: %d%% FT: %.2fms",
-                        (perfStats[FPS] + 0.5).toInt(),
-                        (perfStats[SPEED] * 100.0 + 0.5).toInt(),
-                        (perfStats[FRAMETIME] * 1000.0f).toFloat()
-                    )
+                    if (BooleanSetting.OVERLAY_SHOW_FPS.boolean) {
+                        sb.append(String.format("FPS:\u00A0%d", (perfStats[FPS] + 0.5).toInt()))
+                    }
+
+                    if (BooleanSetting.OVERLAY_SHOW_FRAMETIME.boolean) {
+                        if (sb.isNotEmpty()) sb.append(dividerString)
+                        sb.append(
+                            String.format(
+                                "Frame:\u00A0%.1fms (GPU: [CMD:\u00A0%.1fms SWP:\u00A0%.1fms] IPC:\u00A0%.1fms SVC:\u00A0%.1fms Rem:\u00A0%.1fms)",
+                                (perfStats[FRAMETIME] * 1000.0f).toFloat(),
+                                (perfStats[TIME_GPU] * 1000.0f).toFloat(),
+                                (perfStats[TIME_SWAP] * 1000.0f).toFloat(),
+                                (perfStats[TIME_IPC] * 1000.0f).toFloat(),
+                                (perfStats[TIME_SVC] * 1000.0f).toFloat(),
+                                (perfStats[TIME_REM] * 1000.0f).toFloat(),
+                            )
+                        )
+                    }
+
+                    if (BooleanSetting.OVERLAY_SHOW_SPEED.boolean) {
+                        if (sb.isNotEmpty()) sb.append(dividerString)
+                        sb.append(
+                            String.format(
+                                "Speed:\u00A0%d%%",
+                                (perfStats[SPEED] * 100.0 + 0.5).toInt()
+                            )
+                        )
+                    }
+
+                    if (BooleanSetting.OVERLAY_SHOW_APP_RAM_USAGE.boolean) {
+                        if (sb.isNotEmpty()) sb.append(dividerString)
+                        val appRamUsage =
+                            File("/proc/self/statm").readLines()[0].split(' ')[1].toLong() * 4096 / 1000000
+                        sb.append("Process\u00A0RAM:\u00A0$appRamUsage\u00A0MB")
+                    }
+
+                    if (BooleanSetting.OVERLAY_SHOW_AVAILABLE_RAM.boolean) {
+                        if (sb.isNotEmpty()) sb.append(dividerString)
+                        context?.let { ctx ->
+                            val activityManager =
+                                ctx.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+                            val memInfo = ActivityManager.MemoryInfo()
+                            activityManager.getMemoryInfo(memInfo)
+                            val megabyteBytes = 1048576L
+                            val availableRam = memInfo.availMem / megabyteBytes
+                            sb.append("Available\u00A0RAM:\u00A0$availableRam\u00A0MB")
+                        }
+                    }
+
+                    if (BooleanSetting.OVERLAY_SHOW_BATTERY_TEMP.boolean) {
+                        if (sb.isNotEmpty()) sb.append(dividerString)
+                        val batteryTemp = getBatteryTemperature()
+                        val tempF = celsiusToFahrenheit(batteryTemp)
+                        sb.append(String.format("%.1f°C/%.1f°F", batteryTemp, tempF))
+                    }
+
+                    if (BooleanSetting.OVERLAY_BACKGROUND.boolean) {
+                        binding.performanceOverlayShowText.setBackgroundResource(R.color.citra_transparent_black)
+                    } else {
+                        binding.performanceOverlayShowText.setBackgroundResource(0)
+                    }
+
+                    binding.performanceOverlayShowText.text = sb.toString()
                 }
-                perfStatsUpdateHandler.postDelayed(perfStatsUpdater!!, 3000)
+                perfStatsUpdateHandler.postDelayed(perfStatsUpdater!!, 1000)
             }
             perfStatsUpdateHandler.post(perfStatsUpdater!!)
-            binding.showFpsText.visibility = View.VISIBLE
+            binding.performanceOverlayShowText.visibility = View.VISIBLE
         } else {
-            if (perfStatsUpdater != null) {
-                perfStatsUpdateHandler.removeCallbacks(perfStatsUpdater!!)
-            }
-            binding.showFpsText.visibility = View.GONE
+            binding.performanceOverlayShowText.visibility = View.GONE
         }
     }
 
+    private fun updateStatsPosition(position: Int) {
+        val params = binding.performanceOverlayShowText.layoutParams as CoordinatorLayout.LayoutParams
+        val padding = (20 * resources.displayMetrics.density).toInt() // 20dp
+        params.setMargins(padding, 0, padding, 0)
+
+        when (position) {
+            0 -> {
+                params.gravity = (Gravity.TOP or Gravity.START)
+            }
+
+            1 -> {
+                params.gravity = (Gravity.TOP or Gravity.CENTER_HORIZONTAL)
+            }
+
+            2 -> {
+                params.gravity = (Gravity.TOP or Gravity.END)
+            }
+
+            3 -> {
+                params.gravity = (Gravity.BOTTOM or Gravity.START)
+            }
+
+            4 -> {
+                params.gravity = (Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL)
+            }
+
+            5 -> {
+                params.gravity = (Gravity.BOTTOM or Gravity.END)
+            }
+        }
+
+        binding.performanceOverlayShowText.layoutParams = params
+    }
+
+    private fun getBatteryTemperature(): Float {
+        try {
+            val batteryIntent = requireContext().registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+            // Temperature in tenths of a degree Celsius
+            val temperature = batteryIntent?.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) ?: 0
+            // Convert to degrees Celsius
+            return temperature / 10.0f
+        } catch (e: Exception) {
+            return 0.0f
+        }
+    }
+
+    private fun celsiusToFahrenheit(celsius: Float): Float {
+        return (celsius * 9 / 5) + 32
+    }
+
+
     override fun surfaceCreated(holder: SurfaceHolder) {
         // We purposely don't do anything here.
         // All work is done in surfaceChanged, which we are guaranteed to get even for surface creation.
@@ -1190,23 +1348,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
 
             v.setPadding(left, cutInsets.top, right, 0)
 
-            // Ensure FPS text doesn't get cut off by rounded display corners
-            val sidePadding = resources.getDimensionPixelSize(R.dimen.spacing_large)
-            if (cutInsets.left == 0) {
-                binding.showFpsText.setPadding(
-                    sidePadding,
-                    cutInsets.top,
-                    cutInsets.right,
-                    cutInsets.bottom
-                )
-            } else {
-                binding.showFpsText.setPadding(
-                    cutInsets.left,
-                    cutInsets.top,
-                    cutInsets.right,
-                    cutInsets.bottom
-                )
-            }
             windowInsets
         }
     }

src/android/app/src/main/java/org/citra/citra_emu/fragments/GamesFragment.kt

@@ -1,16 +1,22 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 package org.citra.citra_emu.fragments
 
 import android.annotation.SuppressLint
+import android.net.Uri
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
+import android.widget.TextView
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.edit
+import androidx.core.text.HtmlCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
@@ -22,6 +28,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.color.MaterialColors
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.transition.MaterialFadeThrough
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -40,6 +47,14 @@ class GamesFragment : Fragment() {
 
     private val gamesViewModel: GamesViewModel by activityViewModels()
     private val homeViewModel: HomeViewModel by activityViewModels()
+    private var show3DSFileWarning: Boolean = true
+    private lateinit var gameAdapter: GameAdapter
+
+    private val openImageLauncher = registerForActivityResult(
+        ActivityResultContracts.GetContent()
+    ) { uri: Uri? ->
+        gameAdapter.handleShortcutImageResult(uri)
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -63,12 +78,18 @@ class GamesFragment : Fragment() {
 
         val inflater = LayoutInflater.from(requireContext())
 
+        gameAdapter = GameAdapter(
+            requireActivity() as AppCompatActivity,
+            inflater,
+            openImageLauncher
+        )
+
         binding.gridGames.apply {
             layoutManager = GridLayoutManager(
                 requireContext(),
                 resources.getInteger(R.integer.game_grid_columns)
             )
-            adapter = GameAdapter(requireActivity() as AppCompatActivity, inflater)
+            adapter = this@GamesFragment.gameAdapter
         }
 
         binding.swipeRefresh.apply {
@@ -143,6 +164,34 @@ class GamesFragment : Fragment() {
         setInsets()
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        if (show3DSFileWarning &&
+            !PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
+                .getBoolean("show_3ds_files_warning", false)) {
+            val message = HtmlCompat.fromHtml(getString(R.string.warning_3ds_files),
+                HtmlCompat.FROM_HTML_MODE_LEGACY)
+
+            context?.let {
+                val alert = MaterialAlertDialogBuilder(it)
+                    .setTitle(getString(R.string.important))
+                    .setMessage(message)
+                    .setPositiveButton(R.string.dont_show_again) { _, _ ->
+                        PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
+                            .edit() {
+                            putBoolean("show_3ds_files_warning", true)
+                        }
+                    }
+                    .show()
+
+                val alertMessage = alert.findViewById<View>(android.R.id.message) as TextView
+                alertMessage.movementMethod = LinkMovementMethod.getInstance()
+            }
+        }
+        show3DSFileWarning = false
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

src/android/app/src/main/java/org/citra/citra_emu/fragments/SearchFragment.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -36,6 +36,8 @@ import org.citra.citra_emu.viewmodel.GamesViewModel
 import org.citra.citra_emu.viewmodel.HomeViewModel
 import java.time.temporal.ChronoField
 import java.util.Locale
+import android.net.Uri
+import androidx.activity.result.contract.ActivityResultContracts
 
 class SearchFragment : Fragment() {
     private var _binding: FragmentSearchBinding? = null
@@ -43,6 +45,13 @@ class SearchFragment : Fragment() {
 
     private val gamesViewModel: GamesViewModel by activityViewModels()
     private val homeViewModel: HomeViewModel by activityViewModels()
+    private lateinit var gameAdapter: GameAdapter
+
+    private val openImageLauncher = registerForActivityResult(
+        ActivityResultContracts.GetContent()
+    ) { uri: Uri? ->
+        gameAdapter.handleShortcutImageResult(uri)
+    }
 
     private lateinit var preferences: SharedPreferences
 
@@ -73,12 +82,18 @@ class SearchFragment : Fragment() {
 
         val inflater = LayoutInflater.from(requireContext())
 
+        gameAdapter = GameAdapter(
+            requireActivity() as AppCompatActivity,
+            inflater,
+            openImageLauncher
+        )
+
         binding.gridGamesSearch.apply {
             layoutManager = GridLayoutManager(
                 requireContext(),
                 resources.getInteger(R.integer.game_grid_columns)
             )
-            adapter = GameAdapter(requireActivity() as AppCompatActivity, inflater)
+            adapter = this@SearchFragment.gameAdapter
         }
 
         binding.chipGroup.setOnCheckedStateChangeListener { _, _ -> filterAndSearch() }

src/android/app/src/main/java/org/citra/citra_emu/fragments/SelectUserDirectoryDialogFragment.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -22,11 +22,12 @@ class SelectUserDirectoryDialogFragment : DialogFragment() {
         mainActivity = requireActivity() as MainActivity
 
         isCancelable = false
+
         return MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.select_citra_user_folder)
-            .setMessage(R.string.cannot_skip_directory_description)
+            .setMessage(R.string.selecting_user_directory_without_write_permissions)
             .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
-                mainActivity?.openCitraDirectory?.launch(null)
+                mainActivity?.openCitraDirectoryLostPermission?.launch(null)
             }
             .show()
     }

src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupFragment.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -35,9 +35,11 @@ import org.citra.citra_emu.R
 import org.citra.citra_emu.adapters.SetupAdapter
 import org.citra.citra_emu.databinding.FragmentSetupBinding
 import org.citra.citra_emu.features.settings.model.Settings
+import org.citra.citra_emu.model.ButtonState
+import org.citra.citra_emu.model.PageButton
+import org.citra.citra_emu.model.PageState
 import org.citra.citra_emu.model.SetupCallback
 import org.citra.citra_emu.model.SetupPage
-import org.citra.citra_emu.model.StepState
 import org.citra.citra_emu.ui.main.MainActivity
 import org.citra.citra_emu.utils.CitraDirectoryHelper
 import org.citra.citra_emu.utils.GameHelper
@@ -113,151 +115,195 @@ class SetupFragment : Fragment() {
                     0,
                     true,
                     R.string.get_started,
-                    { pageForward() }
-                )
-            )
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                add(
-                    SetupPage(
-                        R.drawable.ic_notification,
-                        R.string.notifications,
-                        R.string.notifications_description,
-                        0,
-                        false,
-                        R.string.give_permission,
-                        {
-                            notificationCallback = it
-                            permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
-                        },
-                        false,
-                        true,
-                        {
-                            if (NotificationManagerCompat.from(requireContext())
-                                    .areNotificationsEnabled()
-                            ) {
-                                StepState.STEP_COMPLETE
-                            } else {
-                                StepState.STEP_INCOMPLETE
-                            }
-                        },
-                        R.string.notification_warning,
-                        R.string.notification_warning_description,
-                        0
-                    )
-                )
-            }
-
-            add(
-                SetupPage(
-                    R.drawable.ic_microphone,
-                    R.string.microphone_permission,
-                    R.string.microphone_permission_description,
-                    0,
-                    false,
-                    R.string.give_permission,
-                    {
-                        microphoneCallback = it
-                        permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
-                    },
-                    false,
-                    false,
-                    {
-                        if (
-                            ContextCompat.checkSelfPermission(
-                                requireContext(),
-                                Manifest.permission.RECORD_AUDIO
-                            ) == PackageManager.PERMISSION_GRANTED
-                        ) {
-                            StepState.STEP_COMPLETE
-                        } else {
-                            StepState.STEP_INCOMPLETE
-                        }
+                    pageButtons = mutableListOf<PageButton>().apply {
+                        add(
+                            PageButton(
+                                R.drawable.ic_arrow_forward,
+                                R.string.get_started,
+                                0,
+                                buttonAction = {
+                                    pageForward()
+                                },
+                                buttonState = {
+                                    ButtonState.BUTTON_ACTION_UNDEFINED
+                                }
+                            )
+                        )
                     }
                 )
             )
+
             add(
                 SetupPage(
-                    R.drawable.ic_camera,
-                    R.string.camera_permission,
-                    R.string.camera_permission_description,
+                    R.drawable.ic_permission,
+                    R.string.permissions,
+                    R.string.permissions_description,
                     0,
                     false,
-                    R.string.give_permission,
-                    {
-                        cameraCallback = it
-                        permissionLauncher.launch(Manifest.permission.CAMERA)
-                    },
-                    false,
-                    false,
-                    {
-                        if (
-                            ContextCompat.checkSelfPermission(
-                                requireContext(),
-                                Manifest.permission.CAMERA
-                            ) == PackageManager.PERMISSION_GRANTED
-                        ) {
-                            StepState.STEP_COMPLETE
-                        } else {
-                            StepState.STEP_INCOMPLETE
+                    0,
+                    pageButtons = mutableListOf<PageButton>().apply {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                            add(
+                                PageButton(
+                                    R.drawable.ic_notification,
+                                    R.string.notifications,
+                                    R.string.notifications_description,
+                                    buttonAction = {
+                                        pageButtonCallback = it
+                                        permissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+                                    },
+                                    buttonState = {
+                                        if (NotificationManagerCompat.from(requireContext())
+                                                .areNotificationsEnabled()
+                                        ) {
+                                            ButtonState.BUTTON_ACTION_COMPLETE
+                                        } else {
+                                            ButtonState.BUTTON_ACTION_INCOMPLETE
+                                        }
+                                    },
+                                    isUnskippable = false,
+                                    hasWarning = true,
+                                    R.string.notification_warning,
+                                    R.string.notification_warning_description,
+                                )
+                            )
                         }
-                    }
-                )
-            )
-            add(
-                SetupPage(
-                    R.drawable.ic_home,
-                    R.string.select_citra_user_folder,
-                    R.string.select_citra_user_folder_description,
-                    0,
-                    true,
-                    R.string.select,
-                    {
-                        userDirCallback = it
-                        openCitraDirectory.launch(null)
-                    },
-                    true,
-                    true,
-                    {
-                        if (PermissionsHandler.hasWriteAccess(requireContext())) {
-                            StepState.STEP_COMPLETE
-                        } else {
-                            StepState.STEP_INCOMPLETE
-                        }
-                    },
-                    R.string.cannot_skip,
-                    R.string.cannot_skip_directory_description,
-                    R.string.cannot_skip_directory_help
-                )
-            )
-            add(
-                SetupPage(
-                    R.drawable.ic_controller,
-                    R.string.games,
-                    R.string.games_description,
-                    0,
-                    true,
-                    R.string.select,
-                    {
-                        gamesDirCallback = it
-                        getGamesDirectory.launch(
-                            Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data
+                        add(
+                            PageButton(
+                                R.drawable.ic_microphone,
+                                R.string.microphone_permission,
+                                R.string.microphone_permission_description,
+                                buttonAction = {
+                                    pageButtonCallback = it
+                                    permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
+                                },
+                                buttonState = {
+                                    if (ContextCompat.checkSelfPermission(
+                                            requireContext(),
+                                            Manifest.permission.RECORD_AUDIO
+                                        ) == PackageManager.PERMISSION_GRANTED
+                                    ) {
+                                        ButtonState.BUTTON_ACTION_COMPLETE
+                                    } else {
+                                        ButtonState.BUTTON_ACTION_INCOMPLETE
+                                    }
+                                },
+                            )
+                        )
+                        add(
+                            PageButton(
+                                R.drawable.ic_camera,
+                                R.string.camera_permission,
+                                R.string.camera_permission_description,
+                                buttonAction = {
+                                    pageButtonCallback = it
+                                    permissionLauncher.launch(Manifest.permission.CAMERA)
+                                },
+                                buttonState = {
+                                    if (ContextCompat.checkSelfPermission(
+                                            requireContext(),
+                                            Manifest.permission.CAMERA
+                                        ) == PackageManager.PERMISSION_GRANTED
+                                    ) {
+                                        ButtonState.BUTTON_ACTION_COMPLETE
+                                    } else {
+                                        ButtonState.BUTTON_ACTION_INCOMPLETE
+                                    }
+                                },
+                            )
                         )
                     },
-                    false,
-                    true,
-                    {
-                        if (preferences.getString(GameHelper.KEY_GAME_PATH, "")!!.isNotEmpty()) {
-                            StepState.STEP_COMPLETE
-                        } else {
-                            StepState.STEP_INCOMPLETE
-                        }
-                    },
-                    R.string.add_games_warning,
-                    R.string.add_games_warning_description,
-                    R.string.add_games_warning_help
-                )
+                ) {
+                    if (
+                        ContextCompat.checkSelfPermission(
+                            requireContext(),
+                            Manifest.permission.RECORD_AUDIO
+                        ) == PackageManager.PERMISSION_GRANTED &&
+                        ContextCompat.checkSelfPermission(
+                            requireContext(),
+                            Manifest.permission.CAMERA
+                        ) == PackageManager.PERMISSION_GRANTED &&
+                        NotificationManagerCompat.from(requireContext())
+                            .areNotificationsEnabled()
+                    ) {
+                        PageState.PAGE_STEPS_COMPLETE
+                    } else {
+                        PageState.PAGE_STEPS_INCOMPLETE
+                    }
+                }
             )
+
+            add(
+                SetupPage(
+                    R.drawable.ic_folder,
+                    R.string.select_emulator_data_folders,
+                    R.string.select_emulator_data_folders_description,
+                    0,
+                    true,
+                    R.string.select,
+                    pageButtons = mutableListOf<PageButton>().apply {
+                        add(
+                            PageButton(
+                                R.drawable.ic_home,
+                                R.string.select_citra_user_folder,
+                                R.string.select_citra_user_folder_description,
+                                buttonAction = {
+                                    pageButtonCallback = it
+                                    openCitraDirectory.launch(null)
+                                },
+                                buttonState = {
+                                    if (PermissionsHandler.hasWriteAccess(requireContext())) {
+                                        ButtonState.BUTTON_ACTION_COMPLETE
+                                    } else {
+                                        ButtonState.BUTTON_ACTION_INCOMPLETE
+                                    }
+                                },
+                                isUnskippable = true,
+                                hasWarning = false,
+                                R.string.cannot_skip,
+                                R.string.cannot_skip_directory_description,
+                                R.string.cannot_skip_directory_help
+
+                            )
+                        )
+                        add(
+                            PageButton(
+                                R.drawable.ic_controller,
+                                R.string.games,
+                                R.string.games_description,
+                                buttonAction =  {
+                                    pageButtonCallback = it
+                                    getGamesDirectory.launch(
+                                        Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data
+                                    )
+                                },
+                                buttonState = {
+                                    if (preferences.getString(GameHelper.KEY_GAME_PATH, "")!!.isNotEmpty()) {
+                                        ButtonState.BUTTON_ACTION_COMPLETE
+                                    } else {
+                                        ButtonState.BUTTON_ACTION_INCOMPLETE
+                                    }
+                                },
+                                isUnskippable = false,
+                                hasWarning = true,
+                                R.string.add_games_warning,
+                                R.string.add_games_warning_description,
+                            )
+                        )
+                    },
+                ) {
+                    if (
+                        PermissionsHandler.hasWriteAccess(requireContext()) &&
+                        preferences.getString(GameHelper.KEY_GAME_PATH, "")!!.isNotEmpty()
+                    ) {
+                        PageState.PAGE_STEPS_COMPLETE
+
+                    } else {
+                        PageState.PAGE_STEPS_INCOMPLETE
+                    }
+                }
+            )
+
             add(
                 SetupPage(
                     R.drawable.ic_check,
@@ -266,7 +312,21 @@ class SetupFragment : Fragment() {
                     R.drawable.ic_arrow_forward,
                     false,
                     R.string.text_continue,
-                    { finishSetup() }
+                    pageButtons = mutableListOf<PageButton>().apply {
+                        add(
+                            PageButton(
+                                R.drawable.ic_arrow_forward,
+                                R.string.text_continue,
+                                0,
+                                buttonAction = {
+                                    finishSetup()
+                                },
+                                buttonState = {
+                                    ButtonState.BUTTON_ACTION_UNDEFINED
+                                }
+                            )
+                        )
+                    }
                 )
             )
         }
@@ -303,35 +363,47 @@ class SetupFragment : Fragment() {
             val index = binding.viewPager2.currentItem
             val currentPage = pages[index]
 
-            // Checks if the user has completed the task on the current page
-            if (currentPage.hasWarning || currentPage.isUnskippable) {
-                val stepState = currentPage.stepCompleted.invoke()
-                if (stepState == StepState.STEP_COMPLETE ||
-                    stepState == StepState.STEP_UNDEFINED
-                ) {
-                    pageForward()
-                    return@setOnClickListener
-                }
+            // This allows multiple sets of warning messages to be displayed on the same dialog if necessary
+            val warningMessages =
+                mutableListOf<Triple<Int, Int, Int>>() // title, description, helpLink
 
-                if (currentPage.isUnskippable) {
-                    MessageDialogFragment.newInstance(
-                        currentPage.warningTitleId,
-                        currentPage.warningDescriptionId,
-                        currentPage.warningHelpLinkId
-                    ).show(childFragmentManager, MessageDialogFragment.TAG)
-                    return@setOnClickListener
-                }
+            currentPage.pageButtons?.forEach { button ->
+                if (button.hasWarning || button.isUnskippable) {
+                    val buttonState = button.buttonState()
+                    if (buttonState == ButtonState.BUTTON_ACTION_COMPLETE) {
+                        return@forEach
+                    }
 
-                if (!hasBeenWarned[index]) {
-                    SetupWarningDialogFragment.newInstance(
-                        currentPage.warningTitleId,
-                        currentPage.warningDescriptionId,
-                        currentPage.warningHelpLinkId,
-                        index
-                    ).show(childFragmentManager, SetupWarningDialogFragment.TAG)
-                    return@setOnClickListener
+                    if (button.isUnskippable) {
+                        MessageDialogFragment.newInstance(
+                            button.warningTitleId,
+                            button.warningDescriptionId,
+                            button.warningHelpLinkId
+                        ).show(childFragmentManager, MessageDialogFragment.TAG)
+                        return@setOnClickListener
+                    }
+
+                    if (!hasBeenWarned[index]) {
+                        warningMessages.add(
+                            Triple(
+                                button.warningTitleId,
+                                button.warningDescriptionId,
+                                button.warningHelpLinkId
+                            )
+                        )
+                    }
                 }
             }
+
+            if (warningMessages.isNotEmpty()) {
+                SetupWarningDialogFragment.newInstance(
+                    warningMessages.map { it.first }.toIntArray(),
+                    warningMessages.map { it.second }.toIntArray(),
+                    warningMessages.map { it.third }.toIntArray(),
+                    index
+                ).show(childFragmentManager, SetupWarningDialogFragment.TAG)
+                return@setOnClickListener
+            }
             pageForward()
         }
         binding.buttonBack.setOnClickListener { pageBackward() }
@@ -366,19 +438,24 @@ class SetupFragment : Fragment() {
         _binding = null
     }
 
-    private lateinit var notificationCallback: SetupCallback
-    private lateinit var microphoneCallback: SetupCallback
-    private lateinit var cameraCallback: SetupCallback
+    private lateinit var pageButtonCallback: SetupCallback
+    private val checkForButtonState: () -> Unit = {
+        val page = pages[binding.viewPager2.currentItem]
+        page.pageButtons?.forEach {
+            if (it.buttonState() == ButtonState.BUTTON_ACTION_COMPLETE) {
+                pageButtonCallback.onStepCompleted(it.titleId, pageFullyCompleted = false)
+            }
+
+            if (page.pageSteps() == PageState.PAGE_STEPS_COMPLETE) {
+                pageButtonCallback.onStepCompleted(0, pageFullyCompleted = true)
+            }
+        }
+    }
 
     private val permissionLauncher =
         registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
             if (isGranted) {
-                val page = pages[binding.viewPager2.currentItem]
-                when (page.titleId) {
-                    R.string.notifications -> notificationCallback.onStepCompleted()
-                    R.string.microphone_permission -> microphoneCallback.onStepCompleted()
-                    R.string.camera_permission -> cameraCallback.onStepCompleted()
-                }
+                checkForButtonState.invoke()
                 return@registerForActivityResult
             }
 
@@ -394,8 +471,6 @@ class SetupFragment : Fragment() {
                 .show()
         }
 
-    private lateinit var userDirCallback: SetupCallback
-
     private val openCitraDirectory = registerForActivityResult<Uri, Uri>(
         ActivityResultContracts.OpenDocumentTree()
     ) { result: Uri? ->
@@ -403,11 +478,9 @@ class SetupFragment : Fragment() {
             return@registerForActivityResult
         }
 
-        CitraDirectoryHelper(requireActivity()).showCitraDirectoryDialog(result, userDirCallback)
+        CitraDirectoryHelper(requireActivity(), true).showCitraDirectoryDialog(result, pageButtonCallback, checkForButtonState)
     }
 
-    private lateinit var gamesDirCallback: SetupCallback
-
     private val getGamesDirectory =
         registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
             if (result == null) {
@@ -427,7 +500,7 @@ class SetupFragment : Fragment() {
 
             homeViewModel.setGamesDir(requireActivity(), result.path!!)
 
-            gamesDirCallback.onStepCompleted()
+            checkForButtonState.invoke()
         }
 
     private fun finishSetup() {

src/android/app/src/main/java/org/citra/citra_emu/fragments/SetupWarningDialogFragment.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -14,18 +14,18 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.citra.citra_emu.R
 
 class SetupWarningDialogFragment : DialogFragment() {
-    private var titleId: Int = 0
-    private var descriptionId: Int = 0
-    private var helpLinkId: Int = 0
+    private var titleIds: IntArray = intArrayOf()
+    private var descriptionIds: IntArray = intArrayOf()
+    private var helpLinkIds: IntArray = intArrayOf()
     private var page: Int = 0
 
     private lateinit var setupFragment: SetupFragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        titleId = requireArguments().getInt(TITLE)
-        descriptionId = requireArguments().getInt(DESCRIPTION)
-        helpLinkId = requireArguments().getInt(HELP_LINK)
+        titleIds = requireArguments().getIntArray(TITLES) ?: intArrayOf()
+        descriptionIds = requireArguments().getIntArray(DESCRIPTIONS) ?: intArrayOf()
+        helpLinkIds = requireArguments().getIntArray(HELP_LINKS) ?: intArrayOf()
         page = requireArguments().getInt(PAGE)
 
         setupFragment = requireParentFragment() as SetupFragment
@@ -39,16 +39,23 @@ class SetupWarningDialogFragment : DialogFragment() {
             }
             .setNegativeButton(R.string.warning_cancel, null)
 
-        if (titleId != 0) {
-            builder.setTitle(titleId)
-        } else {
-            builder.setTitle("")
+        // Message builder to build multiple strings into one
+        val messageBuilder = StringBuilder()
+        for (i in titleIds.indices) {
+            if (titleIds[i] != 0) {
+                messageBuilder.append(getString(titleIds[i])).append("\n\n")
+            }
+            if (descriptionIds[i] != 0) {
+                messageBuilder.append(getString(descriptionIds[i])).append("\n\n")
+            }
         }
-        if (descriptionId != 0) {
-            builder.setMessage(descriptionId)
-        }
-        if (helpLinkId != 0) {
+
+        builder.setTitle("Warning")
+        builder.setMessage(messageBuilder.toString().trim())
+
+        if (helpLinkIds.any { it != 0 }) {
             builder.setNeutralButton(R.string.warning_help) { _: DialogInterface?, _: Int ->
+                val helpLinkId = helpLinkIds.first { it != 0 }
                 val helpLink = resources.getString(helpLinkId)
                 val intent = Intent(Intent.ACTION_VIEW, Uri.parse(helpLink))
                 startActivity(intent)
@@ -61,23 +68,23 @@ class SetupWarningDialogFragment : DialogFragment() {
     companion object {
         const val TAG = "SetupWarningDialogFragment"
 
-        private const val TITLE = "Title"
-        private const val DESCRIPTION = "Description"
-        private const val HELP_LINK = "HelpLink"
+        private const val TITLES = "Titles"
+        private const val DESCRIPTIONS = "Descriptions"
+        private const val HELP_LINKS = "HelpLinks"
         private const val PAGE = "Page"
 
         fun newInstance(
-            titleId: Int,
-            descriptionId: Int,
-            helpLinkId: Int,
+            titleIds: IntArray,
+            descriptionIds: IntArray,
+            helpLinkIds: IntArray,
             page: Int
         ): SetupWarningDialogFragment {
             val dialog = SetupWarningDialogFragment()
             val bundle = Bundle()
             bundle.apply {
-                putInt(TITLE, titleId)
-                putInt(DESCRIPTION, descriptionId)
-                putInt(HELP_LINK, helpLinkId)
+                putIntArray(TITLES, titleIds)
+                putIntArray(DESCRIPTIONS, descriptionIds)
+                putIntArray(HELP_LINKS, helpLinkIds)
                 putInt(PAGE, page)
             }
             dialog.arguments = bundle

src/android/app/src/main/java/org/citra/citra_emu/fragments/SystemFilesFragment.kt

@@ -4,6 +4,7 @@
 
 package org.citra.citra_emu.fragments
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.Gravity
@@ -157,6 +158,22 @@ class SystemFilesFragment : Fragment() {
             movementMethod = LinkMovementMethod.getInstance()
         }
 
+        binding.buttonUnlinkConsoleData.isEnabled = NativeLibrary.isFullConsoleLinked()
+        binding.buttonUnlinkConsoleData.setOnClickListener {
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.delete_system_files)
+                .setMessage(HtmlCompat.fromHtml(
+                    requireContext().getString(R.string.delete_system_files_description),
+                    HtmlCompat.FROM_HTML_MODE_COMPACT
+                ))
+                .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
+                    NativeLibrary.unlinkConsole()
+                    binding.buttonUnlinkConsoleData.isEnabled = NativeLibrary.isFullConsoleLinked()
+                }
+                .setNegativeButton(android.R.string.cancel, null)
+                .show()
+        }
+
         binding.buttonSetUpSystemFiles.setOnClickListener {
             val inflater = LayoutInflater.from(context)
             val inputBinding = DialogSoftwareKeyboardBinding.inflate(inflater)

src/android/app/src/main/java/org/citra/citra_emu/fragments/UpdateUserDirectoryDialogFragment.kt

@@ -0,0 +1,113 @@
+// Copyright Citra Emulator Project / Azahar Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+package org.citra.citra_emu.fragments
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.content.SharedPreferences
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.RadioButton
+import android.widget.RadioGroup
+import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.ViewModelProvider
+import androidx.preference.PreferenceManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.citra.citra_emu.CitraApplication
+import org.citra.citra_emu.R
+import org.citra.citra_emu.ui.main.MainActivity
+import org.citra.citra_emu.utils.CitraDirectoryUtils
+import org.citra.citra_emu.utils.DirectoryInitialization
+import org.citra.citra_emu.utils.PermissionsHandler
+import org.citra.citra_emu.viewmodel.HomeViewModel
+
+class UpdateUserDirectoryDialogFragment : DialogFragment() {
+    private lateinit var mainActivity: MainActivity
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        mainActivity = requireActivity() as MainActivity
+
+        isCancelable = false
+        val preferences: SharedPreferences =
+            PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
+        val ld = preferences.getString("LIME3DS_DIRECTORY","")
+        val cd = preferences.getString("CITRA_DIRECTORY","")
+        val dialogView = LayoutInflater.from(requireContext())
+            .inflate(R.layout.dialog_select_which_directory, null)
+
+        val radioGroup = dialogView.findViewById<RadioGroup>(R.id.radioGroup)
+
+        val choices = listOf(
+            getString(R.string.keep_current_azahar_directory) to Uri.parse(cd).path,
+            getString(R.string.use_prior_lime3ds_directory) to Uri.parse(ld).path
+        )
+        var selected = -1 // 0 = current, 1 = prior, -1 = no selection
+
+        choices.forEachIndexed { index, (label, subtext) ->
+            val container = LinearLayout(requireContext()).apply {
+                orientation = LinearLayout.VERTICAL
+                setPadding(0, 16, 0, 16)
+            }
+
+            val radioButton = RadioButton(requireContext()).apply {
+                text = label
+                id = View.generateViewId()
+            }
+
+            val subTextView = TextView(requireContext()).apply {
+                text = subtext
+                setPadding(64, 4, 0, 0) // indent for visual hierarchy
+                setTextAppearance(android.R.style.TextAppearance_Small)
+            }
+
+            container.addView(radioButton)
+            container.addView(subTextView)
+            radioGroup.addView(container)
+
+            // RadioGroup expects RadioButtons directly, so we need to manage selection ourselves
+            radioButton.setOnClickListener {
+                selected = index
+                // Manually uncheck others
+                for (i in 0 until radioGroup.childCount) {
+                    val child = radioGroup.getChildAt(i) as LinearLayout
+                    val rb = child.getChildAt(0) as RadioButton
+                    rb.isChecked = i == index
+                }
+            }
+        }
+
+        return MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.select_citra_user_folder)
+            .setView(dialogView)
+            .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
+                if (selected == 1) {
+                    PermissionsHandler.setCitraDirectory(ld)
+                }
+                if (selected >= 0) {
+                    CitraDirectoryUtils.removeLimeDirectoryPreference()
+                    DirectoryInitialization.resetCitraDirectoryState()
+                    DirectoryInitialization.start()
+                }
+
+                ViewModelProvider(mainActivity)[HomeViewModel::class.java].setPickingUserDir(false)
+                ViewModelProvider(mainActivity)[HomeViewModel::class.java].setUserDir(this.requireActivity(),PermissionsHandler.citraDirectory.path!!)
+            }
+            .show()
+    }
+
+    companion object {
+        const val TAG = "UpdateUserDirectoryDialogFragment"
+
+        fun newInstance(activity: FragmentActivity): UpdateUserDirectoryDialogFragment {
+            ViewModelProvider(activity)[HomeViewModel::class.java].setPickingUserDir(true)
+            return UpdateUserDirectoryDialogFragment()
+        }
+    }
+}