mirror of
https://git.743378673.xyz/MeloNX/MeloNX.git
synced 2025-04-24 08:25:14 +00:00
Refactor settings to include update check option and adjust API URLs
This commit is contained in:
parent
61fca7892f
commit
c5c79c26ea
@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"originHash" : "fedf09a893a63378a2e53f631cd833ae83a0c9ee7338eb8d153b04fd34aaf805",
|
|
||||||
"pins" : [
|
|
||||||
{
|
|
||||||
"identity" : "swiftsvg",
|
|
||||||
"kind" : "remoteSourceControl",
|
|
||||||
"location" : "https://github.com/mchoe/SwiftSVG",
|
|
||||||
"state" : {
|
|
||||||
"branch" : "master",
|
|
||||||
"revision" : "88b9ee086b29019e35f6f49c8e30e5552eb8fa9d"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"version" : 3
|
|
||||||
}
|
|
@ -836,7 +836,7 @@ struct GameListRow: View {
|
|||||||
}
|
}
|
||||||
.padding(.horizontal, 10)
|
.padding(.horizontal, 10)
|
||||||
.padding(.vertical, 4)
|
.padding(.vertical, 4)
|
||||||
.frame(width: .infinity, height: .infinity)
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||||
}
|
}
|
||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
.contextMenu {
|
.contextMenu {
|
||||||
@ -1129,7 +1129,7 @@ func pullGameCompatibility(completion: @escaping (Result<[GameRequirements], Err
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
guard let url = URL(string: "https://melonx.org/api/game_entries") else {
|
guard let url = URL(string: "https://melonx.net/api/game_entries") else {
|
||||||
completion(.failure(NSError(domain: "Invalid URL", code: 0, userInfo: nil)))
|
completion(.failure(NSError(domain: "Invalid URL", code: 0, userInfo: nil)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -56,6 +56,8 @@ struct SettingsView: View {
|
|||||||
|
|
||||||
@AppStorage("HideButtons") var hideButtonsJoy = false
|
@AppStorage("HideButtons") var hideButtonsJoy = false
|
||||||
|
|
||||||
|
@AppStorage("checkForUpdate") var checkForUpdate: Bool = true
|
||||||
|
|
||||||
@State private var showResolutionInfo = false
|
@State private var showResolutionInfo = false
|
||||||
@State private var showAnisotropicInfo = false
|
@State private var showAnisotropicInfo = false
|
||||||
@State private var showControllerInfo = false
|
@State private var showControllerInfo = false
|
||||||
@ -887,6 +889,9 @@ struct SettingsView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Divider()
|
||||||
|
|
||||||
|
SettingsToggle(isOn: $checkForUpdate, icon: "square.and.arrow.down", label: "Check for Updates")
|
||||||
|
|
||||||
if ryujinx.firmwareversion != "0" {
|
if ryujinx.firmwareversion != "0" {
|
||||||
Divider()
|
Divider()
|
||||||
|
@ -32,13 +32,16 @@ struct MeloNXApp: App {
|
|||||||
@AppStorage("hasbeenfinished") var finishedStorage: Bool = false
|
@AppStorage("hasbeenfinished") var finishedStorage: Bool = false
|
||||||
|
|
||||||
@AppStorage("location-enabled") var locationenabled: Bool = false
|
@AppStorage("location-enabled") var locationenabled: Bool = false
|
||||||
|
@AppStorage("checkForUpdate") var checkForUpdate: Bool = true
|
||||||
|
|
||||||
var body: some Scene {
|
var body: some Scene {
|
||||||
WindowGroup {
|
WindowGroup {
|
||||||
if finishedStorage {
|
if finishedStorage {
|
||||||
ContentView()
|
ContentView()
|
||||||
.onAppear {
|
.onAppear {
|
||||||
checkLatestVersion()
|
if checkForUpdate {
|
||||||
|
checkLatestVersion()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.sheet(isPresented: Binding(
|
.sheet(isPresented: Binding(
|
||||||
get: { showOutOfDateSheet && updateInfo != nil },
|
get: { showOutOfDateSheet && updateInfo != nil },
|
||||||
@ -73,7 +76,7 @@ struct MeloNXApp: App {
|
|||||||
#if DEBUG
|
#if DEBUG
|
||||||
let urlString = "http://192.168.178.116:8000/api/latest_release"
|
let urlString = "http://192.168.178.116:8000/api/latest_release"
|
||||||
#else
|
#else
|
||||||
let urlString = "https://melonx.org/api/latest_release"
|
let urlString = "https://melonx.net/api/latest_release"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
guard let url = URL(string: urlString) else {
|
guard let url = URL(string: urlString) else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user