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

Jump to bottom

Add bottom divider to SettingsViewIconCell (needed for accessibility statement task) #1342

Merged
merged 4 commits into from
May 6, 2024
Merged

Add bottom divider to SettingsViewIconCell (needed for accessibility statement task) #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9612f1c
Add divider to SettingsViewIconCell
teddyfahi Apr 23, 2024
b7df7a1
rename HairlineDividerModifier
teddyfahi Apr 23, 2024
fcb24d1
Merge branch 'master' into nmpapp-972_accessibility-link
teddyfahi May 3, 2024
e05517b
Merge branch 'master' into nmpapp-972_accessibility-link
teddyfahi May 6, 2024
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
31 changes: 29 additions & 2 deletions FinniversKit/Sources/Recycling/ListViews/Settings/Cell/SettingsViewIconCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ struct SettingsViewIconCell: View {
let title: String
let icon: UIImage
let tintColor: Color?
let isLastItem: Bool

var body: some View {
HStack(alignment: .center) {
Expand All @@ -20,12 +21,38 @@ struct SettingsViewIconCell: View {
.frame(width: .spacingM, height: .spacingM)
.foregroundColor(tintColor)
.padding([.trailing], .spacingXL)
}
}.bottomDivider(!isLastItem)
}
}

extension View {
func bottomDivider(
_ isLastItem: Bool,
inset: EdgeInsets = EdgeInsets(top: 0, leading: .spacingM, bottom: 0, trailing: 0)
) -> some View {
modifier(BottomDivider(isLastItem: isLastItem, inset: inset))
}
}

struct SettingsViewIconCell_Previews: PreviewProvider {
static var previews: some View {
SettingsViewIconCell(title: "Personvernerklæring", icon: .init(systemName: "square.and.arrow.up")!, tintColor: .bgSuccess) // swiftlint:disable:this force_unwrapping
SettingsViewIconCell(title: "Personvernerklæring", icon: .init(systemName: "square.and.arrow.up")!, tintColor: .bgSuccess, isLastItem: false) // swiftlint:disable:this force_unwrapping
}
}

struct BottomDivider: ViewModifier {
let isLastItem: Bool
let inset: EdgeInsets

public func body(content: Content) -> some View {
ZStack {
content
if isLastItem {
VStack {
Spacer()
Divider().padding(inset)
}
}
}.listRowInsets(EdgeInsets())
}
}
2 changes: 1 addition & 1 deletion FinniversKit/Sources/Recycling/ListViews/Settings/View/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ extension SettingsView: UITableViewDataSource {
let (icon, tintColor) = iconModel.icon

cell.contentConfiguration = HostingContentConfiguration(content: {
SettingsViewIconCell(title: iconModel.title, icon: icon, tintColor: tintColor)
SettingsViewIconCell(title: iconModel.title, icon: icon, tintColor: tintColor, isLastItem: isLastItem)
})
return cell
default:
Expand Down