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

Hide messages tab, set up app for beta review

Browse source
This commit is contained in:
Garth Vander Houwen 2021-09-24 21:53:17 -07:00
parent cb0264af32
commit 2c13a9ed95
5 changed files with 20 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Meshtastic Client.xcodeproj/project.pbxproj
View file

@ -43,7 +43,6 @@
DDC2E1A726CEB3400042C5E4 /* LocationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */; };
DDF924C626FA2375009FE055 /* MessageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924C526FA2375009FE055 /* MessageModel.swift */; };
DDF924CA26FBB953009FE055 /* ConnectedDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924C926FBB953009FE055 /* ConnectedDevice.swift */; };
DDF924CD26FCC97E009FE055 /* PacketModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924CC26FCC97E009FE055 /* PacketModel.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -107,7 +106,6 @@
DDF924C526FA2375009FE055 /* MessageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageModel.swift; sourceTree = "<group>"; };
DDF924C926FBB953009FE055 /* ConnectedDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectedDevice.swift; sourceTree = "<group>"; };
DDF924CB26FCC916009FE055 /* packets.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = packets.json; sourceTree = "<group>"; };
DDF924CC26FCC97E009FE055 /* PacketModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PacketModel.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -261,7 +259,6 @@
DDF924C526FA2375009FE055 /* MessageModel.swift */,
DD836AEC26F858F900ABCC23 /* MeshData.swift */,
DD836AEE26F85D8D00ABCC23 /* NodeInfoModel.swift */,
DDF924CC26FCC97E009FE055 /* PacketModel.swift */,
DD23A50E26FD1B4400D9B90C /* PeripheralModel.swift */,
);
path = Model;
@ -457,7 +454,6 @@
DD90860C26F684AF00DC5189 /* BatteryIcon.swift in Sources */,
DDAF8C6226ED0A230058C060 /* mqtt.pb.swift in Sources */,
DDF924CA26FBB953009FE055 /* ConnectedDevice.swift in Sources */,
DDF924CD26FCC97E009FE055 /* PacketModel.swift in Sources */,
DDAF8C5D26ED09490058C060 /* portnums.pb.swift in Sources */,
DD47E3DF26F39D9F00029299 /* MyInfoModel.swift in Sources */,
DD23A50F26FD1B4400D9B90C /* PeripheralModel.swift in Sources */,
@ -641,7 +637,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.13;
MARKETING_VERSION = 1.14;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;
@ -667,7 +663,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.13;
MARKETING_VERSION = 1.14;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;

6
MeshtasticClient/Model/MessageModel.swift
View file

@ -15,11 +15,13 @@ struct MessageModel : Identifiable
var toUserId: String
var fromUserLongName: String
var toUserLongName: String
var fromUserShortName: String
var toUserShortName: String
var receivedACK: Bool
var messagePayload: String
var direction: String
init(id: UUID = UUID(), messageId: UInt32, messageTimeStamp: Int64, fromUserId: String, toUserId: String, fromUserLongName: String, toUserLongName: String, receivedACK: Bool, messagePayload: String, direction: String)
init(id: UUID = UUID(), messageId: UInt32, messageTimeStamp: Int64, fromUserId: String, toUserId: String, fromUserLongName: String, toUserLongName: String, fromUserShortName: String, toUserShortName: String, receivedACK: Bool, messagePayload: String, direction: String)
{
self.id = id
self.messageId = messageId
@ -28,6 +30,8 @@ struct MessageModel : Identifiable
self.toUserId = toUserId
self.fromUserLongName = fromUserLongName
self.toUserLongName = toUserLongName
self.fromUserShortName = fromUserShortName
self.toUserShortName = toUserShortName
self.receivedACK = receivedACK
self.messagePayload = messagePayload
self.direction = direction

22
MeshtasticClient/Model/PacketModel.swift
View file

@ -1,22 +0,0 @@
struct PacketModel: Identifiable {
var id: UInt32
var from: UInt32
var to: UInt32
var channel: UInt32
var rxTime: UInt32
var hopLimit: UInt32
var wantAck: Bool
init(id: UInt32, from: UInt32, to: UInt32, channel: UInt32, rxTime: UInt32, hopLimit: UInt32, wantAck: Bool) {
self.id = id
self.from = from
self.to = to
self.channel = channel
self.rxTime = rxTime
self.hopLimit = hopLimit
self.wantAck = wantAck
}
}

24
MeshtasticClient/Views/ContentView.swift
View file

@ -17,24 +17,24 @@ struct ContentView: View {
var body: some View {
TabView(selection: $selection) {
MessageList()
.tabItem {
Label("Messages", systemImage: "text.bubble")
.symbolRenderingMode(.hierarchical)
}
.tag(Tab.messages)
NodeMap()
.tabItem {
Label("Mesh Map", systemImage: "map")
.symbolRenderingMode(.hierarchical)
}
.tag(Tab.map)
//MessageList()
// .tabItem {
// Label("Messages", systemImage: "text.bubble")
// .symbolRenderingMode(.hierarchical)
// }
// .tag(Tab.messages)
NodeList()
.tabItem {
Label("Nodes", systemImage: "flipphone")
.symbolRenderingMode(.hierarchical)
}
.tag(Tab.nodes)
NodeMap()
.tabItem {
Label("Mesh Map", systemImage: "map")
.symbolRenderingMode(.hierarchical)
}
.tag(Tab.map)
Connect()
.tabItem {
Label("Bluetooth", systemImage: "dot.radiowaves.left.and.right")

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

@ -19,7 +19,7 @@ struct NodeRow: View {
Image(systemName: "timer").font(.headline).foregroundColor(.blue).symbolRenderingMode(.hierarchical)
let lastHeard = Date(timeIntervalSince1970: TimeInterval(node.lastHeard))
Text("Last Heard:").font(.headline).foregroundColor(.gray)
Text(lastHeard, style: .relative).font(.subheadline).foregroundColor(.gray)
Text(lastHeard, style: .relative).font(.headline).foregroundColor(.gray)
}
}.padding([.leading, .top, .bottom])
}