meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bump required version with proto updates

Browse source
This commit is contained in:
Garth Vander Houwen 2022-10-10 15:02:27 -07:00
parent e24c9df7ff
commit 4df2f4614b
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Meshtastic/MeshtasticApp.swift
View file

@ -13,6 +13,7 @@ struct MeshtasticAppleApp: App {
@State var saveChannels = false
@State var incomingUrl: URL?
@State var channelSettings: String?
@Environment(\.scenePhase) var scenePhase
@ -27,15 +28,23 @@ struct MeshtasticAppleApp: App {
print("URL received \(userActivity)")
incomingUrl = userActivity.webpageURL
if incomingUrl!.absoluteString.lowercased().contains("https://meshtastic.org/e/#") {
if incomingUrl!.absoluteString.lowercased().contains("meshtastic.org/e/#") {
if let components = incomingUrl?.absoluteString.components(separatedBy: "#") {
channelSettings = components.last!
}
saveChannels = true
print("User wants to open a Channel Settings URL: \(incomingUrl?.absoluteString ?? "No QR Code Link")")
}
if saveChannels {
print("User wants to open Channel Settings URL: \(String(describing: incomingUrl!.relativeString))")
}
}
.sheet(isPresented: $saveChannels) {
SaveChannelQRCode(channelHash: incomingUrl?.absoluteString ?? "Empty Channel URL")
let channelSettingsString = incomingUrl?.absoluteString
SaveChannelQRCode(channelHash: channelSettings ?? "Empty Channel URL")
.presentationDetents([.medium, .large])
.presentationDragIndicator(.visible)
}
@ -44,7 +53,10 @@ struct MeshtasticAppleApp: App {
print("Some sort of URL was received \(url)")
incomingUrl = url
if url.absoluteString.lowercased().contains("https://meshtastic.org/e/#") {
if url.absoluteString.lowercased().contains("meshtastic.org/e/#") {
if let components = incomingUrl?.absoluteString.components(separatedBy: "#") {
channelSettings = components.last!
}
saveChannels = true
print("User wants to open a Channel Settings URL: \(incomingUrl?.absoluteString ?? "No QR Code Link")")
} else {

2
Meshtastic/Views/Settings/SaveChannelQRCode.swift
View file

@ -23,7 +23,7 @@ struct SaveChannelQRCode: View {
.padding()
Text(channelHash)
.font(.title2)
.font(.callout)
.padding()
Text("This does not work yet.")