mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
58da532d32
This change modifies the process for generating and integrating the Meshtastic protobufs into the client application. * The generated Swift code is now in a local SPM package `MeshtasticProtobufs` * An Xcode Workspace file `Meshtastic.xcworkspace` was created to more easily manage the new build targets. * The code generation script for the protos was modified to generate the Swift code into the new location. * The README.md was updated to reflect these changes. NOTE: After merging this PR, do not open the project file `Meshtastic.xcodeproj`. You must use the workspace `Meshtastic.xcworkspace` Extracting out the generated protobuf code into its own library enables several opportunities for the project. This is just a first step, but with some more modularization, a standalone Apple Watch app or other targets starts to become a little bit more achievable to implement. After extracting the protobufs into a Swift package, I validate these changes by building and running the Meshtastic app to an iPhone 15 Pro Max, and tried changing some settings on a local node. I then messaged back and forth using two local nodes connected to two different iOS devices.
91 lines
2.6 KiB
Swift
91 lines
2.6 KiB
Swift
import MeshtasticProtobufs
|
|
import OSLog
|
|
import SwiftUI
|
|
|
|
struct MessageText: View {
|
|
static let linkBlue = Color(red: 0.4627, green: 0.8392, blue: 1) /* #76d6ff */
|
|
static let localeDateFormat = DateFormatter.dateFormat(
|
|
fromTemplate: "yyMMddjmmssa",
|
|
options: 0,
|
|
locale: Locale.current
|
|
)
|
|
static let dateFormatString = (localeDateFormat ?? "MM/dd/YY j:mm:ss:a")
|
|
|
|
@Environment(\.managedObjectContext) var context
|
|
|
|
let message: MessageEntity
|
|
let tapBackDestination: MessageDestination
|
|
let isCurrentUser: Bool
|
|
let onReply: () -> Void
|
|
|
|
@State private var isShowingDeleteConfirmation = false
|
|
|
|
var body: some View {
|
|
let markdownText = LocalizedStringKey(message.messagePayloadMarkdown ?? (message.messagePayload ?? "EMPTY MESSAGE"))
|
|
return Text(markdownText)
|
|
.tint(Self.linkBlue)
|
|
.padding(10)
|
|
.foregroundColor(.white)
|
|
.background(isCurrentUser ? .accentColor : Color(.gray))
|
|
.cornerRadius(15)
|
|
.overlay {
|
|
let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
|
|
if tapBackDestination.overlaySensorMessage {
|
|
VStack {
|
|
if #available(iOS 17.0, macOS 14.0, *) {
|
|
isDetectionSensorMessage ? Image(systemName: "sensor.fill")
|
|
.padding()
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topTrailing)
|
|
.foregroundStyle(Color.orange)
|
|
.symbolRenderingMode(.multicolor)
|
|
.symbolEffect(.variableColor.reversing.cumulative, options: .repeat(20).speed(3))
|
|
.offset(x: 20, y: -20)
|
|
: nil
|
|
} else {
|
|
isDetectionSensorMessage ? Image(systemName: "sensor.fill")
|
|
.padding()
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topTrailing)
|
|
.foregroundStyle(Color.orange)
|
|
.offset(x: 20, y: -20)
|
|
: nil
|
|
}
|
|
}
|
|
} else {
|
|
EmptyView()
|
|
}
|
|
}
|
|
.contextMenu {
|
|
MessageContextMenuItems(
|
|
message: message,
|
|
tapBackDestination: tapBackDestination,
|
|
isCurrentUser: isCurrentUser,
|
|
isShowingDeleteConfirmation: $isShowingDeleteConfirmation,
|
|
onReply: onReply
|
|
)
|
|
}
|
|
.confirmationDialog(
|
|
"Are you sure you want to delete this message?",
|
|
isPresented: $isShowingDeleteConfirmation,
|
|
titleVisibility: .visible
|
|
) {
|
|
Button("Delete Message", role: .destructive) {
|
|
context.delete(message)
|
|
do {
|
|
try context.save()
|
|
} catch {
|
|
Logger.data.error("Failed to delete message \(message.messageId): \(error.localizedDescription)")
|
|
}
|
|
}
|
|
Button("Cancel", role: .cancel) {}
|
|
}
|
|
}
|
|
}
|
|
|
|
private extension MessageDestination {
|
|
var overlaySensorMessage: Bool {
|
|
switch self {
|
|
case .user: return false
|
|
case .channel: return true
|
|
}
|
|
}
|
|
}
|