From 138d67b3078939cdeceb76e14fab5101ab384c8b Mon Sep 17 00:00:00 2001 From: Exverge Date: Sun, 31 Mar 2024 20:08:49 -0400 Subject: [PATCH] Refactor android to dev.suyu.suyu_emu --- .ci/scripts/linux/upload.sh | 2 +- CMakeLists.txt | 8 +- ...suyu.desktop => dev.suyu_emu.suyu.desktop} | 2 +- ...nfo.xml => dev.suyu_emu.suyu.metainfo.xml} | 4 +- ...uyu_emu.suyu.xml => dev.suyu_emu.suyu.xml} | 8 +- src/android/app/build.gradle.kts | 4 +- src/android/app/src/main/AndroidManifest.xml | 8 +- .../suyu/suyu_emu/NativeLibrary.kt | 18 ++--- .../suyu/suyu_emu/SuyuApplication.kt | 12 +-- .../suyu_emu/activities/EmulationActivity.kt | 36 ++++----- .../suyu_emu/adapters/AbstractDiffAdapter.kt | 4 +- .../suyu_emu/adapters/AbstractListAdapter.kt | 4 +- .../adapters/AbstractSingleSelectionList.kt | 6 +- .../suyu/suyu_emu/adapters/AddonAdapter.kt | 10 +-- .../suyu/suyu_emu/adapters/AppletAdapter.kt | 20 ++--- .../adapters/CabinetLauncherDialogAdapter.kt | 22 ++--- .../suyu/suyu_emu/adapters/DriverAdapter.kt | 18 ++--- .../suyu/suyu_emu/adapters/FolderAdapter.kt | 14 ++-- .../suyu/suyu_emu/adapters/GameAdapter.kt | 20 ++--- .../adapters/GamePropertiesAdapter.kt | 20 ++--- .../suyu_emu/adapters/HomeSettingAdapter.kt | 18 ++--- .../suyu_emu/adapters/InstallableAdapter.kt | 10 +-- .../suyu/suyu_emu/adapters/LicenseAdapter.kt | 12 +-- .../suyu/suyu_emu/adapters/SetupAdapter.kt | 18 ++--- .../applets/keyboard/SoftwareKeyboard.kt | 8 +- .../keyboard/ui/KeyboardDialogFragment.kt | 12 +-- .../DiskShaderCacheProgress.kt | 12 +-- .../suyu_emu/features/DocumentProvider.kt | 10 +-- .../suyu_emu/features/input/NativeInput.kt | 16 ++-- .../features/input/SuyuInputDevice.kt | 8 +- .../suyu_emu/features/input/SuyuVibrator.kt | 4 +- .../features/input/model/AnalogDirection.kt | 2 +- .../features/input/model/ButtonName.kt | 2 +- .../features/input/model/InputType.kt | 2 +- .../features/input/model/NativeAnalog.kt | 2 +- .../features/input/model/NativeButton.kt | 2 +- .../features/input/model/NativeTrigger.kt | 2 +- .../features/input/model/NpadStyleIndex.kt | 4 +- .../features/input/model/PlayerInput.kt | 2 +- .../settings/model/AbstractBooleanSetting.kt | 2 +- .../settings/model/AbstractByteSetting.kt | 2 +- .../settings/model/AbstractFloatSetting.kt | 2 +- .../settings/model/AbstractIntSetting.kt | 2 +- .../settings/model/AbstractLongSetting.kt | 2 +- .../settings/model/AbstractSetting.kt | 4 +- .../settings/model/AbstractShortSetting.kt | 2 +- .../settings/model/AbstractStringSetting.kt | 2 +- .../features/settings/model/BooleanSetting.kt | 4 +- .../features/settings/model/ByteSetting.kt | 4 +- .../features/settings/model/FloatSetting.kt | 4 +- .../features/settings/model/IntSetting.kt | 4 +- .../features/settings/model/LongSetting.kt | 4 +- .../features/settings/model/Settings.kt | 6 +- .../features/settings/model/ShortSetting.kt | 4 +- .../features/settings/model/StringSetting.kt | 4 +- .../settings/model/view/AnalogInputSetting.kt | 12 +-- .../settings/model/view/ButtonInputSetting.kt | 10 +-- .../settings/model/view/DateTimeSetting.kt | 4 +- .../settings/model/view/HeaderSetting.kt | 2 +- .../model/view/InputProfileSetting.kt | 8 +- .../settings/model/view/InputSetting.kt | 14 ++-- .../model/view/IntSingleChoiceSetting.kt | 4 +- .../model/view/ModifierInputSetting.kt | 10 +-- .../settings/model/view/RunnableSetting.kt | 2 +- .../settings/model/view/SettingsItem.kt | 30 +++---- .../model/view/SingleChoiceSetting.kt | 6 +- .../settings/model/view/SliderSetting.kt | 12 +-- .../settings/model/view/StringInputSetting.kt | 4 +- .../model/view/StringSingleChoiceSetting.kt | 4 +- .../settings/model/view/SubmenuSetting.kt | 4 +- .../settings/model/view/SwitchSetting.kt | 8 +- .../settings/ui/InputDialogFragment.kt | 24 +++--- .../settings/ui/InputProfileAdapter.kt | 12 +-- .../settings/ui/InputProfileDialogFragment.kt | 12 +-- .../ui/NewInputProfileDialogFragment.kt | 8 +- .../features/settings/ui/SettingsActivity.kt | 16 ++-- .../features/settings/ui/SettingsAdapter.kt | 26 +++--- .../settings/ui/SettingsDialogFragment.kt | 32 ++++---- .../features/settings/ui/SettingsFragment.kt | 16 ++-- .../settings/ui/SettingsFragmentPresenter.kt | 44 +++++----- .../settings/ui/SettingsSearchFragment.kt | 16 ++-- .../features/settings/ui/SettingsViewModel.kt | 14 ++-- .../ui/viewholder/DateTimeViewHolder.kt | 12 +-- .../ui/viewholder/HeaderViewHolder.kt | 8 +- .../ui/viewholder/InputProfileViewHolder.kt | 14 ++-- .../settings/ui/viewholder/InputViewHolder.kt | 20 ++--- .../ui/viewholder/RunnableViewHolder.kt | 12 +-- .../ui/viewholder/SettingViewHolder.kt | 10 +-- .../ui/viewholder/SingleChoiceViewHolder.kt | 16 ++-- .../ui/viewholder/SliderViewHolder.kt | 14 ++-- .../ui/viewholder/StringInputViewHolder.kt | 12 +-- .../ui/viewholder/SubmenuViewHolder.kt | 12 +-- .../ui/viewholder/SwitchSettingViewHolder.kt | 12 +-- .../features/settings/utils/SettingsFile.kt | 10 +-- .../suyu/suyu_emu/fragments/AboutFragment.kt | 12 +-- .../fragments/AddGameFolderDialogFragment.kt | 12 +-- .../suyu/suyu_emu/fragments/AddonsFragment.kt | 21 +++-- .../fragments/AppletLauncherFragment.kt | 16 ++-- .../CabinetLauncherDialogFragment.kt | 8 +- .../ContentTypeSelectionDialogFragment.kt | 10 +-- .../fragments/CoreErrorDialogFragment.kt | 6 +- .../fragments/DriverManagerFragment.kt | 27 +++---- .../fragments/DriversLoadingDialogFragment.kt | 10 +-- .../suyu_emu/fragments/EarlyAccessFragment.kt | 10 +-- .../suyu_emu/fragments/EmulationFragment.kt | 40 +++++----- .../GameFolderPropertiesDialogFragment.kt | 14 ++-- .../suyu_emu/fragments/GameFoldersFragment.kt | 19 +++-- .../suyu_emu/fragments/GameInfoFragment.kt | 18 ++--- .../fragments/GamePropertiesFragment.kt | 44 +++++----- .../fragments/HomeSettingsFragment.kt | 35 ++++---- .../suyu_emu/fragments/InstallableFragment.kt | 29 ++++--- .../fragments/LaunchGameDialogFragment.kt | 10 +-- .../LicenseBottomSheetDialogFragment.kt | 8 +- .../suyu_emu/fragments/LicensesFragment.kt | 14 ++-- .../fragments/MessageDialogFragment.kt | 8 +- .../PermissionDeniedDialogFragment.kt | 4 +- .../fragments/ProgressDialogFragment.kt | 12 +-- .../fragments/ResetSettingsDialogFragment.kt | 6 +- .../suyu/suyu_emu/fragments/SearchFragment.kt | 22 ++--- .../suyu/suyu_emu/fragments/SetupFragment.kt | 35 ++++---- .../fragments/SetupWarningDialogFragment.kt | 4 +- .../layout/AutofitGridLayoutManager.kt | 4 +- .../suyu/suyu_emu/model/AddonViewModel.kt | 6 +- .../suyu/suyu_emu/model/Applet.kt | 4 +- .../suyu/suyu_emu/model/Driver.kt | 4 +- .../suyu/suyu_emu/model/DriverViewModel.kt | 18 ++--- .../suyu/suyu_emu/model/EmulationViewModel.kt | 2 +- .../{org => dev}/suyu/suyu_emu/model/Game.kt | 14 ++-- .../suyu/suyu_emu/model/GameDir.kt | 2 +- .../suyu/suyu_emu/model/GameProperties.kt | 2 +- .../suyu_emu/model/GameVerificationResult.kt | 2 +- .../suyu/suyu_emu/model/GamesViewModel.kt | 10 +-- .../suyu/suyu_emu/model/HomeSetting.kt | 2 +- .../suyu/suyu_emu/model/HomeViewModel.kt | 2 +- .../suyu/suyu_emu/model/InstallResult.kt | 2 +- .../suyu/suyu_emu/model/Installable.kt | 2 +- .../suyu/suyu_emu/model/License.kt | 2 +- .../suyu_emu/model/MessageDialogViewModel.kt | 2 +- .../suyu_emu/model/MinimalDocumentFile.kt | 2 +- .../{org => dev}/suyu/suyu_emu/model/Patch.kt | 2 +- .../suyu/suyu_emu/model/PatchType.kt | 2 +- .../suyu/suyu_emu/model/SelectableItem.kt | 2 +- .../suyu/suyu_emu/model/SetupPage.kt | 2 +- .../suyu/suyu_emu/model/TaskViewModel.kt | 2 +- .../suyu/suyu_emu/overlay/InputOverlay.kt | 24 +++--- .../overlay/InputOverlayDrawableButton.kt | 8 +- .../overlay/InputOverlayDrawableDpad.kt | 6 +- .../overlay/InputOverlayDrawableJoystick.kt | 10 +-- .../suyu_emu/overlay/model/OverlayControl.kt | 6 +- .../overlay/model/OverlayControlData.kt | 2 +- .../overlay/model/OverlayControlDefault.kt | 2 +- .../suyu_emu/overlay/model/OverlayLayout.kt | 2 +- .../suyu/suyu_emu/ui/GamesFragment.kt | 20 ++--- .../suyu/suyu_emu/ui/main/MainActivity.kt | 36 ++++----- .../suyu/suyu_emu/ui/main/ThemeProvider.kt | 2 +- .../suyu/suyu_emu/utils/AddonUtil.kt | 2 +- .../suyu_emu/utils/DirectoryInitialization.kt | 20 ++--- .../suyu/suyu_emu/utils/DocumentsTree.kt | 4 +- .../suyu/suyu_emu/utils/FileUtil.kt | 8 +- .../suyu/suyu_emu/utils/GameHelper.kt | 12 +-- .../suyu/suyu_emu/utils/GameIconUtils.kt | 8 +- .../suyu/suyu_emu/utils/GameMetadata.kt | 2 +- .../suyu/suyu_emu/utils/GpuDriverHelper.kt | 8 +- .../suyu/suyu_emu/utils/GpuDriverMetadata.kt | 2 +- .../suyu/suyu_emu/utils/InputHandler.kt | 8 +- .../suyu/suyu_emu/utils/InsetsHelper.kt | 2 +- .../suyu/suyu_emu/utils/LifecycleUtils.kt | 2 +- .../{org => dev}/suyu/suyu_emu/utils/Log.kt | 2 +- .../suyu/suyu_emu/utils/MemoryUtil.kt | 6 +- .../suyu/suyu_emu/utils/NativeConfig.kt | 8 +- .../suyu/suyu_emu/utils/NfcReader.kt | 4 +- .../suyu/suyu_emu/utils/ParamPackage.kt | 2 +- .../suyu/suyu_emu/utils/PreferenceUtil.kt | 2 +- .../suyu/suyu_emu/utils/SerializableHelper.kt | 2 +- .../suyu/suyu_emu/utils/ThemeHelper.kt | 10 +-- .../suyu/suyu_emu/utils/ViewUtils.kt | 2 +- .../suyu_emu/viewholder/AbstractViewHolder.kt | 6 +- .../suyu_emu/views/FixedRatioSurfaceView.kt | 2 +- .../app/src/main/jni/game_metadata.cpp | 16 ++-- src/android/app/src/main/jni/native.cpp | 80 +++++++++---------- .../app/src/main/jni/native_config.cpp | 78 +++++++++--------- src/android/app/src/main/jni/native_input.cpp | 78 +++++++++--------- src/android/app/src/main/jni/native_log.cpp | 10 +-- .../main/res/layout/fragment_emulation.xml | 6 +- .../res/navigation/emulation_navigation.xml | 10 +-- .../main/res/navigation/home_navigation.xml | 48 +++++------ .../res/navigation/settings_navigation.xml | 8 +- .../app/src/main/res/values-ar/strings.xml | 10 +-- .../app/src/main/res/values-ckb/strings.xml | 16 ++-- .../app/src/main/res/values-cs/strings.xml | 8 +- .../app/src/main/res/values-de/strings.xml | 16 ++-- .../app/src/main/res/values-es/strings.xml | 20 ++--- .../app/src/main/res/values-fa/strings.xml | 16 ++-- .../app/src/main/res/values-fr/strings.xml | 20 ++--- .../app/src/main/res/values-he/strings.xml | 20 ++--- .../app/src/main/res/values-hu/strings.xml | 18 ++--- .../app/src/main/res/values-id/strings.xml | 18 ++--- .../app/src/main/res/values-it/strings.xml | 20 ++--- .../app/src/main/res/values-ja/strings.xml | 16 ++-- .../app/src/main/res/values-ko/strings.xml | 20 ++--- .../app/src/main/res/values-nb/strings.xml | 16 ++-- .../app/src/main/res/values-pl/strings.xml | 16 ++-- .../src/main/res/values-pt-rBR/strings.xml | 20 ++--- .../src/main/res/values-pt-rPT/strings.xml | 16 ++-- .../app/src/main/res/values-ru/strings.xml | 20 ++--- .../app/src/main/res/values-uk/strings.xml | 14 ++-- .../app/src/main/res/values-vi/strings.xml | 16 ++-- .../src/main/res/values-zh-rCN/strings.xml | 20 ++--- .../src/main/res/values-zh-rTW/strings.xml | 20 ++--- .../app/src/main/res/values/strings.xml | 20 ++--- .../android/applets/software_keyboard.cpp | 10 +-- src/common/android/id_cache.cpp | 18 ++--- src/suyu/about_dialog.cpp | 2 +- src/suyu/main.cpp | 2 +- 214 files changed, 1244 insertions(+), 1250 deletions(-) rename dist/{org.suyu_emu.suyu.desktop => dev.suyu_emu.suyu.desktop} (95%) rename dist/{org.suyu_emu.suyu.metainfo.xml => dev.suyu_emu.suyu.metainfo.xml} (96%) rename dist/{org.suyu_emu.suyu.xml => dev.suyu_emu.suyu.xml} (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/NativeLibrary.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/SuyuApplication.kt (86%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/activities/EmulationActivity.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/AbstractDiffAdapter.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/AbstractListAdapter.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/AbstractSingleSelectionList.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/AddonAdapter.kt (84%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/AppletAdapter.kt (84%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/CabinetLauncherDialogAdapter.kt (79%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/DriverAdapter.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/FolderAdapter.kt (80%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/GameAdapter.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/GamePropertiesAdapter.kt (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/HomeSettingAdapter.kt (87%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/InstallableAdapter.kt (83%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/LicenseAdapter.kt (81%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/adapters/SetupAdapter.kt (86%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/applets/keyboard/ui/KeyboardDialogFragment.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress.kt (84%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/DocumentProvider.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/NativeInput.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/SuyuInputDevice.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/SuyuVibrator.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/model/AnalogDirection.kt (86%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/model/ButtonName.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/model/InputType.kt (87%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/model/NativeAnalog.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/model/NativeButton.kt (93%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/model/NativeTrigger.kt (85%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/model/NpadStyleIndex.kt (91%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/input/model/PlayerInput.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/AbstractBooleanSetting.kt (83%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/AbstractByteSetting.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/AbstractFloatSetting.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/AbstractIntSetting.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/AbstractLongSetting.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/AbstractSetting.kt (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/AbstractShortSetting.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/AbstractStringSetting.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/BooleanSetting.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/ByteSetting.kt (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/FloatSetting.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/IntSetting.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/LongSetting.kt (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/Settings.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/ShortSetting.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/StringSetting.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/AnalogInputSetting.kt (72%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/ButtonInputSetting.kt (75%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/DateTimeSetting.kt (84%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/HeaderSetting.kt (85%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/InputProfileSetting.kt (85%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/InputSetting.kt (93%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/IntSingleChoiceSetting.kt (90%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/ModifierInputSetting.kt (78%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/RunnableSetting.kt (91%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/SettingsItem.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/SingleChoiceSetting.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/SliderSetting.kt (78%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/StringInputSetting.kt (86%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/StringSingleChoiceSetting.kt (90%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/SubmenuSetting.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/model/view/SwitchSetting.kt (79%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/InputDialogFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/InputProfileAdapter.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/InputProfileDialogFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/NewInputProfileDialogFragment.kt (93%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/SettingsActivity.kt (93%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/SettingsAdapter.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/SettingsDialogFragment.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/SettingsFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/SettingsFragmentPresenter.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/SettingsSearchFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/SettingsViewModel.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt (82%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt (70%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/InputProfileViewHolder.kt (72%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/InputViewHolder.kt (76%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt (79%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/SettingViewHolder.kt (84%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt (85%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/SliderViewHolder.kt (79%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt (79%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt (78%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt (81%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/features/settings/utils/SettingsFile.kt (77%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/AboutFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/AddGameFolderDialogFragment.kt (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/AddonsFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/AppletLauncherFragment.kt (91%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/CabinetLauncherDialogFragment.kt (86%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/ContentTypeSelectionDialogFragment.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/CoreErrorDialogFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/DriverManagerFragment.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/DriversLoadingDialogFragment.kt (87%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/EarlyAccessFragment.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/EmulationFragment.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/GameFolderPropertiesDialogFragment.kt (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/GameFoldersFragment.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/GameInfoFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/GamePropertiesFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/HomeSettingsFragment.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/InstallableFragment.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/LaunchGameDialogFragment.kt (90%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/LicenseBottomSheetDialogFragment.kt (90%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/LicensesFragment.kt (93%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/MessageDialogFragment.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/PermissionDeniedDialogFragment.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/ProgressDialogFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/ResetSettingsDialogFragment.kt (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/SearchFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/SetupFragment.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/fragments/SetupWarningDialogFragment.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/layout/AutofitGridLayoutManager.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/AddonViewModel.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/Applet.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/Driver.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/DriverViewModel.kt (93%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/EmulationViewModel.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/Game.kt (91%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/GameDir.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/GameProperties.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/GameVerificationResult.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/GamesViewModel.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/HomeSetting.kt (93%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/HomeViewModel.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/InstallResult.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/Installable.kt (90%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/License.kt (91%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/MessageDialogViewModel.kt (91%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/MinimalDocumentFile.kt (91%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/Patch.kt (90%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/PatchType.kt (91%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/SelectableItem.kt (89%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/SetupPage.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/model/TaskViewModel.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/overlay/InputOverlay.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/overlay/InputOverlayDrawableButton.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/overlay/InputOverlayDrawableDpad.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/overlay/InputOverlayDrawableJoystick.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/overlay/model/OverlayControl.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/overlay/model/OverlayControlData.kt (93%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/overlay/model/OverlayControlDefault.kt (90%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/overlay/model/OverlayLayout.kt (84%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/ui/GamesFragment.kt (92%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/ui/main/MainActivity.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/ui/main/ThemeProvider.kt (88%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/AddonUtil.kt (85%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/DirectoryInitialization.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/DocumentsTree.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/FileUtil.kt (99%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/GameHelper.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/GameIconUtils.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/GameMetadata.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/GpuDriverHelper.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/GpuDriverMetadata.kt (99%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/InputHandler.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/InsetsHelper.kt (95%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/LifecycleUtils.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/Log.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/MemoryUtil.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/NativeConfig.kt (96%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/NfcReader.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/ParamPackage.kt (99%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/PreferenceUtil.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/SerializableHelper.kt (97%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/ThemeHelper.kt (94%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/utils/ViewUtils.kt (98%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/viewholder/AbstractViewHolder.kt (80%) rename src/android/app/src/main/java/{org => dev}/suyu/suyu_emu/views/FixedRatioSurfaceView.kt (98%) diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index 392106bcd2..0e383fd059 100755 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh @@ -37,7 +37,7 @@ fi # Don't let AppImageLauncher ask to integrate EA if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then - echo "X-AppImage-Integrate=false" >> AppDir/org.suyu_emu.suyu.desktop + echo "X-AppImage-Integrate=false" >> AppDir/dev.suyu_emu.suyu.desktop fi if [ "${RELEASE_NAME}" = "mainline" ]; then diff --git a/CMakeLists.txt b/CMakeLists.txt index 9406dd64a1..cbeb2ee689 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -732,14 +732,14 @@ endif() # https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html # https://www.freedesktop.org/software/appstream/docs/ if(ENABLE_QT AND UNIX AND NOT APPLE) - install(FILES "dist/org.suyu_emu.suyu.desktop" + install(FILES "dist/dev.suyu_emu.suyu.desktop" DESTINATION "share/applications") install(FILES "dist/suyu.svg" DESTINATION "share/icons/hicolor/scalable/apps" - RENAME "org.suyu_emu.suyu.svg") - install(FILES "dist/org.suyu_emu.suyu.xml" + RENAME "dev.suyu_emu.suyu.svg") + install(FILES "dist/dev.suyu_emu.suyu.xml" DESTINATION "share/mime/packages") - install(FILES "dist/org.suyu_emu.suyu.metainfo.xml" + install(FILES "dist/dev.suyu_emu.suyu.metainfo.xml" DESTINATION "share/metainfo") endif() diff --git a/dist/org.suyu_emu.suyu.desktop b/dist/dev.suyu_emu.suyu.desktop similarity index 95% rename from dist/org.suyu_emu.suyu.desktop rename to dist/dev.suyu_emu.suyu.desktop index 26bc6dd6f1..215c9d884a 100644 --- a/dist/org.suyu_emu.suyu.desktop +++ b/dist/dev.suyu_emu.suyu.desktop @@ -8,7 +8,7 @@ Type=Application Name=suyu GenericName=Switch Emulator Comment=Nintendo Switch video game console emulator -Icon=org.suyu_emu.suyu +Icon=dev.suyu_emu.suyu TryExec=suyu Exec=suyu %f Categories=Game;Emulator;Qt; diff --git a/dist/org.suyu_emu.suyu.metainfo.xml b/dist/dev.suyu_emu.suyu.metainfo.xml similarity index 96% rename from dist/org.suyu_emu.suyu.metainfo.xml rename to dist/dev.suyu_emu.suyu.metainfo.xml index aeb2fecfbe..7677919f77 100644 --- a/dist/org.suyu_emu.suyu.metainfo.xml +++ b/dist/dev.suyu_emu.suyu.metainfo.xml @@ -7,7 +7,7 @@ SPDX-License-Identifier: CC0-1.0 --> - org.suyu_emu.suyu + dev.suyu_emu.suyu CC0-1.0 suyu Nintendo Switch emulator @@ -34,7 +34,7 @@ SPDX-License-Identifier: CC0-1.0 https://community.citra-emu.org/ https://gitlab.com/suyu-emu/suyu https://suyu-emu.org/wiki/contributing/ - org.suyu_emu.suyu.desktop + dev.suyu_emu.suyu.desktop suyu suyu-cmd diff --git a/dist/org.suyu_emu.suyu.xml b/dist/dev.suyu_emu.suyu.xml similarity index 88% rename from dist/org.suyu_emu.suyu.xml rename to dist/dev.suyu_emu.suyu.xml index 9fafef671b..7e1414ce17 100644 --- a/dist/org.suyu_emu.suyu.xml +++ b/dist/dev.suyu_emu.suyu.xml @@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-2.0-or-later Nintendo Switch homebrew executable NRO - + @@ -18,7 +18,7 @@ SPDX-License-Identifier: GPL-2.0-or-later Nintendo Switch homebrew executable NSO - + @@ -26,7 +26,7 @@ SPDX-License-Identifier: GPL-2.0-or-later Nintendo Switch Package NSP - + @@ -34,7 +34,7 @@ SPDX-License-Identifier: GPL-2.0-or-later Nintendo Switch Card Image XCI - + diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 78f8cc3488..9312d48c33 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -25,7 +25,7 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn @Suppress("UnstableApiUsage") android { - namespace = "org.suyu.suyu_emu" + namespace = "dev.suyu.suyu_emu" compileSdkVersion = "android-34" ndkVersion = "26.1.10909125" @@ -54,7 +54,7 @@ android { defaultConfig { // TODO If this is ever modified, change application_id in strings.xml - applicationId = "org.suyu.suyu_emu" + applicationId = "dev.suyu.suyu_emu" minSdk = 30 targetSdk = 34 versionName = getGitVersion() diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index 02d08c00be..5f893cd986 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 @@ -48,12 +48,12 @@ SPDX-License-Identifier: GPL-3.0-or-later () { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/AppletAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/AppletAdapter.kt similarity index 84% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/AppletAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/AppletAdapter.kt index 73c43a6d2c..c6d373f7a5 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/AppletAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/AppletAdapter.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.view.LayoutInflater import android.view.ViewGroup @@ -9,15 +9,15 @@ import android.widget.Toast import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.FragmentActivity import androidx.navigation.findNavController -import org.suyu.suyu_emu.HomeNavigationDirections -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.databinding.CardSimpleOutlinedBinding -import org.suyu.suyu_emu.model.Applet -import org.suyu.suyu_emu.model.AppletInfo -import org.suyu.suyu_emu.model.Game -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.HomeNavigationDirections +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.databinding.CardSimpleOutlinedBinding +import dev.suyu.suyu_emu.model.Applet +import dev.suyu.suyu_emu.model.AppletInfo +import dev.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class AppletAdapter(val activity: FragmentActivity, applets: List) : AbstractListAdapter(applets) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/CabinetLauncherDialogAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/CabinetLauncherDialogAdapter.kt similarity index 79% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/CabinetLauncherDialogAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/CabinetLauncherDialogAdapter.kt index 188b3ae464..d7125d8603 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/CabinetLauncherDialogAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/CabinetLauncherDialogAdapter.kt @@ -1,23 +1,23 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import org.suyu.suyu_emu.HomeNavigationDirections -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.databinding.DialogListItemBinding -import org.suyu.suyu_emu.model.CabinetMode -import org.suyu.suyu_emu.adapters.CabinetLauncherDialogAdapter.CabinetModeViewHolder -import org.suyu.suyu_emu.model.AppletInfo -import org.suyu.suyu_emu.model.Game -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.HomeNavigationDirections +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.databinding.DialogListItemBinding +import dev.suyu.suyu_emu.model.CabinetMode +import dev.suyu.suyu_emu.adapters.CabinetLauncherDialogAdapter.CabinetModeViewHolder +import dev.suyu.suyu_emu.model.AppletInfo +import dev.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class CabinetLauncherDialogAdapter(val fragment: Fragment) : AbstractListAdapter( diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/DriverAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/DriverAdapter.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/DriverAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/DriverAdapter.kt index 4c8e53abbd..58c8555750 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/DriverAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/DriverAdapter.kt @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.view.LayoutInflater import android.view.ViewGroup -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.CardDriverOptionBinding -import org.suyu.suyu_emu.features.settings.model.StringSetting -import org.suyu.suyu_emu.model.Driver -import org.suyu.suyu_emu.model.DriverViewModel -import org.suyu.suyu_emu.utils.ViewUtils.marquee -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.CardDriverOptionBinding +import dev.suyu.suyu_emu.features.settings.model.StringSetting +import dev.suyu.suyu_emu.model.Driver +import dev.suyu.suyu_emu.model.DriverViewModel +import dev.suyu.suyu_emu.utils.ViewUtils.marquee +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class DriverAdapter(private val driverViewModel: DriverViewModel) : AbstractSingleSelectionList( diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/FolderAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/FolderAdapter.kt similarity index 80% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/FolderAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/FolderAdapter.kt index dfe332586d..ce73151938 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/FolderAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/FolderAdapter.kt @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.net.Uri import android.view.LayoutInflater import android.view.ViewGroup import androidx.fragment.app.FragmentActivity -import org.suyu.suyu_emu.databinding.CardFolderBinding -import org.suyu.suyu_emu.fragments.GameFolderPropertiesDialogFragment -import org.suyu.suyu_emu.model.GameDir -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.utils.ViewUtils.marquee -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.databinding.CardFolderBinding +import dev.suyu.suyu_emu.fragments.GameFolderPropertiesDialogFragment +import dev.suyu.suyu_emu.model.GameDir +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.utils.ViewUtils.marquee +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class FolderAdapter(val activity: FragmentActivity, val gamesViewModel: GamesViewModel) : AbstractDiffAdapter() { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/GameAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/GameAdapter.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/GameAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/GameAdapter.kt index 6a87c8852c..7cca8b9aec 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/GameAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/GameAdapter.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.net.Uri import android.view.LayoutInflater @@ -19,15 +19,15 @@ import androidx.preference.PreferenceManager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.suyu.suyu_emu.HomeNavigationDirections -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.databinding.CardGameBinding -import org.suyu.suyu_emu.model.Game -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.utils.GameIconUtils -import org.suyu.suyu_emu.utils.ViewUtils.marquee -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.HomeNavigationDirections +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.databinding.CardGameBinding +import dev.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.utils.GameIconUtils +import dev.suyu.suyu_emu.utils.ViewUtils.marquee +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class GameAdapter(private val activity: AppCompatActivity) : AbstractDiffAdapter(exact = false) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/GamePropertiesAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/GamePropertiesAdapter.kt similarity index 88% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/GamePropertiesAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/GamePropertiesAdapter.kt index 1d3916b43f..6cc783d2c2 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/GamePropertiesAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/GamePropertiesAdapter.kt @@ -1,21 +1,21 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.LifecycleOwner -import org.suyu.suyu_emu.databinding.CardInstallableIconBinding -import org.suyu.suyu_emu.databinding.CardSimpleOutlinedBinding -import org.suyu.suyu_emu.model.GameProperty -import org.suyu.suyu_emu.model.InstallableProperty -import org.suyu.suyu_emu.model.SubmenuProperty -import org.suyu.suyu_emu.utils.ViewUtils.marquee -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.utils.collect -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.databinding.CardInstallableIconBinding +import dev.suyu.suyu_emu.databinding.CardSimpleOutlinedBinding +import dev.suyu.suyu_emu.model.GameProperty +import dev.suyu.suyu_emu.model.InstallableProperty +import dev.suyu.suyu_emu.model.SubmenuProperty +import dev.suyu.suyu_emu.utils.ViewUtils.marquee +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class GamePropertiesAdapter( private val viewLifecycle: LifecycleOwner, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/HomeSettingAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/HomeSettingAdapter.kt similarity index 87% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/HomeSettingAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/HomeSettingAdapter.kt index 973e0b457d..8ecc0e6f90 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/HomeSettingAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/HomeSettingAdapter.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.view.LayoutInflater import android.view.ViewGroup @@ -9,14 +9,14 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.LifecycleOwner -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.CardHomeOptionBinding -import org.suyu.suyu_emu.fragments.MessageDialogFragment -import org.suyu.suyu_emu.model.HomeSetting -import org.suyu.suyu_emu.utils.ViewUtils.marquee -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.utils.collect -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.CardHomeOptionBinding +import dev.suyu.suyu_emu.fragments.MessageDialogFragment +import dev.suyu.suyu_emu.model.HomeSetting +import dev.suyu.suyu_emu.utils.ViewUtils.marquee +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class HomeSettingAdapter( private val activity: AppCompatActivity, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/InstallableAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/InstallableAdapter.kt similarity index 83% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/InstallableAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/InstallableAdapter.kt index fbd420aaae..e4bef9e2b6 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/InstallableAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/InstallableAdapter.kt @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.view.LayoutInflater import android.view.ViewGroup -import org.suyu.suyu_emu.databinding.CardInstallableBinding -import org.suyu.suyu_emu.model.Installable -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.databinding.CardInstallableBinding +import dev.suyu.suyu_emu.model.Installable +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class InstallableAdapter(installables: List) : AbstractListAdapter(installables) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/LicenseAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/LicenseAdapter.kt similarity index 81% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/LicenseAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/LicenseAdapter.kt index 5358cd6067..dec98c8032 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/LicenseAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/LicenseAdapter.kt @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.fragments.LicenseBottomSheetDialogFragment -import org.suyu.suyu_emu.model.License -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.fragments.LicenseBottomSheetDialogFragment +import dev.suyu.suyu_emu.model.License +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class LicenseAdapter(private val activity: AppCompatActivity, licenses: List) : AbstractListAdapter(licenses) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/SetupAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/SetupAdapter.kt similarity index 86% rename from src/android/app/src/main/java/org/suyu/suyu_emu/adapters/SetupAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/SetupAdapter.kt index 2dcd5cfc64..134de7cfc3 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/adapters/SetupAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/adapters/SetupAdapter.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.adapters +package dev.suyu.suyu_emu.adapters import android.text.Html import android.view.LayoutInflater @@ -10,14 +10,14 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.ViewModelProvider import com.google.android.material.button.MaterialButton -import org.suyu.suyu_emu.databinding.PageSetupBinding -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.model.SetupCallback -import org.suyu.suyu_emu.model.SetupPage -import org.suyu.suyu_emu.model.StepState -import org.suyu.suyu_emu.utils.ViewUtils -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.databinding.PageSetupBinding +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.model.SetupCallback +import dev.suyu.suyu_emu.model.SetupPage +import dev.suyu.suyu_emu.model.StepState +import dev.suyu.suyu_emu.utils.ViewUtils +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder class SetupAdapter(val activity: AppCompatActivity, pages: List) : AbstractListAdapter(pages) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard.kt index 8558858d9f..8831c0d439 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.applets.keyboard +package dev.suyu.suyu_emu.applets.keyboard import android.content.Context import android.os.Handler @@ -13,9 +13,9 @@ import android.view.inputmethod.InputMethodManager import androidx.annotation.Keep import androidx.core.view.ViewCompat import java.io.Serializable -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.applets.keyboard.ui.KeyboardDialogFragment +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.applets.keyboard.ui.KeyboardDialogFragment @Keep object SoftwareKeyboard { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/applets/keyboard/ui/KeyboardDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/applets/keyboard/ui/KeyboardDialogFragment.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/applets/keyboard/ui/KeyboardDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/applets/keyboard/ui/KeyboardDialogFragment.kt index b80d9e0d04..c6ea6a8f67 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/applets/keyboard/ui/KeyboardDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/applets/keyboard/ui/KeyboardDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.applets.keyboard.ui +package dev.suyu.suyu_emu.applets.keyboard.ui import android.app.Dialog import android.content.DialogInterface @@ -10,11 +10,11 @@ import android.text.InputFilter import android.text.InputType import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.applets.keyboard.SoftwareKeyboard -import org.suyu.suyu_emu.applets.keyboard.SoftwareKeyboard.KeyboardConfig -import org.suyu.suyu_emu.databinding.DialogEditTextBinding -import org.suyu.suyu_emu.utils.SerializableHelper.serializable +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.applets.keyboard.SoftwareKeyboard +import dev.suyu.suyu_emu.applets.keyboard.SoftwareKeyboard.KeyboardConfig +import dev.suyu.suyu_emu.databinding.DialogEditTextBinding +import dev.suyu.suyu_emu.utils.SerializableHelper.serializable class KeyboardDialogFragment : DialogFragment() { private lateinit var binding: DialogEditTextBinding diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress.kt similarity index 84% rename from src/android/app/src/main/java/org/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress.kt index 80df698230..48dd975538 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress.kt @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.disk_shader_cache +package dev.suyu.suyu_emu.disk_shader_cache import androidx.annotation.Keep import androidx.lifecycle.ViewModelProvider -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.activities.EmulationActivity -import org.suyu.suyu_emu.model.EmulationViewModel -import org.suyu.suyu_emu.utils.Log +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.activities.EmulationActivity +import dev.suyu.suyu_emu.model.EmulationViewModel +import dev.suyu.suyu_emu.utils.Log @Keep object DiskShaderCacheProgress { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/DocumentProvider.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/DocumentProvider.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/DocumentProvider.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/DocumentProvider.kt index 3e434cdd66..9d77f36d54 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/DocumentProvider.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/DocumentProvider.kt @@ -4,7 +4,7 @@ // SPDX-License-Identifier: MPL-2.0 // Copyright © 2023 Skyline Team and Contributors (https://github.com/skyline-emu/) -package org.suyu.suyu_emu.features +package dev.suyu.suyu_emu.features import android.database.Cursor import android.database.MatrixCursor @@ -14,10 +14,10 @@ import android.provider.DocumentsContract import android.provider.DocumentsProvider import android.webkit.MimeTypeMap import java.io.* -import org.suyu.suyu_emu.BuildConfig -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.getPublicFilesDir +import dev.suyu.suyu_emu.BuildConfig +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.getPublicFilesDir class DocumentProvider : DocumentsProvider() { private val baseDirectory: File diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/NativeInput.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/NativeInput.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/NativeInput.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/NativeInput.kt index 9639a614ac..f9485c3642 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/NativeInput.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/NativeInput.kt @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input +package dev.suyu.suyu_emu.features.input -import org.suyu.suyu_emu.features.input.model.NativeButton -import org.suyu.suyu_emu.features.input.model.NativeAnalog -import org.suyu.suyu_emu.features.input.model.InputType -import org.suyu.suyu_emu.features.input.model.ButtonName -import org.suyu.suyu_emu.features.input.model.NpadStyleIndex -import org.suyu.suyu_emu.utils.NativeConfig -import org.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.features.input.model.NativeButton +import dev.suyu.suyu_emu.features.input.model.NativeAnalog +import dev.suyu.suyu_emu.features.input.model.InputType +import dev.suyu.suyu_emu.features.input.model.ButtonName +import dev.suyu.suyu_emu.features.input.model.NpadStyleIndex +import dev.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.ParamPackage import android.view.InputDevice object NativeInput { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/SuyuInputDevice.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/SuyuInputDevice.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/SuyuInputDevice.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/SuyuInputDevice.kt index 4e7fc4adf0..f04ebb5253 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/SuyuInputDevice.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/SuyuInputDevice.kt @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input +package dev.suyu.suyu_emu.features.input import android.view.InputDevice import androidx.annotation.Keep -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.utils.InputHandler.getGUID +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.utils.InputHandler.getGUID @Keep interface SuyuInputDevice { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/SuyuVibrator.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/SuyuVibrator.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/SuyuVibrator.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/SuyuVibrator.kt index 33cf4f5788..b1e3dad1a6 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/SuyuVibrator.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/SuyuVibrator.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input +package dev.suyu.suyu_emu.features.input import android.content.Context import android.os.Build @@ -13,7 +13,7 @@ import android.os.VibratorManager import android.view.InputDevice import androidx.annotation.Keep import androidx.annotation.RequiresApi -import org.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.SuyuApplication @Keep @Suppress("DEPRECATION") diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/AnalogDirection.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/AnalogDirection.kt similarity index 86% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/AnalogDirection.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/AnalogDirection.kt index ff4762c7d4..f2cf59a23c 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/AnalogDirection.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/AnalogDirection.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input.model +package dev.suyu.suyu_emu.features.input.model enum class AnalogDirection(val int: Int, val param: String) { Up(0, "up"), diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/ButtonName.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/ButtonName.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/ButtonName.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/ButtonName.kt index c33e986cdb..ccbb555bd3 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/ButtonName.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/ButtonName.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input.model +package dev.suyu.suyu_emu.features.input.model // Loosely matches the enum in common/input.h enum class ButtonName(val int: Int) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/InputType.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/InputType.kt similarity index 87% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/InputType.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/InputType.kt index 6d441f180a..1b93341e0d 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/InputType.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/InputType.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input.model +package dev.suyu.suyu_emu.features.input.model // Must match the corresponding enum in input_common/main.h enum class InputType(val int: Int) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeAnalog.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeAnalog.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeAnalog.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeAnalog.kt index cbddbadcc8..7d8cced220 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeAnalog.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeAnalog.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input.model +package dev.suyu.suyu_emu.features.input.model // Must match enum in src/common/settings_input.h enum class NativeAnalog(val int: Int) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeButton.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeButton.kt similarity index 93% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeButton.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeButton.kt index c290cea7ca..29ad0b7b97 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeButton.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeButton.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input.model +package dev.suyu.suyu_emu.features.input.model // Must match enum in src/common/settings_input.h enum class NativeButton(val int: Int) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeTrigger.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeTrigger.kt similarity index 85% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeTrigger.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeTrigger.kt index ac6583b28f..8ce026c19b 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NativeTrigger.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NativeTrigger.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input.model +package dev.suyu.suyu_emu.features.input.model // Must match enum in src/common/settings_input.h enum class NativeTrigger(val int: Int) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NpadStyleIndex.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NpadStyleIndex.kt similarity index 91% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NpadStyleIndex.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NpadStyleIndex.kt index 7bad46d728..a884de8de3 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/NpadStyleIndex.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/NpadStyleIndex.kt @@ -2,10 +2,10 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input.model +package dev.suyu.suyu_emu.features.input.model import androidx.annotation.StringRes -import org.suyu.suyu_emu.R +import dev.suyu.suyu_emu.R // Must match enum in src/core/hid/hid_types.h enum class NpadStyleIndex(val int: Int, @StringRes val nameId: Int = 0) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/PlayerInput.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/PlayerInput.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/PlayerInput.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/PlayerInput.kt index 35e600dbd0..d6c9178984 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/input/model/PlayerInput.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/input/model/PlayerInput.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.input.model +package dev.suyu.suyu_emu.features.input.model import androidx.annotation.Keep diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractBooleanSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractBooleanSetting.kt similarity index 83% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractBooleanSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractBooleanSetting.kt index 8266e3dbd1..4066805d12 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractBooleanSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractBooleanSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model interface AbstractBooleanSetting : AbstractSetting { fun getBoolean(needsGlobal: Boolean = false): Boolean diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractByteSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractByteSetting.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractByteSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractByteSetting.kt index 6ef8255341..d8cd03f295 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractByteSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractByteSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model interface AbstractByteSetting : AbstractSetting { fun getByte(needsGlobal: Boolean = false): Byte diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractFloatSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractFloatSetting.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractFloatSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractFloatSetting.kt index 5437a65ade..bd95009db8 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractFloatSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractFloatSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model interface AbstractFloatSetting : AbstractSetting { fun getFloat(needsGlobal: Boolean = false): Float diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractIntSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractIntSetting.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractIntSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractIntSetting.kt index 1d979d153d..c9269cde37 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractIntSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractIntSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model interface AbstractIntSetting : AbstractSetting { fun getInt(needsGlobal: Boolean = false): Int diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractLongSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractLongSetting.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractLongSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractLongSetting.kt index 22e94c10b8..b74a150c12 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractLongSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractLongSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model interface AbstractLongSetting : AbstractSetting { fun getLong(needsGlobal: Boolean = false): Long diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractSetting.kt similarity index 88% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractSetting.kt index f4cf067e65..41bbf62d46 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractSetting.kt @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.NativeConfig interface AbstractSetting { val key: String diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractShortSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractShortSetting.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractShortSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractShortSetting.kt index 4488802269..e8c3bcf9ab 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractShortSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractShortSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model interface AbstractShortSetting : AbstractSetting { fun getShort(needsGlobal: Boolean = false): Short diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractStringSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractStringSetting.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractStringSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractStringSetting.kt index 3afb1bc3a1..5820192b74 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/AbstractStringSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/AbstractStringSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model interface AbstractStringSetting : AbstractSetting { fun getString(needsGlobal: Boolean = false): String diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/BooleanSetting.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/BooleanSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/BooleanSetting.kt index 2e36e82b9a..2958f02ca1 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/BooleanSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/BooleanSetting.kt @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.NativeConfig enum class BooleanSetting(override val key: String) : AbstractBooleanSetting { AUDIO_MUTED("audio_muted"), diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/ByteSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/ByteSetting.kt similarity index 88% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/ByteSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/ByteSetting.kt index 9a3f966697..fe6f84a0f6 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/ByteSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/ByteSetting.kt @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.NativeConfig enum class ByteSetting(override val key: String) : AbstractByteSetting { AUDIO_VOLUME("volume"); diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/FloatSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/FloatSetting.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/FloatSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/FloatSetting.kt index 6d266cb5c8..a6d744d68b 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/FloatSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/FloatSetting.kt @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.NativeConfig enum class FloatSetting(override val key: String) : AbstractFloatSetting { // No float settings currently exist diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/IntSetting.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/IntSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/IntSetting.kt index bf62df3c28..4e9f0a00c4 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/IntSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/IntSetting.kt @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.NativeConfig enum class IntSetting(override val key: String) : AbstractIntSetting { CPU_BACKEND("cpu_backend"), diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/LongSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/LongSetting.kt similarity index 88% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/LongSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/LongSetting.kt index 01f2e580ae..e6bc2116eb 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/LongSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/LongSetting.kt @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.NativeConfig enum class LongSetting(override val key: String) : AbstractLongSetting { CUSTOM_RTC("custom_rtc"); diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/Settings.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/Settings.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/Settings.kt index 2352c3824f..b4cfca4c77 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/Settings.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/Settings.kt @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication object Settings { enum class MenuTag(val titleId: Int = 0) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/ShortSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/ShortSetting.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/ShortSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/ShortSetting.kt index 45614501c3..2525e6d63a 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/ShortSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/ShortSetting.kt @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.NativeConfig enum class ShortSetting(override val key: String) : AbstractShortSetting { RENDERER_SPEED_LIMIT("speed_limit"); diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/StringSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/StringSetting.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/StringSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/StringSetting.kt index 3f40fedcce..61a169ae8a 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/StringSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/StringSetting.kt @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model +package dev.suyu.suyu_emu.features.settings.model -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.NativeConfig enum class StringSetting(override val key: String) : AbstractStringSetting { DRIVER_PATH("driver_path"), diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/AnalogInputSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/AnalogInputSetting.kt similarity index 72% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/AnalogInputSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/AnalogInputSetting.kt index 78103ba858..bea116f229 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/AnalogInputSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/AnalogInputSetting.kt @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.AnalogDirection -import org.suyu.suyu_emu.features.input.model.InputType -import org.suyu.suyu_emu.features.input.model.NativeAnalog -import org.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.AnalogDirection +import dev.suyu.suyu_emu.features.input.model.InputType +import dev.suyu.suyu_emu.features.input.model.NativeAnalog +import dev.suyu.suyu_emu.utils.ParamPackage class AnalogInputSetting( override val playerIndex: Int, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/ButtonInputSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/ButtonInputSetting.kt similarity index 75% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/ButtonInputSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/ButtonInputSetting.kt index e586cedbb0..6279ef7b92 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/ButtonInputSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/ButtonInputSetting.kt @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.utils.ParamPackage -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.InputType -import org.suyu.suyu_emu.features.input.model.NativeButton +import dev.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.InputType +import dev.suyu.suyu_emu.features.input.model.NativeButton class ButtonInputSetting( override val playerIndex: Int, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/DateTimeSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/DateTimeSetting.kt similarity index 84% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/DateTimeSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/DateTimeSetting.kt index 7ed6a721af..72fe741c0e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/DateTimeSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/DateTimeSetting.kt @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.settings.model.AbstractLongSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractLongSetting class DateTimeSetting( private val longSetting: AbstractLongSetting, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/HeaderSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/HeaderSetting.kt similarity index 85% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/HeaderSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/HeaderSetting.kt index da9b34e9be..df6bdfb129 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/HeaderSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/HeaderSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/InputProfileSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/InputProfileSetting.kt similarity index 85% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/InputProfileSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/InputProfileSetting.kt index 461588354a..708e0ae40f 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/InputProfileSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/InputProfileSetting.kt @@ -2,11 +2,11 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.utils.NativeConfig class InputProfileSetting(private val playerIndex: Int) : SettingsItem(emptySetting, R.string.profile, "", 0, "") { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/InputSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/InputSetting.kt similarity index 93% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/InputSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/InputSetting.kt index ac54cda377..417e8f2655 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/InputSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/InputSetting.kt @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.ButtonName -import org.suyu.suyu_emu.features.input.model.InputType -import org.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.ButtonName +import dev.suyu.suyu_emu.features.input.model.InputType +import dev.suyu.suyu_emu.utils.ParamPackage sealed class InputSetting( @StringRes titleId: Int, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/IntSingleChoiceSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/IntSingleChoiceSetting.kt similarity index 90% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/IntSingleChoiceSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/IntSingleChoiceSetting.kt index ba43799254..f61a60be15 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/IntSingleChoiceSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/IntSingleChoiceSetting.kt @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.settings.model.AbstractIntSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractIntSetting class IntSingleChoiceSetting( private val intSetting: AbstractIntSetting, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/ModifierInputSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/ModifierInputSetting.kt similarity index 78% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/ModifierInputSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/ModifierInputSetting.kt index 4d1e2c6699..611160286e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/ModifierInputSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/ModifierInputSetting.kt @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.InputType -import org.suyu.suyu_emu.features.input.model.NativeAnalog -import org.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.InputType +import dev.suyu.suyu_emu.features.input.model.NativeAnalog +import dev.suyu.suyu_emu.utils.ParamPackage class ModifierInputSetting( override val playerIndex: Int, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/RunnableSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/RunnableSetting.kt similarity index 91% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/RunnableSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/RunnableSetting.kt index b48e0ee4d1..8a7f88ebb5 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/RunnableSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/RunnableSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SettingsItem.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SettingsItem.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SettingsItem.kt index f59f4ebf53..ea59f5ff63 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SettingsItem.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SettingsItem.kt @@ -1,23 +1,23 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.NpadStyleIndex -import org.suyu.suyu_emu.features.settings.model.AbstractBooleanSetting -import org.suyu.suyu_emu.features.settings.model.AbstractSetting -import org.suyu.suyu_emu.features.settings.model.BooleanSetting -import org.suyu.suyu_emu.features.settings.model.ByteSetting -import org.suyu.suyu_emu.features.settings.model.IntSetting -import org.suyu.suyu_emu.features.settings.model.LongSetting -import org.suyu.suyu_emu.features.settings.model.ShortSetting -import org.suyu.suyu_emu.features.settings.model.StringSetting -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.NpadStyleIndex +import dev.suyu.suyu_emu.features.settings.model.AbstractBooleanSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractSetting +import dev.suyu.suyu_emu.features.settings.model.BooleanSetting +import dev.suyu.suyu_emu.features.settings.model.ByteSetting +import dev.suyu.suyu_emu.features.settings.model.IntSetting +import dev.suyu.suyu_emu.features.settings.model.LongSetting +import dev.suyu.suyu_emu.features.settings.model.ShortSetting +import dev.suyu.suyu_emu.features.settings.model.StringSetting +import dev.suyu.suyu_emu.utils.NativeConfig /** * ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments. diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SingleChoiceSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SingleChoiceSetting.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SingleChoiceSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SingleChoiceSetting.kt index 4d0edda0ff..70fc58941f 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SingleChoiceSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SingleChoiceSetting.kt @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.ArrayRes import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.settings.model.AbstractIntSetting -import org.suyu.suyu_emu.features.settings.model.AbstractSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractIntSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractSetting class SingleChoiceSetting( setting: AbstractSetting, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SliderSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SliderSetting.kt similarity index 78% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SliderSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SliderSetting.kt index 45471a64e8..1ad5caeb7e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SliderSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SliderSetting.kt @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.settings.model.AbstractByteSetting -import org.suyu.suyu_emu.features.settings.model.AbstractFloatSetting -import org.suyu.suyu_emu.features.settings.model.AbstractIntSetting -import org.suyu.suyu_emu.features.settings.model.AbstractSetting -import org.suyu.suyu_emu.features.settings.model.AbstractShortSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractByteSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractFloatSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractIntSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractShortSetting import kotlin.math.roundToInt class SliderSetting( diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/StringInputSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/StringInputSetting.kt similarity index 86% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/StringInputSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/StringInputSetting.kt index f2dbeb2912..82c36b622d 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/StringInputSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/StringInputSetting.kt @@ -2,10 +2,10 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.settings.model.AbstractStringSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractStringSetting class StringInputSetting( setting: AbstractStringSetting, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/StringSingleChoiceSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/StringSingleChoiceSetting.kt similarity index 90% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/StringSingleChoiceSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/StringSingleChoiceSetting.kt index 2a35a1b425..f3556eb415 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/StringSingleChoiceSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/StringSingleChoiceSetting.kt @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.settings.model.AbstractStringSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractStringSetting class StringSingleChoiceSetting( private val stringSetting: AbstractStringSetting, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SubmenuSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SubmenuSetting.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SubmenuSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SubmenuSetting.kt index e381af10a3..c88a6014c1 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SubmenuSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SubmenuSetting.kt @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.features.settings.model.Settings class SubmenuSetting( @StringRes titleId: Int = 0, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SwitchSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SwitchSetting.kt similarity index 79% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SwitchSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SwitchSetting.kt index f7d4b73f91..afa83ccfc0 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/model/view/SwitchSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/model/view/SwitchSetting.kt @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.model.view +package dev.suyu.suyu_emu.features.settings.model.view import androidx.annotation.StringRes -import org.suyu.suyu_emu.features.settings.model.AbstractBooleanSetting -import org.suyu.suyu_emu.features.settings.model.AbstractIntSetting -import org.suyu.suyu_emu.features.settings.model.AbstractSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractBooleanSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractIntSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractSetting class SwitchSetting( setting: AbstractSetting, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputDialogFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputDialogFragment.kt index af7767af51..904fdeef15 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputDialogFragment.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.app.Dialog import android.graphics.drawable.Animatable2 @@ -18,17 +18,17 @@ import android.view.ViewGroup import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.DialogMappingBinding -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.NativeAnalog -import org.suyu.suyu_emu.features.input.model.NativeButton -import org.suyu.suyu_emu.features.settings.model.view.AnalogInputSetting -import org.suyu.suyu_emu.features.settings.model.view.ButtonInputSetting -import org.suyu.suyu_emu.features.settings.model.view.InputSetting -import org.suyu.suyu_emu.features.settings.model.view.ModifierInputSetting -import org.suyu.suyu_emu.utils.InputHandler -import org.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.DialogMappingBinding +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.NativeAnalog +import dev.suyu.suyu_emu.features.input.model.NativeButton +import dev.suyu.suyu_emu.features.settings.model.view.AnalogInputSetting +import dev.suyu.suyu_emu.features.settings.model.view.ButtonInputSetting +import dev.suyu.suyu_emu.features.settings.model.view.InputSetting +import dev.suyu.suyu_emu.features.settings.model.view.ModifierInputSetting +import dev.suyu.suyu_emu.utils.InputHandler +import dev.suyu.suyu_emu.utils.ParamPackage class InputDialogFragment : DialogFragment() { private var inputAccepted = false diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputProfileAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputProfileAdapter.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputProfileAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputProfileAdapter.kt index 693cb77cbb..2b4dd0f98e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputProfileAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputProfileAdapter.kt @@ -2,16 +2,16 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.adapters.AbstractListAdapter -import org.suyu.suyu_emu.databinding.ListItemInputProfileBinding -import org.suyu.suyu_emu.viewholder.AbstractViewHolder -import org.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.adapters.AbstractListAdapter +import dev.suyu.suyu_emu.databinding.ListItemInputProfileBinding +import dev.suyu.suyu_emu.viewholder.AbstractViewHolder +import dev.suyu.suyu_emu.R class InputProfileAdapter(options: List) : AbstractListAdapter>(options) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputProfileDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputProfileDialogFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputProfileDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputProfileDialogFragment.kt index 55acee9eda..aa37d86817 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/InputProfileDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/InputProfileDialogFragment.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.app.Dialog import android.os.Bundle @@ -14,11 +14,11 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.DialogInputProfilesBinding -import org.suyu.suyu_emu.features.settings.model.view.InputProfileSetting -import org.suyu.suyu_emu.fragments.MessageDialogFragment -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.DialogInputProfilesBinding +import dev.suyu.suyu_emu.features.settings.model.view.InputProfileSetting +import dev.suyu.suyu_emu.fragments.MessageDialogFragment +import dev.suyu.suyu_emu.utils.collect class InputProfileDialogFragment : DialogFragment() { private var position = 0 diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/NewInputProfileDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/NewInputProfileDialogFragment.kt similarity index 93% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/NewInputProfileDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/NewInputProfileDialogFragment.kt index e683caf190..abf02cf804 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/NewInputProfileDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/NewInputProfileDialogFragment.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.app.Dialog import android.os.Bundle @@ -10,9 +10,9 @@ import android.widget.Toast import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.databinding.DialogEditTextBinding -import org.suyu.suyu_emu.features.settings.model.view.InputProfileSetting -import org.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.DialogEditTextBinding +import dev.suyu.suyu_emu.features.settings.model.view.InputProfileSetting +import dev.suyu.suyu_emu.R class NewInputProfileDialogFragment : DialogFragment() { private var position = 0 diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsActivity.kt similarity index 93% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsActivity.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsActivity.kt index aaa621a1da..aa33a4afd6 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsActivity.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsActivity.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.os.Bundle import android.view.View @@ -16,14 +16,14 @@ import androidx.core.view.WindowInsetsCompat import androidx.navigation.fragment.NavHostFragment import androidx.navigation.navArgs import com.google.android.material.color.MaterialColors -import org.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.NativeLibrary import java.io.IOException -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.ActivitySettingsBinding -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.settings.utils.SettingsFile -import org.suyu.suyu_emu.fragments.ResetSettingsDialogFragment -import org.suyu.suyu_emu.utils.* +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.ActivitySettingsBinding +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.settings.utils.SettingsFile +import dev.suyu.suyu_emu.fragments.ResetSettingsDialogFragment +import dev.suyu.suyu_emu.utils.* class SettingsActivity : AppCompatActivity() { private lateinit var binding: ActivitySettingsBinding diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsAdapter.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsAdapter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsAdapter.kt index 6693e16096..e72eb6a67e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsAdapter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsAdapter.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.content.Context import android.icu.util.Calendar @@ -20,18 +20,18 @@ import androidx.recyclerview.widget.ListAdapter import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SettingsNavigationDirections -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.databinding.ListItemSettingInputBinding -import org.suyu.suyu_emu.databinding.ListItemSettingSwitchBinding -import org.suyu.suyu_emu.databinding.ListItemSettingsHeaderBinding -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.AnalogDirection -import org.suyu.suyu_emu.features.settings.model.AbstractIntSetting -import org.suyu.suyu_emu.features.settings.model.view.* -import org.suyu.suyu_emu.features.settings.ui.viewholder.* -import org.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SettingsNavigationDirections +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.databinding.ListItemSettingInputBinding +import dev.suyu.suyu_emu.databinding.ListItemSettingSwitchBinding +import dev.suyu.suyu_emu.databinding.ListItemSettingsHeaderBinding +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.AnalogDirection +import dev.suyu.suyu_emu.features.settings.model.AbstractIntSetting +import dev.suyu.suyu_emu.features.settings.model.view.* +import dev.suyu.suyu_emu.features.settings.ui.viewholder.* +import dev.suyu.suyu_emu.utils.ParamPackage class SettingsAdapter( private val fragment: Fragment, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsDialogFragment.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsDialogFragment.kt index 8d22dc1d55..11b46e9338 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.app.Dialog import android.content.DialogInterface @@ -13,21 +13,21 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.slider.Slider -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.DialogEditTextBinding -import org.suyu.suyu_emu.databinding.DialogSliderBinding -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.AnalogDirection -import org.suyu.suyu_emu.features.settings.model.view.AnalogInputSetting -import org.suyu.suyu_emu.features.settings.model.view.ButtonInputSetting -import org.suyu.suyu_emu.features.settings.model.view.IntSingleChoiceSetting -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.model.view.SingleChoiceSetting -import org.suyu.suyu_emu.features.settings.model.view.SliderSetting -import org.suyu.suyu_emu.features.settings.model.view.StringInputSetting -import org.suyu.suyu_emu.features.settings.model.view.StringSingleChoiceSetting -import org.suyu.suyu_emu.utils.ParamPackage -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.DialogEditTextBinding +import dev.suyu.suyu_emu.databinding.DialogSliderBinding +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.AnalogDirection +import dev.suyu.suyu_emu.features.settings.model.view.AnalogInputSetting +import dev.suyu.suyu_emu.features.settings.model.view.ButtonInputSetting +import dev.suyu.suyu_emu.features.settings.model.view.IntSingleChoiceSetting +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.model.view.SingleChoiceSetting +import dev.suyu.suyu_emu.features.settings.model.view.SliderSetting +import dev.suyu.suyu_emu.features.settings.model.view.StringInputSetting +import dev.suyu.suyu_emu.features.settings.model.view.StringSingleChoiceSetting +import dev.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.utils.collect class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener { private var type = 0 diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsFragment.kt index 8e7896780a..4e53f925ac 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.annotation.SuppressLint import android.os.Bundle @@ -17,13 +17,13 @@ import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.transition.MaterialSharedAxis -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.FragmentSettingsBinding -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.settings.model.Settings -import org.suyu.suyu_emu.fragments.MessageDialogFragment -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.FragmentSettingsBinding +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.fragments.MessageDialogFragment +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.utils.collect class SettingsFragment : Fragment() { private lateinit var presenter: SettingsFragmentPresenter diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsFragmentPresenter.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsFragmentPresenter.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsFragmentPresenter.kt index 876725a35e..0b22a5c063 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -1,32 +1,32 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.annotation.SuppressLint import android.os.Build import android.widget.Toast -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.model.AnalogDirection -import org.suyu.suyu_emu.features.input.model.NativeAnalog -import org.suyu.suyu_emu.features.input.model.NativeButton -import org.suyu.suyu_emu.features.input.model.NpadStyleIndex -import org.suyu.suyu_emu.features.settings.model.AbstractBooleanSetting -import org.suyu.suyu_emu.features.settings.model.AbstractIntSetting -import org.suyu.suyu_emu.features.settings.model.BooleanSetting -import org.suyu.suyu_emu.features.settings.model.ByteSetting -import org.suyu.suyu_emu.features.settings.model.IntSetting -import org.suyu.suyu_emu.features.settings.model.LongSetting -import org.suyu.suyu_emu.features.settings.model.Settings -import org.suyu.suyu_emu.features.settings.model.Settings.MenuTag -import org.suyu.suyu_emu.features.settings.model.ShortSetting -import org.suyu.suyu_emu.features.settings.model.StringSetting -import org.suyu.suyu_emu.features.settings.model.view.* -import org.suyu.suyu_emu.utils.InputHandler -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.model.AnalogDirection +import dev.suyu.suyu_emu.features.input.model.NativeAnalog +import dev.suyu.suyu_emu.features.input.model.NativeButton +import dev.suyu.suyu_emu.features.input.model.NpadStyleIndex +import dev.suyu.suyu_emu.features.settings.model.AbstractBooleanSetting +import dev.suyu.suyu_emu.features.settings.model.AbstractIntSetting +import dev.suyu.suyu_emu.features.settings.model.BooleanSetting +import dev.suyu.suyu_emu.features.settings.model.ByteSetting +import dev.suyu.suyu_emu.features.settings.model.IntSetting +import dev.suyu.suyu_emu.features.settings.model.LongSetting +import dev.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.features.settings.model.Settings.MenuTag +import dev.suyu.suyu_emu.features.settings.model.ShortSetting +import dev.suyu.suyu_emu.features.settings.model.StringSetting +import dev.suyu.suyu_emu.features.settings.model.view.* +import dev.suyu.suyu_emu.utils.InputHandler +import dev.suyu.suyu_emu.utils.NativeConfig class SettingsFragmentPresenter( private val settingsViewModel: SettingsViewModel, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsSearchFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsSearchFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsSearchFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsSearchFragment.kt index bab4765b5a..2cd10632bd 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsSearchFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsSearchFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import android.content.Context import android.os.Bundle @@ -19,13 +19,13 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.divider.MaterialDividerItemDecoration import com.google.android.material.transition.MaterialSharedAxis import info.debatty.java.stringsimilarity.Cosine -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.FragmentSettingsSearchBinding -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.utils.NativeConfig -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.FragmentSettingsSearchBinding +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.utils.collect class SettingsSearchFragment : Fragment() { private var _binding: FragmentSettingsSearchBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsViewModel.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsViewModel.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsViewModel.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsViewModel.kt index e99dec076d..7f2faa336f 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/SettingsViewModel.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/SettingsViewModel.kt @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui +package dev.suyu.suyu_emu.features.settings.ui import androidx.lifecycle.ViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.model.Game -import org.suyu.suyu_emu.utils.InputHandler -import org.suyu.suyu_emu.utils.ParamPackage +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.utils.InputHandler +import dev.suyu.suyu_emu.utils.ParamPackage class SettingsViewModel : ViewModel() { var game: Game? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt similarity index 82% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt index a996f044f9..1581fea850 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View import java.time.Instant @@ -9,11 +9,11 @@ import java.time.ZoneId import java.time.ZonedDateTime import java.time.format.DateTimeFormatter import java.time.format.FormatStyle -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.features.settings.model.view.DateTimeSetting -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.features.settings.model.view.DateTimeSetting +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt similarity index 70% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt index 7b9c8303d4..8768a387dd 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View -import org.suyu.suyu_emu.databinding.ListItemSettingsHeaderBinding -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.databinding.ListItemSettingsHeaderBinding +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter class HeaderViewHolder(val binding: ListItemSettingsHeaderBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/InputProfileViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/InputProfileViewHolder.kt similarity index 72% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/InputProfileViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/InputProfileViewHolder.kt index 72c27b668a..ea5ea262cc 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/InputProfileViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/InputProfileViewHolder.kt @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.features.settings.model.view.InputProfileSetting -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.features.settings.model.view.InputProfileSetting +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class InputProfileViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/InputViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/InputViewHolder.kt similarity index 76% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/InputViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/InputViewHolder.kt index d66e4e7581..9260a90c36 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/InputViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/InputViewHolder.kt @@ -2,18 +2,18 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View -import org.suyu.suyu_emu.databinding.ListItemSettingInputBinding -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.settings.model.view.AnalogInputSetting -import org.suyu.suyu_emu.features.settings.model.view.ButtonInputSetting -import org.suyu.suyu_emu.features.settings.model.view.InputSetting -import org.suyu.suyu_emu.features.settings.model.view.ModifierInputSetting -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.databinding.ListItemSettingInputBinding +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.settings.model.view.AnalogInputSetting +import dev.suyu.suyu_emu.features.settings.model.view.ButtonInputSetting +import dev.suyu.suyu_emu.features.settings.model.view.InputSetting +import dev.suyu.suyu_emu.features.settings.model.view.ModifierInputSetting +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class InputViewHolder(val binding: ListItemSettingInputBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt similarity index 79% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt index f210925fd2..886ea6adce 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View import androidx.core.content.res.ResourcesCompat -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.features.settings.model.view.RunnableSetting -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.features.settings.model.view.RunnableSetting +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SettingViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SettingViewHolder.kt similarity index 84% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SettingViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SettingViewHolder.kt index 93b0967462..c0d467ef92 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SettingViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SettingViewHolder.kt @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View import androidx.recyclerview.widget.RecyclerView -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.databinding.ListItemSettingSwitchBinding -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.databinding.ListItemSettingSwitchBinding +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter abstract class SettingViewHolder(itemView: View, protected val adapter: SettingsAdapter) : RecyclerView.ViewHolder(itemView), View.OnClickListener, View.OnLongClickListener { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt similarity index 85% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt index f8b891c94a..450424503e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.features.settings.model.view.IntSingleChoiceSetting -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.model.view.SingleChoiceSetting -import org.suyu.suyu_emu.features.settings.model.view.StringSingleChoiceSetting -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.features.settings.model.view.IntSingleChoiceSetting +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.model.view.SingleChoiceSetting +import dev.suyu.suyu_emu.features.settings.model.view.StringSingleChoiceSetting +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SliderViewHolder.kt similarity index 79% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SliderViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SliderViewHolder.kt index 160dc33b75..3d9ef7caf7 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SliderViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SliderViewHolder.kt @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.model.view.SliderSetting -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.model.view.SliderSetting +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt similarity index 79% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt index 3acc7248cd..63ce59a84b 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/StringInputViewHolder.kt @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.model.view.StringInputSetting -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.model.view.StringInputSetting +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class StringInputViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt similarity index 78% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt index 3701f0f46e..38102d672e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View import androidx.core.content.res.ResourcesCompat -import org.suyu.suyu_emu.databinding.ListItemSettingBinding -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.model.view.SubmenuSetting -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.databinding.ListItemSettingBinding +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.model.view.SubmenuSetting +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class SubmenuViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt similarity index 81% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt index 93e50f381b..4b45251298 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.ui.viewholder +package dev.suyu.suyu_emu.features.settings.ui.viewholder import android.view.View import android.widget.CompoundButton -import org.suyu.suyu_emu.databinding.ListItemSettingSwitchBinding -import org.suyu.suyu_emu.features.settings.model.view.SettingsItem -import org.suyu.suyu_emu.features.settings.model.view.SwitchSetting -import org.suyu.suyu_emu.features.settings.ui.SettingsAdapter -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.databinding.ListItemSettingSwitchBinding +import dev.suyu.suyu_emu.features.settings.model.view.SettingsItem +import dev.suyu.suyu_emu.features.settings.model.view.SwitchSetting +import dev.suyu.suyu_emu.features.settings.ui.SettingsAdapter +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) : SettingViewHolder(binding.root, adapter) { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/utils/SettingsFile.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/utils/SettingsFile.kt similarity index 77% rename from src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/utils/SettingsFile.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/utils/SettingsFile.kt index 3c05c2c219..3532cdef87 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/features/settings/utils/SettingsFile.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/features/settings/utils/SettingsFile.kt @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.features.settings.utils +package dev.suyu.suyu_emu.features.settings.utils import android.net.Uri -import org.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.model.Game import java.io.* -import org.suyu.suyu_emu.utils.DirectoryInitialization -import org.suyu.suyu_emu.utils.FileUtil -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.DirectoryInitialization +import dev.suyu.suyu_emu.utils.FileUtil +import dev.suyu.suyu_emu.utils.NativeConfig /** * Contains static methods for interacting with .ini files in which settings are stored. diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AboutFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AboutFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AboutFragment.kt index 66b4fd5604..5902a997aa 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AboutFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AboutFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.content.ClipData import android.content.ClipboardManager @@ -21,11 +21,11 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController import com.google.android.material.transition.MaterialSharedAxis -import org.suyu.suyu_emu.BuildConfig -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.FragmentAboutBinding -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.BuildConfig +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.FragmentAboutBinding +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins class AboutFragment : Fragment() { private var _binding: FragmentAboutBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AddGameFolderDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AddGameFolderDialogFragment.kt similarity index 88% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AddGameFolderDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AddGameFolderDialogFragment.kt index bfc06a31c9..6e75e5d139 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AddGameFolderDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AddGameFolderDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.content.DialogInterface @@ -10,11 +10,11 @@ import android.os.Bundle import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.DialogAddFolderBinding -import org.suyu.suyu_emu.model.GameDir -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.DialogAddFolderBinding +import dev.suyu.suyu_emu.model.GameDir +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.model.HomeViewModel class AddGameFolderDialogFragment : DialogFragment() { private val homeViewModel: HomeViewModel by activityViewModels() diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AddonsFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AddonsFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AddonsFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AddonsFragment.kt index 825b0869de..7d2b9a2f27 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AddonsFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AddonsFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.content.Intent import android.os.Bundle @@ -19,16 +19,15 @@ import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.transition.MaterialSharedAxis -import kotlinx.coroutines.launch -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.adapters.AddonAdapter -import org.suyu.suyu_emu.databinding.FragmentAddonsBinding -import org.suyu.suyu_emu.model.AddonViewModel -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.utils.AddonUtil -import org.suyu.suyu_emu.utils.FileUtil.copyFilesTo -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.adapters.AddonAdapter +import dev.suyu.suyu_emu.databinding.FragmentAddonsBinding +import dev.suyu.suyu_emu.model.AddonViewModel +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.utils.AddonUtil +import dev.suyu.suyu_emu.utils.FileUtil.copyFilesTo +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.utils.collect import java.io.File class AddonsFragment : Fragment() { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AppletLauncherFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AppletLauncherFragment.kt similarity index 91% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AppletLauncherFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AppletLauncherFragment.kt index 138e5074af..622ef144a0 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/AppletLauncherFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/AppletLauncherFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.os.Bundle import android.view.LayoutInflater @@ -15,13 +15,13 @@ import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController import androidx.recyclerview.widget.GridLayoutManager import com.google.android.material.transition.MaterialSharedAxis -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.adapters.AppletAdapter -import org.suyu.suyu_emu.databinding.FragmentAppletLauncherBinding -import org.suyu.suyu_emu.model.Applet -import org.suyu.suyu_emu.model.AppletInfo -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.adapters.AppletAdapter +import dev.suyu.suyu_emu.databinding.FragmentAppletLauncherBinding +import dev.suyu.suyu_emu.model.Applet +import dev.suyu.suyu_emu.model.AppletInfo +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins class AppletLauncherFragment : Fragment() { private var _binding: FragmentAppletLauncherBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/CabinetLauncherDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/CabinetLauncherDialogFragment.kt similarity index 86% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/CabinetLauncherDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/CabinetLauncherDialogFragment.kt index dce2c8ca1f..8be5d21ea0 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/CabinetLauncherDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/CabinetLauncherDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.os.Bundle @@ -11,9 +11,9 @@ import android.view.ViewGroup import androidx.fragment.app.DialogFragment import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.adapters.CabinetLauncherDialogAdapter -import org.suyu.suyu_emu.databinding.DialogListBinding +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.adapters.CabinetLauncherDialogAdapter +import dev.suyu.suyu_emu.databinding.DialogListBinding class CabinetLauncherDialogFragment : DialogFragment() { private lateinit var binding: DialogListBinding diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ContentTypeSelectionDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ContentTypeSelectionDialogFragment.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ContentTypeSelectionDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ContentTypeSelectionDialogFragment.kt index 5bbf751a3a..a11e058a73 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ContentTypeSelectionDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ContentTypeSelectionDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.content.DialogInterface @@ -10,10 +10,10 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels import androidx.preference.PreferenceManager import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.model.AddonViewModel -import org.suyu.suyu_emu.ui.main.MainActivity +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.model.AddonViewModel +import dev.suyu.suyu_emu.ui.main.MainActivity class ContentTypeSelectionDialogFragment : DialogFragment() { private val addonViewModel: AddonViewModel by activityViewModels() diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/CoreErrorDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/CoreErrorDialogFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/CoreErrorDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/CoreErrorDialogFragment.kt index 16f3e8b08f..bcba2b9750 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/CoreErrorDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/CoreErrorDialogFragment.kt @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.content.DialogInterface import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R class CoreErrorDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/DriverManagerFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/DriverManagerFragment.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/DriverManagerFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/DriverManagerFragment.kt index 812037563b..1645400b41 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/DriverManagerFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/DriverManagerFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.os.Bundle import android.view.LayoutInflater @@ -18,20 +18,19 @@ import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.GridLayoutManager import com.google.android.material.transition.MaterialSharedAxis import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.adapters.DriverAdapter -import org.suyu.suyu_emu.databinding.FragmentDriverManagerBinding -import org.suyu.suyu_emu.features.settings.model.StringSetting -import org.suyu.suyu_emu.model.Driver.Companion.toDriver -import org.suyu.suyu_emu.model.DriverViewModel -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.utils.FileUtil -import org.suyu.suyu_emu.utils.GpuDriverHelper -import org.suyu.suyu_emu.utils.NativeConfig -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.adapters.DriverAdapter +import dev.suyu.suyu_emu.databinding.FragmentDriverManagerBinding +import dev.suyu.suyu_emu.features.settings.model.StringSetting +import dev.suyu.suyu_emu.model.Driver.Companion.toDriver +import dev.suyu.suyu_emu.model.DriverViewModel +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.utils.FileUtil +import dev.suyu.suyu_emu.utils.GpuDriverHelper +import dev.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.utils.collect import java.io.File import java.io.IOException diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/DriversLoadingDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/DriversLoadingDialogFragment.kt similarity index 87% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/DriversLoadingDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/DriversLoadingDialogFragment.kt index 993eb015d7..6f97d5a4eb 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/DriversLoadingDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/DriversLoadingDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.os.Bundle @@ -11,10 +11,10 @@ import android.view.ViewGroup import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.DialogProgressBarBinding -import org.suyu.suyu_emu.model.DriverViewModel -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.DialogProgressBarBinding +import dev.suyu.suyu_emu.model.DriverViewModel +import dev.suyu.suyu_emu.utils.collect class DriversLoadingDialogFragment : DialogFragment() { private val driverViewModel: DriverViewModel by activityViewModels() diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/EarlyAccessFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/EarlyAccessFragment.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/EarlyAccessFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/EarlyAccessFragment.kt index 7eebf77159..28215693b6 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/EarlyAccessFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/EarlyAccessFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.content.Intent import android.net.Uri @@ -16,10 +16,10 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController import com.google.android.material.transition.MaterialSharedAxis -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.FragmentEarlyAccessBinding -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.FragmentEarlyAccessBinding +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins class EarlyAccessFragment : Fragment() { private var _binding: FragmentEarlyAccessBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/EmulationFragment.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/EmulationFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/EmulationFragment.kt index 62fbcaf629..79a7078e53 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/EmulationFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/EmulationFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.annotation.SuppressLint import android.app.AlertDialog @@ -39,25 +39,25 @@ import androidx.window.layout.WindowInfoTracker import androidx.window.layout.WindowLayoutInfo import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.slider.Slider -import org.suyu.suyu_emu.HomeNavigationDirections -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.activities.EmulationActivity -import org.suyu.suyu_emu.databinding.DialogOverlayAdjustBinding -import org.suyu.suyu_emu.databinding.FragmentEmulationBinding -import org.suyu.suyu_emu.features.settings.model.BooleanSetting -import org.suyu.suyu_emu.features.settings.model.IntSetting -import org.suyu.suyu_emu.features.settings.model.Settings -import org.suyu.suyu_emu.features.settings.model.Settings.EmulationOrientation -import org.suyu.suyu_emu.features.settings.model.Settings.EmulationVerticalAlignment -import org.suyu.suyu_emu.features.settings.utils.SettingsFile -import org.suyu.suyu_emu.model.DriverViewModel -import org.suyu.suyu_emu.model.Game -import org.suyu.suyu_emu.model.EmulationViewModel -import org.suyu.suyu_emu.overlay.model.OverlayControl -import org.suyu.suyu_emu.overlay.model.OverlayLayout -import org.suyu.suyu_emu.utils.* -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.HomeNavigationDirections +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.activities.EmulationActivity +import dev.suyu.suyu_emu.databinding.DialogOverlayAdjustBinding +import dev.suyu.suyu_emu.databinding.FragmentEmulationBinding +import dev.suyu.suyu_emu.features.settings.model.BooleanSetting +import dev.suyu.suyu_emu.features.settings.model.IntSetting +import dev.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.features.settings.model.Settings.EmulationOrientation +import dev.suyu.suyu_emu.features.settings.model.Settings.EmulationVerticalAlignment +import dev.suyu.suyu_emu.features.settings.utils.SettingsFile +import dev.suyu.suyu_emu.model.DriverViewModel +import dev.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.model.EmulationViewModel +import dev.suyu.suyu_emu.overlay.model.OverlayControl +import dev.suyu.suyu_emu.overlay.model.OverlayLayout +import dev.suyu.suyu_emu.utils.* +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible import java.lang.NullPointerException class EmulationFragment : Fragment(), SurfaceHolder.Callback { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameFolderPropertiesDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameFolderPropertiesDialogFragment.kt similarity index 88% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameFolderPropertiesDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameFolderPropertiesDialogFragment.kt index e65f0f5e6c..f40c4daaae 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameFolderPropertiesDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameFolderPropertiesDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.content.DialogInterface @@ -9,12 +9,12 @@ import android.os.Bundle import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.DialogFolderPropertiesBinding -import org.suyu.suyu_emu.model.GameDir -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.utils.NativeConfig -import org.suyu.suyu_emu.utils.SerializableHelper.parcelable +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.DialogFolderPropertiesBinding +import dev.suyu.suyu_emu.model.GameDir +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.SerializableHelper.parcelable class GameFolderPropertiesDialogFragment : DialogFragment() { private val gamesViewModel: GamesViewModel by activityViewModels() diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameFoldersFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameFoldersFragment.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameFoldersFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameFoldersFragment.kt index 7b9ccce0a1..198afc26a1 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameFoldersFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameFoldersFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.content.Intent import android.os.Bundle @@ -16,15 +16,14 @@ import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController import androidx.recyclerview.widget.GridLayoutManager import com.google.android.material.transition.MaterialSharedAxis -import kotlinx.coroutines.launch -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.adapters.FolderAdapter -import org.suyu.suyu_emu.databinding.FragmentFoldersBinding -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.ui.main.MainActivity -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.adapters.FolderAdapter +import dev.suyu.suyu_emu.databinding.FragmentFoldersBinding +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.ui.main.MainActivity +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.utils.collect class GameFoldersFragment : Fragment() { private var _binding: FragmentFoldersBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameInfoFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameInfoFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameInfoFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameInfoFragment.kt index 16901fead4..743389016f 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GameInfoFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GameInfoFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.content.ClipData import android.content.ClipboardManager @@ -21,14 +21,14 @@ import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController import androidx.navigation.fragment.navArgs import com.google.android.material.transition.MaterialSharedAxis -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.FragmentGameInfoBinding -import org.suyu.suyu_emu.model.GameVerificationResult -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.utils.GameMetadata -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.FragmentGameInfoBinding +import dev.suyu.suyu_emu.model.GameVerificationResult +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.utils.GameMetadata +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins class GameInfoFragment : Fragment() { private var _binding: FragmentGameInfoBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GamePropertiesFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GamePropertiesFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GamePropertiesFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GamePropertiesFragment.kt index e56b186d06..751aa29a3f 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/GamePropertiesFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/GamePropertiesFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.content.pm.ShortcutInfo import android.content.pm.ShortcutManager @@ -24,27 +24,27 @@ import com.google.android.material.transition.MaterialSharedAxis import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.suyu.suyu_emu.HomeNavigationDirections -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.adapters.GamePropertiesAdapter -import org.suyu.suyu_emu.databinding.FragmentGamePropertiesBinding -import org.suyu.suyu_emu.features.settings.model.Settings -import org.suyu.suyu_emu.model.DriverViewModel -import org.suyu.suyu_emu.model.GameProperty -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.model.InstallableProperty -import org.suyu.suyu_emu.model.SubmenuProperty -import org.suyu.suyu_emu.model.TaskState -import org.suyu.suyu_emu.utils.DirectoryInitialization -import org.suyu.suyu_emu.utils.FileUtil -import org.suyu.suyu_emu.utils.GameIconUtils -import org.suyu.suyu_emu.utils.GpuDriverHelper -import org.suyu.suyu_emu.utils.MemoryUtil -import org.suyu.suyu_emu.utils.ViewUtils.marquee -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.HomeNavigationDirections +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.adapters.GamePropertiesAdapter +import dev.suyu.suyu_emu.databinding.FragmentGamePropertiesBinding +import dev.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.model.DriverViewModel +import dev.suyu.suyu_emu.model.GameProperty +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.model.InstallableProperty +import dev.suyu.suyu_emu.model.SubmenuProperty +import dev.suyu.suyu_emu.model.TaskState +import dev.suyu.suyu_emu.utils.DirectoryInitialization +import dev.suyu.suyu_emu.utils.FileUtil +import dev.suyu.suyu_emu.utils.GameIconUtils +import dev.suyu.suyu_emu.utils.GpuDriverHelper +import dev.suyu.suyu_emu.utils.MemoryUtil +import dev.suyu.suyu_emu.utils.ViewUtils.marquee +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.utils.collect import java.io.BufferedOutputStream import java.io.File diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/HomeSettingsFragment.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/HomeSettingsFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/HomeSettingsFragment.kt index 790ca7a54b..6b80f7ee79 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/HomeSettingsFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/HomeSettingsFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.Manifest import android.content.ActivityNotFoundException @@ -27,23 +27,22 @@ import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.GridLayoutManager import com.google.android.material.transition.MaterialSharedAxis -import org.suyu.suyu_emu.BuildConfig -import org.suyu.suyu_emu.HomeNavigationDirections -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.adapters.HomeSettingAdapter -import org.suyu.suyu_emu.databinding.FragmentHomeSettingsBinding -import org.suyu.suyu_emu.features.DocumentProvider -import org.suyu.suyu_emu.features.settings.model.Settings -import org.suyu.suyu_emu.model.DriverViewModel -import org.suyu.suyu_emu.model.HomeSetting -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.ui.main.MainActivity -import org.suyu.suyu_emu.utils.FileUtil -import org.suyu.suyu_emu.utils.GpuDriverHelper -import org.suyu.suyu_emu.utils.Log -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.HomeNavigationDirections +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.adapters.HomeSettingAdapter +import dev.suyu.suyu_emu.databinding.FragmentHomeSettingsBinding +import dev.suyu.suyu_emu.features.DocumentProvider +import dev.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.model.DriverViewModel +import dev.suyu.suyu_emu.model.HomeSetting +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.ui.main.MainActivity +import dev.suyu.suyu_emu.utils.FileUtil +import dev.suyu.suyu_emu.utils.GpuDriverHelper +import dev.suyu.suyu_emu.utils.Log +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins class HomeSettingsFragment : Fragment() { private var _binding: FragmentHomeSettingsBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/InstallableFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/InstallableFragment.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/InstallableFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/InstallableFragment.kt index 4a4dd11f4f..659811e33d 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/InstallableFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/InstallableFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.os.Bundle import android.view.LayoutInflater @@ -18,21 +18,20 @@ import androidx.navigation.findNavController import androidx.recyclerview.widget.GridLayoutManager import com.google.android.material.transition.MaterialSharedAxis import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.adapters.InstallableAdapter -import org.suyu.suyu_emu.databinding.FragmentInstallablesBinding -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.model.Installable -import org.suyu.suyu_emu.model.TaskState -import org.suyu.suyu_emu.ui.main.MainActivity -import org.suyu.suyu_emu.utils.DirectoryInitialization -import org.suyu.suyu_emu.utils.FileUtil -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.adapters.InstallableAdapter +import dev.suyu.suyu_emu.databinding.FragmentInstallablesBinding +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.model.Installable +import dev.suyu.suyu_emu.model.TaskState +import dev.suyu.suyu_emu.ui.main.MainActivity +import dev.suyu.suyu_emu.utils.DirectoryInitialization +import dev.suyu.suyu_emu.utils.FileUtil +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.utils.collect import java.io.BufferedOutputStream import java.io.File import java.math.BigInteger diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LaunchGameDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LaunchGameDialogFragment.kt similarity index 90% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LaunchGameDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LaunchGameDialogFragment.kt index 4cc4f62407..bd78b3480c 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LaunchGameDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LaunchGameDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.content.DialogInterface @@ -9,10 +9,10 @@ import android.os.Bundle import androidx.fragment.app.DialogFragment import androidx.navigation.fragment.findNavController import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.HomeNavigationDirections -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.model.Game -import org.suyu.suyu_emu.utils.SerializableHelper.parcelable +import dev.suyu.suyu_emu.HomeNavigationDirections +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.utils.SerializableHelper.parcelable class LaunchGameDialogFragment : DialogFragment() { private var selectedItem = 1 diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LicenseBottomSheetDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LicenseBottomSheetDialogFragment.kt similarity index 90% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LicenseBottomSheetDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LicenseBottomSheetDialogFragment.kt index 76e34b62da..f473acb881 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LicenseBottomSheetDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LicenseBottomSheetDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.os.Bundle import android.view.LayoutInflater @@ -9,9 +9,9 @@ import android.view.View import android.view.ViewGroup import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import org.suyu.suyu_emu.databinding.DialogLicenseBinding -import org.suyu.suyu_emu.model.License -import org.suyu.suyu_emu.utils.SerializableHelper.parcelable +import dev.suyu.suyu_emu.databinding.DialogLicenseBinding +import dev.suyu.suyu_emu.model.License +import dev.suyu.suyu_emu.utils.SerializableHelper.parcelable class LicenseBottomSheetDialogFragment : BottomSheetDialogFragment() { private var _binding: DialogLicenseBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LicensesFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LicensesFragment.kt similarity index 93% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LicensesFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LicensesFragment.kt index b5709d624e..71bdec1ea0 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/LicensesFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/LicensesFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.os.Bundle import android.view.LayoutInflater @@ -16,12 +16,12 @@ import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.transition.MaterialSharedAxis -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.adapters.LicenseAdapter -import org.suyu.suyu_emu.databinding.FragmentLicensesBinding -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.model.License -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.adapters.LicenseAdapter +import dev.suyu.suyu_emu.databinding.FragmentLicensesBinding +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.model.License +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins class LicensesFragment : Fragment() { private var _binding: FragmentLicensesBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/MessageDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/MessageDialogFragment.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/MessageDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/MessageDialogFragment.kt index ed80521354..75414251e1 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/MessageDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/MessageDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.content.Intent @@ -13,9 +13,9 @@ import androidx.fragment.app.FragmentActivity import androidx.fragment.app.activityViewModels import androidx.lifecycle.ViewModelProvider import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.model.MessageDialogViewModel -import org.suyu.suyu_emu.utils.Log +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.model.MessageDialogViewModel +import dev.suyu.suyu_emu.utils.Log class MessageDialogFragment : DialogFragment() { private val messageDialogViewModel: MessageDialogViewModel by activityViewModels() diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/PermissionDeniedDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/PermissionDeniedDialogFragment.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/PermissionDeniedDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/PermissionDeniedDialogFragment.kt index c384584b19..02e91db633 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/PermissionDeniedDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/PermissionDeniedDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.content.DialogInterface @@ -11,7 +11,7 @@ import android.os.Bundle import android.provider.Settings import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R +import dev.suyu.suyu_emu.R class PermissionDeniedDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ProgressDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ProgressDialogFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ProgressDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ProgressDialogFragment.kt index c1221f383c..db6a7c4e82 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ProgressDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ProgressDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.os.Bundle @@ -15,11 +15,11 @@ import androidx.fragment.app.FragmentActivity import androidx.fragment.app.activityViewModels import androidx.lifecycle.ViewModelProvider import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.DialogProgressBarBinding -import org.suyu.suyu_emu.model.TaskViewModel -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.DialogProgressBarBinding +import dev.suyu.suyu_emu.model.TaskViewModel +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.utils.collect class ProgressDialogFragment : DialogFragment() { private val taskViewModel: TaskViewModel by activityViewModels() diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ResetSettingsDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ResetSettingsDialogFragment.kt similarity index 88% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ResetSettingsDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ResetSettingsDialogFragment.kt index 24f9f6a10a..ff96b1f8d5 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/ResetSettingsDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/ResetSettingsDialogFragment.kt @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.features.settings.ui.SettingsActivity +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.features.settings.ui.SettingsActivity class ResetSettingsDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SearchFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SearchFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SearchFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SearchFragment.kt index 54155bdc43..7216fc641e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SearchFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SearchFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.content.Context import android.content.SharedPreferences @@ -21,16 +21,16 @@ import androidx.preference.PreferenceManager import info.debatty.java.stringsimilarity.Jaccard import info.debatty.java.stringsimilarity.JaroWinkler import java.util.Locale -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.adapters.GameAdapter -import org.suyu.suyu_emu.databinding.FragmentSearchBinding -import org.suyu.suyu_emu.layout.AutofitGridLayoutManager -import org.suyu.suyu_emu.model.Game -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.adapters.GameAdapter +import dev.suyu.suyu_emu.databinding.FragmentSearchBinding +import dev.suyu.suyu_emu.layout.AutofitGridLayoutManager +import dev.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.utils.collect class SearchFragment : Fragment() { private var _binding: FragmentSearchBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SetupFragment.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SetupFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SetupFragment.kt index fdbdb20b65..3c2ccf4bcd 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SetupFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SetupFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.Manifest import android.content.Intent @@ -26,24 +26,23 @@ import androidx.navigation.findNavController import androidx.preference.PreferenceManager import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback import com.google.android.material.transition.MaterialFadeThrough -import kotlinx.coroutines.launch -import org.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.NativeLibrary import java.io.File -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.adapters.SetupAdapter -import org.suyu.suyu_emu.databinding.FragmentSetupBinding -import org.suyu.suyu_emu.features.settings.model.Settings -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.model.SetupCallback -import org.suyu.suyu_emu.model.SetupPage -import org.suyu.suyu_emu.model.StepState -import org.suyu.suyu_emu.ui.main.MainActivity -import org.suyu.suyu_emu.utils.DirectoryInitialization -import org.suyu.suyu_emu.utils.NativeConfig -import org.suyu.suyu_emu.utils.ViewUtils -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.adapters.SetupAdapter +import dev.suyu.suyu_emu.databinding.FragmentSetupBinding +import dev.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.model.SetupCallback +import dev.suyu.suyu_emu.model.SetupPage +import dev.suyu.suyu_emu.model.StepState +import dev.suyu.suyu_emu.ui.main.MainActivity +import dev.suyu.suyu_emu.utils.DirectoryInitialization +import dev.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.utils.ViewUtils +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.utils.collect class SetupFragment : Fragment() { private var _binding: FragmentSetupBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SetupWarningDialogFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SetupWarningDialogFragment.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SetupWarningDialogFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SetupWarningDialogFragment.kt index a508ebfd33..70556f57a6 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/fragments/SetupWarningDialogFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/fragments/SetupWarningDialogFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.fragments +package dev.suyu.suyu_emu.fragments import android.app.Dialog import android.content.DialogInterface @@ -10,7 +10,7 @@ import android.net.Uri import android.os.Bundle import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.suyu.suyu_emu.R +import dev.suyu.suyu_emu.R class SetupWarningDialogFragment : DialogFragment() { private var titleId: Int = 0 diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/layout/AutofitGridLayoutManager.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/layout/AutofitGridLayoutManager.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/layout/AutofitGridLayoutManager.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/layout/AutofitGridLayoutManager.kt index 6d37cf4f8b..b5bad73c03 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/layout/AutofitGridLayoutManager.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/layout/AutofitGridLayoutManager.kt @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.layout +package dev.suyu.suyu_emu.layout import android.content.Context import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.Recycler -import org.suyu.suyu_emu.R +import dev.suyu.suyu_emu.R /** * Cut down version of the solution provided here diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/AddonViewModel.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/AddonViewModel.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/AddonViewModel.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/AddonViewModel.kt index e67611631e..184668475c 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/AddonViewModel.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/AddonViewModel.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -10,8 +10,8 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.utils.NativeConfig import java.util.concurrent.atomic.AtomicBoolean class AddonViewModel : ViewModel() { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Applet.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Applet.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/Applet.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/Applet.kt index af22fd0bc4..37f50588df 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Applet.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Applet.kt @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import org.suyu.suyu_emu.R +import dev.suyu.suyu_emu.R data class Applet( @StringRes val titleId: Int, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Driver.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Driver.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/Driver.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/Driver.kt index cf1f72bcc1..a866ceb6b8 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Driver.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Driver.kt @@ -2,9 +2,9 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model -import org.suyu.suyu_emu.utils.GpuDriverMetadata +import dev.suyu.suyu_emu.utils.GpuDriverMetadata data class Driver( override var selected: Boolean, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/DriverViewModel.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/DriverViewModel.kt similarity index 93% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/DriverViewModel.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/DriverViewModel.kt index 7009d453ae..7d4f59c493 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/DriverViewModel.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/DriverViewModel.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -14,14 +14,14 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.features.settings.model.StringSetting -import org.suyu.suyu_emu.features.settings.utils.SettingsFile -import org.suyu.suyu_emu.model.Driver.Companion.toDriver -import org.suyu.suyu_emu.utils.GpuDriverHelper -import org.suyu.suyu_emu.utils.GpuDriverMetadata -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.features.settings.model.StringSetting +import dev.suyu.suyu_emu.features.settings.utils.SettingsFile +import dev.suyu.suyu_emu.model.Driver.Companion.toDriver +import dev.suyu.suyu_emu.utils.GpuDriverHelper +import dev.suyu.suyu_emu.utils.GpuDriverMetadata +import dev.suyu.suyu_emu.utils.NativeConfig import java.io.File class DriverViewModel : ViewModel() { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/EmulationViewModel.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/EmulationViewModel.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/EmulationViewModel.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/EmulationViewModel.kt index 3d6e744e93..3a0124b8b0 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/EmulationViewModel.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/EmulationViewModel.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.lifecycle.ViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Game.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Game.kt similarity index 91% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/Game.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/Game.kt index 039ce3d302..b186df68ab 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Game.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Game.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import android.content.Intent import android.net.Uri @@ -9,12 +9,12 @@ import android.os.Parcelable import java.util.HashSet import kotlinx.parcelize.Parcelize import kotlinx.serialization.Serializable -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.activities.EmulationActivity -import org.suyu.suyu_emu.utils.DirectoryInitialization -import org.suyu.suyu_emu.utils.FileUtil +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.activities.EmulationActivity +import dev.suyu.suyu_emu.utils.DirectoryInitialization +import dev.suyu.suyu_emu.utils.FileUtil import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/GameDir.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameDir.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/GameDir.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameDir.kt index b3f7a8d14a..881b6c992e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/GameDir.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameDir.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/GameProperties.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameProperties.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/GameProperties.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameProperties.kt index abeee8f73b..c052f4aaae 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/GameProperties.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameProperties.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/GameVerificationResult.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameVerificationResult.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/GameVerificationResult.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameVerificationResult.kt index 61c6014469..4964e16209 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/GameVerificationResult.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/GameVerificationResult.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model enum class GameVerificationResult(val int: Int) { Success(0), diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/GamesViewModel.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/GamesViewModel.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/GamesViewModel.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/GamesViewModel.kt index f5a1e55256..58105ae341 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/GamesViewModel.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/GamesViewModel.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import android.net.Uri import androidx.documentfile.provider.DocumentFile @@ -17,10 +17,10 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.utils.GameHelper -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.utils.GameHelper +import dev.suyu.suyu_emu.utils.NativeConfig import java.util.concurrent.atomic.AtomicBoolean class GamesViewModel : ViewModel() { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/HomeSetting.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/HomeSetting.kt similarity index 93% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/HomeSetting.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/HomeSetting.kt index 114e4a89ad..6097181df2 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/HomeSetting.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/HomeSetting.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/HomeViewModel.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/HomeViewModel.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/HomeViewModel.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/HomeViewModel.kt index 6cfbb725c8..d0e9a44149 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/HomeViewModel.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/HomeViewModel.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import android.net.Uri import androidx.lifecycle.ViewModel diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/InstallResult.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/InstallResult.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/InstallResult.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/InstallResult.kt index 110da0f32b..40668f192d 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/InstallResult.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/InstallResult.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model enum class InstallResult(val int: Int) { Success(0), diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Installable.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Installable.kt similarity index 90% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/Installable.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/Installable.kt index 6b15d54afe..632121f191 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Installable.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Installable.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.annotation.StringRes diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/License.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/License.kt similarity index 91% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/License.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/License.kt index 735b07ee65..e10a68f668 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/License.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/License.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/MessageDialogViewModel.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/MessageDialogViewModel.kt similarity index 91% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/MessageDialogViewModel.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/MessageDialogViewModel.kt index 1f51bb3a06..02474352c5 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/MessageDialogViewModel.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/MessageDialogViewModel.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.lifecycle.ViewModel diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/MinimalDocumentFile.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/MinimalDocumentFile.kt similarity index 91% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/MinimalDocumentFile.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/MinimalDocumentFile.kt index 176c6f3b71..f6580c8e2a 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/MinimalDocumentFile.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/MinimalDocumentFile.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import android.net.Uri import android.provider.DocumentsContract diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Patch.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Patch.kt similarity index 90% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/Patch.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/Patch.kt index 6e9d09d1be..aa105c3401 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/Patch.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/Patch.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.annotation.Keep diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/PatchType.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/PatchType.kt similarity index 91% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/PatchType.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/PatchType.kt index 1880f876ec..b48cc843dd 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/PatchType.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/PatchType.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model enum class PatchType(val int: Int) { Update(0), diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/SelectableItem.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/SelectableItem.kt similarity index 89% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/SelectableItem.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/SelectableItem.kt index b8209e3f1d..a98315c653 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/SelectableItem.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/SelectableItem.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model interface SelectableItem { var selected: Boolean diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/SetupPage.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/SetupPage.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/SetupPage.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/SetupPage.kt index 0316009d6c..4766b1870a 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/SetupPage.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/SetupPage.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model data class SetupPage( val iconId: Int, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/model/TaskViewModel.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/TaskViewModel.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/model/TaskViewModel.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/model/TaskViewModel.kt index e4d635ff4f..b3f9daaf98 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/model/TaskViewModel.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/model/TaskViewModel.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.model +package dev.suyu.suyu_emu.model import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlay.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlay.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlay.kt index 76e33bef37..dd5d906b53 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlay.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.overlay +package dev.suyu.suyu_emu.overlay import android.app.Activity import android.content.Context @@ -24,17 +24,17 @@ import androidx.core.content.ContextCompat import androidx.window.layout.WindowMetricsCalculator import kotlin.math.max import kotlin.math.min -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.features.input.model.NativeAnalog -import org.suyu.suyu_emu.features.input.model.NativeButton -import org.suyu.suyu_emu.features.input.model.NpadStyleIndex -import org.suyu.suyu_emu.features.settings.model.BooleanSetting -import org.suyu.suyu_emu.features.settings.model.IntSetting -import org.suyu.suyu_emu.overlay.model.OverlayControl -import org.suyu.suyu_emu.overlay.model.OverlayControlData -import org.suyu.suyu_emu.overlay.model.OverlayLayout -import org.suyu.suyu_emu.utils.NativeConfig +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.features.input.model.NativeAnalog +import dev.suyu.suyu_emu.features.input.model.NativeButton +import dev.suyu.suyu_emu.features.input.model.NpadStyleIndex +import dev.suyu.suyu_emu.features.settings.model.BooleanSetting +import dev.suyu.suyu_emu.features.settings.model.IntSetting +import dev.suyu.suyu_emu.overlay.model.OverlayControl +import dev.suyu.suyu_emu.overlay.model.OverlayControlData +import dev.suyu.suyu_emu.overlay.model.OverlayLayout +import dev.suyu.suyu_emu.utils.NativeConfig /** * Draws the interactive input overlay on top of the diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableButton.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableButton.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableButton.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableButton.kt index 0ba7205e58..3d94061bb5 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableButton.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableButton.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.overlay +package dev.suyu.suyu_emu.overlay import android.content.res.Resources import android.graphics.Bitmap @@ -9,9 +9,9 @@ import android.graphics.Canvas import android.graphics.Rect import android.graphics.drawable.BitmapDrawable import android.view.MotionEvent -import org.suyu.suyu_emu.features.input.NativeInput.ButtonState -import org.suyu.suyu_emu.features.input.model.NativeButton -import org.suyu.suyu_emu.overlay.model.OverlayControlData +import dev.suyu.suyu_emu.features.input.NativeInput.ButtonState +import dev.suyu.suyu_emu.features.input.model.NativeButton +import dev.suyu.suyu_emu.overlay.model.OverlayControlData /** * Custom [BitmapDrawable] that is capable diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableDpad.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableDpad.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableDpad.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableDpad.kt index 6f24f5c1da..35d1f70f5e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableDpad.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableDpad.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.overlay +package dev.suyu.suyu_emu.overlay import android.content.res.Resources import android.graphics.Bitmap @@ -9,8 +9,8 @@ import android.graphics.Canvas import android.graphics.Rect import android.graphics.drawable.BitmapDrawable import android.view.MotionEvent -import org.suyu.suyu_emu.features.input.NativeInput.ButtonState -import org.suyu.suyu_emu.features.input.model.NativeButton +import dev.suyu.suyu_emu.features.input.NativeInput.ButtonState +import dev.suyu.suyu_emu.features.input.model.NativeButton /** * Custom [BitmapDrawable] that is capable diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableJoystick.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableJoystick.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableJoystick.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableJoystick.kt index e6f8b5d21a..8afa134ae4 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/InputOverlayDrawableJoystick.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/InputOverlayDrawableJoystick.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.overlay +package dev.suyu.suyu_emu.overlay import android.content.res.Resources import android.graphics.Bitmap @@ -13,10 +13,10 @@ import kotlin.math.atan2 import kotlin.math.cos import kotlin.math.sin import kotlin.math.sqrt -import org.suyu.suyu_emu.features.input.NativeInput.ButtonState -import org.suyu.suyu_emu.features.input.model.NativeAnalog -import org.suyu.suyu_emu.features.input.model.NativeButton -import org.suyu.suyu_emu.features.settings.model.BooleanSetting +import dev.suyu.suyu_emu.features.input.NativeInput.ButtonState +import dev.suyu.suyu_emu.features.input.model.NativeAnalog +import dev.suyu.suyu_emu.features.input.model.NativeButton +import dev.suyu.suyu_emu.features.settings.model.BooleanSetting /** * Custom [BitmapDrawable] that is capable diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControl.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControl.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControl.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControl.kt index 605f63ff79..a9e32675e8 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControl.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControl.kt @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.overlay.model +package dev.suyu.suyu_emu.overlay.model import androidx.annotation.IntegerRes -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication enum class OverlayControl( val id: String, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControlData.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControlData.kt similarity index 93% rename from src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControlData.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControlData.kt index 7559bcfe2d..2a4267da2e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControlData.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControlData.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.overlay.model +package dev.suyu.suyu_emu.overlay.model data class OverlayControlData( val id: String, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControlDefault.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControlDefault.kt similarity index 90% rename from src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControlDefault.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControlDefault.kt index 0df2e4ff8b..74ca6edec4 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayControlDefault.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayControlDefault.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.overlay.model +package dev.suyu.suyu_emu.overlay.model import androidx.annotation.IntegerRes diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayLayout.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayLayout.kt similarity index 84% rename from src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayLayout.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayLayout.kt index 1eb0105352..f8595593d9 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/overlay/model/OverlayLayout.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/overlay/model/OverlayLayout.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.overlay.model +package dev.suyu.suyu_emu.overlay.model enum class OverlayLayout(val id: String) { Landscape("Landscape"), diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/ui/GamesFragment.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/ui/GamesFragment.kt similarity index 92% rename from src/android/app/src/main/java/org/suyu/suyu_emu/ui/GamesFragment.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/ui/GamesFragment.kt index b37aa23850..39b1ef8b77 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/ui/GamesFragment.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/ui/GamesFragment.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.ui +package dev.suyu.suyu_emu.ui import android.os.Bundle import android.view.LayoutInflater @@ -14,15 +14,15 @@ import androidx.core.view.updatePadding import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import com.google.android.material.color.MaterialColors -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.adapters.GameAdapter -import org.suyu.suyu_emu.databinding.FragmentGamesBinding -import org.suyu.suyu_emu.layout.AutofitGridLayoutManager -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.utils.ViewUtils.setVisible -import org.suyu.suyu_emu.utils.ViewUtils.updateMargins -import org.suyu.suyu_emu.utils.collect +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.adapters.GameAdapter +import dev.suyu.suyu_emu.databinding.FragmentGamesBinding +import dev.suyu.suyu_emu.layout.AutofitGridLayoutManager +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.utils.ViewUtils.updateMargins +import dev.suyu.suyu_emu.utils.collect class GamesFragment : Fragment() { private var _binding: FragmentGamesBinding? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/ui/main/MainActivity.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/ui/main/MainActivity.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/ui/main/MainActivity.kt index ea5ba39a32..c994a3510d 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/ui/main/MainActivity.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.ui.main +package dev.suyu.suyu_emu.ui.main import android.content.Intent import android.net.Uri @@ -27,23 +27,23 @@ import com.google.android.material.color.MaterialColors import com.google.android.material.navigation.NavigationBarView import java.io.File import java.io.FilenameFilter -import org.suyu.suyu_emu.HomeNavigationDirections -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.databinding.ActivityMainBinding -import org.suyu.suyu_emu.features.settings.model.Settings -import org.suyu.suyu_emu.fragments.AddGameFolderDialogFragment -import org.suyu.suyu_emu.fragments.ProgressDialogFragment -import org.suyu.suyu_emu.fragments.MessageDialogFragment -import org.suyu.suyu_emu.model.AddonViewModel -import org.suyu.suyu_emu.model.DriverViewModel -import org.suyu.suyu_emu.model.GamesViewModel -import org.suyu.suyu_emu.model.HomeViewModel -import org.suyu.suyu_emu.model.InstallResult -import org.suyu.suyu_emu.model.TaskState -import org.suyu.suyu_emu.model.TaskViewModel -import org.suyu.suyu_emu.utils.* -import org.suyu.suyu_emu.utils.ViewUtils.setVisible +import dev.suyu.suyu_emu.HomeNavigationDirections +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.databinding.ActivityMainBinding +import dev.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.fragments.AddGameFolderDialogFragment +import dev.suyu.suyu_emu.fragments.ProgressDialogFragment +import dev.suyu.suyu_emu.fragments.MessageDialogFragment +import dev.suyu.suyu_emu.model.AddonViewModel +import dev.suyu.suyu_emu.model.DriverViewModel +import dev.suyu.suyu_emu.model.GamesViewModel +import dev.suyu.suyu_emu.model.HomeViewModel +import dev.suyu.suyu_emu.model.InstallResult +import dev.suyu.suyu_emu.model.TaskState +import dev.suyu.suyu_emu.model.TaskViewModel +import dev.suyu.suyu_emu.utils.* +import dev.suyu.suyu_emu.utils.ViewUtils.setVisible import java.io.BufferedInputStream import java.io.BufferedOutputStream import java.util.zip.ZipEntry diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/ui/main/ThemeProvider.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/ui/main/ThemeProvider.kt similarity index 88% rename from src/android/app/src/main/java/org/suyu/suyu_emu/ui/main/ThemeProvider.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/ui/main/ThemeProvider.kt index 3ba6c5cd16..c9c7f87636 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/ui/main/ThemeProvider.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/ui/main/ThemeProvider.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.ui.main +package dev.suyu.suyu_emu.ui.main interface ThemeProvider { /** diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/AddonUtil.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/AddonUtil.kt similarity index 85% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/AddonUtil.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/AddonUtil.kt index adc4228bc0..c1d93ba585 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/AddonUtil.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/AddonUtil.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils object AddonUtil { val validAddonDirectories = listOf("cheats", "exefs", "romfs") diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/DirectoryInitialization.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/DirectoryInitialization.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/DirectoryInitialization.kt index 451757fea3..dd0257a0e5 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/DirectoryInitialization.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/DirectoryInitialization.kt @@ -1,19 +1,19 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import androidx.preference.PreferenceManager import java.io.IOException -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.features.settings.model.BooleanSetting -import org.suyu.suyu_emu.features.settings.model.IntSetting -import org.suyu.suyu_emu.features.settings.model.Settings -import org.suyu.suyu_emu.overlay.model.OverlayControlData -import org.suyu.suyu_emu.overlay.model.OverlayControl -import org.suyu.suyu_emu.overlay.model.OverlayLayout -import org.suyu.suyu_emu.utils.PreferenceUtil.migratePreference +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.features.settings.model.BooleanSetting +import dev.suyu.suyu_emu.features.settings.model.IntSetting +import dev.suyu.suyu_emu.features.settings.model.Settings +import dev.suyu.suyu_emu.overlay.model.OverlayControlData +import dev.suyu.suyu_emu.overlay.model.OverlayControl +import dev.suyu.suyu_emu.overlay.model.OverlayLayout +import dev.suyu.suyu_emu.utils.PreferenceUtil.migratePreference object DirectoryInitialization { private var userPath: String? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/DocumentsTree.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/DocumentsTree.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/DocumentsTree.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/DocumentsTree.kt index 8269cbc238..fab217f538 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/DocumentsTree.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/DocumentsTree.kt @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.net.Uri import androidx.documentfile.provider.DocumentFile import java.io.File import java.util.* -import org.suyu.suyu_emu.model.MinimalDocumentFile +import dev.suyu.suyu_emu.model.MinimalDocumentFile class DocumentsTree { private var root: DocumentsNode? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/FileUtil.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/FileUtil.kt similarity index 99% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/FileUtil.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/FileUtil.kt index 61a40992a8..8f10ab6711 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/FileUtil.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/FileUtil.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.database.Cursor import android.net.Uri @@ -14,9 +14,9 @@ import java.io.InputStream import java.net.URLDecoder import java.util.zip.ZipEntry import java.util.zip.ZipInputStream -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.model.MinimalDocumentFile -import org.suyu.suyu_emu.model.TaskState +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.model.MinimalDocumentFile +import dev.suyu.suyu_emu.model.TaskState import java.io.BufferedOutputStream import java.io.OutputStream import java.lang.NullPointerException diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameHelper.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameHelper.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameHelper.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameHelper.kt index 4800c5cb4e..a413a44cd8 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameHelper.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameHelper.kt @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.content.SharedPreferences import android.net.Uri import androidx.preference.PreferenceManager import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.model.Game -import org.suyu.suyu_emu.model.GameDir -import org.suyu.suyu_emu.model.MinimalDocumentFile +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.model.GameDir +import dev.suyu.suyu_emu.model.MinimalDocumentFile object GameHelper { private const val KEY_OLD_GAME_PATH = "game_path" diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameIconUtils.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameIconUtils.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameIconUtils.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameIconUtils.kt index 692030c218..f941e9eb60 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameIconUtils.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameIconUtils.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -21,9 +21,9 @@ import coil.key.Keyer import coil.memory.MemoryCache import coil.request.ImageRequest import coil.request.Options -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.model.Game +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.model.Game class GameIconFetcher( private val game: Game, diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameMetadata.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameMetadata.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameMetadata.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameMetadata.kt index d8f278e902..9847f81cc1 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GameMetadata.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GameMetadata.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils object GameMetadata { external fun getIsValid(path: String): Boolean diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GpuDriverHelper.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GpuDriverHelper.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/GpuDriverHelper.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GpuDriverHelper.kt index 28486d32de..2d7bc81553 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GpuDriverHelper.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GpuDriverHelper.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.graphics.SurfaceTexture import android.net.Uri @@ -9,9 +9,9 @@ import android.os.Build import android.view.Surface import java.io.File import java.io.IOException -import org.suyu.suyu_emu.NativeLibrary -import org.suyu.suyu_emu.SuyuApplication -import org.suyu.suyu_emu.features.settings.model.StringSetting +import dev.suyu.suyu_emu.NativeLibrary +import dev.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.features.settings.model.StringSetting import java.io.FileNotFoundException import java.util.zip.ZipException import java.util.zip.ZipFile diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GpuDriverMetadata.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GpuDriverMetadata.kt similarity index 99% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/GpuDriverMetadata.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GpuDriverMetadata.kt index c12e49d2cd..5b992ef1ce 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/GpuDriverMetadata.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/GpuDriverMetadata.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import java.io.IOException import org.json.JSONException diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/InputHandler.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/InputHandler.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/InputHandler.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/InputHandler.kt index 90afcea9aa..394f6b8e24 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/InputHandler.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/InputHandler.kt @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.view.InputDevice import android.view.KeyEvent import android.view.MotionEvent -import org.suyu.suyu_emu.features.input.NativeInput -import org.suyu.suyu_emu.features.input.SuyuInputOverlayDevice -import org.suyu.suyu_emu.features.input.SuyuPhysicalDevice +import dev.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.SuyuInputOverlayDevice +import dev.suyu.suyu_emu.features.input.SuyuPhysicalDevice object InputHandler { var androidControllers = mapOf() diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/InsetsHelper.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/InsetsHelper.kt similarity index 95% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/InsetsHelper.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/InsetsHelper.kt index d5621f42cc..e2eb325742 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/InsetsHelper.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/InsetsHelper.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.annotation.SuppressLint import android.content.Context diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/LifecycleUtils.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/LifecycleUtils.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/LifecycleUtils.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/LifecycleUtils.kt index e1b73c11d6..4cb1910f67 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/LifecycleUtils.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/LifecycleUtils.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/Log.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/Log.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/Log.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/Log.kt index 794f03629d..703f17361e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/Log.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/Log.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.os.Build diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/MemoryUtil.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/MemoryUtil.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/MemoryUtil.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/MemoryUtil.kt index 3617b0dc54..abc08c7d4e 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/MemoryUtil.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/MemoryUtil.kt @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.app.ActivityManager import android.content.Context import android.os.Build -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.SuyuApplication +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.SuyuApplication import java.util.Locale import kotlin.math.ceil diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/NativeConfig.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/NativeConfig.kt similarity index 96% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/NativeConfig.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/NativeConfig.kt index 248b02515c..fac09e9e16 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/NativeConfig.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/NativeConfig.kt @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils -import org.suyu.suyu_emu.model.GameDir -import org.suyu.suyu_emu.overlay.model.OverlayControlData +import dev.suyu.suyu_emu.model.GameDir +import dev.suyu.suyu_emu.overlay.model.OverlayControlData -import org.suyu.suyu_emu.features.input.model.PlayerInput +import dev.suyu.suyu_emu.features.input.model.PlayerInput object NativeConfig { /** diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/NfcReader.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/NfcReader.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/NfcReader.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/NfcReader.kt index 2a8045202c..b32f246498 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/NfcReader.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/NfcReader.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.app.Activity import android.app.PendingIntent @@ -14,7 +14,7 @@ import android.os.Build import android.os.Handler import android.os.Looper import java.io.IOException -import org.suyu.suyu_emu.features.input.NativeInput +import dev.suyu.suyu_emu.features.input.NativeInput class NfcReader(private val activity: Activity) { private var nfcAdapter: NfcAdapter? = null diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/ParamPackage.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ParamPackage.kt similarity index 99% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/ParamPackage.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ParamPackage.kt index 98a906c8e3..30ff051910 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/ParamPackage.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ParamPackage.kt @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils // Kotlin version of src/common/param_package.h class ParamPackage(serialized: String = "") { diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/PreferenceUtil.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/PreferenceUtil.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/PreferenceUtil.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/PreferenceUtil.kt index ad8fd59211..1c16b3b401 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/PreferenceUtil.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/PreferenceUtil.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.content.SharedPreferences diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/SerializableHelper.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/SerializableHelper.kt similarity index 97% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/SerializableHelper.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/SerializableHelper.kt index 71438c2866..d75a47beea 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/SerializableHelper.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/SerializableHelper.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.content.Intent import android.os.Build diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/ThemeHelper.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ThemeHelper.kt similarity index 94% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/ThemeHelper.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ThemeHelper.kt index 2c0b3ea2ed..eaff5893c5 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/ThemeHelper.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ThemeHelper.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.content.res.Configuration import android.graphics.Color @@ -12,10 +12,10 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsControllerCompat import kotlin.math.roundToInt -import org.suyu.suyu_emu.R -import org.suyu.suyu_emu.features.settings.model.BooleanSetting -import org.suyu.suyu_emu.features.settings.model.IntSetting -import org.suyu.suyu_emu.ui.main.ThemeProvider +import dev.suyu.suyu_emu.R +import dev.suyu.suyu_emu.features.settings.model.BooleanSetting +import dev.suyu.suyu_emu.features.settings.model.IntSetting +import dev.suyu.suyu_emu.ui.main.ThemeProvider object ThemeHelper { const val SYSTEM_BAR_ALPHA = 0.9f diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/ViewUtils.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ViewUtils.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/utils/ViewUtils.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ViewUtils.kt index b81e146673..94bf0d890f 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/utils/ViewUtils.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/utils/ViewUtils.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.utils +package dev.suyu.suyu_emu.utils import android.text.TextUtils import android.view.View diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/viewholder/AbstractViewHolder.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/viewholder/AbstractViewHolder.kt similarity index 80% rename from src/android/app/src/main/java/org/suyu/suyu_emu/viewholder/AbstractViewHolder.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/viewholder/AbstractViewHolder.kt index ee149eae7d..c1991d609a 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/viewholder/AbstractViewHolder.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/viewholder/AbstractViewHolder.kt @@ -2,12 +2,12 @@ // SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.viewholder +package dev.suyu.suyu_emu.viewholder import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding -import org.suyu.suyu_emu.adapters.AbstractDiffAdapter -import org.suyu.suyu_emu.adapters.AbstractListAdapter +import dev.suyu.suyu_emu.adapters.AbstractDiffAdapter +import dev.suyu.suyu_emu.adapters.AbstractListAdapter /** * [RecyclerView.ViewHolder] meant to work together with a [AbstractDiffAdapter] or a diff --git a/src/android/app/src/main/java/org/suyu/suyu_emu/views/FixedRatioSurfaceView.kt b/src/android/app/src/main/java/dev/suyu/suyu_emu/views/FixedRatioSurfaceView.kt similarity index 98% rename from src/android/app/src/main/java/org/suyu/suyu_emu/views/FixedRatioSurfaceView.kt rename to src/android/app/src/main/java/dev/suyu/suyu_emu/views/FixedRatioSurfaceView.kt index 7d4708ce12..181ddca032 100644 --- a/src/android/app/src/main/java/org/suyu/suyu_emu/views/FixedRatioSurfaceView.kt +++ b/src/android/app/src/main/java/dev/suyu/suyu_emu/views/FixedRatioSurfaceView.kt @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -package org.suyu.suyu_emu.views +package dev.suyu.suyu_emu.views import android.content.Context import android.util.AttributeSet diff --git a/src/android/app/src/main/jni/game_metadata.cpp b/src/android/app/src/main/jni/game_metadata.cpp index 489f862978..52d29ce3ff 100644 --- a/src/android/app/src/main/jni/game_metadata.cpp +++ b/src/android/app/src/main/jni/game_metadata.cpp @@ -75,7 +75,7 @@ RomMetadata GetRomMetadata(const std::string& path, bool reload = false) { extern "C" { -jboolean Java_org_suyu_suyu_1emu_utils_GameMetadata_getIsValid(JNIEnv* env, jobject obj, +jboolean Java_dev_suyu_suyu_1emu_utils_GameMetadata_getIsValid(JNIEnv* env, jobject obj, jstring jpath) { const auto file = EmulationSession::GetInstance().System().GetFilesystem()->OpenFile( Common::Android::GetJString(env, jpath), FileSys::OpenMode::Read); @@ -101,31 +101,31 @@ jboolean Java_org_suyu_suyu_1emu_utils_GameMetadata_getIsValid(JNIEnv* env, jobj return true; } -jstring Java_org_suyu_suyu_1emu_utils_GameMetadata_getTitle(JNIEnv* env, jobject obj, +jstring Java_dev_suyu_suyu_1emu_utils_GameMetadata_getTitle(JNIEnv* env, jobject obj, jstring jpath) { return Common::Android::ToJString( env, GetRomMetadata(Common::Android::GetJString(env, jpath)).title); } -jstring Java_org_suyu_suyu_1emu_utils_GameMetadata_getProgramId(JNIEnv* env, jobject obj, +jstring Java_dev_suyu_suyu_1emu_utils_GameMetadata_getProgramId(JNIEnv* env, jobject obj, jstring jpath) { return Common::Android::ToJString( env, std::to_string(GetRomMetadata(Common::Android::GetJString(env, jpath)).programId)); } -jstring Java_org_suyu_suyu_1emu_utils_GameMetadata_getDeveloper(JNIEnv* env, jobject obj, +jstring Java_dev_suyu_suyu_1emu_utils_GameMetadata_getDeveloper(JNIEnv* env, jobject obj, jstring jpath) { return Common::Android::ToJString( env, GetRomMetadata(Common::Android::GetJString(env, jpath)).developer); } -jstring Java_org_suyu_suyu_1emu_utils_GameMetadata_getVersion(JNIEnv* env, jobject obj, +jstring Java_dev_suyu_suyu_1emu_utils_GameMetadata_getVersion(JNIEnv* env, jobject obj, jstring jpath, jboolean jreload) { return Common::Android::ToJString( env, GetRomMetadata(Common::Android::GetJString(env, jpath), jreload).version); } -jbyteArray Java_org_suyu_suyu_1emu_utils_GameMetadata_getIcon(JNIEnv* env, jobject obj, +jbyteArray Java_dev_suyu_suyu_1emu_utils_GameMetadata_getIcon(JNIEnv* env, jobject obj, jstring jpath) { auto icon_data = GetRomMetadata(Common::Android::GetJString(env, jpath)).icon; jbyteArray icon = env->NewByteArray(static_cast(icon_data.size())); @@ -134,13 +134,13 @@ jbyteArray Java_org_suyu_suyu_1emu_utils_GameMetadata_getIcon(JNIEnv* env, jobje return icon; } -jboolean Java_org_suyu_suyu_1emu_utils_GameMetadata_getIsHomebrew(JNIEnv* env, jobject obj, +jboolean Java_dev_suyu_suyu_1emu_utils_GameMetadata_getIsHomebrew(JNIEnv* env, jobject obj, jstring jpath) { return static_cast( GetRomMetadata(Common::Android::GetJString(env, jpath)).isHomebrew); } -void Java_org_suyu_suyu_1emu_utils_GameMetadata_resetMetadata(JNIEnv* env, jobject obj) { +void Java_dev_suyu_suyu_1emu_utils_GameMetadata_resetMetadata(JNIEnv* env, jobject obj) { m_rom_metadata_cache.clear(); } diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 35ca93a78d..be8e36dbe3 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -435,24 +435,24 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath, extern "C" { -void Java_org_suyu_suyu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jobject instance, +void Java_dev_suyu_suyu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jobject instance, [[maybe_unused]] jobject surf) { EmulationSession::GetInstance().SetNativeWindow(ANativeWindow_fromSurface(env, surf)); EmulationSession::GetInstance().SurfaceChanged(); } -void Java_org_suyu_suyu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env, jobject instance) { +void Java_dev_suyu_suyu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env, jobject instance) { ANativeWindow_release(EmulationSession::GetInstance().NativeWindow()); EmulationSession::GetInstance().SetNativeWindow(nullptr); EmulationSession::GetInstance().SurfaceChanged(); } -void Java_org_suyu_suyu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject instance, +void Java_dev_suyu_suyu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject instance, [[maybe_unused]] jstring j_directory) { Common::FS::SetAppDirectory(Common::Android::GetJString(env, j_directory)); } -int Java_org_suyu_suyu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance, +int Java_dev_suyu_suyu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance, jstring j_file, jobject jcallback) { auto jlambdaClass = env->GetObjectClass(jcallback); auto jlambdaInvokeMethod = env->GetMethodID( @@ -470,7 +470,7 @@ int Java_org_suyu_suyu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject Common::Android::GetJString(env, j_file), callback)); } -jboolean Java_org_suyu_suyu_1emu_NativeLibrary_doesUpdateMatchProgram(JNIEnv* env, jobject jobj, +jboolean Java_dev_suyu_suyu_1emu_NativeLibrary_doesUpdateMatchProgram(JNIEnv* env, jobject jobj, jstring jprogramId, jstring jupdatePath) { u64 program_id = EmulationSession::GetProgramId(env, jprogramId); @@ -491,7 +491,7 @@ jboolean Java_org_suyu_suyu_1emu_NativeLibrary_doesUpdateMatchProgram(JNIEnv* en return false; } -void JNICALL Java_org_suyu_suyu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz, +void JNICALL Java_dev_suyu_suyu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz, jstring hook_lib_dir, jstring custom_driver_dir, jstring custom_driver_name, @@ -513,7 +513,7 @@ void JNICALL Java_org_suyu_suyu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* e return android_get_device_api_level() >= 28 && CheckKgslPresent(); } -jboolean JNICALL Java_org_suyu_suyu_1emu_utils_GpuDriverHelper_supportsCustomDriverLoading( +jboolean JNICALL Java_dev_suyu_suyu_1emu_utils_GpuDriverHelper_supportsCustomDriverLoading( JNIEnv* env, jobject instance) { #ifdef ARCHITECTURE_arm64 // If the KGSL device exists custom drivers can be loaded using adrenotools @@ -523,7 +523,7 @@ jboolean JNICALL Java_org_suyu_suyu_1emu_utils_GpuDriverHelper_supportsCustomDri #endif } -jobjectArray Java_org_suyu_suyu_1emu_utils_GpuDriverHelper_getSystemDriverInfo( +jobjectArray Java_dev_suyu_suyu_1emu_utils_GpuDriverHelper_getSystemDriverInfo( JNIEnv* env, jobject j_obj, jobject j_surf, jstring j_hook_lib_dir) { const char* file_redirect_dir_{}; int featureFlags{}; @@ -555,32 +555,32 @@ jobjectArray Java_org_suyu_suyu_1emu_utils_GpuDriverHelper_getSystemDriverInfo( return j_driver_info; } -jboolean Java_org_suyu_suyu_1emu_NativeLibrary_reloadKeys(JNIEnv* env, jclass clazz) { +jboolean Java_dev_suyu_suyu_1emu_NativeLibrary_reloadKeys(JNIEnv* env, jclass clazz) { Core::Crypto::KeyManager::Instance().ReloadKeys(); return static_cast(Core::Crypto::KeyManager::Instance().AreKeysLoaded()); } -void Java_org_suyu_suyu_1emu_NativeLibrary_unpauseEmulation(JNIEnv* env, jclass clazz) { +void Java_dev_suyu_suyu_1emu_NativeLibrary_unpauseEmulation(JNIEnv* env, jclass clazz) { EmulationSession::GetInstance().UnPauseEmulation(); } -void Java_org_suyu_suyu_1emu_NativeLibrary_pauseEmulation(JNIEnv* env, jclass clazz) { +void Java_dev_suyu_suyu_1emu_NativeLibrary_pauseEmulation(JNIEnv* env, jclass clazz) { EmulationSession::GetInstance().PauseEmulation(); } -void Java_org_suyu_suyu_1emu_NativeLibrary_stopEmulation(JNIEnv* env, jclass clazz) { +void Java_dev_suyu_suyu_1emu_NativeLibrary_stopEmulation(JNIEnv* env, jclass clazz) { EmulationSession::GetInstance().HaltEmulation(); } -jboolean Java_org_suyu_suyu_1emu_NativeLibrary_isRunning(JNIEnv* env, jclass clazz) { +jboolean Java_dev_suyu_suyu_1emu_NativeLibrary_isRunning(JNIEnv* env, jclass clazz) { return static_cast(EmulationSession::GetInstance().IsRunning()); } -jboolean Java_org_suyu_suyu_1emu_NativeLibrary_isPaused(JNIEnv* env, jclass clazz) { +jboolean Java_dev_suyu_suyu_1emu_NativeLibrary_isPaused(JNIEnv* env, jclass clazz) { return static_cast(EmulationSession::GetInstance().IsPaused()); } -void Java_org_suyu_suyu_1emu_NativeLibrary_initializeSystem(JNIEnv* env, jclass clazz, +void Java_dev_suyu_suyu_1emu_NativeLibrary_initializeSystem(JNIEnv* env, jclass clazz, jboolean reload) { // Initialize the emulated system. if (!reload) { @@ -589,7 +589,7 @@ void Java_org_suyu_suyu_1emu_NativeLibrary_initializeSystem(JNIEnv* env, jclass EmulationSession::GetInstance().InitializeSystem(reload); } -jdoubleArray Java_org_suyu_suyu_1emu_NativeLibrary_getPerfStats(JNIEnv* env, jclass clazz) { +jdoubleArray Java_dev_suyu_suyu_1emu_NativeLibrary_getPerfStats(JNIEnv* env, jclass clazz) { jdoubleArray j_stats = env->NewDoubleArray(4); if (EmulationSession::GetInstance().IsRunning()) { @@ -605,7 +605,7 @@ jdoubleArray Java_org_suyu_suyu_1emu_NativeLibrary_getPerfStats(JNIEnv* env, jcl return j_stats; } -jstring Java_org_suyu_suyu_1emu_NativeLibrary_getCpuBackend(JNIEnv* env, jclass clazz) { +jstring Java_dev_suyu_suyu_1emu_NativeLibrary_getCpuBackend(JNIEnv* env, jclass clazz) { if (Settings::IsNceEnabled()) { return Common::Android::ToJString(env, "NCE"); } @@ -613,21 +613,21 @@ jstring Java_org_suyu_suyu_1emu_NativeLibrary_getCpuBackend(JNIEnv* env, jclass return Common::Android::ToJString(env, "JIT"); } -jstring Java_org_suyu_suyu_1emu_NativeLibrary_getGpuDriver(JNIEnv* env, jobject jobj) { +jstring Java_dev_suyu_suyu_1emu_NativeLibrary_getGpuDriver(JNIEnv* env, jobject jobj) { return Common::Android::ToJString( env, EmulationSession::GetInstance().System().GPU().Renderer().GetDeviceVendor()); } -void Java_org_suyu_suyu_1emu_NativeLibrary_applySettings(JNIEnv* env, jobject jobj) { +void Java_dev_suyu_suyu_1emu_NativeLibrary_applySettings(JNIEnv* env, jobject jobj) { EmulationSession::GetInstance().System().ApplySettings(); EmulationSession::GetInstance().System().HIDCore().ReloadInputDevices(); } -void Java_org_suyu_suyu_1emu_NativeLibrary_logSettings(JNIEnv* env, jobject jobj) { +void Java_dev_suyu_suyu_1emu_NativeLibrary_logSettings(JNIEnv* env, jobject jobj) { Settings::LogSettings(); } -void Java_org_suyu_suyu_1emu_NativeLibrary_run(JNIEnv* env, jobject jobj, jstring j_path, +void Java_dev_suyu_suyu_1emu_NativeLibrary_run(JNIEnv* env, jobject jobj, jstring j_path, jint j_program_index, jboolean j_frontend_initiated) { const std::string path = Common::Android::GetJString(env, j_path); @@ -641,23 +641,23 @@ void Java_org_suyu_suyu_1emu_NativeLibrary_run(JNIEnv* env, jobject jobj, jstrin } } -void Java_org_suyu_suyu_1emu_NativeLibrary_logDeviceInfo(JNIEnv* env, jclass clazz) { +void Java_dev_suyu_suyu_1emu_NativeLibrary_logDeviceInfo(JNIEnv* env, jclass clazz) { LOG_INFO(Frontend, "suyu Version: {}-{}", Common::g_scm_branch, Common::g_scm_desc); LOG_INFO(Frontend, "Host OS: Android API level {}", android_get_device_api_level()); } -void Java_org_suyu_suyu_1emu_NativeLibrary_submitInlineKeyboardText(JNIEnv* env, jclass clazz, +void Java_dev_suyu_suyu_1emu_NativeLibrary_submitInlineKeyboardText(JNIEnv* env, jclass clazz, jstring j_text) { const std::u16string input = Common::UTF8ToUTF16(Common::Android::GetJString(env, j_text)); EmulationSession::GetInstance().SoftwareKeyboard()->SubmitInlineKeyboardText(input); } -void Java_org_suyu_suyu_1emu_NativeLibrary_submitInlineKeyboardInput(JNIEnv* env, jclass clazz, +void Java_dev_suyu_suyu_1emu_NativeLibrary_submitInlineKeyboardInput(JNIEnv* env, jclass clazz, jint j_key_code) { EmulationSession::GetInstance().SoftwareKeyboard()->SubmitInlineKeyboardInput(j_key_code); } -void Java_org_suyu_suyu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv* env, +void Java_dev_suyu_suyu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv* env, jobject instance) { const auto nand_dir = Common::FS::GetSuyuPath(Common::FS::SuyuPath::NANDDir); auto vfs_nand_dir = EmulationSession::GetInstance().System().GetFilesystem()->OpenDirectory( @@ -677,7 +677,7 @@ void Java_org_suyu_suyu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv* } } -jstring Java_org_suyu_suyu_1emu_NativeLibrary_getAppletLaunchPath(JNIEnv* env, jclass clazz, +jstring Java_dev_suyu_suyu_1emu_NativeLibrary_getAppletLaunchPath(JNIEnv* env, jclass clazz, jlong jid) { auto bis_system = EmulationSession::GetInstance().System().GetFileSystemController().GetSystemNANDContents(); @@ -694,18 +694,18 @@ jstring Java_org_suyu_suyu_1emu_NativeLibrary_getAppletLaunchPath(JNIEnv* env, j return Common::Android::ToJString(env, applet_nca->GetFullPath()); } -void Java_org_suyu_suyu_1emu_NativeLibrary_setCurrentAppletId(JNIEnv* env, jclass clazz, +void Java_dev_suyu_suyu_1emu_NativeLibrary_setCurrentAppletId(JNIEnv* env, jclass clazz, jint jappletId) { EmulationSession::GetInstance().SetAppletId(jappletId); } -void Java_org_suyu_suyu_1emu_NativeLibrary_setCabinetMode(JNIEnv* env, jclass clazz, +void Java_dev_suyu_suyu_1emu_NativeLibrary_setCabinetMode(JNIEnv* env, jclass clazz, jint jcabinetMode) { EmulationSession::GetInstance().System().GetFrontendAppletHolder().SetCabinetMode( static_cast(jcabinetMode)); } -jboolean Java_org_suyu_suyu_1emu_NativeLibrary_isFirmwareAvailable(JNIEnv* env, jclass clazz) { +jboolean Java_dev_suyu_suyu_1emu_NativeLibrary_isFirmwareAvailable(JNIEnv* env, jclass clazz) { auto bis_system = EmulationSession::GetInstance().System().GetFileSystemController().GetSystemNANDContents(); if (!bis_system) { @@ -721,7 +721,7 @@ jboolean Java_org_suyu_suyu_1emu_NativeLibrary_isFirmwareAvailable(JNIEnv* env, return true; } -jobjectArray Java_org_suyu_suyu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env, jobject jobj, +jobjectArray Java_dev_suyu_suyu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env, jobject jobj, jstring jpath, jstring jprogramId) { const auto path = Common::Android::GetJString(env, jpath); @@ -757,27 +757,27 @@ jobjectArray Java_org_suyu_suyu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env return jpatchArray; } -void Java_org_suyu_suyu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject jobj, +void Java_dev_suyu_suyu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject jobj, jstring jprogramId) { auto program_id = EmulationSession::GetProgramId(env, jprogramId); ContentManager::RemoveUpdate(EmulationSession::GetInstance().System().GetFileSystemController(), program_id); } -void Java_org_suyu_suyu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj, +void Java_dev_suyu_suyu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj, jstring jprogramId) { auto program_id = EmulationSession::GetProgramId(env, jprogramId); ContentManager::RemoveAllDLC(EmulationSession::GetInstance().System(), program_id); } -void Java_org_suyu_suyu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId, +void Java_dev_suyu_suyu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId, jstring jname) { auto program_id = EmulationSession::GetProgramId(env, jprogramId); ContentManager::RemoveMod(EmulationSession::GetInstance().System().GetFileSystemController(), program_id, Common::Android::GetJString(env, jname)); } -jobjectArray Java_org_suyu_suyu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, +jobjectArray Java_dev_suyu_suyu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, jobject jobj, jobject jcallback) { auto jlambdaClass = env->GetObjectClass(jcallback); @@ -801,7 +801,7 @@ jobjectArray Java_org_suyu_suyu_1emu_NativeLibrary_verifyInstalledContents(JNIEn return jresult; } -jint Java_org_suyu_suyu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobject jobj, +jint Java_dev_suyu_suyu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobject jobj, jstring jpath, jobject jcallback) { auto jlambdaClass = env->GetObjectClass(jcallback); auto jlambdaInvokeMethod = env->GetMethodID( @@ -817,7 +817,7 @@ jint Java_org_suyu_suyu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobje session.System(), Common::Android::GetJString(env, jpath), callback)); } -jstring Java_org_suyu_suyu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj, +jstring Java_dev_suyu_suyu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj, jstring jprogramId) { auto program_id = EmulationSession::GetProgramId(env, jprogramId); if (program_id == 0) { @@ -841,7 +841,7 @@ jstring Java_org_suyu_suyu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject j return Common::Android::ToJString(env, user_save_data_path); } -jstring Java_org_suyu_suyu_1emu_NativeLibrary_getDefaultProfileSaveDataRoot(JNIEnv* env, +jstring Java_dev_suyu_suyu_1emu_NativeLibrary_getDefaultProfileSaveDataRoot(JNIEnv* env, jobject jobj, jboolean jfuture) { Service::Account::ProfileManager manager; @@ -854,17 +854,17 @@ jstring Java_org_suyu_suyu_1emu_NativeLibrary_getDefaultProfileSaveDataRoot(JNIE return Common::Android::ToJString(env, user_save_data_root); } -void Java_org_suyu_suyu_1emu_NativeLibrary_addFileToFilesystemProvider(JNIEnv* env, jobject jobj, +void Java_dev_suyu_suyu_1emu_NativeLibrary_addFileToFilesystemProvider(JNIEnv* env, jobject jobj, jstring jpath) { EmulationSession::GetInstance().ConfigureFilesystemProvider( Common::Android::GetJString(env, jpath)); } -void Java_org_suyu_suyu_1emu_NativeLibrary_clearFilesystemProvider(JNIEnv* env, jobject jobj) { +void Java_dev_suyu_suyu_1emu_NativeLibrary_clearFilesystemProvider(JNIEnv* env, jobject jobj) { EmulationSession::GetInstance().GetContentProvider()->ClearAllEntries(); } -jboolean Java_org_suyu_suyu_1emu_NativeLibrary_areKeysPresent(JNIEnv* env, jobject jobj) { +jboolean Java_dev_suyu_suyu_1emu_NativeLibrary_areKeysPresent(JNIEnv* env, jobject jobj) { auto& system = EmulationSession::GetInstance().System(); system.GetFileSystemController().CreateFactories(*system.GetFilesystem()); return ContentManager::AreKeysPresent(); diff --git a/src/android/app/src/main/jni/native_config.cpp b/src/android/app/src/main/jni/native_config.cpp index 88282657f1..cad322297b 100644 --- a/src/android/app/src/main/jni/native_config.cpp +++ b/src/android/app/src/main/jni/native_config.cpp @@ -34,23 +34,23 @@ Settings::Setting* getSetting(JNIEnv* env, jstring jkey) { extern "C" { -void Java_org_suyu_suyu_1emu_utils_NativeConfig_initializeGlobalConfig(JNIEnv* env, jobject obj) { +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_initializeGlobalConfig(JNIEnv* env, jobject obj) { global_config = std::make_unique(); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_unloadGlobalConfig(JNIEnv* env, jobject obj) { +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_unloadGlobalConfig(JNIEnv* env, jobject obj) { global_config.reset(); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_reloadGlobalConfig(JNIEnv* env, jobject obj) { +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_reloadGlobalConfig(JNIEnv* env, jobject obj) { global_config->AndroidConfig::ReloadAllValues(); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_saveGlobalConfig(JNIEnv* env, jobject obj) { +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_saveGlobalConfig(JNIEnv* env, jobject obj) { global_config->AndroidConfig::SaveAllValues(); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_initializePerGameConfig(JNIEnv* env, jobject obj, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_initializePerGameConfig(JNIEnv* env, jobject obj, jstring jprogramId, jstring jfileName) { auto program_id = EmulationSession::GetProgramId(env, jprogramId); @@ -60,20 +60,20 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_initializePerGameConfig(JNIEnv* std::make_unique(config_file_name, Config::ConfigType::PerGameConfig); } -jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_isPerGameConfigLoaded(JNIEnv* env, +jboolean Java_dev_suyu_suyu_1emu_utils_NativeConfig_isPerGameConfigLoaded(JNIEnv* env, jobject obj) { return per_game_config != nullptr; } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_savePerGameConfig(JNIEnv* env, jobject obj) { +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_savePerGameConfig(JNIEnv* env, jobject obj) { per_game_config->AndroidConfig::SaveAllValues(); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_unloadPerGameConfig(JNIEnv* env, jobject obj) { +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_unloadPerGameConfig(JNIEnv* env, jobject obj) { per_game_config.reset(); } -jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_getBoolean(JNIEnv* env, jobject obj, +jboolean Java_dev_suyu_suyu_1emu_utils_NativeConfig_getBoolean(JNIEnv* env, jobject obj, jstring jkey, jboolean needGlobal) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -82,7 +82,7 @@ jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_getBoolean(JNIEnv* env, jobj return setting->GetValue(static_cast(needGlobal)); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setBoolean(JNIEnv* env, jobject obj, jstring jkey, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setBoolean(JNIEnv* env, jobject obj, jstring jkey, jboolean value) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -91,7 +91,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setBoolean(JNIEnv* env, jobject setting->SetValue(static_cast(value)); } -jbyte Java_org_suyu_suyu_1emu_utils_NativeConfig_getByte(JNIEnv* env, jobject obj, jstring jkey, +jbyte Java_dev_suyu_suyu_1emu_utils_NativeConfig_getByte(JNIEnv* env, jobject obj, jstring jkey, jboolean needGlobal) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -100,7 +100,7 @@ jbyte Java_org_suyu_suyu_1emu_utils_NativeConfig_getByte(JNIEnv* env, jobject ob return setting->GetValue(static_cast(needGlobal)); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setByte(JNIEnv* env, jobject obj, jstring jkey, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setByte(JNIEnv* env, jobject obj, jstring jkey, jbyte value) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -109,7 +109,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setByte(JNIEnv* env, jobject obj setting->SetValue(value); } -jshort Java_org_suyu_suyu_1emu_utils_NativeConfig_getShort(JNIEnv* env, jobject obj, jstring jkey, +jshort Java_dev_suyu_suyu_1emu_utils_NativeConfig_getShort(JNIEnv* env, jobject obj, jstring jkey, jboolean needGlobal) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -118,7 +118,7 @@ jshort Java_org_suyu_suyu_1emu_utils_NativeConfig_getShort(JNIEnv* env, jobject return setting->GetValue(static_cast(needGlobal)); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setShort(JNIEnv* env, jobject obj, jstring jkey, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setShort(JNIEnv* env, jobject obj, jstring jkey, jshort value) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -127,7 +127,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setShort(JNIEnv* env, jobject ob setting->SetValue(value); } -jint Java_org_suyu_suyu_1emu_utils_NativeConfig_getInt(JNIEnv* env, jobject obj, jstring jkey, +jint Java_dev_suyu_suyu_1emu_utils_NativeConfig_getInt(JNIEnv* env, jobject obj, jstring jkey, jboolean needGlobal) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -136,7 +136,7 @@ jint Java_org_suyu_suyu_1emu_utils_NativeConfig_getInt(JNIEnv* env, jobject obj, return setting->GetValue(needGlobal); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setInt(JNIEnv* env, jobject obj, jstring jkey, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setInt(JNIEnv* env, jobject obj, jstring jkey, jint value) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -145,7 +145,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setInt(JNIEnv* env, jobject obj, setting->SetValue(value); } -jfloat Java_org_suyu_suyu_1emu_utils_NativeConfig_getFloat(JNIEnv* env, jobject obj, jstring jkey, +jfloat Java_dev_suyu_suyu_1emu_utils_NativeConfig_getFloat(JNIEnv* env, jobject obj, jstring jkey, jboolean needGlobal) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -154,7 +154,7 @@ jfloat Java_org_suyu_suyu_1emu_utils_NativeConfig_getFloat(JNIEnv* env, jobject return setting->GetValue(static_cast(needGlobal)); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setFloat(JNIEnv* env, jobject obj, jstring jkey, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setFloat(JNIEnv* env, jobject obj, jstring jkey, jfloat value) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -163,7 +163,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setFloat(JNIEnv* env, jobject ob setting->SetValue(value); } -jlong Java_org_suyu_suyu_1emu_utils_NativeConfig_getLong(JNIEnv* env, jobject obj, jstring jkey, +jlong Java_dev_suyu_suyu_1emu_utils_NativeConfig_getLong(JNIEnv* env, jobject obj, jstring jkey, jboolean needGlobal) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -172,7 +172,7 @@ jlong Java_org_suyu_suyu_1emu_utils_NativeConfig_getLong(JNIEnv* env, jobject ob return setting->GetValue(static_cast(needGlobal)); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setLong(JNIEnv* env, jobject obj, jstring jkey, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setLong(JNIEnv* env, jobject obj, jstring jkey, jlong value) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -181,7 +181,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setLong(JNIEnv* env, jobject obj setting->SetValue(value); } -jstring Java_org_suyu_suyu_1emu_utils_NativeConfig_getString(JNIEnv* env, jobject obj, jstring jkey, +jstring Java_dev_suyu_suyu_1emu_utils_NativeConfig_getString(JNIEnv* env, jobject obj, jstring jkey, jboolean needGlobal) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -190,7 +190,7 @@ jstring Java_org_suyu_suyu_1emu_utils_NativeConfig_getString(JNIEnv* env, jobjec return Common::Android::ToJString(env, setting->GetValue(static_cast(needGlobal))); } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setString(JNIEnv* env, jobject obj, jstring jkey, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setString(JNIEnv* env, jobject obj, jstring jkey, jstring value) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -200,7 +200,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setString(JNIEnv* env, jobject o setting->SetValue(Common::Android::GetJString(env, value)); } -jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_getIsRuntimeModifiable(JNIEnv* env, jobject obj, +jboolean Java_dev_suyu_suyu_1emu_utils_NativeConfig_getIsRuntimeModifiable(JNIEnv* env, jobject obj, jstring jkey) { auto setting = getSetting(env, jkey); if (setting != nullptr) { @@ -209,7 +209,7 @@ jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_getIsRuntimeModifiable(JNIEn return true; } -jstring Java_org_suyu_suyu_1emu_utils_NativeConfig_getPairedSettingKey(JNIEnv* env, jobject obj, +jstring Java_dev_suyu_suyu_1emu_utils_NativeConfig_getPairedSettingKey(JNIEnv* env, jobject obj, jstring jkey) { auto setting = getSetting(env, jkey); if (setting == nullptr) { @@ -222,7 +222,7 @@ jstring Java_org_suyu_suyu_1emu_utils_NativeConfig_getPairedSettingKey(JNIEnv* e return Common::Android::ToJString(env, setting->PairedSetting()->GetLabel()); } -jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_getIsSwitchable(JNIEnv* env, jobject obj, +jboolean Java_dev_suyu_suyu_1emu_utils_NativeConfig_getIsSwitchable(JNIEnv* env, jobject obj, jstring jkey) { auto setting = getSetting(env, jkey); if (setting != nullptr) { @@ -231,7 +231,7 @@ jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_getIsSwitchable(JNIEnv* env, return false; } -jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_usingGlobal(JNIEnv* env, jobject obj, +jboolean Java_dev_suyu_suyu_1emu_utils_NativeConfig_usingGlobal(JNIEnv* env, jobject obj, jstring jkey) { auto setting = getSetting(env, jkey); if (setting != nullptr) { @@ -240,7 +240,7 @@ jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_usingGlobal(JNIEnv* env, job return true; } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setGlobal(JNIEnv* env, jobject obj, jstring jkey, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setGlobal(JNIEnv* env, jobject obj, jstring jkey, jboolean global) { auto setting = getSetting(env, jkey); if (setting != nullptr) { @@ -248,7 +248,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setGlobal(JNIEnv* env, jobject o } } -jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_getIsSaveable(JNIEnv* env, jobject obj, +jboolean Java_dev_suyu_suyu_1emu_utils_NativeConfig_getIsSaveable(JNIEnv* env, jobject obj, jstring jkey) { auto setting = getSetting(env, jkey); if (setting != nullptr) { @@ -257,7 +257,7 @@ jboolean Java_org_suyu_suyu_1emu_utils_NativeConfig_getIsSaveable(JNIEnv* env, j return false; } -jstring Java_org_suyu_suyu_1emu_utils_NativeConfig_getDefaultToString(JNIEnv* env, jobject obj, +jstring Java_dev_suyu_suyu_1emu_utils_NativeConfig_getDefaultToString(JNIEnv* env, jobject obj, jstring jkey) { auto setting = getSetting(env, jkey); if (setting != nullptr) { @@ -266,7 +266,7 @@ jstring Java_org_suyu_suyu_1emu_utils_NativeConfig_getDefaultToString(JNIEnv* en return Common::Android::ToJString(env, ""); } -jobjectArray Java_org_suyu_suyu_1emu_utils_NativeConfig_getGameDirs(JNIEnv* env, jobject obj) { +jobjectArray Java_dev_suyu_suyu_1emu_utils_NativeConfig_getGameDirs(JNIEnv* env, jobject obj) { jclass gameDirClass = Common::Android::GetGameDirClass(); jmethodID gameDirConstructor = Common::Android::GetGameDirConstructor(); jobjectArray jgameDirArray = @@ -281,7 +281,7 @@ jobjectArray Java_org_suyu_suyu_1emu_utils_NativeConfig_getGameDirs(JNIEnv* env, return jgameDirArray; } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setGameDirs(JNIEnv* env, jobject obj, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setGameDirs(JNIEnv* env, jobject obj, jobjectArray gameDirs) { AndroidSettings::values.game_dirs.clear(); int size = env->GetArrayLength(gameDirs); @@ -304,7 +304,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setGameDirs(JNIEnv* env, jobject } } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_addGameDir(JNIEnv* env, jobject obj, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_addGameDir(JNIEnv* env, jobject obj, jobject gameDir) { jclass gameDirClass = Common::Android::GetGameDirClass(); jfieldID uriStringField = env->GetFieldID(gameDirClass, "uriString", "Ljava/lang/String;"); @@ -317,7 +317,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_addGameDir(JNIEnv* env, jobject AndroidSettings::GameDir{uriString, static_cast(jdeepScanBoolean)}); } -jobjectArray Java_org_suyu_suyu_1emu_utils_NativeConfig_getDisabledAddons(JNIEnv* env, jobject obj, +jobjectArray Java_dev_suyu_suyu_1emu_utils_NativeConfig_getDisabledAddons(JNIEnv* env, jobject obj, jstring jprogramId) { auto program_id = EmulationSession::GetProgramId(env, jprogramId); auto& disabledAddons = Settings::values.disabled_addons[program_id]; @@ -331,7 +331,7 @@ jobjectArray Java_org_suyu_suyu_1emu_utils_NativeConfig_getDisabledAddons(JNIEnv return jdisabledAddonsArray; } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setDisabledAddons(JNIEnv* env, jobject obj, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setDisabledAddons(JNIEnv* env, jobject obj, jstring jprogramId, jobjectArray jdisabledAddons) { auto program_id = EmulationSession::GetProgramId(env, jprogramId); @@ -345,7 +345,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setDisabledAddons(JNIEnv* env, j Settings::values.disabled_addons[program_id] = disabled_addons; } -jobjectArray Java_org_suyu_suyu_1emu_utils_NativeConfig_getOverlayControlData(JNIEnv* env, +jobjectArray Java_dev_suyu_suyu_1emu_utils_NativeConfig_getOverlayControlData(JNIEnv* env, jobject obj) { jobjectArray joverlayControlDataArray = env->NewObjectArray(AndroidSettings::values.overlay_control_data.size(), @@ -375,7 +375,7 @@ jobjectArray Java_org_suyu_suyu_1emu_utils_NativeConfig_getOverlayControlData(JN return joverlayControlDataArray; } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setOverlayControlData( +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setOverlayControlData( JNIEnv* env, jobject obj, jobjectArray joverlayControlDataArray) { AndroidSettings::values.overlay_control_data.clear(); int size = env->GetArrayLength(joverlayControlDataArray); @@ -424,7 +424,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setOverlayControlData( } } -jobjectArray Java_org_suyu_suyu_1emu_utils_NativeConfig_getInputSettings(JNIEnv* env, jobject obj, +jobjectArray Java_dev_suyu_suyu_1emu_utils_NativeConfig_getInputSettings(JNIEnv* env, jobject obj, jboolean j_global) { Settings::values.players.SetGlobal(static_cast(j_global)); auto& players = Settings::values.players.GetValue(); @@ -474,7 +474,7 @@ jobjectArray Java_org_suyu_suyu_1emu_utils_NativeConfig_getInputSettings(JNIEnv* return j_input_settings; } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_setInputSettings(JNIEnv* env, jobject obj, +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_setInputSettings(JNIEnv* env, jobject obj, jobjectArray j_value, jboolean j_global) { auto& players = Settings::values.players.GetValue(static_cast(j_global)); @@ -530,7 +530,7 @@ void Java_org_suyu_suyu_1emu_utils_NativeConfig_setInputSettings(JNIEnv* env, jo } } -void Java_org_suyu_suyu_1emu_utils_NativeConfig_saveControlPlayerValues(JNIEnv* env, jobject obj) { +void Java_dev_suyu_suyu_1emu_utils_NativeConfig_saveControlPlayerValues(JNIEnv* env, jobject obj) { Settings::values.players.SetGlobal(false); // Clear all controls from the config in case the user reverted back to globals diff --git a/src/android/app/src/main/jni/native_input.cpp b/src/android/app/src/main/jni/native_input.cpp index 5f83c3fe1b..d3523eb30d 100644 --- a/src/android/app/src/main/jni/native_input.cpp +++ b/src/android/app/src/main/jni/native_input.cpp @@ -186,24 +186,24 @@ void ConnectController(size_t player_index, bool connected) { extern "C" { -jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_isHandheldOnly(JNIEnv* env, +jboolean Java_dev_suyu_suyu_1emu_features_input_NativeInput_isHandheldOnly(JNIEnv* env, jobject j_obj) { return IsHandheldOnly(); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onGamePadButtonEvent( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onGamePadButtonEvent( JNIEnv* env, jobject j_obj, jstring j_guid, jint j_port, jint j_button_id, jint j_action) { EmulationSession::GetInstance().GetInputSubsystem().GetAndroid()->SetButtonState( Common::Android::GetJString(env, j_guid), j_port, j_button_id, j_action != 0); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onGamePadAxisEvent( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onGamePadAxisEvent( JNIEnv* env, jobject j_obj, jstring j_guid, jint j_port, jint j_stick_id, jfloat j_value) { EmulationSession::GetInstance().GetInputSubsystem().GetAndroid()->SetAxisPosition( Common::Android::GetJString(env, j_guid), j_port, j_stick_id, j_value); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onGamePadMotionEvent( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onGamePadMotionEvent( JNIEnv* env, jobject j_obj, jstring j_guid, jint j_port, jlong j_delta_timestamp, jfloat j_x_gyro, jfloat j_y_gyro, jfloat j_z_gyro, jfloat j_x_accel, jfloat j_y_accel, jfloat j_z_accel) { @@ -212,7 +212,7 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_onGamePadMotionEvent( j_z_gyro, j_x_accel, j_y_accel, j_z_accel); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onReadNfcTag(JNIEnv* env, jobject j_obj, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onReadNfcTag(JNIEnv* env, jobject j_obj, jbyteArray j_data) { jboolean isCopy{false}; std::span data(reinterpret_cast(env->GetByteArrayElements(j_data, &isCopy)), @@ -223,13 +223,13 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_onReadNfcTag(JNIEnv* env } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onRemoveNfcTag(JNIEnv* env, jobject j_obj) { +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onRemoveNfcTag(JNIEnv* env, jobject j_obj) { if (EmulationSession::GetInstance().IsRunning()) { EmulationSession::GetInstance().GetInputSubsystem().GetVirtualAmiibo()->CloseAmiibo(); } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onTouchPressed(JNIEnv* env, jobject j_obj, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onTouchPressed(JNIEnv* env, jobject j_obj, jint j_id, jfloat j_x_axis, jfloat j_y_axis) { if (EmulationSession::GetInstance().IsRunning()) { @@ -237,7 +237,7 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_onTouchPressed(JNIEnv* e } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onTouchMoved(JNIEnv* env, jobject j_obj, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onTouchMoved(JNIEnv* env, jobject j_obj, jint j_id, jfloat j_x_axis, jfloat j_y_axis) { if (EmulationSession::GetInstance().IsRunning()) { @@ -245,14 +245,14 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_onTouchMoved(JNIEnv* env } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onTouchReleased(JNIEnv* env, jobject j_obj, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onTouchReleased(JNIEnv* env, jobject j_obj, jint j_id) { if (EmulationSession::GetInstance().IsRunning()) { EmulationSession::GetInstance().Window().OnTouchReleased(j_id); } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onOverlayButtonEventImpl( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onOverlayButtonEventImpl( JNIEnv* env, jobject j_obj, jint j_port, jint j_button_id, jint j_action) { if (EmulationSession::GetInstance().IsRunning()) { EmulationSession::GetInstance().GetInputSubsystem().GetVirtualGamepad()->SetButtonState( @@ -260,7 +260,7 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_onOverlayButtonEventImpl } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onOverlayJoystickEventImpl( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onOverlayJoystickEventImpl( JNIEnv* env, jobject j_obj, jint j_port, jint j_stick_id, jfloat j_x_axis, jfloat j_y_axis) { if (EmulationSession::GetInstance().IsRunning()) { EmulationSession::GetInstance().GetInputSubsystem().GetVirtualGamepad()->SetStickPosition( @@ -268,7 +268,7 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_onOverlayJoystickEventIm } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_onDeviceMotionEvent( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_onDeviceMotionEvent( JNIEnv* env, jobject j_obj, jint j_port, jlong j_delta_timestamp, jfloat j_x_gyro, jfloat j_y_gyro, jfloat j_z_gyro, jfloat j_x_accel, jfloat j_y_accel, jfloat j_z_accel) { if (EmulationSession::GetInstance().IsRunning()) { @@ -278,18 +278,18 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_onDeviceMotionEvent( } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_reloadInputDevices(JNIEnv* env, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_reloadInputDevices(JNIEnv* env, jobject j_obj) { EmulationSession::GetInstance().System().HIDCore().ReloadInputDevices(); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_registerController(JNIEnv* env, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_registerController(JNIEnv* env, jobject j_obj, jobject j_device) { EmulationSession::GetInstance().GetInputSubsystem().GetAndroid()->RegisterController(j_device); } -jobjectArray Java_org_suyu_suyu_1emu_features_input_NativeInput_getInputDevices(JNIEnv* env, +jobjectArray Java_dev_suyu_suyu_1emu_features_input_NativeInput_getInputDevices(JNIEnv* env, jobject j_obj) { auto devices = EmulationSession::GetInstance().GetInputSubsystem().GetInputDevices(); jobjectArray jdevices = env->NewObjectArray(devices.size(), Common::Android::GetStringClass(), @@ -301,7 +301,7 @@ jobjectArray Java_org_suyu_suyu_1emu_features_input_NativeInput_getInputDevices( return jdevices; } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_loadInputProfiles(JNIEnv* env, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_loadInputProfiles(JNIEnv* env, jobject j_obj) { map_profiles.clear(); const auto input_profile_loc = @@ -327,7 +327,7 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_loadInputProfiles(JNIEnv } } -jobjectArray Java_org_suyu_suyu_1emu_features_input_NativeInput_getInputProfileNames( +jobjectArray Java_dev_suyu_suyu_1emu_features_input_NativeInput_getInputProfileNames( JNIEnv* env, jobject j_obj) { std::vector profile_names; profile_names.reserve(map_profiles.size()); @@ -357,14 +357,14 @@ jobjectArray Java_org_suyu_suyu_1emu_features_input_NativeInput_getInputProfileN return j_profile_names; } -jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_isProfileNameValid(JNIEnv* env, +jboolean Java_dev_suyu_suyu_1emu_features_input_NativeInput_isProfileNameValid(JNIEnv* env, jobject j_obj, jstring j_name) { return Common::Android::GetJString(env, j_name).find_first_of("<>:;\"/\\|,.!?*") == std::string::npos; } -jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_createProfile(JNIEnv* env, +jboolean Java_dev_suyu_suyu_1emu_features_input_NativeInput_createProfile(JNIEnv* env, jobject j_obj, jstring j_name, jint j_player_index) { @@ -380,7 +380,7 @@ jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_createProfile(JNIEnv return SaveProfile(profile_name, j_player_index); } -jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_deleteProfile(JNIEnv* env, +jboolean Java_dev_suyu_suyu_1emu_features_input_NativeInput_deleteProfile(JNIEnv* env, jobject j_obj, jstring j_name, jint j_player_index) { @@ -398,21 +398,21 @@ jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_deleteProfile(JNIEnv return !ProfileExistsInMap(profile_name) && !ProfileExistsInFilesystem(profile_name); } -jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_loadProfile(JNIEnv* env, jobject j_obj, +jboolean Java_dev_suyu_suyu_1emu_features_input_NativeInput_loadProfile(JNIEnv* env, jobject j_obj, jstring j_name, jint j_player_index) { auto profile_name = Common::Android::GetJString(env, j_name); return LoadProfile(profile_name, j_player_index); } -jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_saveProfile(JNIEnv* env, jobject j_obj, +jboolean Java_dev_suyu_suyu_1emu_features_input_NativeInput_saveProfile(JNIEnv* env, jobject j_obj, jstring j_name, jint j_player_index) { auto profile_name = Common::Android::GetJString(env, j_name); return SaveProfile(profile_name, j_player_index); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_loadPerGameConfiguration( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_loadPerGameConfiguration( JNIEnv* env, jobject j_obj, jint j_player_index, jint j_selected_index, jstring j_selected_profile_name) { static constexpr size_t HANDHELD_INDEX = 8; @@ -460,23 +460,23 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_loadPerGameConfiguration handheld_controller->ReloadFromSettings(); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_beginMapping(JNIEnv* env, jobject j_obj, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_beginMapping(JNIEnv* env, jobject j_obj, jint jtype) { EmulationSession::GetInstance().GetInputSubsystem().BeginMapping( static_cast(jtype)); } -jstring Java_org_suyu_suyu_1emu_features_input_NativeInput_getNextInput(JNIEnv* env, +jstring Java_dev_suyu_suyu_1emu_features_input_NativeInput_getNextInput(JNIEnv* env, jobject j_obj) { return Common::Android::ToJString( env, EmulationSession::GetInstance().GetInputSubsystem().GetNextInput().Serialize()); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_stopMapping(JNIEnv* env, jobject j_obj) { +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_stopMapping(JNIEnv* env, jobject j_obj) { EmulationSession::GetInstance().GetInputSubsystem().StopMapping(); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_updateMappingsWithDefaultImpl( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_updateMappingsWithDefaultImpl( JNIEnv* env, jobject j_obj, jint j_player_index, jstring j_device_params, jstring j_display_name) { auto& input_subsystem = EmulationSession::GetInstance().GetInputSubsystem(); @@ -516,7 +516,7 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_updateMappingsWithDefaul } } -jstring Java_org_suyu_suyu_1emu_features_input_NativeInput_getButtonParamImpl(JNIEnv* env, +jstring Java_dev_suyu_suyu_1emu_features_input_NativeInput_getButtonParamImpl(JNIEnv* env, jobject j_obj, jint j_player_index, jint j_button) { @@ -528,7 +528,7 @@ jstring Java_org_suyu_suyu_1emu_features_input_NativeInput_getButtonParamImpl(JN .Serialize()); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_setButtonParamImpl( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_setButtonParamImpl( JNIEnv* env, jobject j_obj, jint j_player_index, jint j_button_id, jstring j_param) { ApplyControllerConfig(j_player_index, [&](Core::HID::EmulatedController* controller) { controller->SetButtonParam(j_button_id, @@ -536,7 +536,7 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_setButtonParamImpl( }); } -jstring Java_org_suyu_suyu_1emu_features_input_NativeInput_getStickParamImpl(JNIEnv* env, +jstring Java_dev_suyu_suyu_1emu_features_input_NativeInput_getStickParamImpl(JNIEnv* env, jobject j_obj, jint j_player_index, jint j_stick) { @@ -548,7 +548,7 @@ jstring Java_org_suyu_suyu_1emu_features_input_NativeInput_getStickParamImpl(JNI .Serialize()); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_setStickParamImpl( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_setStickParamImpl( JNIEnv* env, jobject j_obj, jint j_player_index, jint j_stick_id, jstring j_param) { ApplyControllerConfig(j_player_index, [&](Core::HID::EmulatedController* controller) { controller->SetStickParam(j_stick_id, @@ -556,14 +556,14 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_setStickParamImpl( }); } -jint Java_org_suyu_suyu_1emu_features_input_NativeInput_getButtonNameImpl(JNIEnv* env, +jint Java_dev_suyu_suyu_1emu_features_input_NativeInput_getButtonNameImpl(JNIEnv* env, jobject j_obj, jstring j_param) { return static_cast(EmulationSession::GetInstance().GetInputSubsystem().GetButtonName( Common::ParamPackage(Common::Android::GetJString(env, j_param)))); } -jintArray Java_org_suyu_suyu_1emu_features_input_NativeInput_getSupportedStyleTagsImpl( +jintArray Java_dev_suyu_suyu_1emu_features_input_NativeInput_getSupportedStyleTagsImpl( JNIEnv* env, jobject j_obj, jint j_player_index) { auto supported_styles = GetSupportedStyles(j_player_index); jintArray j_supported_indexes = env->NewIntArray(supported_styles.size()); @@ -572,7 +572,7 @@ jintArray Java_org_suyu_suyu_1emu_features_input_NativeInput_getSupportedStyleTa return j_supported_indexes; } -jint Java_org_suyu_suyu_1emu_features_input_NativeInput_getStyleIndexImpl(JNIEnv* env, +jint Java_dev_suyu_suyu_1emu_features_input_NativeInput_getStyleIndexImpl(JNIEnv* env, jobject j_obj, jint j_player_index) { return static_cast(EmulationSession::GetInstance() @@ -582,7 +582,7 @@ jint Java_org_suyu_suyu_1emu_features_input_NativeInput_getStyleIndexImpl(JNIEnv ->GetNpadStyleIndex(true)); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_setStyleIndexImpl(JNIEnv* env, +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_setStyleIndexImpl(JNIEnv* env, jobject j_obj, jint j_player_index, jint j_style_index) { @@ -599,14 +599,14 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_setStyleIndexImpl(JNIEnv } } -jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_isControllerImpl(JNIEnv* env, +jboolean Java_dev_suyu_suyu_1emu_features_input_NativeInput_isControllerImpl(JNIEnv* env, jobject j_obj, jstring jparams) { return static_cast(EmulationSession::GetInstance().GetInputSubsystem().IsController( Common::ParamPackage(Common::Android::GetJString(env, jparams)))); } -jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_getIsConnected(JNIEnv* env, +jboolean Java_dev_suyu_suyu_1emu_features_input_NativeInput_getIsConnected(JNIEnv* env, jobject j_obj, jint j_player_index) { auto& hid_core = EmulationSession::GetInstance().System().HIDCore(); @@ -618,7 +618,7 @@ jboolean Java_org_suyu_suyu_1emu_features_input_NativeInput_getIsConnected(JNIEn return controller->IsConnected(true); } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_connectControllersImpl( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_connectControllersImpl( JNIEnv* env, jobject j_obj, jbooleanArray j_connected) { jboolean isCopy = false; auto j_connected_array_size = env->GetArrayLength(j_connected); @@ -628,7 +628,7 @@ void Java_org_suyu_suyu_1emu_features_input_NativeInput_connectControllersImpl( } } -void Java_org_suyu_suyu_1emu_features_input_NativeInput_resetControllerMappings( +void Java_dev_suyu_suyu_1emu_features_input_NativeInput_resetControllerMappings( JNIEnv* env, jobject j_obj, jint j_player_index) { // Clear all previous mappings for (int button_id = 0; button_id < Settings::NativeButton::NumButtons; ++button_id) { diff --git a/src/android/app/src/main/jni/native_log.cpp b/src/android/app/src/main/jni/native_log.cpp index e1f74d4701..29a33119e6 100644 --- a/src/android/app/src/main/jni/native_log.cpp +++ b/src/android/app/src/main/jni/native_log.cpp @@ -7,23 +7,23 @@ extern "C" { -void Java_org_suyu_suyu_1emu_utils_Log_debug(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_dev_suyu_suyu_1emu_utils_Log_debug(JNIEnv* env, jobject obj, jstring jmessage) { LOG_DEBUG(Frontend, "{}", Common::Android::GetJString(env, jmessage)); } -void Java_org_suyu_suyu_1emu_utils_Log_warning(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_dev_suyu_suyu_1emu_utils_Log_warning(JNIEnv* env, jobject obj, jstring jmessage) { LOG_WARNING(Frontend, "{}", Common::Android::GetJString(env, jmessage)); } -void Java_org_suyu_suyu_1emu_utils_Log_info(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_dev_suyu_suyu_1emu_utils_Log_info(JNIEnv* env, jobject obj, jstring jmessage) { LOG_INFO(Frontend, "{}", Common::Android::GetJString(env, jmessage)); } -void Java_org_suyu_suyu_1emu_utils_Log_error(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_dev_suyu_suyu_1emu_utils_Log_error(JNIEnv* env, jobject obj, jstring jmessage) { LOG_ERROR(Frontend, "{}", Common::Android::GetJString(env, jmessage)); } -void Java_org_suyu_suyu_1emu_utils_Log_critical(JNIEnv* env, jobject obj, jstring jmessage) { +void Java_dev_suyu_suyu_1emu_utils_Log_critical(JNIEnv* env, jobject obj, jstring jmessage) { LOG_CRITICAL(Frontend, "{}", Common::Android::GetJString(env, jmessage)); } diff --git a/src/android/app/src/main/res/layout/fragment_emulation.xml b/src/android/app/src/main/res/layout/fragment_emulation.xml index fb56b3c9d8..e43e9fe208 100644 --- a/src/android/app/src/main/res/layout/fragment_emulation.xml +++ b/src/android/app/src/main/res/layout/fragment_emulation.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:keepScreenOn="true" android:defaultFocusHighlightEnabled="false" - tools:context="org.suyu.suyu_emu.fragments.EmulationFragment" + tools:context="dev.suyu.suyu_emu.fragments.EmulationFragment" tools:openDrawer="start"> - - + app:argType="dev.suyu.suyu_emu.features.settings.model.Settings$MenuTag" /> + app:argType="dev.suyu.suyu_emu.features.settings.model.Settings$MenuTag" /> + app:argType="dev.suyu.suyu_emu.model.Game" /> @@ -157,19 +157,19 @@ app:destination="@id/perGamePropertiesFragment" /> + app:argType="dev.suyu.suyu_emu.model.Game" /> + app:argType="dev.suyu.suyu_emu.model.Game" /> diff --git a/src/android/app/src/main/res/navigation/settings_navigation.xml b/src/android/app/src/main/res/navigation/settings_navigation.xml index 94ba7b61a6..31993fb171 100644 --- a/src/android/app/src/main/res/navigation/settings_navigation.xml +++ b/src/android/app/src/main/res/navigation/settings_navigation.xml @@ -6,14 +6,14 @@ + app:argType="dev.suyu.suyu_emu.features.settings.model.Settings$MenuTag" /> diff --git a/src/android/app/src/main/res/values-ar/strings.xml b/src/android/app/src/main/res/values-ar/strings.xml index 2eacae1d5c..6717a3527a 100644 --- a/src/android/app/src/main/res/values-ar/strings.xml +++ b/src/android/app/src/main/res/values-ar/strings.xml @@ -34,7 +34,7 @@ يسمح لـ يوزو بملء قائمة الألعاب تخطي تحديد مجلد الألعاب؟ لن يتم عرض الألعاب في قائمة الألعاب إذا لم يتم تحديد مجلد - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games البحث عن ألعاب إعدادات البحث تم تحديد مجلد الألعاب @@ -42,7 +42,7 @@ مطلوب لفك تشفير ألعاب البيع بالتجزئة تخطي إضافة المفاتيح؟ مطلوب مفاتيح صالحة لمحاكاة ألعاب البيع بالتجزئة. ستعمل تطبيقات البيرة المنزلية فقط إذا تابعت - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction الإشعارات امنح إذن الإشعار باستخدام الزر أدناه منح الإذن @@ -63,7 +63,7 @@ وحاول مرة أخر keys تحقق من أن ملف المفاتيح له امتداد وحاول مرة أخر bin تحقق من أن ملف المفاتيح له امتداد مفاتيح التشفير غير صالحة - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys الملف المحدد غير صحيح أو تالف. يرجى إعادة المفاتيح الخاصة بك GPU مدير برنامج تشغيل GPU تثبيت برنامج تشغيل @@ -107,7 +107,7 @@ لا يُسمح بتثبيت الألعاب الأساسية لتجنب التعارضات المحتملة. %1$d تم التثبيت بنجاح %1$d تمت الكتابة فوقه بنجاح - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates برامج التشغيل المخصصة غير مدعومة تحميل برنامج التشغيل المخصص غير معتمد حاليًا لهذا الجهاز.\nحدد هذا الخيار مرة أخرى في المستقبل لمعرفة ما إذا تمت إضافة الدعم! إدارة بيانات يوزو @@ -150,7 +150,7 @@ تم استيراد بيانات المستخدم بنجاح تم إلغاء التصدير https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu diff --git a/src/android/app/src/main/res/values-ckb/strings.xml b/src/android/app/src/main/res/values-ckb/strings.xml index bb630f934a..510b33bcad 100644 --- a/src/android/app/src/main/res/values-ckb/strings.xml +++ b/src/android/app/src/main/res/values-ckb/strings.xml @@ -1,7 +1,7 @@ - ئەم نەرمەکاڵایە یارییەکانی کۆنسۆلی نینتێندۆ سویچ کارپێدەکات. هیچ ناونیشانێکی یاری و کلیلی تێدا نییە..<br /><br />پێش ئەوەی دەست پێ بکەیت، تکایە شوێنی فایلی prod.keys ]]> دیاریبکە لە نێو کۆگای ئامێرەکەت.<br /><br />زیاتر فێربە]]> + ئەم نەرمەکاڵایە یارییەکانی کۆنسۆلی نینتێندۆ سویچ کارپێدەکات. هیچ ناونیشانێکی یاری و کلیلی تێدا نییە..<br /><br />پێش ئەوەی دەست پێ بکەیت، تکایە شوێنی فایلی prod.keys ]]> دیاریبکە لە نێو کۆگای ئامێرەکەت.<br /><br />زیاتر فێربە]]> ئاگاداری و هەڵەکان ئاگادارکردنەوەکان پیشان دەدات کاتێک شتێک بە هەڵەدا دەچێت. مۆڵەتی ئاگادارکردنەوە نەدراوە! @@ -32,14 +32,14 @@ ڕێگە بە یوزو دەدات بۆ پڕکردنەوەی لیستی یارییەکان هەڵبژاردنی فۆڵدەری یارییەکان تێپەڕدەکەیت؟ یارییەکان لە لیستی یارییەکاندا پیشان نادرێن ئەگەر فۆڵدەرێک هەڵنەبژێردرێت. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games گەڕان بەدوای یارییەکاندا ناونیشانی یارییەکان هەڵبژێردرا دابمەزرێنە prod.keys پێویستە بۆ کۆدکردنەوەى یارییە تاکەکەسییەکان زیادکردنی کلیلەکان تێپەڕدەکەیت؟ کلیلی دروست پێویستە بۆ وەرگرتنی یارییەکانی تاکەکەسی. تەنها ئەپەکانی homebrew کاردەکەن ئەگەر بەردەوام بیت. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction ئاگادارکردنەوەکان بە دوگمەی خوارەوە مۆڵەتی ئاگادارکردنەوەکە بدە. مۆڵەت بدە @@ -60,7 +60,7 @@ دڵنیابەوە کە فایلی کلیلەکانت درێژکراوەی .keys ی هەیە و دووبارە هەوڵبدەرەوە. دڵنیابە کە فایلی کلیلەکانت درێژکراوەی .bin ی هەیە و دووبارە هەوڵبدەرەوە. کلیلی کۆدکردنی نادروستە - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys فایلە هەڵبژێردراوەکە هەڵەیە یان تێکچووە. تکایە دووبارە کلیلەکانت دەربێنەوە. دامەزراندنی وەگەڕخەری GPU دامەزراندنی وەگەڕخەری بەدیل بۆ ئەوەی بە ئەگەرێکی زۆرەوە کارایی باشتر یان وردبینی هەبێت @@ -94,8 +94,8 @@ هیچ فایلێکی لۆگ نەدۆزراوە دامەزراندنی ناوەڕۆکی یاری دامەزراندنی نوێکاری یارییەکان یان DLC - https://suyu-emu.org/help/quickstart/#dumping-installed-updates - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-decryption-keys گایا ڕاستەقینە نییە @@ -107,7 +107,7 @@ ئەو پڕۆژانەی کە یوزوی بۆ ئەندرۆید ڕەخساند بونیات https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -246,7 +246,7 @@ وەشان ڕۆمەکەت کۆدکراوە - prod.keys فایلەکەت بۆ ئەوەی بتوانرێت یارییەکان کۆد بکرێنەوە.]]> + prod.keys فایلەکەت بۆ ئەوەی بتوانرێت یارییەکان کۆد بکرێنەوە.]]> هەڵەیەک لە دەستپێکردنی ناوەکی ڤیدیۆکەدا ڕوویدا ئەمەش بەزۆری بەهۆی وەگەڕخەرێکی ناتەبای GPU ەوەیە. دامەزراندنی وەگەڕخەری GPU ی تایبەتمەندکراو لەوانەیە ئەم کێشەیە چارەسەر بکات. ناتوانرێت ڕۆم باربکرێت diff --git a/src/android/app/src/main/res/values-cs/strings.xml b/src/android/app/src/main/res/values-cs/strings.xml index 6d09b552cd..4318d89afd 100644 --- a/src/android/app/src/main/res/values-cs/strings.xml +++ b/src/android/app/src/main/res/values-cs/strings.xml @@ -26,10 +26,10 @@ Hledat a filtrovat hry Vybrat složku s hrami Spravovat složky s hrami - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Instalovat prod.keys Přeskočit přidávání klíčů? - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Oznámení Udělit oprávnění Přeskočit udělení oprávnění k oznámení? @@ -47,7 +47,7 @@ Klíče úspěšně nainstalovány Chyba při čtení šifrovacích klíčů Neplatné šifrovací klíče - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Správce ovladače GPU Instalovat GPU ovladač Pokročilé nastavení @@ -97,7 +97,7 @@ Uživatelská data byla úspěšně importována. Export zrušen https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu https://play.google.com/store/apps/details?id=org.suyu.suyu_emu.ea diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml index 8a69115433..b74c08c6ce 100644 --- a/src/android/app/src/main/res/values-de/strings.xml +++ b/src/android/app/src/main/res/values-de/strings.xml @@ -1,7 +1,7 @@ - Diese Software kann Spiele für die Nintendo Switch abspielen. Keine Spiele oder Spielekeys sind enthalten.<br /><br />Bevor du beginnst, bitte halte deine prod.keys ]]> auf deinem Gerät bereit. .<br /><br />Mehr Infos]]> + Diese Software kann Spiele für die Nintendo Switch abspielen. Keine Spiele oder Spielekeys sind enthalten.<br /><br />Bevor du beginnst, bitte halte deine prod.keys ]]> auf deinem Gerät bereit. .<br /><br />Mehr Infos]]> Hinweise und Fehler Zeigt Benachrichtigungen an, wenn etwas schief läuft. Berechtigung für Benachrichtigungen nicht erlaubt! @@ -35,7 +35,7 @@ Erlaubt suyu die Spieleliste zu füllen Auswahl des Spieleverzeichnisses überspringen? Spiele werden in der Spieleliste nicht angezeigt, wenn kein Ordner ausgewählt ist. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Spiele suchen Einstellungen suchen Spieleverzeichnis ausgewählt @@ -43,7 +43,7 @@ Zum Entschlüsseln von Spielen benötigt Hinzufügen der Schlüssel überspringen? Für die Emulation von Spielen sind gültige Schlüssel erforderlich. Wenn du fortfährst, funktionieren nur Homebrew-Anwendungen. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Benachrichtigungen Erteile mit dem Knopf unten die Berechtigung, Benachrichtigungen zu senden. Berechtigung erteilen @@ -63,7 +63,7 @@ Überprüfen Sie, ob Ihre Schlüsseldatei die Erweiterung \".keys\" hat, und versuchen Sie es erneut. Überprüfen Sie, ob Ihre Schlüsseldatei die Erweiterung \".bin\" hat, und versuchen Sie es erneut. Ungültige Schlüssel - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Die ausgewählte Datei ist falsch oder beschädigt. Bitte kopieren Sie Ihre Schlüssel erneut. GPU-Treiber Verwaltung GPU-Treiber installieren @@ -108,12 +108,12 @@ Wirklich fortfahren? %1$d Installationsfehler %1$d erfolgreich installiert %1$d erfolgreich überschrieben - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates suyu-Daten Verwalten Speicherdaten teilen Spiele-Ordner Spiele-Ordner hinzufügen - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Firmware nicht installiert @@ -132,7 +132,7 @@ Wirklich fortfahren? Nutzerdaten erfolgreich importiert Export abgebrochen https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -319,7 +319,7 @@ Wirklich fortfahren? Integritätsüberprüfung konnte nicht durchgeführt werden Das ROM ist verschlüsselt - prod.keys Datei installiert ist, damit Spiele entschlüsselt werden können.]]> + prod.keys Datei installiert ist, damit Spiele entschlüsselt werden können.]]> Bei der Initialisierung des Videokerns ist ein Fehler aufgetreten Dies wird normalerweise durch einen inkompatiblen GPU-Treiber verursacht. Die Installation eines passenden GPU-Treibers kann dieses Problem beheben. ROM konnte nicht geladen werden diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml index ebe05df24a..7262bff489 100644 --- a/src/android/app/src/main/res/values-es/strings.xml +++ b/src/android/app/src/main/res/values-es/strings.xml @@ -1,7 +1,7 @@ - Este software ejecuta juegos para la videoconsola Nintendo Switch. Los videojuegos o claves no vienen incluidos.<br /><br />Antes de empezar, por favor, localice el archivo prod.keys ]]>en el almacenamiento de su dispositivo..<br /><br />Saber más]]> + Este software ejecuta juegos para la videoconsola Nintendo Switch. Los videojuegos o claves no vienen incluidos.<br /><br />Antes de empezar, por favor, localice el archivo prod.keys ]]>en el almacenamiento de su dispositivo..<br /><br />Saber más]]> Avisos y errores Mostrar notificaciones cuándo algo vaya mal. ¡Permisos de notificación no concedidos! @@ -35,7 +35,7 @@ Permite que suyu llene la lista de juegos ¿Omitir la selección de la carpeta de juegos? No se mostrará ningún juego si no se ha seleccionado una carpeta de juegos. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Buscar juegos Buscar configuración Directorio de juegos seleccionado @@ -43,7 +43,7 @@ Requerido para descifrar juegos ¿Omitir agregar claves? Se requieren claves válidas para emular juegos. Solo las aplicaciones homebrew funcionarán si continúas. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Notificaciones Otorga el permiso de notificación con el botón de abajo. Conceder permiso @@ -64,7 +64,7 @@ Compruebe que el archivo de claves tenga una extensión .keys y pruebe otra vez. Compruebe que el archivo de claves tenga una extensión .bin y pruebe otra vez. Claves de cifrado no válidas - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys El archivo seleccionado es incorrecto o está corrupto. Vuelva a redumpear sus claves. Explorador de drivers de GPU Instalar driver de GPU @@ -114,7 +114,7 @@ Contenido(s) de juego instalado/s con éxito %1$d instalado con éxito %1$d sobreescrito con éxito - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates Drivers personalizados no soportados En estos momentos, la carga de drivers personalizados no está disponible para este dispositivo..\n¡Comprueba esta opción en el futuro para ver si ya está añadido el soporte a ese dispositivo! Administrar datos de suyu @@ -141,14 +141,14 @@ Comprueba todo el contenido instalado por si hubiese alguno corrupto Faltan las claves de encriptación El firmware y los juegos no se pueden desencriptar - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Ejecutador de applet Ejecutar applets de sistema usando el firmware instalado Firmware no instalado Applet no disponible - prod.keys y el firmware estén instalados e inténtelo de nuevo.]]> + prod.keys y el firmware estén instalados e inténtelo de nuevo.]]> Álbum Ver las imágenes que están en la carpeta \"screenshots\" del usuario con el visor de fotos del sistema Editor de Mii @@ -181,7 +181,7 @@ Exportación cancelada Asegúrese de que las carpetas de datos de usuario estén en la raíz de la carpeta del zip y contengan un archivo config en config/config.ini e inténtelo de nuevo. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -410,8 +410,8 @@ Su ROM está encriptada - cartuchos de juegos o títulos instalados.]]> - prod.keys está instalado, para que los juegos sean descifrados.]]> + cartuchos de juegos o títulos instalados.]]> + prod.keys está instalado, para que los juegos sean descifrados.]]> Ocurrió un error al inicializar el núcleo de video, posiblemente debido a una incompatibilidad con el driver seleccionado Esto suele deberse a un driver de GPU incompatible. La instalación de un controlador de GPU personalizado puede resolver este problema. No se pudo cargar la ROM diff --git a/src/android/app/src/main/res/values-fa/strings.xml b/src/android/app/src/main/res/values-fa/strings.xml index 8112b8a853..884e9e4334 100644 --- a/src/android/app/src/main/res/values-fa/strings.xml +++ b/src/android/app/src/main/res/values-fa/strings.xml @@ -35,7 +35,7 @@ به suyu اجازه می دهد تا لیست باز‌ی‌ها را پر کند از انتخاب پوشه بازی رد می‌شوید؟ اگر پوشه‌ای انتخاب نشده باشد، بازی‌ها در لیست بازی‌ها نمایش داده نمی‌شوند. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games جستجو در بازی‌ها جستجو در تنظیمات پوشه بازی‌ها انتخاب شد @@ -43,7 +43,7 @@ برای رمزگشایی بازی‌های فروشگاهی مورد نیاز است افزودن کلیدها را رد می‌کنید؟ کلیدهای معتبر برای شبیه‌سازی بازی‌های فروشگاهی مورد نیاز است. اگر ادامه دهید، فقط برنامه‌های سیستم ریزکامپیوتری کار خواهند کرد. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction اعلان‌ها مجوز اعلان را با دکمه زیر اعطا کنید. اجازه بدهید @@ -64,7 +64,7 @@ بررسی کنید که فایل کلیدهای شما دارای پسوند keys. باشد و دوباره امتحان کنید. بررسی کنید که فایل کلیدهای شما دارای پسوند bin. باشد و دوباره امتحان کنید. کلیدهای رمزگذاری نامعتبر - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys فایل انتخابی نادرست یا خراب است. لطفا کلیدهای خود را دوباره استخراج کنید. مدیریت درایور پردازنده گرافیکی نصب درایور پردازنده گرافیکی @@ -114,7 +114,7 @@ محتوا(های) بازی با موفقیت نصب شد %1$dبا موفقیت نصب شد %1$dبا موفقیت بازنویسی شد - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates درایورهای سفارشی پشتیبانی نمی‌شوند بارگیری درایور سفارشی در حال حاضر برای این دستگاه پشتیبانی نمی‌شود.\nاین گزینه را دوباره در آینده بررسی کنید تا ببینید آیا پشتیبانی اضافه شده است یا خیر! مدیریت داده‌های suyu @@ -139,14 +139,14 @@ تمام محتوای نصب شده را از نظر خرابی بررسی می‌کند کلیدهای رمزگذاری وجود ندارند ثابت‌افزار و بازی‌های فروشگاهی قابل رمزگشایی نیستند - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys اجراکننده برنامک برنامک‌های سیستم را با استفاده از ثابت‌افزار نصب شده راه اندازی کنید ثابت‌افزار نصب نیست برنامک در دسترس نیست - prod.keys و ثابت‌افزار شما نصب شده است و دوباره امتحان کنید.]]> + prod.keys و ثابت‌افزار شما نصب شده است و دوباره امتحان کنید.]]> آلبوم تصاویر ذخیره شده در پوشه اسکرین شات‌های کاربر را با نمایشگر عکس سیستم مشاهده کنید ویرایش Mii @@ -179,7 +179,7 @@ صدور لغو شد مطمئن شوید که پوشه‌های داده کاربر در ریشه پوشه zip و حاوی یک فایل پیکربندی در config/config.ini هستند سپس دوباره امتحان کنید. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -410,7 +410,7 @@ رام شما رمزگذاری شده است - کارتیج‌های بازی یا عناوین نصب شده خود را استخراج کنید.]]> + کارتیج‌های بازی یا عناوین نصب شده خود را استخراج کنید.]]> در راه‌اندازی اولیه هسته ویدیو خطایی رخ داد این مورد معمولاً توسط یک درایور گرافیکی ناسازگار ایجاد می‌شود. نصب درایور گرافیکی سفارشی ممکن است این مشکل را حل کند. diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml index f98ea6a35f..34bfd2cb79 100644 --- a/src/android/app/src/main/res/values-fr/strings.xml +++ b/src/android/app/src/main/res/values-fr/strings.xml @@ -1,7 +1,7 @@ - Ce logiciel exécutera des jeux pour la console de jeu Nintendo Switch. Aucun jeux ou clés n\'est inclus.<br /><br />Avant de commencer, veuillez localiser votre fichier prod.keys ]]> sur le stockage de votre appareil.<br /><br />En savoir plus]]> + Ce logiciel exécutera des jeux pour la console de jeu Nintendo Switch. Aucun jeux ou clés n\'est inclus.<br /><br />Avant de commencer, veuillez localiser votre fichier prod.keys ]]> sur le stockage de votre appareil.<br /><br />En savoir plus]]> Avis et erreurs Affiche des notifications en cas de problème. Permission de notification non accordée ! @@ -35,7 +35,7 @@ Permet à suyu de remplir la liste des jeux Ne pas sélectionner le dossier des jeux ? Les jeux ne seront pas affichés dans la liste des jeux si aucun dossier n\'est sélectionné. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Rechercher des jeux Rechercher un paramètre Répertoire de jeux sélectionné @@ -43,7 +43,7 @@ Nécessaire pour décrypter les jeux commerciaux. Sauter l\'ajout des clés ? Des clés valides sont nécessaires pour émuler des jeux commerciaux. Seules les applications homebrew fonctionneront si vous continuez. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Notifications Accorder la permission de notification avec le bouton ci-dessous. Accorder la permission @@ -64,7 +64,7 @@ Vérifiez que votre fichier de clés a une extension .keys et réessayez. Vérifiez que votre fichier de clés a une extension .bin et réessayez. Clés de chiffrement invalides - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Le fichier sélectionné est incorrect ou corrompu. Veuillez dumper à nouveau vos clés. Gestionnaire de pilotes du GPU Installer le pilote du GPU @@ -114,7 +114,7 @@ Contenu du jeu installé avec succès %1$d installé avec succès %1$d écrasé avec succès - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates Pilotes personnalisés non supporté Le chargement des pilotes personnalisés ne sont pas actuellement pris en charge pour ce périphérique. Vérifiez à nouveau cette option à l\'avenir pour voir si la prise en charge a été ajoutée ! Gérer les données de suyu @@ -141,14 +141,14 @@ Vérifie l\'intégrité des contenus installés Les clés de chiffrement sont manquantes. Le firmware et les jeux commerciaux ne peuvent pas être déchiffrés - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Lanceur d\'applets Lancer des applets système en utilisant le firmware installé Firmware non installé Applet non disponible - prod.keys et le firmware sont installés et essayez à nouveau.]]> + prod.keys et le firmware sont installés et essayez à nouveau.]]> Album Afficher les images stockées dans le dossier de captures d\'écran de l\'utilisateur avec le visualiseur de photos système. Éditeur Mii @@ -181,7 +181,7 @@ Exportation annulée Assurez-vous que les dossiers de données utilisateur se trouvent à la racine du dossier ZIP et contiennent un fichier de configuration à config/config.ini, puis réessayez. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -460,8 +460,8 @@ Votre ROM est cryptée - cartouches de jeu ou de vos titres installés.]]> - prod.keys est installé pour que les jeux puissent être déchiffrés.]]> + cartouches de jeu ou de vos titres installés.]]> + prod.keys est installé pour que les jeux puissent être déchiffrés.]]> Une erreur s\'est produite lors de l\'initialisation du noyau vidéo Cela est généralement dû à un pilote GPU incompatible. L\'installation d\'un pilote GPU personnalisé peut résoudre ce problème. Impossible de charger la ROM diff --git a/src/android/app/src/main/res/values-he/strings.xml b/src/android/app/src/main/res/values-he/strings.xml index f1087d6131..ee8be05463 100644 --- a/src/android/app/src/main/res/values-he/strings.xml +++ b/src/android/app/src/main/res/values-he/strings.xml @@ -1,7 +1,7 @@ - התוכנה תריץ משחקים לקונסולת ה Nintendo Switch. אף משחק או קבצים בעלי זכויות יוצרים נכללים.<br /><br /> לפני שאת/ה מתחיל בבקשה מצא את קובץ prod.keys]]> על המכשיר.<br /><br />קרא עוד]]> + התוכנה תריץ משחקים לקונסולת ה Nintendo Switch. אף משחק או קבצים בעלי זכויות יוצרים נכללים.<br /><br /> לפני שאת/ה מתחיל בבקשה מצא את קובץ prod.keys]]> על המכשיר.<br /><br />קרא עוד]]> התראות ותקלות מציג התראות כאשר משהו הולך לא כשורה. הרשאות התראות לא ניתנה! @@ -35,7 +35,7 @@ אפשר ל suyu לאכלס את רשימת המשחקים לדלג על בחירת תיקיית המשחקים? משחקים לא יוצגו ברשימת המשחקים אם לנבחרה תיקיית משחקים. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games חפש משחקים חפש בהגדרות ספריית משחקים נבחרה @@ -43,7 +43,7 @@ הכרחי בכדי לפענח משחקים לדלג על הוספת מפתחות? מפתחות חוקיים הכרחיים כדי לשחק במשחקים. רק אפליקציות פירטיות יפעלו אם תמשיך. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction התראות תן גישה להתראות עם הכפתור למטה. תן הרשאה @@ -64,7 +64,7 @@ ודא שלקובץ המפתחות שלך יש סיומת של key. ונסה/י שוב. ודא/י שלקובץ המפתחות שלך יש סיומת של bin. ונסה/י שוב. מפתחות הצפנה לא חוקיים - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys קבוץ שנבחר מושחת או לא נכון. בבקשה הוצא מחדש את המפתחות שלך. מנהל הדרייברים של המעבד הגרפי התקן דרייבר למעבד הגרפי @@ -114,7 +114,7 @@ תוכן (או תכני) המשחק הותקנו בהצלחה %1$d הותקן בהצלחה %1$d נדרס/נכתב מעל בהצלחה - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates דרייברים מותאמים אישית לא נתמכים הטענת דרייבים מותאמים אישית לא נתמך כרגע על מכשיר זה. \nבבקשה בדוק אופציה זו בעתיד בכדי לראות אם נוספה תמיכה! נהל את המידע של suyu @@ -126,14 +126,14 @@ הוסף תיקיית משחקים התיקייה הזו נוספה כבר! מאפייני תיקיית משחקים - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys משגר Applet מערכת שיגור Applet משתמשת בתוכנה המותקנת ה Firmware לא מותקן Applet לא זמין - prod.keysו firmwareשלך מותקנים ונסה שוב.]]> + prod.keysו firmwareשלך מותקנים ונסה שוב.]]> אלבום צפה בתמונות השמורות בתיקיית צילומי המסך של המשתמש בעזרת מציג התמונות של המערכת עורך Mii @@ -166,7 +166,7 @@ ייצוא בוטל ודא שנתוני המשתמש נמצאים בשורש קובץ ה zip ושהוא מכיל קובץ סידור ב config/config.ini ונסה שוב. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -325,8 +325,8 @@ אימות התקינות הצליח! המשחק שלך מוצפן - כרטיסי המשחקאו הכותרות המותקנות שלך.]]> - prod.keys מותקן כך שניתן יהיה לפענח משחקים.]]> + כרטיסי המשחקאו הכותרות המותקנות שלך.]]> + prod.keys מותקן כך שניתן יהיה לפענח משחקים.]]> התרחשה בעיה באתחול של ליבת הווידאו זה בדרך כלל נגרם על ידי דרייבר לא מתאים עבור המעבד הגרפי. התקנת דרייבר אשר מתאים למעבד הגרפי יכול לפתור את הבעיה הזו. אין אפשרות לטעון את המשחק diff --git a/src/android/app/src/main/res/values-hu/strings.xml b/src/android/app/src/main/res/values-hu/strings.xml index 098d65f9fa..61d44a91fe 100644 --- a/src/android/app/src/main/res/values-hu/strings.xml +++ b/src/android/app/src/main/res/values-hu/strings.xml @@ -1,7 +1,7 @@ - Ez a szoftver Nintendo Switch játékkonzolhoz készült játékokat futtat. Nem tartalmaz játékokat vagy kulcsokat. .<br /><br />Mielőtt hozzákezdenél, kérjük, válaszd ki a prod.keys]]> fájl helyét a készülék tárhelyén<br /><br />Tudj meg többet]]> + Ez a szoftver Nintendo Switch játékkonzolhoz készült játékokat futtat. Nem tartalmaz játékokat vagy kulcsokat. .<br /><br />Mielőtt hozzákezdenél, kérjük, válaszd ki a prod.keys]]> fájl helyét a készülék tárhelyén<br /><br />Tudj meg többet]]> Megjegyzések és hibák Értesítések megjelenítése, ha valami rosszul sül el. Nincs engedély az értesítés megjelenítéséhez! @@ -34,7 +34,7 @@ Játékmappák kezelése Kihagyod a játékok mappa kiválasztását? A játékok nem jelennek meg a Játékok listában, ha egy mappa nincs kijelölve. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Játékok keresése Beállítások keresése Játékok könyvtár kiválasztva @@ -42,7 +42,7 @@ Kiskereskedelmi játékok dekódolásához szükséges Kihagyod a kulcsok hozzáadását? A kiskereskedelmi játékok emulálásához érvényes kulcsokra van szükség. Csak a homebrew alkalmazások fognak működni, ha folytatod. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Értesítések Értesítési engedélyek megadása az alábbi gombbal. Engedély megadása @@ -63,7 +63,7 @@ Győződj meg róla, hogy a titkosító fájlod .keys kiterjesztéssel rendelkezik, majd próbáld újra. Győződj meg róla, hogy a titkosító fájlod .bin kiterjesztéssel rendelkezik, majd próbáld újra. Érvénytelen titkosítókulcsok - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys A kiválasztott fájl helytelen, vagy sérült. Állíts össze egy új kulcsot. GPU illesztőprogram-kezelő GPU illesztőprogram telepítése @@ -112,7 +112,7 @@ Játéktartalom sikeresen telepítve %1$d sikeresen telepítve %1$d sikeresen felülírva - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates Egyéni illesztőprogramok nem támogatottak Egyéni illesztőprogram telepítése jelenleg nem támogatott ezen az eszközön.\nNézz vissza később, hátha hozzáadtuk a támogatását! suyu adatok kezelése @@ -137,14 +137,14 @@ A telepített tartalom épségét ellenőrzi Hiányzó titkosítókulcsok A Firmware és a kiskereskedelmi (retail) játékok nem dekódolhatók - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Applet indító Rendszer appletek indítása a telepített firmware-rel Firmware nincs telepítve Applet nem elérhető - prod.keys fájl és a firmware telepítve van, majd próbáld újra.]]> + prod.keys fájl és a firmware telepítve van, majd próbáld újra.]]> Album Képernyőképek megtekintése a rendszer fényképnézegetőjével Mii szerkesztés @@ -176,7 +176,7 @@ Exportálás megszakítva Ellenőrizd, hogy a felhasználói adatok mappái a zip mappa gyökerében vannak, és tartalmaznak egy konfig fájlt a config/config.ini címen, majd próbáld meg újra. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -448,7 +448,7 @@ ROM titkosítva - prod.keys fájl telepítve van, hogy a játékok visszafejthetők legyenek.]]> + prod.keys fájl telepítve van, hogy a játékok visszafejthetők legyenek.]]> Hiba lépett fel a videómag inicializása során Ezt általában egy nem kompatibilis GPU illesztő okozza. Egyéni GPU illesztőprogram telepítése megoldhatja a problémát. Nem sikerült betölteni a ROM-ot 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 c8437b45c1..b80ceb837b 100644 --- a/src/android/app/src/main/res/values-id/strings.xml +++ b/src/android/app/src/main/res/values-id/strings.xml @@ -1,7 +1,7 @@ - Perangkat lunak ini akan menjalankan game untuk konsol game Nintendo Switch. Tidak ada judul game atau kunci yang disertakan.<br /><br />Sebelum memulai, harap cari file prod.keys ]]> di penyimpanan perangkat anda. <br /><br /> Selengkapnya ]]> + Perangkat lunak ini akan menjalankan game untuk konsol game Nintendo Switch. Tidak ada judul game atau kunci yang disertakan.<br /><br />Sebelum memulai, harap cari file prod.keys ]]> di penyimpanan perangkat anda. <br /><br /> Selengkapnya ]]> Pemberitahuan dan error Menampilkan pemberitahuan ketika terjadi kesalahan. Izin notifikasi tidak diberikan! @@ -35,7 +35,7 @@ Izinkan suyu mengisi daftar game Lewati pemilihan folder game? Game tidak akan muncul di list jika tidak ada folder yang dipilih. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Cari permainan Cari pengaturan Direktori game sudah terpilih @@ -43,7 +43,7 @@ Diperlukan untuk mendekripsi game retail Lewati penginstalan keys? Perlu keys yang valid untuk meng-emulate game retail. Hanya homebrew apps yang akan berfungsi jika kamu melanjutkan. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Notifikasi Berikan izin notifikasi dengan tombol di bawah ini. Berikan izin @@ -64,7 +64,7 @@ Pastikan file keys anda memiliki format .keys dan coba lagi. Pastikan file keys anda memiliki format .bin dan coba lagi. Keys enkripsi tidak valid - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys File yang dipilih salah atau rusak. Silakan masukkan kembali kunci Anda. Manajer driver GPU Install driver GPU @@ -114,7 +114,7 @@ Konten(-konten) game sudah berhasil terinstal. %1$d telah berhasil terinstal %1$d telah berhasil ditimpa. - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/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 Suyu. @@ -137,7 +137,7 @@ Memeriksa semua konten yang terinstal dari kerusakan Kunci enkripsi hilang Firmware dan game retail tidak dapat didekripsi - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Luncurkan applet @@ -177,7 +177,7 @@ Ekspor Dibatalkan Pastikan folder data pengguna berada di akar folder zip dan berisi file konfigurasi di config/config.ini dan coba lagi. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -402,8 +402,8 @@ ROM-mu ter-enkripsi - kartu permainan atau judul yang terinstal.]]> - prod.keys diinstal sehingga game dapat didekripsi.]]> + kartu permainan atau judul yang terinstal.]]> + prod.keys diinstal sehingga game dapat didekripsi.]]> Terjadi kesalahan ketika menginisialisasi inti video. Hal ini biasanya disebabkan oleh driver GPU yang tidak kompatibel. Menginstal driver GPU khusus dapat mengatasi masalah ini Tidak Dapat Memuat ROM 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 10552f1504..7a923d2fc3 100644 --- a/src/android/app/src/main/res/values-it/strings.xml +++ b/src/android/app/src/main/res/values-it/strings.xml @@ -1,7 +1,7 @@ - Questo software permette di giocare ai giochi della console Nintendo Switch. Nessun gioco o chiave è inclusa.<br /><br />Prima di iniziare, perfavore individua il file prod.keys ]]> nella memoria del tuo dispositivo.<br /><br />Scopri di più]]> + Questo software permette di giocare ai giochi della console Nintendo Switch. Nessun gioco o chiave è inclusa.<br /><br />Prima di iniziare, perfavore individua il file prod.keys ]]> nella memoria del tuo dispositivo.<br /><br />Scopri di più]]> Avvisi ed errori Mostra le notifiche quando qualcosa va storto. Autorizzazione di notifica non concessa! @@ -35,7 +35,7 @@ Consente a suyu di popolare l\'elenco dei giochi Saltare la selezione della cartella dei giochi? I giochi non saranno mostrati nella lista dei giochi se una cartella non è selezionata. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Cerca giochi Cerca impostazione Cartella dei giochi selezionata @@ -43,7 +43,7 @@ Necessario per decrittografare i giochi Saltare l\'aggiunta delle chiavi? Sono necessarie delle chiavi valide per emulare i giochi. Se continui, funzioneranno solo le app homebrew. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Notifiche Concedi l\'autorizzazione alle notifiche con il pulsante in basso. Concedere l\'autorizzazione @@ -64,7 +64,7 @@ Controlla che le tue chiavi abbiano l\'estensione .keys e prova di nuovo. Controlla che le tue chiavi abbiano l\'estensione .bin e prova di nuovo Chiavi di crittografia non valide - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Il file selezionato è incorretto o corrotto. Per favore riesegui il dump delle tue chiavi. Gestore driver GPU Installa i driver GPU @@ -114,7 +114,7 @@ Contenuto/i di gioco installato/i con successo. %1$dinstallato con successo. %1$dsovrascritto con successo - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/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 Suyu @@ -129,14 +129,14 @@ Nessun salvataggio trovato Verifica i contenuti installati Verifica l\'integrità di tutti i contenuti installati. - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Avvia applet Avvia applet di sistema usando il firmware installato Firmware non installato Applet non disponibile - prod.keys e il firmware siano installati e riprova.]]> + prod.keys e il firmware siano installati e riprova.]]> Album Visualizza le immagini salvate nella cartella screenshots dell\'utente con il visualizzatore immagini di sistema Modifica Mii @@ -169,7 +169,7 @@ Esportazione annullata Assicurati che la cartella dei Dati dell\'utente stiano nella radice del file.zip e che sia presente una cartella config in config/config.ini, poi, riprova. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -364,8 +364,8 @@ L\'integrità dei contenuti non è stata validata La tua ROM è criptata - dump delle tue cartucce di giocooppure dei titoli già installati.]]> - prod.keys sia installato in modo che i giochi possano essere decrittati.]]> + dump delle tue cartucce di giocooppure dei titoli già installati.]]> + prod.keys sia installato in modo che i giochi possano essere decrittati.]]> È stato riscontrato un errore nell\'inizializzazione del core video Questo è causato solitamente dal driver incompatibile di una GPU. L\'installazione di driver GPU personalizzati potrebbe risolvere questo problema. Impossibile caricare la ROM diff --git a/src/android/app/src/main/res/values-ja/strings.xml b/src/android/app/src/main/res/values-ja/strings.xml index 21e2070e31..5294298faa 100644 --- a/src/android/app/src/main/res/values-ja/strings.xml +++ b/src/android/app/src/main/res/values-ja/strings.xml @@ -1,7 +1,7 @@ - このソフトウェアでは、Nintendo Switchのゲームを実行できます。 ゲームソフトやキーは含まれません。<br /><br />事前に、 prod.keys ]]> ファイルをストレージに配置しておいてください。<br /><br />詳細]]> + このソフトウェアでは、Nintendo Switchのゲームを実行できます。 ゲームソフトやキーは含まれません。<br /><br />事前に、 prod.keys ]]> ファイルをストレージに配置しておいてください。<br /><br />詳細]]> 通知とエラー 問題の発生時に通知を表示します。 通知が許可されていません! @@ -34,7 +34,7 @@ ゲームをsuyuのゲームリストに追加します ゲームフォルダの選択をスキップしますか? フォルダを選択しないと、ゲームがリストに表示されません。 - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games ゲームを検索 設定を検索 フォルダを選択しました @@ -42,7 +42,7 @@ 製品版ゲームの復号化に必要です キーの追加をスキップしますか？ 製品版ゲームのエミュレーションには、有効なキーが必要です。続行すると自作アプリしか機能しません。 - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction 通知 下のボタンで通知を許可してください。 許可 @@ -63,7 +63,7 @@ キーの拡張子が.keysであることを確認し、再度お試しください。 キーの拡張子が.binであることを確認し、再度お試しください。 暗号化キーが無効 - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys ファイルが間違っているか破損しています。キーを再ダンプしてください。 GPUドライバーの管理 GPUドライバー @@ -107,11 +107,11 @@ ゲームコンテンツのインストールに成功しました %1$d のインストールに成功しました %1$d の上書きに成功しました - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates カスタムドライバはサポートされていません suyu データを管理 セーブファイルを共有 - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys ファームウェア未インストール アルバム @@ -133,7 +133,7 @@ ユーザデータのインポートに成功しました エクスポートをキャンセルしました https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -299,7 +299,7 @@ 整合性の確認に失敗しました! ROMが暗号化されています - prod.keys ファイルがインストールされていることを確認してください。]]> + prod.keys ファイルがインストールされていることを確認してください。]]> ビデオコアの初期化中にエラーが発生しました これは通常、互換性のないGPUドライバーが原因で発生します。 カスタムGPUドライバーをインストールすると、問題が解決する可能性があります。 ROMの読み込みに失敗しました diff --git a/src/android/app/src/main/res/values-ko/strings.xml b/src/android/app/src/main/res/values-ko/strings.xml index a2d2bb9511..4a32020520 100644 --- a/src/android/app/src/main/res/values-ko/strings.xml +++ b/src/android/app/src/main/res/values-ko/strings.xml @@ -1,7 +1,7 @@ - 이 소프트웨어는 Nintendo Switch 게임을 실행합니다. 게임 타이틀이나 키는 포함되어 있지 않습니다.<br /><br />시작하기 전에 장치 저장소에서 prod.keys ]]> 파일을 찾아주세요.<br /><br />자세히 알아보기]]> + 이 소프트웨어는 Nintendo Switch 게임을 실행합니다. 게임 타이틀이나 키는 포함되어 있지 않습니다.<br /><br />시작하기 전에 장치 저장소에서 prod.keys ]]> 파일을 찾아주세요.<br /><br />자세히 알아보기]]> 알림 및 오류 문제가 발생하면 알림을 표시합니다. 알림 권한이 부여되지 않았습니다! @@ -35,7 +35,7 @@ suyu에 게임 목록 추가하기 게임 폴더 선택을 건너뛰겠습니까? 폴더를 선택하지 않으면 게임 목록에 게임이 표시되지 않습니다. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games 게임 검색 검색 설정 게임 디렉터리를 설정했습니다. @@ -43,7 +43,7 @@ 패키지 게임 암호 해독에 필요 키 추가를 건너뛰겠습니까? 패키지 게임을 에뮬레이트하려면 유효한 키 값이 필요합니다. 이 단계를 건너뛰면 홈브류 게임만 실행할 수 있습니다. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction 알림 아래 버튼으로 알림 권한을 부여합니다. 알림 켜기 @@ -64,7 +64,7 @@ 키 파일의 확장자가 .keys인지 확인하고 다시 시도하세요. 키 파일의 확장자가 .bin인지 확인하고 다시 시도하세요. 암호화 키가 올바르지 않음 - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys 선택한 파일이 잘못되었거나 손상되었습니다. 키를 다시 덤프하세요. GPU 드라이버 관리자 GPU 드라이버 설치 @@ -114,7 +114,7 @@ 게임 콘텐츠 설치됨 %1$d개를 설치했습니다. %1$d개를 덮어씌웠습니다. - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates 사용자 지정 드라이버는 지원하지 않습니다. 이 장치의 사용자 지정 드라이버 로딩은 현재 지원하지 않습니다.\n나중에 이 옵션을 확인하면 지원이 추가되었는지 확인할 수 있습니다. suyu 데이터 관리 @@ -137,14 +137,14 @@ 전체 설치된 콘텐츠의 손상을 확인합니다. 암호화 키를 찾을 수 없음 펌웨어 및 패키지 게임을 해독할 수 없음 - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys 애플릿 런처 설치된 펌웨어를 사용해 시스템 애플릿을 실행합니다. 펌웨어가 설치되지 않았습니다. 애플릿을 사용할 수 없음 - prod.keys 파일과 펌웨어가 설치되었는지 확인하고 다시 시도하세요.]]> + prod.keys 파일과 펌웨어가 설치되었는지 확인하고 다시 시도하세요.]]> 앨범 시스템 사진 뷰어로 유저 스크린샷 폴더에 저장된 이미지를 확인합니다. Mii 편집 @@ -177,7 +177,7 @@ 내보내기 취소됨 유저 데이터 폴더가 ZIP 폴더의 루트 디렉토리에 위치하고 config/config.ini 구성 파일이 있는지 확인하고 다시 시도하세요. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -403,8 +403,8 @@ 롬 파일이 암호화되어있음 - 게임 카트리지 또는 설치된 타이틀을 다시 덤프하세요.]]> - prod.keys 파일이 설치되어 있는지 확인하세요.]]> + 게임 카트리지 또는 설치된 타이틀을 다시 덤프하세요.]]> + prod.keys 파일이 설치되어 있는지 확인하세요.]]> 비디오 코어를 초기화하는 동안 오류 발생 일반적으로 이 문제는 호환되지 않는 GPU 드라이버로 인해 발생합니다. 사용자 지정 GPU 드라이버를 설치하면 이 문제가 해결될 수 있습니다. 롬 파일을 불러올 수 없음 diff --git a/src/android/app/src/main/res/values-nb/strings.xml b/src/android/app/src/main/res/values-nb/strings.xml index 9ce92d899f..c9ba29339b 100644 --- a/src/android/app/src/main/res/values-nb/strings.xml +++ b/src/android/app/src/main/res/values-nb/strings.xml @@ -1,7 +1,7 @@ - Denne programvaren vil kjøre spill for Nintendo Switch-spillkonsollen. Ingen spilltitler eller nøkler er inkludert.<br /><br />Før du begynner, må du finne prod.keys ]]> filen din på enhetslagringen.<br /><br />Lær mer]]> + Denne programvaren vil kjøre spill for Nintendo Switch-spillkonsollen. Ingen spilltitler eller nøkler er inkludert.<br /><br />Før du begynner, må du finne prod.keys ]]> filen din på enhetslagringen.<br /><br />Lær mer]]> Merknader og feil Viser varsler når noe går galt. Varslingstillatelse ikke gitt! @@ -32,14 +32,14 @@ Gjør det mulig for suyu å fylle ut spillelisten. Hoppe over valg av spillmappe? Spill vises ikke i Spill-listen hvis en mappe ikke er valgt. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Søk i spill| Spillkatalogen er valgt Installer prod.keys Nødvendig for å dekryptere spill Hoppe over å legge til nøkler? Gyldige nøkler er påkrevd for å emulere spill. Bare hjemmebryggede apper vil fungere hvis du fortsetter. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Varsler Gi varslingstillatelse med knappen nedenfor. Gi tillatelse @@ -60,7 +60,7 @@ Kontroller at nøkkelfilen har filtypen .keys, og prøv igjen. Kontroller at nøkkelfilen har filtypen .bin, og prøv igjen. Ugyldige krypteringsnøkler - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Den valgte filen er feil eller ødelagt. Vennligst dump nøklene på nytt. Installer GPU-driver Installer alternative drivere for potensielt bedre ytelse eller nøyaktighet. @@ -94,8 +94,8 @@ Ingen loggfil funnet Installer spillinnhold Installer spilloppdateringer eller DLC - https://suyu-emu.org/help/quickstart/#dumping-installed-updates - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-decryption-keys Gaia er ikke ekte @@ -107,7 +107,7 @@ Prosjekter som gjør suyu for Android mulig Bygg https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -257,7 +257,7 @@ Integritetsverifisering mislyktes! ROM-en din er kryptert - prod.keys filen er installert slik at spillene kan dekrypteres.]]> + prod.keys filen er installert slik at spillene kan dekrypteres.]]> Det oppstod en feil ved initialisering av videokjernen Dette skyldes vanligvis en inkompatibel GPU-driver. Installering av en tilpasset GPU-driver kan løse problemet. Kunne ikke laste inn ROM diff --git a/src/android/app/src/main/res/values-pl/strings.xml b/src/android/app/src/main/res/values-pl/strings.xml index 02587fd8b1..fedb52c0da 100644 --- a/src/android/app/src/main/res/values-pl/strings.xml +++ b/src/android/app/src/main/res/values-pl/strings.xml @@ -1,7 +1,7 @@ - To oprogramowanie umożliwia uruchomienie gier z konsoli Nintendo Switch. Nie zawiera gier ani wymaganych kluczy.<br /><br />Zanim zaczniesz, wybierz plik kluczy prod.keys ]]> z katalogu w pamięci masowej.<br /><br />Dowiedz się więcej]]> + To oprogramowanie umożliwia uruchomienie gier z konsoli Nintendo Switch. Nie zawiera gier ani wymaganych kluczy.<br /><br />Zanim zaczniesz, wybierz plik kluczy prod.keys ]]> z katalogu w pamięci masowej.<br /><br />Dowiedz się więcej]]> Powiadomienia błędy Pokaż powiadomienie gdy coś pójdzie źle Nie zezwolono na powiadomienia! @@ -32,14 +32,14 @@ Pozwala suyu wygenerować listę gier Pominąć wybór folderu z grami? Aby pokazać listę gier wybierz katalog zawierający gry. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Szukaj gier Wybrano katalog gier Instaluj klucze prod.keys Wymagane aby poprawnie odczytać sklepowe gry Pominąć dodawanie kluczy? Poprawne klucze są wymagane aby emulować sklepowe gry. Jeśli przejdziesz dalej, jedynie homebrew będą działać. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Powiadomienia Nadaj uprawnienia dostępu do powiadomień. Nadaj uprawnienia @@ -60,7 +60,7 @@ Upewnij się że twoje klucze mają rozszerzenie .keys i spróbuj ponownie. Upewnij się że twoje klucze mają rozszerzenie .bin i spróbuj ponownie. Niepoprawne klucze - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Wybrany plik jest niepoprawny lub uszkodzony. Zrzuć ponownie swoje klucze. Zainstaluj sterownik GPU Użyj alternatywnych sterowników aby potencjalnie zwiększyć wydajność i naprawić błędy @@ -94,8 +94,8 @@ Nie znaleziono plików logów Zainstaluj zawartość gry Zainstaluj aktualizację gry lub dodatek DLC - https://suyu-emu.org/help/quickstart/#dumping-installed-updates - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-decryption-keys Gaia isn\'t real @@ -107,7 +107,7 @@ Projekty dzięki którym suyu mógł zostać stworzony Wersja https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -255,7 +255,7 @@ Dodatki Twój ROM jest zakodowany - prod.keys jest zainstalowany aby gry mogły zostać odczytane.]]> + prod.keys jest zainstalowany aby gry mogły zostać odczytane.]]> Błąd inicjacji podsystemu graficznego Zazwyczaj spowodowane niekompatybilnym sterownikiem GPU, instalacja niestandardowego sterownika może rozwiązać ten problem. Nie można wczytać pliku ROM 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 3b3bf806b7..2abc99fb9f 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 @@ -1,7 +1,7 @@ - Este software executa jogos do console Nintendo Switch. Não estão inclusos nem jogos ou chaves.<br /><br />Antes de começar, por favor localize o arquivo prod.keys ]]> no armazenamento de seu dispositivo.<br /><br />Saiba mais]]> + Este software executa jogos do console Nintendo Switch. Não estão inclusos nem jogos ou chaves.<br /><br />Antes de começar, por favor localize o arquivo prod.keys ]]> no armazenamento de seu dispositivo.<br /><br />Saiba mais]]> Notificações e erros Mostra notificações quando algo dá errado. Acesso às notificações não concedido! @@ -35,7 +35,7 @@ Permite que o Suyu 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://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Procurar jogos Procurar nas configurações Pasta de jogos selecionada @@ -43,7 +43,7 @@ Necessárias para desencriptar jogos comerciais Ignorar a adição de chaves? São necessárias chaves válidas para emular jogos comerciais. Somente aplicativos homebrew funcionarão se você continuar. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Notificações Conceda a permissão de notificação com o botão abaixo. Conceder permissão @@ -64,7 +64,7 @@ Verifique se seu arquivo de chaves possui a extensão .keys e tente novamente. Verifique se seu arquivo de chaves possui a extensão .bin e tente novamente. Chaves de encriptação inválidas - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys O arquivo selecionado está incorreto ou corrompido. Por favor extraia suas chaves novamente. Gerenciador de driver de GPU Instalar driver para GPU @@ -114,7 +114,7 @@ Conteúdo(s) de jogo instalado(s) com sucesso %1$d instalado com sucesso %1$d substituído com sucesso - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates Drivers personalizados não suportados Carregamento de drivers personalizados não suportado para este dispositivo no momento.\nVerifique essa opção novamente no futuro para ver se o suporte foi adicionado! Administrar dados do suyu @@ -141,14 +141,14 @@ Verifica todo o conteúdo instalado em busca de dados corrompidos Faltando chaves de encriptação O firmware e jogos comerciais não poderão ser decriptados - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Launcher de miniaplicativos Execute miniaplicativos do sistema usando o firmware instalado Firmware não instalado Miniaplicativo não disponível - prod.keys e o firmware estão instalados e tente novamente.]]> + prod.keys e o firmware estão instalados e tente novamente.]]> Álbum Visualize imagens armazenadas na pasta de capturas de telas do usuário com o visualizador de imagens do sistema Editor de Mii @@ -181,7 +181,7 @@ Exportação cancelada Verifique se as pastas de dados do usuário estão na raiz da pasta zip, se possuem um arquivo de configuração em config/config.ini e tente novamente. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -461,8 +461,8 @@ uma tentativa de mapeamento automático Sua ROM está encriptada - cartuchos de jogos ou títulos instalados.]]> - prod.keys está instalado para que os jogos possam ser decriptados.]]> + cartuchos de jogos ou títulos instalados.]]> + prod.keys está instalado para que os jogos possam ser decriptados.]]> Ocorreu um erro ao iniciar o núcleo de vídeo. Isto é normalmente causado por um driver de GPU incompatível. Instalar um driver de GPU personalizado pode resolver este problema. Impossível carregar a ROM 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 75ca1330cc..e326cdd400 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 @@ -35,7 +35,7 @@ Permite que o Suyu 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://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Procurar jogos Procurar nas definições Pasta de Jogos selecionada @@ -43,7 +43,7 @@ Necessário para desencriptar jogos comerciais Ignorar a adição de chaves? São necessárias chaves válidas para emular jogos comerciais. Somente aplicativos homebrew funcionarão se você continuar. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Notificações Conceda a permissão de notificação com o botão abaixo. Conceda permissão @@ -64,7 +64,7 @@ Verifique se seu arquivo keys possui a extensão .keys e tente novamente. Verifique se seu arquivo keys possui a extensão .bin e tente novamente. Chaves de encriptação inválidas - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys O ficheiro selecionado está corrompido. Por favor recarrega as tuas chaves. Gerenciador de driver de GPU Instala driver para GPU @@ -114,7 +114,7 @@ Conteúdo(s) de jogo instalados com sucesso %1$d instalado com sucesso %1$d substituída com êxito - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates Drivers personalizados não suportados Carrea«gamento de drivers personalizados não é suportado pr este dispositivo. \nCheck verifica esta opção de futuro para confirmar se o suporte foi adicionado! Administrar dados suyu @@ -141,7 +141,7 @@ Verifica todo o conteúdo instalado em busca de dados corrompidos Faltando chaves de encriptação O firmware e jogos comerciais não poderão ser decriptados - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Launcher de miniaplicativos @@ -181,7 +181,7 @@ Exportação cancelada Verifiqua se as pastas de dados do utilizados estão na raiz da pasta zip e contêm um arquivo de configuração em config/config.ini e tenta novamente. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -461,8 +461,8 @@ uma tentativa de mapeamento automático A tua ROM está encriptada - cartucho de jogo or títulos instalados.]]> - prod.keys está instalado para que os jogos possam ser desencriptados.]]> + cartucho de jogo or títulos instalados.]]> + prod.keys está instalado para que os jogos possam ser desencriptados.]]> Ocorreu um erro ao iniciar o núcleo de vídeo. Isto é normalmente causado por um driver de GPU incompatível. Instalar um driver GPU pode resolver este problema. Impossível carregar a tua ROM diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml index 0190726def..c78667db11 100644 --- a/src/android/app/src/main/res/values-ru/strings.xml +++ b/src/android/app/src/main/res/values-ru/strings.xml @@ -1,7 +1,7 @@ - Это программное обеспечение позволяет запускать игры для игровой консоли Nintendo Switch. Мы не предоставляем сами игры или ключи.<br /><br />Перед началом работы найдите файл prod.keys ]]> в хранилище устройства..<br /><br />Узнать больше]]> + Это программное обеспечение позволяет запускать игры для игровой консоли Nintendo Switch. Мы не предоставляем сами игры или ключи.<br /><br />Перед началом работы найдите файл prod.keys ]]> в хранилище устройства..<br /><br />Узнать больше]]> Уведомления и ошибки Показывать уведомления, когда что-то пошло не так Вы не предоставили разрешение на уведомления! @@ -35,7 +35,7 @@ Позволяет suyu заполнить список игр Пропустить выбор папки с играми? Игры не будут отображаться в списке Игры, если папка не выбрана. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Найти игры Настройки поиска Выбрана папка с играми @@ -43,7 +43,7 @@ Требуется для расшифровки розничных игр Пропустить добавление ключей? Для эмуляции розничных игр требуются действительные ключи. Если вы продолжите, будут работать только homebrew приложения. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Уведомления Предоставьте разрешение уведомлений с помощью кнопки ниже. Предоставить разрешение @@ -64,7 +64,7 @@ Убедитесь, что файл ключей имеет расширение .keys, и повторите попытку. Убедитесь, что файл ключей имеет расширение .bin, и повторите попытку. Неверные ключи шифрования - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Выбранный файл неверен или поврежден. Пожалуйста, пере-дампите ваши ключи. Менеджер драйверов ГП Установить драйвер ГП @@ -114,7 +114,7 @@ Игровой контент успешно установлен %1$d Успешно установлено %1$d Успешно перезаписано - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates Пользовательские драйверы не поддерживаются Загрузка пользовательского драйвера в настоящее время не поддерживается для этого устройства.\nПроверьте этот параметр еще раз в будущем чтобы узнать была ли добавлена ​​поддержка!   @@ -144,14 +144,14 @@ Проверяет весь установленный контент на наличие повреждений Отсутствуют ключи шифрования Прошивка и розничные игры не могут быть расшифрованы - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Запуск апплета Запуск системных апплетов на установленной прошивке Прошивка не установлена Апплет недоступен - prod.keys и firmware установлены и попробуйте еще раз.]]> + prod.keys и firmware установлены и попробуйте еще раз.]]> Альбом Просмотрите изображения, сохраненные в папке скриншотов пользователя, с помощью системного просмотрщика фотографий. Mii редактор @@ -184,7 +184,7 @@ Экспорт отменен Убедитесь что папки пользовательских данных находятся в корне zip-папки и содержат файл конфигурации config/config.ini и повторите попытку. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -463,8 +463,8 @@ Ваш ROM зашифрованный - или установленные игры.]]> - prod.keys установлен, чтобы игры можно было расшифровать.]]> + или установленные игры.]]> + prod.keys установлен, чтобы игры можно было расшифровать.]]> Произошла ошибка при инициализации видеоядра. Обычно это вызвано несовместимым драйвером ГП. Установка пользовательского драйвера ГП может решить эту проблему. Не удалось запустить ROM diff --git a/src/android/app/src/main/res/values-uk/strings.xml b/src/android/app/src/main/res/values-uk/strings.xml index 4b212d8bc0..9b8c71ccfd 100644 --- a/src/android/app/src/main/res/values-uk/strings.xml +++ b/src/android/app/src/main/res/values-uk/strings.xml @@ -1,7 +1,7 @@ - Це програмне забезпечення дозволяє запускати ігри для ігрової консолі Nintendo Switch. Ми не надаємо самі ігри або ключі.<br /><br />Перед початком роботи знайдіть ваш файл prod.keys ]]> у сховищі пристрою.<br /><br />Дізнатися більше]]> + Це програмне забезпечення дозволяє запускати ігри для ігрової консолі Nintendo Switch. Ми не надаємо самі ігри або ключі.<br /><br />Перед початком роботи знайдіть ваш файл prod.keys ]]> у сховищі пристрою.<br /><br />Дізнатися більше]]> Сповіщення та помилки Показувати сповіщення, коли щось пішло не так Ви не надали дозвіл сповіщень! @@ -32,14 +32,14 @@ Дозволяє suyu заповнити список ігор Пропустити вибір папки з іграми? Ігри не відображатимуться у списку Ігри, якщо папку не вибрано. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Знайти ігри Вибрано папку з іграми Встановити prod.keys Потрібно для розшифровки роздрібних ігор Пропустити додавання ключів? Для емуляції роздрібних ігор потрібні дійсні ключі. Якщо ви продовжите, працюватимуть тільки homebrew додатки. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Сповіщення Надайте дозвіл сповіщень за допомогою кнопки нижче. Надати дозвіл @@ -59,7 +59,7 @@ Помилка під час зчитування ключів шифрування Переконайтеся, що файл ключів має розширення .keys, і повторіть спробу. Невірні ключі шифрування - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Обраний файл невірний або пошкоджений. Будь ласка, пере-дампіть ваші ключі. Встановити драйвер ГП Встановіть альтернативні драйвери для потенційно кращої продуктивності та/або точності @@ -81,7 +81,7 @@ Назва першої вкладеної папки має бути ідентифікатором гри. Імпорт Експорт - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Gaia не існує @@ -92,7 +92,7 @@ https://github.com/suyu-emu/suyu/graphs/contributors Збірка https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -214,7 +214,7 @@ Доповнення Ваш ROM зашифрований - prod.keys встановлено, щоб ігри можна було розшифрувати.]]> + prod.keys встановлено, щоб ігри можна було розшифрувати.]]> Сталася помилка під час ініціалізації відеоядра. Зазвичай це спричинено несумісним драйвером ГП. Встановлення користувацького драйвера ГП може вирішити цю проблему. Не вдалося запустити ROM diff --git a/src/android/app/src/main/res/values-vi/strings.xml b/src/android/app/src/main/res/values-vi/strings.xml index 6355582cb0..4c0446fc96 100644 --- a/src/android/app/src/main/res/values-vi/strings.xml +++ b/src/android/app/src/main/res/values-vi/strings.xml @@ -1,7 +1,7 @@ - Phần mềm này sẽ chạy trò chơi cho máy chơi game Nintendo Switch. Không có game titles hoặc keys được bao gồm.<br /><br />Trước khi bạn bắt đầu, hãy tìm file prod.keys ]]> trên bộ nhớ thiết bị của bạn.<br /><br />Tìm hiểu thêm]]> + Phần mềm này sẽ chạy trò chơi cho máy chơi game Nintendo Switch. Không có game titles hoặc keys được bao gồm.<br /><br />Trước khi bạn bắt đầu, hãy tìm file prod.keys ]]> trên bộ nhớ thiết bị của bạn.<br /><br />Tìm hiểu thêm]]> Thông báo và lỗi Hiển thị thông báo khi có sự cố xảy ra Ứng dụng không được cấp quyền thông báo! @@ -32,14 +32,14 @@ Cho phép suyu thêm các trò chơi vào danh sách Bỏ qua lựa chọn thư mục trò chơi? Trò chơi sẽ không hiển thị trong danh sách nếu một thư mục không được chọn - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Tìm kiếm games Thư mục trò chơi đã được chọn Cài prod.keys Yêu cầu để giải mã các game bán lẻ Bỏ qua thêm chìa khóa? Cần có chìa khóa hợp lệ để giả lập trò chơi. Chỉ có các ứng dụng homebrew có thể vận hành nếu bạn tiếp tục - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Thông báo Ấn vào nút bên dưới để cấp quyền ứng dụng gửi thông báo Cấp quyền @@ -60,7 +60,7 @@ Xác minh rằng tệp keys của bạn có đuôi .keys và thử lại. Xác minh rằng tệp keys của bạn có đuôi .bin và thử lại. Keys mã hoá không hợp lệ - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Chọn file sai hoặc bị hỏng. Hãy xuất chìa khóa khác Cài đặt driver GPU Cài đặt driver thay thế để có thể có hiệu suất tốt và chính xác hơn @@ -94,8 +94,8 @@ Không tìm thấy tệp log Cài đặt nội dung game Cài đặt cập nhật game hoặc DLC - https://suyu-emu.org/help/quickstart/#dumping-installed-updates - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-decryption-keys Gaia không có thật @@ -107,7 +107,7 @@ Các dự án làm cho suyu trên Android trở thành điều có thể Dựng https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -259,7 +259,7 @@ Kiểm tra tính toàn vẹn thất bại! ROM của bạn đã bị mã hoá - prod.keys đã được cài đặt để game có thể được giải mã.]]> + prod.keys đã được cài đặt để game có thể được giải mã.]]> Đã xảy ra lỗi khi khởi tạo lõi video Việc này thường do driver GPU không tương thích. Cài đặt một driver GPU tùy chỉnh có thể giải quyết vấn đề này. Không thể tải ROM diff --git a/src/android/app/src/main/res/values-zh-rCN/strings.xml b/src/android/app/src/main/res/values-zh-rCN/strings.xml index 3ad450e1c9..1cecb2bbf8 100644 --- a/src/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml @@ -1,7 +1,7 @@ - 此软件可以运行 Nintendo Switch 游戏，但不包含任何游戏和密钥文件。<br /><br />在开始前，请找到放置于设备存储中的 prod.keys ]]> 文件。<br /><br />了解更多]]> + 此软件可以运行 Nintendo Switch 游戏，但不包含任何游戏和密钥文件。<br /><br />在开始前，请找到放置于设备存储中的 prod.keys ]]> 文件。<br /><br />了解更多]]> 通知及错误提醒 当发生错误时显示通知。 未授予通知权限！ @@ -35,7 +35,7 @@ 允许 suyu 更新游戏列表 跳过选择游戏文件夹？ 如果未选择游戏文件夹，游戏将不会显示在游戏列表中。 - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games 搜索游戏 搜索设置 已选择游戏文件夹 @@ -43,7 +43,7 @@ 需要密钥文件来解密游戏 跳过添加密钥文件？ 对于商业游戏，需要有效的密钥文件才能运行。如果没有密钥文件，将只能运行自制软件。 - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction 通知 使用下方的按钮授予通知权限。 授予权限 @@ -64,7 +64,7 @@ 请确保您的密钥文件扩展名为 .keys 并重试。 请确保您的密钥文件扩展名为 .bin 并重试。 无效的加密密钥 - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys 选择的密钥文件不正确或已损坏。请重新转储密钥文件。 GPU 驱动管理器 安装 GPU 驱动 @@ -114,7 +114,7 @@ 游戏附加内容已成功安装 %1$d 个包安装成功 %1$d 个包覆盖安装成功 - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates 不支持自定义驱动 此设备不支持自定义驱动。\n请之后再访问此项，查看是否已为此设备添加支持。 管理 suyu 数据 @@ -137,14 +137,14 @@ 检查所有安装的内容是否有损坏 密钥缺失 无法解密固件和商业游戏 - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys 小程序启动器 使用已安装的固件启动系统小程序 未安装固件 小程序不可用 - prod.keys 文件和固件已安装，然后再试一次。]]> + prod.keys 文件和固件已安装，然后再试一次。]]> 相册 查看存储在用户屏幕截图文件夹中的图像 Mii edit @@ -177,7 +177,7 @@ 已取消导出数据 请确保用户数据文件夹位于 zip 压缩包的根目录，并在 config/config.ini 路径中包含配置文件，然后重试。 https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -456,8 +456,8 @@ 您的 ROM 已加密 - 游戏卡带或已安装的游戏。]]> - prod.keys 文件已安装，使得游戏可以被解密。]]> + 游戏卡带或已安装的游戏。]]> + prod.keys 文件已安装，使得游戏可以被解密。]]> 初始化视频核心时发生错误 这通常由不兼容的 GPU 驱动程序造成，安装自定义 GPU 驱动程序可能解决此问题。 无法载入 ROM diff --git a/src/android/app/src/main/res/values-zh-rTW/strings.xml b/src/android/app/src/main/res/values-zh-rTW/strings.xml index 06e23d4c4e..4b2926a95f 100644 --- a/src/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml @@ -1,7 +1,7 @@ - 此軟體可以執行 Nintendo Switch 主機遊戲，但不包含任何遊戲和金鑰。<br /><br />在您開始前，請找到放置於您的裝置儲存空間的 prod.keys ]]> 檔案。<br /><br />深入瞭解]]> + 此軟體可以執行 Nintendo Switch 主機遊戲，但不包含任何遊戲和金鑰。<br /><br />在您開始前，請找到放置於您的裝置儲存空間的 prod.keys ]]> 檔案。<br /><br />深入瞭解]]> 通知和錯誤 發生錯誤時顯示通知。 未授予通知權限！ @@ -35,7 +35,7 @@ 允許 suyu 填入遊戲清單 跳過選取遊戲資料夾？ 如果資料夾未選取，遊戲將不會顯示在遊戲清單。 - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games 搜尋遊戲 搜尋設定 遊戲目錄已選取 @@ -43,7 +43,7 @@ 需要解密零售遊戲 跳過新增金鑰？ 模擬零售遊戲需要有效的金鑰，若要繼續，將僅有自製遊戲應用程式可以運作。 - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction 通知 使用下方的按鈕授予通知權限。 授予權限 @@ -64,7 +64,7 @@ 驗證您的金鑰檔案是否具有 .keys 副檔名並再試一次。 驗證您的金鑰檔案是否具有 .bin 副檔名並再試一次。 無效的加密金鑰 - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys 選取的檔案不正確或已損毀，請重新傾印您的金鑰。 GPU 驅動程式管理員 安裝 GPU 驅動程式 @@ -114,7 +114,7 @@ 遊戲內容已成功安裝 %1$d 安裝成功 %1$d 覆寫成功 - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates 不支援自訂的驅動程式 此裝置不支援自訂的驅動程式。\n請以後再來查看是否已新增支援！ 管理 suyu 資料 @@ -137,14 +137,14 @@ 检查所有安装的内容是否有损坏 密钥缺失 无法解密固件和商业游戏 - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys 小程式啟動器 使用已安裝的韌體啟動系統小程式 未安裝韌體 無法使用小程式 - prod.keys 檔案和韌體已安裝，然後再試一次。]]> + prod.keys 檔案和韌體已安裝，然後再試一次。]]> 相簿 使用系統相片檢視器查看儲存在使用者螢幕截圖資料夾中的影像 Mii 編輯 @@ -177,7 +177,7 @@ 匯出已取消 請確保使用者資料夾位於 zip 壓縮檔的根目錄，並在 config/config.ini 路徑中包含組態檔案，並再試一次。 https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -456,8 +456,8 @@ 您的 ROM 已加密 - 遊戲卡匣或已安裝的遊戲。]]> - prod.keys 檔案已安裝，讓遊戲可以解密。]]> + 遊戲卡匣或已安裝的遊戲。]]> + prod.keys 檔案已安裝，讓遊戲可以解密。]]> 初始化視訊核心時發生錯誤 這經常由不相容的 GPU 驅動程式造成，安裝自訂 GPU 驅動程式可能會解決此問題。 無法載入 ROM diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 5331f2b419..da9c9d2cf8 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ suyu - This software will run games for the Nintendo Switch game console. No game titles or keys are included.<br /><br />Before you begin, please locate your prod.keys ]]> file on your device storage.<br /><br />Learn more]]> + This software will run games for the Nintendo Switch game console. No game titles or keys are included.<br /><br />Before you begin, please locate your prod.keys ]]> file on your device storage.<br /><br />Learn more]]> Notices and errors noticesAndErrors Shows notifications when something goes wrong. @@ -38,7 +38,7 @@ Allows suyu to populate the games list Skip selecting games folder? Games won\'t be displayed in the Games list if a folder isn\'t selected. - https://suyu-emu.org/help/quickstart/#dumping-games + https://suyu.dev/help/quickstart/#dumping-games Search games Search settings Games directory selected @@ -46,7 +46,7 @@ Required to decrypt retail games Skip adding keys? Valid keys are required to emulate retail games. Only homebrew apps will function if you continue. - https://suyu-emu.org/help/quickstart/#guide-introduction + https://suyu.dev/help/quickstart/#guide-introduction Notifications Grant the notification permission with the button below. Grant permission @@ -67,7 +67,7 @@ Verify your keys file has a .keys extension and try again. Verify your keys file has a .bin extension and try again. Invalid encryption keys - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys The selected file is incorrect or corrupt. Please redump your keys. GPU driver manager Install GPU driver @@ -117,7 +117,7 @@ Game content(s) installed successfully %1$d installed successfully %1$d overwritten successfully - https://suyu-emu.org/help/quickstart/#dumping-installed-updates + https://suyu.dev/help/quickstart/#dumping-installed-updates Custom drivers not supported Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added! Manage suyu data @@ -142,7 +142,7 @@ Checks all installed content for corruption Encryption keys are missing Firmware and retail games cannot be decrypted - https://suyu-emu.org/help/quickstart/#dumping-decryption-keys + https://suyu.dev/help/quickstart/#dumping-decryption-keys Qlaunch @@ -151,7 +151,7 @@ Launch system applets using installed firmware Firmware not installed Applet not available - prod.keys file and firmware are installed and try again.]]> + prod.keys file and firmware are installed and try again.]]> Album See images stored in the user screenshots folder with the system photo viewer Mii edit @@ -184,7 +184,7 @@ Export cancelled Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again. https://discord.gg/suyu - https://suyu-emu.org/ + https://suyu.dev/ https://github.com/suyu-emu @@ -463,8 +463,8 @@ Your ROM is encrypted - game cartidges or installed titles.]]> - prod.keys file is installed so that games can be decrypted.]]> + game cartidges or installed titles.]]> + prod.keys file is installed so that games can be decrypted.]]> An error occurred initializing the video core This is usually caused by an incompatible GPU driver. Installing a custom GPU driver may resolve this problem. Unable to load ROM diff --git a/src/common/android/applets/software_keyboard.cpp b/src/common/android/applets/software_keyboard.cpp index 2f0c58227a..8a49ff0442 100644 --- a/src/common/android/applets/software_keyboard.cpp +++ b/src/common/android/applets/software_keyboard.cpp @@ -253,19 +253,19 @@ void AndroidKeyboard::SubmitNormalText(const ResultData& data) const { void InitJNI(JNIEnv* env) { s_software_keyboard_class = reinterpret_cast( - env->NewGlobalRef(env->FindClass("org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard"))); + env->NewGlobalRef(env->FindClass("dev/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard"))); s_keyboard_config_class = reinterpret_cast(env->NewGlobalRef( - env->FindClass("org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig"))); + env->FindClass("dev/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig"))); s_keyboard_data_class = reinterpret_cast(env->NewGlobalRef( - env->FindClass("org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardData"))); + env->FindClass("dev/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardData"))); s_swkbd_execute_normal = env->GetStaticMethodID( s_software_keyboard_class, "executeNormal", - "(Lorg/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Lorg/suyu/suyu_emu/" + "(Ldev/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Ldev/suyu/suyu_emu/" "applets/keyboard/SoftwareKeyboard$KeyboardData;"); s_swkbd_execute_inline = env->GetStaticMethodID( s_software_keyboard_class, "executeInline", - "(Lorg/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V"); + "(Ldev/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V"); } void CleanupJNI(JNIEnv* env) { diff --git a/src/common/android/id_cache.cpp b/src/common/android/id_cache.cpp index 40faea9fa0..c4ef648ae5 100644 --- a/src/common/android/id_cache.cpp +++ b/src/common/android/id_cache.cpp @@ -400,14 +400,14 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { return JNI_ERR; // Initialize Java classes - const jclass native_library_class = env->FindClass("org/suyu/suyu_emu/NativeLibrary"); + const jclass native_library_class = env->FindClass("dev/suyu/suyu_emu/NativeLibrary"); s_native_library_class = reinterpret_cast(env->NewGlobalRef(native_library_class)); s_disk_cache_progress_class = reinterpret_cast(env->NewGlobalRef( - env->FindClass("org/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress"))); + env->FindClass("dev/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress"))); s_load_callback_stage_class = reinterpret_cast(env->NewGlobalRef(env->FindClass( - "org/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage"))); + "dev/suyu/suyu_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage"))); - const jclass game_dir_class = env->FindClass("org/suyu/suyu_emu/model/GameDir"); + const jclass game_dir_class = env->FindClass("dev/suyu/suyu_emu/model/GameDir"); s_game_dir_class = reinterpret_cast(env->NewGlobalRef(game_dir_class)); s_game_dir_constructor = env->GetMethodID(game_dir_class, "", "(Ljava/lang/String;Z)V"); env->DeleteLocalRef(game_dir_class); @@ -424,7 +424,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { s_on_program_changed = env->GetStaticMethodID(s_native_library_class, "onProgramChanged", "(I)V"); - const jclass game_class = env->FindClass("org/suyu/suyu_emu/model/Game"); + const jclass game_class = env->FindClass("dev/suyu/suyu_emu/model/Game"); s_game_class = reinterpret_cast(env->NewGlobalRef(game_class)); s_game_constructor = env->GetMethodID(game_class, "", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/" @@ -450,7 +450,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->DeleteLocalRef(pair_class); const jclass overlay_control_data_class = - env->FindClass("org/suyu/suyu_emu/overlay/model/OverlayControlData"); + env->FindClass("dev/suyu/suyu_emu/overlay/model/OverlayControlData"); s_overlay_control_data_class = reinterpret_cast(env->NewGlobalRef(overlay_control_data_class)); s_overlay_control_data_constructor = @@ -468,7 +468,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->GetFieldID(overlay_control_data_class, "foldablePosition", "Lkotlin/Pair;"); env->DeleteLocalRef(overlay_control_data_class); - const jclass patch_class = env->FindClass("org/suyu/suyu_emu/model/Patch"); + const jclass patch_class = env->FindClass("dev/suyu/suyu_emu/model/Patch"); s_patch_class = reinterpret_cast(env->NewGlobalRef(patch_class)); s_patch_constructor = env->GetMethodID( patch_class, "", @@ -500,7 +500,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->DeleteLocalRef(boolean_class); const jclass player_input_class = - env->FindClass("org/suyu/suyu_emu/features/input/model/PlayerInput"); + env->FindClass("dev/suyu/suyu_emu/features/input/model/PlayerInput"); s_player_input_class = reinterpret_cast(env->NewGlobalRef(player_input_class)); s_player_input_constructor = env->GetMethodID( player_input_class, "", @@ -531,7 +531,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->DeleteLocalRef(player_input_class); const jclass suyu_input_device_interface = - env->FindClass("org/suyu/suyu_emu/features/input/SuyuInputDevice"); + env->FindClass("dev/suyu/suyu_emu/features/input/SuyuInputDevice"); s_suyu_input_device_interface = reinterpret_cast(env->NewGlobalRef(suyu_input_device_interface)); s_suyu_input_device_get_name = diff --git a/src/suyu/about_dialog.cpp b/src/suyu/about_dialog.cpp index 40c99f91b7..d5f05b4a2a 100644 --- a/src/suyu/about_dialog.cpp +++ b/src/suyu/about_dialog.cpp @@ -20,7 +20,7 @@ AboutDialog::AboutDialog(QWidget* parent) ui->setupUi(this); // Try and request the icon from Qt theme (Linux?) - const QIcon suyu_logo = QIcon::fromTheme(QStringLiteral("org.suyu_emu.suyu")); + const QIcon suyu_logo = QIcon::fromTheme(QStringLiteral("dev.suyu_emu.suyu")); if (!suyu_logo.isNull()) { ui->labelLogo->setPixmap(suyu_logo.pixmap(200)); } diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index 300eb0819a..97c49da134 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -5382,7 +5382,7 @@ int main(int argc, char* argv[]) { // Fix the Wayland appId. This needs to match the name of the .desktop file without the .desktop // suffix. - QGuiApplication::setDesktopFileName(QStringLiteral("org.suyu_emu.suyu")); + QGuiApplication::setDesktopFileName(QStringLiteral("dev.suyu_emu.suyu")); #endif SetHighDPIAttributes();