Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 💡 [JIRA:HCPSDKFIORIUIKIT-2881] ContactItem Refactor #952

Merged
merged 6 commits into from
Jan 10, 2025
Merged

refactor: 💡 [JIRA:HCPSDKFIORIUIKIT-2881] ContactItem Refactor #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
374eaee
refactor: 💡 [JIRA:HCPSDKFIORIUIKIT-2881] ContactItem Refactor
hengyi-zhang Jan 3, 2025
7920087
refactor: 💡 [JIRA:HCPSDKFIORIUIKIT-2881] ContactItem Refactor
hengyi-zhang Jan 3, 2025
8f5b3ff
refactor: 💡 [JIRA:HCPSDKFIORIUIKIT-2881] ContactItem Refactor
hengyi-zhang Jan 7, 2025
7baf127
refactor: 💡 [JIRA:HCPSDKFIORIUIKIT-2881] ContactItem Refactor
hengyi-zhang Jan 8, 2025
78ebdab
Merge branch 'main' into feat/HCPSDKFIORIUIKIT-2881
hengyi-zhang Jan 8, 2025
57af9c9
Merge branch 'main' into feat/HCPSDKFIORIUIKIT-2881
dyongxu Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 147 additions & 47 deletions Apps/Examples/Examples/FioriSwiftUICore/ContactItem/ContactItemCompactExamples.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import FioriSwiftUICore
import SwiftUI

struct ContactItemCompactExamples: ListDataProtocol {
struct ContactItemCompactExamples: ObjectItemListDataProtocol {
var isNewObjectItem = false

init(cellTapped: Binding<Bool>) {}
init() {}

Expand All @@ -27,53 +29,151 @@ struct ContactItemCompactExamples: ListDataProtocol {
}

func cellForRow(_ indexPath: IndexPath) -> AnyView {
switch (indexPath.section, indexPath.row) {
case (0, 0):
let ci = ContactItem(title: "Seann Longname", actionItems: _ActivityItems(actionItems: [.init(type: .phone), .init(type: .videoCall), .init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))

return AnyView(ci)

case (0, 1):
let ci = ContactItem(title: "Headline example is allowed to wrap two lines ok", actionItems: _ActivityItems(actionItems: [.init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))

return AnyView(ci)

case (0, 2):
let ci = ContactItem(title: "Sean Long has a name that wraps two lines", detailImage: Image("person_square4").resizable(), actionItems: _ActivityItems(actionItems: [.init(type: .phone), .init(type: .videoCall), .init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))

return AnyView(ci)

case (0, 3):
let ci = ContactItem(title: "Headline example when it wraps two lines", subtitle: "Team Lead", actionItems: _ActivityItems(actionItems: [.init(type: .email), .init(type: .phone)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))
if self.isNewObjectItem {
switch (indexPath.section, indexPath.row) {
case (0, 0):
let item = ContactItem(title: "Seann Longname", activityItems: [.init(type: .phone, didSelectActivityItem: {
print("tap phone")
}), .init(type: .videoCall, didSelectActivityItem: {
print("tap videoCall")
}), .init(type: .message, didSelectActivityItem: {
print("tap message")
})])

return item.typeErased

case (0, 1):
let item = ContactItem(title: "Headline example is allowed to wrap two lines ok", activityItems: [.init(type: .message, didSelectActivityItem: {
print("tap message")
})])

return item.typeErased

return AnyView(ci)

case (0, 4):
let ci = ContactItem(title: "Seann Longname", subtitle: "Team Lead", actionItems: _ActivityItems(actionItems: [.init(type: .phone), .init(type: .videoCall), .init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))
.splitPercent(0.3)

return AnyView(ci)

case (0, 5):
let ci = ContactItem(title: "Headline when\n wraps 2 lines", subtitle: "Team Lead", detailImage: Image("person_square4").resizable(), actionItems: _ActivityItems(actionItems: [.init(type: .phone), .init(type: .videoCall), .init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))
.splitPercent(0.3)

return AnyView(ci)

default:
return AnyView(ContactItem(title: "Lorem ipseum dolor"))
case (0, 2):
let item = ContactItem(title: "Sean Long has a name that wraps two lines", detailImage: Image("person_square4").resizable(), activityItems: [.init(type: .phone, didSelectActivityItem: {
print("tap phone")
}), .init(type: .videoCall, didSelectActivityItem: {
print("tap videoCall")
}), .init(type: .message, didSelectActivityItem: {
print("tap message")
})])

return item.typeErased

case (0, 3):
let item = ContactItem(title: "Headline example when it wraps two lines", subtitle: "Team Lead", activityItems: [.init(type: .email, didSelectActivityItem: {
print("tap email")
}), .init(type: .phone, didSelectActivityItem: {
print("tap phone")
})])

return item.typeErased

case (0, 4):
let item = ContactItem(title: "Seann Longname", subtitle: "Team Lead", activityItems: [.init(type: .phone, didSelectActivityItem: {
print("tap phone")
}), .init(type: .videoCall, didSelectActivityItem: {
print("tap videoCall")
}), .init(type: .message, didSelectActivityItem: {
print("tap message")
})])
.splitPercent(0.3)

return item.typeErased

case (0, 5):
let item = ContactItem(title: "Headline when\n wraps 2 lines", subtitle: "Team Lead", detailImage: Image("person_square4").resizable(), activityItems: [.init(type: .phone, didSelectActivityItem: {
print("tap phone")
}), .init(type: .videoCall, didSelectActivityItem: {
print("tap videoCall")
}), .init(type: .message, didSelectActivityItem: {
print("tap message")
})])
.splitPercent(0.3)
.activityItemsStyle { conf in
conf.activityItems
.foregroundColor(.red)
.font(.fiori(forTextStyle: .headline).weight(.bold))
}
.titleStyle { conf in
conf.title
.foregroundStyle(Color.red)
.font(.fiori(forTextStyle: .headline).weight(.bold))
.lineLimit(nil)
}
.subtitleStyle(content: { conf in
conf.subtitle
.foregroundStyle(Color.green)
.font(.fiori(forTextStyle: .headline).weight(.bold))
.lineLimit(nil)
})
.descriptionStyle { conf in
conf.description
.foregroundStyle(Color.blue)
.font(.fiori(forTextStyle: .headline).weight(.bold))
.lineLimit(nil)
}
.detailImageStyle { conf in
conf.detailImage
.backgroundStyle(Color.yellow)
.font(.fiori(forTextStyle: .headline).weight(.bold))
.clipShape(Rectangle())
}

return item.typeErased

default:
return ContactItem(title: "Lorem ipseum dolor").typeErased
}
} else {
switch (indexPath.section, indexPath.row) {
case (0, 0):
let ci = _ContactItem(title: "Seann Longname", actionItems: _ActivityItems(actionItems: [.init(type: .phone), .init(type: .videoCall), .init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))

return AnyView(ci)

case (0, 1):
let ci = _ContactItem(title: "Headline example is allowed to wrap two lines ok", actionItems: _ActivityItems(actionItems: [.init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))

return AnyView(ci)

case (0, 2):
let ci = _ContactItem(title: "Sean Long has a name that wraps two lines", detailImage: Image("person_square4").resizable(), actionItems: _ActivityItems(actionItems: [.init(type: .phone), .init(type: .videoCall), .init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))

return AnyView(ci)

case (0, 3):
let ci = _ContactItem(title: "Headline example when it wraps two lines", subtitle: "Team Lead", actionItems: _ActivityItems(actionItems: [.init(type: .email), .init(type: .phone)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))

return AnyView(ci)

case (0, 4):
let ci = _ContactItem(title: "Seann Longname", subtitle: "Team Lead", actionItems: _ActivityItems(actionItems: [.init(type: .phone), .init(type: .videoCall), .init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))
.splitPercent(0.3)

return AnyView(ci)

case (0, 5):
let ci = _ContactItem(title: "Headline when\n wraps 2 lines", subtitle: "Team Lead", detailImage: Image("person_square4").resizable(), actionItems: _ActivityItems(actionItems: [.init(type: .phone), .init(type: .videoCall), .init(type: .message)], didSelectActivityItem: { dataType in
print("\(dataType)")
}))
.splitPercent(0.3)

return AnyView(ci)

default:
return AnyView(_ContactItem(title: "Lorem ipseum dolor"))
}
}
}
}
36 changes: 20 additions & 16 deletions Apps/Examples/Examples/FioriSwiftUICore/ContactItem/ContactItemExample.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
import SwiftUI

struct ContactItemExample: View {
var isNewObjectItem = false

var body: some View {
List {
Section {
NavigationLink {
ActivityItemExample()
} label: {
if self.isNewObjectItem {
Section {
NavigationLink {
ActivityItemExample()
} label: {
Text("ActivityItem")
}

NavigationLink {
ActivityItemsExample()
} label: {
Text("ActivityItems")
}
} header: {
Text("ActivityItem")
.textCase(.none)
}

NavigationLink {
ActivityItemsExample()
} label: {
Text("ActivityItems")
}
} header: {
Text("ActivityItem")
.textCase(.none)
}

Section {
NavigationLink(destination: ObjectItemListView(title: "Regular View Examples", listDataType: ContactItemRegularExamples.self, changeLeftMargin: false, showEditButton: false)) {
NavigationLink(destination: ObjectItemListView(title: "Regular View Examples", listDataType: ContactItemRegularExamples.self, changeLeftMargin: false, showEditButton: false, isNewObjectItem: self.isNewObjectItem)) {
Text("Regular View Examples")
}

NavigationLink(destination: ObjectItemListView(title: "Compact View Examples", listDataType: ContactItemCompactExamples.self, changeLeftMargin: false, showEditButton: false)) {
NavigationLink(destination: ObjectItemListView(title: "Compact View Examples", listDataType: ContactItemCompactExamples.self, changeLeftMargin: false, showEditButton: false, isNewObjectItem: self.isNewObjectItem)) {
Text("Compact View Examples")
}

NavigationLink(destination: ContactItemTapStateExamples()) {
NavigationLink(destination: ContactItemTapStateExamples(isNewObjectItem: self.isNewObjectItem)) {
Text("Tap State Examples")
}
} header: {
Expand Down
Loading
Loading