diff --git a/.gitignore b/.gitignore
index 23df2f576..48f1000dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,3 +174,69 @@ PublishProfiles/
# Glade backup files
*.glade~
src/MeloNX/MeloNX/Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib
+
+
+# Swift
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+
+## Obj-C/Swift specific
+*.hmap
+
+## App packaging
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+# *.xcodeproj
+#
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+# .swiftpm
+
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build/
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
diff --git a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj
index 1caec0c46..fb780c308 100644
--- a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj
+++ b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj
@@ -62,7 +62,6 @@
4E80AA0A2CD6FAA800029585 /* Exceptions for "MeloNX" folder in "Embed Libraries" phase from "MeloNX" target */ = {
isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet;
attributesByRelativePath = {
- "Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib" = (CodeSignOnCopy, );
"Dependencies/Dynamic Libraries/libMoltenVK.dylib" = (CodeSignOnCopy, );
"Dependencies/Dynamic Libraries/libavcodec.dylib" = (CodeSignOnCopy, );
"Dependencies/Dynamic Libraries/libavutil.dylib" = (CodeSignOnCopy, );
@@ -82,7 +81,6 @@
"Dependencies/Dynamic Libraries/libavcodec.dylib",
"Dependencies/Dynamic Libraries/libavutil.dylib",
"Dependencies/Dynamic Libraries/libMoltenVK.dylib",
- "Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib",
Dependencies/XCFrameworks/libavcodec.xcframework,
Dependencies/XCFrameworks/libavfilter.xcframework,
Dependencies/XCFrameworks/libavformat.xcframework,
@@ -555,6 +553,11 @@
"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.benlawrence.MeloNX;
@@ -646,6 +649,11 @@
"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+ "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.benlawrence.MeloNX;
diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/benlawrence.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/benlawrence.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 06e42df8e..000000000
Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/benlawrence.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/brandon.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/brandon.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 95e2ee32e..000000000
Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/brandon.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 8b26026b6..000000000
Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
deleted file mode 100644
index 529b37b6e..000000000
--- a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
- uuid = "271EB822-2830-4016-A3D7-CA2DEBEDCD27"
- type = "1"
- version = "2.0">
- <Breakpoints>
- <BreakpointProxy
- BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
- <BreakpointContent
- uuid = "1F3099D0-0456-4AD5-8EA1-52BABAF2AA89"
- shouldBeEnabled = "Yes"
- nameForDebugger = "Ignore-SIGUSR"
- ignoreCount = "0"
- continueAfterRunningActions = "Yes"
- filePath = "MeloNX/MeloNXApp.swift"
- startingColumnNumber = "9223372036854775807"
- endingColumnNumber = "9223372036854775807"
- startingLineNumber = "14"
- endingLineNumber = "14"
- landmarkName = "body"
- landmarkType = "24">
- <Actions>
- <BreakpointActionProxy
- ActionExtensionID = "Xcode.BreakpointAction.DebuggerCommand">
- <ActionContent
- consoleCommand = "process handle SIGUSR1 -s false -n false">
- </ActionContent>
- </BreakpointActionProxy>
- <BreakpointActionProxy
- ActionExtensionID = "Xcode.BreakpointAction.DebuggerCommand">
- <ActionContent
- consoleCommand = "process handle SIGBUS -s false -n false">
- </ActionContent>
- </BreakpointActionProxy>
- </Actions>
- </BreakpointContent>
- </BreakpointProxy>
- </Breakpoints>
-</Bucket>
diff --git a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist b/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 10d539f04..000000000
--- a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>SchemeUserState</key>
- <dict>
- <key>MeloNX.xcscheme_^#shared#^_</key>
- <dict>
- <key>orderHint</key>
- <integer>0</integer>
- </dict>
- </dict>
- <key>SuppressBuildableAutocreation</key>
- <dict>
- <key>4E80A98C2CD6F54500029585</key>
- <dict>
- <key>primary</key>
- <true/>
- </dict>
- <key>4E80A99C2CD6F54700029585</key>
- <dict>
- <key>primary</key>
- <true/>
- </dict>
- <key>4E80A9A62CD6F54700029585</key>
- <dict>
- <key>primary</key>
- <true/>
- </dict>
- </dict>
-</dict>
-</plist>
diff --git a/src/Ryujinx.UI.Common/App/LdnGameData.cs b/src/Ryujinx.Ui.Common/App/LdnGameData.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/App/LdnGameData.cs
rename to src/Ryujinx.Ui.Common/App/LdnGameData.cs
diff --git a/src/Ryujinx.UI.Common/App/LdnGameDataReceivedEventArgs.cs b/src/Ryujinx.Ui.Common/App/LdnGameDataReceivedEventArgs.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/App/LdnGameDataReceivedEventArgs.cs
rename to src/Ryujinx.Ui.Common/App/LdnGameDataReceivedEventArgs.cs
diff --git a/src/Ryujinx.UI.Common/App/LdnGameDataSerializerContext.cs b/src/Ryujinx.Ui.Common/App/LdnGameDataSerializerContext.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/App/LdnGameDataSerializerContext.cs
rename to src/Ryujinx.Ui.Common/App/LdnGameDataSerializerContext.cs
diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx.Ui.Common/Configuration/ConfigurationState.Migration.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/Configuration/ConfigurationState.Migration.cs
rename to src/Ryujinx.Ui.Common/Configuration/ConfigurationState.Migration.cs
diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.Model.cs b/src/Ryujinx.Ui.Common/Configuration/ConfigurationState.Model.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/Configuration/ConfigurationState.Model.cs
rename to src/Ryujinx.Ui.Common/Configuration/ConfigurationState.Model.cs
diff --git a/src/Ryujinx.UI.Common/Helper/DownloadableContentsHelper.cs b/src/Ryujinx.Ui.Common/Helper/DownloadableContentsHelper.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/Helper/DownloadableContentsHelper.cs
rename to src/Ryujinx.Ui.Common/Helper/DownloadableContentsHelper.cs
diff --git a/src/Ryujinx.UI.Common/Helper/TitleUpdatesHelper.cs b/src/Ryujinx.Ui.Common/Helper/TitleUpdatesHelper.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/Helper/TitleUpdatesHelper.cs
rename to src/Ryujinx.Ui.Common/Helper/TitleUpdatesHelper.cs
diff --git a/src/Ryujinx.UI.Common/Models/DownloadableContentModel.cs b/src/Ryujinx.Ui.Common/Models/DownloadableContentModel.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/Models/DownloadableContentModel.cs
rename to src/Ryujinx.Ui.Common/Models/DownloadableContentModel.cs
diff --git a/src/Ryujinx.UI.Common/Models/TitleUpdateModel.cs b/src/Ryujinx.Ui.Common/Models/TitleUpdateModel.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/Models/TitleUpdateModel.cs
rename to src/Ryujinx.Ui.Common/Models/TitleUpdateModel.cs
diff --git a/src/Ryujinx.UI.Common/Models/XCITrimmerFileModel.cs b/src/Ryujinx.Ui.Common/Models/XCITrimmerFileModel.cs
similarity index 100%
rename from src/Ryujinx.UI.Common/Models/XCITrimmerFileModel.cs
rename to src/Ryujinx.Ui.Common/Models/XCITrimmerFileModel.cs
diff --git a/src/Ryujinx.UI.Common/Resources/Icon_Blank.png b/src/Ryujinx.Ui.Common/Resources/Icon_Blank.png
similarity index 100%
rename from src/Ryujinx.UI.Common/Resources/Icon_Blank.png
rename to src/Ryujinx.Ui.Common/Resources/Icon_Blank.png