Plugin picker: manufacturer, category, image and subtitle on plugin descriptors

LoopKit/LoopPluginBundleKey.swift

@@ -20,4 +20,7 @@ public enum LoopPluginBundleKey: String {
     case serviceIdentifier = "com.loopkit.Loop.ServiceIdentifier"
     case statefulPluginIdentifier = "com.loopkit.Loop.StatefulPluginIdentifier"
     case supportIdentifier = "com.loopkit.Loop.SupportIdentifier"
+    case deviceManufacturer = "com.loopkit.Loop.DeviceManufacturer"
+    case serviceCategory = "com.loopkit.Loop.ServiceCategory"
+    case pluginSubtitle = "com.loopkit.Loop.PluginSubtitle"
 }

LoopKitUI/CGMManagerUI.swift

@@ -7,16 +7,30 @@
 
 import HealthKit
 import SwiftUI
+import UIKit
 import LoopKit
 import LoopAlgorithm
 
 public struct CGMManagerDescriptor {
     public let identifier: String
     public let localizedTitle: String
+    /// The models the plugin supports, or other details shown under the title in the picker
+    public let subtitle: String?
+    public let manufacturer: String?
+    public let image: UIImage?
 
-    public init(identifier: String, localizedTitle: String) {
+    public init(
+        identifier: String,
+        localizedTitle: String,
+        subtitle: String? = nil,
+        manufacturer: String?,
+        image: UIImage?
+    ) {
         self.identifier = identifier
         self.localizedTitle = localizedTitle
+        self.subtitle = subtitle
+        self.manufacturer = manufacturer
+        self.image = image
     }
 }
 

LoopKitUI/DeviceManagerUI.swift

@@ -13,6 +13,13 @@ public protocol DeviceManagerUI: DeviceManager {
     /// An image representing a generalized device. Used during onboarding.
     static var onboardingImage: UIImage? { get }
 
+    /// An image used in the device picker
+    static var pickerImage: UIImage? { get }
+
     /// An image representing a device configuration after it is set up
     var smallImage: UIImage? { get }
 }
+
+public extension DeviceManagerUI {
+    static var pickerImage: UIImage? { onboardingImage }
+}

LoopKitUI/PumpManagerUI.swift

@@ -13,10 +13,23 @@ import LoopAlgorithm
 public struct PumpManagerDescriptor {
     public let identifier: String
     public let localizedTitle: String
-
-    public init(identifier: String, localizedTitle: String) {
+    /// The models the plugin supports, or other details shown under the title in the picker
+    public let subtitle: String?
+    public let manufacturer: String?
+    public let image: UIImage?
+
+    public init(
+        identifier: String,
+        localizedTitle: String,
+        subtitle: String? = nil,
+        manufacturer: String?,
+        image: UIImage?
+    ) {
         self.identifier = identifier
         self.localizedTitle = localizedTitle
+        self.subtitle = subtitle
+        self.manufacturer = manufacturer
+        self.image = image
     }
 }
 

LoopKitUI/ServiceUI.swift

@@ -12,10 +12,23 @@ import LoopKit
 public struct ServiceDescriptor {
     public let identifier: String
     public let localizedTitle: String
+    /// Details shown under the title in the picker
+    public let subtitle: String?
+    public let category: String?
+    public let image: UIImage?
 
-    public init(identifier: String, localizedTitle: String) {
+    public init(
+        identifier: String,
+        localizedTitle: String,
+        subtitle: String? = nil,
+        category: String?,
+        image: UIImage?
+    ) {
         self.identifier = identifier
         self.localizedTitle = localizedTitle
+        self.subtitle = subtitle
+        self.category = category
+        self.image = image
     }
 }