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

Messages Cleanup

Browse source
This commit is contained in:
Garth Vander Houwen 2022-11-03 20:26:38 -07:00
parent a89b42d7aa
commit 0c3dbf3b26
3 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Meshtastic/Views/Messages/Contacts.swift
View file

@ -36,7 +36,7 @@ struct Contacts: View {
NavigationSplitView {
List {
Section(header: Text("Primary Channel")) {
Section(header: Text("Direct Messages")) {
ForEach(users) { (user: UserEntity) in
if user.num != bleManager.userSettings?.preferredNodeNum ?? 0 {
@ -52,43 +52,41 @@ struct Contacts: View {
HStack {
VStack(alignment: .leading) {
HStack {
CircleText(text: user.shortName ?? "???", color: Color.blue)
.padding(.trailing, 5)
}
VStack {
HStack {
VStack {
Text(user.longName ?? "Unknown").font(.headline).fixedSize()
Text(user.longName ?? "Unknown").font(.headline)
}
VStack {
.frame(maxWidth: .infinity, alignment: .leading)
VStack (alignment: .trailing) {
if lastMessageDay == currentDay {
Text(lastMessageTime, style: .time )
.font(.caption)
.font(.callout)
.foregroundColor(.gray)
} else if lastMessageDay == (currentDay - 1) {
Text("Yesterday")
.font(.callout)
.foregroundColor(.gray)
} else if lastMessageDay < (currentDay - 1) && lastMessageDay > (currentDay - 5) {
Text(lastMessageTime, style: .date)
Text(lastMessageTime.formattedDate(format: "MM/dd/yy"))
.font(.callout)
.foregroundColor(.gray)
} else if lastMessageDay < (currentDay - 1800) {
Text(lastMessageTime, style: .date)
Text(lastMessageTime.formattedDate(format: "MM/dd/yy"))
.font(.callout)
.foregroundColor(.gray)
}
}
.frame(maxWidth: .infinity, alignment: .trailing)
}
HStack(alignment: .top) {
Text("\(mostRecent != nil ? mostRecent!.messagePayload! : " ")")
.frame(height: 50)
.truncationMode(.tail)
.foregroundColor(Color.gray)
.frame(maxWidth: .infinity, alignment: .leading)
}
}
.padding(.top)
}
} else {
HStack {
@ -108,7 +106,6 @@ struct Contacts: View {
}
HStack(alignment: .top) {
Text(" ")
.frame(height: 50 )
.truncationMode(.tail)
.foregroundColor(Color.gray)
.frame(maxWidth: .infinity, alignment: .leading)
@ -125,7 +122,6 @@ struct Contacts: View {
// Display Contacts for the rest of the non admin channels
}
.hidden()
}
.tint(Color(UIColor.systemGray))
.navigationSplitViewStyle(.automatic)

4
Meshtastic/Views/Messages/MessageList.swift
View file

@ -422,8 +422,8 @@ struct MessageList: View {
.toolbar {
ToolbarItem(placement: .principal) {
HStack {
CircleText(text: user.shortName ?? "???", color: .blue, circleSize: 42, fontSize: 16).fixedSize()
Text(user.longName ?? "Unknown").font(.headline).fixedSize()
CircleText(text: user.shortName ?? "???", color: .blue, circleSize: 44, fontSize: 14).fixedSize()
Text(user.longName ?? "Unknown").font(.headline)
}
}
ToolbarItem(placement: .navigationBarTrailing) {

3
Meshtastic/Views/Nodes/NodeDetail.swift
View file

@ -431,8 +431,7 @@ struct NodeDetail: View {
.offset( y:-40)
}
.edgesIgnoringSafeArea([.leading, .trailing])
.navigationTitle((node.user != nil) ? String(node.user!.longName ?? "Unknown") : "Unknown")
.navigationBarTitleDisplayMode(.inline)
.navigationBarTitle((node.user != nil) ? String(node.user!.longName ?? "Unknown") : "Unknown", displayMode: .inline)
.padding(.bottom, 10)
.navigationBarItems(trailing: