Refactor context menus and buttons to use Label

fwcd · fwcd · commit d5739bb8a670 · 2024-08-04T01:47:51.000+02:00
diff --git a/DistributedChatApp/View/ChannelsView.swift b/DistributedChatApp/View/ChannelsView.swift
@@ -43,43 +43,37 @@ struct ChannelsView: View {
                             deletingChannels = [channel]
                             deletionConfirmationShown = true
                         } label: {
-                            Text("Delete Locally")
-                            Image(systemName: "trash")
+                            Label("Delete Locally", systemImage: "trash")
                         }
                         if messages.unreadChannels.contains(channel) {
                             Button {
                                 messages.markAsRead(channel: channel)
                             } label: {
-                                Text("Mark as Read")
-                                Image(systemName: "circlebadge")
+                                Label("Mark as Read", systemImage: "circlebadge")
                             }
                         }
                         if !messages.pinnedChannels.contains(channel) {
                             Button {
                                 messages.pin(channel: channel)
                             } label: {
-                                Text("Pin")
-                                Image(systemName: "pin.fill")
+                                Label("Pin", systemImage: "pin.fill")
                             }
                         } else if channel != .global {
                             Button {
                                 messages.unpin(channel: channel)
                             } label: {
-                                Text("Unpin")
-                                Image(systemName: "pin.slash.fill")
+                                Label("Unpin", systemImage: "pin.slash.fill")
                             }
                         }
                         Button {
                             UIPasteboard.general.string = channel.displayName(with: network)
                         } label: {
-                            Text("Copy Channel Name")
-                            Image(systemName: "doc.on.doc")
+                            Label("Copy Channel Name", systemImage: "doc.on.doc")
                         }
                         Button {
                             UIPasteboard.general.url = URL(string: "distributedchat:///channel/\(channel)")
                         } label: {
-                            Text("Copy Channel URL")
-                            Image(systemName: "doc.on.doc.fill")
+                            Label("Copy Channel URL", systemImage: "doc.on.doc.fill")
                         }
                     }
                 }
diff --git a/DistributedChatApp/View/MessageView.swift b/DistributedChatApp/View/MessageView.swift
@@ -23,83 +23,69 @@ struct MessageView: View {
             Button {
                 messages.deleteMessage(id: message.id)
             } label: {
-                Text("Delete Locally")
-                Image(systemName: "trash")
+                Label("Delete Locally", systemImage: "trash")
             }
             Button {
                 replyingToMessageId = message.id
             } label: {
-                Text("Reply")
-                Image(systemName: "arrowshape.turn.up.left.fill")
+                Label("Reply", systemImage: "arrowshape.turn.up.left.fill")
             }
             if messages.unreadMessageIds.contains(message.id) {
                 Button {
                     messages.unreadMessageIds.remove(message.id)
                 } label: {
-                    Text("Mark as Read")
-                    Image(systemName: "circlebadge")
+                    Label("Mark as Read", systemImage: "circlebadge")
                 }
             } else {
                 Button {
                     messages.unreadMessageIds.insert(message.id)
                 } label: {
-                    Text("Mark as Unread")
-                    Image(systemName: "circlebadge.fill")
+                    Label("Mark as Unread", systemImage: "circlebadge.fill")
                 }
             }
             if !message.displayContent.isEmpty {
                 ShareLink(item: message.displayContent) {
-                    Text("Share Text")
-                    Image(systemName: "square.and.arrow.up")
+                    Label("Share Text", systemImage: "square.and.arrow.up")
                 }
             }
             ForEach(message.attachments ?? []) { attachment in
                 if let url = attachment.content.asURL {
                     ShareLink(item: url.smartResolved) {
-                        Text("Share \(attachment.type) (\(attachment.name))")
-                        Image(systemName: "square.and.arrow.up")
+                        Label("Share \(attachment.type) (\(attachment.name))", systemImage: "square.and.arrow.up")
                     }
                 }
             }
             if !message.displayContent.isEmpty {
                 Button {
                     UIPasteboard.general.string = message.displayContent
                 } label: {
-                    Text("Copy Text")
-                    Image(systemName: "doc.on.doc")
+                    Label("Copy Text", systemImage: "doc.on.doc")
                 }
             }
             Button {
                 UIPasteboard.general.string = message.id.uuidString
             } label: {
-                Text("Copy Message ID")
-                Image(systemName: "doc.on.doc")
+                Label("Copy Message ID", systemImage: "doc.on.doc")
             }
             Button {
                 UIPasteboard.general.url = URL(string: "distributedchat:///message/\(message.id)")
             } label: {
-                Text("Copy Message URL")
-                Image(systemName: "doc.on.doc.fill")
+                Label("Copy Message URL", systemImage: "doc.on.doc.fill")
             }
-            Group {
-                Button {
-                    UIPasteboard.general.string = message.author.id.uuidString
-                } label: {
-                    Text("Copy Author ID")
-                    Image(systemName: "doc.on.doc")
-                }
-                Button {
-                    UIPasteboard.general.string = message.author.name
-                } label: {
-                    Text("Copy Author Name")
-                    Image(systemName: "doc.on.doc")
-                }
-                Button {
-                    navigation.open(channel: .dm([controller.me.id, message.author.id]))
-                } label: {
-                    Text("Open DM channel")
-                    Image(systemName: "at")
-                }
+            Button {
+                UIPasteboard.general.string = message.author.id.uuidString
+            } label: {
+                Label("Copy Author ID", systemImage: "doc.on.doc")
+            }
+            Button {
+                UIPasteboard.general.string = message.author.name
+            } label: {
+                Label("Copy Author Name", systemImage: "doc.on.doc")
+            }
+            Button {
+                navigation.open(channel: .dm([controller.me.id, message.author.id]))
+            } label: {
+                Label("Open DM channel", systemImage: "at")
             }
         }
         
diff --git a/DistributedChatApp/View/NetworkView.swift b/DistributedChatApp/View/NetworkView.swift
@@ -31,42 +31,36 @@ struct NetworkView: View {
                                 Button {
                                     UIPasteboard.general.string = chatUser.id.uuidString
                                 } label: {
-                                    Text("Copy User ID")
-                                    Image(systemName: "doc.on.doc")
+                                    Label("Copy User ID", systemImage: "doc.on.doc")
                                 }
                                 Button {
                                     UIPasteboard.general.string = chatUser.name
                                 } label: {
-                                    Text("Copy User Name")
-                                    Image(systemName: "doc.on.doc")
+                                    Label("Copy User Name", systemImage: "doc.on.doc")
                                 }
                                 Button {
                                     navigation.open(channel: .dm([network.myId, chatUser.id]))
                                 } label: {
-                                    Text("Open DM channel")
-                                    Image(systemName: "at")
+                                    Label("Open DM channel", systemImage: "at")
                                 }
                             }
                             Button {
                                 UIPasteboard.general.string = user.peripheralIdentifier.uuidString
                             } label: {
-                                Text("Copy Peripheral ID")
-                                Image(systemName: "doc.on.doc")
+                                Label("Copy Peripheral ID", systemImage: "doc.on.doc")
                             }
                             if let peripheralName = user.peripheralName {
                                 Button {
                                     UIPasteboard.general.string = peripheralName
                                 } label: {
-                                    Text("Copy Peripheral Name")
-                                    Image(systemName: "doc.on.doc")
+                                    Label("Copy Peripheral Name", systemImage: "doc.on.doc")
                                 }
                             }
                             if let rssi = user.rssi {
                                 Button {
                                     UIPasteboard.general.string = String(rssi)
                                 } label: {
-                                    Text("Copy RSSI")
-                                    Image(systemName: "doc.on.doc")
+                                    Label("Copy RSSI", systemImage: "doc.on.doc")
                                 }
                             }
                         }
diff --git a/DistributedChatApp/View/PresenceView.swift b/DistributedChatApp/View/PresenceView.swift
@@ -33,28 +33,24 @@ struct PresenceView: View {
             Button {
                 UIPasteboard.general.string = presence.user.id.uuidString
             } label: {
-                Text("Copy User ID")
-                Image(systemName: "doc.on.doc")
+                Label("Copy User ID", systemImage: "doc.on.doc")
             }
             Button {
                 UIPasteboard.general.string = presence.user.name
             } label: {
-                Text("Copy User Name")
-                Image(systemName: "doc.on.doc")
+                Label("Copy User Name", systemImage: "doc.on.doc")
             }
             if !presence.info.isEmpty {
                 Button {
                     UIPasteboard.general.string = presence.info
                 } label: {
-                    Text("Copy Status Info")
-                    Image(systemName: "doc.on.doc")
+                    Label("Copy Status Info", systemImage: "doc.on.doc")
                 }
             }
             Button {
                 navigation.open(channel: .dm([network.myId, presence.user.id]))
             } label: {
-                Text("Open DM channel")
-                Image(systemName: "at")
+                Label("Open DM channel", systemImage: "at")
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -43,43 +43,37 @@ struct ChannelsView: View {`
`43`	`43`	`deletingChannels = [channel]`
`44`	`44`	`deletionConfirmationShown = true`
`45`	`45`	`} label: {`
`46`		`- Text("Delete Locally")`
`47`		`- Image(systemName: "trash")`
	`46`	`+ Label("Delete Locally", systemImage: "trash")`
`48`	`47`	`}`
`49`	`48`	`if messages.unreadChannels.contains(channel) {`
`50`	`49`	`Button {`
`51`	`50`	`messages.markAsRead(channel: channel)`
`52`	`51`	`} label: {`
`53`		`- Text("Mark as Read")`
`54`		`- Image(systemName: "circlebadge")`
	`52`	`+ Label("Mark as Read", systemImage: "circlebadge")`
`55`	`53`	`}`
`56`	`54`	`}`
`57`	`55`	`if !messages.pinnedChannels.contains(channel) {`
`58`	`56`	`Button {`
`59`	`57`	`messages.pin(channel: channel)`
`60`	`58`	`} label: {`
`61`		`- Text("Pin")`
`62`		`- Image(systemName: "pin.fill")`
	`59`	`+ Label("Pin", systemImage: "pin.fill")`
`63`	`60`	`}`
`64`	`61`	`} else if channel != .global {`
`65`	`62`	`Button {`
`66`	`63`	`messages.unpin(channel: channel)`
`67`	`64`	`} label: {`
`68`		`- Text("Unpin")`
`69`		`- Image(systemName: "pin.slash.fill")`
	`65`	`+ Label("Unpin", systemImage: "pin.slash.fill")`
`70`	`66`	`}`
`71`	`67`	`}`
`72`	`68`	`Button {`
`73`	`69`	`UIPasteboard.general.string = channel.displayName(with: network)`
`74`	`70`	`} label: {`
`75`		`- Text("Copy Channel Name")`
`76`		`- Image(systemName: "doc.on.doc")`
	`71`	`+ Label("Copy Channel Name", systemImage: "doc.on.doc")`
`77`	`72`	`}`
`78`	`73`	`Button {`
`79`	`74`	`UIPasteboard.general.url = URL(string: "distributedchat:///channel/\(channel)")`
`80`	`75`	`} label: {`
`81`		`- Text("Copy Channel URL")`
`82`		`- Image(systemName: "doc.on.doc.fill")`
	`76`	`+ Label("Copy Channel URL", systemImage: "doc.on.doc.fill")`
`83`	`77`	`}`
`84`	`78`	`}`
`85`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,42 +31,36 @@ struct NetworkView: View {`
`31`	`31`	`Button {`
`32`	`32`	`UIPasteboard.general.string = chatUser.id.uuidString`
`33`	`33`	`} label: {`
`34`		`- Text("Copy User ID")`
`35`		`- Image(systemName: "doc.on.doc")`
	`34`	`+ Label("Copy User ID", systemImage: "doc.on.doc")`
`36`	`35`	`}`
`37`	`36`	`Button {`
`38`	`37`	`UIPasteboard.general.string = chatUser.name`
`39`	`38`	`} label: {`
`40`		`- Text("Copy User Name")`
`41`		`- Image(systemName: "doc.on.doc")`
	`39`	`+ Label("Copy User Name", systemImage: "doc.on.doc")`
`42`	`40`	`}`
`43`	`41`	`Button {`
`44`	`42`	`navigation.open(channel: .dm([network.myId, chatUser.id]))`
`45`	`43`	`} label: {`
`46`		`- Text("Open DM channel")`
`47`		`- Image(systemName: "at")`
	`44`	`+ Label("Open DM channel", systemImage: "at")`
`48`	`45`	`}`
`49`	`46`	`}`
`50`	`47`	`Button {`
`51`	`48`	`UIPasteboard.general.string = user.peripheralIdentifier.uuidString`
`52`	`49`	`} label: {`
`53`		`- Text("Copy Peripheral ID")`
`54`		`- Image(systemName: "doc.on.doc")`
	`50`	`+ Label("Copy Peripheral ID", systemImage: "doc.on.doc")`
`55`	`51`	`}`
`56`	`52`	`if let peripheralName = user.peripheralName {`
`57`	`53`	`Button {`
`58`	`54`	`UIPasteboard.general.string = peripheralName`
`59`	`55`	`} label: {`
`60`		`- Text("Copy Peripheral Name")`
`61`		`- Image(systemName: "doc.on.doc")`
	`56`	`+ Label("Copy Peripheral Name", systemImage: "doc.on.doc")`
`62`	`57`	`}`
`63`	`58`	`}`
`64`	`59`	`if let rssi = user.rssi {`
`65`	`60`	`Button {`
`66`	`61`	`UIPasteboard.general.string = String(rssi)`
`67`	`62`	`} label: {`
`68`		`- Text("Copy RSSI")`
`69`		`- Image(systemName: "doc.on.doc")`
	`63`	`+ Label("Copy RSSI", systemImage: "doc.on.doc")`
`70`	`64`	`}`
`71`	`65`	`}`
`72`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,28 +33,24 @@ struct PresenceView: View {`
`33`	`33`	`Button {`
`34`	`34`	`UIPasteboard.general.string = presence.user.id.uuidString`
`35`	`35`	`} label: {`
`36`		`- Text("Copy User ID")`
`37`		`- Image(systemName: "doc.on.doc")`
	`36`	`+ Label("Copy User ID", systemImage: "doc.on.doc")`
`38`	`37`	`}`
`39`	`38`	`Button {`
`40`	`39`	`UIPasteboard.general.string = presence.user.name`
`41`	`40`	`} label: {`
`42`		`- Text("Copy User Name")`
`43`		`- Image(systemName: "doc.on.doc")`
	`41`	`+ Label("Copy User Name", systemImage: "doc.on.doc")`
`44`	`42`	`}`
`45`	`43`	`if !presence.info.isEmpty {`
`46`	`44`	`Button {`
`47`	`45`	`UIPasteboard.general.string = presence.info`
`48`	`46`	`} label: {`
`49`		`- Text("Copy Status Info")`
`50`		`- Image(systemName: "doc.on.doc")`
	`47`	`+ Label("Copy Status Info", systemImage: "doc.on.doc")`
`51`	`48`	`}`
`52`	`49`	`}`
`53`	`50`	`Button {`
`54`	`51`	`navigation.open(channel: .dm([network.myId, presence.user.id]))`
`55`	`52`	`} label: {`
`56`		`- Text("Open DM channel")`
`57`		`- Image(systemName: "at")`
	`53`	`+ Label("Open DM channel", systemImage: "at")`
`58`	`54`	`}`
`59`	`55`	`}`
`60`	`56`	`}`