feat: 🎸 [JIRA:HCPSDKFIORIUIKIT-2717] Feedback Patterns

SAP · Sep 19, 2024 · d60c886 · d60c886
1 parent 2a76f63
commit d60c886
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/...xamples/Examples/FioriSwiftUICore/BannerMessage/BannerMultiMessageCustomInitExample.swift b/...xamples/Examples/FioriSwiftUICore/BannerMessage/BannerMultiMessageCustomInitExample.swift
@@ -350,19 +350,19 @@ struct BannerMultiMessageCustomInitExample: View {
         }
 
         var result: [BannerMessageListModel] = []
-        if errorMessages.count > 0 {
+        if !errorMessages.isEmpty {
             result.append(BannerMessageListModel(category: "Errors", items: errorMessages))
         }
-        if warningMessages.count > 0 {
+        if !warningMessages.isEmpty {
             result.append(BannerMessageListModel(category: "Warnings", items: warningMessages))
         }
-        if informationMessages.count > 0 {
+        if !informationMessages.isEmpty {
             result.append(BannerMessageListModel(category: "Information", items: informationMessages))
         }
 
         self.bannerMultiMessages = result
 
-        self.showingMessageDetail = self.bannerMultiMessages.count > 0
+        self.showingMessageDetail = !self.bannerMultiMessages.isEmpty
     }
 
     var isEmailInvalid: Bool {

diff --git a/Apps/Examples/Examples/FioriSwiftUICore/BannerMessage/BannerMultiMessageExample.swift b/Apps/Examples/Examples/FioriSwiftUICore/BannerMessage/BannerMultiMessageExample.swift
@@ -256,19 +256,19 @@ struct BannerMultiMessageExample: View {
         }
 
         var result: [BannerMessageListModel] = []
-        if errorMessages.count > 0 {
+        if !errorMessages.isEmpty {
             result.append(BannerMessageListModel(category: "Errors", items: errorMessages))
         }
-        if warningMessages.count > 0 {
+        if !warningMessages.isEmpty {
             result.append(BannerMessageListModel(category: "Warnings", items: warningMessages))
         }
-        if informationMessages.count > 0 {
+        if !informationMessages.isEmpty {
             result.append(BannerMessageListModel(category: "Information", items: informationMessages))
         }
 
         self.bannerMultiMessages = result
 
-        self.showBanner = self.bannerMultiMessages.count > 0
+        self.showBanner = !self.bannerMultiMessages.isEmpty
     }
 
     var isEmailInvalid: Bool {

diff --git a/Sources/FioriSwiftUICore/_FioriStyles/BannerMessageStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/BannerMessageStyle.fiori.swift
@@ -235,10 +235,8 @@ public extension View {
     {
         var finalMessageType = messageType
         for bannerMessageListModel in bannerMultiMessages {
-            for singleMessageModel in bannerMessageListModel.wrappedValue.items {
-                if singleMessageModel.messageType.rawValue > finalMessageType.rawValue {
-                    finalMessageType = singleMessageModel.messageType
-                }
+            for singleMessageModel in bannerMessageListModel.wrappedValue.items where singleMessageModel.messageType.rawValue > finalMessageType.rawValue {
+                finalMessageType = singleMessageModel.messageType
             }
         }
         return self.modifier(BannerMessageModifier(icon: icon(),
@@ -309,7 +307,7 @@ struct BannerMessageModifier: ViewModifier {
             summary.append("\(value) \(self.messageDesc(type: key, count: value))")
         }
 
-        if summary.count > 0 {
+        if !summary.isEmpty {
             var result = ""
             for i in 0 ..< summary.count {
                 if result == "" {
@@ -366,7 +364,7 @@ struct BannerMessageModifier: ViewModifier {
                         BannerMultiMessageSheet(closeAction: {
                             self.showingMessageDetail = false
                         }, removeAction: { _, _ in
-                            if self.bannerMultiMessages.count == 0 {
+                            if self.bannerMultiMessages.isEmpty {
                                 self.isPresented = false
                             }
                         }, viewDetailAction: self.viewDetailAction, turnOnSectionHeader: self.turnOnSectionHeader, bannerMultiMessages: self.$bannerMultiMessages)

diff --git a/Sources/FioriSwiftUICore/_FioriStyles/BannerMultiMessageSheet.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/BannerMultiMessageSheet.fiori.swift
@@ -293,7 +293,7 @@ public struct BannerMultiMessageSheet: View {
         .animation(.spring, value: self.popoverHeight)
         .onChange(of: self.bannerMultiMessages) { _ in
             // when datasource is empty, dismiss in 2 seconds
-            if self.bannerMultiMessages.count == 0 {
+            if self.bannerMultiMessages.isEmpty {
                 self.timer = Timer.scheduledTimer(withTimeInterval: 2, repeats: false, block: { _ in
                     self.dismiss()
                 })