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

V 1.25.2 make the bluetooth connection indicator much shorter, fixed broken swipe to delete on nodes and swipe to disconnect on connect

Browse source
This commit is contained in:
Garth Vander Houwen 2021-10-07 22:51:40 -07:00
parent 669fb6de6b
commit 30b425fb29
5 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meshtastic Client.xcodeproj/project.pbxproj
View file

@ -659,7 +659,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.25.1;
MARKETING_VERSION = 1.25.12;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;
@ -686,7 +686,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.25.1;
MARKETING_VERSION = 1.25.12;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;

4
MeshtasticClient/Views/Bluetooth/Connect.swift
View file

@ -133,9 +133,9 @@ struct Connect: View {
.navigationTitle("Bluetooth Radios")
.navigationBarItems(trailing:
ZStack {
VStack(alignment: .trailing) {
ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedNode != nil) ? bleManager.connectedNode.user.longName : ((bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.name : "Unknown") ?? "Unknown")
ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedNode != nil) ? bleManager.connectedNode.user.shortName : ((bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.name : "Unknown") ?? "Unknown")
}
)

40
MeshtasticClient/Views/Helpers/ConnectedDevice.swift
View file

@ -13,31 +13,29 @@ struct ConnectedDevice: View {
var body: some View {
HStack {
VStack {
if bluetoothOn {
if deviceConnected {
Image(systemName: "antenna.radiowaves.left.and.right")
.imageScale(.medium)
.foregroundColor(.green)
.symbolRenderingMode(.hierarchical)
Text(name!).font(.caption2).foregroundColor(.gray)
}
else {
Image(systemName: "antenna.radiowaves.left.and.right.slash")
.imageScale(.medium)
.foregroundColor(.red)
.symbolRenderingMode(.hierarchical)
Text("Disconnected").font(.caption2).foregroundColor(.gray)
}
if bluetoothOn {
if deviceConnected {
Image(systemName: "antenna.radiowaves.left.and.right.circle.fill")
.imageScale(.large)
.foregroundColor(.green)
.symbolRenderingMode(.hierarchical)
Text(name!).font(.subheadline).foregroundColor(.gray)
}
else {
Text("Bluetooth Off").font(.caption).foregroundColor(.red)
Image(systemName: "antenna.radiowaves.left.and.right.slash")
.imageScale(.medium)
.foregroundColor(.red)
.symbolRenderingMode(.hierarchical)
Text("Disconnected").font(.subheadline).foregroundColor(.gray)
}
}
}.offset(x: 5, y: -7)
else {
Text("Bluetooth Off").font(.subheadline).foregroundColor(.red)
}
}
}
}

2
MeshtasticClient/Views/Messages/Messages.swift
View file

@ -135,7 +135,7 @@ struct Messages: View {
ZStack {
ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedNode != nil) ? bleManager.connectedNode.user.longName : ((bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.name : "Unknown") ?? "Unknown")
ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedNode != nil) ? bleManager.connectedNode.user.shortName : ((bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.name : "Unknown") ?? "Unknown")
}
)

2
MeshtasticClient/Views/Nodes/NodeList.swift
View file

@ -58,10 +58,12 @@ struct NodeList: View {
}
.swipeActions {
Button {
let nodeIndex = meshData.nodes.firstIndex(where: { $0.id == node.id })
meshData.nodes.remove(at: nodeIndex!)
meshData.save()
} label: {
Label("Delete from app", systemImage: "trash")
}
.tint(.red)