Merge branch 'main' into main-IOSSDKBUG-187

Author: dyongxu

Diff for: Apps/Examples/Examples/FioriSwiftUICore/Card/MobileCardExample.swift

@@ -20,6 +20,19 @@ struct MobileCardExample: View {
             } label: {
                 Text("Cards")
             }
+            
+            NavigationLink {
+                List {
+                    ForEach(0 ..< CardTests.cardFooterSamples.count, id: \.self) { i in
+                        CardTests.cardFooterSamples[i]
+                    }
+                }
+                .cardStyle(.card)
+                .listStyle(.plain)
+                .navigationBarTitle("Footers", displayMode: .inline)
+            } label: {
+                Text("Footers")
+            }
 
             NavigationLink {
                 MasonryTestView()
@@ -90,24 +103,26 @@ struct CarouselTestView: View {
     }
 
     var body: some View {
-        Carousel(numberOfColumns: Int(self.numberOfColumns), spacing: self.spacing, alignment: self.alignment == 0 ? .top : (self.alignment == 1 ? .center : .bottom), isSnapping: self.isSnapping) {
-            if self.contentType == 0 {
-                ForEach(0 ..< CardTests.cardSamples.count, id: \.self) { i in
-                    CardTests.cardSamples[i]
-                }
-            } else {
-                ForEach(0 ..< 20, id: \.self) { i in
-                    Text("Text \(i)")
-                        .font(.title)
-                        .padding()
-                        .frame(height: 100)
-                        .background(Color.gray)
+        ScrollView(.vertical) {
+            Carousel(numberOfColumns: Int(self.numberOfColumns), spacing: self.spacing, alignment: self.alignment == 0 ? .top : (self.alignment == 1 ? .center : .bottom), isSnapping: self.isSnapping) {
+                if self.contentType == 0 {
+                    ForEach(0 ..< CardTests.cardSamples.count, id: \.self) { i in
+                        CardTests.cardSamples[i]
+                    }
+                } else {
+                    ForEach(0 ..< 20, id: \.self) { i in
+                        Text("Text \(i)")
+                            .font(.title)
+                            .padding()
+                            .frame(height: 100)
+                            .background(Color.gray)
+                    }
                 }
             }
+            .cardStyle(.card)
+            .padding(self.padding)
+            .border(Color.gray)
         }
-        .cardStyle(.card)
-        .padding(self.padding)
-        .border(Color.gray)
         .sheet(isPresented: self.$isPresented, content: {
             VStack {
                 HStack {

Diff for: Apps/Examples/Examples/FioriSwiftUICore/FormViews/KeyValueFormViewExample.swift

@@ -3,26 +3,26 @@ import SwiftUI
 
 struct KeyValueFormViewExample: View {
     var key1: AttributedString {
-        var aString = AttributedString("Key 1")
+        let aString = AttributedString("Key 1")
         return aString
     }
 
     var key1Long: AttributedString {
-        var aString = AttributedString("Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 ")
+        let aString = AttributedString("Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 Long Key 1 ")
         return aString
     }
 
     @State var valueText1: String = "1234567890 12345678"
 
     var key2: AttributedString {
-        var aString = AttributedString("Key 2")
+        let aString = AttributedString("Key 2")
         return aString
     }
 
     @State var valueText2: String = "This is a test"
 
     var key3: AttributedString {
-        var aString = AttributedString("Key 3")
+        let aString = AttributedString("Key 3")
         return aString
     }
 
@@ -65,8 +65,13 @@ struct KeyValueFormViewExample: View {
                 Toggle("Mandatory Field", isOn: self.$isRequired)
                     .padding(.leading, 16)
                     .padding(.trailing, 16)
+                Button("Dismiss Keyboard") {
+                    hideKeyboard()
+                }
+                .padding(.leading, 16)
+                .padding(.trailing, 16)
 
-                Text("Default KeyValueFormView")
+                Text("Default KeyValueForm")
                 KeyValueFormView(title: self.key1, text: self.$valueText1, placeholder: "KeyValueFormView", errorMessage: self.getErrorMessage(), maxTextLength: self.getMaxTextLength(), hintText: self.getHintText(), isCharCountEnabled: self.showsCharCount, allowsBeyondLimit: self.allowsBeyondLimit, isRequired: self.isRequired)
 
                 Text("Existing Text")
@@ -104,6 +109,14 @@ struct KeyValueFormViewExample: View {
     }
 }
 
+#if canImport(UIKit)
+    extension View {
+        func hideKeyboard() {
+            UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+        }
+    }
+#endif
+
 // #Preview {
 //    KeyValueFormViewExample()
 // }

Diff for: Apps/Examples/Examples/FioriSwiftUICore/FormViews/NoteFormViewExample.swift

@@ -43,6 +43,11 @@ struct NoteFormViewExample: View {
                 Toggle("Hides Read-Only Hint", isOn: self.$hidesReadonlyHint)
                     .padding(.leading, 16)
                     .padding(.trailing, 16)
+                Button("Dismiss Keyboard") {
+                    hideKeyboard()
+                }
+                .padding(.leading, 16)
+                .padding(.trailing, 16)
 
                 Text("Default NoteForm")
                 NoteFormView(text: self.$valueText1, placeholder: "NoteFormView", errorMessage: self.getErrorMessage(), maxTextLength: self.getMaxTextLength(), hintText: self.getHintText(), isCharCountEnabled: self.showsCharCount, allowsBeyondLimit: self.allowsBeyondLimit)

Diff for: Apps/Examples/Examples/FioriSwiftUICore/FormViews/TextFieldFormViewExample.swift

@@ -64,6 +64,11 @@ struct TextFieldFormViewExample: View {
                 Toggle("Mandatory Field", isOn: self.$isRequired)
                     .padding(.leading, 16)
                     .padding(.trailing, 16)
+                Button("Dismiss Keyboard") {
+                    hideKeyboard()
+                }
+                .padding(.leading, 16)
+                .padding(.trailing, 16)
 
                 Text("Default TitleForm")
                 TextFieldFormView(title: self.key1, text: self.$valueText1, placeholder: "TextFieldFormView", errorMessage: self.getErrorMessage(), maxTextLength: self.getMaxTextLength(), hintText: self.getHintText(), isCharCountEnabled: self.showsCharCount, allowsBeyondLimit: self.allowsBeyondLimit, isRequired: self.isRequired, actionIcon: self.getActionIcon(), action: self.getAction())

Diff for: Sources/FioriSwiftUICore/Utils/EqualWidthWithMaxWidthHStackLayout.swift

@@ -138,6 +138,20 @@ protocol _SecondaryActionComponent {
     var secondaryAction: FioriButton? { get }
 }
 
+// sourcery: BaseComponent
+protocol _TertiaryActionComponent {
+    // sourcery: @ViewBuilder
+    var tertiaryAction: FioriButton? { get }
+}
+
+// sourcery: BaseComponent
+protocol _OverflowActionComponent {
+    // sourcery: @ViewBuilder
+    // sourcery: defaultValue = "FioriButton { _ in Image(systemName: "ellipsis") }"
+    // sourcery: resultBuilder.defaultValue = "{ FioriButton { _ in Image(systemName: "ellipsis") } }"
+    var overflowAction: FioriButton? { get }
+}
+
 // sourcery: BaseComponent
 protocol _Row1Component {
 //    var numberOfLines: Int { get set }

Diff for: Sources/FioriSwiftUICore/_ComponentProtocols/BaseComponentProtocols.swift

@@ -24,7 +24,7 @@ protocol _CardMainHeaderComponent: _TitleComponent, _SubtitleComponent, _IconsCo
 protocol _CardExtHeaderComponent: _Row1Component, _Row2Component, _Row3Component, _KpiComponent, _KpiCaptionComponent {}
 
 // sourcery: CompositeComponent
-protocol _CardFooterComponent: _ActionComponent, _SecondaryActionComponent {}
+protocol _CardFooterComponent: _ActionComponent, _SecondaryActionComponent, _TertiaryActionComponent, _OverflowActionComponent {}
 
 // sourcery: CompositeComponent
 protocol _CardHeaderComponent: _CardMediaComponent, _CardMainHeaderComponent, _CardExtHeaderComponent {}