Skip to content

Commit

Permalink
merge: from main to rel-4.1 to get the latest translation package and…
Browse files Browse the repository at this point in the history 
… other fixes (#776)

* chore(release): 4.1.2

* fix: 🐛 [IOSSDKBUG-291] set line limit for MenuSelectionItem (#769)

* fix: 🐛 [JIRA: IOSSDKBUG-306] toolbar layout issue (#771)

* feat: 🎸 [JIRA:HCPSDKFIORIUIKIT-2686] Button update (#753)

Co-authored-by: Bill Zhou <bill.zhou01@sap.com>

* fix: 🐛 step progress indicator styles (#775)

* Translation Delivery (#774)

* [INTERNAL] Translation delivery: commit by LX Lab

Change-Id: I111a249ae01afea6ba8029630027e1807e471499

* [INTERNAL] Translation delivery: commit by LX Lab

Change-Id: I00c59b0e7a3bcd6346b6fddb8a51787bc132ace4

---------

Co-authored-by: dyongxu <61523257+dyongxu@users.noreply.github.com>

---------

Co-authored-by: Marco Eidinger <marco.eidinger@sap.com>
Co-authored-by: Bill Zhou <bill.zhou01@sap.com>
Co-authored-by: Xiaoyu Liu <xiaoyuliu0722@gmail.com>
Co-authored-by: hengyi-zhang <hengyizhangcn@gmail.com>
Co-authored-by: SAP LX Lab Service Account <tmsatsls+github.com_service-tip-git@sap.com>
  • Loading branch information
@dyongxu @MarcoEidinger
@billzhou0223 @xiaoyu0722 @hengyi-zhang @service-tip-git
6 people authored Aug 16, 2024
1 parent ca3eaf5 commit fcbf54f
Show file tree
Hide file tree
Showing 32 changed files with 2,174 additions and 101 deletions.
56 changes: 56 additions & 0 deletions Apps/Examples/Examples.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

196 changes: 196 additions & 0 deletions Apps/Examples/Examples/FioriSwiftUICore/FioriButton/CardFixedWidthButtonsExample.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
import FioriSwiftUICore
import FioriThemeManager
import SwiftUI

struct CardFixedWidthButtonsExample: View {
@State private var buttonTitle = "Check in"

@Environment(\.dismiss) private var dismiss

@State private var _dataSource: [CardFullWidthSingleButtonItem] = [
CardFullWidthSingleButtonItem(title: "1", loadingState: .unspecified, id: UUID()),
CardFullWidthSingleButtonItem(title: "2", loadingState: .unspecified, id: UUID()),
CardFullWidthSingleButtonItem(title: "3", loadingState: .unspecified, id: UUID()),
CardFullWidthSingleButtonItem(title: "4", loadingState: .unspecified, id: UUID()),
CardFullWidthSingleButtonItem(title: "5", loadingState: .unspecified, id: UUID())
]

private var profileHeader: some View {
ProfileHeader(detailImage: {
Image("rw").resizable()
}, title: {
Text("Harry Ford")
}, subtitle: {
Text("The boy wizard, the boy wizard")
}, description: {
Text("This is a description.")
}) {
HStack {
Spacer()
Button {
print("tap message")
} label: {
FioriIcon.callout.discussion
.imageScale(.large)
.fontWeight(.light)
}
Spacer()

Button {
print("tap email")
} label: {
FioriIcon.actions.email
.imageScale(.large)
.fontWeight(.light)
}
Spacer()

Button {
print("tap call")
} label: {
FioriIcon.actions.call
.imageScale(.large)
.fontWeight(.light)
}
Spacer()

Button {
print("tap video")
} label: {
FioriIcon.actions.video
.imageScale(.large)
.fontWeight(.light)
}
Spacer()

Button {
print("tap hint")
} label: {
FioriIcon.actions.hint
.imageScale(.large)
.fontWeight(.light)
}
Spacer()
}
}
}

var body: some View {
List {
Section {
Divider()
.padding(EdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 0))

HStack {
Text("My Schedule")
.font(.fiori(forTextStyle: .subheadline))
.foregroundStyle(Color.preferredColor(.secondaryLabel))
Spacer()
Button {
print("see all")
} label: {
Text("See all (\(self._dataSource.count))")
.font(.fiori(forTextStyle: .body))
.foregroundStyle(Color.preferredColor(.tintColor))
}
}
.padding(EdgeInsets(top: 5, leading: 20, bottom: 5, trailing: 20))

ScrollView(.horizontal) {
HStack(spacing: 8, content: {
ForEach(0 ..< self._dataSource.count, id: \.self) { index in
let item = self._dataSource[index]
HStack {
Card {
Text("Schedule\(item.title)")
} subtitle: {
Text("Subtitle")
} detailImage: {
Image("ProfilePic")
.resizable()
.frame(width: 45, height: 45)
.clipShape(RoundedRectangle(cornerRadius: 10))
} headerAction: {
FioriIcon.shopping.cart
} row1: {
Text("Body text could be really long description that requires wrapping, with suggested 2 lines from Fiori Design Guideline perspective to make the UI concise. SDK default setting of numberOfLines for body is 6. Application Developer can override it with : cell.body.numOfLines = preferredNumberOfLines.")
.lineLimit(2)
} action: {
FioriButton(isSelectionPersistent: false, action: { _ in
self.updateDataSource(id: item.id)
}, label: { _ in
self.primaryActionLabel(item.loadingState)
}, image: { _ in
EmptyView()
}, imagePosition: .leading, imageTitleSpacing: 8.0)
.fioriButtonStyle(FioriPrimaryButtonStyle(118, loadingState: item.loadingState))
.disabled(item.loadingState != .unspecified)
} secondaryAction: {
FioriButton(isSelectionPersistent: false, title: "Decline", action: { _ in
print("tap Decline")
})
.fioriButtonStyle(FioriSecondaryButtonStyle(colorStyle: .negative, maxWidth: 118))
}
.frame(width: 300, height: 192)
.background(Color.white)
}
.clipShape(RoundedRectangle(cornerRadius: 16))
.shadow(color: .preferredColor(.cardShadow), radius: 16) //
.padding(EdgeInsets(top: 8, leading: 8, bottom: 8, trailing: 8))
}
})
.padding(EdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
}
Spacer()
} header: {
self.profileHeader
.frame(maxWidth: .infinity)
.padding()
.background(Color.preferredColor(.secondaryGroupedBackground))
}
.listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
.listRowSeparator(.hidden)
}
.listStyle(.grouped)
.navigationTitle("Object Card - Full Width Single Button")
.navigationBarTitleDisplayMode(.inline)
}

@ViewBuilder
func primaryActionLabel(_ loadingState: FioriButtonLoadingState) -> any View {
loadingState != .unspecified ? AnyView(EmptyView()) : AnyView(Text("Check in"))
}

func updateDataSource(id: UUID) {
for i in 0 ..< self._dataSource.count {
let item = self._dataSource[i]
if item.id == id {
var timeInterval = 0.0
if item.loadingState == .unspecified {
item.loadingState = .processing
self._dataSource[i] = item
timeInterval = 2.0
} else if item.loadingState == .processing {
item.loadingState = .success
self._dataSource[i] = item
timeInterval = 1.0
} else {
self._dataSource.remove(at: i)
if self._dataSource.isEmpty {
self.dismiss()
}
return
}

_ = Timer.scheduledTimer(withTimeInterval: timeInterval, repeats: false, block: { _ in
self.updateDataSource(id: id)
})
break
}
}
}
}

#Preview {
CardFixedWidthButtonsExample()
}
199 changes: 199 additions & 0 deletions Apps/Examples/Examples/FioriSwiftUICore/FioriButton/CardFullWidthSingleButtonExample.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
import FioriSwiftUICore
import FioriThemeManager
import SwiftUI

class CardFullWidthSingleButtonItem: Identifiable, ObservableObject {
@Published var title: String
@Published var loadingState: FioriButtonLoadingState
@Published var id: UUID

init(title: String, loadingState: FioriButtonLoadingState, id: UUID) {
self.title = title
self.loadingState = loadingState
self.id = id
}
}

struct CardFullWidthSingleButtonExample: View {
@State private var buttonTitle = "Check in"
@Environment(\.dismiss) private var dismiss

@State private var _dataSource: [CardFullWidthSingleButtonItem] = [
CardFullWidthSingleButtonItem(title: "1", loadingState: .unspecified, id: UUID()),
CardFullWidthSingleButtonItem(title: "2", loadingState: .unspecified, id: UUID()),
CardFullWidthSingleButtonItem(title: "3", loadingState: .unspecified, id: UUID()),
CardFullWidthSingleButtonItem(title: "4", loadingState: .unspecified, id: UUID()),
CardFullWidthSingleButtonItem(title: "5", loadingState: .unspecified, id: UUID())
]

var profileHeader: some View {
ProfileHeader(detailImage: {
Image("rw").resizable()
}, title: {
Text("Harry Ford")
}, subtitle: {
Text("The boy wizard, the boy wizard")
}, description: {
Text("This is a description.")
}) {
HStack {
Spacer()
Button {
print("tap message")
} label: {
FioriIcon.callout.discussion
.imageScale(.large)
.fontWeight(.light)
}
Spacer()

Button {
print("tap email")
} label: {
FioriIcon.actions.email
.imageScale(.large)
.fontWeight(.light)
}
Spacer()

Button {
print("tap call")
} label: {
FioriIcon.actions.call
.imageScale(.large)
.fontWeight(.light)
}
Spacer()

Button {
print("tap video")
} label: {
FioriIcon.actions.video
.imageScale(.large)
.fontWeight(.light)
}
Spacer()

Button {
print("tap hint")
} label: {
FioriIcon.actions.hint
.imageScale(.large)
.fontWeight(.light)
}
Spacer()
}
}
}

var body: some View {
Section {
Divider()
HStack {
Text("My Schedule")
.font(.fiori(forTextStyle: .subheadline))
.foregroundStyle(Color.preferredColor(.secondaryLabel))
Spacer()
Button {
print("see all")
} label: {
Text("See all (\(self._dataSource.count))")
.font(.fiori(forTextStyle: .body))
.foregroundStyle(Color.preferredColor(.tintColor))
}
}
.padding(EdgeInsets(top: 5, leading: 20, bottom: 5, trailing: 20))

ScrollView(.horizontal) {
HStack(spacing: 8, content: {
ForEach(0 ..< self._dataSource.count, id: \.self) { index in
let item = self._dataSource[index]
HStack {
Card {
Text("Schedule\(item.title)")
} subtitle: {
Text("Subtitle")
} detailImage: {
Image("ProfilePic")
.resizable()
.frame(width: 45, height: 45)
.clipShape(RoundedRectangle(cornerRadius: 10))
} headerAction: {
FioriIcon.shopping.cart
} row1: {
Text("Body text could be really long description that requires wrapping, with suggested 2 lines from Fiori Design Guideline perspective to make the UI concise. SDK default setting of numberOfLines for body is 6. Application Developer can override it with : cell.body.numOfLines = preferredNumberOfLines.")
.lineLimit(2)
} action: {
FioriButton(action: { _ in
self.updateDataSource(id: item.id)
}, label: { _ in
Text(self.titleStr(item.loadingState))
})
.fioriButtonStyle(FioriPrimaryButtonStyle(.infinity, loadingState: item.loadingState))
.disabled(item.loadingState != .unspecified)
}
.frame(width: 300, height: 192)
.background(Color.white)
}
.clipShape(RoundedRectangle(cornerRadius: 16))
.shadow(color: .preferredColor(.cardShadow), radius: 16) //
.padding(EdgeInsets(top: 8, leading: 8, bottom: 8, trailing: 8))
}
})
.padding(EdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
}
Spacer()
} header: {
self.profileHeader
.frame(maxWidth: .infinity)
.padding()
.background(Color.preferredColor(.secondaryGroupedBackground))
}
.navigationTitle("Object Card - Full Width Single Button")
.navigationBarTitleDisplayMode(.inline)
}

func updateDataSource(id: UUID) {
for i in 0 ..< self._dataSource.count {
let item = self._dataSource[i]
if item.id == id {
var timeInterval = 0.0
if item.loadingState == .unspecified {
item.loadingState = .processing
self._dataSource[i] = item
timeInterval = 2.0
} else if item.loadingState == .processing {
item.loadingState = .success
self._dataSource[i] = item
timeInterval = 1.0
} else {
self._dataSource.remove(at: i)
if self._dataSource.isEmpty {
self.dismiss()
}
return
}

_ = Timer.scheduledTimer(withTimeInterval: timeInterval, repeats: false, block: { _ in
self.updateDataSource(id: id)
})
break
}
}
}

func titleStr(_ loadingState: FioriButtonLoadingState) -> AttributedString {
switch loadingState {
case .unspecified:
"Check in"
case .processing:
"Checking in"
case .success:
"Checked in"
}
}
}

#Preview {
CardFullWidthSingleButtonExample()
}
Loading

0 comments on commit fcbf54f

Please sign in to comment.