Add bottom divider to SettingsViewIconCell (needed for accessibility …

…statement task) (#1342) * Add divider to SettingsViewIconCell * rename HairlineDividerModifier
finn-no · May 6, 2024 · 273af5e · 273af5e
1 parent d6e2f47
commit 273af5e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/FinniversKit/Sources/Recycling/ListViews/Settings/Cell/SettingsViewIconCell.swift b/FinniversKit/Sources/Recycling/ListViews/Settings/Cell/SettingsViewIconCell.swift
@@ -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) {
@@ -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())
     }
 }
diff --git a/FinniversKit/Sources/Recycling/ListViews/Settings/View/SettingsView.swift b/FinniversKit/Sources/Recycling/ListViews/Settings/View/SettingsView.swift
@@ -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: