Merge branch 'main' into carplay
This commit is contained in:
commit
cdd5cbe634
1 file changed
+22
-1
@@ -26,6 +26,23 @@ struct SettingsView: View {
|
|||||||
TextField("Enter CarPlayWallpaper App Hash", text: $cpHash)
|
TextField("Enter CarPlayWallpaper App Hash", text: $cpHash)
|
||||||
.textFieldStyle(RoundedBorderTextFieldStyle())
|
.textFieldStyle(RoundedBorderTextFieldStyle())
|
||||||
.font(.system(.body, design: .monospaced))
|
.font(.system(.body, design: .monospaced))
|
||||||
|
.onChange(of: pbHash) { _ in
|
||||||
|
var separator: String? = nil
|
||||||
|
if pbHash.contains(" ") {
|
||||||
|
separator = " "
|
||||||
|
} else if pbHash.contains("\n") {
|
||||||
|
separator = "\n"
|
||||||
|
}
|
||||||
|
if let separator = separator {
|
||||||
|
let items = pbHash.split(separator: separator)
|
||||||
|
if let pb = items.first {
|
||||||
|
pbHash = String(pb)
|
||||||
|
}
|
||||||
|
if items.count >= 2 {
|
||||||
|
cpHash = String(items[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
HStack {
|
HStack {
|
||||||
Spacer()
|
Spacer()
|
||||||
// Run task to check until file exists from Nugget pc over AFC
|
// Run task to check until file exists from Nugget pc over AFC
|
||||||
@@ -158,7 +175,11 @@ struct SettingsView: View {
|
|||||||
let contents = try String(contentsOf: filePath)
|
let contents = try String(contentsOf: filePath)
|
||||||
try? FileManager.default.removeItem(at: filePath)
|
try? FileManager.default.removeItem(at: filePath)
|
||||||
await MainActor.run {
|
await MainActor.run {
|
||||||
let items = contents.split(separator: "\n")
|
var separator = " "
|
||||||
|
if contents.contains("\n") {
|
||||||
|
separator = "\n"
|
||||||
|
}
|
||||||
|
let items = contents.split(separator: separator)
|
||||||
if let pb = items.first {
|
if let pb = items.first {
|
||||||
pbHash = String(pb)
|
pbHash = String(pb)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user