The-Homebrew-Cloud/Lime3DS
2
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2024-12-25 01:11:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

The big rebrand commit

Browse Source 
- Rebranded executable files to reference Lime instead of Citra
- Rebranded many files in the source tree to reference Lime instead of Citra
- Rebranded many resource files to reference Lime instead of Citra
- Rebranded all instances of Citra's reverse DNS to Lime's reverse DNS
- Other small misc rebrands
This commit is contained in:
OpenSauce 2024-03-31 16:50:40 +01:00 committed by GitHub
parent c3972fa1dd
commit 6cf2c37392
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
394 changed files with 33257 additions and 33257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/macos-universal.sh
View File

@ -11,7 +11,7 @@ BASE_ARTIFACT_ARCH="${BASE_ARTIFACT##*-}"
mv $BASE_ARTIFACT $BUNDLE_DIR mv $BASE_ARTIFACT $BUNDLE_DIR
# Executable binary paths that need to be combined. # Executable binary paths that need to be combined.
BIN_PATHS=(citra citra-room citra-qt.app/Contents/MacOS/citra-qt) BIN_PATHS=(lime lime-room lime-qt.app/Contents/MacOS/lime-qt)
# Dylib paths that need to be combined. # Dylib paths that need to be combined.
IFS=$'\n' IFS=$'\n'
@ -37,7 +37,7 @@ for OTHER_ARTIFACT in "${ARTIFACTS_LIST[@]:1}"; do
done done
# Re-sign executables and bundles after combining. # Re-sign executables and bundles after combining.
APP_PATHS=(citra citra-room citra-qt.app) APP_PATHS=(lime lime-room lime-qt.app)
for APP_PATH in "${APP_PATHS[@]}"; do for APP_PATH in "${APP_PATHS[@]}"; do
codesign --deep -fs - $BUNDLE_DIR/$APP_PATH codesign --deep -fs - $BUNDLE_DIR/$APP_PATH
done done

30
CMakeLists.txt
View File

@ -15,7 +15,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modul
include(DownloadExternals) include(DownloadExternals)
include(CMakeDependentOption) include(CMakeDependentOption)
project(citra LANGUAGES C CXX ASM) project(lime LANGUAGES C CXX ASM)
# Some submodules like to pick their own default build type if not specified. # Some submodules like to pick their own default build type if not specified.
# Make sure we default to Release build type always, unless the generator has custom types. # Make sure we default to Release build type always, unless the generator has custom types.
@ -156,9 +156,9 @@ configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
COPYONLY) COPYONLY)
if (ENABLE_COMPATIBILITY_LIST_DOWNLOAD AND NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json) if (ENABLE_COMPATIBILITY_LIST_DOWNLOAD AND NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
message(STATUS "Downloading compatibility list for citra...") message(STATUS "Downloading compatibility list for lime...")
file(DOWNLOAD file(DOWNLOAD
https://api.citra-emu.org/gamedb/ https://api.lime-emu.org/gamedb/
"${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json" SHOW_PROGRESS) "${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json" SHOW_PROGRESS)
endif() endif()
if (EXISTS ${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json) if (EXISTS ${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json)
@ -317,7 +317,7 @@ if (NOT CLANG_FORMAT)
message(STATUS "Clang format not found! Downloading...") message(STATUS "Clang format not found! Downloading...")
set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe") set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe")
file(DOWNLOAD file(DOWNLOAD
https://github.com/citra-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe https://github.com/lime-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
"${CLANG_FORMAT}" SHOW_PROGRESS "${CLANG_FORMAT}" SHOW_PROGRESS
STATUS DOWNLOAD_SUCCESS) STATUS DOWNLOAD_SUCCESS)
if (NOT DOWNLOAD_SUCCESS EQUAL 0) if (NOT DOWNLOAD_SUCCESS EQUAL 0)
@ -434,11 +434,11 @@ add_subdirectory(src)
add_subdirectory(dist/installer) add_subdirectory(dist/installer)
# Set citra-qt project or citra project as default StartUp Project in Visual Studio depending on whether QT is enabled or not # Set lime-qt project or lime project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
if(ENABLE_QT) if(ENABLE_QT)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra-qt) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lime-qt)
else() else()
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lime)
endif() endif()
# Create target for outputting distributable bundles. # Create target for outputting distributable bundles.
@ -446,13 +446,13 @@ endif()
if (NOT ANDROID AND NOT IOS) if (NOT ANDROID AND NOT IOS)
include(BundleTarget) include(BundleTarget)
if (ENABLE_SDL2_FRONTEND) if (ENABLE_SDL2_FRONTEND)
bundle_target(citra) bundle_target(lime)
endif() endif()
if (ENABLE_QT) if (ENABLE_QT)
bundle_target(citra-qt) bundle_target(lime-qt)
endif() endif()
if (ENABLE_DEDICATED_ROOM) if (ENABLE_DEDICATED_ROOM)
bundle_target(citra-room) bundle_target(lime-room)
endif() endif()
endif() endif()
@ -464,22 +464,22 @@ endif()
# http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
# http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html # http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
if(ENABLE_QT AND UNIX AND NOT APPLE) if(ENABLE_QT AND UNIX AND NOT APPLE)
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra-qt.desktop" install(FILES "${PROJECT_SOURCE_DIR}/dist/lime-qt.desktop"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications") DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.svg" install(FILES "${PROJECT_SOURCE_DIR}/dist/lime.svg"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps") DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.xml" install(FILES "${PROJECT_SOURCE_DIR}/dist/lime.xml"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/mime/packages") DESTINATION "${CMAKE_INSTALL_PREFIX}/share/mime/packages")
endif() endif()
if(UNIX) if(UNIX)
if(ENABLE_SDL2) if(ENABLE_SDL2)
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.6" install(FILES "${PROJECT_SOURCE_DIR}/dist/lime.6"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6") DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6")
endif() endif()
if (ENABLE_QT) if (ENABLE_QT)
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra-qt.6" install(FILES "${PROJECT_SOURCE_DIR}/dist/lime-qt.6"
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6") DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6")
endif() endif()
endif() endif()

4
CMakeModules/BundleTarget.cmake
View File

@ -124,7 +124,7 @@ if (BUNDLE_TARGET_EXECUTE)
${extra_linuxdeploy_args} ${extra_linuxdeploy_args}
--plugin checkrt --plugin checkrt
--executable "${executable_path}" --executable "${executable_path}"
--icon-file "${source_path}/dist/citra.svg" --icon-file "${source_path}/dist/lime.svg"
--desktop-file "${source_path}/dist/${executable_name}.desktop" --desktop-file "${source_path}/dist/${executable_name}.desktop"
--appdir "${appdir_path}" --appdir "${appdir_path}"
RESULT_VARIABLE linuxdeploy_appdir_result) RESULT_VARIABLE linuxdeploy_appdir_result)
@ -282,7 +282,7 @@ else()
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/dist/") COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/dist/")
add_custom_command( add_custom_command(
TARGET bundle TARGET bundle
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dist/icon.png" "${CMAKE_BINARY_DIR}/bundle/dist/citra.png") COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dist/icon.png" "${CMAKE_BINARY_DIR}/bundle/dist/lime.png")
add_custom_command( add_custom_command(
TARGET bundle TARGET bundle
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/license.txt" "${CMAKE_BINARY_DIR}/bundle/") COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/license.txt" "${CMAKE_BINARY_DIR}/bundle/")

0
dist/apple/citra.icns → dist/apple/lime.icns vendored
View File

2924
dist/languages/da_DK.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/de.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/el.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/es_ES.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/fi.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/fr.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/hu_HU.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/id.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/it.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/ja_JP.ts vendored
View File

File diff suppressed because it is too large Load Diff

2926
dist/languages/ko_KR.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/lt_LT.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/nb.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/nl.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/pl_PL.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/pt_BR.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/ro_RO.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/ru_RU.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/tr_TR.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/vi_VN.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/zh_CN.ts vendored
View File

File diff suppressed because it is too large Load Diff

2924
dist/languages/zh_TW.ts vendored
View File

File diff suppressed because it is too large Load Diff

20
dist/citra-qt.6 → dist/lime-qt.6 vendored
View File

@ -1,16 +1,16 @@
.Dd November 22 2016 .Dd November 22 2016
.Dt citra-qt 6 .Dt lime-qt 6
.Os .Os
.Sh NAME .Sh NAME
.Nm Citra-Qt .Nm Lime-Qt
.Nd Nintendo 3DS Emulator/Debugger (Qt) .Nd Nintendo 3DS Emulator/Debugger (Qt)
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm citra-qt .Nm lime-qt
.Op Ar file .Op Ar file
.Sh DESCRIPTION .Sh DESCRIPTION
Citra is an experimental open-source Nintendo 3DS emulator/debugger. Lime is an experimental open-source Nintendo 3DS emulator/debugger.
.Pp .Pp
.Nm citra-qt .Nm lime-qt
is the Qt implementation. is the Qt implementation.
.Sh FILES .Sh FILES
.Bl -tag -width Ds .Bl -tag -width Ds
@ -22,19 +22,19 @@ Configuration files.
.Sh AUTHORS .Sh AUTHORS
This document is made available to you under the CC-BY license. This document is made available to you under the CC-BY license.
.Pp .Pp
Citra is made by a team of volunteers. These contributors are listed Lime is made by a team of volunteers. These contributors are listed
at <\fBhttps://github.com/citra-emu/citra/contributors\fR>. at <\https://github.com/Lime3DS/Lime3DS/contributors\fR>.
.Pp .Pp
.Sh SEE ALSO .Sh SEE ALSO
.Bl -tag -width Ds .Bl -tag -width Ds
.It Xr citra 6 .It Xr lime 6
The SDL frontend of the application The SDL frontend of the application
.El .El
.Pp .Pp
Resources are available for this project: Resources are available for this project:
.Bl -tag -width Ds .Bl -tag -width Ds
.It <\fBhttps://citra-emu.org\fR> .It <\fBhttps://lime3ds.github.io\fR>
The main homepage of the project. The main homepage of the project.
.It <\fBhttps://github.com/citra-emu/citra\fR> .It <\fBhttps://github.com/Lime3DS/Lime3DS\fR>
The main source code repository for the Citra emulator. The main source code repository for the Citra emulator.
.Pp .Pp

6
dist/citra-qt.desktop → dist/lime-qt.desktop vendored
View File

@ -6,9 +6,9 @@ GenericName=3DS Emulator
GenericName[fr]=Émulateur 3DS GenericName[fr]=Émulateur 3DS
Comment=Nintendo 3DS video game console emulator Comment=Nintendo 3DS video game console emulator
Comment[fr]=Émulateur de console de jeu Nintendo 3DS Comment[fr]=Émulateur de console de jeu Nintendo 3DS
Icon=citra Icon=lime
TryExec=citra-qt TryExec=lime-qt
Exec=citra-qt %f Exec=lime-qt %f
Categories=Game;Emulator;Qt; Categories=Game;Emulator;Qt;
MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi; MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;
Keywords=3DS;Nintendo; Keywords=3DS;Nintendo;

6
dist/citra-room.desktop → dist/lime-room.desktop vendored
View File

@ -3,8 +3,8 @@ Version=1.0
Type=Application Type=Application
Name=Lime3DS Room Name=Lime3DS Room
Comment=Multiplayer room host for Lime3DS Comment=Multiplayer room host for Lime3DS
Icon=citra Icon=lime
TryExec=citra-room TryExec=lime-room
Exec=citra-room %f Exec=lime-room %f
Categories=Game;Emulator; Categories=Game;Emulator;
Keywords=3DS;Nintendo Keywords=3DS;Nintendo

26
dist/citra.6 → dist/lime.6 vendored
View File

@ -1,11 +1,11 @@
.Dd November 22 2016 .Dd November 22 2016
.Dt citra 6 .Dt lime 6
.Os .Os
.Sh NAME .Sh NAME
.Nm Citra .Nm Lime
.Nd Nintendo 3DS Emulator/Debugger (SDL) .Nd Nintendo 3DS Emulator/Debugger (SDL)
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm citra .Nm lime
.Op Ar options .Op Ar options
.Op Ar file .Op Ar file
.Sh OPTIONS .Sh OPTIONS
@ -17,33 +17,33 @@ Shows syntax help and exits
.It Fl v , Fl Fl version .It Fl v , Fl Fl version
Describes the installed version and exits Describes the installed version and exits
.Sh DESCRIPTION .Sh DESCRIPTION
Citra is an experimental open-source Nintendo 3DS emulator/debugger. Lime is an experimental open-source Nintendo 3DS emulator/debugger.
.Pp .Pp
.Nm citra .Nm lime
is the Simple DirectMedia Layer (SDL) implementation. is the Simple DirectMedia Layer (SDL) implementation.
.Sh FILES .Sh FILES
.Bl -tag -width Ds .Bl -tag -width Ds
.It Pa $XDG_DATA_HOME/citra-emu .It Pa $XDG_DATA_HOME/lime-emu
Emulator storage. Emulator storage.
.It Pa $XDG_CONFIG_HOME/citra-emu .It Pa $XDG_CONFIG_HOME/lime-emu
Configuration files. Configuration files.
.El .El
.Sh AUTHORS .Sh AUTHORS
This document is made available to you under the CC-BY license. This document is made available to you under the CC-BY license.
.Pp .Pp
Citra is made by a team of volunteers. These contributors are listed Lime is made by a team of volunteers. These contributors are listed
at <\fBhttps://github.com/citra-emu/citra/contributors\fR>. at <\fBhttps://github.com/lime-emu/lime/contributors\fR>.
.Pp .Pp
.Sh SEE ALSO .Sh SEE ALSO
.Bl -tag -width Ds .Bl -tag -width Ds
.It Xr citra-qt 6 .It Xr lime-qt 6
The Qt frontend of the application The Qt frontend of the application
.El .El
.Pp .Pp
Resources are available for this project: Resources are available for this project:
.Bl -tag -width Ds .Bl -tag -width Ds
.It <\fBhttps://citra-emu.org\fR> .It <\fBhttps://lime-emu.org\fR>
The main homepage of the project. The main homepage of the project.
.It <\fBhttps://github.com/citra-emu/citra\fR> .It <\fBhttps://github.com/lime-emu/lime\fR>
The main source code repository for the Citra emulator. The main source code repository for the Lime emulator.
.Pp .Pp

6
dist/citra.desktop → dist/lime.desktop vendored
View File

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

0
dist/citra.ico → dist/lime.ico vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 361 KiB

0
dist/citra.manifest → dist/lime.manifest vendored
View File

0
dist/citra.png → dist/lime.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 KiB

After

Width:  |  Height:  |  Size: 199 KiB

0
dist/citra.svg → dist/lime.svg vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 216 KiB

After

Width:  |  Height:  |  Size: 216 KiB

8
dist/citra.xml → dist/lime.xml vendored
View File

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

2
dist/qt_themes/default/default.qrc vendored
View File

@ -13,7 +13,7 @@
<file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file> <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
<file alias="48x48/plus.png">icons/48x48/plus.png</file> <file alias="48x48/plus.png">icons/48x48/plus.png</file>
<file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file> <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
<file alias="256x256/citra.png">icons/256x256/citra.png</file> <file alias="256x256/lime.png">icons/256x256/lime.png</file>
<file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file> <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
</qresource> </qresource>
<qresource prefix="default"> <qresource prefix="default">

0
dist/qt_themes/default/icons/256x256/citra.png → dist/qt_themes/default/icons/256x256/lime.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

2
externals/boost vendored

@ -1 +1 @@
Subproject commit 3c27c785ad0f8a742af02e620dc225673f3a12d8 Subproject commit 80f97ea03b5412baddaba8bef1222b112076c997

6
src/CMakeLists.txt
View File

@ -181,11 +181,11 @@ if (ENABLE_TESTS)
endif() endif()
if (ENABLE_SDL2 AND ENABLE_SDL2_FRONTEND) if (ENABLE_SDL2 AND ENABLE_SDL2_FRONTEND)
add_subdirectory(citra) add_subdirectory(lime)
endif() endif()
if (ENABLE_QT) if (ENABLE_QT)
add_subdirectory(citra_qt) add_subdirectory(lime_qt)
endif() endif()
if (ENABLE_DEDICATED_ROOM) if (ENABLE_DEDICATED_ROOM)
@ -194,7 +194,7 @@ endif()
if (ANDROID) if (ANDROID)
add_subdirectory(android/app/src/main/jni) add_subdirectory(android/app/src/main/jni)
target_include_directories(citra-android PRIVATE android/app/src/main) target_include_directories(lime-android PRIVATE android/app/src/main)
endif() endif()
if (ENABLE_WEB_SERVICE) if (ENABLE_WEB_SERVICE)

4
src/android/app/build.gradle.kts
View File

@ -26,7 +26,7 @@ val downloadedJniLibsPath = "${buildDir}/downloadedJniLibs"
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
android { android {
namespace = "org.citra.citra_emu" namespace = "io.github.lime3ds"
compileSdkVersion = "android-34" compileSdkVersion = "android-34"
ndkVersion = "26.1.10909125" ndkVersion = "26.1.10909125"
@ -61,7 +61,7 @@ android {
defaultConfig { defaultConfig {
// TODO If this is ever modified, change application_id in strings.xml // TODO If this is ever modified, change application_id in strings.xml
applicationId = "org.citra.citra_emu" applicationId = "io.github.lime3ds"
minSdk = 28 minSdk = 28
targetSdk = 34 targetSdk = 34
versionCode = autoVersion versionCode = autoVersion

12
src/android/app/src/main/AndroidManifest.xml
View File

@ -33,7 +33,7 @@
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<application <application
android:name="org.citra.citra_emu.CitraApplication" android:name="io.github.lime3ds.CitraApplication"
android:label="@string/app_name" android:label="@string/app_name"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:allowBackup="false" android:allowBackup="false"
@ -46,7 +46,7 @@
android:resource="@xml/game_mode_config" /> android:resource="@xml/game_mode_config" />
<activity <activity
android:name="org.citra.citra_emu.ui.main.MainActivity" android:name="io.github.lime3ds.ui.main.MainActivity"
android:theme="@style/Theme.Citra.Splash.Main" android:theme="@style/Theme.Citra.Splash.Main"
android:exported="true"> android:exported="true">
@ -59,13 +59,13 @@
</activity> </activity>
<activity <activity
android:name="org.citra.citra_emu.features.settings.ui.SettingsActivity" android:name="io.github.lime3ds.features.settings.ui.SettingsActivity"
android:configChanges="orientation|screenSize|uiMode" android:configChanges="orientation|screenSize|uiMode"
android:theme="@style/Theme.Citra.Main" android:theme="@style/Theme.Citra.Main"
android:label="@string/preferences_settings"/> android:label="@string/preferences_settings"/>
<activity <activity
android:name="org.citra.citra_emu.activities.EmulationActivity" android:name="io.github.lime3ds.activities.EmulationActivity"
android:exported="true" android:exported="true"
android:theme="@style/Theme.Citra.Main" android:theme="@style/Theme.Citra.Main"
android:launchMode="singleTop"> android:launchMode="singleTop">
@ -80,12 +80,12 @@
</activity> </activity>
<service android:name="org.citra.citra_emu.utils.ForegroundService" android:foregroundServiceType="specialUse"> <service android:name="io.github.lime3ds.utils.ForegroundService" android:foregroundServiceType="specialUse">
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="Keep emulation running in background"/> <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="Keep emulation running in background"/>
</service> </service>
<activity <activity
android:name="org.citra.citra_emu.features.cheats.ui.CheatsActivity" android:name="io.github.lime3ds.features.cheats.ui.CheatsActivity"
android:exported="false" android:exported="false"
android:theme="@style/Theme.Citra.Main" android:theme="@style/Theme.Citra.Main"
android:label="@string/cheats"/> android:label="@string/cheats"/>

14
src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu package io.github.lime3ds
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Application import android.app.Application
@ -10,12 +10,12 @@ import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
import org.citra.citra_emu.utils.DirectoryInitialization import io.github.lime3ds.utils.DirectoryInitialization
import org.citra.citra_emu.utils.DocumentsTree import io.github.lime3ds.utils.DocumentsTree
import org.citra.citra_emu.utils.GpuDriverHelper import io.github.lime3ds.utils.GpuDriverHelper
import org.citra.citra_emu.utils.PermissionsHandler import io.github.lime3ds.utils.PermissionsHandler
import org.citra.citra_emu.utils.Log import io.github.lime3ds.utils.Log
import org.citra.citra_emu.utils.MemoryUtil import io.github.lime3ds.utils.MemoryUtil
class CitraApplication : Application() { class CitraApplication : Application() {
private fun createNotificationChannel() { private fun createNotificationChannel() {

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu package io.github.lime3ds
import android.Manifest.permission import android.Manifest.permission
import android.app.Dialog import android.app.Dialog
@ -20,10 +20,10 @@ import androidx.annotation.Keep
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import org.citra.citra_emu.activities.EmulationActivity import io.github.lime3ds.activities.EmulationActivity
import org.citra.citra_emu.utils.EmulationMenuSettings import io.github.lime3ds.utils.EmulationMenuSettings
import org.citra.citra_emu.utils.FileUtil import io.github.lime3ds.utils.FileUtil
import org.citra.citra_emu.utils.Log import io.github.lime3ds.utils.Log
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
import java.util.Date import java.util.Date
@ -44,7 +44,7 @@ object NativeLibrary {
init { init {
try { try {
System.loadLibrary("citra-android") System.loadLibrary("lime-android")
} catch (ex: UnsatisfiedLinkError) { } catch (ex: UnsatisfiedLinkError) {
Log.error("[NativeLibrary] $ex") Log.error("[NativeLibrary] $ex")
} }

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.activities package io.github.lime3ds.activities
import android.Manifest.permission import android.Manifest.permission
import android.annotation.SuppressLint import android.annotation.SuppressLint
@ -25,24 +25,24 @@ import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.WindowInsetsControllerCompat
import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.NavHostFragment
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import org.citra.citra_emu.CitraApplication import io.github.lime3ds.CitraApplication
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.camera.StillImageCameraHelper.OnFilePickerResult import io.github.lime3ds.camera.StillImageCameraHelper.OnFilePickerResult
import org.citra.citra_emu.contracts.OpenFileResultContract import io.github.lime3ds.contracts.OpenFileResultContract
import org.citra.citra_emu.databinding.ActivityEmulationBinding import io.github.lime3ds.databinding.ActivityEmulationBinding
import org.citra.citra_emu.display.ScreenAdjustmentUtil import io.github.lime3ds.display.ScreenAdjustmentUtil
import org.citra.citra_emu.features.hotkeys.HotkeyUtility import io.github.lime3ds.features.hotkeys.HotkeyUtility
import org.citra.citra_emu.features.settings.model.SettingsViewModel import io.github.lime3ds.features.settings.model.SettingsViewModel
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting import io.github.lime3ds.features.settings.model.view.InputBindingSetting
import org.citra.citra_emu.fragments.MessageDialogFragment import io.github.lime3ds.fragments.MessageDialogFragment
import org.citra.citra_emu.utils.ControllerMappingHelper import io.github.lime3ds.utils.ControllerMappingHelper
import org.citra.citra_emu.utils.FileBrowserHelper import io.github.lime3ds.utils.FileBrowserHelper
import org.citra.citra_emu.utils.ForegroundService import io.github.lime3ds.utils.ForegroundService
import org.citra.citra_emu.utils.EmulationLifecycleUtil import io.github.lime3ds.utils.EmulationLifecycleUtil
import org.citra.citra_emu.utils.EmulationMenuSettings import io.github.lime3ds.utils.EmulationMenuSettings
import org.citra.citra_emu.utils.ThemeUtil import io.github.lime3ds.utils.ThemeUtil
import org.citra.citra_emu.viewmodel.EmulationViewModel import io.github.lime3ds.viewmodel.EmulationViewModel
class EmulationActivity : AppCompatActivity() { class EmulationActivity : AppCompatActivity() {
private val preferences: SharedPreferences private val preferences: SharedPreferences

12
src/android/app/src/main/java/org/citra/citra_emu/adapters/DriverAdapter.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.adapters package io.github.lime3ds.adapters
import android.net.Uri import android.net.Uri
import android.text.TextUtils import android.text.TextUtils
@ -13,11 +13,11 @@ import androidx.recyclerview.widget.AsyncDifferConfig
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.databinding.CardDriverOptionBinding import io.github.lime3ds.databinding.CardDriverOptionBinding
import org.citra.citra_emu.utils.GpuDriverMetadata import io.github.lime3ds.utils.GpuDriverMetadata
import org.citra.citra_emu.viewmodel.DriverViewModel import io.github.lime3ds.viewmodel.DriverViewModel
import org.citra.citra_emu.utils.GpuDriverHelper import io.github.lime3ds.utils.GpuDriverHelper
class DriverAdapter(private val driverViewModel: DriverViewModel) : class DriverAdapter(private val driverViewModel: DriverViewModel) :
ListAdapter<Pair<Uri, GpuDriverMetadata>, DriverAdapter.DriverViewHolder>( ListAdapter<Pair<Uri, GpuDriverMetadata>, DriverAdapter.DriverViewHolder>(

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.adapters package io.github.lime3ds.adapters
import android.net.Uri import android.net.Uri
import android.os.SystemClock import android.os.SystemClock
@ -23,15 +23,15 @@ import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.color.MaterialColors import com.google.android.material.color.MaterialColors
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import org.citra.citra_emu.HomeNavigationDirections import io.github.lime3ds.HomeNavigationDirections
import org.citra.citra_emu.CitraApplication import io.github.lime3ds.CitraApplication
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.adapters.GameAdapter.GameViewHolder import io.github.lime3ds.adapters.GameAdapter.GameViewHolder
import org.citra.citra_emu.databinding.CardGameBinding import io.github.lime3ds.databinding.CardGameBinding
import org.citra.citra_emu.features.cheats.ui.CheatsFragmentDirections import io.github.lime3ds.features.cheats.ui.CheatsFragmentDirections
import org.citra.citra_emu.model.Game import io.github.lime3ds.model.Game
import org.citra.citra_emu.utils.GameIconUtils import io.github.lime3ds.utils.GameIconUtils
import org.citra.citra_emu.viewmodel.GamesViewModel import io.github.lime3ds.viewmodel.GamesViewModel
class GameAdapter(private val activity: AppCompatActivity) : class GameAdapter(private val activity: AppCompatActivity) :
ListAdapter<Game, GameViewHolder>(AsyncDifferConfig.Builder(DiffCallback()).build()), ListAdapter<Game, GameViewHolder>(AsyncDifferConfig.Builder(DiffCallback()).build()),

12
src/android/app/src/main/java/org/citra/citra_emu/adapters/HomeSettingAdapter.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.adapters package io.github.lime3ds.adapters
import android.text.TextUtils import android.text.TextUtils
import android.view.LayoutInflater import android.view.LayoutInflater
@ -19,11 +19,11 @@ import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.databinding.CardHomeOptionBinding import io.github.lime3ds.databinding.CardHomeOptionBinding
import org.citra.citra_emu.fragments.MessageDialogFragment import io.github.lime3ds.fragments.MessageDialogFragment
import org.citra.citra_emu.model.HomeSetting import io.github.lime3ds.model.HomeSetting
import org.citra.citra_emu.viewmodel.GamesViewModel import io.github.lime3ds.viewmodel.GamesViewModel
class HomeSettingAdapter( class HomeSettingAdapter(
private val activity: AppCompatActivity, private val activity: AppCompatActivity,

10
src/android/app/src/main/java/org/citra/citra_emu/adapters/LicenseAdapter.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.adapters package io.github.lime3ds.adapters
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -10,10 +10,10 @@ import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.ViewHolder import androidx.recyclerview.widget.RecyclerView.ViewHolder
import org.citra.citra_emu.CitraApplication import io.github.lime3ds.CitraApplication
import org.citra.citra_emu.databinding.ListItemSettingBinding import io.github.lime3ds.databinding.ListItemSettingBinding
import org.citra.citra_emu.fragments.LicenseBottomSheetDialogFragment import io.github.lime3ds.fragments.LicenseBottomSheetDialogFragment
import org.citra.citra_emu.model.License import io.github.lime3ds.model.License
class LicenseAdapter(private val activity: AppCompatActivity, var licenses: List<License>) : class LicenseAdapter(private val activity: AppCompatActivity, var licenses: List<License>) :
RecyclerView.Adapter<LicenseAdapter.LicenseViewHolder>(), RecyclerView.Adapter<LicenseAdapter.LicenseViewHolder>(),

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.adapters package io.github.lime3ds.adapters
import android.text.Html import android.text.Html
import android.text.method.LinkMovementMethod import android.text.method.LinkMovementMethod
@ -13,11 +13,11 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.ResourcesCompat
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.button.MaterialButton import com.google.android.material.button.MaterialButton
import org.citra.citra_emu.databinding.PageSetupBinding import io.github.lime3ds.databinding.PageSetupBinding
import org.citra.citra_emu.model.SetupCallback import io.github.lime3ds.model.SetupCallback
import org.citra.citra_emu.model.SetupPage import io.github.lime3ds.model.SetupPage
import org.citra.citra_emu.model.StepState import io.github.lime3ds.model.StepState
import org.citra.citra_emu.utils.ViewUtils import io.github.lime3ds.utils.ViewUtils
class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>) : class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>) :
RecyclerView.Adapter<SetupAdapter.SetupPageViewHolder>() { RecyclerView.Adapter<SetupAdapter.SetupPageViewHolder>() {

6
src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.kt
View File

@ -2,11 +2,11 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.applets package io.github.lime3ds.applets
import androidx.annotation.Keep import androidx.annotation.Keep
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
import org.citra.citra_emu.fragments.MiiSelectorDialogFragment import io.github.lime3ds.fragments.MiiSelectorDialogFragment
import java.io.Serializable import java.io.Serializable
@Keep @Keep

14
src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.kt
View File

@ -2,17 +2,17 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.applets package io.github.lime3ds.applets
import android.text.InputFilter import android.text.InputFilter
import android.text.Spanned import android.text.Spanned
import androidx.annotation.Keep import androidx.annotation.Keep
import org.citra.citra_emu.CitraApplication.Companion.appContext import io.github.lime3ds.CitraApplication.Companion.appContext
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.fragments.KeyboardDialogFragment import io.github.lime3ds.fragments.KeyboardDialogFragment
import org.citra.citra_emu.fragments.MessageDialogFragment import io.github.lime3ds.fragments.MessageDialogFragment
import org.citra.citra_emu.utils.Log import io.github.lime3ds.utils.Log
import java.io.Serializable import java.io.Serializable
@Keep @Keep

6
src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.camera package io.github.lime3ds.camera
import android.graphics.Bitmap import android.graphics.Bitmap
import androidx.activity.result.PickVisualMediaRequest import androidx.activity.result.PickVisualMediaRequest
@ -12,8 +12,8 @@ import androidx.core.graphics.drawable.toBitmap
import coil.executeBlocking import coil.executeBlocking
import coil.imageLoader import coil.imageLoader
import coil.request.ImageRequest import coil.request.ImageRequest
import org.citra.citra_emu.CitraApplication import io.github.lime3ds.CitraApplication
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
// Used in native code. // Used in native code.
object StillImageCameraHelper { object StillImageCameraHelper {

2
src/android/app/src/main/java/org/citra/citra_emu/contracts/OpenFileResultContract.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.contracts package io.github.lime3ds.contracts
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent

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

@ -2,15 +2,15 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.display package io.github.lime3ds.display
import android.view.WindowManager import android.view.WindowManager
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
import org.citra.citra_emu.features.settings.model.BooleanSetting import io.github.lime3ds.features.settings.model.BooleanSetting
import org.citra.citra_emu.features.settings.model.IntSetting import io.github.lime3ds.features.settings.model.IntSetting
import org.citra.citra_emu.features.settings.model.Settings import io.github.lime3ds.features.settings.model.Settings
import org.citra.citra_emu.features.settings.utils.SettingsFile import io.github.lime3ds.features.settings.utils.SettingsFile
import org.citra.citra_emu.utils.EmulationMenuSettings import io.github.lime3ds.utils.EmulationMenuSettings
class ScreenAdjustmentUtil(private val windowManager: WindowManager, class ScreenAdjustmentUtil(private val windowManager: WindowManager,
private val settings: Settings) { private val settings: Settings) {

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.display package io.github.lime3ds.display
enum class ScreenLayout(val int: Int) { enum class ScreenLayout(val int: Int) {
// These must match what is defined in src/common/settings.h // These must match what is defined in src/common/settings.h

2
src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/Cheat.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.cheats.model package io.github.lime3ds.features.cheats.model
import androidx.annotation.Keep import androidx.annotation.Keep

2
src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatEngine.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.cheats.model package io.github.lime3ds.features.cheats.model
import androidx.annotation.Keep import androidx.annotation.Keep

2
src/android/app/src/main/java/org/citra/citra_emu/features/cheats/model/CheatsViewModel.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.cheats.model package io.github.lime3ds.features.cheats.model
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow

10
src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatDetailsFragment.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.cheats.ui package io.github.lime3ds.features.cheats.ui
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.DialogInterface import android.content.DialogInterface
@ -21,10 +21,10 @@ import androidx.lifecycle.repeatOnLifecycle
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.databinding.FragmentCheatDetailsBinding import io.github.lime3ds.databinding.FragmentCheatDetailsBinding
import org.citra.citra_emu.features.cheats.model.Cheat import io.github.lime3ds.features.cheats.model.Cheat
import org.citra.citra_emu.features.cheats.model.CheatsViewModel import io.github.lime3ds.features.cheats.model.CheatsViewModel
class CheatDetailsFragment : Fragment() { class CheatDetailsFragment : Fragment() {
private val cheatsViewModel: CheatsViewModel by activityViewModels() private val cheatsViewModel: CheatsViewModel by activityViewModels()

10
src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatListFragment.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.cheats.ui package io.github.lime3ds.features.cheats.ui
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -23,10 +23,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.divider.MaterialDividerItemDecoration import com.google.android.material.divider.MaterialDividerItemDecoration
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.databinding.FragmentCheatListBinding import io.github.lime3ds.databinding.FragmentCheatListBinding
import org.citra.citra_emu.features.cheats.model.CheatsViewModel import io.github.lime3ds.features.cheats.model.CheatsViewModel
import org.citra.citra_emu.ui.main.MainActivity import io.github.lime3ds.ui.main.MainActivity
class CheatListFragment : Fragment() { class CheatListFragment : Fragment() {
private var _binding: FragmentCheatListBinding? = null private var _binding: FragmentCheatListBinding? = null

10
src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsActivity.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.cheats.ui package io.github.lime3ds.features.cheats.ui
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
@ -12,10 +12,10 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.WindowCompat import androidx.core.view.WindowCompat
import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.NavHostFragment
import com.google.android.material.color.MaterialColors import com.google.android.material.color.MaterialColors
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.databinding.ActivityCheatsBinding import io.github.lime3ds.databinding.ActivityCheatsBinding
import org.citra.citra_emu.utils.InsetsHelper import io.github.lime3ds.utils.InsetsHelper
import org.citra.citra_emu.utils.ThemeUtil import io.github.lime3ds.utils.ThemeUtil
class CheatsActivity : AppCompatActivity() { class CheatsActivity : AppCompatActivity() {
private lateinit var binding: ActivityCheatsBinding private lateinit var binding: ActivityCheatsBinding

8
src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsAdapter.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.cheats.ui package io.github.lime3ds.features.cheats.ui
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -11,9 +11,9 @@ import android.widget.CompoundButton
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import org.citra.citra_emu.databinding.ListItemCheatBinding import io.github.lime3ds.databinding.ListItemCheatBinding
import org.citra.citra_emu.features.cheats.model.Cheat import io.github.lime3ds.features.cheats.model.Cheat
import org.citra.citra_emu.features.cheats.model.CheatsViewModel import io.github.lime3ds.features.cheats.model.CheatsViewModel
class CheatsAdapter( class CheatsAdapter(
private val activity: FragmentActivity, private val activity: FragmentActivity,

14
src/android/app/src/main/java/org/citra/citra_emu/features/cheats/ui/CheatsFragment.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.cheats.ui package io.github.lime3ds.features.cheats.ui
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Build import android.os.Build
@ -25,12 +25,12 @@ import androidx.slidingpanelayout.widget.SlidingPaneLayout
import com.google.android.material.transition.MaterialSharedAxis import com.google.android.material.transition.MaterialSharedAxis
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.citra.citra_emu.databinding.FragmentCheatsBinding import io.github.lime3ds.databinding.FragmentCheatsBinding
import org.citra.citra_emu.features.cheats.model.Cheat import io.github.lime3ds.features.cheats.model.Cheat
import org.citra.citra_emu.features.cheats.model.CheatsViewModel import io.github.lime3ds.features.cheats.model.CheatsViewModel
import org.citra.citra_emu.ui.TwoPaneOnBackPressedCallback import io.github.lime3ds.ui.TwoPaneOnBackPressedCallback
import org.citra.citra_emu.ui.main.MainActivity import io.github.lime3ds.ui.main.MainActivity
import org.citra.citra_emu.viewmodel.HomeViewModel import io.github.lime3ds.viewmodel.HomeViewModel
class CheatsFragment : Fragment(), SlidingPaneLayout.PanelSlideListener { class CheatsFragment : Fragment(), SlidingPaneLayout.PanelSlideListener {
private var cheatListLastFocus: View? = null private var cheatListLastFocus: View? = null

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.hotkeys package io.github.lime3ds.features.hotkeys
enum class Hotkey(val button: Int) { enum class Hotkey(val button: Int) {
SWAP_SCREEN(10001), SWAP_SCREEN(10001),

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

@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.hotkeys package io.github.lime3ds.features.hotkeys
import org.citra.citra_emu.utils.EmulationLifecycleUtil import io.github.lime3ds.utils.EmulationLifecycleUtil
import org.citra.citra_emu.display.ScreenAdjustmentUtil import io.github.lime3ds.display.ScreenAdjustmentUtil
class HotkeyUtility(private val screenAdjustmentUtil: ScreenAdjustmentUtil) { class HotkeyUtility(private val screenAdjustmentUtil: ScreenAdjustmentUtil) {

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractBooleanSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
interface AbstractBooleanSetting : AbstractSetting { interface AbstractBooleanSetting : AbstractSetting {
var boolean: Boolean var boolean: Boolean

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractFloatSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
interface AbstractFloatSetting : AbstractSetting { interface AbstractFloatSetting : AbstractSetting {
var float: Float var float: Float

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractIntSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
interface AbstractIntSetting : AbstractSetting { interface AbstractIntSetting : AbstractSetting {
var int: Int var int: Int

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
interface AbstractSetting { interface AbstractSetting {
val key: String? val key: String?

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractShortSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
interface AbstractShortSetting : AbstractSetting { interface AbstractShortSetting : AbstractSetting {
var short: Short var short: Short

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractStringSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
interface AbstractStringSetting : AbstractSetting { interface AbstractStringSetting : AbstractSetting {
var string: String var string: String

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
enum class BooleanSetting( enum class BooleanSetting(
override val key: String, override val key: String,

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
enum class FloatSetting( enum class FloatSetting(
override val key: String, override val key: String,

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
enum class IntSetting( enum class IntSetting(
override val key: String, override val key: String,

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/ScaledFloatSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
enum class ScaledFloatSetting( enum class ScaledFloatSetting(
override val key: String, override val key: String,

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingSection.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
/** /**
* A semantically-related group of Settings objects. These Settings are * A semantically-related group of Settings objects. These Settings are

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

@ -2,13 +2,13 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
import android.text.TextUtils import android.text.TextUtils
import org.citra.citra_emu.CitraApplication import io.github.lime3ds.CitraApplication
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.features.settings.ui.SettingsActivityView import io.github.lime3ds.features.settings.ui.SettingsActivityView
import org.citra.citra_emu.features.settings.utils.SettingsFile import io.github.lime3ds.features.settings.utils.SettingsFile
import java.util.TreeMap import java.util.TreeMap
class Settings { class Settings {

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingsViewModel.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/StringSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model package io.github.lime3ds.features.settings.model
enum class StringSetting( enum class StringSetting(
override val key: String, override val key: String,

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

@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.AbstractStringSetting import io.github.lime3ds.features.settings.model.AbstractStringSetting
class DateTimeSetting( class DateTimeSetting(
setting: AbstractSetting?, setting: AbstractSetting?,

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
class HeaderSetting(titleId: Int) : SettingsItem(null, titleId, 0) { class HeaderSetting(titleId: Int) : SettingsItem(null, titleId, 0) {
override val type = TYPE_HEADER override val type = TYPE_HEADER

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
@ -11,12 +11,12 @@ import android.view.InputDevice.MotionRange
import android.view.KeyEvent import android.view.KeyEvent
import android.widget.Toast import android.widget.Toast
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import org.citra.citra_emu.CitraApplication import io.github.lime3ds.CitraApplication
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.features.hotkeys.Hotkey import io.github.lime3ds.features.hotkeys.Hotkey
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.Settings import io.github.lime3ds.features.settings.model.Settings
class InputBindingSetting( class InputBindingSetting(
val abstractSetting: AbstractSetting, val abstractSetting: AbstractSetting,

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/RunnableSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
class RunnableSetting( class RunnableSetting(
titleId: Int, titleId: Int,

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

@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
/** /**
* ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments. * ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments.

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

@ -2,11 +2,11 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
import org.citra.citra_emu.features.settings.model.AbstractIntSetting import io.github.lime3ds.features.settings.model.AbstractIntSetting
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.AbstractShortSetting import io.github.lime3ds.features.settings.model.AbstractShortSetting
class SingleChoiceSetting( class SingleChoiceSetting(
setting: AbstractSetting?, setting: AbstractSetting?,

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

@ -2,14 +2,14 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
import org.citra.citra_emu.features.settings.model.AbstractFloatSetting import io.github.lime3ds.features.settings.model.AbstractFloatSetting
import org.citra.citra_emu.features.settings.model.AbstractIntSetting import io.github.lime3ds.features.settings.model.AbstractIntSetting
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.FloatSetting import io.github.lime3ds.features.settings.model.FloatSetting
import org.citra.citra_emu.features.settings.model.ScaledFloatSetting import io.github.lime3ds.features.settings.model.ScaledFloatSetting
import org.citra.citra_emu.utils.Log import io.github.lime3ds.utils.Log
import kotlin.math.roundToInt import kotlin.math.roundToInt
class SliderSetting( class SliderSetting(

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

@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.AbstractStringSetting import io.github.lime3ds.features.settings.model.AbstractStringSetting
class StringInputSetting( class StringInputSetting(
setting: AbstractSetting?, setting: AbstractSetting?,

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

@ -2,11 +2,11 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.AbstractShortSetting import io.github.lime3ds.features.settings.model.AbstractShortSetting
import org.citra.citra_emu.features.settings.model.AbstractStringSetting import io.github.lime3ds.features.settings.model.AbstractStringSetting
class StringSingleChoiceSetting( class StringSingleChoiceSetting(
setting: AbstractSetting?, setting: AbstractSetting?,

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SubmenuSetting.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
class SubmenuSetting( class SubmenuSetting(
titleId: Int, titleId: Int,

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

@ -2,11 +2,11 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model.view package io.github.lime3ds.features.settings.model.view
import org.citra.citra_emu.features.settings.model.AbstractBooleanSetting import io.github.lime3ds.features.settings.model.AbstractBooleanSetting
import org.citra.citra_emu.features.settings.model.AbstractIntSetting import io.github.lime3ds.features.settings.model.AbstractIntSetting
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
class SwitchSetting( class SwitchSetting(
setting: AbstractSetting, setting: AbstractSetting,

34
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui package io.github.lime3ds.features.settings.ui
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -21,23 +21,23 @@ import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.google.android.material.color.MaterialColors import com.google.android.material.color.MaterialColors
import org.citra.citra_emu.CitraApplication import io.github.lime3ds.CitraApplication
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.databinding.ActivitySettingsBinding import io.github.lime3ds.databinding.ActivitySettingsBinding
import java.io.IOException import java.io.IOException
import org.citra.citra_emu.features.settings.model.BooleanSetting import io.github.lime3ds.features.settings.model.BooleanSetting
import org.citra.citra_emu.features.settings.model.FloatSetting import io.github.lime3ds.features.settings.model.FloatSetting
import org.citra.citra_emu.features.settings.model.IntSetting import io.github.lime3ds.features.settings.model.IntSetting
import org.citra.citra_emu.features.settings.model.ScaledFloatSetting import io.github.lime3ds.features.settings.model.ScaledFloatSetting
import org.citra.citra_emu.features.settings.model.Settings import io.github.lime3ds.features.settings.model.Settings
import org.citra.citra_emu.features.settings.model.SettingsViewModel import io.github.lime3ds.features.settings.model.SettingsViewModel
import org.citra.citra_emu.features.settings.model.StringSetting import io.github.lime3ds.features.settings.model.StringSetting
import org.citra.citra_emu.features.settings.utils.SettingsFile import io.github.lime3ds.features.settings.utils.SettingsFile
import org.citra.citra_emu.utils.SystemSaveGame import io.github.lime3ds.utils.SystemSaveGame
import org.citra.citra_emu.utils.DirectoryInitialization import io.github.lime3ds.utils.DirectoryInitialization
import org.citra.citra_emu.utils.InsetsHelper import io.github.lime3ds.utils.InsetsHelper
import org.citra.citra_emu.utils.ThemeUtil import io.github.lime3ds.utils.ThemeUtil
class SettingsActivity : AppCompatActivity(), SettingsActivityView { class SettingsActivity : AppCompatActivity(), SettingsActivityView {
private val presenter = SettingsActivityPresenter(this) private val presenter = SettingsActivityPresenter(this)

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

@ -2,15 +2,15 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui package io.github.lime3ds.features.settings.ui
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import org.citra.citra_emu.NativeLibrary import io.github.lime3ds.NativeLibrary
import org.citra.citra_emu.features.settings.model.Settings import io.github.lime3ds.features.settings.model.Settings
import org.citra.citra_emu.utils.SystemSaveGame import io.github.lime3ds.utils.SystemSaveGame
import org.citra.citra_emu.utils.DirectoryInitialization import io.github.lime3ds.utils.DirectoryInitialization
import org.citra.citra_emu.utils.Log import io.github.lime3ds.utils.Log
class SettingsActivityPresenter(private val activityView: SettingsActivityView) { class SettingsActivityPresenter(private val activityView: SettingsActivityView) {
val settings: Settings get() = activityView.settings val settings: Settings get() = activityView.settings

4
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.kt
View File

@ -2,9 +2,9 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui package io.github.lime3ds.features.settings.ui
import org.citra.citra_emu.features.settings.model.Settings import io.github.lime3ds.features.settings.model.Settings
/** /**
* Abstraction for the Activity that manages SettingsFragments. * Abstraction for the Activity that manages SettingsFragments.

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui package io.github.lime3ds.features.settings.ui
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -24,42 +24,42 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.slider.Slider import com.google.android.material.slider.Slider
import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.MaterialTimePicker
import com.google.android.material.timepicker.TimeFormat import com.google.android.material.timepicker.TimeFormat
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.databinding.DialogSliderBinding import io.github.lime3ds.databinding.DialogSliderBinding
import org.citra.citra_emu.databinding.DialogSoftwareKeyboardBinding import io.github.lime3ds.databinding.DialogSoftwareKeyboardBinding
import org.citra.citra_emu.databinding.ListItemSettingBinding import io.github.lime3ds.databinding.ListItemSettingBinding
import org.citra.citra_emu.databinding.ListItemSettingSwitchBinding import io.github.lime3ds.databinding.ListItemSettingSwitchBinding
import org.citra.citra_emu.databinding.ListItemSettingsHeaderBinding import io.github.lime3ds.databinding.ListItemSettingsHeaderBinding
import org.citra.citra_emu.features.settings.model.AbstractBooleanSetting import io.github.lime3ds.features.settings.model.AbstractBooleanSetting
import org.citra.citra_emu.features.settings.model.AbstractFloatSetting import io.github.lime3ds.features.settings.model.AbstractFloatSetting
import org.citra.citra_emu.features.settings.model.AbstractIntSetting import io.github.lime3ds.features.settings.model.AbstractIntSetting
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.AbstractStringSetting import io.github.lime3ds.features.settings.model.AbstractStringSetting
import org.citra.citra_emu.features.settings.model.FloatSetting import io.github.lime3ds.features.settings.model.FloatSetting
import org.citra.citra_emu.features.settings.model.ScaledFloatSetting import io.github.lime3ds.features.settings.model.ScaledFloatSetting
import org.citra.citra_emu.features.settings.model.AbstractShortSetting import io.github.lime3ds.features.settings.model.AbstractShortSetting
import org.citra.citra_emu.features.settings.model.view.DateTimeSetting import io.github.lime3ds.features.settings.model.view.DateTimeSetting
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting import io.github.lime3ds.features.settings.model.view.InputBindingSetting
import org.citra.citra_emu.features.settings.model.view.SettingsItem import io.github.lime3ds.features.settings.model.view.SettingsItem
import org.citra.citra_emu.features.settings.model.view.SingleChoiceSetting import io.github.lime3ds.features.settings.model.view.SingleChoiceSetting
import org.citra.citra_emu.features.settings.model.view.SliderSetting import io.github.lime3ds.features.settings.model.view.SliderSetting
import org.citra.citra_emu.features.settings.model.view.StringInputSetting import io.github.lime3ds.features.settings.model.view.StringInputSetting
import org.citra.citra_emu.features.settings.model.view.StringSingleChoiceSetting import io.github.lime3ds.features.settings.model.view.StringSingleChoiceSetting
import org.citra.citra_emu.features.settings.model.view.SubmenuSetting import io.github.lime3ds.features.settings.model.view.SubmenuSetting
import org.citra.citra_emu.features.settings.model.view.SwitchSetting import io.github.lime3ds.features.settings.model.view.SwitchSetting
import org.citra.citra_emu.features.settings.ui.viewholder.DateTimeViewHolder import io.github.lime3ds.features.settings.ui.viewholder.DateTimeViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.HeaderViewHolder import io.github.lime3ds.features.settings.ui.viewholder.HeaderViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.InputBindingSettingViewHolder import io.github.lime3ds.features.settings.ui.viewholder.InputBindingSettingViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.RunnableViewHolder import io.github.lime3ds.features.settings.ui.viewholder.RunnableViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.SettingViewHolder import io.github.lime3ds.features.settings.ui.viewholder.SettingViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.SingleChoiceViewHolder import io.github.lime3ds.features.settings.ui.viewholder.SingleChoiceViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.SliderViewHolder import io.github.lime3ds.features.settings.ui.viewholder.SliderViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.StringInputViewHolder import io.github.lime3ds.features.settings.ui.viewholder.StringInputViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.SubmenuViewHolder import io.github.lime3ds.features.settings.ui.viewholder.SubmenuViewHolder
import org.citra.citra_emu.features.settings.ui.viewholder.SwitchSettingViewHolder import io.github.lime3ds.features.settings.ui.viewholder.SwitchSettingViewHolder
import org.citra.citra_emu.fragments.MessageDialogFragment import io.github.lime3ds.fragments.MessageDialogFragment
import org.citra.citra_emu.fragments.MotionBottomSheetDialogFragment import io.github.lime3ds.fragments.MotionBottomSheetDialogFragment
import org.citra.citra_emu.utils.SystemSaveGame import io.github.lime3ds.utils.SystemSaveGame
import java.lang.IllegalStateException import java.lang.IllegalStateException
import java.lang.NumberFormatException import java.lang.NumberFormatException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat

8
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragment.kt
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui package io.github.lime3ds.features.settings.ui
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -15,9 +15,9 @@ import androidx.core.view.updatePadding
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.divider.MaterialDividerItemDecoration import com.google.android.material.divider.MaterialDividerItemDecoration
import org.citra.citra_emu.databinding.FragmentSettingsBinding import io.github.lime3ds.databinding.FragmentSettingsBinding
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.view.SettingsItem import io.github.lime3ds.features.settings.model.view.SettingsItem
class SettingsFragment : Fragment(), SettingsFragmentView { class SettingsFragment : Fragment(), SettingsFragmentView {
override var activityView: SettingsActivityView? = null override var activityView: SettingsActivityView? = null

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

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui package io.github.lime3ds.features.settings.ui
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
@ -12,35 +12,35 @@ import android.hardware.camera2.CameraManager
import android.os.Build import android.os.Build
import android.text.TextUtils import android.text.TextUtils
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import org.citra.citra_emu.CitraApplication import io.github.lime3ds.CitraApplication
import org.citra.citra_emu.R import io.github.lime3ds.R
import org.citra.citra_emu.features.settings.model.AbstractBooleanSetting import io.github.lime3ds.features.settings.model.AbstractBooleanSetting
import org.citra.citra_emu.features.settings.model.AbstractIntSetting import io.github.lime3ds.features.settings.model.AbstractIntSetting
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.AbstractStringSetting import io.github.lime3ds.features.settings.model.AbstractStringSetting
import org.citra.citra_emu.features.settings.model.BooleanSetting import io.github.lime3ds.features.settings.model.BooleanSetting
import org.citra.citra_emu.features.settings.model.IntSetting import io.github.lime3ds.features.settings.model.IntSetting
import org.citra.citra_emu.features.settings.model.ScaledFloatSetting import io.github.lime3ds.features.settings.model.ScaledFloatSetting
import org.citra.citra_emu.features.settings.model.Settings import io.github.lime3ds.features.settings.model.Settings
import org.citra.citra_emu.features.settings.model.StringSetting import io.github.lime3ds.features.settings.model.StringSetting
import org.citra.citra_emu.features.settings.model.AbstractShortSetting import io.github.lime3ds.features.settings.model.AbstractShortSetting
import org.citra.citra_emu.features.settings.model.view.DateTimeSetting import io.github.lime3ds.features.settings.model.view.DateTimeSetting
import org.citra.citra_emu.features.settings.model.view.HeaderSetting import io.github.lime3ds.features.settings.model.view.HeaderSetting
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting import io.github.lime3ds.features.settings.model.view.InputBindingSetting
import org.citra.citra_emu.features.settings.model.view.RunnableSetting import io.github.lime3ds.features.settings.model.view.RunnableSetting
import org.citra.citra_emu.features.settings.model.view.SettingsItem import io.github.lime3ds.features.settings.model.view.SettingsItem
import org.citra.citra_emu.features.settings.model.view.SingleChoiceSetting import io.github.lime3ds.features.settings.model.view.SingleChoiceSetting
import org.citra.citra_emu.features.settings.model.view.SliderSetting import io.github.lime3ds.features.settings.model.view.SliderSetting
import org.citra.citra_emu.features.settings.model.view.StringInputSetting import io.github.lime3ds.features.settings.model.view.StringInputSetting
import org.citra.citra_emu.features.settings.model.view.StringSingleChoiceSetting import io.github.lime3ds.features.settings.model.view.StringSingleChoiceSetting
import org.citra.citra_emu.features.settings.model.view.SubmenuSetting import io.github.lime3ds.features.settings.model.view.SubmenuSetting
import org.citra.citra_emu.features.settings.model.view.SwitchSetting import io.github.lime3ds.features.settings.model.view.SwitchSetting
import org.citra.citra_emu.features.settings.utils.SettingsFile import io.github.lime3ds.features.settings.utils.SettingsFile
import org.citra.citra_emu.fragments.ResetSettingsDialogFragment import io.github.lime3ds.fragments.ResetSettingsDialogFragment
import org.citra.citra_emu.utils.BirthdayMonth import io.github.lime3ds.utils.BirthdayMonth
import org.citra.citra_emu.utils.Log import io.github.lime3ds.utils.Log
import org.citra.citra_emu.utils.SystemSaveGame import io.github.lime3ds.utils.SystemSaveGame
import org.citra.citra_emu.utils.ThemeUtil import io.github.lime3ds.utils.ThemeUtil
class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) { class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) {
private var menuTag: String? = null private var menuTag: String? = null

6
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentView.kt
View File

@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui package io.github.lime3ds.features.settings.ui
import org.citra.citra_emu.features.settings.model.AbstractSetting import io.github.lime3ds.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.view.SettingsItem import io.github.lime3ds.features.settings.model.view.SettingsItem
/** /**
* Abstraction for a screen showing a list of settings. Instances of * Abstraction for a screen showing a list of settings. Instances of

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

@ -2,19 +2,19 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui.viewholder package io.github.lime3ds.features.settings.ui.viewholder
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.view.View import android.view.View
import org.citra.citra_emu.databinding.ListItemSettingBinding import io.github.lime3ds.databinding.ListItemSettingBinding
import java.time.Instant import java.time.Instant
import java.time.ZoneId import java.time.ZoneId
import java.time.ZonedDateTime import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter
import java.time.format.FormatStyle import java.time.format.FormatStyle
import org.citra.citra_emu.features.settings.model.view.DateTimeSetting import io.github.lime3ds.features.settings.model.view.DateTimeSetting
import org.citra.citra_emu.features.settings.model.view.SettingsItem import io.github.lime3ds.features.settings.model.view.SettingsItem
import org.citra.citra_emu.features.settings.ui.SettingsAdapter import io.github.lime3ds.features.settings.ui.SettingsAdapter
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :

8
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.kt
View File

@ -2,12 +2,12 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.ui.viewholder package io.github.lime3ds.features.settings.ui.viewholder
import android.view.View import android.view.View
import org.citra.citra_emu.databinding.ListItemSettingsHeaderBinding import io.github.lime3ds.databinding.ListItemSettingsHeaderBinding
import org.citra.citra_emu.features.settings.model.view.SettingsItem import io.github.lime3ds.features.settings.model.view.SettingsItem
import org.citra.citra_emu.features.settings.ui.SettingsAdapter import io.github.lime3ds.features.settings.ui.SettingsAdapter
class HeaderViewHolder(val binding: ListItemSettingsHeaderBinding, adapter: SettingsAdapter) : class HeaderViewHolder(val binding: ListItemSettingsHeaderBinding, adapter: SettingsAdapter) :
SettingViewHolder(binding.root, adapter) { SettingViewHolder(binding.root, adapter) {

Some files were not shown because too many files have changed in this diff Show More