Add display name to search

meshtastic · Aug 7, 2024 · 6bb8d03 · 6bb8d03
1 parent 91022d2
commit 6bb8d03
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Meshtastic/Resources/DeviceHardware.json b/Meshtastic/Resources/DeviceHardware.json
@@ -367,6 +367,14 @@
 	"activelySupported": true,
 	"displayName": "RadioMaster 900 Bandit Nano"
   },
+  {
+	"hwModel": 66,
+	"hwModelSlug": "HELTEC_VISION_MASTER_T190",
+	"platformioTarget": "heltec-vision-master-T190",
+	"architecture": "esp32-s3",
+	"activelySupported": true,
+	"displayName": "Heltec Vision Master T190"
+  },
   {
 	"hwModel": 67,
 	"hwModelSlug": "HELTEC_VISION_MASTER_E213",

diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift
@@ -237,7 +237,7 @@ struct UserList: View {
 	private func searchUserList() {
 
 		/// Case Insensitive Search Text Predicates
-		let searchPredicates = ["userId", "numString", "hwModel", "longName", "shortName"].map { property in
+		let searchPredicates = ["userId", "numString", "hwModel", "hwDisplayName", "longName", "shortName"].map { property in
 			return NSPredicate(format: "%K CONTAINS[c] %@", property, searchText)
 		}
 		/// Create a compound predicate using each text search preicate as an OR

diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift
@@ -344,7 +344,7 @@ struct NodeList: View {
 
 	private func searchNodeList() async {
 		/// Case Insensitive Search Text Predicates
-		let searchPredicates = ["user.userId", "user.numString", "user.hwModel", "user.longName", "user.shortName"].map { property in
+		let searchPredicates = ["user.userId", "user.numString", "user.hwModel", "user.hwDisplayName", "user.longName", "user.shortName"].map { property in
 			return NSPredicate(format: "%K CONTAINS[c] %@", property, searchText)
 		}
 		/// Create a compound predicate using each text search preicate as an OR