Skip to content

Commit c537d85

Browse files
xiaoqinggracexiaoqinggracehedyongxu
authored
fix: 🐛 [JIRA:0] Update the padding of Illustrated Messagge (SAP#902)
* fix: 🐛 [JIRA:0] Update the padding of Illustrated Messagge * fix: 🐛 [JIRA:0] Update the padding of Illustrated Messagge --------- Co-authored-by: I824136 <[email protected]> Co-authored-by: dyongxu <[email protected]>
1 parent caea2b2 commit c537d85

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Apps/Examples/Examples/FioriSwiftUICore/IllustratedMessage/IllustratedMessageExample.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ struct IllustratedMessageExample: View {
9595
Toggle("Action Button vertical Aligned", isOn: self.$isActionButtonVertical)
9696
}
9797

98-
ForEach(0 ... 7, id: \.self) { subcomponentConfiguration in
98+
ForEach((0 ... 7).reversed(), id: \.self) { subcomponentConfiguration in
9999
let hasImage = subcomponentConfiguration & 0b100 == 4
100100
let hasDescription = subcomponentConfiguration & 0b010 == 2
101101
let hasAction = subcomponentConfiguration & 0b001 == 1

Sources/FioriSwiftUICore/_FioriStyles/IllustratedMessageStyle.fiori.swift

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ extension IllustratedMessageFioriStyle {
8686
func makeBody(_ configuration: ActionConfiguration) -> some View {
8787
Action(configuration)
8888
.font(.fiori(forTextStyle: .body, weight: .bold))
89-
.fioriButtonStyle(FioriPrimaryButtonStyle(.infinity))
9089
}
9190
}
9291

@@ -96,7 +95,6 @@ extension IllustratedMessageFioriStyle {
9695
func makeBody(_ configuration: SecondaryActionConfiguration) -> some View {
9796
SecondaryAction(configuration)
9897
.font(.fiori(forTextStyle: .body, weight: .bold))
99-
.fioriButtonStyle(FioriSecondaryButtonStyle(colorStyle: .tint, maxWidth: .infinity))
10098
}
10199
}
102100
}
@@ -122,17 +120,17 @@ public struct IllustratedMessageHorizontalLayoutStyle: IllustratedMessageStyle {
122120
if configuration.isActionVerticallyAligned {
123121
VStack(alignment: configuration.contentAlignment) {
124122
configuration.action
125-
.fioriButtonStyle(FioriPrimaryButtonStyle())
123+
.fioriButtonStyle(FioriPrimaryButtonStyle(.infinity))
126124
configuration.secondaryAction
127-
.fioriButtonStyle(FioriSecondaryButtonStyle(colorStyle: .tint))
125+
.fioriButtonStyle(FioriSecondaryButtonStyle(colorStyle: .tint, maxWidth: .infinity))
128126
}
129127
.padding(.top, (!configuration.action.isEmpty || !configuration.secondaryAction.isEmpty) ? 16 : 0)
130128
} else {
131129
HStack(spacing: 8) {
132130
configuration.secondaryAction
133131
.fioriButtonStyle(FioriSecondaryButtonStyle(colorStyle: .tint, maxWidth: .infinity))
134132
configuration.action
135-
.fioriButtonStyle(FioriPrimaryButtonStyle())
133+
.fioriButtonStyle(FioriPrimaryButtonStyle(.infinity))
136134
}
137135
.padding(.top, (!configuration.action.isEmpty || !configuration.secondaryAction.isEmpty) ? 16 : 0)
138136
}
@@ -154,6 +152,7 @@ public struct IllustratedMessageMixedLayoutStyle: IllustratedMessageStyle {
154152
configuration.description
155153
.multilineTextAlignment(getTextAlignment(configuration.contentAlignment))
156154
}
155+
.frame(maxWidth: .infinity)
157156
}
158157

159158
if configuration.isActionVerticallyAligned {
@@ -320,7 +319,11 @@ public extension IllustratedMessageStyle where Self == IllustratedMessageFixedWi
320319
}
321320
}
322321

323-
func getResizedDetailImage(detailImage: IllustratedMessageConfiguration.DetailImage, size: IllustratedMessage.DetailImageSize) -> some View {
322+
/// Get the resized detail image as a view based on image size parameter.
323+
/// - Parameter `detailImage`: An `Image` for the `IllustratedMessage`.
324+
/// - Parameter `size`: enum value of `IllustratedMessage.DetailImageSize`.
325+
/// - Returns: `IllustratedMessageConfiguration.DetailImage`
326+
public func getResizedDetailImage(detailImage: IllustratedMessageConfiguration.DetailImage, size: IllustratedMessage.DetailImageSize) -> some View {
324327
switch size {
325328
case .extraSmall:
326329
return detailImage

0 commit comments

Comments
 (0)