diff --git a/dist/languages/ca.ts b/dist/languages/ca.ts index c5118ca6a..474332d76 100644 --- a/dist/languages/ca.ts +++ b/dist/languages/ca.ts @@ -235,7 +235,7 @@ This would ban both their forum username and their IP address. <html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://citron-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">citron Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of citron you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected citron account</li></ul></body></html> - <html><head/><body><p><span style=" font-size:10pt;">Si escolliu presentar un cas de prova a la </span><a href="https://citron-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">llista de compatibilitat de Yuzu</span></a><span style=" font-size:10pt;">, la informació següent es recollirà i es mostrarà al web:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Informació del maquinari (CPU / GPU / Sistema operatiu)</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Quina versió de citron està utilitzant?</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">El compte de citron connectat</li></ul></body></html> + <html><head/><body><p><span style=" font-size:10pt;">Si escolliu presentar un cas de prova a la </span><a href="https://citron-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">llista de compatibilitat de Citron</span></a><span style=" font-size:10pt;">, la informació següent es recollirà i es mostrarà al web:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Informació del maquinari (CPU / GPU / Sistema operatiu)</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Quina versió de citron està utilitzant?</li> <li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">El compte de citron connectat</li></ul></body></html> diff --git a/dist/languages/cs.ts b/dist/languages/cs.ts index e4834a17a..cf18ed420 100644 --- a/dist/languages/cs.ts +++ b/dist/languages/cs.ts @@ -29,7 +29,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Yuzu je experimentální open source emulátor pro konzoli Nintendo Switch licencován pod licencí GPLv3.0+.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Citron je experimentální open source emulátor pro konzoli Nintendo Switch licencován pod licencí GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Tento software by neměl být využíván pro hraní her, které nevlastníte.</span></p></body></html> @@ -41,7 +41,7 @@ p, li { white-space: pre-wrap; } <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; is a trademark of Nintendo. citron is not affiliated with Nintendo in any way.</span></p></body></html> - <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; je trademark Nintenda. Yuzu nemá s Nintendem nic společného.</span></p></body></html> + <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; je trademark Nintenda. Citron nemá s Nintendem nic společného.</span></p></body></html> diff --git a/dist/languages/da.ts b/dist/languages/da.ts index f4631c294..c5b86b640 100644 --- a/dist/languages/da.ts +++ b/dist/languages/da.ts @@ -29,7 +29,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Yuzu er en eksperimentel åben emulator til Nintendo Switch, under GPLv3.0+ licensen.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Citron er en eksperimentel åben emulator til Nintendo Switch, under GPLv3.0+ licensen.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Denne programvare bør ikke bruges til, at spille spil, du ikke har anskaffet på lovlig vis.</span></p></body></html> @@ -41,7 +41,7 @@ p, li { white-space: pre-wrap; } <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; is a trademark of Nintendo. citron is not affiliated with Nintendo in any way.</span></p></body></html> - <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; er et varemærke tilhørende Nintendo. Yuzu er ikke tilknyttet Nintendo på nogen måde.</span></p></body></html> + <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; er et varemærke tilhørende Nintendo. Citron er ikke tilknyttet Nintendo på nogen måde.</span></p></body></html> @@ -2229,7 +2229,7 @@ When a guest attempts to open the controller applet, it is immediately closed. Enables citron to check for a working Vulkan environment when the program starts up. Disable this if this is causing issues with external programs seeing citron. - Gør Yuzu i stand til at kontrollere for et funktionelt Vulkan-miljø, når programmet starter op. Deaktivering af dette forårsager problemer med at eksterne programmer ser Yuzu. + Gør Citron i stand til at kontrollere for et funktionelt Vulkan-miljø, når programmet starter op. Deaktivering af dette forårsager problemer med at eksterne programmer ser Citron. diff --git a/dist/languages/de.ts b/dist/languages/de.ts index 71cc9c0fb..a2497ff7e 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -5296,7 +5296,7 @@ Ziehe die Punkte mit deiner Maus, um ihre Position zu ändern. Doppelklicke auf citron has encountered an error while running the video core. This is usually caused by outdated GPU drivers, including integrated ones. Please see the log for more details. For more information on accessing the log, please see the following page: <a href='https://citron-emu.org/help/reference/log-files/'>How to Upload the Log File</a>. - Yuzu ist auf einen Fehler gestoßen beim Ausführen des Videokerns. + Citron ist auf einen Fehler gestoßen beim Ausführen des Videokerns. Dies ist in der Regel auf veraltete GPU Treiber zurückzuführen, integrierte GPUs eingeschlossen. Bitte öffnen Sie die Log Datei für weitere Informationen. Für weitere Informationen wie Sie auf die Log Datei zugreifen, öffnen Sie bitte die folgende Seite: <a href='https://citron-emu.org/help/reference/log-files/'>Wie wird eine Log Datei hochgeladen?</a>. diff --git a/dist/languages/es.ts b/dist/languages/es.ts index d057539ac..1bb0eab54 100644 --- a/dist/languages/es.ts +++ b/dist/languages/es.ts @@ -5932,7 +5932,7 @@ Por favor, utiliza esta función sólo para instalar actualizaciones y DLCs. Missing citron Account - Falta la cuenta de Yuzu + Falta la cuenta de Citron diff --git a/dist/languages/fi.ts b/dist/languages/fi.ts index 2fff2c62c..930ac332e 100644 --- a/dist/languages/fi.ts +++ b/dist/languages/fi.ts @@ -4,7 +4,7 @@ About citron - Tietoa Yuzu:sta + Tietoa Citron:sta @@ -4789,7 +4789,7 @@ Haluatko silti ohittaa tämän ja sulkea? citron has not been compiled with OpenGL support. - Yuzua ei ole koottu OpenGL-yhteensopivuuden kanssa. + Citrona ei ole koottu OpenGL-yhteensopivuuden kanssa. diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index f0f1f9424..6c397c7dc 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -4514,7 +4514,7 @@ UUID : %2 <html><head/><body><p>Reads controller input from scripts in the same format as TAS-nx scripts.<br/>For a more detailed explanation, please consult the <a href="https://citron-emu.org/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">help page</span></a> on the citron website.</p></body></html> - <html><head/><body><p>Lit l'entrée du contrôleur à partir des scripts dans le même format que 'TAS-nx' <br/> Pour une explication plus détaillée, veuillez consulter le <a href="https://citron-emu.org/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">page d'aide</span></a> sur le site Yuzu.</p></body></html> + <html><head/><body><p>Lit l'entrée du contrôleur à partir des scripts dans le même format que 'TAS-nx' <br/> Pour une explication plus détaillée, veuillez consulter le <a href="https://citron-emu.org/help/feature/tas/"><span style=" text-decoration: underline; color:#039be5;">page d'aide</span></a> sur le site Citron.</p></body></html> @@ -7399,7 +7399,7 @@ Message de débogage : Open &citron Folder - Ouvrir le &dossier de Yuzu + Ouvrir le &dossier de Citron diff --git a/dist/languages/hu.ts b/dist/languages/hu.ts index 69d0e01bc..ad654452d 100644 --- a/dist/languages/hu.ts +++ b/dist/languages/hu.ts @@ -3122,7 +3122,7 @@ Ha egy vendég megpróbálja megnyitni a vezérlő appletet, az azonnal bezárul Requires restarting citron - Yuzu újraindítása szükséges + Citron újraindítása szükséges diff --git a/dist/languages/it.ts b/dist/languages/it.ts index a453cffc9..e12e40431 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -2763,7 +2763,7 @@ When a guest attempts to open the controller applet, it is immediately closed. An error occurred. Please report this issue on github. - Errore durante la configurazione. Segnala quest'errore alla pagina Github di Yuzu. + Errore durante la configurazione. Segnala quest'errore alla pagina Github di Citron. diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index 83e3a1224..ee92addc1 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -2301,7 +2301,7 @@ When a guest attempts to open the controller applet, it is immediately closed. **This will be reset automatically when citron closes. - **Yuzu가 종료되면 자동으로 재설정됩니다. + **Citron가 종료되면 자동으로 재설정됩니다. diff --git a/dist/languages/pl.ts b/dist/languages/pl.ts index 5fcced1a4..915af887a 100644 --- a/dist/languages/pl.ts +++ b/dist/languages/pl.ts @@ -4625,7 +4625,7 @@ Przeciągnij punkty, aby zmienić pozycję, lub kliknij dwukrotnie komórki tabe Warning: The settings in this page affect the inner workings of citron's emulated touchscreen. Changing them may result in undesirable behavior, such as the touchscreen partially or not working. You should only use this page if you know what you are doing. - Ostrzeżenie: Ustawienia na tej stronie mają wpływ na działanie emulowanego ekranu dotykowego Yuzu. ch zmiana może spowodować niepożądane zachowanie, takie jak częściowo lub całkowicie nie działający ekran dotykowy. Powinieneś/naś używać tej strony tylko wtedy, gdy wiesz, co robisz. + Ostrzeżenie: Ustawienia na tej stronie mają wpływ na działanie emulowanego ekranu dotykowego Citron. ch zmiana może spowodować niepożądane zachowanie, takie jak częściowo lub całkowicie nie działający ekran dotykowy. Powinieneś/naś używać tej strony tylko wtedy, gdy wiesz, co robisz. @@ -5878,7 +5878,7 @@ Proszę, używaj tej funkcji tylko do instalowania łatek i DLC. Missing citron Account - Brakuje konta Yuzu + Brakuje konta Citron diff --git a/dist/languages/pt_PT.ts b/dist/languages/pt_PT.ts index 7d9c45904..0ccf7654e 100644 --- a/dist/languages/pt_PT.ts +++ b/dist/languages/pt_PT.ts @@ -41,7 +41,7 @@ p, li { white-space: pre-wrap; } <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; is a trademark of Nintendo. citron is not affiliated with Nintendo in any way.</span></p></body></html> - <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; é uma marca comercial da Nintendo. Yuzu não é afiliado com a Nintendo de qualquer forma.</span></p></body></html> + <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; é uma marca comercial da Nintendo. Citron não é afiliado com a Nintendo de qualquer forma.</span></p></body></html> @@ -4991,7 +4991,7 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta citron Web Service - Serviço Web do Yuzu + Serviço Web do Citron @@ -5037,7 +5037,7 @@ Arrasta os pontos para mudar a posição, ou dá duplo-clique nas células da ta Share anonymous usage data with the citron team - Compartilhar dados de uso anônimos com a equipa Yuzu + Compartilhar dados de uso anônimos com a equipa Citron @@ -5917,7 +5917,7 @@ Por favor, use esse recurso apenas para instalar atualizações e DLC. Missing citron Account - Conta Yuzu Ausente + Conta Citron Ausente diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index 51ce76e70..386dcd6ca 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -4,7 +4,7 @@ About citron - Yuzu hakkında + Citron hakkında @@ -29,7 +29,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Yuzu GPLv3.0+ ile lisanslanmış Nintendo Switch için açık kaynak bir deneysel emülatördür.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Citron GPLv3.0+ ile lisanslanmış Nintendo Switch için açık kaynak bir deneysel emülatördür.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Bu yazılım yasal yollarla edinilmemiş oyunları çalıştırmak için kullanılmamalı.</span></p></body></html> @@ -3102,7 +3102,7 @@ When a guest attempts to open the controller applet, it is immediately closed. Requires restarting citron - Yuzu'yu yeniden başlatmayı gerektirir + Citron'yu yeniden başlatmayı gerektirir @@ -4993,7 +4993,7 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne Share anonymous usage data with the citron team - Yuzu ekibiyle anonim kullanım verilerini paylaş + Citron ekibiyle anonim kullanım verilerini paylaş @@ -5270,7 +5270,7 @@ Noktanın konumunu değiştirmek için sürükleyin ya da sayıların üstüne You are using the deconstructed ROM directory format for this game, which is an outdated format that has been superseded by others such as NCA, NAX, XCI, or NSP. Deconstructed ROM directories lack icons, metadata, and update support.<br><br>For an explanation of the various Switch formats citron supports, <a href='https://citron-emu.org/wiki/overview-of-switch-game-formats'>check out our wiki</a>. This message will not be shown again. - Bu oyun için dekonstrükte ROM formatı kullanıyorsunuz, bu fromatın yerine NCA, NAX, XCI ve NSP formatları kullanılmaktadır. Dekonstrükte ROM formatları ikon, üst veri ve güncelleme desteği içermemektedir.<br><br>Yuzu'nun desteklediği çeşitli Switch formatları için<a href='https://citron-emu.org/wiki/overview-of-switch-game-formats'>Wiki'yi ziyaret edin</a>. Bu mesaj yeniden gösterilmeyecektir. + Bu oyun için dekonstrükte ROM formatı kullanıyorsunuz, bu fromatın yerine NCA, NAX, XCI ve NSP formatları kullanılmaktadır. Dekonstrükte ROM formatları ikon, üst veri ve güncelleme desteği içermemektedir.<br><br>Citron'nun desteklediği çeşitli Switch formatları için<a href='https://citron-emu.org/wiki/overview-of-switch-game-formats'>Wiki'yi ziyaret edin</a>. Bu mesaj yeniden gösterilmeyecektir. @@ -5884,7 +5884,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın. In order to submit a game compatibility test case, you must link your citron account.<br><br/>To link your citron account, go to Emulation &gt; Configuration &gt; Web. - Oyun uyumluluk test çalışması göndermek için öncelikle citron hesabınla giriş yapmanız gerekiyor.<br><br/>Yuzu hesabınızla giriş yapmak için, Emülasyon &gt; Yapılandırma &gt; Web'e gidiniz. + Oyun uyumluluk test çalışması göndermek için öncelikle citron hesabınla giriş yapmanız gerekiyor.<br><br/>Citron hesabınızla giriş yapmak için, Emülasyon &gt; Yapılandırma &gt; Web'e gidiniz. @@ -6290,7 +6290,7 @@ Lütfen bu özelliği sadece güncelleme ve DLC yüklemek için kullanın.The currently running application has requested citron to not exit. Would you like to bypass this and exit anyway? - Şu an çalışan uygulamadan dolayı Yuzu kapatılamıyor. + Şu an çalışan uygulamadan dolayı Citron kapatılamıyor. Görmezden gelip kapatmak ister misiniz? @@ -6406,7 +6406,7 @@ Görmezden gelip kapatmak ister misiniz? citron has not been compiled with OpenGL support. - Yuzu OpenGL desteklememektedir. + Citron OpenGL desteklememektedir. @@ -6877,7 +6877,7 @@ Debug Message: Exit citron - Yuzu'dan çık + Citron'dan çık @@ -7255,7 +7255,7 @@ Debug Message: &About citron - &Yuzu Hakkında + &Citron Hakkında @@ -7575,7 +7575,7 @@ Debug Bilgisi: Creating a room failed. Please retry. Restarting citron might be necessary. - Odayı oluşturma başarısız oldu. Lütfen tekrar deneyin. Yuzu'yu yeniden başlatmak gerekebilir. + Odayı oluşturma başarısız oldu. Lütfen tekrar deneyin. Citron'yu yeniden başlatmak gerekebilir. diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d49a2e43e..ef549648b 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -65,9 +65,9 @@ endif() # SDL2 if (YUZU_USE_EXTERNAL_SDL2) if (NOT WIN32) - # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers + # Citron itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095) - # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) + # Citron-cmd also needs: Video (depends on Loadso/Dlopen) # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809) set(SDL_UNUSED_SUBSYSTEMS File Filesystem diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index bc5421d46..84c9877e5 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ SPDX-License-Identifier: GPL-3.0-or-later + android:theme="@style/Theme.Citron.Splash.Main"> @@ -49,12 +49,12 @@ SPDX-License-Identifier: GPL-3.0-or-later ) : NativeLibrary.setCurrentAppletId(applet.appletInfo.appletId) val appletGame = Game( - title = YuzuApplication.appContext.getString(applet.titleId), + title = CitronApplication.appContext.getString(applet.titleId), path = appletPath ) val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/adapters/CabinetLauncherDialogAdapter.kt b/src/android/app/src/main/java/org/citron/citron_emu/adapters/CabinetLauncherDialogAdapter.kt index 3589cbf86..16254670c 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/adapters/CabinetLauncherDialogAdapter.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/adapters/CabinetLauncherDialogAdapter.kt @@ -11,7 +11,7 @@ import androidx.navigation.fragment.findNavController import org.citron.citron_emu.HomeNavigationDirections import org.citron.citron_emu.NativeLibrary import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.databinding.DialogListItemBinding import org.citron.citron_emu.model.CabinetMode import org.citron.citron_emu.adapters.CabinetLauncherDialogAdapter.CabinetModeViewHolder @@ -49,7 +49,7 @@ class CabinetLauncherDialogAdapter(val fragment: Fragment) : NativeLibrary.setCurrentAppletId(AppletInfo.Cabinet.appletId) NativeLibrary.setCabinetMode(mode.id) val appletGame = Game( - title = YuzuApplication.appContext.getString(R.string.cabinet_applet), + title = CitronApplication.appContext.getString(R.string.cabinet_applet), path = appletPath ) val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/adapters/GameAdapter.kt b/src/android/app/src/main/java/org/citron/citron_emu/adapters/GameAdapter.kt index ceeeb70fe..9adf45c14 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/adapters/GameAdapter.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/adapters/GameAdapter.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.citron.citron_emu.HomeNavigationDirections import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.databinding.CardGameBinding import org.citron.citron_emu.model.Game import org.citron.citron_emu.model.GamesViewModel @@ -51,12 +51,12 @@ class GameAdapter(private val activity: AppCompatActivity) : fun onClick(game: Game) { val gameExists = DocumentFile.fromSingleUri( - YuzuApplication.appContext, + CitronApplication.appContext, Uri.parse(game.path) )?.exists() == true if (!gameExists) { Toast.makeText( - YuzuApplication.appContext, + CitronApplication.appContext, R.string.loader_error_file_not_found, Toast.LENGTH_LONG ).show() @@ -66,7 +66,7 @@ class GameAdapter(private val activity: AppCompatActivity) : } val preferences = - PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(CitronApplication.appContext) preferences.edit() .putLong( game.keyLastPlayedTime, @@ -77,12 +77,12 @@ class GameAdapter(private val activity: AppCompatActivity) : activity.lifecycleScope.launch { withContext(Dispatchers.IO) { val shortcut = - ShortcutInfoCompat.Builder(YuzuApplication.appContext, game.path) + ShortcutInfoCompat.Builder(CitronApplication.appContext, game.path) .setShortLabel(game.title) .setIcon(GameIconUtils.getShortcutIcon(activity, game)) .setIntent(game.launchIntent) .build() - ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut) + ShortcutManagerCompat.pushDynamicShortcut(CitronApplication.appContext, shortcut) } } diff --git a/src/android/app/src/main/java/org/citron/citron_emu/citronApplication.kt b/src/android/app/src/main/java/org/citron/citron_emu/citronApplication.kt index d0618434d..db162b70c 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/citronApplication.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/citronApplication.kt @@ -16,7 +16,7 @@ import org.citron.citron_emu.utils.Log fun Context.getPublicFilesDir(): File = getExternalFilesDir(null) ?: filesDir -class YuzuApplication : Application() { +class CitronApplication : Application() { private fun createNotificationChannels() { val noticeChannel = NotificationChannel( getString(R.string.notice_notification_channel_id), @@ -47,7 +47,7 @@ class YuzuApplication : Application() { companion object { var documentsTree: DocumentsTree? = null - lateinit var application: YuzuApplication + lateinit var application: CitronApplication val appContext: Context get() = application.applicationContext diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/DocumentProvider.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/DocumentProvider.kt index 98e860888..980fe1975 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/DocumentProvider.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/DocumentProvider.kt @@ -16,12 +16,12 @@ import android.webkit.MimeTypeMap import java.io.* import org.citron.citron_emu.BuildConfig import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.getPublicFilesDir class DocumentProvider : DocumentsProvider() { private val baseDirectory: File - get() = File(YuzuApplication.application.getPublicFilesDir().canonicalPath) + get() = File(CitronApplication.application.getPublicFilesDir().canonicalPath) companion object { private val DEFAULT_ROOT_PROJECTION: Array = arrayOf( diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/input/NativeInput.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/input/NativeInput.kt index 5bb5de0b4..a64590484 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/input/NativeInput.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/input/NativeInput.kt @@ -177,9 +177,9 @@ object NativeInput { /** * Registers a controller to be used with mapping - * @param device An [InputDevice] or the input overlay wrapped with [YuzuInputDevice] + * @param device An [InputDevice] or the input overlay wrapped with [CitronInputDevice] */ - external fun registerController(device: YuzuInputDevice) + external fun registerController(device: CitronInputDevice) /** * Gets the names of input devices that have been registered with the input subsystem via [registerController] diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/input/citronInputDevice.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/input/citronInputDevice.kt index c4b9164b3..14ff2dcc3 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/input/citronInputDevice.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/input/citronInputDevice.kt @@ -5,12 +5,12 @@ package org.citron.citron_emu.features.input import android.view.InputDevice import androidx.annotation.Keep -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.R import org.citron.citron_emu.utils.InputHandler.getGUID @Keep -interface YuzuInputDevice { +interface CitronInputDevice { fun getName(): String fun getGUID(): String @@ -25,15 +25,15 @@ interface YuzuInputDevice { fun hasKeys(keys: IntArray): BooleanArray = BooleanArray(0) } -class YuzuPhysicalDevice( +class CitronPhysicalDevice( private val device: InputDevice, private val port: Int, useSystemVibrator: Boolean -) : YuzuInputDevice { +) : CitronInputDevice { private val vibrator = if (useSystemVibrator) { - YuzuVibrator.getSystemVibrator() + CitronVibrator.getSystemVibrator() } else { - YuzuVibrator.getControllerVibrator(device) + CitronVibrator.getControllerVibrator(device) } override fun getName(): String { @@ -60,14 +60,14 @@ class YuzuPhysicalDevice( override fun hasKeys(keys: IntArray): BooleanArray = device.hasKeys(*keys) } -class YuzuInputOverlayDevice( +class CitronInputOverlayDevice( private val vibration: Boolean, private val port: Int -) : YuzuInputDevice { - private val vibrator = YuzuVibrator.getSystemVibrator() +) : CitronInputDevice { + private val vibrator = CitronVibrator.getSystemVibrator() override fun getName(): String { - return YuzuApplication.appContext.getString(R.string.input_overlay) + return CitronApplication.appContext.getString(R.string.input_overlay) } override fun getGUID(): String { diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/input/citronVibrator.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/input/citronVibrator.kt index bf044dae3..c4f86595b 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/input/citronVibrator.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/input/citronVibrator.kt @@ -12,32 +12,32 @@ import android.os.VibratorManager import android.view.InputDevice import androidx.annotation.Keep import androidx.annotation.RequiresApi -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication @Keep @Suppress("DEPRECATION") -interface YuzuVibrator { +interface CitronVibrator { fun supportsVibration(): Boolean fun vibrate(intensity: Float) companion object { - fun getControllerVibrator(device: InputDevice): YuzuVibrator = + fun getControllerVibrator(device: InputDevice): CitronVibrator = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - YuzuVibratorManager(device.vibratorManager) + CitronVibratorManager(device.vibratorManager) } else { - YuzuVibratorManagerCompat(device.vibrator) + CitronVibratorManagerCompat(device.vibrator) } - fun getSystemVibrator(): YuzuVibrator = + fun getSystemVibrator(): CitronVibrator = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - val vibratorManager = YuzuApplication.appContext + val vibratorManager = CitronApplication.appContext .getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager - YuzuVibratorManager(vibratorManager) + CitronVibratorManager(vibratorManager) } else { - val vibrator = YuzuApplication.appContext + val vibrator = CitronApplication.appContext .getSystemService(Context.VIBRATOR_SERVICE) as Vibrator - YuzuVibratorManagerCompat(vibrator) + CitronVibratorManagerCompat(vibrator) } fun getVibrationEffect(intensity: Float): VibrationEffect? { @@ -53,24 +53,24 @@ interface YuzuVibrator { } @RequiresApi(Build.VERSION_CODES.S) -class YuzuVibratorManager(private val vibratorManager: VibratorManager) : YuzuVibrator { +class CitronVibratorManager(private val vibratorManager: VibratorManager) : CitronVibrator { override fun supportsVibration(): Boolean { return vibratorManager.vibratorIds.isNotEmpty() } override fun vibrate(intensity: Float) { - val vibration = YuzuVibrator.getVibrationEffect(intensity) ?: return + val vibration = CitronVibrator.getVibrationEffect(intensity) ?: return vibratorManager.vibrate(CombinedVibration.createParallel(vibration)) } } -class YuzuVibratorManagerCompat(private val vibrator: Vibrator) : YuzuVibrator { +class CitronVibratorManagerCompat(private val vibrator: Vibrator) : CitronVibrator { override fun supportsVibration(): Boolean { return vibrator.hasVibrator() } override fun vibrate(intensity: Float) { - val vibration = YuzuVibrator.getVibrationEffect(intensity) ?: return + val vibration = CitronVibrator.getVibrationEffect(intensity) ?: return vibrator.vibrate(vibration) } } diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/Settings.kt index 85cf8ed5e..7ae4a7c00 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/Settings.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/Settings.kt @@ -4,7 +4,7 @@ package org.citron.citron_emu.features.settings.model import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication object Settings { enum class MenuTag(val titleId: Int = 0) { @@ -26,7 +26,7 @@ object Settings { } fun getPlayerString(player: Int): String = - YuzuApplication.appContext.getString(R.string.preferences_player, player) + CitronApplication.appContext.getString(R.string.preferences_player, player) const val PREF_FIRST_APP_LAUNCH = "FirstApplicationLaunch" const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown" diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/InputSetting.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/InputSetting.kt index 92013b945..0210e4b11 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/InputSetting.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/InputSetting.kt @@ -5,7 +5,7 @@ package org.citron.citron_emu.features.settings.model.view import androidx.annotation.StringRes import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.features.input.NativeInput import org.citron.citron_emu.features.input.model.ButtonName import org.citron.citron_emu.features.input.model.InputType @@ -19,7 +19,7 @@ sealed class InputSetting( abstract val inputType: InputType abstract val playerIndex: Int - protected val context get() = YuzuApplication.appContext + protected val context get() = CitronApplication.appContext abstract fun getSelectedValue(): String diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/SettingsItem.kt index 199e7d95e..26991b059 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/SettingsItem.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/model/view/SettingsItem.kt @@ -6,7 +6,7 @@ package org.citron.citron_emu.features.settings.model.view import androidx.annotation.StringRes import org.citron.citron_emu.NativeLibrary import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.features.input.NativeInput import org.citron.citron_emu.features.input.model.NpadStyleIndex import org.citron.citron_emu.features.settings.model.AbstractBooleanSetting @@ -37,14 +37,14 @@ abstract class SettingsItem( val title: String by lazy { if (titleId != 0) { - return@lazy YuzuApplication.appContext.getString(titleId) + return@lazy CitronApplication.appContext.getString(titleId) } return@lazy titleString } val description: String by lazy { if (descriptionId != 0) { - return@lazy YuzuApplication.appContext.getString(descriptionId) + return@lazy CitronApplication.appContext.getString(descriptionId) } return@lazy descriptionString } diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/InputProfileAdapter.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/InputProfileAdapter.kt index 8460c6851..b911c6632 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/InputProfileAdapter.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/InputProfileAdapter.kt @@ -6,7 +6,7 @@ package org.citron.citron_emu.features.settings.ui import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.adapters.AbstractListAdapter import org.citron.citron_emu.databinding.ListItemInputProfileBinding import org.citron.citron_emu.viewholder.AbstractViewHolder @@ -57,7 +57,7 @@ sealed interface ProfileItem { data class NewProfileItem( val createNewProfile: () -> Unit ) : ProfileItem { - override val name: String = YuzuApplication.appContext.getString(R.string.create_new_profile) + override val name: String = CitronApplication.appContext.getString(R.string.create_new_profile) } data class ExistingProfileItem( diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/SettingsFragmentPresenter.kt index e163e5ac0..79b563f3d 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -8,7 +8,7 @@ import android.os.Build import android.widget.Toast import org.citron.citron_emu.NativeLibrary import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.features.input.NativeInput import org.citron.citron_emu.features.input.model.AnalogDirection import org.citron.citron_emu.features.input.model.NativeAnalog @@ -35,7 +35,7 @@ class SettingsFragmentPresenter( ) { private var settingsList = ArrayList() - private val context get() = YuzuApplication.appContext + private val context get() = CitronApplication.appContext // Extension for altering settings list based on each setting's properties fun ArrayList.add(key: String) { diff --git a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/SettingsViewModel.kt b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/SettingsViewModel.kt index 9502429eb..d6256512d 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/SettingsViewModel.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/features/settings/ui/SettingsViewModel.kt @@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.features.settings.model.view.SettingsItem import org.citron.citron_emu.model.Game import org.citron.citron_emu.utils.InputHandler @@ -73,7 +73,7 @@ class SettingsViewModel : ViewModel() { fun setSliderTextValue(value: Float, units: String) { _sliderProgress.value = value.toInt() _sliderTextValue.value = String.format( - YuzuApplication.appContext.getString(R.string.value_with_units), + CitronApplication.appContext.getString(R.string.value_with_units), value.toInt().toString(), units ) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/fragments/ContentTypeSelectionDialogFragment.kt b/src/android/app/src/main/java/org/citron/citron_emu/fragments/ContentTypeSelectionDialogFragment.kt index 006d3faa6..4ca7c05bb 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/fragments/ContentTypeSelectionDialogFragment.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/fragments/ContentTypeSelectionDialogFragment.kt @@ -11,7 +11,7 @@ import androidx.fragment.app.activityViewModels import androidx.preference.PreferenceManager import com.google.android.material.dialog.MaterialAlertDialogBuilder import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.model.AddonViewModel import org.citron.citron_emu.ui.main.MainActivity @@ -19,7 +19,7 @@ class ContentTypeSelectionDialogFragment : DialogFragment() { private val addonViewModel: AddonViewModel by activityViewModels() private val preferences get() = - PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(CitronApplication.appContext) private var selectedItem = 0 diff --git a/src/android/app/src/main/java/org/citron/citron_emu/fragments/GamePropertiesFragment.kt b/src/android/app/src/main/java/org/citron/citron_emu/fragments/GamePropertiesFragment.kt index 47c81c350..203cbd70a 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/fragments/GamePropertiesFragment.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/fragments/GamePropertiesFragment.kt @@ -26,7 +26,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.citron.citron_emu.HomeNavigationDirections import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.adapters.GamePropertiesAdapter import org.citron.citron_emu.databinding.FragmentGamePropertiesBinding import org.citron.citron_emu.features.settings.model.Settings @@ -224,7 +224,7 @@ class GamePropertiesFragment : Fragment() { negativeAction = { File(args.game.saveDir).deleteRecursively() Toast.makeText( - YuzuApplication.appContext, + CitronApplication.appContext, R.string.save_data_deleted_successfully, Toast.LENGTH_SHORT ).show() @@ -263,7 +263,7 @@ class GamePropertiesFragment : Fragment() { positiveAction = { shaderCacheDir.deleteRecursively() Toast.makeText( - YuzuApplication.appContext, + CitronApplication.appContext, R.string.cleared_shaders_successfully, Toast.LENGTH_SHORT ).show() @@ -374,7 +374,7 @@ class GamePropertiesFragment : Fragment() { return@withContext } Toast.makeText( - YuzuApplication.appContext, + CitronApplication.appContext, getString(R.string.save_file_imported_success), Toast.LENGTH_LONG ).show() @@ -384,7 +384,7 @@ class GamePropertiesFragment : Fragment() { cacheSaveDir.deleteRecursively() } catch (e: Exception) { Toast.makeText( - YuzuApplication.appContext, + CitronApplication.appContext, getString(R.string.fatal_error), Toast.LENGTH_LONG ).show() diff --git a/src/android/app/src/main/java/org/citron/citron_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/citron/citron_emu/fragments/HomeSettingsFragment.kt index 7dac5a059..17d3b91a3 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/fragments/HomeSettingsFragment.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/fragments/HomeSettingsFragment.kt @@ -31,7 +31,7 @@ import org.citron.citron_emu.BuildConfig import org.citron.citron_emu.HomeNavigationDirections import org.citron.citron_emu.NativeLibrary import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.adapters.HomeSettingAdapter import org.citron.citron_emu.databinding.FragmentHomeSettingsBinding import org.citron.citron_emu.features.DocumentProvider @@ -180,7 +180,7 @@ class HomeSettingsFragment : Fragment() { ) } else { val failedNames = result.joinToString("\n") - val errorMessage = YuzuApplication.appContext.getString( + val errorMessage = CitronApplication.appContext.getString( R.string.verification_failed_for, failedNames ) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/fragments/InstallableFragment.kt b/src/android/app/src/main/java/org/citron/citron_emu/fragments/InstallableFragment.kt index 06887a092..90f15f8ed 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/fragments/InstallableFragment.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/fragments/InstallableFragment.kt @@ -22,7 +22,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.citron.citron_emu.NativeLibrary import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.adapters.InstallableAdapter import org.citron.citron_emu.databinding.FragmentInstallablesBinding import org.citron.citron_emu.model.HomeViewModel @@ -109,7 +109,7 @@ class InstallableFragment : Fragment() { ) if (!oldSaveDataFolder.exists() && !futureSaveDataFolder.exists()) { Toast.makeText( - YuzuApplication.appContext, + CitronApplication.appContext, R.string.no_save_data_found, Toast.LENGTH_SHORT ).show() @@ -262,7 +262,7 @@ class InstallableFragment : Fragment() { cacheSaveDir.deleteRecursively() } catch (e: Exception) { Toast.makeText( - YuzuApplication.appContext, + CitronApplication.appContext, getString(R.string.fatal_error), Toast.LENGTH_LONG ).show() diff --git a/src/android/app/src/main/java/org/citron/citron_emu/fragments/SearchFragment.kt b/src/android/app/src/main/java/org/citron/citron_emu/fragments/SearchFragment.kt index 6978ac47c..657025ea4 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/fragments/SearchFragment.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/fragments/SearchFragment.kt @@ -22,7 +22,7 @@ import info.debatty.java.stringsimilarity.Jaccard import info.debatty.java.stringsimilarity.JaroWinkler import java.util.Locale import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.adapters.GameAdapter import org.citron.citron_emu.databinding.FragmentSearchBinding import org.citron.citron_emu.layout.AutofitGridLayoutManager @@ -58,7 +58,7 @@ class SearchFragment : Fragment() { super.onViewCreated(view, savedInstanceState) homeViewModel.setNavigationVisibility(visible = true, animated = true) homeViewModel.setStatusBarShadeVisibility(true) - preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext) + preferences = PreferenceManager.getDefaultSharedPreferences(CitronApplication.appContext) if (savedInstanceState != null) { binding.searchText.setText(savedInstanceState.getString(SEARCH_TEXT)) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/org/citron/citron_emu/fragments/SetupFragment.kt index a51c2d5e9..711d16558 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/fragments/SetupFragment.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/fragments/SetupFragment.kt @@ -30,7 +30,7 @@ import kotlinx.coroutines.launch import org.citron.citron_emu.NativeLibrary import java.io.File import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.adapters.SetupAdapter import org.citron.citron_emu.databinding.FragmentSetupBinding import org.citron.citron_emu.features.settings.model.Settings @@ -343,7 +343,7 @@ class SetupFragment : Fragment() { } private fun finishSetup() { - PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext).edit() + PreferenceManager.getDefaultSharedPreferences(CitronApplication.appContext).edit() .putBoolean(Settings.PREF_FIRST_APP_LAUNCH, false) .apply() mainActivity.finishSetup(binding.root.findNavController()) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/model/DriverViewModel.kt b/src/android/app/src/main/java/org/citron/citron_emu/model/DriverViewModel.kt index fe775319d..8a7820a86 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/model/DriverViewModel.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/model/DriverViewModel.kt @@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.features.settings.model.StringSetting import org.citron.citron_emu.features.settings.utils.SettingsFile import org.citron.citron_emu.model.Driver.Companion.toDriver @@ -70,7 +70,7 @@ class DriverViewModel : ViewModel() { val newDriverList = mutableListOf( Driver( selectedDriver == GpuDriverMetadata(), - YuzuApplication.appContext.getString(R.string.system_gpu_driver), + CitronApplication.appContext.getString(R.string.system_gpu_driver), systemDriverData?.get(0) ?: "", systemDriverData?.get(1) ?: "" ) @@ -186,7 +186,7 @@ class DriverViewModel : ViewModel() { private fun updateName() { _selectedDriverTitle.value = GpuDriverHelper.customDriverSettingData.name - ?: YuzuApplication.appContext.getString(R.string.system_gpu_driver) + ?: CitronApplication.appContext.getString(R.string.system_gpu_driver) } private fun setDriverReady() { diff --git a/src/android/app/src/main/java/org/citron/citron_emu/model/Game.kt b/src/android/app/src/main/java/org/citron/citron_emu/model/Game.kt index d7d2c5628..dced02d5c 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/model/Game.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/model/Game.kt @@ -11,7 +11,7 @@ import kotlinx.parcelize.Parcelize import kotlinx.serialization.Serializable import org.citron.citron_emu.NativeLibrary import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.activities.EmulationActivity import org.citron.citron_emu.utils.DirectoryInitialization import org.citron.citron_emu.utils.FileUtil @@ -52,7 +52,7 @@ class Game( } val saveZipName: String - get() = "$title ${YuzuApplication.appContext.getString(R.string.save_data).lowercase()} - ${ + get() = "$title ${CitronApplication.appContext.getString(R.string.save_data).lowercase()} - ${ LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) }.zip" @@ -64,7 +64,7 @@ class Game( get() = DirectoryInitialization.userDirectory + "/load/" + programIdHex + "/" val launchIntent: Intent - get() = Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply { + get() = Intent(CitronApplication.appContext, EmulationActivity::class.java).apply { action = Intent.ACTION_VIEW data = Uri.parse(path) } diff --git a/src/android/app/src/main/java/org/citron/citron_emu/model/GamesViewModel.kt b/src/android/app/src/main/java/org/citron/citron_emu/model/GamesViewModel.kt index 2a2415ac3..14118e4e6 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/model/GamesViewModel.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/model/GamesViewModel.kt @@ -18,7 +18,7 @@ import kotlinx.coroutines.withContext import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import org.citron.citron_emu.NativeLibrary -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.utils.GameHelper import org.citron.citron_emu.utils.NativeConfig import java.util.concurrent.atomic.AtomicBoolean @@ -94,7 +94,7 @@ class GamesViewModel : ViewModel() { if (firstStartup) { // Retrieve list of cached games val storedGames = - PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext) + PreferenceManager.getDefaultSharedPreferences(CitronApplication.appContext) .getStringSet(GameHelper.KEY_GAMES, emptySet()) if (storedGames!!.isNotEmpty()) { val deserializedGames = mutableSetOf() @@ -109,7 +109,7 @@ class GamesViewModel : ViewModel() { val gameExists = DocumentFile.fromSingleUri( - YuzuApplication.appContext, + CitronApplication.appContext, Uri.parse(game.path) )?.exists() if (gameExists == true) { diff --git a/src/android/app/src/main/java/org/citron/citron_emu/overlay/model/OverlayControl.kt b/src/android/app/src/main/java/org/citron/citron_emu/overlay/model/OverlayControl.kt index 172510357..85053a07a 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/overlay/model/OverlayControl.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/overlay/model/OverlayControl.kt @@ -5,7 +5,7 @@ package org.citron.citron_emu.overlay.model import androidx.annotation.IntegerRes import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication enum class OverlayControl( val id: String, @@ -136,7 +136,7 @@ enum class OverlayControl( fun getDefaultPositionForLayout(layout: OverlayLayout): Pair { val rawResourcePair: Pair - YuzuApplication.appContext.resources.apply { + CitronApplication.appContext.resources.apply { rawResourcePair = when (layout) { OverlayLayout.Landscape -> { Pair( diff --git a/src/android/app/src/main/java/org/citron/citron_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/citron/citron_emu/ui/main/MainActivity.kt index cb99a635a..5e2ac122d 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/ui/main/MainActivity.kt @@ -642,18 +642,18 @@ class MainActivity : AppCompatActivity(), ThemeProvider { ) { progressCallback, _ -> val checkStream = ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result))) - var isYuzuBackup = false + var isCitronBackup = false checkStream.use { stream -> var ze: ZipEntry? = null while (stream.nextEntry?.also { ze = it } != null) { val itemName = ze!!.name.trim() if (itemName == "/config/config.ini" || itemName == "config/config.ini") { - isYuzuBackup = true + isCitronBackup = true return@use } } } - if (!isYuzuBackup) { + if (!isCitronBackup) { return@newInstance MessageDialogFragment.newInstance( this, titleId = R.string.invalid_citron_backup, diff --git a/src/android/app/src/main/java/org/citron/citron_emu/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/org/citron/citron_emu/utils/DirectoryInitialization.kt index c0d71c55a..97f106a57 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/utils/DirectoryInitialization.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/utils/DirectoryInitialization.kt @@ -6,7 +6,7 @@ package org.citron.citron_emu.utils import androidx.preference.PreferenceManager import java.io.IOException import org.citron.citron_emu.NativeLibrary -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.features.settings.model.BooleanSetting import org.citron.citron_emu.features.settings.model.IntSetting import org.citron.citron_emu.features.settings.model.Settings @@ -38,7 +38,7 @@ object DirectoryInitialization { private fun initializeInternalStorage() { try { - userPath = YuzuApplication.appContext.getExternalFilesDir(null)!!.canonicalPath + userPath = CitronApplication.appContext.getExternalFilesDir(null)!!.canonicalPath NativeLibrary.setAppDirectory(userPath!!) } catch (e: IOException) { e.printStackTrace() @@ -46,7 +46,7 @@ object DirectoryInitialization { } private fun migrateSettings() { - val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext) + val preferences = PreferenceManager.getDefaultSharedPreferences(CitronApplication.appContext) var saveConfig = false val theme = preferences.migratePreference(Settings.PREF_THEME) if (theme != null) { diff --git a/src/android/app/src/main/java/org/citron/citron_emu/utils/FileUtil.kt b/src/android/app/src/main/java/org/citron/citron_emu/utils/FileUtil.kt index 88289c3a8..1f02d313d 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/utils/FileUtil.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/utils/FileUtil.kt @@ -14,7 +14,7 @@ import java.io.InputStream import java.net.URLDecoder import java.util.zip.ZipEntry import java.util.zip.ZipInputStream -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.model.MinimalDocumentFile import org.citron.citron_emu.model.TaskState import java.io.BufferedOutputStream @@ -31,7 +31,7 @@ object FileUtil { const val APPLICATION_OCTET_STREAM = "application/octet-stream" const val TEXT_PLAIN = "text/plain" - private val context get() = YuzuApplication.appContext + private val context get() = CitronApplication.appContext /** * Create a file from directory with filename. @@ -195,7 +195,7 @@ object FileUtil { * @return String display name */ fun getFilename(uri: Uri): String { - val resolver = YuzuApplication.appContext.contentResolver + val resolver = CitronApplication.appContext.contentResolver val columns = arrayOf( DocumentsContract.Document.COLUMN_DISPLAY_NAME ) @@ -408,10 +408,10 @@ object FileUtil { val newFile = File(file, it.name!!) if (it.isDirectory) { newFile.mkdirs() - DocumentFile.fromTreeUri(YuzuApplication.appContext, it.uri)?.copyFilesTo(newFile) + DocumentFile.fromTreeUri(CitronApplication.appContext, it.uri)?.copyFilesTo(newFile) } else { val inputStream = - YuzuApplication.appContext.contentResolver.openInputStream(it.uri) + CitronApplication.appContext.contentResolver.openInputStream(it.uri) BufferedInputStream(inputStream).use { bos -> if (!newFile.exists()) { newFile.createNewFile() @@ -487,17 +487,17 @@ object FileUtil { String(stream.readBytes(), StandardCharsets.UTF_8) fun DocumentFile.inputStream(): InputStream = - YuzuApplication.appContext.contentResolver.openInputStream(uri)!! + CitronApplication.appContext.contentResolver.openInputStream(uri)!! fun DocumentFile.outputStream(): OutputStream = - YuzuApplication.appContext.contentResolver.openOutputStream(uri)!! + CitronApplication.appContext.contentResolver.openOutputStream(uri)!! fun Uri.inputStream(): InputStream = - YuzuApplication.appContext.contentResolver.openInputStream(this)!! + CitronApplication.appContext.contentResolver.openInputStream(this)!! fun Uri.outputStream(): OutputStream = - YuzuApplication.appContext.contentResolver.openOutputStream(this)!! + CitronApplication.appContext.contentResolver.openOutputStream(this)!! fun Uri.asDocumentFile(): DocumentFile? = - DocumentFile.fromSingleUri(YuzuApplication.appContext, this) + DocumentFile.fromSingleUri(CitronApplication.appContext, this) } diff --git a/src/android/app/src/main/java/org/citron/citron_emu/utils/GameHelper.kt b/src/android/app/src/main/java/org/citron/citron_emu/utils/GameHelper.kt index f651d0e30..6edb79226 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/utils/GameHelper.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/utils/GameHelper.kt @@ -9,7 +9,7 @@ import androidx.preference.PreferenceManager import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.citron.citron_emu.NativeLibrary -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.model.Game import org.citron.citron_emu.model.GameDir import org.citron.citron_emu.model.MinimalDocumentFile @@ -22,7 +22,7 @@ object GameHelper { fun getGames(): List { val games = mutableListOf() - val context = YuzuApplication.appContext + val context = CitronApplication.appContext preferences = PreferenceManager.getDefaultSharedPreferences(context) val gameDirs = mutableListOf() diff --git a/src/android/app/src/main/java/org/citron/citron_emu/utils/GameIconUtils.kt b/src/android/app/src/main/java/org/citron/citron_emu/utils/GameIconUtils.kt index 6b4784061..3e8a0e12f 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/utils/GameIconUtils.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/utils/GameIconUtils.kt @@ -22,7 +22,7 @@ import coil.memory.MemoryCache import coil.request.ImageRequest import coil.request.Options import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.model.Game class GameIconFetcher( @@ -58,20 +58,20 @@ class GameIconKeyer : Keyer { } object GameIconUtils { - private val imageLoader = ImageLoader.Builder(YuzuApplication.appContext) + private val imageLoader = ImageLoader.Builder(CitronApplication.appContext) .components { add(GameIconKeyer()) add(GameIconFetcher.Factory()) } .memoryCache { - MemoryCache.Builder(YuzuApplication.appContext) + MemoryCache.Builder(CitronApplication.appContext) .maxSizePercent(0.25) .build() } .build() fun loadGameIcon(game: Game, imageView: ImageView) { - val request = ImageRequest.Builder(YuzuApplication.appContext) + val request = ImageRequest.Builder(CitronApplication.appContext) .data(game) .target(imageView) .error(R.drawable.default_icon) @@ -80,7 +80,7 @@ object GameIconUtils { } suspend fun getGameIcon(lifecycleOwner: LifecycleOwner, game: Game): Bitmap { - val request = ImageRequest.Builder(YuzuApplication.appContext) + val request = ImageRequest.Builder(CitronApplication.appContext) .data(game) .lifecycle(lifecycleOwner) .error(R.drawable.default_icon) @@ -91,15 +91,15 @@ object GameIconUtils { suspend fun getShortcutIcon(lifecycleOwner: LifecycleOwner, game: Game): IconCompat { val layerDrawable = ResourcesCompat.getDrawable( - YuzuApplication.appContext.resources, + CitronApplication.appContext.resources, R.drawable.shortcut, null ) as LayerDrawable layerDrawable.setDrawableByLayerId( R.id.shortcut_foreground, - getGameIcon(lifecycleOwner, game).toDrawable(YuzuApplication.appContext.resources) + getGameIcon(lifecycleOwner, game).toDrawable(CitronApplication.appContext.resources) ) - val inset = YuzuApplication.appContext.resources + val inset = CitronApplication.appContext.resources .getDimensionPixelSize(R.dimen.icon_inset) layerDrawable.setLayerInset(1, inset, inset, inset, inset) return IconCompat.createWithAdaptiveBitmap( diff --git a/src/android/app/src/main/java/org/citron/citron_emu/utils/GpuDriverHelper.kt b/src/android/app/src/main/java/org/citron/citron_emu/utils/GpuDriverHelper.kt index d1d25aa5f..2112a1666 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/utils/GpuDriverHelper.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/utils/GpuDriverHelper.kt @@ -10,7 +10,7 @@ import android.view.Surface import java.io.File import java.io.IOException import org.citron.citron_emu.NativeLibrary -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import org.citron.citron_emu.features.settings.model.StringSetting import java.io.FileNotFoundException import java.util.zip.ZipException @@ -27,11 +27,11 @@ object GpuDriverHelper { fun initializeDriverParameters() { try { // Initialize the file redirection directory. - fileRedirectionPath = YuzuApplication.appContext + fileRedirectionPath = CitronApplication.appContext .getExternalFilesDir(null)!!.canonicalPath + "/gpu/vk_file_redirect/" // Initialize the driver installation directory. - driverInstallationPath = YuzuApplication.appContext + driverInstallationPath = CitronApplication.appContext .filesDir.canonicalPath + "/gpu_driver/" } catch (e: IOException) { throw RuntimeException(e) @@ -41,7 +41,7 @@ object GpuDriverHelper { initializeDirectories() // Initialize hook libraries directory. - hookLibPath = YuzuApplication.appContext.applicationInfo.nativeLibraryDir + "/" + hookLibPath = CitronApplication.appContext.applicationInfo.nativeLibraryDir + "/" // Initialize GPU driver. NativeLibrary.initializeGpuDriver( diff --git a/src/android/app/src/main/java/org/citron/citron_emu/utils/InputHandler.kt b/src/android/app/src/main/java/org/citron/citron_emu/utils/InputHandler.kt index bedb7e7ba..3713593a0 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/utils/InputHandler.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/utils/InputHandler.kt @@ -7,11 +7,11 @@ import android.view.InputDevice import android.view.KeyEvent import android.view.MotionEvent import org.citron.citron_emu.features.input.NativeInput -import org.citron.citron_emu.features.input.YuzuInputOverlayDevice -import org.citron.citron_emu.features.input.YuzuPhysicalDevice +import org.citron.citron_emu.features.input.CitronInputOverlayDevice +import org.citron.citron_emu.features.input.CitronPhysicalDevice object InputHandler { - var androidControllers = mapOf() + var androidControllers = mapOf() var registeredControllers = mutableListOf() fun dispatchKeyEvent(event: KeyEvent): Boolean { @@ -50,8 +50,8 @@ object InputHandler { return true } - fun getDevices(): Map { - val gameControllerDeviceIds = mutableMapOf() + fun getDevices(): Map { + val gameControllerDeviceIds = mutableMapOf() val deviceIds = InputDevice.getDeviceIds() var port = 0 val inputSettings = NativeConfig.getInputSettings(true) @@ -62,7 +62,7 @@ object InputHandler { sources and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK ) { if (!gameControllerDeviceIds.contains(controllerNumber)) { - gameControllerDeviceIds[controllerNumber] = YuzuPhysicalDevice( + gameControllerDeviceIds[controllerNumber] = CitronPhysicalDevice( this, port, inputSettings[port].useSystemVibrator @@ -82,7 +82,7 @@ object InputHandler { } // Register the input overlay on a dedicated port for all player 1 vibrations - NativeInput.registerController(YuzuInputOverlayDevice(androidControllers.isEmpty(), 100)) + NativeInput.registerController(CitronInputOverlayDevice(androidControllers.isEmpty(), 100)) registeredControllers.clear() NativeInput.getInputDevices().forEach { registeredControllers.add(ParamPackage(it)) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/utils/MemoryUtil.kt b/src/android/app/src/main/java/org/citron/citron_emu/utils/MemoryUtil.kt index d07ab4f51..fa5b797be 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/utils/MemoryUtil.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/utils/MemoryUtil.kt @@ -7,12 +7,12 @@ import android.app.ActivityManager import android.content.Context import android.os.Build import org.citron.citron_emu.R -import org.citron.citron_emu.YuzuApplication +import org.citron.citron_emu.CitronApplication import java.util.Locale import kotlin.math.ceil object MemoryUtil { - private val context get() = YuzuApplication.appContext + private val context get() = CitronApplication.appContext private val Float.hundredths: String get() = String.format(Locale.ROOT, "%.2f", this) diff --git a/src/android/app/src/main/java/org/citron/citron_emu/utils/ThemeHelper.kt b/src/android/app/src/main/java/org/citron/citron_emu/utils/ThemeHelper.kt index c6fd61119..338216dff 100644 --- a/src/android/app/src/main/java/org/citron/citron_emu/utils/ThemeHelper.kt +++ b/src/android/app/src/main/java/org/citron/citron_emu/utils/ThemeHelper.kt @@ -23,12 +23,12 @@ object ThemeHelper { fun setTheme(activity: AppCompatActivity) { setThemeMode(activity) when (Theme.from(IntSetting.THEME.getInt())) { - Theme.Default -> activity.setTheme(R.style.Theme_Yuzu_Main) + Theme.Default -> activity.setTheme(R.style.Theme_Citron_Main) Theme.MaterialYou -> { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - activity.setTheme(R.style.Theme_Yuzu_Main_MaterialYou) + activity.setTheme(R.style.Theme_Citron_Main_MaterialYou) } else { - activity.setTheme(R.style.Theme_Yuzu_Main) + activity.setTheme(R.style.Theme_Citron_Main) } } } @@ -37,7 +37,7 @@ object ThemeHelper { // light app mode, dark system mode, and black backgrounds. Launching the settings activity // will then show light mode colors/navigation bars but with black backgrounds. if (BooleanSetting.BLACK_BACKGROUNDS.getBoolean() && isNightMode(activity)) { - activity.setTheme(R.style.ThemeOverlay_Yuzu_Dark) + activity.setTheme(R.style.ThemeOverlay_Citron_Dark) } } diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 1a060c228..eae276e96 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -659,7 +659,7 @@ void Java_org_citron_citron_1emu_NativeLibrary_submitInlineKeyboardInput(JNIEnv* void Java_org_citron_citron_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv* env, jobject instance) { - const auto nand_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir); + const auto nand_dir = Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir); auto vfs_nand_dir = EmulationSession::GetInstance().System().GetFilesystem()->OpenDirectory( Common::FS::PathToUTF8String(nand_dir), FileSys::OpenMode::Read); @@ -831,7 +831,7 @@ jstring Java_org_citron_citron_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobje const auto user_id = manager.GetUser(static_cast(0)); ASSERT(user_id); - const auto nandDir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir); + const auto nandDir = Common::FS::GetCitronPath(Common::FS::CitronPath::NANDDir); auto vfsNandDir = system.GetFilesystem()->OpenDirectory(Common::FS::PathToUTF8String(nandDir), FileSys::OpenMode::Read); diff --git a/src/android/app/src/main/jni/native_input.cpp b/src/android/app/src/main/jni/native_input.cpp index f9cdc8c70..cc7ced780 100644 --- a/src/android/app/src/main/jni/native_input.cpp +++ b/src/android/app/src/main/jni/native_input.cpp @@ -44,7 +44,7 @@ bool IsProfileNameValid(std::string_view profile_name) { } bool ProfileExistsInFilesystem(std::string_view profile_name) { - return Common::FS::Exists(Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "input" / + return Common::FS::Exists(Common::FS::GetCitronPath(Common::FS::CitronPath::ConfigDir) / "input" / fmt::format("{}.ini", profile_name)); } @@ -304,7 +304,7 @@ void Java_org_citron_citron_1emu_features_input_NativeInput_loadInputProfiles(JN jobject j_obj) { map_profiles.clear(); const auto input_profile_loc = - Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "input"; + Common::FS::GetCitronPath(Common::FS::CitronPath::ConfigDir) / "input"; if (Common::FS::IsDir(input_profile_loc)) { Common::FS::IterateDirEntries( diff --git a/src/android/app/src/main/res/values-id/strings.xml b/src/android/app/src/main/res/values-id/strings.xml index e17dacba6..45327cb70 100644 --- a/src/android/app/src/main/res/values-id/strings.xml +++ b/src/android/app/src/main/res/values-id/strings.xml @@ -117,7 +117,7 @@ https://citron-emu.org/help/quickstart/#dumping-installed-updates Driver kustom tidak didukung Driver kustom saat ini tidak dapat digunakan pada perangkat ini. \nCek opsi ini lain waktu untuk mengetahui apakah dapat digunakan! - Kelola data Yuzu. + Kelola data Citron. Impor/expor firmware, key, data pengguna, dan sebagainya! Bagikan file simpanan. Gagal mengekspor simpanan. diff --git a/src/android/app/src/main/res/values-it/strings.xml b/src/android/app/src/main/res/values-it/strings.xml index c708b7f71..c510799cb 100644 --- a/src/android/app/src/main/res/values-it/strings.xml +++ b/src/android/app/src/main/res/values-it/strings.xml @@ -117,7 +117,7 @@ https://citron-emu.org/help/quickstart/#dumping-installed-updates I driver personalizzati non sono supportati. I driver personalizzati non sono attualmente supportati su questo dispositivo.\n Ricontrolla in futuro. - Gestisci i dati di Yuzu + Gestisci i dati di Citron Importa/Esporta il firmware, le keys, i dati utente, e altro! Condividi i tuoi dati di salvataggio Errore durante l\'esportazione del salvataggio @@ -163,7 +163,7 @@ Esportazione dei Dati Utente... Importazione dei Dati Utente... Importa i Dati Utente - Backup di Yuzu Invalido + Backup di Citron Invalido Dati Utente esportati con successo Dati Utente importati con successo. Esportazione annullata diff --git a/src/android/app/src/main/res/values-night-v31/themes.xml b/src/android/app/src/main/res/values-night-v31/themes.xml index 631d7fd1b..7e97f84ac 100644 --- a/src/android/app/src/main/res/values-night-v31/themes.xml +++ b/src/android/app/src/main/res/values-night-v31/themes.xml @@ -1,7 +1,7 @@ - diff --git a/src/android/app/src/main/res/values-pt-rBR/strings.xml b/src/android/app/src/main/res/values-pt-rBR/strings.xml index e7bdce607..11114b1f0 100644 --- a/src/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml @@ -32,7 +32,7 @@ Procura e filtra jogos Seleciona a pasta de jogos Gerenciar pastas de jogos - Permite que o Yuzu preencha a lista de jogos + Permite que o Citron preencha a lista de jogos Ignorar a seleção da pasta de jogos? Os jogos não serão exibidos na lista de jogos se uma pasta não estiver selecionada. https://citron-emu.org/help/quickstart/#dumping-games @@ -48,7 +48,7 @@ Conceda a permissão de notificação com o botão abaixo. Conceder permissão Ignorar a concessão da permissão de notificação? - O Yuzu não irá te notificar de informações importantes. + O Citron não irá te notificar de informações importantes. Permissão negada Você negou essa permissão muitas vezes e agora precisa concedê-la manualmente nas configurações do sistema. Sobre @@ -76,11 +76,11 @@ Adicionado recentemente Jogos comerciais Homebrew - Abrir a pasta do Yuzu - Gerencie os arquivos internos do Yuzu + Abrir a pasta do Citron + Gerencie os arquivos internos do Citron Altere a aparência do aplicativo Nenhum gerenciador de arquivos encontrado - Não foi possível abrir a pasta do Yuzu + Não foi possível abrir a pasta do Citron Por favor localize manualmente a pasta do usuário, com o painel lateral do gerenciador de arquivos. Gerenciar os dados salvos dos jogos Dados salvos encontrados. Por favor selecione uma opção abaixo. @@ -166,7 +166,7 @@ Copiado para a área de transferência Um emulador de Switch de código aberto Colaboradores - Feito com \u2764 da equipe do Yuzu + Feito com \u2764 da equipe do Citron https://github.com/citron-emu/citron/graphs/contributors Projetos que tornam o citron para Android possível Versão da Compilação diff --git a/src/android/app/src/main/res/values-pt-rPT/strings.xml b/src/android/app/src/main/res/values-pt-rPT/strings.xml index c425b74e0..1be0c2d15 100644 --- a/src/android/app/src/main/res/values-pt-rPT/strings.xml +++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml @@ -32,7 +32,7 @@ Procura e filtra jogos. Seleciona a pasta de jogos. Gerencie as pastas de jogos - Permite que o Yuzu preencha a lista de jogos + Permite que o Citron preencha a lista de jogos Ignorar a seleção da pasta de jogos? Os jogos não serão exibidos na lista de jogos se uma pasta não estiver selecionada. https://citron-emu.org/help/quickstart/#dumping-games @@ -48,7 +48,7 @@ Conceda a permissão de notificação com o botão abaixo. Conceda permissão Saltar a concessão da permissão de notificação? - Yuzu não conseguirá te notificar de informações importantes. + Citron não conseguirá te notificar de informações importantes. Permissão negada Você negou essa permissão muitas vezes e agora precisa concedê-la manualmente nas configurações do sistema. Sobre @@ -76,11 +76,11 @@ Adicionado recentemente Jogos comerciais Homebrew - Abre a pasta Yuzu - Gere os ficheiro internos do Yuzu + Abre a pasta Citron + Gere os ficheiro internos do Citron Modifica a aparência da App Nenhum gestor de ficheiros encontrado - Impossível abrir pasta Yuzu + Impossível abrir pasta Citron Localiza a pasta de utilizador manualmente com o painel lateral do gestor de ficheiros. Gerir dados guardados Dados não encontrados. Por favor seleciona uma opção abaixo. @@ -166,7 +166,7 @@ Copiado para a área de transferência Um emulador Switch de código aberto Contribuidores - Feito com \u2764 da equipa do Yuzu + Feito com \u2764 da equipa do Citron https://github.com/citron-emu/citron/graphs/contributors Projetos que tornam o citron para Android possível Versão diff --git a/src/android/app/src/main/res/values-v31/themes.xml b/src/android/app/src/main/res/values-v31/themes.xml index 5d3a86bf6..d07428abf 100644 --- a/src/android/app/src/main/res/values-v31/themes.xml +++ b/src/android/app/src/main/res/values-v31/themes.xml @@ -1,7 +1,7 @@ - - - - diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml index 6de8c2ad6..16552e0a5 100644 --- a/src/android/app/src/main/res/values/themes.xml +++ b/src/android/app/src/main/res/values/themes.xml @@ -1,13 +1,13 @@ - -