From d4ff24cb16e3c5093b341a47163a8b82ed342cd2 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 13 Feb 2024 10:58:07 -0800 Subject: [PATCH] Add some padding to the share location button --- Meshtastic/Helpers/BLEManager.swift | 5 +++-- Meshtastic/Helpers/MeshPackets.swift | 4 ---- .../Messages/TextMessageField/RequestPositionButton.swift | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 3f31ec97..9dc704d3 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -695,7 +695,8 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate } case .neighborinfoApp: if let neighborInfo = try? NeighborInfo(serializedData: decodedInfo.packet.decoded.payload) { - MeshLogger.log("🕸️ MESH PACKET received for Neighbor Info App App UNHANDLED \(neighborInfo)") + MeshLogger.log("🕸️ MESH PACKET received for Neighbor Info App UNHANDLED") + // MeshLogger.log("🕸️ MESH PACKET received for Neighbor Info App UNHANDLED \(neighborInfo)") } case .paxcounterApp: MeshLogger.log("🕸️ MESH PACKET received for PAX Counter App UNHANDLED \((try? decodedInfo.packet.jsonString()) ?? "JSON Decode Failure")") @@ -715,7 +716,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate peripherals.removeAll(where: { $0.peripheral.state == CBPeripheralState.disconnected }) // Config conplete returns so we don't read the characteristic again - /// MQTT Client Proxy and RangeTest interest + /// MQTT Client Proxy and RangeTest and Store and Forward interest if connectedPeripheral.num > 0 { let fetchNodeInfoRequest: NSFetchRequest = NSFetchRequest.init(entityName: "NodeInfoEntity") diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index a2e93d38..d2e6a8f1 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -723,10 +723,6 @@ func telemetryPacket(packet: MeshPacket, connectedNode: Int64, context: NSManage func textMessageAppPacket(packet: MeshPacket, connectedNode: Int64, context: NSManagedObjectContext) { - //let storeForwardMessage = packet.decoded.payload.text/// String(bytes: packet.decoded.payload.text, encoding: .utf8) - - - if let messageText = String(bytes: packet.decoded.payload, encoding: .utf8) { MeshLogger.log("💬 \("mesh.log.textmessage.received".localized)") diff --git a/Meshtastic/Views/Messages/TextMessageField/RequestPositionButton.swift b/Meshtastic/Views/Messages/TextMessageField/RequestPositionButton.swift index 4a69ea50..2f1634bc 100644 --- a/Meshtastic/Views/Messages/TextMessageField/RequestPositionButton.swift +++ b/Meshtastic/Views/Messages/TextMessageField/RequestPositionButton.swift @@ -10,6 +10,7 @@ struct RequestPositionButton: View { .imageScale(.large) .foregroundColor(.accentColor) } + .padding(.trailing) } }