Merge pull request #499 from jorgeblacio/delete_label

danieltigse · web-flow · commit f0e351ca8c03 · 2019-10-25T17:53:42.000-05:00
Added delete label functionality.
diff --git a/iOS-Email-Client.xcodeproj/project.pbxproj b/iOS-Email-Client.xcodeproj/project.pbxproj
@@ -2805,7 +2805,7 @@
 				INFOPLIST_FILE = "iOS-Email-Client/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"$(inherited)",
@@ -2847,7 +2847,7 @@
 				INFOPLIST_FILE = "iOS-Email-Client/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"$(inherited)",
@@ -2995,7 +2995,7 @@
 				INFOPLIST_FILE = "iOS-Email-Client/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"$(inherited)",
@@ -3056,7 +3056,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.ShareExtension;
@@ -3087,7 +3087,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3118,7 +3118,7 @@
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.support.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3150,7 +3150,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.NotificationExtension;
@@ -3184,7 +3184,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.NotificationExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3218,7 +3218,7 @@
 				INFOPLIST_FILE = NotificationExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.1.24;
+				MARKETING_VERSION = 1.1.25;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.criptext.mail.support.NotificationExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/iOS-Email-Client/Base.lproj/Main.storyboard b/iOS-Email-Client/Base.lproj/Main.storyboard
diff --git a/iOS-Email-Client/Controllers/SettingsLabelsViewController.swift b/iOS-Email-Client/Controllers/SettingsLabelsViewController.swift
@@ -74,6 +74,31 @@ class SettingsLabelsViewController: UIViewController {
         DBManager.createQueueItem(params: ["cmd": Event.Peer.newLabel.rawValue, "params": params.asDictionary()], account: myAccount)
     }
     
+    func createDeleteLabelPopover(label: Label, row: Int){
+        let popover = GenericDualAnswerUIPopover()
+        popover.initialTitle = String.localize("DELETE_LABEL_DIALOG_TITLE")
+        popover.initialMessage = String.localize("DELETE_LABEL_DIALOG_MESSAGE", arguments: label.text)
+        popover.leftOption = String.localize("CANCEL")
+        popover.rightOption = String.localize("YES")
+        popover.onResponse = { [weak self] accept in
+            guard accept,
+                let weakSelf = self else {
+                    return
+            }
+            if(accept){
+                guard let account = weakSelf.myAccount else {
+                    return
+                }
+                let params = EventData.Peer.DeleteLabel(uuid: label.uuid)
+                DBManager.createQueueItem(params: ["cmd": Event.Peer.deleteLabel.rawValue, "params": params.asDictionary()], account: account)
+                DBManager.deleteLabel(label: label)
+                weakSelf.labels.remove(at: row)
+                weakSelf.tableView.reloadData()
+            }
+        }
+        self.presentPopover(popover: popover, height: 200)
+    }
+    
     @objc func goBack(){
         navigationController?.popViewController(animated: true)
     }
@@ -88,6 +113,13 @@ extension SettingsLabelsViewController: UITableViewDelegate, UITableViewDataSour
         let label = labels[indexPath.row]
         let cell = tableView.dequeueReusableCell(withIdentifier: "settingsLabelCell") as! LabelsLabelTableViewCell
         cell.fillFields(label: label)
+        cell.clickTrash = { [weak self] in
+            guard let weakSelf = self else {
+                    return
+            }
+            weakSelf.createDeleteLabelPopover(label: label, row: indexPath.row)
+        }
+        cell.delegate = self
         return cell
     }
     
@@ -114,12 +146,14 @@ extension SettingsLabelsViewController: UITableViewDelegate, UITableViewDataSour
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         return tableView.dequeueReusableHeaderFooterView(withIdentifier: "settingsHeaderLabel")
     }
-    
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let label = labels[indexPath.row]
-        guard label.id != SystemLabel.starred.id else {
+}
+
+extension SettingsLabelsViewController: LabelTableViewCellDelegate {
+    func tableViewCellDidTapCheck(_ cell: LabelsLabelTableViewCell) {
+        guard let indexPath = self.tableView.indexPath(for: cell) else {
             return
         }
+        let label = labels[indexPath.row]
         DBManager.updateLabel(label, visible: !label.visible)
         tableView.reloadRows(at: [indexPath], with: .automatic)
     }
diff --git a/iOS-Email-Client/Libs/EventHandler.swift b/iOS-Email-Client/Libs/EventHandler.swift
@@ -350,6 +350,7 @@ enum Event: Int32 {
         case recoveryChange = 311
         case recoveryVerify = 312
         case updateProfilePic = 313
+        case deleteLabel = 320
     }
     
     enum Server: Int32 {
diff --git a/iOS-Email-Client/Managers/DBManager.swift b/iOS-Email-Client/Managers/DBManager.swift
@@ -666,6 +666,14 @@ class DBManager: SharedDB {
         return settableLabels
     }
     
+    class func deleteLabel(label: Label){
+        let realm = try! Realm()
+        
+        try! realm.write {
+            realm.delete(label)
+        }
+    }
+    
     //MARK: - File
     
     class func delete(_ files: [File]){
diff --git a/iOS-Email-Client/Model/EventData.swift b/iOS-Email-Client/Model/EventData.swift
@@ -261,6 +261,18 @@ extension EventData {
             }
         }
         
+        struct DeleteLabel: Dictionarify {
+            let uuid: String
+
+            init(params: [String: Any]){
+                uuid = params["uuid"] as! String
+            }
+            
+            init(uuid: String){
+                self.uuid = uuid
+            }
+        }
+        
         struct NameChanged: Dictionarify {
             let name: String
             
diff --git a/iOS-Email-Client/Views/LabelsLabelTableViewCell.swift b/iOS-Email-Client/Views/LabelsLabelTableViewCell.swift
@@ -8,19 +8,30 @@
 
 import Foundation
 
+protocol LabelTableViewCellDelegate: class {
+    func tableViewCellDidTapCheck(_ cell: LabelsLabelTableViewCell)
+}
+
 class LabelsLabelTableViewCell: UITableViewCell{
     @IBOutlet weak var checkMarkView: CheckMarkUIView!
+    @IBOutlet weak var trashButton: UIButton!
     @IBOutlet weak var labelLabel: UILabel!
     @IBOutlet weak var colorDotsContainer: UIView!
     @IBOutlet weak var colorDotsView: UIView!
     
+    weak var delegate: LabelTableViewCellDelegate?
+    
+    var clickTrash: (() -> Void)? = nil
+    
     var theme: Theme {
         return ThemeManager.shared.theme
     }
     
     override func awakeFromNib() {
         super.awakeFromNib()
         applyTheme()
+        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap(_:)))
+        checkMarkView.addGestureRecognizer(tap)
     }
     
     override func prepareForReuse() {
@@ -35,8 +46,20 @@ class LabelsLabelTableViewCell: UITableViewCell{
     
     func fillFields(label: Label) {
         let isDisabled = label.id == SystemLabel.starred.id
+        trashButton.isHidden = isDisabled
         labelLabel.text = label.localized
         checkMarkView.setChecked(label.visible, disabled: isDisabled)
         colorDotsView.backgroundColor = UIColor(hex: label.color)
     }
+    
+    @objc func handleTap(_ gestureRecognizer:UITapGestureRecognizer){
+        guard let delegate = self.delegate else {
+            return
+        }
+        delegate.tableViewCellDidTapCheck(self)
+    }
+    
+    @IBAction func didTapButton(sender: UIButton) {
+        clickTrash?()
+    }
 }
diff --git a/iOS-Email-Client/en.lproj/Localizable.strings b/iOS-Email-Client/en.lproj/Localizable.strings
@@ -459,3 +459,5 @@
 "RECOVERY_CODE_DIALOG_ERROR" = "Incorrect Recovery Code";
 "RECOVERY_CODE_VALIDATION_ERROR" = "Recovery Code is at least 6 characters long.";
 "RECOVERY_CODE_VALIDATION_ERROR_EMPTY" = "Recovery Code cannot be empty.";
+"DELETE_LABEL_DIALOG_TITLE" = "Delete Label";
+"DELETE_LABEL_DIALOG_MESSAGE" = "Are you sure you want to delete label: (%@)?";
diff --git a/iOS-Email-Client/es-419.lproj/Localizable.strings b/iOS-Email-Client/es-419.lproj/Localizable.strings
@@ -459,3 +459,5 @@
 "RECOVERY_CODE_DIALOG_ERROR" = "Código de Recuperación no es correcto.";
 "RECOVERY_CODE_VALIDATION_ERROR" = "El código de recuperación debe tener 6 caracteres.";
 "RECOVERY_CODE_VALIDATION_ERROR_EMPTY" = "El código de recuperación no puede estar vacío.";
+"DELETE_LABEL_DIALOG_TITLE" = "Borrar Etiqueta";
+"DELETE_LABEL_DIALOG_MESSAGE" = "¿Estás seguro que quieres borrar la etiqueta: (%@)?";

Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,7 @@ enum Event: Int32 {`
`350`	`350`	`case recoveryChange = 311`
`351`	`351`	`case recoveryVerify = 312`
`352`	`352`	`case updateProfilePic = 313`
	`353`	`+ case deleteLabel = 320`
`353`	`354`	`}`
`354`	`355`
`355`	`356`	`enum Server: Int32 {`