Merge branch 'master' into 'master'

Add System Requirements Page.

See merge request citron/emu!2

.ci/citron-canary-step1.yml

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+trigger:
+- master
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+stages:
+- stage: merge
+  displayName: 'merge'
+  jobs:
+  - template: ./templates/merge-private.yml

.ci/citron-canary-step2.yml

@@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+trigger:
+- master
+
+variables:
+  DisplayVersion: $[counter(variables['DisplayPrefix'], 1)]
+
+stages:
+- stage: build
+  displayName: 'build'
+  jobs:
+  - job: linux
+    timeoutInMinutes: 120
+    displayName: 'linux'
+    pool:
+      vmImage: ubuntu-latest
+    strategy:
+      maxParallel: 10
+      matrix:
+        linux:
+          BuildSuffix: 'linux'
+          ScriptFolder: 'linux'
+    steps:
+    - template: ./templates/sync-source.yml
+      parameters:
+        artifactSource: $(parameters.artifactSource)
+        needSubmodules: 'true'
+    - template: ./templates/build-single.yml
+      parameters:
+        artifactSource: 'false'
+        cache: $(parameters.cache)
+        version: $(DisplayVersion)
+  - job: msvc
+    timeoutInMinutes: 120
+    displayName: 'windows'
+    pool:
+      vmImage: windows-2022
+    steps:
+    - template: ./templates/sync-source.yml
+      parameters:
+        artifactSource: $(parameters.artifactSource)
+        needSubmodules: 'true'
+    - template: ./templates/build-msvc.yml
+      parameters:
+        artifactSource: 'false'
+        cache: $(parameters.cache)
+        version: $(DisplayVersion)
+- stage: release
+  displayName: 'release'
+  dependsOn: build
+  jobs:
+    - job: release
+      displayName: 'source'
+      pool:
+        vmImage: 'ubuntu-latest'
+      steps:
+        - template: ./templates/release-private-tag.yml

.ci/citron-pipeline.yml

@@ -0,0 +1,106 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+trigger:
+- master
+
+variables:
+  DisplayVersion: $[counter(variables['DisplayPrefix'], 1)]
+  BuildName: 'stable'
+
+stages:
+- stage: build
+  displayName: 'build'
+  jobs:
+  - job: build
+    timeoutInMinutes: 120
+    displayName: 'standard'
+    pool:
+      vmImage: ubuntu-latest
+    strategy:
+      maxParallel: 10
+      matrix:
+        linux:
+          BuildSuffix: 'linux'
+          ScriptFolder: 'linux'
+    steps:
+    - template: ./templates/sync-source.yml
+      parameters:
+        artifactSource: $(parameters.artifactSource)
+        needSubmodules: 'true'
+    - template: ./templates/build-single.yml
+      parameters:
+        artifactSource: 'false'
+        cache: 'true'
+        version: $(DisplayVersion)
+    # Make tokens available to scripts
+    - task: Bash@3
+      inputs:
+        targetType: 'inline'
+        script: |
+          echo "##vso[task.setvariable variable=EARLY_ACCESS_TOKEN]$(EARLY_ACCESS_TOKEN)"
+          echo "##vso[task.setvariable variable=CI_RELEASE_TOKEN]$(CI_RELEASE_TOKEN)"
+
+- stage: build_win
+  displayName: 'build-windows'
+  jobs:
+  - job: build
+    timeoutInMinutes: 120
+    displayName: 'msvc'
+    pool:
+      vmImage: windows-2022
+    steps:
+    - template: ./templates/sync-source.yml
+      parameters:
+        artifactSource: $(parameters.artifactSource)
+        needSubmodules: 'true'
+    - template: ./templates/build-msvc.yml
+      parameters:
+        artifactSource: 'false'
+        cache: 'true'
+        version: $(DisplayVersion)
+    # Make tokens available to scripts
+    - task: PowerShell@2
+      inputs:
+        targetType: 'inline'
+        script: |
+          Write-Host "##vso[task.setvariable variable=EARLY_ACCESS_TOKEN]$(EARLY_ACCESS_TOKEN)"
+          Write-Host "##vso[task.setvariable variable=CI_RELEASE_TOKEN]$(CI_RELEASE_TOKEN)"
+
+- stage: build_android
+  displayName: 'build-android'
+  jobs:
+  - job: build
+    timeoutInMinutes: 120
+    displayName: 'android'
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - template: ./templates/sync-source.yml
+      parameters:
+        artifactSource: $(parameters.artifactSource)
+        needSubmodules: 'true'
+    - task: Bash@3
+      inputs:
+        targetType: 'inline'
+        script: |
+          export USE_DEBUG_KEYSTORE=true
+          chmod +x ./.ci/scripts/android/build.sh
+          ./.ci/scripts/android/build.sh
+    - publish: artifacts
+      artifact: 'citron-$(BuildName)-android'
+      displayName: 'Upload Android Artifacts'
+
+- stage: release
+  displayName: 'release'
+  dependsOn:
+  - build
+  - build_win
+  - build_android
+  jobs:
+  - job: github
+    displayName: 'github'
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - template: ./templates/release-github.yml 

.ci/citron-repo-sync.yml

@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+trigger:
+- master
+
+jobs:
+- job: copy
+  displayName: 'Sync Repository'
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - script: echo 'https://$(GitUsername):$(GitAccessToken)@dev.azure.com' > $HOME/.git-credentials
+    displayName: 'Load Credentials'
+  - script: git config --global credential.helper store
+    displayName: 'Register Credential Helper'
+  - script: git remote add other $(GitRepoPushChangesURL)
+    displayName: 'Register Repository'
+  - script: git push --force other HEAD:$(GitPushBranch)
+    displayName: 'Update Code'
+  - script: rm -rf $HOME/.git-credentials
+    displayName: 'Clear Cached Credentials'

.ci/citron-stable-step1.yml

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+trigger:
+- master
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+stages:
+- stage: merge
+  displayName: 'merge'
+  jobs:
+  - template: ./templates/merge.yml

.ci/citron-stable-step2.yml

@@ -0,0 +1,64 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+trigger:
+- master
+
+variables:
+  DisplayVersion: $[counter(variables['DisplayPrefix'], 1)]
+
+stages:
+- stage: build
+  displayName: 'build'
+  jobs:
+  - job: build
+    timeoutInMinutes: 120
+    displayName: 'standard'
+    pool:
+      vmImage: ubuntu-latest
+    strategy:
+      maxParallel: 10
+      matrix:
+        linux:
+          BuildSuffix: 'linux'
+          ScriptFolder: 'linux'
+    steps:
+    - template: ./templates/sync-source.yml
+      parameters:
+        artifactSource: $(parameters.artifactSource)
+        needSubmodules: 'true'
+    - template: ./templates/build-single.yml
+      parameters:
+        artifactSource: 'false'
+        cache: 'true'
+        version: $(DisplayVersion)
+- stage: build_win
+  displayName: 'build-windows'
+  jobs:
+  - job: build
+    timeoutInMinutes: 120
+    displayName: 'msvc'
+    pool:
+      vmImage: windows-2022
+    steps:
+    - template: ./templates/sync-source.yml
+      parameters:
+        artifactSource: $(parameters.artifactSource)
+        needSubmodules: 'true'
+    - template: ./templates/build-msvc.yml
+      parameters:
+        artifactSource: 'false'
+        cache: 'true'
+        version: $(DisplayVersion)
+- stage: release
+  displayName: 'release'
+  dependsOn:
+  - build
+  - build_win
+  jobs:
+  - job: github
+    displayName: 'github'
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - template: ./templates/release-github.yml

.ci/citron-verify.yml

@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+stages:
+- stage: format
+  displayName: 'format'
+  jobs:
+  - job: format
+    displayName: 'clang'
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - template: ./templates/format-check.yml
+      parameters:
+        artifactSource: 'false'
+- stage: build
+  displayName: 'build'
+  dependsOn: format
+  jobs:
+  - template: ./templates/build-standard.yml
+    parameters:
+      cache: 'false'
+  - template: ./templates/build-testing.yml

.ci/scripts/android/build.sh

@@ -0,0 +1,28 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+export NDK_CCACHE="$(which ccache)"
+ccache -s
+
+BUILD_FLAVOR="stable"
+
+mkdir -p "artifacts"
+
+BUILD_TYPE="release"
+if [ "${GITHUB_REPOSITORY}" == "Citron-Project/Cit" ]; then
+    BUILD_TYPE="relWithDebInfo"
+fi
+
+# We'll use the Android debug keystore for builds
+# This removes the requirement for storing a keystore in secrets
+# For production builds, this should be replaced with a proper signing configuration
+export USE_DEBUG_KEYSTORE=true
+
+cd src/android
+chmod +x ./gradlew
+./gradlew clean
+./gradlew app:assemble${BUILD_FLAVOR}${BUILD_TYPE}
+
+ccache -s

.ci/scripts/android/canarybuild.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2024 Citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+export NDK_CCACHE="$(which ccache)"
+ccache -s
+
+export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/service-account-key.json"
+
+base64 --decode <<< "${CANARY_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+chmod 600 "${ANDROID_KEYSTORE_FILE}"
+
+mkdir -p "$(dirname "${SERVICE_ACCOUNT_KEY_PATH}")"
+base64 --decode <<< "${CANARY_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
+./gradlew "publishCanaryReleaseBundle"
+
+ccache -s
+
+rm "${ANDROID_KEYSTORE_FILE}" "${SERVICE_ACCOUNT_KEY_PATH}" 

.ci/scripts/android/eabuild.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2024 citron Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+export NDK_CCACHE="$(which ccache)"
+ccache -s
+
+export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
+export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
+export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
+base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
+./gradlew "publishEaReleaseBundle"
+
+ccache -s
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    rm "${ANDROID_KEYSTORE_FILE}"
+fi

.ci/scripts/android/stablebuild.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+export NDK_CCACHE="$(which ccache)"
+ccache -s
+
+export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/service-account-key.json"
+
+base64 --decode <<< "${STABLE_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+chmod 600 "${ANDROID_KEYSTORE_FILE}"
+
+mkdir -p "$(dirname "${SERVICE_ACCOUNT_KEY_PATH}")"
+base64 --decode <<< "${STABLE_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
+./gradlew "publishStableReleaseBundle"
+
+ccache -s
+
+rm "${ANDROID_KEYSTORE_FILE}" "${SERVICE_ACCOUNT_KEY_PATH}"

.ci/scripts/android/upload.sh

@@ -0,0 +1,41 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. .ci/scripts/common/pre-upload.sh
+
+APPNAME="org.citron.citron"
+
+REV_NAME="${APPNAME}-${GITDATE}-${GITREV}"
+
+APK="${REV_NAME}.apk"
+
+if [ "${GITHUB_REPOSITORY}" == "Citron-Project/Cit" ]; then
+    cd src/android
+    ./gradlew app:bundleRelease
+    # RELEASE_BODY gets reset here, but its fine since we're uploading after the GitHub Release
+    . .ci/scripts/common/post-upload.sh
+
+    sudo apt-get install -y jq
+
+    ls app/build/outputs/bundle/release/
+
+    echo "Downloading CI scripts bundle"
+    ARTIFACTS_DIR="/tmp/artifact-pool"
+    mkdir -p "$ARTIFACTS_DIR"
+fi
+
+BUILD_FLAVOR="stable"
+
+BUILD_TYPE_LOWER="release"
+BUILD_TYPE_UPPER="Release"
+if [ "${GITHUB_REPOSITORY}" == "Citron-Project/Cit" ]; then
+    BUILD_TYPE_LOWER="relWithDebInfo"
+    BUILD_TYPE_UPPER="RelWithDebInfo"
+fi
+
+cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/${BUILD_TYPE_LOWER}/app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.apk" \
+  "artifacts/${REV_NAME}.apk"
+cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}${BUILD_TYPE_UPPER}"/"app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.aab" \
+  "artifacts/${REV_NAME}.aab"

.ci/scripts/clang/docker.sh

@@ -0,0 +1,32 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2021 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Exit on error, rather than continuing with the rest of the script.
+set -e
+
+ccache -s
+
+mkdir build || true && cd build
+cmake .. \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
+      -DCMAKE_CXX_COMPILER=/usr/lib/ccache/clang++ \
+      -DCMAKE_C_COMPILER=/usr/lib/ccache/clang \
+      -DCMAKE_INSTALL_PREFIX="/usr" \
+      -DDISPLAY_VERSION=$1 \
+      -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
+      -DENABLE_QT_TRANSLATION=ON \
+      -DUSE_DISCORD_PRESENCE=ON \
+      -DCITRON_CRASH_DUMPS=ON \
+      -DCITRON_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
+      -DCITRON_USE_BUNDLED_FFMPEG=ON \
+      -GNinja
+
+ninja
+
+ccache -s
+
+ctest -VV -C Release
+

.ci/scripts/clang/exec.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2021 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+mkdir -p "ccache"  || true
+chmod a+x ./.ci/scripts/clang/docker.sh
+# the UID for the container citron user is 1027
+sudo chown -R 1027 ./
+docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/citron/ccache -v "$(pwd):/citron" -w /citron yuzu-emu-mirror/build-environments:linux-fresh /bin/bash /citron/.ci/scripts/clang/docker.sh "$1"
+sudo chown -R $UID ./

.ci/scripts/clang/upload.sh

@@ -0,0 +1,23 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. .ci/scripts/common/pre-upload.sh
+
+REV_NAME="citron-linux-clang-${GITDATE}-${GITREV}"
+ARCHIVE_NAME="${REV_NAME}.tar.xz"
+COMPRESSION_FLAGS="-cJvf"
+
+if [ "${RELEASE_NAME}" = "stable" ]; then
+    DIR_NAME="${REV_NAME}"
+else
+    DIR_NAME="${REV_NAME}_${RELEASE_NAME}"
+fi
+
+mkdir -p $DIR_NAME
+
+cp build/bin/citron "$DIR_NAME"
+cp build/bin/citron-cmd "$DIR_NAME"
+
+. .ci/scripts/common/post-upload.sh

.ci/scripts/common/post-upload.sh

@@ -0,0 +1,20 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Copy documentation
+cp LICENSE.txt "$DIR_NAME"
+cp README.md "$DIR_NAME"
+
+if [[ -z "${NO_SOURCE_PACK}" ]]; then
+  git clone --depth 1 file://$(readlink -e .) ${REV_NAME}-source
+  tar -cJvf "${REV_NAME}-source.tar.xz" ${REV_NAME}-source
+  cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME"
+  cp -v "${REV_NAME}-source.tar.xz" "${ARTIFACTS_DIR}/"
+fi
+
+tar $COMPRESSION_FLAGS "$ARCHIVE_NAME" "$DIR_NAME"
+
+# move the compiled archive into the artifacts directory to be uploaded by travis releases
+mv "$ARCHIVE_NAME" "${ARTIFACTS_DIR}/"

.ci/scripts/common/pre-upload.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
+GITREV="`git show -s --format='%h'`"
+ARTIFACTS_DIR="$PWD/artifacts"
+
+mkdir -p "${ARTIFACTS_DIR}/"

.ci/scripts/format/docker.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Run clang-format
+cd /citron
+chmod a+x ./.ci/scripts/format/script.sh
+./.ci/scripts/format/script.sh

.ci/scripts/format/exec.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+chmod a+x ./.ci/scripts/format/docker.sh
+# the UID for the container citron user is 1027
+sudo chown -R 1027 ./
+docker run -v "$(pwd):/citron" -w /citron yuzu-emu-mirror/build-environments:linux-clang-format /bin/bash -ex /citron/.ci/scripts/format/docker.sh
+sudo chown -R $UID ./

.ci/scripts/format/script.sh

@@ -0,0 +1,37 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+shopt -s nullglob globstar
+
+if git grep -nrI '\s$' src **/*.yml **/*.txt **/*.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop dist/*.svg dist/*.xml; then
+    echo Trailing whitespace found, aborting
+    exit 1
+fi
+
+# Default clang-format points to default 3.5 version one
+CLANG_FORMAT="${CLANG_FORMAT:-clang-format-15}"
+"$CLANG_FORMAT" --version
+
+# Turn off tracing for this because it's too verbose
+set +x
+
+# Check everything for branch pushes
+FILES_TO_LINT="$(find src/ -name '*.cpp' -or -name '*.h')"
+
+for f in $FILES_TO_LINT; do
+    echo "$f"
+    "$CLANG_FORMAT" -i "$f"
+done
+
+DIFF=$(git -c core.fileMode=false diff)
+
+if [ ! -z "$DIFF" ]; then
+    echo "!!! Not compliant to coding style, here is the fix:"
+    echo "$DIFF"
+    exit 1
+fi
+
+cd src/android
+./gradlew ktlintCheck

.ci/scripts/linux/docker.sh

@@ -0,0 +1,79 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Exit on error, rather than continuing with the rest of the script.
+set -e
+
+ccache -s
+
+mkdir build || true && cd build
+cmake .. \
+      -DBoost_USE_STATIC_LIBS=ON \
+      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+      -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
+      -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
+      -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \
+      -DCMAKE_INSTALL_PREFIX="/usr" \
+      -DDISPLAY_VERSION=$1 \
+      -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
+      -DENABLE_QT_TRANSLATION=ON \
+      -DUSE_DISCORD_PRESENCE=ON \
+      -DCITRON_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
+      -DCITRON_USE_BUNDLED_FFMPEG=ON \
+      -DCITRON_ENABLE_LTO=ON \
+      -DCITRON_CRASH_DUMPS=ON \
+      -GNinja
+
+ninja
+
+ccache -s
+
+ctest -VV -C Release
+
+# Separate debug symbols from specified executables
+for EXE in citron; do
+    EXE_PATH="bin/$EXE"
+    # Copy debug symbols out
+    objcopy --only-keep-debug $EXE_PATH $EXE_PATH.debug
+    # Add debug link and strip debug symbols
+    objcopy -g --add-gnu-debuglink=$EXE_PATH.debug $EXE_PATH $EXE_PATH.out
+    # Overwrite original with stripped copy
+    mv $EXE_PATH.out $EXE_PATH
+done
+# Strip debug symbols from all executables
+find bin/ -type f -not -regex '.*.debug' -exec strip -g {} ';'
+
+DESTDIR="$PWD/AppDir" ninja install
+rm -vf AppDir/usr/bin/citron-cmd AppDir/usr/bin/citron-tester
+
+# Download tools needed to build an AppImage
+wget -nc https://raw.githubusercontent.com/yuzu-emu-mirror/ext-linux-bin/main/appimage/deploy-linux.sh || wget -nc https://raw.githubusercontent.com/AppImage/AppImageKit/master/appimagetool/deploy-linux.sh
+wget -nc https://raw.githubusercontent.com/yuzu-emu-mirror/AppImageKit-checkrt/old/AppRun.sh || wget -nc https://raw.githubusercontent.com/darealshinji/AppImageKit-checkrt/master/AppRun.sh
+wget -nc https://github.com/yuzu-emu-mirror/ext-linux-bin/raw/main/appimage/exec-x86_64.so || wget -nc https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so
+# Set executable bit
+chmod 755 \
+    deploy-linux.sh \
+    AppRun.sh \
+    exec-x86_64.so
+
+# Workaround for https://github.com/AppImage/AppImageKit/issues/828
+export APPIMAGE_EXTRACT_AND_RUN=1
+
+mkdir -p AppDir/usr/optional
+mkdir -p AppDir/usr/optional/libstdc++
+mkdir -p AppDir/usr/optional/libgcc_s
+
+# Deploy citron's needed dependencies
+DEPLOY_QT=1 ./deploy-linux.sh AppDir/usr/bin/citron AppDir
+
+# Workaround for libQt5MultimediaGstTools indirectly requiring libwayland-client and breaking Vulkan usage on end-user systems
+find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print
+
+# Workaround for building citron with GCC 10 but also trying to distribute it to Ubuntu 18.04 et al.
+# See https://github.com/darealshinji/AppImageKit-checkrt
+cp exec-x86_64.so AppDir/usr/optional/exec.so
+cp AppRun.sh AppDir/AppRun
+cp --dereference /usr/lib/x86_64-linux-gnu/libstdc++.so.6 AppDir/usr/optional/libstdc++/libstdc++.so.6
+cp --dereference /lib/x86_64-linux-gnu/libgcc_s.so.1 AppDir/usr/optional/libgcc_s/libgcc_s.so.1

.ci/scripts/linux/exec.sh

@@ -0,0 +1,16 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+mkdir -p "ccache"  || true
+chmod a+x ./.ci/scripts/linux/docker.sh
+# the UID for the container citron user is 1027
+sudo chown -R 1027 ./
+
+# The environment variables listed below:
+# AZURECIREPO TITLEBARFORMATIDLE TITLEBARFORMATRUNNING DISPLAYVERSION
+#  are requested in src/common/CMakeLists.txt and appear to be provided somewhere in Azure DevOps
+
+docker run -e AZURECIREPO -e TITLEBARFORMATIDLE -e TITLEBARFORMATRUNNING -e DISPLAYVERSION -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/citron/ccache -v "$(pwd):/citron" -w /citron yuzu-emu-mirror/build-environments:linux-fresh /bin/bash /citron/.ci/scripts/linux/docker.sh "$1"
+sudo chown -R $UID ./

.ci/scripts/linux/upload.sh

@@ -0,0 +1,67 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. .ci/scripts/common/pre-upload.sh
+
+APPIMAGE_NAME="citron-${RELEASE_NAME}-${GITDATE}-${GITREV}.AppImage"
+BASE_NAME="citron-linux"
+REV_NAME="${BASE_NAME}-${GITDATE}-${GITREV}"
+ARCHIVE_NAME="${REV_NAME}.tar.xz"
+COMPRESSION_FLAGS="-cJvf"
+
+if [ "${RELEASE_NAME}" = "stable" ] || [ "${RELEASE_NAME}" = "canary" ]; then
+    DIR_NAME="${BASE_NAME}-${RELEASE_NAME}"
+else
+    DIR_NAME="${REV_NAME}-${RELEASE_NAME}"
+fi
+
+mkdir "$DIR_NAME"
+
+cp build/bin/citron-cmd "$DIR_NAME"
+if [ "${RELEASE_NAME}" != "canary" ] && [ "${RELEASE_NAME}" != "stable" ]; then
+    cp build/bin/citron "$DIR_NAME"
+fi
+
+# Build an AppImage
+cd build
+
+wget -nc https://github.com/yuzu-emu-mirror/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage || wget -nc https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+chmod 755 appimagetool-x86_64.AppImage
+
+# if FUSE is not available, then fallback to extract and run
+if ! ./appimagetool-x86_64.AppImage --version; then
+    export APPIMAGE_EXTRACT_AND_RUN=1
+fi
+
+# Don't let AppImageLauncher ask to integrate EA
+if [ "${RELEASE_NAME}" = "stable" ] || [ "${RELEASE_NAME}" = "canary" ]; then
+    echo "X-AppImage-Integrate=false" >> AppDir/org.citron_emu.citron.desktop
+fi
+
+if [ "${RELEASE_NAME}" = "stable" ]; then
+    # Generate update information if releasing to stable
+    ./appimagetool-x86_64.AppImage -u "gh-releases-zsync|Citron-Project|Cit|latest|citron-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}"
+else
+    ./appimagetool-x86_64.AppImage AppDir "${APPIMAGE_NAME}"
+fi
+cd ..
+
+# Copy the AppImage and update info to the artifacts directory and avoid compressing it
+cp "build/${APPIMAGE_NAME}" "${ARTIFACTS_DIR}/"
+if [ -f "build/${APPIMAGE_NAME}.zsync" ]; then
+    cp "build/${APPIMAGE_NAME}.zsync" "${ARTIFACTS_DIR}/"
+fi
+
+# Copy the AppImage to the general release directory and remove git revision info
+if [ "${RELEASE_NAME}" = "stable" ] || [ "${RELEASE_NAME}" = "canary" ]; then
+    cp "build/${APPIMAGE_NAME}" "${DIR_NAME}/citron-${RELEASE_NAME}.AppImage"
+fi
+
+# Copy debug symbols to artifacts
+cd build/bin
+tar $COMPRESSION_FLAGS "${ARTIFACTS_DIR}/${REV_NAME}-debug.tar.xz" *.debug
+cd -
+
+. .ci/scripts/common/post-upload.sh

.ci/scripts/merge/apply-patches-by-label-private.py

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Apply patches that are tagged with a specific label
+# Current labels include:
+# "canary merge benefit"
+
+import os
+import sys
+org = os.getenv("PRIVATEMERGEORG", "Citron-Project")
+base = os.getenv("PRIVATEMERGEBASE", "Cit")
+head = os.getenv("PRIVATEMERGEBASE", "Cit-canary")
+
+# We use different files for the 3 PR checkers.
+check_label_presence_file = ".ci/scripts/merge/check-label-presence.py"
+check_reviews_file = ".ci/scripts/merge/check-reviews-private.py"
+
+# python3 python_file org repo pr# label
+os.system(f"python3 .ci/scripts/merge/apply-patches-by-label.py {sys.argv[1]} {org} {base} {head} {check_label_presence_file} {check_reviews_file}")

.ci/scripts/merge/apply-patches-by-label.py

@@ -0,0 +1,60 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Apply patches that are tagged with a specific label
+# Current labels include:
+# "canary merge benefit"
+
+import json
+import os
+import sys
+import subprocess
+import re
+from urllib import request
+
+
+def get_pull_request_list(page=1):
+    url = f"https://api.github.com/repos/Citron-Project/Cit/pulls?page={page}"
+    headers = {'Accept': 'application/vnd.github.v3+json'}
+    token = os.environ.get('EARLY_ACCESS_TOKEN')
+    if token:
+        headers['Authorization'] = f'token {token}'
+    req = request.Request(url, headers=headers)
+    response = request.urlopen(req)
+    result = json.loads(response.read().decode('utf-8'))
+    if len(result) > 0:
+        return result + get_pull_request_list(page + 1)
+    return []
+
+
+seen = {}
+
+for pr in get_pull_request_list():
+    pn = pr['number']
+    if pn in seen:
+        continue
+    seen[pn] = True
+    print(subprocess.check_output(["git", "fetch", "https://github.com/Citron-Project/Cit.git", f"pull/{pn}/head:pr-{pn}", "-f", "--no-recurse-submodules"]))
+    out = subprocess.check_output(["python3", ".ci/scripts/merge/check-label-presence.py", str(pn), sys.argv[1]])
+    if b'true' in out:
+        print(f'Applying PR #{pn} matching label {sys.argv[1]}...')
+        try:
+            if b'changes requested' in subprocess.check_output(["python3", ".ci/scripts/merge/check-reviews.py", str(pn)]):
+                print(f'PR #{pn} has requested changes, skipping')
+                continue
+            else:
+                print(f'PR #{pn} has approving reviews, applying')
+        except:
+            print('Could not find any valid reviews, applying anyway')
+        try:
+            print(subprocess.check_output(["git", "merge", "--squash", f"pr-{pn}", "-m", f"Merge PR #{pn} tagged with: {sys.argv[1]}"]))
+        except:
+            print("Failed to merge cleanly, are there conflicts?")
+            exit(0)
+
+# Apply a tag to the EA release
+try:
+    print(subprocess.check_output(["git", "tag", "-f", f"canary/{sys.argv[1]}"]))
+except:
+    print("Failed to apply canary tag")
+    exit(0)

.ci/scripts/merge/check-label-presence.py

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Check if a pull request has a specific label
+# Usage: python3 check-label-presence.py <PR Number> <Label Text>
+
+import json, sys
+from urllib import request
+import os
+
+url = 'https://api.github.com/repos/Citron-Project/Cit/issues/%s' % sys.argv[1]
+headers = {'Accept': 'application/vnd.github.v3+json'}
+token = os.environ.get('EARLY_ACCESS_TOKEN')
+if token:
+    headers['Authorization'] = f'token {token}'
+req = request.Request(url, headers=headers)
+try:
+    response = request.urlopen(req)
+    j = json.loads(response.read().decode('utf-8'))
+    for label in j['labels']:
+        if label['name'] == sys.argv[2]:
+            print('true')
+            sys.exit(0)
+except Exception as e:
+    print(f'Error: {e}')
+print('false')
+sys.exit(1)

.ci/scripts/merge/citronbot-git-config.sh

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+git config --global user.email "zephyron@citron-emu.org"
+git config --global user.name "Zephyron"

.ci/scripts/transifex/docker.sh

@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+# SPDX-FileCopyrightText: 2021 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set -x
+
+echo -e "\e[1m\e[33mBuild tools information:\e[0m"
+cmake --version
+gcc -v
+tx --version
+
+mkdir build && cd build
+cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF -DCITRON_TESTS=OFF -DCITRON_USE_BUNDLED_VCPKG=ON
+make translation
+cd ..
+
+cd dist/languages
+tx push -s

.ci/scripts/windows/docker.sh

@@ -0,0 +1,66 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set -e
+
+#cd /citron
+
+ccache -sv
+
+mkdir -p build && cd build
+cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWCross.cmake" \
+    -DDISPLAY_VERSION="$1" \
+    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
+    -DENABLE_QT_TRANSLATION=ON \
+    -DUSE_CCACHE=ON \
+    -DCITRON_USE_BUNDLED_SDL2=OFF \
+    -DCITRON_USE_EXTERNAL_SDL2=OFF \
+    -DCITRON_TESTS=OFF \
+    -GNinja
+ninja citron citron-cmd
+
+ccache -sv
+
+echo "Tests skipped"
+#ctest -VV -C Release
+
+echo 'Prepare binaries...'
+cd ..
+mkdir package
+
+if [ -d "/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/" ]; then
+  QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins'
+else
+  #fallback to qt
+  QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins'
+fi
+
+find build/ -name "citron*.exe" -exec cp {} 'package' \;
+
+# copy Qt plugins
+mkdir package/platforms
+cp -v "${QT_PLUGINS_PATH}/platforms/qwindows.dll" package/platforms/
+cp -rv "${QT_PLUGINS_PATH}/mediaservice/" package/
+cp -rv "${QT_PLUGINS_PATH}/imageformats/" package/
+cp -rv "${QT_PLUGINS_PATH}/styles/" package/
+rm -f package/mediaservice/*d.dll
+
+for i in package/*.exe; do
+  # we need to process pdb here, however, cv2pdb
+  # does not work here, so we just simply strip all the debug symbols
+  x86_64-w64-mingw32-strip "${i}"
+done
+
+python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/"
+
+# copy FFmpeg libraries
+EXTERNALS_PATH="$(pwd)/build/externals"
+FFMPEG_DLL_PATH="$(find "${EXTERNALS_PATH}" -maxdepth 1 -type d | grep 'ffmpeg-')/bin"
+find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -nv {} package/ ';'
+
+# copy libraries from citron.exe path
+find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';'

.ci/scripts/windows/exec.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+mkdir -p "ccache" || true
+chmod a+x ./.ci/scripts/windows/docker.sh
+# the UID for the container citron user is 1027
+sudo chown -R 1027 ./
+docker run -e CCACHE_DIR=/citron/ccache -v "$(pwd):/citron" -w /citron yuzu-emu-mirror/build-environments:linux-mingw /bin/bash -ex /citron/.ci/scripts/windows/docker.sh "$1"
+sudo chown -R $UID ./

.ci/scripts/windows/install-vulkan-sdk.ps1

@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2023 citron Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+$ErrorActionPreference = "Stop"
+
+$VulkanSDKVer = "1.3.250.1"
+$ExeFile = "VulkanSDK-$VulkanSDKVer-Installer.exe"
+$Uri = "https://sdk.lunarg.com/sdk/download/$VulkanSDKVer/windows/$ExeFile"
+$Destination = "./$ExeFile"
+
+echo "Downloading Vulkan SDK $VulkanSDKVer from $Uri"
+$WebClient = New-Object System.Net.WebClient
+$WebClient.DownloadFile($Uri, $Destination)
+echo "Finished downloading $ExeFile"
+
+$VULKAN_SDK = "C:/VulkanSDK/$VulkanSDKVer"
+$Arguments = "--root `"$VULKAN_SDK`" --accept-licenses --default-answer --confirm-command install"
+
+echo "Installing Vulkan SDK $VulkanSDKVer"
+$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -Wait -ArgumentList $Arguments
+$ExitCode = $InstallProcess.ExitCode
+
+if ($ExitCode -ne 0) {
+    echo "Error installing Vulkan SDK $VulkanSDKVer (Error: $ExitCode)"
+    Exit $ExitCode
+}
+
+echo "Finished installing Vulkan SDK $VulkanSDKVer"
+
+if ("$env:GITHUB_ACTIONS" -eq "true") {
+    echo "VULKAN_SDK=$VULKAN_SDK" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+    echo "$VULKAN_SDK/Bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+}

.ci/scripts/windows/scan_dll.py

@@ -0,0 +1,109 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import pefile
+import sys
+import re
+import os
+import queue
+import shutil
+
+# constant definitions
+KNOWN_SYS_DLLS = ['WINMM.DLL', 'MSVCRT.DLL', 'VERSION.DLL', 'MPR.DLL',
+                  'DWMAPI.DLL', 'UXTHEME.DLL', 'DNSAPI.DLL', 'IPHLPAPI.DLL']
+# below is for Ubuntu 18.04 with specified PPA enabled, if you are using
+# other distro or different repositories, change the following accordingly
+DLL_PATH = [
+    '/usr/x86_64-w64-mingw32/bin/',
+    '/usr/x86_64-w64-mingw32/lib/',
+    '/usr/lib/gcc/x86_64-w64-mingw32/7.3-posix/'
+]
+
+missing = []
+
+
+def parse_imports(file_name):
+    results = []
+    pe = pefile.PE(file_name, fast_load=True)
+    pe.parse_data_directories()
+
+    for entry in pe.DIRECTORY_ENTRY_IMPORT:
+        current = entry.dll.decode()
+        current_u = current.upper()  # b/c Windows is often case insensitive
+        # here we filter out system dlls
+        # dll w/ names like *32.dll are likely to be system dlls
+        if current_u.upper() not in KNOWN_SYS_DLLS and not re.match(string=current_u, pattern=r'.*32\.DLL'):
+            results.append(current)
+
+    return results
+
+
+def parse_imports_recursive(file_name, path_list=[]):
+    q = queue.Queue()  # create a FIFO queue
+    # file_name can be a string or a list for the convenience
+    if isinstance(file_name, str):
+        q.put(file_name)
+    elif isinstance(file_name, list):
+        for i in file_name:
+            q.put(i)
+    full_list = []
+    while q.qsize():
+        current = q.get_nowait()
+        print('> %s' % current)
+        deps = parse_imports(current)
+        # if this dll does not have any import, ignore it
+        if not deps:
+            continue
+        for dep in deps:
+            # the dependency already included in the list, skip
+            if dep in full_list:
+                continue
+            # find the requested dll in the provided paths
+            full_path = find_dll(dep)
+            if not full_path:
+                missing.append(dep)
+                continue
+            full_list.append(dep)
+            q.put(full_path)
+            path_list.append(full_path)
+    return full_list
+
+
+def find_dll(name):
+    for path in DLL_PATH:
+        for root, _, files in os.walk(path):
+            for f in files:
+                if name.lower() == f.lower():
+                    return os.path.join(root, f)
+
+
+def deploy(name, dst, dry_run=False):
+    dlls_path = []
+    parse_imports_recursive(name, dlls_path)
+    for dll_entry in dlls_path:
+        if not dry_run:
+            shutil.copy(dll_entry, dst)
+        else:
+            print('[Dry-Run] Copy %s to %s' % (dll_entry, dst))
+    print('Deploy completed.')
+    return dlls_path
+
+
+def main():
+    if len(sys.argv) < 3:
+        print('Usage: %s [files to examine ...] [target deploy directory]')
+        return 1
+    to_deploy = sys.argv[1:-1]
+    tgt_dir = sys.argv[-1]
+    if not os.path.isdir(tgt_dir):
+        print('%s is not a directory.' % tgt_dir)
+        return 1
+    print('Scanning dependencies...')
+    deploy(to_deploy, tgt_dir)
+    if missing:
+        print('Following DLLs are not found: %s' % ('\n'.join(missing)))
+    return 0
+
+
+if __name__ == '__main__':
+    main()

.ci/scripts/windows/upload.ps1

@@ -0,0 +1,118 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+param($BUILD_NAME)
+
+$GITDATE = $(git show -s --date=short --format='%ad') -replace "-", ""
+$GITREV = $(git show -s --format='%h')
+
+if ("$BUILD_NAME" -eq "stable") {
+    $RELEASE_DIST = "citron-stable-msvc"
+}
+else {
+    $RELEASE_DIST = "citron-windows-msvc-$BUILD_NAME"
+}
+
+$MSVC_BUILD_ZIP = "citron-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", ""
+$MSVC_BUILD_PDB = "citron-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", ""
+$MSVC_SEVENZIP = "citron-windows-msvc-$GITDATE-$GITREV.7z" -replace " ", ""
+$MSVC_TAR = "citron-windows-msvc-$GITDATE-$GITREV.tar" -replace " ", ""
+$MSVC_TARXZ = "citron-windows-msvc-$GITDATE-$GITREV.tar.xz" -replace " ", ""
+$MSVC_SOURCE = "citron-windows-msvc-source-$GITDATE-$GITREV" -replace " ", ""
+$MSVC_SOURCE_TAR = "$MSVC_SOURCE.tar"
+$MSVC_SOURCE_TARXZ = "$MSVC_SOURCE_TAR.xz"
+
+$env:BUILD_ZIP = $MSVC_BUILD_ZIP
+$env:BUILD_SYMBOLS = $MSVC_BUILD_PDB
+$env:BUILD_UPDATE = $MSVC_SEVENZIP
+
+if (Test-Path -Path ".\build\bin\Release") {
+    $BUILD_DIR = ".\build\bin\Release"
+} else {
+    $BUILD_DIR = ".\build\bin\"
+}
+
+# Cleanup unneeded data in submodules
+git submodule foreach git clean -fxd
+
+# Upload debugging symbols
+mkdir pdb
+Get-ChildItem "$BUILD_DIR\" -Recurse -Filter "*.pdb" | Copy-Item -destination .\pdb
+7z a -tzip $MSVC_BUILD_PDB .\pdb\*.pdb
+rm "$BUILD_DIR\*.pdb"
+
+# Create artifact directories
+mkdir $RELEASE_DIST
+mkdir $MSVC_SOURCE
+mkdir "artifacts"
+
+$CURRENT_DIR = Convert-Path .
+
+# Build a tar.xz for the source of the release
+git clone --depth 1 file://$CURRENT_DIR $MSVC_SOURCE
+7z a -r -ttar $MSVC_SOURCE_TAR $MSVC_SOURCE
+7z a -r -txz $MSVC_SOURCE_TARXZ $MSVC_SOURCE_TAR
+
+# Following section is quick hack to package artifacts differently for GitHub Actions
+if ("$env:GITHUB_ACTIONS" -eq "true") {
+    echo "Hello GitHub Actions"
+
+    # With vcpkg we now have a few more dll files
+    ls .\build\bin\*.dll
+    cp .\build\bin\*.dll .\artifacts\
+
+    # Hopefully there is an exe in either .\build\bin or .\build\bin\Release
+    cp .\build\bin\citron*.exe .\artifacts\
+    Copy-Item "$BUILD_DIR\*" -Destination "artifacts" -Recurse
+    Remove-Item .\artifacts\tests.exe -ErrorAction ignore
+
+    # None of the other GHA builds are including source, so commenting out today
+    #Copy-Item $MSVC_SOURCE_TARXZ -Destination "artifacts"
+
+    # Debugging symbols
+    cp .\build\bin\citron*.pdb .\artifacts\
+
+    # Write out a tag BUILD_TAG to environment for the Upload step
+    # We're getting ${{ github.event.number }} as $env:PR_NUMBER"
+    echo "env:PR_NUMBER: $env:PR_NUMBER"
+    if (Test-Path env:PR_NUMBER) {
+        $PR_NUMBER = $env:PR_NUMBER.Substring(2) -as [int]
+        $PR_NUMBER_TAG = "pr"+([string]$PR_NUMBER).PadLeft(5,'0')
+        if ($PR_NUMBER -gt 1){
+            $BUILD_TAG="verify-$PR_NUMBER_TAG-$GITDATE-$GITREV"
+        } else {
+            $BUILD_TAG = "verify-$GITDATE-$GITREV"
+        }
+    } else {
+        # If env:PR_NUMBER isn't set, we should still write out a variable
+        $BUILD_TAG = "verify-$GITDATE-$GITREV"
+    }
+    echo "BUILD_TAG=$BUILD_TAG"
+    echo "BUILD_TAG=$BUILD_TAG" >> $env:GITHUB_ENV
+
+    # For extra job, just the exe
+    $INDIVIDUAL_EXE = "citron-msvc-$BUILD_TAG.exe"
+    echo "INDIVIDUAL_EXE=$INDIVIDUAL_EXE"
+    echo "INDIVIDUAL_EXE=$INDIVIDUAL_EXE" >> $env:GITHUB_ENV
+    echo "Just the exe: $INDIVIDUAL_EXE"
+    cp .\artifacts\citron.exe .\$INDIVIDUAL_EXE
+
+
+} else {
+
+# Build the final release artifacts
+Copy-Item $MSVC_SOURCE_TARXZ -Destination $RELEASE_DIST
+Copy-Item "$BUILD_DIR\*" -Destination $RELEASE_DIST -Recurse
+rm "$RELEASE_DIST\*.exe"
+Get-ChildItem "$BUILD_DIR" -Recurse -Filter "citron*.exe" | Copy-Item -destination $RELEASE_DIST
+Get-ChildItem "$BUILD_DIR" -Recurse -Filter "QtWebEngineProcess*.exe" | Copy-Item -destination $RELEASE_DIST
+7z a -tzip $MSVC_BUILD_ZIP $RELEASE_DIST\*
+7z a $MSVC_SEVENZIP $RELEASE_DIST
+
+7z a -r -ttar $MSVC_TAR $RELEASE_DIST
+7z a -r -txz $MSVC_TARXZ $MSVC_TAR
+
+Get-ChildItem . -Filter "*.zip" | Copy-Item -destination "artifacts"
+Get-ChildItem . -Filter "*.7z" | Copy-Item -destination "artifacts"
+Get-ChildItem . -Filter "*.tar.xz" | Copy-Item -destination "artifacts"
+}

.ci/scripts/windows/upload.sh

@@ -0,0 +1,28 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. .ci/scripts/common/pre-upload.sh
+
+REV_NAME="citron-windows-${GITDATE}-${GITREV}"
+ARCHIVE_NAME="${REV_NAME}.tar.xz"
+COMPRESSION_FLAGS="-cJvf"
+
+if [ "${RELEASE_NAME}" = "stable" ]; then
+    DIR_NAME="${REV_NAME}"
+else
+    DIR_NAME="${REV_NAME}_${RELEASE_NAME}"
+fi
+
+mkdir "$DIR_NAME"
+# get around the permission issues
+cp -r package/* "$DIR_NAME"
+
+if [ "${RELEASE_NAME}" = "stable" ]; then
+    MSVC_BUILD_ZIP="citron-stable-msvc.zip"
+else
+    MSVC_BUILD_ZIP="${REV_NAME}-msvc.zip"
+fi
+
+. .ci/scripts/common/post-upload.sh

.ci/templates/build-mock.yml

@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+steps:
+  - script: mkdir artifacts || echo 'X' > artifacts/T1.txt
+  - publish: artifacts
+    artifact: 'citron-$(BuildName)-mock'
+    displayName: 'Upload Artifacts'

.ci/templates/build-msvc.yml

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+parameters:
+  artifactSource: 'true'
+  cache: 'false'
+  version: ''
+
+steps:
+- task: Powershell@2
+  displayName: 'Install Vulkan SDK'
+  inputs:
+    targetType: 'filePath'
+    filePath: './.ci/scripts/windows/install-vulkan-sdk.ps1'
+- script: refreshenv && glslangValidator --version && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DCITRON_ENABLE_LTO=ON -DCITRON_USE_BUNDLED_QT=1 -DCITRON_USE_BUNDLED_SDL2=1 -DCITRON_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCITRON_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DCITRON_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DCITRON_CRASH_DUMPS=ON .. && cd ..
+  displayName: 'Configure CMake'
+- task: MSBuild@1
+  displayName: 'Build'
+  inputs:
+    solution: 'build/citron.sln'
+    maximumCpuCount: true
+    configuration: release
+- task: PowerShell@2
+  displayName: 'Package Artifacts'
+  inputs:
+    targetType: 'filePath'
+    filePath: './.ci/scripts/windows/upload.ps1'
+    arguments: '$(BuildName)'
+- publish: artifacts
+  artifact: 'citron-$(BuildName)-windows-msvc'
+  displayName: 'Upload Artifacts'

.ci/templates/build-single.yml

@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+parameters:
+  artifactSource: 'true'
+  cache: 'false'
+  version: ''
+
+steps:
+- task: DockerInstaller@0
+  displayName: 'Prepare Environment'
+  inputs:
+    dockerVersion: '17.09.0-ce'
+- task: CacheBeta@0
+  displayName: 'Cache Build System'
+  inputs:
+    key: citron-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix)
+    path: $(System.DefaultWorkingDirectory)/ccache
+    cacheHitVar: CACHE_RESTORED
+- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh ${{ parameters['version'] }}
+  displayName: 'Build'
+- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh
+  displayName: 'Package Artifacts'
+- publish: artifacts
+  artifact: 'citron-$(BuildName)-$(BuildSuffix)'
+  displayName: 'Upload Artifacts'

.ci/templates/build-standard.yml

@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+parameters:
+  version: ''
+
+jobs:
+- job: build
+  displayName: 'standard'
+  pool:
+    vmImage: ubuntu-latest
+  strategy:
+    maxParallel: 10
+    matrix:
+      windows:
+        BuildSuffix: 'windows-mingw'
+        ScriptFolder: 'windows'
+      clang:
+        BuildSuffix: 'clang'
+        ScriptFolder: 'clang'
+      linux:
+        BuildSuffix: 'linux'
+        ScriptFolder: 'linux'
+  steps:
+  - template: ./sync-source.yml
+    parameters:
+      artifactSource: $(parameters.artifactSource)
+      needSubmodules: 'true'
+  - template: ./build-single.yml
+    parameters:
+      artifactSource: 'false'
+      cache: $(parameters.cache)
+      version: $(parameters.version)

.ci/templates/build-testing.yml

@@ -0,0 +1,40 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+parameters:
+  version: ''
+
+jobs:
+- job: build_test
+  displayName: 'testing'
+  pool:
+    vmImage: ubuntu-latest
+  strategy:
+    maxParallel: 5
+    matrix:
+      windows:
+        BuildSuffix: 'windows-testing'
+        ScriptFolder: 'windows'
+  steps:
+  - script: sudo apt-get update && sudo apt-get --only-upgrade -y install python3-pip && pip install requests urllib3
+    displayName: 'Prepare Environment'
+  - task: PythonScript@0
+    condition: eq(variables['Build.Reason'], 'PullRequest')
+    displayName: 'Determine Testing Status'
+    inputs:
+      scriptSource: 'filePath'
+      scriptPath: '.ci/scripts/merge/check-label-presence.py'
+      arguments: '$(System.PullRequest.PullRequestNumber) create-testing-build'
+  - ${{ if eq(variables.enabletesting, 'true') }}:
+    - template: ./sync-source.yml
+      parameters:
+        artifactSource: $(parameters.artifactSource)
+        needSubmodules: 'true'
+    - template: ./mergebot.yml
+      parameters:
+        matchLabel: 'testing-merge'
+    - template: ./build-single.yml
+      parameters:
+        artifactSource: 'false'
+        cache: 'false'
+        version: $(parameters.version)

.ci/templates/format-check.yml

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+parameters:
+  artifactSource: 'true'
+
+steps:
+- template: ./sync-source.yml
+  parameters:
+    artifactSource: $(parameters.artifactSource)
+    needSubmodules: 'false'
+- task: DockerInstaller@0
+  displayName: 'Prepare Environment'
+  inputs:
+    dockerVersion: '17.09.0-ce'
+- script: chmod a+x ./.ci/scripts/format/exec.sh && ./.ci/scripts/format/exec.sh
+  displayName: 'Verify Formatting'

.ci/templates/merge-private.yml

@@ -0,0 +1,44 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+jobs:
+- job: merge
+  displayName: 'pull requests'
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - checkout: self
+    submodules: recursive
+  - template: ./mergebot-private.yml
+    parameters:
+      matchLabel: '$(BuildName)-merge'
+      matchLabelPublic: '$(PublicBuildName)-merge'
+  - task: ArchiveFiles@2
+    displayName: 'Package Source'
+    inputs:
+      rootFolderOrFile: '$(System.DefaultWorkingDirectory)'
+      includeRootFolder: false
+      archiveType: '7z'
+      archiveFile: '$(Build.ArtifactStagingDirectory)/citron-$(BuildName)-source.7z'
+  - task: PublishPipelineArtifact@1
+    displayName: 'Upload Artifacts'
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)/citron-$(BuildName)-source.7z'
+      artifact: 'citron-$(BuildName)-source'
+      replaceExistingArchive: true
+- job: upload_source
+  displayName: 'upload'
+  dependsOn: merge
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - template: ./sync-source.yml
+    parameters:
+      artifactSource: 'true'
+      needSubmodules: 'true'
+  - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/citronbot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/citronbot-git-config.sh
+    displayName: 'Apply Git Configuration'
+  - script: git remote add other $(GitRepoPushChangesURL)
+    displayName: 'Register Repository'
+  - script: git push --force other HEAD:$(GitPushBranch)
+    displayName: 'Update Code'

.ci/templates/merge.yml

@@ -0,0 +1,43 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+jobs:
+- job: merge
+  displayName: 'pull requests'
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - checkout: self
+    submodules: recursive
+  - template: ./mergebot.yml
+    parameters:
+      matchLabel: '$(BuildName)-merge'
+  - task: ArchiveFiles@2
+    displayName: 'Package Source'
+    inputs:
+      rootFolderOrFile: '$(System.DefaultWorkingDirectory)'
+      includeRootFolder: false
+      archiveType: '7z'
+      archiveFile: '$(Build.ArtifactStagingDirectory)/citron-$(BuildName)-source.7z'
+  - task: PublishPipelineArtifact@1
+    displayName: 'Upload Artifacts'
+    inputs:
+      targetPath: '$(Build.ArtifactStagingDirectory)/citron-$(BuildName)-source.7z'
+      artifact: 'citron-$(BuildName)-source'
+      replaceExistingArchive: true
+- job: upload_source
+  displayName: 'upload'
+  dependsOn: merge
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - template: ./sync-source.yml
+    parameters:
+      artifactSource: 'true'
+      needSubmodules: 'true'
+  - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/citronbot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/citronbot-git-config.sh
+    displayName: 'Apply Git Configuration'
+  - script: git remote add other $(GitRepoPushChangesURL)
+    displayName: 'Register Repository'
+  - script: git push --force other HEAD:$(GitPushBranch)
+    displayName: 'Update Code'

.ci/templates/mergebot-private.yml

@@ -0,0 +1,41 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+parameters:
+  matchLabel: 'dummy-merge'
+  matchLabelPublic: 'dummy-merge'
+
+steps:
+  - checkout: self
+    fetchDepth: 1
+    submodules: false
+  - task: PythonScript@0
+    displayName: 'Generate Merge Config'
+    inputs:
+      scriptSource: 'inline'
+      script: '${{ parameters.createMergeConfigScript }}'
+  - task: PythonScript@0
+    displayName: 'Discover, Download, and Apply Patches (Stable)'
+    inputs:
+      scriptSource: 'filePath'
+      scriptPath: '.ci/scripts/merge/apply-patches-by-label-private.py'
+      arguments: $(publicLabel)
+      workingDirectory: '$(Build.SourcesDirectory)'
+  - task: PythonScript@0
+    displayName: 'Discover, Download, and Apply Patches (Canary Public)'
+    inputs:
+      scriptSource: 'filePath'
+      scriptPath: '.ci/scripts/merge/apply-patches-by-label-private.py'
+      arguments: $(supporterPublicLabel)
+      workingDirectory: '$(Build.SourcesDirectory)'
+  - task: PythonScript@0
+    displayName: 'Discover, Download, and Apply Patches (Canary Private)'
+    inputs:
+      scriptSource: 'filePath'
+      scriptPath: '.ci/scripts/merge/apply-patches-by-label-private.py'
+      arguments: $(supporterPrivateLabel)
+      workingDirectory: '$(Build.SourcesDirectory)'
+  - script: |
+      echo '##vso[task.setvariable variable=DisplayPrefix]$(tagPrefix)'
+      git rev-parse HEAD
+    displayName: 'Set Version Number'

.ci/templates/mergebot.yml

@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+parameters:
+  matchLabel: 'dummy-merge'
+
+steps:
+  - script: mkdir $(System.DefaultWorkingDirectory)/patches && pip install requests urllib3
+    displayName: 'Prepare Environment'
+  - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/citronbot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/citronbot-git-config.sh
+    displayName: 'Apply Git Configuration'
+  - task: PythonScript@0
+    displayName: 'Discover, Download, and Apply Patches'
+    inputs:
+      scriptSource: 'filePath'
+      scriptPath: '.ci/scripts/merge/apply-patches-by-label.py'
+      arguments: '${{ parameters.matchLabel }} Tagged patches'
+      workingDirectory: '$(System.DefaultWorkingDirectory)'

.ci/templates/release-download.yml

@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+steps:
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download Windows Release'
+    inputs:
+      artifactName: 'citron-$(BuildName)-windows-msvc'
+      buildType: 'current'
+      targetPath: '$(Build.ArtifactStagingDirectory)'
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download Linux Release'
+    inputs:
+      artifactName: 'citron-$(BuildName)-linux'
+      buildType: 'current'
+      targetPath: '$(Build.ArtifactStagingDirectory)'
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download Android Release'
+    inputs:
+      artifactName: 'citron-$(BuildName)-android'
+      buildType: 'current'
+      targetPath: '$(Build.ArtifactStagingDirectory)'

.ci/templates/release-github.yml

@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+steps:
+  - template: ./release-download.yml
+  - task: GitHubRelease@0
+    displayName: 'GitHub Release'
+    inputs:
+      action: 'create'
+      title: '$(ReleasePrefix) $(DisplayVersion)'
+      assets: '$(Build.ArtifactStagingDirectory)/*'
+      gitHubConnection: CI_RELEASE_TOKEN
+      repositoryName: 'Citron-Project/Cit'
+      target: '$(Build.SourceVersion)'
+      tagSource: manual
+      tag: $(BuildName)-$(DisplayPrefix)-$(DisplayVersion)
+      addChangeLog: true
+      isDraft: false

.ci/templates/release-private-tag.yml

@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+steps:
+  - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/citronbot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/citronbot-git-config.sh
+    displayName: 'Apply Git Configuration'
+  - script: git tag -a $(BuildName)-$(DisplayPrefix)-$(DisplayVersion) -m "citron $(BuildName) $(Build.BuildNumber) $(Build.DefinitionName) $(DisplayPrefix)-$(DisplayVersion)"
+    displayName: 'Tag Source'
+  - script: git remote add other $(GitRepoPushChangesURL)
+    displayName: 'Register Repository'
+  - script: git push other $(BuildName)-$(DisplayPrefix)-$(DisplayVersion)
+    displayName: 'Update Code'

.ci/templates/release-universal.yml

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+steps:
+  - template: ./release-download.yml
+  - task: UniversalPackages@0
+    displayName: Publish Artifacts
+    inputs:
+      command: publish
+      publishDirectory: '$(Build.ArtifactStagingDirectory)'
+      vstsFeedPublish: 'citron-$(BuildName)'
+      vstsFeedPackagePublish: 'main'
+      packagePublishDescription: 'Citron Windows and Linux Executable Packages'

.ci/templates/retrieve-artifact-source.yml

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+steps:
+- checkout: none
+- task: DownloadPipelineArtifact@2
+  displayName: 'Download Source'
+  inputs:
+    artifactName: 'citron-$(BuildName)-source'
+    buildType: 'current'
+    targetPath: '$(Build.ArtifactStagingDirectory)'
+- script: rm -rf $(System.DefaultWorkingDirectory) && mkdir $(System.DefaultWorkingDirectory)
+  displayName: 'Clean Working Directory'
+- task: ExtractFiles@1
+  displayName: 'Prepare Source'
+  inputs:
+    archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/*.7z'
+    destinationFolder: '$(System.DefaultWorkingDirectory)'
+    cleanDestinationFolder: false

.ci/templates/retrieve-master-source.yml

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+parameters:
+  needSubmodules: 'true'
+
+steps:
+- checkout: self
+  displayName: 'Checkout Recursive'
+  submodules: recursive
+#  condition: eq(parameters.needSubmodules, 'true')
+#- checkout: self
+#  displayName: 'Checkout Fast'
+#  condition: ne(parameters.needSubmodules, 'true')

.ci/templates/sync-source.yml

@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2019 citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+steps:
+- ${{ if eq(parameters.artifactSource, 'true') }}:
+  - template: ./retrieve-artifact-source.yml
+- ${{ if ne(parameters.artifactSource, 'true') }}:
+  - template: ./retrieve-master-source.yml
+    parameters:
+      needSubmodules: $(parameters.needSubmodules)

.github/ISSUE_TEMPLATE/blank_issue_template.yml

@@ -0,0 +1,10 @@
+name: New Issue (Developers Only)
+description: A blank issue template for developers only. If you are not a developer, do not use this issue template. Your issue WILL BE CLOSED if you do not use the appropriate issue template.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **If you are not a developer, do not use this issue template. Your issue WILL BE CLOSED if you do not use the appropriate issue template.**
+  - type: textarea
+    attributes:
+      label: "Issue"

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,64 @@
+name: Bug Report
+description: File a bug report
+body:
+  - type: markdown
+    attributes:
+      value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with yuzu.
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+      - label: I have searched the existing issues
+        required: true
+  - type: input
+    attributes:
+      label: Affected Build(s)
+      description: List the affected build(s) that this issue applies to.
+      placeholder: Mainline 1234 / Early Access 1234
+    validations:
+      required: true
+  - type: textarea
+    id: issue-desc
+    attributes:
+      label: Description of Issue
+      description: A brief description of the issue encountered along with any images and/or videos.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: A brief description of how it is expected to work along with any images and/or videos.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Reproduction Steps
+      description: A brief explanation of how to reproduce this issue. If possible, provide a save file to aid in reproducing the issue.
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Log File
+      description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://yuzu-emu.org/help/reference/log-files).
+    validations:
+      required: true
+  - type: textarea
+    id: system-config
+    attributes:
+      label: System Configuration
+      placeholder: |
+        CPU: Intel i5-10400 / AMD Ryzen 5 3600
+        GPU/Driver: NVIDIA GeForce GTX 1060 (Driver 512.95)
+        RAM: 16GB DDR4-3200
+        OS: Windows 11 22H2 (Build 22621.819)
+      value: |
+        CPU:
+        GPU/Driver:
+        RAM:
+        OS:
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: yuzu Discord
+    url: https://discord.com/invite/u77vRWY
+    about: If you are experiencing an issue with yuzu, and you need tech support, or if you have a general question, try asking in the official yuzu Discord linked here. Piracy is not allowed.
+  - name: Community forums
+    url: https://community.citra-emu.org
+    about: This is an alternative place for tech support, however helpers there are not as active.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,28 @@
+name: Feature Request
+description: File a feature request
+labels: "request"
+body:
+  - type: markdown
+    attributes:
+      value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make yuzu better.
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the feature you are requesting.
+      options:
+      - label: I have searched the existing issues
+        required: true
+  - type: textarea
+    id: what-feature
+    attributes:
+      label: What feature are you suggesting?
+      description: A brief description of the requested feature.
+    validations:
+      required: true
+  - type: textarea
+    id: why-feature
+    attributes:
+      label: Why would this feature be useful?
+      description: A brief description of why this feature would make yuzu better.
+    validations:
+      required: true

.github/workflows/android-build.yml

@@ -0,0 +1,80 @@
+# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+name: 'yuzu-android-build'
+
+on:
+  push:
+    tags: [ "*" ]
+
+jobs:
+  android:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'yuzu-emu/yuzu-android' }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Set up cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.ccache
+          key: ${{ runner.os }}-android-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-android-
+      - name: Query tag name
+        uses: olegtarasov/get-tag@v2.1.2
+        id: tagName
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
+      - name: Build
+        run: ./.ci/scripts/android/build.sh
+        env:
+          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+      - name: Copy artifacts
+        run: ./.ci/scripts/android/upload.sh
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: android
+          path: artifacts/
+  # release steps
+  release-android:
+    runs-on: ubuntu-latest
+    needs: [android]
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/download-artifact@v3
+      - name: Query tag name
+        uses: olegtarasov/get-tag@v2.1.2
+        id: tagName
+      - name: Create release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.tagName.outputs.tag }}
+          release_name: ${{ steps.tagName.outputs.tag }}
+          draft: false
+          prerelease: false
+      - name: Upload artifacts
+        uses: alexellis/upload-assets@0.2.3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          asset_paths: '["./**/*.apk","./**/*.aab"]'

.github/workflows/android-canary-play-release.yml

@@ -0,0 +1,66 @@
+# SPDX-FileCopyrightText: 2024 Citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+name: citron-android-canary-play-release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release-track:
+        description: 'Play store release track (internal/alpha/beta/production)'
+        required: true
+        default: 'alpha'
+
+jobs:
+  android:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'Citron-Project/Cit' }}
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout
+        with:
+          fetch-depth: 0
+          submodules: true
+          token: ${{ secrets.CI_RELEASE_TOKEN }}
+      - run: npm install execa@5
+      - uses: actions/github-script@v5
+        name: 'Merge and publish Android Canary changes'
+        env:
+          CI_RELEASE_TOKEN: ${{ secrets.CI_RELEASE_TOKEN }}
+          BUILD_CANARY: true
+        with:
+          script: |
+            const execa = require("execa");
+            const mergebot = require('./.github/workflows/android-merge.js').mergebot;
+            process.chdir('${{ github.workspace }}');
+            mergebot(github, context, execa);
+      - name: Get tag name
+        run: echo "GIT_TAG_NAME=$(cat tag-name.txt)" >> $GITHUB_ENV
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
+      - name: Build
+        run: ./.ci/scripts/android/canarybuild.sh
+        env:
+          CANARY_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
+          PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
+          PLAY_ANDROID_KEYSTORE_PASS: ${{ secrets.PLAY_ANDROID_KEYSTORE_PASS }}
+          CANARY_SERVICE_ACCOUNT_KEY_B64: ${{ secrets.CANARY_SERVICE_ACCOUNT_KEY_B64 }}
+          STORE_TRACK: ${{ github.event.inputs.release-track }}
+          AUTO_VERSIONED: true
+          BUILD_CANARY: true
+      - name: Create release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ env.CANARY_TAG_NAME }}
+          name: ${{ env.CANARY_TAG_NAME }}
+          draft: false
+          prerelease: false
+          repository: Citron-Project/citron-android
+          token: ${{ secrets.CI_RELEASE_TOKEN }}

.github/workflows/android-merge.js

@@ -0,0 +1,318 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Note: This is a GitHub Actions script
+// It is not meant to be executed directly on your machine without modifications
+
+const fs = require("fs");
+// which label to check for changes
+const CHANGE_LABEL_MAINLINE = 'android-merge';
+const CHANGE_LABEL_EA = 'android-ea-merge';
+// how far back in time should we consider the changes are "recent"? (default: 24 hours)
+const DETECTION_TIME_FRAME = (parseInt(process.env.DETECTION_TIME_FRAME)) || (24 * 3600 * 1000);
+const BUILD_EA = process.env.BUILD_EA == 'true';
+const MAINLINE_TAG = process.env.MAINLINE_TAG;
+
+async function checkBaseChanges(github) {
+    // query the commit date of the latest commit on this branch
+    const query = `query($owner:String!, $name:String!, $ref:String!) {
+        repository(name:$name, owner:$owner) {
+            ref(qualifiedName:$ref) {
+                target {
+                    ... on Commit { id pushedDate oid }
+                }
+            }
+        }
+    }`;
+    const variables = {
+        owner: 'yuzu-emu',
+        name: 'yuzu',
+        ref: 'refs/heads/master',
+    };
+    const result = await github.graphql(query, variables);
+    const pushedAt = result.repository.ref.target.pushedDate;
+    console.log(`Last commit pushed at ${pushedAt}.`);
+    const delta = new Date() - new Date(pushedAt);
+    if (delta <= DETECTION_TIME_FRAME) {
+        console.info('New changes detected, triggering a new build.');
+        return true;
+    }
+    console.info('No new changes detected.');
+    return false;
+}
+
+async function checkAndroidChanges(github) {
+    if (checkBaseChanges(github)) return true;
+    const pulls = getPulls(github, false);
+    for (let i = 0; i < pulls.length; i++) {
+        let pull = pulls[i];
+        if (new Date() - new Date(pull.headRepository.pushedAt) <= DETECTION_TIME_FRAME) {
+            console.info(`${pull.number} updated at ${pull.headRepository.pushedAt}`);
+            return true;
+        }
+    }
+    console.info("No changes detected in any tagged pull requests.");
+    return false;
+}
+
+async function tagAndPush(github, owner, repo, execa, commit=false) {
+    let altToken = process.env.ALT_GITHUB_TOKEN;
+    if (!altToken) {
+        throw `Please set ALT_GITHUB_TOKEN environment variable. This token should have write access to ${owner}/${repo}.`;
+    }
+    const query = `query ($owner:String!, $name:String!) {
+        repository(name:$name, owner:$owner) {
+            refs(refPrefix: "refs/tags/", orderBy: {field: TAG_COMMIT_DATE, direction: DESC}, first: 10) {
+                nodes { name }
+            }
+        }
+    }`;
+    const variables = {
+        owner: owner,
+        name: repo,
+    };
+    const tags = await github.graphql(query, variables);
+    const tagList = tags.repository.refs.nodes;
+    let lastTag = 'android-1';
+    for (let i = 0; i < tagList.length; ++i) {
+        if (tagList[i].name.includes('android-')) {
+            lastTag = tagList[i].name;
+            break;
+        }
+    }
+    const tagNumber = /\w+-(\d+)/.exec(lastTag)[1] | 0;
+    const channel = repo.split('-')[1];
+    const newTag = `${channel}-${tagNumber + 1}`;
+    console.log(`New tag: ${newTag}`);
+    if (commit) {
+        let channelName = channel[0].toUpperCase() + channel.slice(1);
+        console.info(`Committing pending commit as ${channelName} ${tagNumber + 1}`);
+        await execa("git", ['commit', '-m', `${channelName} ${tagNumber + 1}`]);
+    }
+    console.info('Pushing tags to GitHub ...');
+    await execa("git", ['tag', newTag]);
+    await execa("git", ['remote', 'add', 'target', `https://${altToken}@github.com/${owner}/${repo}.git`]);
+    await execa("git", ['push', 'target', 'master', '-f']);
+    await execa("git", ['push', 'target', 'master', '--tags']);
+    console.info('Successfully pushed new changes.');
+}
+
+async function tagAndPushEA(github, owner, repo, execa) {
+    let altToken = process.env.ALT_GITHUB_TOKEN;
+    if (!altToken) {
+        throw `Please set ALT_GITHUB_TOKEN environment variable. This token should have write access to ${owner}/${repo}.`;
+    }
+    const query = `query ($owner:String!, $name:String!) {
+        repository(name:$name, owner:$owner) {
+            refs(refPrefix: "refs/tags/", orderBy: {field: TAG_COMMIT_DATE, direction: DESC}, first: 10) {
+                nodes { name }
+            }
+        }
+    }`;
+    const variables = {
+        owner: owner,
+        name: repo,
+    };
+    const tags = await github.graphql(query, variables);
+    const tagList = tags.repository.refs.nodes;
+    let lastTag = 'ea-1';
+    for (let i = 0; i < tagList.length; ++i) {
+        if (tagList[i].name.includes('ea-')) {
+            lastTag = tagList[i].name;
+            break;
+        }
+    }
+    const tagNumber = /\w+-(\d+)/.exec(lastTag)[1] | 0;
+    const newTag = `ea-${tagNumber + 1}`;
+    console.log(`New tag: ${newTag}`);
+    console.info('Pushing tags to GitHub ...');
+    await execa("git", ["remote", "add", "android", "https://github.com/yuzu-emu/yuzu-android.git"]);
+    await execa("git", ["fetch", "android"]);
+
+    await execa("git", ['tag', newTag]);
+    await execa("git", ['push', 'android', `${newTag}`]);
+
+    fs.writeFile('tag-name.txt', newTag, (err) => {
+        if (err) throw 'Could not write tag name to file!'
+    })
+
+    console.info('Successfully pushed new changes.');
+}
+
+async function generateReadme(pulls, context, mergeResults, execa) {
+    let baseUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/`;
+    let output =
+        "| Pull Request | Commit | Title | Author | Merged? |\n|----|----|----|----|----|\n";
+    for (let pull of pulls) {
+        let pr = pull.number;
+        let result = mergeResults[pr];
+        output += `| [${pr}](${baseUrl}/pull/${pr}) | [\`${result.rev || "N/A"}\`](${baseUrl}/pull/${pr}/files) | ${pull.title} | [${pull.author.login}](https://github.com/${pull.author.login}/) | ${result.success ? "Yes" : "No"} |\n`;
+    }
+    output +=
+        "\n\nEnd of merge log. You can find the original README.md below the break.\n\n-----\n\n";
+    output += fs.readFileSync("./README.md");
+    fs.writeFileSync("./README.md", output);
+    await execa("git", ["add", "README.md"]);
+}
+
+async function fetchPullRequests(pulls, repoUrl, execa) {
+    console.log("::group::Fetch pull requests");
+    for (let pull of pulls) {
+        let pr = pull.number;
+        console.info(`Fetching PR ${pr} ...`);
+        await execa("git", [
+            "fetch",
+            "-f",
+            "--no-recurse-submodules",
+            repoUrl,
+            `pull/${pr}/head:pr-${pr}`,
+        ]);
+    }
+    console.log("::endgroup::");
+}
+
+async function mergePullRequests(pulls, execa) {
+    let mergeResults = {};
+    console.log("::group::Merge pull requests");
+    await execa("git", ["config", "--global", "user.name", "yuzubot"]);
+    await execa("git", [
+        "config",
+        "--global",
+        "user.email",
+        "yuzu\x40yuzu-emu\x2eorg", // prevent email harvesters from scraping the address
+    ]);
+    let hasFailed = false;
+    for (let pull of pulls) {
+        let pr = pull.number;
+        console.info(`Merging PR ${pr} ...`);
+        try {
+            const process1 = execa("git", [
+                "merge",
+                "--squash",
+                "--no-edit",
+                `pr-${pr}`,
+            ]);
+            process1.stdout.pipe(process.stdout);
+            await process1;
+
+            const process2 = execa("git", ["commit", "-m", `Merge yuzu-emu#${pr}`]);
+            process2.stdout.pipe(process.stdout);
+            await process2;
+
+            const process3 = await execa("git", ["rev-parse", "--short", `pr-${pr}`]);
+            mergeResults[pr] = {
+                success: true,
+                rev: process3.stdout,
+            };
+        } catch (err) {
+            console.log(
+                `::error title=#${pr} not merged::Failed to merge pull request: ${pr}: ${err}`
+            );
+            mergeResults[pr] = { success: false };
+            hasFailed = true;
+            await execa("git", ["reset", "--hard"]);
+        }
+    }
+    console.log("::endgroup::");
+    if (hasFailed) {
+        throw 'There are merge failures. Aborting!';
+    }
+    return mergeResults;
+}
+
+async function resetBranch(execa) {
+    console.log("::group::Reset master branch");
+    let hasFailed = false;
+    try {
+        await execa("git", ["remote", "add", "source", "https://github.com/yuzu-emu/yuzu.git"]);
+        await execa("git", ["fetch", "source"]);
+        const process1 = await execa("git", ["rev-parse", "source/master"]);
+        const headCommit = process1.stdout;
+
+        await execa("git", ["reset", "--hard", headCommit]);
+    } catch (err) {
+        console.log(`::error title=Failed to reset master branch`);
+        hasFailed = true;
+    }
+    console.log("::endgroup::");
+    if (hasFailed) {
+        throw 'Failed to reset the master branch. Aborting!';
+    }
+}
+
+async function getPulls(github) {
+    const query = `query ($owner:String!, $name:String!, $label:String!) {
+        repository(name:$name, owner:$owner) {
+            pullRequests(labels: [$label], states: OPEN, first: 100) {
+                nodes {
+                    number title author { login }
+                }
+            }
+        }
+    }`;
+    const mainlineVariables = {
+        owner: 'yuzu-emu',
+        name: 'yuzu',
+        label: CHANGE_LABEL_MAINLINE,
+    };
+    const mainlineResult = await github.graphql(query, mainlineVariables);
+    const pulls = mainlineResult.repository.pullRequests.nodes;
+    if (BUILD_EA) {
+        const eaVariables = {
+            owner: 'yuzu-emu',
+            name: 'yuzu',
+            label: CHANGE_LABEL_EA,
+        };
+        const eaResult = await github.graphql(query, eaVariables);
+        const eaPulls = eaResult.repository.pullRequests.nodes;
+        return pulls.concat(eaPulls);
+    }
+    return pulls;
+}
+
+async function getMainlineTag(execa) {
+    console.log(`::group::Getting mainline tag android-${MAINLINE_TAG}`);
+    let hasFailed = false;
+    try {
+        await execa("git", ["remote", "add", "mainline", "https://github.com/yuzu-emu/yuzu-android.git"]);
+        await execa("git", ["fetch", "mainline", "--tags"]);
+        await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]);
+        await execa("git", ["submodule", "update", "--init", "--recursive"]);
+    } catch (err) {
+        console.log('::error title=Failed pull tag');
+        hasFailed = true;
+    }
+    console.log("::endgroup::");
+    if (hasFailed) {
+        throw 'Failed pull mainline tag. Aborting!';
+    }
+}
+
+async function mergebot(github, context, execa) {
+    // Reset our local copy of master to what appears on yuzu-emu/yuzu - master
+    await resetBranch(execa);
+
+    const pulls = await getPulls(github);
+    let displayList = [];
+    for (let i = 0; i < pulls.length; i++) {
+        let pull = pulls[i];
+        displayList.push({ PR: pull.number, Title: pull.title });
+    }
+    console.info("The following pull requests will be merged:");
+    console.table(displayList);
+    await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa);
+    const mergeResults = await mergePullRequests(pulls, execa);
+
+    if (BUILD_EA) {
+        await tagAndPushEA(github, 'yuzu-emu', `yuzu-android`, execa);
+    } else {
+        await generateReadme(pulls, context, mergeResults, execa);
+        await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
+    }
+}
+
+module.exports.mergebot = mergebot;
+module.exports.checkAndroidChanges = checkAndroidChanges;
+module.exports.tagAndPush = tagAndPush;
+module.exports.checkBaseChanges = checkBaseChanges;
+module.exports.getMainlineTag = getMainlineTag;

.github/workflows/android-publish.yml

@@ -0,0 +1,57 @@
+# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+name: yuzu-android-publish
+
+on:
+  schedule:
+    - cron: '37 0 * * *'
+  workflow_dispatch:
+    inputs:
+      android:
+        description: 'Whether to trigger an Android build (true/false/auto)'
+        required: false
+        default: 'true'
+
+jobs:
+  android:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu' }}
+    steps:
+      # this checkout is required to make sure the GitHub Actions scripts are available
+      - uses: actions/checkout@v3
+        name: Pre-checkout
+        with:
+          submodules: false
+      - uses: actions/github-script@v6
+        id: check-changes
+        name: 'Check for new changes'
+        env:
+          # 24 hours
+          DETECTION_TIME_FRAME: 86400000
+        with:
+          script: |
+            if (context.payload.inputs && context.payload.inputs.android === 'true') return true;
+            const checkAndroidChanges = require('./.github/workflows/android-merge.js').checkAndroidChanges;
+            return checkAndroidChanges(github);
+      - run: npm install execa@5
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+      - uses: actions/checkout@v3
+        name: Checkout
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+        with:
+          path: 'yuzu-merge'
+          fetch-depth: 0
+          submodules: true
+          token: ${{ secrets.ALT_GITHUB_TOKEN }}
+      - uses: actions/github-script@v5
+        name: 'Check and merge Android changes'
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+        env:
+          ALT_GITHUB_TOKEN: ${{ secrets.ALT_GITHUB_TOKEN }}
+        with:
+          script: |
+            const execa = require("execa");
+            const mergebot = require('./.github/workflows/android-merge.js').mergebot;
+            process.chdir('${{ github.workspace }}/yuzu-merge');
+            mergebot(github, context, execa);

.github/workflows/android-stable-play-release.yml

@@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: 2024 Citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+name: citron-android-stable-play-release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release-tag:
+        description: 'Tag # from citron-android that you want to build and publish'
+        required: true
+        default: '100'
+      release-track:
+        description: 'Play store release track (internal/alpha/beta/production)'
+        required: true
+        default: 'alpha'
+
+jobs:
+  android:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'Citron-Project/Cit' }}
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout
+        with:
+          fetch-depth: 0
+          submodules: true
+          token: ${{ secrets.CI_RELEASE_TOKEN }}
+      - run: npm install execa@5
+      - uses: actions/github-script@v5
+        name: 'Pull stable tag'
+        env:
+          STABLE_TAG: ${{ github.event.inputs.release-tag }}
+        with:
+          script: |
+            const execa = require("execa");
+            const mergebot = require('./.github/workflows/android-merge.js').getStableTag;
+            process.chdir('${{ github.workspace }}');
+            mergebot(execa);
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
+      - name: Build
+        run: |
+          echo "GIT_TAG_NAME=android-${{ github.event.inputs.releast-tag }}" >> $GITHUB_ENV
+          ./.ci/scripts/android/stablebuild.sh
+        env:
+          STABLE_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
+          PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
+          PLAY_ANDROID_KEYSTORE_PASS: ${{ secrets.PLAY_ANDROID_KEYSTORE_PASS }}
+          STABLE_SERVICE_ACCOUNT_KEY_B64: ${{ secrets.STABLE_SERVICE_ACCOUNT_KEY_B64 }}
+          STORE_TRACK: ${{ github.event.inputs.release-track }}
+          AUTO_VERSIONED: true

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2024 Citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+name: citron-ci
+
+on:
+  push:
+    branches: [ master ]
+    tags: [ "*" ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  transifex:
+    runs-on: ubuntu-latest
+    container: yuzu-emu-mirror/build-environments:linux-transifex
+    if: ${{ github.repository == 'Citron-Project/Cit' && !github.head_ref }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Update Translation
+        run: ./.ci/scripts/transifex/docker.sh
+        env:
+          TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }}
+
+  reuse:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'Citron-Project/Cit' }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: fsfe/reuse-action@v1

.github/workflows/codespell.yml

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+# GitHub Action to automate the identification of common misspellings in text files.
+# https://github.com/codespell-project/actions-codespell
+# https://github.com/codespell-project/codespell
+name: codespell
+on: pull_request
+permissions: {}
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+      - uses: codespell-project/actions-codespell@master

.github/workflows/verify.yml

@@ -0,0 +1,190 @@
+# SPDX-FileCopyrightText: 2024 Citron Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+name: 'citron verify'
+
+on:
+  pull_request:
+    branches: [ master ]
+env:
+  PR_NUMBER: pr${{ github.event.number }}
+
+jobs:
+  format:
+    name: 'verify format'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: false
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: 'Verify Formatting'
+        run: bash -ex ./.ci/scripts/format/script.sh
+  build:
+    name: 'test build'
+    needs: format
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - type: clang
+            image: linux-fresh
+          - type: linux
+            image: linux-fresh
+          - type: windows
+            image: linux-mingw
+    container:
+      image: yuzu-emu-mirror/build-environments:${{ matrix.image }}
+      options: -u 1001
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Set up cache
+        uses: actions/cache@v3
+        id: ccache-restore
+        with:
+          path: ~/.ccache
+          key: ${{ runner.os }}-${{ matrix.type }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.type }}-
+      - name: Create ccache directory
+        if: steps.ccache-restore.outputs.cache-hit != 'true'
+        run: mkdir -p ~/.ccache
+      - name: Build
+        run: ./.ci/scripts/${{ matrix.type }}/docker.sh
+        env:
+          ENABLE_COMPATIBILITY_REPORTING: "ON"
+      - name: Pack
+        run: ./.ci/scripts/${{ matrix.type }}/upload.sh
+        env:
+          NO_SOURCE_PACK: "YES"
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.type }}
+          path: artifacts/
+  build-mac:
+    name: 'test build (macos)'
+    needs: format
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Install dependencies
+        run: |
+          brew install autoconf automake boost ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd
+      - name: Build
+        run: |
+          mkdir build
+          cd build
+          export Qt5_DIR="$(brew --prefix qt@5)/lib/cmake"
+          cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCITRON_USE_BUNDLED_VCPKG=OFF -DCITRON_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF
+          ninja
+  build-msvc:
+    name: 'test build (windows, msvc)'
+    needs: format
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Set up cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.buildcache
+          key: ${{ runner.os }}-msvc-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-msvc-
+      - name: Install dependencies
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = "Stop"
+          $BuildCacheVer = "v0.28.4"
+          $File = "buildcache-windows.zip"
+          $Uri = "https://github.com/mbitsnbites/buildcache/releases/download/$BuildCacheVer/$File"
+          $WebClient = New-Object System.Net.WebClient
+          $WebClient.DownloadFile($Uri, $File)
+          7z x $File
+          $CurrentDir = Convert-Path .
+          echo "$CurrentDir/buildcache/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: Install Vulkan SDK
+        shell: pwsh
+        run: .\.ci\scripts\windows\install-vulkan-sdk.ps1
+      - name: Set up MSVC
+        uses: ilammy/msvc-dev-cmd@v1
+      - name: Configure
+        env:
+          CC: cl.exe
+          CXX: cl.exe
+        run: |
+          glslangValidator --version
+          mkdir build
+          cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DCITRON_USE_BUNDLED_QT=1 -DCITRON_USE_BUNDLED_SDL2=1 -DCITRON_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCITRON_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DCITRON_CRASH_DUMPS=ON
+      - name: Build
+        run: cmake --build build
+      - name: Cache Summary
+        run: buildcache -s
+      - name: Pack
+        shell: pwsh
+        run: .\.ci\scripts\windows\upload.ps1
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: msvc
+          path: artifacts/
+      - name: Upload EXE
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.INDIVIDUAL_EXE }}
+          path: ${{ env.INDIVIDUAL_EXE }}
+  android:
+    runs-on: ubuntu-latest
+    needs: format
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Set up cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.ccache
+          key: ${{ runner.os }}-android-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-android-
+      - name: Query tag name
+        uses: olegtarasov/get-tag@v2.1.2
+        id: tagName
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
+      - name: Build
+        run: ./.ci/scripts/android/build.sh
+        env:
+          USE_DEBUG_KEYSTORE: "true"
+      - name: Copy artifacts
+        run: ./.ci/scripts/android/upload.sh
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: android
+          path: artifacts/

.gitmodules

@@ -9,22 +9,22 @@
 	url = https://github.com/mozilla/cubeb.git
 [submodule "dynarmic"]
 	path = externals/dynarmic
-	url = https://git.citron-emu.org/Citron/dynarmic.git
+	url = https://github.com/yuzu-mirror/dynarmic.git
 [submodule "libusb"]
 	path = externals/libusb/libusb
 	url = https://github.com/libusb/libusb.git
 [submodule "discord-rpc"]
 	path = externals/discord-rpc
-	url = https://git.citron-emu.org/Citron/discord-rpc.git
+	url = https://github.com/yuzu-mirror/discord-rpc.git
 [submodule "Vulkan-Headers"]
 	path = externals/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers.git
 [submodule "sirit"]
 	path = externals/sirit
-	url = https://git.citron-emu.org/Citron/sirit.git
+	url = https://github.com/yuzu-mirror/sirit.git
 [submodule "mbedtls"]
 	path = externals/mbedtls
-	url = https://git.citron-emu.org/Citron/mbedtls.git
+	url = https://github.com/yuzu-mirror/mbedtls.git
 [submodule "xbyak"]
 	path = externals/xbyak
 	url = https://github.com/herumi/xbyak.git
@@ -57,13 +57,13 @@
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
 [submodule "breakpad"]
 	path = externals/breakpad
-	url = https://git.citron-emu.org/Citron/breakpad.git
+	url = https://github.com/yuzu-mirror/breakpad.git
 [submodule "simpleini"]
 	path = externals/simpleini
 	url = https://github.com/brofield/simpleini.git
 [submodule "oaknut"]
 	path = externals/oaknut
-	url = https://git.citron-emu.org/Citron/oaknut.git
+	url = https://github.com/yuzu-mirror/oaknut
 [submodule "Vulkan-Utility-Libraries"]
 	path = externals/Vulkan-Utility-Libraries
 	url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git

CMakeLists.txt

@@ -17,6 +17,45 @@ if (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX-")
 endif()
 
+# PGO Configuration
+option(CITRON_ENABLE_PGO_INSTRUMENT "Enable Profile-Guided Optimization instrumentation build" OFF)
+option(CITRON_ENABLE_PGO_OPTIMIZE "Enable Profile-Guided Optimization optimization build" OFF)
+
+if(MSVC)
+    if(CITRON_ENABLE_PGO_INSTRUMENT)
+        string(APPEND CMAKE_CXX_FLAGS_RELEASE " /GL /LTCG:PGINSTRUMENT")
+        string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /LTCG:PGINSTRUMENT")
+        string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " /LTCG:PGINSTRUMENT")
+    elseif(CITRON_ENABLE_PGO_OPTIMIZE)
+        string(APPEND CMAKE_CXX_FLAGS_RELEASE " /GL /LTCG:PGOPTIMIZE")
+        string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /LTCG:PGOPTIMIZE")
+        string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " /LTCG:PGOPTIMIZE")
+    endif()
+else()
+    # GCC and Clang PGO flags
+    if(CITRON_ENABLE_PGO_INSTRUMENT)
+        if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+            string(APPEND CMAKE_CXX_FLAGS_RELEASE " -fprofile-instr-generate")
+            string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " -fprofile-instr-generate")
+            string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " -fprofile-instr-generate")
+        else() # GCC
+            string(APPEND CMAKE_CXX_FLAGS_RELEASE " -fprofile-generate")
+            string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " -fprofile-generate")
+            string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " -fprofile-generate")
+        endif()
+    elseif(CITRON_ENABLE_PGO_OPTIMIZE)
+        if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+            string(APPEND CMAKE_CXX_FLAGS_RELEASE " -fprofile-instr-use=default.profdata")
+            string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " -fprofile-instr-use=default.profdata")
+            string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " -fprofile-instr-use=default.profdata")
+        else() # GCC
+            string(APPEND CMAKE_CXX_FLAGS_RELEASE " -fprofile-use")
+            string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " -fprofile-use")
+            string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " -fprofile-use")
+        endif()
+    endif()
+endif()
+
 # Check if SDL2::SDL2 target exists; if not, create an alias
 if (TARGET SDL2::SDL2-static)
     add_library(SDL2::SDL2 ALIAS SDL2::SDL2-static)
@@ -98,21 +137,25 @@ endif()
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
 
 if (ANDROID AND CITRON_DOWNLOAD_ANDROID_VVL)
-    set(vvl_version "1.4.304.1")
+    set(vvl_version "1.4.309.0")
     set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
-    if (NOT EXISTS "${vvl_zip_file}")
-        # Download and extract validation layer release to externals directory
-        set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
-        file(DOWNLOAD "${vvl_base_url}/vulkan-sdk-${vvl_version}/android-binaries-${vvl_version}.zip"
-            "${vvl_zip_file}" SHOW_PROGRESS)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
-                        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
-    endif()
-
-    # Copy the arm64 binary to src/android/app/main/jniLibs
     set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/arm64-v8a/")
-    file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
-            DESTINATION "${vvl_lib_path}")
+    set(vvl_final_lib "${vvl_lib_path}/libVkLayer_khronos_validation.so")
+
+    if (NOT EXISTS "${vvl_final_lib}")
+        # Download and extract validation layer release to externals directory
+        if (NOT EXISTS "${vvl_zip_file}")
+            set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
+            file(DOWNLOAD "${vvl_base_url}/vulkan-sdk-${vvl_version}/android-binaries-${vvl_version}.zip"
+                "${vvl_zip_file}" SHOW_PROGRESS)
+            execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
+                            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
+        endif()
+
+        # Copy the arm64 binary to src/android/app/main/jniLibs
+        file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
+                DESTINATION "${vvl_lib_path}")
+    endif()
 endif()
 
 if (ANDROID)
@@ -126,13 +169,23 @@ if (CITRON_USE_BUNDLED_VCPKG)
 
         if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
             set(VCPKG_TARGET_TRIPLET "arm64-android")
-            set(VCPKG_HOST_TRIPLET "x64-windows")
+            # Detect host system (Windows or Linux)
+            if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+                set(VCPKG_HOST_TRIPLET "x64-windows")
+            else()
+                set(VCPKG_HOST_TRIPLET "x64-linux")
+            endif()
             # this is to avoid CMake using the host pkg-config to find the host
             # libraries when building for Android targets
             set(PKG_CONFIG_EXECUTABLE "aarch64-none-linux-android-pkg-config" CACHE FILEPATH "" FORCE)
         elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64")
             set(VCPKG_TARGET_TRIPLET "x64-android")
-            set(VCPKG_HOST_TRIPLET "x64-windows")
+            # Detect host system (Windows or Linux)
+            if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+                set(VCPKG_HOST_TRIPLET "x64-windows")
+            else()
+                set(VCPKG_HOST_TRIPLET "x64-linux")
+            endif()
             set(PKG_CONFIG_EXECUTABLE "x86_64-none-linux-android-pkg-config" CACHE FILEPATH "" FORCE)
         else()
             message(FATAL_ERROR "Unsupported Android architecture ${CMAKE_ANDROID_ARCH_ABI}")
@@ -316,7 +369,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 # Enforce the search mode of non-required packages for better and shorter failure messages
 find_package(Boost REQUIRED context)
 find_package(enet MODULE)
-find_package(fmt 11 REQUIRED)
+find_package(fmt 10 REQUIRED)
 if (CITRON_USE_LLVM_DEMANGLE)
     find_package(LLVM MODULE COMPONENTS Demangle)
 endif()
@@ -331,7 +384,7 @@ find_package(ZLIB REQUIRED)
 find_package(zstd REQUIRED)
 
 if (NOT CITRON_USE_EXTERNAL_VULKAN_HEADERS)
-    find_package(VulkanHeaders 1.4.307 REQUIRED)
+    find_package(VulkanHeaders 1.4.313 REQUIRED)
 endif()
 
 if (NOT CITRON_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
@@ -394,7 +447,7 @@ if (ENABLE_SDL2)
     if (CITRON_USE_BUNDLED_SDL2)
         # Detect toolchain and platform
         if ((MSVC_VERSION GREATER_EQUAL 1920) AND ARCHITECTURE_x86_64)
-            set(SDL2_VER "SDL2-2.32.0")
+            set(SDL2_VER "SDL2-2.28.2")
         else()
             message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRON_USE_BUNDLED_SDL2 and provide your own.")
         endif()
@@ -541,7 +594,7 @@ endif()
 # against all the src files. This should be used before making a pull request.
 # =======================================================================
 
-set(CLANG_FORMAT_POSTFIX "-18")
+set(CLANG_FORMAT_POSTFIX "-15")
 find_program(CLANG_FORMAT
     NAMES clang-format${CLANG_FORMAT_POSTFIX}
           clang-format
@@ -552,7 +605,7 @@ if (NOT CLANG_FORMAT)
         message(STATUS "Clang format not found! Downloading...")
         set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe")
         file(DOWNLOAD
-            https://git.citron-emu.org/Citron/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
+            https://github.com/yuzu-mirror/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
             "${CLANG_FORMAT}" SHOW_PROGRESS
             STATUS DOWNLOAD_SUCCESS)
         if (NOT DOWNLOAD_SUCCESS EQUAL 0)

CMakeModules/DownloadExternals.cmake

@@ -8,7 +8,7 @@
 set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
 function(download_bundled_external remote_path lib_name prefix_var)
 
-set(package_base_url "https://git.citron-emu.org/Citron/")
+set(package_base_url "https://github.com/yuzu-mirror/")
 set(package_repo "no_platform")
 set(package_extension "no_platform")
 if (WIN32)

README.md

@@ -14,13 +14,14 @@ Welcome to **Citron**, a cutting-edge Nintendo Homebrew emulator designed to del
 
 ## Download 🚀
 
-Ready to experience Citron? [Download the latest version](https://git.citron-emu.org/Citron/Citron/releases) and dive into your favorite Nintendo homebrew titles!
+Ready to experience Citron? [Download the latest version](https://git.citron-emu.org/citron/emu/-/releases) and dive into your favorite Nintendo homebrew titles!
 
 ## Getting Started 💡
 
-1. **Download and Install**: Head over to the [downloads page](https://git.citron-emu.org/Citron/Citron/releases) to grab the latest release.
-2. **Add Homebrew Games**: Citron is built to play homebrew games. Add them to your game directory and enjoy!
-3. **Configure Your Settings**: Customize your emulator settings to suit your performance needs.
+1. **Check the System Requirements** Head over to this link to check the requirements to run this emulator [system requirements page](https://evilperson1337.notion.site/Hardware-Requirements-1d957c2edaf680418e2bf2c7239170ce)
+2. **Download and Install**: Head over to the [downloads page](https://git.citron-emu.org/citron/emu/-/releases) to grab the latest release.
+3. **Add Homebrew Games**: Citron is built to play homebrew games. Add them to your game directory and enjoy!
+4. **Configure Your Settings**: Customize your emulator settings to suit your performance needs.
 
 ## Source Code 🔧
 

dist/72-citron-input.rules

@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+# SPDX-FileCopyrightText: 2025 citron Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # Allow systemd-logind to manage user access to hidraw with this file
@@ -7,13 +8,13 @@
 
 # Switch Pro Controller (USB/Bluetooth)
 KERNEL=="hidraw*", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="2009", MODE="0660", TAG+="uaccess"
-KERNEL=="hidraw*", KERNELS=="*057e:2009*", MODE="0660", TAG+="uaccess"
+KERNEL=="hidraw*", KERNELS=="*057E:2009*", MODE="0660", TAG+="uaccess"
 
 # Joy-Con L (Bluetooth)
-KERNEL=="hidraw*", KERNELS=="*057e:2006*", MODE="0660", TAG+="uaccess"
+KERNEL=="hidraw*", KERNELS=="*057E:2006*", MODE="0660", TAG+="uaccess"
 
 # Joy-Con R (Bluetooth)
-KERNEL=="hidraw*", KERNELS=="*057e:2007*", MODE="0660", TAG+="uaccess"
+KERNEL=="hidraw*", KERNELS=="*057E:2007*", MODE="0660", TAG+="uaccess"
 
 # Joy-Con Charging Grip (USB)
 KERNEL=="hidraw*", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="200e", MODE="0660", TAG+="uaccess"

dist/org.citron_emu.citron.desktop

@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-FileCopyrightText: 2025 citron Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 [Desktop Entry]
@@ -13,4 +14,4 @@ Exec=citron %f
 Categories=Game;Emulator;Qt;
 MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
 Keywords=Nintendo;Switch;
-StartupWMClass=citron
+StartupWMClass=org.citron_emu.citron

externals/SDL

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

externals/Vulkan-Headers

@@ -1 +1 @@
-Subproject commit 234c4b7370a8ea3239a214c9e871e4b17c89f4ab
+Subproject commit e2e53a724677f6eba8ff0ce1ccb64ee321785cbd

externals/Vulkan-Utility-Libraries

@@ -1 +1 @@
-Subproject commit fe7a09b13899c5c77d956fa310286f7a7eb2c4ed
+Subproject commit 4e246c56ec5afb5ad66b9b04374d39ac04675c8e

externals/VulkanMemoryAllocator

@@ -1 +1 @@
-Subproject commit c788c52156f3ef7bc7ab769cb03c110a53ac8fcb
+Subproject commit 539c0a8d8e3733c9f25ea9a184c85c77504f1653

externals/ffmpeg/ffmpeg

@@ -1 +1 @@
-Subproject commit 9c1294eaddb88cb0e044c675ccae059a85fc9c6c
+Subproject commit 99e2af4e7837ca09b97d93a562dc12947179fc48

externals/vcpkg

@@ -1 +1 @@
-Subproject commit 37d46edf0f2024c3d04997a2d432d59278ca1dff
+Subproject commit 5a874b05fb981e2643fd0c1c9ad63e19dfe76b27

src/android/app/build.gradle.kts

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-FileCopyrightText: 2023 citron Emulator Project
+// SPDX-FileCopyrightText: 2025 citron Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import android.annotation.SuppressLint
@@ -28,20 +28,20 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn
 android {
     namespace = "org.citron.citron_emu"
 
-    compileSdkVersion = "android-34"
-    ndkVersion = "26.1.10909125"
+    compileSdkVersion = "android-35"
+    ndkVersion = "29.0.13113456 rc1" // "26.1.10909125"
 
     buildFeatures {
         viewBinding = true
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 
     packaging {
@@ -57,7 +57,8 @@ android {
         // TODO If this is ever modified, change application_id in strings.xml
         applicationId = "org.citron.citron_emu"
         minSdk = 30
-        targetSdk = 34
+        //noinspection EditedTargetSdkVersion
+        targetSdk = 35
         versionName = getGitVersion()
 
         versionCode = if (System.getenv("AUTO_VERSIONED") == "true") {
@@ -75,18 +76,19 @@ android {
         buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
     }
 
-    android.applicationVariants.all {
-        val variant = this
-        variant.outputs.all {
-            if (this is com.android.build.gradle.internal.api.ApkVariantOutputImpl) {
-                outputFileName = "Citron-${variant.versionName}-${variant.name}.apk"
-            }
-        }
-    }
-
+    // Always use debug keystore for CI builds when USE_DEBUG_KEYSTORE is set
+    val useDebugKeystore = System.getenv("USE_DEBUG_KEYSTORE") == "true"
     val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
+
     signingConfigs {
-        if (keystoreFile != null) {
+        create("default") {
+            storeFile = file("$projectDir/debug.keystore")
+            storePassword = "android"
+            keyAlias = "androiddebugkey"
+            keyPassword = "android"
+        }
+
+        if (keystoreFile != null && !useDebugKeystore) {
             create("release") {
                 storeFile = file(keystoreFile)
                 storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
@@ -94,12 +96,6 @@ android {
                 keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
             }
         }
-        create("default") {
-            storeFile = file("$projectDir/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
-        }
     }
 
     // Define build types, which are orthogonal to product flavors.
@@ -107,7 +103,7 @@ android {
 
         // Signed by release key, allowing for upload to Play Store.
         release {
-            signingConfig = if (keystoreFile != null) {
+            signingConfig = if (keystoreFile != null && !useDebugKeystore) {
                 signingConfigs.getByName("release")
             } else {
                 signingConfigs.getByName("default")
@@ -116,9 +112,11 @@ android {
             resValue("string", "app_name_suffixed", "Citron")
             isDefault = true
             isMinifyEnabled = true
+            isShrinkResources = true
+            isJniDebuggable = false
             isDebuggable = false
             proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
@@ -130,7 +128,7 @@ android {
             signingConfig = signingConfigs.getByName("default")
             isDebuggable = true
             proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
             versionNameSuffix = "-relWithDebInfo"
@@ -167,7 +165,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version = "3.22.1"
+            version = "4.0.1"
             path = file("../../../CMakeLists.txt")
         }
     }
@@ -185,10 +183,11 @@ android {
                     "-DCITRON_USE_BUNDLED_FFMPEG=ON",
                     "-DCITRON_ENABLE_LTO=ON",
                     "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
-                    "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+                    "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
+                    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
                 )
 
-                abiFilters("arm64-v8a", "x86_64")
+                abiFilters("arm64-v8a") // , "x86_64")
             }
         }
     }
@@ -246,7 +245,6 @@ dependencies {
     implementation("io.coil-kt:coil:2.2.2")
     implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("androidx.window:window:1.2.0-beta03")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.7.4")
     implementation("androidx.navigation:navigation-ui-ktx:2.7.4")

src/android/app/src/main/AndroidManifest.xml

@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
-SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-SPDX-License-Identifier: GPL-3.0-or-later
--->
-
+<!-- SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+     SPDX-License-Identifier: GPL-3.0-or-later -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.hardware.gamepad" android:required="false" />
     <uses-feature android:name="android.software.leanback" android:required="false" />
     <uses-feature android:name="android.hardware.vulkan.version" android:version="0x401000" android:required="true" />
 
+    <!-- Required Permissions for the app -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
+    <!-- Permissions for NFC (only if needed) -->
+    <uses-permission android:name="android.permission.NFC" android:required="false" />
+
     <application
         android:name="org.citron.citron_emu.CitronApplication"
         android:label="@string/app_name_suffixed"
@@ -30,28 +31,37 @@ SPDX-License-Identifier: GPL-3.0-or-later
         android:dataExtractionRules="@xml/data_extraction_rules_api_31"
         android:enableOnBackInvokedCallback="true">
 
-        <meta-data android:name="android.game_mode_config"
+        <!-- Samsung Gaming Hub specific metadata -->
+        <meta-data
+            android:name="com.samsung.android.gamehub"
+            android:value="true" />
+
+        <!-- Game Mode configuration -->
+        <meta-data
+            android:name="android.game_mode_config"
             android:resource="@xml/game_mode_config" />
 
+        <!-- Main Activity -->
         <activity
             android:name="org.citron.citron_emu.ui.main.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.Citron.Splash.Main">
-
-            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.GAME" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <!-- Settings Activity -->
         <activity
             android:name="org.citron.citron_emu.features.settings.ui.SettingsActivity"
             android:theme="@style/Theme.Citron.Main"
-            android:label="@string/preferences_settings"/>
+            android:label="@string/preferences_settings" />
 
+        <!-- Emulation Activity -->
         <activity
             android:name="org.citron.citron_emu.activities.EmulationActivity"
             android:theme="@style/Theme.Citron.Main"
@@ -71,7 +81,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <category android:name="android.intent.category.DEFAULT" />
                 <data
                     android:mimeType="application/octet-stream"
-                    android:scheme="content"/>
+                    android:scheme="content" />
             </intent-filter>
 
             <meta-data
@@ -79,6 +89,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 android:resource="@xml/nfc_tech_filter" />
         </activity>
 
+        <!-- Document Provider -->
         <provider
             android:name=".features.DocumentProvider"
             android:authorities="${applicationId}.user"

src/android/app/src/main/java/org/citron/citron_emu/NativeLibrary.kt

@@ -21,6 +21,7 @@ import org.citron.citron_emu.utils.Log
 import org.citron.citron_emu.model.InstallResult
 import org.citron.citron_emu.model.Patch
 import org.citron.citron_emu.model.GameVerificationResult
+import org.citron.citron_emu.network.NetPlayManager
 import java.net.NetworkInterface
 
 /**
@@ -243,6 +244,27 @@ object NativeLibrary {
         return coreErrorAlertResult
     }
 
+    @Keep
+    @JvmStatic
+    fun addNetPlayMessage(type: Int, message: String) {
+        val emulationActivity = sEmulationActivity.get()
+        if (emulationActivity != null) {
+            emulationActivity.addNetPlayMessages(type, message)
+        }
+        else {
+            NetPlayManager.addNetPlayMessage(type, message)
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    fun clearChat() {
+        NetPlayManager.clearChat()
+    }
+
+
+    external fun netPlayInit()
+
     @Keep
     @JvmStatic
     fun exitEmulationActivity(resultCode: Int) {

src/android/app/src/main/java/org/citron/citron_emu/activities/EmulationActivity.kt

@@ -4,6 +4,7 @@
 package org.citron.citron_emu.activities
 
 import android.annotation.SuppressLint
+import android.app.AlertDialog
 import android.app.PendingIntent
 import android.app.PictureInPictureParams
 import android.app.RemoteAction
@@ -39,12 +40,14 @@ import org.citron.citron_emu.NativeLibrary
 import org.citron.citron_emu.R
 import org.citron.citron_emu.CitronApplication
 import org.citron.citron_emu.databinding.ActivityEmulationBinding
+import org.citron.citron_emu.dialogs.NetPlayDialog
 import org.citron.citron_emu.features.input.NativeInput
 import org.citron.citron_emu.features.settings.model.BooleanSetting
 import org.citron.citron_emu.features.settings.model.IntSetting
 import org.citron.citron_emu.features.settings.model.Settings
 import org.citron.citron_emu.model.EmulationViewModel
 import org.citron.citron_emu.model.Game
+import org.citron.citron_emu.network.NetPlayManager
 import org.citron.citron_emu.utils.InputHandler
 import org.citron.citron_emu.utils.Log
 import org.citron.citron_emu.utils.MemoryUtil
@@ -80,6 +83,19 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
 
         super.onCreate(savedInstanceState)
 
+        // Check if firmware is available
+        if (!NativeLibrary.isFirmwareAvailable()) {
+            AlertDialog.Builder(this)
+                .setTitle(R.string.firmware_missing_title)
+                .setMessage(R.string.firmware_missing_message)
+                .setPositiveButton(R.string.ok) { _, _ ->
+                    finish()
+                }
+                .setCancelable(false)
+                .show()
+            return
+        }
+
         // Add license verification at the start
         LicenseVerifier.verifyLicense(this)
 
@@ -409,6 +425,16 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         setPictureInPictureParams(pictureInPictureParamsBuilder.build())
     }
 
+    fun displayMultiplayerDialog() {
+        val dialog = NetPlayDialog(this)
+        dialog.show()
+    }
+
+    fun addNetPlayMessages(type: Int, msg: String) {
+        NetPlayManager.addNetPlayMessage(type, msg)
+    }
+
+
     private var pictureInPictureReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent) {
             if (intent.action == actionPlay) {

src/android/app/src/main/java/org/citron/citron_emu/dialogs/ChatDialog.kt

@@ -0,0 +1,133 @@
+package org.citron.citron_emu.dialogs
+
+import android.content.Context
+import android.content.res.Configuration
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import org.citron.citron_emu.R
+import org.citron.citron_emu.databinding.DialogChatBinding
+import org.citron.citron_emu.databinding.ItemChatMessageBinding
+import org.citron.citron_emu.network.NetPlayManager
+import java.text.SimpleDateFormat
+import java.util.*
+
+class ChatMessage(
+    val nickname: String, // This is the common name youll see on private servers
+    val username: String, // Username is the community/forum username
+    val message: String,
+    val timestamp: String = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
+) {
+}
+
+class ChatDialog(context: Context) : BottomSheetDialog(context) {
+    private lateinit var binding: DialogChatBinding
+    private lateinit var chatAdapter: ChatAdapter
+    private val handler = Handler(Looper.getMainLooper())
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DialogChatBinding.inflate(LayoutInflater.from(context))
+        setContentView(binding.root)
+
+        NetPlayManager.setChatOpen(true)
+        setupRecyclerView()
+
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        behavior.skipCollapsed = context.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+
+        handler.post {
+            chatAdapter.notifyDataSetChanged()
+            binding.chatRecyclerView.post {
+                scrollToBottom()
+            }
+        }
+
+        NetPlayManager.setOnMessageReceivedListener { type, message ->
+            handler.post {
+                chatAdapter.notifyDataSetChanged()
+                scrollToBottom()
+            }
+        }
+
+        binding.sendButton.setOnClickListener {
+            val message = binding.chatInput.text.toString()
+            if (message.isNotBlank()) {
+                sendMessage(message)
+                binding.chatInput.text?.clear()
+            }
+        }
+    }
+
+    override fun dismiss() {
+        NetPlayManager.setChatOpen(false)
+        super.dismiss()
+    }
+
+    private fun sendMessage(message: String) {
+        val username = NetPlayManager.getUsername(context)
+        NetPlayManager.netPlaySendMessage(message)
+
+        val chatMessage = ChatMessage(
+            nickname = username,
+            username = "",
+            message = message,
+            timestamp = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
+        )
+
+        NetPlayManager.addChatMessage(chatMessage)
+        chatAdapter.notifyDataSetChanged()
+        scrollToBottom()
+    }
+
+    private fun setupRecyclerView() {
+        chatAdapter = ChatAdapter(NetPlayManager.getChatMessages())
+        binding.chatRecyclerView.layoutManager = LinearLayoutManager(context).apply {
+            stackFromEnd = true
+        }
+        binding.chatRecyclerView.adapter = chatAdapter
+    }
+
+    private fun scrollToBottom() {
+        binding.chatRecyclerView.scrollToPosition(chatAdapter.itemCount - 1)
+    }
+}
+
+class ChatAdapter(private val messages: List<ChatMessage>) :
+    RecyclerView.Adapter<ChatAdapter.ChatViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatViewHolder {
+        val binding = ItemChatMessageBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
+        return ChatViewHolder(binding)
+    }
+
+    override fun getItemCount(): Int = messages.size
+
+    override fun onBindViewHolder(holder: ChatViewHolder, position: Int) {
+        holder.bind(messages[position])
+    }
+
+    inner class ChatViewHolder(private val binding: ItemChatMessageBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        fun bind(message: ChatMessage) {
+            binding.usernameText.text = message.nickname
+            binding.messageText.text = message.message
+            binding.userIcon.setImageResource(when (message.nickname) {
+                "System" -> R.drawable.ic_system
+                else -> R.drawable.ic_user
+            })
+        }
+    }
+}

src/android/app/src/main/java/org/citron/citron_emu/dialogs/NetPlayDialog.kt

@@ -0,0 +1,397 @@
+// Copyright 2024 Mandarine Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+package org.citron.citron_emu.dialogs
+
+import android.content.Context
+import org.citron.citron_emu.R
+import android.content.res.Configuration
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.PopupMenu
+import android.widget.Toast
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.citron.citron_emu.CitronApplication
+import org.citron.citron_emu.databinding.DialogMultiplayerConnectBinding
+import org.citron.citron_emu.databinding.DialogMultiplayerLobbyBinding
+import org.citron.citron_emu.databinding.DialogMultiplayerRoomBinding
+import org.citron.citron_emu.databinding.ItemBanListBinding
+import org.citron.citron_emu.databinding.ItemButtonNetplayBinding
+import org.citron.citron_emu.databinding.ItemTextNetplayBinding
+import org.citron.citron_emu.utils.CompatUtils
+import org.citron.citron_emu.network.NetPlayManager
+
+class NetPlayDialog(context: Context) : BottomSheetDialog(context) {
+    private lateinit var adapter: NetPlayAdapter
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        behavior.skipCollapsed = context.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+        when {
+            NetPlayManager.netPlayIsJoined() -> DialogMultiplayerLobbyBinding.inflate(layoutInflater)
+                .apply {
+                    setContentView(root)
+                    adapter = NetPlayAdapter()
+                    listMultiplayer.layoutManager = LinearLayoutManager(context)
+                    listMultiplayer.adapter = adapter
+                    adapter.loadMultiplayerMenu()
+                    btnLeave.setOnClickListener {
+                        NetPlayManager.netPlayLeaveRoom()
+                        dismiss()
+                    }
+                    btnChat.setOnClickListener {
+                        ChatDialog(context).show()
+                    }
+
+                    refreshAdapterItems()
+
+                    btnModeration.visibility = if (NetPlayManager.netPlayIsModerator()) View.VISIBLE else View.GONE
+                    btnModeration.setOnClickListener {
+                        showModerationDialog()
+                    }
+
+                }
+            else -> {
+                DialogMultiplayerConnectBinding.inflate(layoutInflater).apply {
+                    setContentView(root)
+                    btnCreate.setOnClickListener {
+                        showNetPlayInputDialog(true)
+                        dismiss()
+                    }
+                    btnJoin.setOnClickListener {
+                        showNetPlayInputDialog(false)
+                        dismiss()
+                    }
+                }
+            }
+        }
+    }
+
+    data class NetPlayItems(
+        val option: Int,
+        val name: String,
+        val type: Int,
+        val id: Int = 0
+    ) {
+        companion object {
+            const val MULTIPLAYER_ROOM_TEXT = 1
+            const val MULTIPLAYER_ROOM_MEMBER = 2
+            const val MULTIPLAYER_SEPARATOR = 3
+            const val MULTIPLAYER_ROOM_COUNT = 4
+            const val TYPE_BUTTON = 0
+            const val TYPE_TEXT = 1
+            const val TYPE_SEPARATOR = 2
+        }
+    }
+
+    inner class NetPlayAdapter : RecyclerView.Adapter<NetPlayAdapter.NetPlayViewHolder>() {
+        val netPlayItems = mutableListOf<NetPlayItems>()
+
+        abstract inner class NetPlayViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+            init {
+                itemView.setOnClickListener(this)
+            }
+            abstract fun bind(item: NetPlayItems)
+        }
+
+        inner class TextViewHolder(private val binding: ItemTextNetplayBinding) : NetPlayViewHolder(binding.root) {
+            private lateinit var netPlayItem: NetPlayItems
+
+            override fun onClick(clicked: View) {}
+
+            override fun bind(item: NetPlayItems) {
+                netPlayItem = item
+                binding.itemTextNetplayName.text = item.name
+                binding.itemIcon.apply {
+                    val iconRes = when (item.option) {
+                        NetPlayItems.MULTIPLAYER_ROOM_TEXT -> R.drawable.ic_system
+                        NetPlayItems.MULTIPLAYER_ROOM_COUNT -> R.drawable.ic_joined
+                        else -> 0
+                    }
+                    visibility = if (iconRes != 0) {
+                        setImageResource(iconRes)
+                        View.VISIBLE
+                    } else View.GONE
+                }
+            }
+        }
+
+        inner class ButtonViewHolder(private val binding: ItemButtonNetplayBinding) : NetPlayViewHolder(binding.root) {
+            private lateinit var netPlayItems: NetPlayItems
+            private val isModerator = NetPlayManager.netPlayIsModerator()
+
+            init {
+                binding.itemButtonMore.apply {
+                    visibility = View.VISIBLE
+                    setOnClickListener { showPopupMenu(it) }
+                }
+            }
+
+            override fun onClick(clicked: View) {}
+
+
+            private fun showPopupMenu(view: View) {
+                PopupMenu(view.context, view).apply {
+                    menuInflater.inflate(R.menu.menu_netplay_member, menu)
+                    menu.findItem(R.id.action_kick).isEnabled = isModerator &&
+                            netPlayItems.name != NetPlayManager.getUsername(context)
+                    menu.findItem(R.id.action_ban).isEnabled = isModerator &&
+                            netPlayItems.name != NetPlayManager.getUsername(context)
+                    setOnMenuItemClickListener { item ->
+                        if (item.itemId == R.id.action_kick) {
+                            NetPlayManager.netPlayKickUser(netPlayItems.name)
+                            true
+                        } else if (item.itemId == R.id.action_ban) {
+                            NetPlayManager.netPlayBanUser(netPlayItems.name)
+                            true
+                        } else false
+                    }
+                    show()
+                }
+            }
+
+            override fun bind(item: NetPlayItems) {
+                netPlayItems = item
+                binding.itemButtonNetplayName.text = netPlayItems.name
+            }
+        }
+
+        fun loadMultiplayerMenu() {
+            val infos = NetPlayManager.netPlayRoomInfo()
+            if (infos.isNotEmpty()) {
+                val roomInfo = infos[0].split("|")
+                netPlayItems.add(NetPlayItems(NetPlayItems.MULTIPLAYER_ROOM_TEXT, roomInfo[0], NetPlayItems.TYPE_TEXT))
+                netPlayItems.add(NetPlayItems(NetPlayItems.MULTIPLAYER_ROOM_COUNT, "${infos.size - 1}/${roomInfo[1]}", NetPlayItems.TYPE_TEXT))
+                netPlayItems.add(NetPlayItems(NetPlayItems.MULTIPLAYER_SEPARATOR, "", NetPlayItems.TYPE_SEPARATOR))
+                for (i in 1 until infos.size) {
+                    netPlayItems.add(NetPlayItems(NetPlayItems.MULTIPLAYER_ROOM_MEMBER, infos[i], NetPlayItems.TYPE_BUTTON))
+                }
+            }
+        }
+
+        override fun getItemViewType(position: Int) = netPlayItems[position].type
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NetPlayViewHolder {
+            val inflater = LayoutInflater.from(parent.context)
+            return when (viewType) {
+                NetPlayItems.TYPE_TEXT -> TextViewHolder(ItemTextNetplayBinding.inflate(inflater, parent, false))
+                NetPlayItems.TYPE_BUTTON -> ButtonViewHolder(ItemButtonNetplayBinding.inflate(inflater, parent, false))
+                NetPlayItems.TYPE_SEPARATOR -> object : NetPlayViewHolder(inflater.inflate(R.layout.item_separator_netplay, parent, false)) {
+                    override fun bind(item: NetPlayItems) {}
+                    override fun onClick(clicked: View) {}
+                }
+                else -> throw IllegalStateException("Unsupported view type")
+            }
+        }
+
+        override fun onBindViewHolder(holder: NetPlayViewHolder, position: Int) {
+            holder.bind(netPlayItems[position])
+        }
+
+        override fun getItemCount() = netPlayItems.size
+    }
+
+    fun refreshAdapterItems() {
+        val handler = Handler(Looper.getMainLooper())
+
+        NetPlayManager.setOnAdapterRefreshListener() { type, msg ->
+            handler.post {
+                adapter.netPlayItems.clear()
+                adapter.loadMultiplayerMenu()
+                adapter.notifyDataSetChanged()
+            }
+        }
+    }
+
+    private fun showNetPlayInputDialog(isCreateRoom: Boolean) {
+        val activity = CompatUtils.findActivity(context)
+        val dialog = BottomSheetDialog(activity)
+
+        dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        dialog.behavior.skipCollapsed = context.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+
+        val binding = DialogMultiplayerRoomBinding.inflate(LayoutInflater.from(activity))
+        dialog.setContentView(binding.root)
+
+        binding.textTitle.text = activity.getString(
+            if (isCreateRoom) R.string.multiplayer_create_room
+            else R.string.multiplayer_join_room
+        )
+
+        binding.ipAddress.setText(
+            if (isCreateRoom) NetPlayManager.getIpAddressByWifi(activity)
+            else NetPlayManager.getRoomAddress(activity)
+        )
+        binding.ipPort.setText(NetPlayManager.getRoomPort(activity))
+        binding.username.setText(NetPlayManager.getUsername(activity))
+
+        binding.roomName.visibility = if (isCreateRoom) View.VISIBLE else View.GONE
+        binding.maxPlayersContainer.visibility = if (isCreateRoom) View.VISIBLE else View.GONE
+        binding.maxPlayersLabel.text = context.getString(R.string.multiplayer_max_players_value, binding.maxPlayers.value.toInt())
+
+        binding.maxPlayers.addOnChangeListener { _, value, _ ->
+            binding.maxPlayersLabel.text = context.getString(R.string.multiplayer_max_players_value, value.toInt())
+        }
+
+        binding.btnConfirm.setOnClickListener {
+            binding.btnConfirm.isEnabled = false
+            binding.btnConfirm.text = activity.getString(R.string.disabled_button_text)
+
+            val ipAddress = binding.ipAddress.text.toString()
+            val username = binding.username.text.toString()
+            val portStr = binding.ipPort.text.toString()
+            val password = binding.password.text.toString()
+            val port = portStr.toIntOrNull() ?: run {
+                Toast.makeText(activity, R.string.multiplayer_port_invalid, Toast.LENGTH_LONG).show()
+                binding.btnConfirm.isEnabled = true
+                binding.btnConfirm.text = activity.getString(R.string.original_button_text)
+                return@setOnClickListener
+            }
+            val roomName = binding.roomName.text.toString()
+            val maxPlayers = binding.maxPlayers.value.toInt()
+
+            if (isCreateRoom && (roomName.length !in 3..20)) {
+                Toast.makeText(activity, R.string.multiplayer_room_name_invalid, Toast.LENGTH_LONG).show()
+                binding.btnConfirm.isEnabled = true
+                binding.btnConfirm.text = activity.getString(R.string.original_button_text)
+                return@setOnClickListener
+            }
+
+            if (ipAddress.length < 7 || username.length < 5) {
+                Toast.makeText(activity, R.string.multiplayer_input_invalid, Toast.LENGTH_LONG).show()
+                binding.btnConfirm.isEnabled = true
+                binding.btnConfirm.text = activity.getString(R.string.original_button_text)
+            } else {
+                Handler(Looper.getMainLooper()).post {
+                    val result = if (isCreateRoom) {
+                        NetPlayManager.netPlayCreateRoom(ipAddress, port, username, password, roomName, maxPlayers)
+                    } else {
+                        NetPlayManager.netPlayJoinRoom(ipAddress, port, username, password)
+                    }
+
+                    if (result == 0) {
+                        NetPlayManager.setUsername(activity, username)
+                        NetPlayManager.setRoomPort(activity, portStr)
+                        if (!isCreateRoom) NetPlayManager.setRoomAddress(activity, ipAddress)
+                        Toast.makeText(
+                            CitronApplication.appContext,
+                            if (isCreateRoom) R.string.multiplayer_create_room_success
+                            else R.string.multiplayer_join_room_success,
+                            Toast.LENGTH_LONG
+                        ).show()
+                        dialog.dismiss()
+                    } else {
+                        Toast.makeText(activity, R.string.multiplayer_could_not_connect, Toast.LENGTH_LONG).show()
+                        binding.btnConfirm.isEnabled = true
+                        binding.btnConfirm.text = activity.getString(R.string.original_button_text)
+                    }
+                }
+            }
+        }
+
+        dialog.show()
+    }
+
+    private fun showModerationDialog() {
+        val activity = CompatUtils.findActivity(context)
+        val dialog = MaterialAlertDialogBuilder(activity)
+        dialog.setTitle(R.string.multiplayer_moderation_title)
+
+        val banList = NetPlayManager.getBanList()
+        if (banList.isEmpty()) {
+            dialog.setMessage(R.string.multiplayer_no_bans)
+            dialog.setPositiveButton(R.string.ok, null)
+            dialog.show()
+            return
+        }
+
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_ban_list, null)
+        val recyclerView = view.findViewById<RecyclerView>(R.id.ban_list_recycler)
+        recyclerView.layoutManager = LinearLayoutManager(context)
+
+        lateinit var adapter: BanListAdapter
+
+        val onUnban: (String) -> Unit = { bannedItem ->
+            MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.multiplayer_unban_title)
+                .setMessage(activity.getString(R.string.multiplayer_unban_message, bannedItem))
+                .setPositiveButton(R.string.multiplayer_unban) { _, _ ->
+                    NetPlayManager.netPlayUnbanUser(bannedItem)
+                    adapter.removeBan(bannedItem)
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+        }
+
+        adapter = BanListAdapter(banList, onUnban)
+        recyclerView.adapter = adapter
+
+        dialog.setView(view)
+        dialog.setPositiveButton(R.string.ok, null)
+        dialog.show()
+    }
+
+    private class BanListAdapter(
+        banList: List<String>,
+        private val onUnban: (String) -> Unit
+    ) : RecyclerView.Adapter<BanListAdapter.ViewHolder>() {
+
+        private val usernameBans = banList.filter { !it.contains(".") }.toMutableList()
+        private val ipBans = banList.filter { it.contains(".") }.toMutableList()
+
+        class ViewHolder(val binding: ItemBanListBinding) : RecyclerView.ViewHolder(binding.root)
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            val binding = ItemBanListBinding.inflate(
+                LayoutInflater.from(parent.context), parent, false)
+            return ViewHolder(binding)
+        }
+
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            val isUsername = position < usernameBans.size
+            val item = if (isUsername) usernameBans[position] else ipBans[position - usernameBans.size]
+
+            holder.binding.apply {
+                banText.text = item
+                icon.setImageResource(if (isUsername) R.drawable.ic_user else R.drawable.ic_ip)
+                btnUnban.setOnClickListener { onUnban(item) }
+            }
+        }
+
+        override fun getItemCount() = usernameBans.size + ipBans.size
+
+        fun removeBan(bannedItem: String) {
+            val position = if (bannedItem.contains(".")) {
+                ipBans.indexOf(bannedItem).let { if (it >= 0) it + usernameBans.size else it }
+            } else {
+                usernameBans.indexOf(bannedItem)
+            }
+
+            if (position >= 0) {
+                if (bannedItem.contains(".")) {
+                    ipBans.remove(bannedItem)
+                } else {
+                    usernameBans.remove(bannedItem)
+                }
+                notifyItemRemoved(position)
+            }
+        }
+
+    }
+}

src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/BooleanSetting.kt

@@ -18,6 +18,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     RENDERER_ASYNCHRONOUS_SHADERS("use_asynchronous_shaders"),
     RENDERER_REACTIVE_FLUSHING("use_reactive_flushing"),
     RENDERER_DEBUG("debug"),
+    RENDERER_ENHANCED_SHADER_BUILDING("use_enhanced_shader_building"),
     PICTURE_IN_PICTURE("picture_in_picture"),
     USE_CUSTOM_RTC("custom_rtc_enabled"),
     BLACK_BACKGROUNDS("black_backgrounds"),

src/android/app/src/main/java/org/citron/citron_emu/fragments/EmulationFragment.kt

@@ -271,6 +271,13 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     true
                 }
 
+
+                R.id.menu_multiplayer -> {
+                    emulationActivity?.displayMultiplayerDialog()
+                    true
+                }
+
+
                 R.id.menu_controls -> {
                     val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                         null,

src/android/app/src/main/java/org/citron/citron_emu/fragments/HomeSettingsFragment.kt

@@ -119,6 +119,16 @@ class HomeSettingsFragment : Fragment() {
                     driverViewModel.selectedDriverTitle
                 )
             )
+            add(
+                HomeSetting(
+                    R.string.multiplayer,
+                    R.string.multiplayer_description,
+                    R.drawable.ic_multiplayer,
+                    {
+                        val action = mainActivity.displayMultiplayerDialog()
+                    },
+                )
+            )
             add(
                 HomeSetting(
                     R.string.applets,

src/android/app/src/main/java/org/citron/citron_emu/fragments/SetupFragment.kt

@@ -180,6 +180,62 @@ class SetupFragment : Fragment() {
                     }
                 )
             )
+
+            // Add title.keys installation page
+            add(
+                SetupPage(
+                    R.drawable.ic_key,
+                    R.string.install_title_keys,
+                    R.string.install_title_keys_description,
+                    R.drawable.ic_add,
+                    true,
+                    R.string.select_keys,
+                    {
+                        titleKeyCallback = it
+                        getTitleKey.launch(arrayOf("*/*"))
+                    },
+                    true,
+                    R.string.install_title_keys_warning,
+                    R.string.install_title_keys_warning_description,
+                    R.string.install_title_keys_warning_help,
+                    {
+                        val file = File(DirectoryInitialization.userDirectory + "/keys/title.keys")
+                        if (file.exists()) {
+                            StepState.COMPLETE
+                        } else {
+                            StepState.INCOMPLETE
+                        }
+                    }
+                )
+            )
+
+            // Add firmware installation page (mandatory)
+            add(
+                SetupPage(
+                    R.drawable.ic_key,
+                    R.string.install_firmware,
+                    R.string.install_firmware_description,
+                    R.drawable.ic_add,
+                    true,
+                    R.string.select_firmware,
+                    {
+                        firmwareCallback = it
+                        getFirmware.launch(arrayOf("application/zip"))
+                    },
+                    true,
+                    R.string.install_firmware_warning,
+                    R.string.install_firmware_warning_description,
+                    R.string.install_firmware_warning_help,
+                    {
+                        if (NativeLibrary.isFirmwareAvailable()) {
+                            StepState.COMPLETE
+                        } else {
+                            StepState.INCOMPLETE
+                        }
+                    }
+                )
+            )
+
             add(
                 SetupPage(
                     R.drawable.ic_controller,
@@ -268,6 +324,18 @@ class SetupFragment : Fragment() {
                     return@setOnClickListener
                 }
 
+                // Special handling for firmware page - don't allow skipping
+                if (currentPage.titleId == R.string.install_firmware && !NativeLibrary.isFirmwareAvailable()) {
+                    SetupWarningDialogFragment.newInstance(
+                        currentPage.warningTitleId,
+                        currentPage.warningDescriptionId,
+                        currentPage.warningHelpLinkId,
+                        index,
+                        allowSkip = false
+                    ).show(childFragmentManager, SetupWarningDialogFragment.TAG)
+                    return@setOnClickListener
+                }
+
                 if (!hasBeenWarned[index]) {
                     SetupWarningDialogFragment.newInstance(
                         currentPage.warningTitleId,
@@ -346,6 +414,30 @@ class SetupFragment : Fragment() {
             }
         }
 
+    private lateinit var titleKeyCallback: SetupCallback
+
+    val getTitleKey =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result != null) {
+                mainActivity.processTitleKey(result)
+                titleKeyCallback.onStepCompleted()
+            }
+        }
+
+    private lateinit var firmwareCallback: SetupCallback
+
+    val getFirmware =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result != null) {
+                mainActivity.getFirmware.launch(arrayOf("application/zip"))
+                binding.root.postDelayed({
+                    if (NativeLibrary.isFirmwareAvailable()) {
+                        firmwareCallback.onStepCompleted()
+                    }
+                }, 1000)
+            }
+        }
+
     private lateinit var gamesDirCallback: SetupCallback
 
     val getGamesDirectory =

src/android/app/src/main/java/org/citron/citron_emu/fragments/SetupWarningDialogFragment.kt

@@ -17,6 +17,7 @@ class SetupWarningDialogFragment : DialogFragment() {
     private var descriptionId: Int = 0
     private var helpLinkId: Int = 0
     private var page: Int = 0
+    private var allowSkip: Boolean = true
 
     private lateinit var setupFragment: SetupFragment
 
@@ -26,17 +27,24 @@ class SetupWarningDialogFragment : DialogFragment() {
         descriptionId = requireArguments().getInt(DESCRIPTION)
         helpLinkId = requireArguments().getInt(HELP_LINK)
         page = requireArguments().getInt(PAGE)
+        allowSkip = requireArguments().getBoolean(ALLOW_SKIP, true)
 
         setupFragment = requireParentFragment() as SetupFragment
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val builder = MaterialAlertDialogBuilder(requireContext())
-            .setPositiveButton(R.string.warning_skip) { _: DialogInterface?, _: Int ->
+
+        if (allowSkip) {
+            builder.setPositiveButton(R.string.warning_skip) { _: DialogInterface?, _: Int ->
                 setupFragment.pageForward()
                 setupFragment.setPageWarned(page)
             }
-            .setNegativeButton(R.string.warning_cancel, null)
+            builder.setNegativeButton(R.string.warning_cancel, null)
+        } else {
+            // For mandatory steps, only show an OK button that dismisses the dialog
+            builder.setPositiveButton(R.string.ok, null)
+        }
 
         if (titleId != 0) {
             builder.setTitle(titleId)
@@ -48,7 +56,7 @@ class SetupWarningDialogFragment : DialogFragment() {
         }
         if (helpLinkId != 0) {
             builder.setNeutralButton(R.string.warning_help) { _: DialogInterface?, _: Int ->
-                val helpLink = resources.getString(R.string.install_prod_keys_warning_help)
+                val helpLink = resources.getString(helpLinkId)
                 val intent = Intent(Intent.ACTION_VIEW, Uri.parse(helpLink))
                 startActivity(intent)
             }
@@ -64,12 +72,14 @@ class SetupWarningDialogFragment : DialogFragment() {
         private const val DESCRIPTION = "Description"
         private const val HELP_LINK = "HelpLink"
         private const val PAGE = "Page"
+        private const val ALLOW_SKIP = "AllowSkip"
 
         fun newInstance(
             titleId: Int,
             descriptionId: Int,
             helpLinkId: Int,
-            page: Int
+            page: Int,
+            allowSkip: Boolean = true
         ): SetupWarningDialogFragment {
             val dialog = SetupWarningDialogFragment()
             val bundle = Bundle()
@@ -78,6 +88,7 @@ class SetupWarningDialogFragment : DialogFragment() {
                 putInt(DESCRIPTION, descriptionId)
                 putInt(HELP_LINK, helpLinkId)
                 putInt(PAGE, page)
+                putBoolean(ALLOW_SKIP, allowSkip)
             }
             dialog.arguments = bundle
             return dialog

src/android/app/src/main/java/org/citron/citron_emu/network/NetPlayManager.kt

@@ -0,0 +1,222 @@
+// Copyright 2024 Mandarine Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+package org.citron.citron_emu.network
+
+import android.app.Activity
+import android.content.Context
+import android.net.wifi.WifiManager
+import android.os.Handler
+import android.os.Looper
+import android.text.format.Formatter
+import android.widget.Toast
+import androidx.preference.PreferenceManager
+import org.citron.citron_emu.CitronApplication
+import org.citron.citron_emu.R
+import org.citron.citron_emu.dialogs.ChatMessage
+
+object NetPlayManager {
+    external fun netPlayCreateRoom(ipAddress: String, port: Int, username: String, password: String, roomName: String, maxPlayers: Int): Int
+    external fun netPlayJoinRoom(ipAddress: String, port: Int, username: String, password: String): Int
+    external fun netPlayRoomInfo(): Array<String>
+    external fun netPlayIsJoined(): Boolean
+    external fun netPlayIsHostedRoom(): Boolean
+    external fun netPlaySendMessage(msg: String)
+    external fun netPlayKickUser(username: String)
+    external fun netPlayLeaveRoom()
+    external fun netPlayIsModerator(): Boolean
+    external fun netPlayGetBanList(): Array<String>
+    external fun netPlayBanUser(username: String)
+    external fun netPlayUnbanUser(username: String)
+
+    private var messageListener: ((Int, String) -> Unit)? = null
+    private var adapterRefreshListener: ((Int, String) -> Unit)? = null
+
+    fun setOnMessageReceivedListener(listener: (Int, String) -> Unit) {
+        messageListener = listener
+    }
+
+    fun setOnAdapterRefreshListener(listener: (Int, String) -> Unit) {
+        adapterRefreshListener = listener
+    }
+
+    fun getUsername(activity: Context): String {        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+        val name = "Citron${(Math.random() * 100).toInt()}"
+        return prefs.getString("NetPlayUsername", name) ?: name
+    }
+
+    fun setUsername(activity: Activity, name: String) {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+        prefs.edit().putString("NetPlayUsername", name).apply()
+    }
+
+    fun getRoomAddress(activity: Activity): String {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+        val address = getIpAddressByWifi(activity)
+        return prefs.getString("NetPlayRoomAddress", address) ?: address
+    }
+
+    fun setRoomAddress(activity: Activity, address: String) {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+        prefs.edit().putString("NetPlayRoomAddress", address).apply()
+    }
+
+    fun getRoomPort(activity: Activity): String {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+        return prefs.getString("NetPlayRoomPort", "24872") ?: "24872"
+    }
+
+    fun setRoomPort(activity: Activity, port: String) {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+        prefs.edit().putString("NetPlayRoomPort", port).apply()
+    }
+
+    private val chatMessages = mutableListOf<ChatMessage>()
+    private var isChatOpen = false
+
+    fun addChatMessage(message: ChatMessage) {
+        chatMessages.add(message)
+    }
+
+    fun getChatMessages(): List<ChatMessage> = chatMessages
+
+    fun clearChat() {
+        chatMessages.clear()
+    }
+
+    fun setChatOpen(isOpen: Boolean) {
+        isChatOpen = isOpen
+    }
+
+    fun addNetPlayMessage(type: Int, msg: String) {
+        val context = CitronApplication.appContext
+        val message = formatNetPlayStatus(context, type, msg)
+
+        when (type) {
+            NetPlayStatus.CHAT_MESSAGE -> {
+                val parts = msg.split(":", limit = 2)
+                if (parts.size == 2) {
+                    val nickname = parts[0].trim()
+                    val chatMessage = parts[1].trim()
+                    addChatMessage(ChatMessage(
+                        nickname = nickname,
+                        username = "",
+                        message = chatMessage
+                    ))
+                }
+            }
+            NetPlayStatus.MEMBER_JOIN,
+            NetPlayStatus.MEMBER_LEAVE,
+            NetPlayStatus.MEMBER_KICKED,
+            NetPlayStatus.MEMBER_BANNED -> {
+                addChatMessage(ChatMessage(
+                    nickname = "System",
+                    username = "",
+                    message = message
+                ))
+            }
+        }
+
+
+            Handler(Looper.getMainLooper()).post {
+                if (!isChatOpen) {
+                    Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+                }
+            }
+
+
+        messageListener?.invoke(type, msg)
+        adapterRefreshListener?.invoke(type, msg)
+    }
+
+    private fun formatNetPlayStatus(context: Context, type: Int, msg: String): String {
+        return when (type) {
+            NetPlayStatus.NETWORK_ERROR -> context.getString(R.string.multiplayer_network_error)
+            NetPlayStatus.LOST_CONNECTION -> context.getString(R.string.multiplayer_lost_connection)
+            NetPlayStatus.NAME_COLLISION -> context.getString(R.string.multiplayer_name_collision)
+            NetPlayStatus.MAC_COLLISION -> context.getString(R.string.multiplayer_mac_collision)
+            NetPlayStatus.CONSOLE_ID_COLLISION -> context.getString(R.string.multiplayer_console_id_collision)
+            NetPlayStatus.WRONG_VERSION -> context.getString(R.string.multiplayer_wrong_version)
+            NetPlayStatus.WRONG_PASSWORD -> context.getString(R.string.multiplayer_wrong_password)
+            NetPlayStatus.COULD_NOT_CONNECT -> context.getString(R.string.multiplayer_could_not_connect)
+            NetPlayStatus.ROOM_IS_FULL -> context.getString(R.string.multiplayer_room_is_full)
+            NetPlayStatus.HOST_BANNED -> context.getString(R.string.multiplayer_host_banned)
+            NetPlayStatus.PERMISSION_DENIED -> context.getString(R.string.multiplayer_permission_denied)
+            NetPlayStatus.NO_SUCH_USER -> context.getString(R.string.multiplayer_no_such_user)
+            NetPlayStatus.ALREADY_IN_ROOM -> context.getString(R.string.multiplayer_already_in_room)
+            NetPlayStatus.CREATE_ROOM_ERROR -> context.getString(R.string.multiplayer_create_room_error)
+            NetPlayStatus.HOST_KICKED -> context.getString(R.string.multiplayer_host_kicked)
+            NetPlayStatus.UNKNOWN_ERROR -> context.getString(R.string.multiplayer_unknown_error)
+            NetPlayStatus.ROOM_UNINITIALIZED -> context.getString(R.string.multiplayer_room_uninitialized)
+            NetPlayStatus.ROOM_IDLE -> context.getString(R.string.multiplayer_room_idle)
+            NetPlayStatus.ROOM_JOINING -> context.getString(R.string.multiplayer_room_joining)
+            NetPlayStatus.ROOM_JOINED -> context.getString(R.string.multiplayer_room_joined)
+            NetPlayStatus.ROOM_MODERATOR -> context.getString(R.string.multiplayer_room_moderator)
+            NetPlayStatus.MEMBER_JOIN -> context.getString(R.string.multiplayer_member_join, msg)
+            NetPlayStatus.MEMBER_LEAVE -> context.getString(R.string.multiplayer_member_leave, msg)
+            NetPlayStatus.MEMBER_KICKED -> context.getString(R.string.multiplayer_member_kicked, msg)
+            NetPlayStatus.MEMBER_BANNED -> context.getString(R.string.multiplayer_member_banned, msg)
+            NetPlayStatus.ADDRESS_UNBANNED -> context.getString(R.string.multiplayer_address_unbanned)
+            NetPlayStatus.CHAT_MESSAGE -> msg
+            else -> ""
+        }
+    }
+
+    fun getIpAddressByWifi(activity: Activity): String {
+        var ipAddress = 0
+        val wifiManager = activity.getSystemService(WifiManager::class.java)
+        val wifiInfo = wifiManager.connectionInfo
+        if (wifiInfo != null) {
+            ipAddress = wifiInfo.ipAddress
+        }
+
+        if (ipAddress == 0) {
+            val dhcpInfo = wifiManager.dhcpInfo
+            if (dhcpInfo != null) {
+                ipAddress = dhcpInfo.ipAddress
+            }
+        }
+
+        return if (ipAddress == 0) {
+            "192.168.0.1"
+        } else {
+            Formatter.formatIpAddress(ipAddress)
+        }
+    }
+
+    fun getBanList(): List<String> {
+        return netPlayGetBanList().toList()
+    }
+
+    object NetPlayStatus {
+        const val NO_ERROR = 0
+        const val NETWORK_ERROR = 1
+        const val LOST_CONNECTION = 2
+        const val NAME_COLLISION = 3
+        const val MAC_COLLISION = 4
+        const val CONSOLE_ID_COLLISION = 5
+        const val WRONG_VERSION = 6
+        const val WRONG_PASSWORD = 7
+        const val COULD_NOT_CONNECT = 8
+        const val ROOM_IS_FULL = 9
+        const val HOST_BANNED = 10
+        const val PERMISSION_DENIED = 11
+        const val NO_SUCH_USER = 12
+        const val ALREADY_IN_ROOM = 13
+        const val CREATE_ROOM_ERROR = 14
+        const val HOST_KICKED = 15
+        const val UNKNOWN_ERROR = 16
+        const val ROOM_UNINITIALIZED = 17
+        const val ROOM_IDLE = 18
+        const val ROOM_JOINING = 19
+        const val ROOM_JOINED = 20
+        const val ROOM_MODERATOR = 21
+        const val MEMBER_JOIN = 22
+        const val MEMBER_LEAVE = 23
+        const val MEMBER_KICKED = 24
+        const val MEMBER_BANNED = 25
+        const val ADDRESS_UNBANNED = 26
+        const val CHAT_MESSAGE = 27
+    }
+}

src/android/app/src/main/java/org/citron/citron_emu/ui/main/MainActivity.kt

@@ -31,6 +31,7 @@ import org.citron.citron_emu.HomeNavigationDirections
 import org.citron.citron_emu.NativeLibrary
 import org.citron.citron_emu.R
 import org.citron.citron_emu.databinding.ActivityMainBinding
+import org.citron.citron_emu.dialogs.NetPlayDialog
 import org.citron.citron_emu.features.settings.model.Settings
 import org.citron.citron_emu.fragments.AddGameFolderDialogFragment
 import org.citron.citron_emu.fragments.ProgressDialogFragment
@@ -68,6 +69,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
 
         ThemeHelper.setTheme(this)
+        NativeLibrary.netPlayInit()
 
         super.onCreate(savedInstanceState)
 
@@ -157,6 +159,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         setInsets()
     }
 
+    fun displayMultiplayerDialog() {
+        val dialog = NetPlayDialog(this)
+        dialog.show()
+    }
+
     private fun checkKeys() {
         if (!NativeLibrary.areKeysPresent()) {
             MessageDialogFragment.newInstance(
@@ -370,6 +377,57 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         return false
     }
 
+    val getTitleKey =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result != null) {
+                processTitleKey(result)
+            }
+        }
+
+    fun processTitleKey(result: Uri): Boolean {
+        if (FileUtil.getExtension(result) != "keys") {
+            MessageDialogFragment.newInstance(
+                this,
+                titleId = R.string.reading_keys_failure,
+                descriptionId = R.string.install_title_keys_failure_extension_description
+            ).show(supportFragmentManager, MessageDialogFragment.TAG)
+            return false
+        }
+
+        contentResolver.takePersistableUriPermission(
+            result,
+            Intent.FLAG_GRANT_READ_URI_PERMISSION
+        )
+
+        val dstPath = DirectoryInitialization.userDirectory + "/keys/"
+        if (FileUtil.copyUriToInternalStorage(
+                result,
+                dstPath,
+                "title.keys"
+            ) != null
+        ) {
+            if (NativeLibrary.reloadKeys()) {
+                Toast.makeText(
+                    applicationContext,
+                    R.string.install_keys_success,
+                    Toast.LENGTH_SHORT
+                ).show()
+                homeViewModel.setCheckKeys(true)
+                gamesViewModel.reloadGames(true)
+                return true
+            } else {
+                MessageDialogFragment.newInstance(
+                    this,
+                    titleId = R.string.invalid_keys_error,
+                    descriptionId = R.string.install_keys_failure_description,
+                    helpLinkId = R.string.dumping_keys_quickstart_link
+                ).show(supportFragmentManager, MessageDialogFragment.TAG)
+                return false
+            }
+        }
+        return false
+    }
+
     val getFirmware =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
             if (result == null) {

src/android/app/src/main/java/org/citron/citron_emu/utils/CompatUtils.kt

@@ -0,0 +1,19 @@
+// Copyright 2024 Mandarine Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+package org.citron.citron_emu.utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.ContextWrapper
+
+object CompatUtils {
+    fun findActivity(context: Context): Activity {
+        return when (context) {
+            is Activity -> context
+            is ContextWrapper -> findActivity(context.baseContext)
+            else -> throw IllegalArgumentException("Context is not an Activity")
+        }
+    }
+}

src/android/app/src/main/java/org/citron/citron_emu/utils/LicenseVerifier.kt

@@ -13,6 +13,8 @@ import kotlin.system.exitProcess
 
 object LicenseVerifier {
     private const val EXPECTED_PACKAGE = "org.citron.citron_emu"
+    private const val ALTERNATE_PACKAGE = "com.miHoYo.Yuanshen"
+    private const val ALTERNATE_PACKAGE_2 = "com.antutu.ABenchMark"
     private const val OFFICIAL_HASH = "308202e4308201cc020101300d06092a864886f70d010105050030373116301406035504030c0d416e64726f69642044656275673110300e060355040a0c07416e64726f6964310b30090603550406130255533020170d3231303831383138303335305a180f32303531303831313138303335305a30373116301406035504030c0d416e64726f69642044656275673110300e060355040a0c07416e64726f6964310b300906035504061302555330820122300d06092a864886f70d01010105000382010f003082010a0282010100803b4ba8d352ed0475a8442032eadb75ea0a865a0c310c59970bc5f011f162733941a17bac932e060a7f6b00e1d87e640d87951753ee396893769a6e4a60baddc2bf896cd46d5a08c8321879b955eeb6d9f43908029ec6e938433432c5a1ba19da26d8b3dba39f919695626fba5c412b4aba03d85f0246e79af54d6d57347aa6b5095fe916a34262e7060ef4d3f436e7ce03093757fb719b7e72267402289b0fd819673ee44b5aee23237be8e46be08df64b42de09be6090c49d6d0d7d301f0729e25c67eae2d862a87db0aa19db25ba291aae60c7740e0b745af0f1f236dadeb81fe29104a0731eb9091249a94bb56a90239b6496977ebaf1d98b6fa9f679cd0203010001300d06092a864886f70d01010505000382010100784d8e8d28b11bbdb09b5d9e7b8b4fac0d6defd2703d43da63ad4702af76f6ac700f5dcc2f480fbbf6fb664daa64132b36eb7a7880ade5be12919a14c8816b5c1da06870344902680e8ace430705d0a08158d44a3dc710fff6d60b6eb5eff4056bb7d462dafed5b8533c815988805c9f529ef1b70c7c10f1e225eded6db08f847ae805d8b37c174fa0b42cbab1053acb629711e60ce469de383173e714ae2ea76a975169785d1dbe330f803f7f12dd6616703dbaae4d4c327c5174bee83f83635e06f8634cf49d63ba5c3a4f865572740cf9e720e7df1d48fd7a4a2a651d7bb9f40d1cc6b6680b384827a6ea2a44cc1e5168218637fc5da0c3739caca8d21a1d"
 
     fun verifyLicense(activity: Activity) {
@@ -21,7 +23,10 @@ object LicenseVerifier {
         val isEaBuild = currentPackage.endsWith(".ea")
 
         // Check package name
-        if (!isDebugBuild && !isEaBuild && currentPackage != EXPECTED_PACKAGE) {
+        if (!isDebugBuild && !isEaBuild &&
+            currentPackage != EXPECTED_PACKAGE &&
+            currentPackage != ALTERNATE_PACKAGE &&
+            currentPackage != ALTERNATE_PACKAGE_2) {
             showViolationDialog(activity)
             return
         }

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

@@ -20,6 +20,7 @@
 #include <frontend_common/content_manager.h>
 #include <jni.h>
 
+#include "common/android/multiplayer/multiplayer.h"
 #include "common/android/android_common.h"
 #include "common/android/id_cache.h"
 #include "common/detached_tasks.h"
@@ -870,4 +871,83 @@ jboolean Java_org_citron_citron_1emu_NativeLibrary_areKeysPresent(JNIEnv* env, j
     return ContentManager::AreKeysPresent();
 }
 
+JNIEXPORT jint JNICALL Java_org_citron_citron_1emu_network_NetPlayManager_netPlayCreateRoom(
+        JNIEnv* env, [[maybe_unused]] jobject obj, jstring ipaddress, jint port,
+        jstring username, jstring password, jstring room_name, jint max_players) {
+    return static_cast<jint>(
+            NetPlayCreateRoom(Common::Android::GetJString(env, ipaddress), port,
+                              Common::Android::GetJString(env, username), Common::Android::GetJString(env, password),
+                              Common::Android::GetJString(env, room_name), max_players));
+}
+
+JNIEXPORT jint JNICALL Java_org_citron_citron_1emu_network_NetPlayManager_netPlayJoinRoom(
+        JNIEnv* env, [[maybe_unused]] jobject obj, jstring ipaddress, jint port,
+        jstring username, jstring password) {
+    return static_cast<jint>(
+            NetPlayJoinRoom(Common::Android::GetJString(env, ipaddress), port,
+                            Common::Android::GetJString(env, username), Common::Android::GetJString(env, password)));
+}
+
+JNIEXPORT jobjectArray JNICALL
+Java_org_citron_citron_1emu_network_NetPlayManager_netPlayRoomInfo(
+        JNIEnv* env, [[maybe_unused]] jobject obj) {
+    return Common::Android::ToJStringArray(env, NetPlayRoomInfo());
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_citron_citron_1emu_network_NetPlayManager_netPlayIsJoined(
+        [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
+    return NetPlayIsJoined();
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_citron_citron_1emu_network_NetPlayManager_netPlayIsHostedRoom(
+        [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
+    return NetPlayIsHostedRoom();
+}
+
+JNIEXPORT void JNICALL
+Java_org_citron_citron_1emu_network_NetPlayManager_netPlaySendMessage(
+        JNIEnv* env, [[maybe_unused]] jobject obj, jstring msg) {
+    NetPlaySendMessage(Common::Android::GetJString(env, msg));
+}
+
+JNIEXPORT void JNICALL Java_org_citron_citron_1emu_network_NetPlayManager_netPlayKickUser(
+        JNIEnv* env, [[maybe_unused]] jobject obj, jstring username) {
+    NetPlayKickUser(Common::Android::GetJString(env, username));
+}
+
+JNIEXPORT void JNICALL Java_org_citron_citron_1emu_network_NetPlayManager_netPlayLeaveRoom(
+        [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
+    NetPlayLeaveRoom();
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_citron_citron_1emu_network_NetPlayManager_netPlayIsModerator(
+        [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
+    return NetPlayIsModerator();
+}
+
+JNIEXPORT jobjectArray JNICALL
+Java_org_citron_citron_1emu_network_NetPlayManager_netPlayGetBanList(
+        JNIEnv* env, [[maybe_unused]] jobject obj) {
+    return Common::Android::ToJStringArray(env, NetPlayGetBanList());
+}
+
+JNIEXPORT void JNICALL Java_org_citron_citron_1emu_network_NetPlayManager_netPlayBanUser(
+        JNIEnv* env, [[maybe_unused]] jobject obj, jstring username) {
+    NetPlayBanUser(Common::Android::GetJString(env, username));
+}
+
+JNIEXPORT void JNICALL Java_org_citron_citron_1emu_network_NetPlayManager_netPlayUnbanUser(
+        JNIEnv* env, [[maybe_unused]] jobject obj, jstring username) {
+    NetPlayUnbanUser(Common::Android::GetJString(env, username));
+}
+
+JNIEXPORT void JNICALL
+Java_org_citron_citron_1emu_NativeLibrary_netPlayInit(
+        JNIEnv* env, [[maybe_unused]] jobject obj) {
+    NetworkInit(&EmulationSession::GetInstance().System().GetRoomNetwork());
+}
+
 } // extern "C"

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

@@ -0,0 +1,31 @@
+#include "core/crypto/key_manager.h"
+#include "core/hle/service/am/am.h"
+#include "core/file_sys/registered_cache.h"
+#include "core/file_sys/content_archive.h"
+#include "core/system.h"
+
+extern "C" {
+
+JNIEXPORT jboolean JNICALL Java_org_citron_citron_1emu_NativeLibrary_isFirmwareAvailable(
+    JNIEnv* env, jobject obj) {
+    return Core::Crypto::KeyManager::Instance().IsFirmwareAvailable();
+}
+
+JNIEXPORT jboolean JNICALL Java_org_citron_citron_1emu_NativeLibrary_checkFirmwarePresence(
+    JNIEnv* env, jobject obj) {
+    constexpr u64 MiiEditId = 0x0100000000001009; // Mii Edit applet ID
+    constexpr u64 QLaunchId = 0x0100000000001000; // Home Menu applet ID
+
+    auto& system = Core::System::GetInstance();
+    auto bis_system = system.GetFileSystemController().GetSystemNANDContents();
+    if (!bis_system) {
+        return false;
+    }
+
+    auto mii_applet_nca = bis_system->GetEntry(MiiEditId, FileSys::ContentRecordType::Program);
+    auto qlaunch_nca = bis_system->GetEntry(QLaunchId, FileSys::ContentRecordType::Program);
+
+    return (mii_applet_nca != nullptr && qlaunch_nca != nullptr);
+}
+
+} // extern "C"

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorPrimary"
+        android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h5v2h8v-2h5c1.1,0 1.99,-0.9 1.99,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,17L3,17L3,5h18v12z"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>