Skip to content

Commit

Permalink
feat: 🎸 [JIRA:HCPSDKFIORIUIKIT-2717] Feedback Patterns with sourcery …
Browse files Browse the repository at this point in the history 
…protocols

Modify sourcery script to adapt the viewbuilder with parameters in closure
  • Loading branch information
@hengyi-zhang
hengyi-zhang committed Oct 30, 2024
1 parent 9142290 commit e954845
Show file tree
Hide file tree
Showing 14 changed files with 600 additions and 188 deletions.
18 changes: 14 additions & 4 deletions ...xamples/Examples/FioriSwiftUICore/BannerMessage/BannerMultiMessageCustomInitExample.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// Copyright © 2024 SAP. All rights reserved.
//
import FioriSwiftUICore
import FioriThemeManager
import RegexBuilder
import SwiftUI

Expand Down Expand Up @@ -61,11 +62,20 @@ struct BannerMultiMessageCustomInitExample: View {
Spacer()
}
.popover(isPresented: self.$showingMessageDetail) {
BannerMultiMessageSheet(closeAction: {
BannerMultiMessageSheet(title: {
Text("CustomMessagesCount")
}, closeAction: {
FioriButton(isSelectionPersistent: false, action: { _ in
self.showingMessageDetail = false
}, image: { _ in
FioriIcon.tables.circleTaskFill
})
.fioriButtonStyle(FioriTertiaryButtonStyle(colorStyle: .normal))
}, dismissAction: {
self.showingMessageDetail = false
}, removeAction: { category, _ in
self.removeCategory(category: category)
}, turnOnSectionHeader: self.turnOnSectionHeader, bannerMultiMessages: self.$bannerMultiMessages) { id in
}, turnOnSectionHeader: self.turnOnSectionHeader, messageItemView: { id in
if let (message, category) = getItemData(with: id) {
BannerMessage(icon: {
message.icon
Expand Down Expand Up @@ -103,8 +113,8 @@ struct BannerMultiMessageCustomInitExample: View {
} else {
EmptyView()
}
}
.presentationDetents([.medium, .large])
}, bannerMultiMessages: self.$bannerMultiMessages)
.presentationDetents([.medium, .large])
}
}
.listRowSeparator(.hidden)
Expand Down
22 changes: 17 additions & 5 deletions Sources/FioriSwiftUICore/_ComponentProtocols/CompositeComponentProtocols.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -632,11 +632,23 @@ protocol _ToastMessageComponent: _IconComponent, _TitleComponent {
var duration: Double { get }
}

// sourcery: CompositeComponent
protocol _BannerMultiMessageSheet: _TitleComponent, _CloseActionComponent {
var closeAction: () -> Void { get }
var removeAction: (String, UUID?) -> Void { get }
var viewDetailAction: (UUID) -> Void { get }
/// callback when this component want to dismiss itself
var dismissAction: (() -> Void)? { get }
/// callback when category or single item is removed
var removeAction: ((String, UUID?) -> Void)? { get }
/// callback when the link button is clicked
var viewDetailAction: ((UUID) -> Void)? { get }
// sourcery: defaultValue = true
/// the mark to turn on section header or not
var turnOnSectionHeader: Bool { get }
// @ViewBuilder messageItemView: @escaping ((UUID) -> any View)
// var bannerMultiMessages: Binding<[BannerMessageListModel]
// sourcery: @ViewBuilder
// sourcery: defaultValue = "{ _ in EmptyView() }"
// sourcery: resultBuilder.defaultValue = "{ _ in EmptyView() }"
/// view for each item under the category
var messageItemView: (UUID) -> any View { get }
// sourcery: @Binding
/// the data source for banner multi-message sheet
var bannerMultiMessages: [BannerMessageListModel] { get }
}
63 changes: 58 additions & 5 deletions Sources/FioriSwiftUICore/_FioriStyles/BannerMessageStyle.fiori.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public enum BannerMultiMessageType: Int {
public struct BannerMessageBaseStyle: BannerMessageStyle {
public func makeBody(_ configuration: BannerMessageConfiguration) -> some View {
VStack(spacing: 0) {
configuration.topDivider.background(BannerMessageFioriStyle.titleForegroundColor(type: configuration.messageType)).frame(height: 4)
configuration.topDivider.frame(height: 4)
HStack {
HStack(spacing: 6, content: {
switch configuration.alignment {
Expand All @@ -42,7 +42,6 @@ public struct BannerMessageBaseStyle: BannerMessageStyle {
.padding([.top, .bottom], 13)
}
})
.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: configuration.messageType))
.padding(.leading, configuration.alignment == .center ? 44 : 16)
.padding(.trailing, configuration.alignment == .center ? 0 : 16)
.onTapGesture {
Expand All @@ -63,15 +62,63 @@ public struct BannerMessageBaseStyle: BannerMessageStyle {
}
}

struct BannerMessageErrorStyle: BannerMessageStyle {
struct BannerMessageNeutralStyle: BannerMessageStyle {
public func makeBody(_ configuration: BannerMessageConfiguration) -> some View {
BannerMessage(configuration)
.iconStyle { c in
c.icon.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: configuration.messageType))
c.icon.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .neutral))
}
}
}

struct BannerMessageNegativeStyle: BannerMessageStyle {
public func makeBody(_ configuration: BannerMessageConfiguration) -> some View {
BannerMessage(configuration)
.iconStyle { c in
c.icon.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .negative))
}
.titleStyle(content: { c in
c.title.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .negative))
})
}
}

struct BannerMessageCriticalStyle: BannerMessageStyle {
public func makeBody(_ configuration: BannerMessageConfiguration) -> some View {
BannerMessage(configuration)
.iconStyle { c in
c.icon.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .critical))
}
.titleStyle(content: { c in
c.title.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .critical))
})
}
}

struct BannerMessagePositiveStyle: BannerMessageStyle {
public func makeBody(_ configuration: BannerMessageConfiguration) -> some View {
BannerMessage(configuration)
.iconStyle { c in
c.icon.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .positive))
}
.titleStyle(content: { c in
c.title.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .positive))
})
}
}

struct BannerMessageInformativeStyle: BannerMessageStyle {
public func makeBody(_ configuration: BannerMessageConfiguration) -> some View {
BannerMessage(configuration)
.iconStyle { c in
c.icon.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .informative))
}
.titleStyle(content: { c in
c.title.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: .informative))
})
}
}

// Default fiori styles
extension BannerMessageFioriStyle {
static func titleForegroundColor(type: BannerMultiMessageType) -> Color {
Expand Down Expand Up @@ -101,6 +148,7 @@ extension BannerMessageFioriStyle {

func makeBody(_ configuration: IconConfiguration) -> some View {
Icon(configuration)
.foregroundStyle(BannerMessageFioriStyle.titleForegroundColor(type: self.bannerMessageConfiguration.messageType))
}
}

Expand All @@ -127,6 +175,7 @@ extension BannerMessageFioriStyle {

func makeBody(_ configuration: TopDividerConfiguration) -> some View {
TopDivider(configuration)
.background(BannerMessageFioriStyle.titleForegroundColor(type: self.bannerMessageConfiguration.messageType))
}
}
}
Expand Down Expand Up @@ -375,7 +424,11 @@ struct BannerMessageModifier: ViewModifier {
}))
.frame(minWidth: (UIDevice.current.userInterfaceIdiom != .phone && self.alignment != .center) ? 393 : nil, alignment: .leading)
.popover(isPresented: self.$showingMessageDetail) {
BannerMultiMessageSheet(closeAction: {
BannerMultiMessageSheet(title: {
EmptyView()
}, closeAction: {
EmptyView()
}, dismissAction: {
self.showingMessageDetail = false
}, removeAction: { _, _ in
if self.bannerMultiMessages.isEmpty {
Expand Down
Loading

0 comments on commit e954845

Please sign in to comment.