diff --git a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj index f4a30338b..d94e01da1 100644 --- a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj +++ b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj @@ -514,7 +514,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = ""; - DEVELOPMENT_TEAM = 95J8WZ4TN8; + DEVELOPMENT_TEAM = F4QL9A2T88; ENABLE_PREVIEWS = YES; ENABLE_TESTABILITY = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -522,6 +522,7 @@ "$(PROJECT_DIR)/MeloNX/Dependencies/XCFrameworks", "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = MeloNX/Info.plist; @@ -654,9 +655,13 @@ "$(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 = 0.0.8; - PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX; + PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX1; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "MeloNX/Core/Headers/Ryujinx-Header.h"; @@ -674,7 +679,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = ""; - DEVELOPMENT_TEAM = 95J8WZ4TN8; + DEVELOPMENT_TEAM = F4QL9A2T88; ENABLE_PREVIEWS = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -682,6 +687,7 @@ "$(PROJECT_DIR)/MeloNX/Dependencies/XCFrameworks", "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", + "$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries", ); GCC_OPTIMIZATION_LEVEL = 3; GENERATE_INFOPLIST_FILE = YES; @@ -815,9 +821,13 @@ "$(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 = 0.0.8; - PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX; + PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX1; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "MeloNX/Core/Headers/Ryujinx-Header.h"; diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/ls.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/ls.xcuserdatad/UserInterfaceState.xcuserstate index f3138f841..d2a61f079 100644 Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/ls.xcuserdatad/UserInterfaceState.xcuserstate and b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/ls.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/Contents.json b/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/Contents.json new file mode 100644 index 000000000..5a3a6fcda --- /dev/null +++ b/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "trollstore.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "trollstore 1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "trollstore 2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore 1.png b/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore 1.png new file mode 100644 index 000000000..be41e411a Binary files /dev/null and b/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore 1.png differ diff --git a/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore 2.png b/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore 2.png new file mode 100644 index 000000000..be41e411a Binary files /dev/null and b/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore 2.png differ diff --git a/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore.png b/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore.png new file mode 100644 index 000000000..be41e411a Binary files /dev/null and b/src/MeloNX/MeloNX/Assets/Assets.xcassets/trollstore.imageset/trollstore.png differ diff --git a/src/MeloNX/MeloNX/Core/JIT/AskForJIT.swift b/src/MeloNX/MeloNX/Core/JIT/AskForJIT.swift index 8603ef6d6..dd2b881d3 100644 --- a/src/MeloNX/MeloNX/Core/JIT/AskForJIT.swift +++ b/src/MeloNX/MeloNX/Core/JIT/AskForJIT.swift @@ -1,6 +1,6 @@ // // AskForJIT.swift -// Pomelo +// MeloNX // // Created by Stossy11 on 9/10/2024. // Copyright © 2024 Stossy11. All rights reserved. diff --git a/src/MeloNX/MeloNX/Views/GamesList/GameListView.swift b/src/MeloNX/MeloNX/Views/GamesList/GameListView.swift index 07cef6f16..511a5068d 100644 --- a/src/MeloNX/MeloNX/Views/GamesList/GameListView.swift +++ b/src/MeloNX/MeloNX/Views/GamesList/GameListView.swift @@ -157,6 +157,7 @@ struct GameLibraryView: View { Image(systemName: "ellipsis") .foregroundColor(.blue) } + } } } diff --git a/src/MeloNX/MeloNX/Views/SettingsView/SettingsView.swift b/src/MeloNX/MeloNX/Views/SettingsView/SettingsView.swift index 95fc7a3cb..f5542da9b 100644 --- a/src/MeloNX/MeloNX/Views/SettingsView/SettingsView.swift +++ b/src/MeloNX/MeloNX/Views/SettingsView/SettingsView.swift @@ -60,11 +60,7 @@ struct SettingsView: View { labelWithIcon("Disable Docked Mode", iconName: "dock.rectangle") } .tint(.blue) - Toggle(isOn: $useTrollStore) { - labelWithIcon("Trollstore", iconName: "stroller") - } - .tint(.blue) - + VStack(alignment: .leading, spacing: 10) { HStack { labelWithIcon("Resolution Scale", iconName: "magnifyingglass") @@ -265,11 +261,17 @@ struct SettingsView: View { // Advanced Section { DisclosureGroup { + Toggle(isOn: $useTrollStore) { + labelWithpng("TrollStore", iconName: "trollstore") + } + .tint(.blue) + HStack { labelWithIcon("Page Size", iconName: "textformat.size") Spacer() Text("\(String(Int(getpagesize())))") .foregroundColor(.secondary) + } TextField("Additional Arguments", text: Binding( @@ -382,5 +384,14 @@ struct SettingsView: View { } .font(.body) } + func labelWithpng(_ text: String, iconName: String) -> some View { + HStack { + Image(iconName) // Loads the PNG from the Assets folder + .resizable() + .scaledToFit() + .frame(width: 20, height: 20) // Adjust size as needed + Text(text) + } + } }