Merge pull request wordpress-mobile#18297 from wordpress-mobile/featu…

…re/18250-ios13-destructive-menu-item
ciccioska · Apr 7, 2022 · 02e551a · 02e551a
2 parents 2bdc25a + 4f6a342
commit 02e551a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...ress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardPromptsCardCell.swift b/...ress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardPromptsCardCell.swift
@@ -293,7 +293,7 @@ private extension DashboardPromptsCardCell {
             case .viewMore(let handler),
                     .skip(let handler),
                     .remove(let handler):
-                return .init(title: title, image: image, handler: handler)
+                return .init(title: title, image: image, destructive: menuAttributes.contains(.destructive), handler: handler)
             }
         }
     }

diff --git a/WordPress/Classes/ViewRelated/Views/MenuSheetViewController.swift b/WordPress/Classes/ViewRelated/Views/MenuSheetViewController.swift
@@ -17,6 +17,18 @@ class MenuSheetViewController: UITableViewController {
         let title: String
         let image: UIImage?
         let handler: () -> Void
+        let destructive: Bool
+
+        init(title: String, image: UIImage? = nil, destructive: Bool = false, handler: @escaping () -> Void) {
+            self.title = title
+            self.image = image
+            self.handler = handler
+            self.destructive = destructive
+        }
+
+        var foregroundColor: UIColor {
+            return destructive ? .error : .text
+        }
     }
 
     private let itemSource: [[MenuItem]]
@@ -96,8 +108,10 @@ extension MenuSheetViewController {
               }
 
         let cell = tableView.dequeueReusableCell(withIdentifier: Constants.cellIdentifier, for: indexPath)
-        cell.tintColor = .text
+        cell.tintColor = item.foregroundColor
+        cell.textLabel?.textColor = item.foregroundColor
         cell.textLabel?.setText(item.title)
+        cell.textLabel?.numberOfLines = 0
         cell.accessoryView = UIImageView(image: item.image?.withTintColor(.text))
 
         return cell
@@ -131,6 +145,7 @@ private extension MenuSheetViewController {
     func configureTable() {
         tableView.register(UITableViewCell.self, forCellReuseIdentifier: Constants.cellIdentifier)
         tableView.sectionHeaderHeight = 0
+        tableView.bounces = false
 
         // draw the separators from edge to edge.
         tableView.separatorInset = .zero