From c8c461662109334bf83119efe98fa99efeccc096 Mon Sep 17 00:00:00 2001 From: Felix Schmidt Date: Fri, 10 Mar 2023 09:09:42 +0100 Subject: [PATCH 1/3] 14904: `MoreActionItemView` is now configurable to hide separator view. --- .../Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift index 8773a6a1be1..0649be22792 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift @@ -34,7 +34,10 @@ class HomeMoreInfoTableViewCell: UITableViewCell { let nib = UINib(nibName: nibName, bundle: .main) if let actionItemView = nib.instantiate(withOwner: self, options: nil).first as? MoreActionItemView { - actionItemView.configure(actionItem: item) { selectedItem in + actionItemView.configure( + actionItem: item, + hideSeparatorView: item == items.last // index == items.count - 1 + ) { selectedItem in onItemTap(selectedItem) } stackView.addArrangedSubview(actionItemView) From 5775bb37c3fcca7d32ba9b7ec8c808ad41b2a8f7 Mon Sep 17 00:00:00 2001 From: Felix Schmidt Date: Fri, 10 Mar 2023 09:09:57 +0100 Subject: [PATCH 2/3] 14904: `MoreActionItemView` is now configurable to hide separator view. --- .../Home/Cells/More/MoreActionItem/MoreActionItemView.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/MoreActionItem/MoreActionItemView.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/MoreActionItem/MoreActionItemView.swift index cc255606827..1de706c213e 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/MoreActionItem/MoreActionItemView.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/MoreActionItem/MoreActionItemView.swift @@ -23,6 +23,7 @@ class MoreActionItemView: UIView { func configure( actionItem: MoreInfoItem, + hideSeparatorView: Bool = false, completion: @escaping ((MoreInfoItem) -> Void) ) { imageView.image = actionItem.image @@ -31,7 +32,7 @@ class MoreActionItemView: UIView { accessibilityIdentifier = actionItem.accessibilityIdentifier accessibilityLabel = actionItem.title - separatorView.isHidden = actionItem == .share + separatorView.isHidden = hideSeparatorView self.actionItem = actionItem self.completion = completion From 8d249e64cf0d194b976386443ded2b8eb92b89a4 Mon Sep 17 00:00:00 2001 From: Felix Schmidt Date: Fri, 10 Mar 2023 09:13:14 +0100 Subject: [PATCH 3/3] 14904: Remove unused code. --- .../Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift index 0649be22792..d570429cdaa 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/More/HomeMoreInfoTableViewCell.swift @@ -36,7 +36,7 @@ class HomeMoreInfoTableViewCell: UITableViewCell { if let actionItemView = nib.instantiate(withOwner: self, options: nil).first as? MoreActionItemView { actionItemView.configure( actionItem: item, - hideSeparatorView: item == items.last // index == items.count - 1 + hideSeparatorView: item == items.last ) { selectedItem in onItemTap(selectedItem) }