refactor ReportReason

l5071134 · Aug 12, 2016 · 0ec7445 · 0ec7445
1 parent 9b3133a
commit 0ec7445
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Yep/Extensions/UIViewController+Yep.swift b/Yep/Extensions/UIViewController+Yep.swift
@@ -46,7 +46,7 @@ extension UIViewController {
 
 extension ReportReason {
 
-    var description: String {
+    var title: String {
         switch self {
         case .Porno:
             return String.trans_reportPorno
@@ -111,22 +111,22 @@ extension UIViewController {
 
         let reportAlertController = UIAlertController(title: NSLocalizedString("Report Reason", comment: ""), message: nil, preferredStyle: .ActionSheet)
 
-        let pornoReasonAction: UIAlertAction = UIAlertAction(title: ReportReason.Porno.description, style: .Default) { action -> Void in
+        let pornoReasonAction: UIAlertAction = UIAlertAction(title: ReportReason.Porno.title, style: .Default) { action -> Void in
             reportWithReason(.Porno)
         }
         reportAlertController.addAction(pornoReasonAction)
 
-        let advertisingReasonAction: UIAlertAction = UIAlertAction(title: ReportReason.Advertising.description, style: .Default) { action -> Void in
+        let advertisingReasonAction: UIAlertAction = UIAlertAction(title: ReportReason.Advertising.title, style: .Default) { action -> Void in
             reportWithReason(.Advertising)
         }
         reportAlertController.addAction(advertisingReasonAction)
 
-        let scamsReasonAction: UIAlertAction = UIAlertAction(title: ReportReason.Scams.description, style: .Default) { action -> Void in
+        let scamsReasonAction: UIAlertAction = UIAlertAction(title: ReportReason.Scams.title, style: .Default) { action -> Void in
             reportWithReason(.Scams)
         }
         reportAlertController.addAction(scamsReasonAction)
 
-        let otherReasonAction: UIAlertAction = UIAlertAction(title: ReportReason.Other("").description, style: .Default) { [weak self] action -> Void in
+        let otherReasonAction: UIAlertAction = UIAlertAction(title: ReportReason.Other("").title, style: .Default) { [weak self] action -> Void in
             YepAlert.textInput(title: NSLocalizedString("Other Reason", comment: ""), message: nil, placeholder: nil, oldText: nil, confirmTitle: NSLocalizedString("OK", comment: ""), cancelTitle: NSLocalizedString("Cancel", comment: ""), inViewController: self, withConfirmAction: { text in
                 reportWithReason(.Other(text))
             }, cancelAction: nil)

diff --git a/YepKit/Remote/YepService.swift b/YepKit/Remote/YepService.swift
@@ -871,12 +871,16 @@ public func friendsInContacts(contacts: [UploadContact], failureHandler: Failure
 }
 
 public enum ReportReason {
+
     case Porno
     case Advertising
     case Scams
     case Other(String)
+}
+
+extension ReportReason {
 
-    public var type: Int {
+    var type: Int {
         switch self {
         case .Porno:
             return 0