Browse Source

show action 'Delete' instead of 'Block' for Group Contact requests

cyberta 4 năm trước cách đây
mục cha
commit
1d885ea8c6

+ 1 - 1
deltachat-ios/Chat/ChatViewController.swift

@@ -55,7 +55,7 @@ class ChatViewController: UITableViewController {
     }()
 
     public lazy var contactRequestBar: ChatContactRequestBar = {
-        let view = ChatContactRequestBar()
+        let view = ChatContactRequestBar(isGroupRequest: dcContext.getChat(chatId: chatId).isGroup)
         view.delegate = self
         view.translatesAutoresizingMaskIntoConstraints = false
         return view

+ 7 - 9
deltachat-ios/Chat/Views/ChatContactRequestBar.swift

@@ -16,6 +16,8 @@ public class ChatContactRequestBar: UIView, InputItem {
     public func keyboardEditingBeginsAction() {}
 
     weak var delegate: ChatContactRequestDelegate?
+    
+    private var isGroupRequest: Bool = false
 
     private lazy var acceptButton: UIButton = {
         let view = UIButton()
@@ -27,7 +29,7 @@ public class ChatContactRequestBar: UIView, InputItem {
 
     private lazy var blockButton: UIButton = {
         let view = UIButton()
-        view.setTitle(String.localized("block"), for: .normal)
+        view.setTitle(isGroupRequest ? String.localized("delete") : String.localized("block"), for: .normal)
         view.setTitleColor(.systemRed, for: .normal)
         view.translatesAutoresizingMaskIntoConstraints = false
         view.isUserInteractionEnabled = true
@@ -43,14 +45,10 @@ public class ChatContactRequestBar: UIView, InputItem {
         return view
     }()
 
-    convenience init() {
-        self.init(frame: .zero)
-
-    }
-
-    public override init(frame: CGRect) {
-        super.init(frame: frame)
-        self.setupSubviews()
+    public required init(isGroupRequest: Bool) {
+        self.isGroupRequest = isGroupRequest
+        super.init(frame: .zero)
+        setupSubviews()
     }
 
     required init(coder: NSCoder) {