@@ -60,14 +60,14 @@ struct NotificationContentParser {
6060 }
6161 } else {
6262 if #available( iOS 15 . 0 , * ) {
63- return UNTextInputNotificationAction ( identifier: button. identifier,
64- title: button. title,
65- options: getOptions ( forActionButton: button) ,
66- icon: getNotificationIcon ( forActionButton: button) )
63+ return UNNotificationAction ( identifier: button. identifier,
64+ title: button. title,
65+ options: getOptions ( forActionButton: button) ,
66+ icon: getNotificationIcon ( forActionButton: button) )
6767 } else {
68- return UNTextInputNotificationAction ( identifier: button. identifier,
69- title: button. title,
70- options: getOptions ( forActionButton: button) )
68+ return UNNotificationAction ( identifier: button. identifier,
69+ title: button. title,
70+ options: getOptions ( forActionButton: button) )
7171 }
7272 }
7373 }
@@ -76,15 +76,15 @@ struct NotificationContentParser {
7676 guard let identifier = json [ JsonKey . ActionButton. identifier] as? String else { return nil }
7777 guard let title = json [ JsonKey . ActionButton. title] as? String else { return nil }
7878
79+ let actionIcon = ( json [ JsonKey . ActionButton. actionIcon] as? [ AnyHashable : Any ] ) . flatMap ( ActionIcon . from ( json: ) )
7980 return ActionButton ( identifier: identifier,
8081 title: title,
8182 buttonType: getButtonType ( info: json) ,
8283 openApp: getBoolValue ( json [ JsonKey . ActionButton. openApp] ) ?? true ,
8384 requiresUnlock: getBoolValue ( json [ JsonKey . ActionButton. requiresUnlock] ) ?? false ,
8485 textInputTitle: json [ JsonKey . ActionButton. inputTitle] as? String ,
8586 textInputPlaceholder: json [ JsonKey . ActionButton. inputPlaceholder] as? String ,
86- systemImageName: json [ JsonKey . ActionButton. systemImageName] as? String ,
87- templateImageName: json [ JsonKey . ActionButton. templateImageName] as? String )
87+ actionIcon: actionIcon)
8888 }
8989
9090 private static func getButtonType( info: [ AnyHashable : Any ] ) -> ButtonType {
@@ -120,13 +120,14 @@ struct NotificationContentParser {
120120
121121 @available ( iOS 15 . 0 , * )
122122 private static func getNotificationIcon( forActionButton button: ActionButton ) -> UNNotificationActionIcon ? {
123- if let systemImageName = button. systemImageName {
124- return UNNotificationActionIcon ( systemImageName: systemImageName)
125- } else if let templateImageName = button. templateImageName {
126- return UNNotificationActionIcon ( templateImageName: templateImageName)
127- } else {
123+ guard let actionIcon = button. actionIcon else {
128124 return nil
129125 }
126+ if actionIcon. iconType == . systemImage {
127+ return UNNotificationActionIcon ( systemImageName: actionIcon. imageName)
128+ } else {
129+ return UNNotificationActionIcon ( templateImageName: actionIcon. imageName)
130+ }
130131 }
131132
132133 private enum ButtonType : String {
@@ -143,7 +144,24 @@ struct NotificationContentParser {
143144 let requiresUnlock : Bool
144145 let textInputTitle : String ?
145146 let textInputPlaceholder : String ?
146- let systemImageName : String ?
147- let templateImageName : String ?
147+ let actionIcon : ActionIcon ?
148+ }
149+
150+ private enum ActionIconType : String , Codable {
151+ case systemImage
152+ case templateImage
153+ }
154+
155+ private struct ActionIcon : Codable {
156+ let iconType : ActionIconType
157+ let imageName : String
158+
159+ static func from( json: [ AnyHashable : Any ] ) -> ActionIcon ? {
160+ guard let data = try ? JSONSerialization . data ( withJSONObject: json, options: [ ] ) else {
161+ return nil
162+ }
163+ return try ? JSONDecoder ( ) . decode ( ActionIcon . self, from: data)
164+ }
148165 }
149166}
167+
0 commit comments