Merge branch 'feature/inviteButton' into 'master'

Different actions for Invite Button in send view

See merge request !15

enzevalos_iphone/Dialog/DialogOption.swift

@@ -14,6 +14,7 @@ enum DialogOption {
 	case invitationCode(code: String)
 	case invitationWelcome
 	case invitationStep
+    case invitationHelp
 
 	var color: UIColor {
 		switch self {
@@ -21,6 +22,7 @@ enum DialogOption {
 		case .invitationCode	: return UIColor.Invitation.orange
 		case .invitationWelcome	: return UIColor.Invitation.orange
 		case .invitationStep	: return UIColor.Invitation.orange
+        case .invitationHelp    : return UIColor.Invitation.orange
 		}
 	}
 
@@ -28,7 +30,7 @@ enum DialogOption {
 		switch self {
 		case .postcard			: return nil
 		case .invitationCode	: return nil
-		case .invitationWelcome	:
+		case .invitationWelcome, .invitationHelp :
             if StudySettings.invitationsmode == InvitationMode.Censorship {
                 var images = [UIImage]()
                 if let sender = UIImage(named: "bg_inviation_censor_sender"), let receiver = UIImage(named: "bg_inviation_censor_receiver") {
@@ -47,7 +49,8 @@ enum DialogOption {
 		switch self {
 		case .postcard			: return UIImage(named: "letter")
 		case .invitationCode	: return UIImage(named: "ic_secure_card")
-		case .invitationWelcome	: return nil
+		case .invitationWelcome,
+             .invitationHelp    : return nil
 		case .invitationStep	: return UIImage(named: "ic_secure_card")
 		}
 	}
@@ -56,7 +59,8 @@ enum DialogOption {
 		switch self {
 		case .postcard			: return "Welcome"
 		case .invitationCode	: return NSLocalizedString("Invitation.Code.Title", comment: "")
-		case .invitationWelcome	: return NSLocalizedString("Invitation.Welcome.Title", comment: "")
+		case .invitationWelcome,
+             .invitationHelp    : return NSLocalizedString("Invitation.Welcome.Title", comment: "")
 		case .invitationStep	: return NSLocalizedString("Invitation.Step.Title", comment: "")
 		}
 	}
@@ -64,7 +68,8 @@ enum DialogOption {
 	var message: String? {
 		switch self {
 		case .postcard			: return "Message\nMultiline and long texts are allowed, btw second button is hidden"
-		case .invitationWelcome	:
+		case .invitationWelcome,
+             .invitationHelp    :
             if StudySettings.invitationsmode == InvitationMode.Censorship{
                 return NSLocalizedString("Invitation.Welcome.Message.Censor", comment: "")
             }
@@ -84,6 +89,7 @@ enum DialogOption {
 		case .invitationCode	: return NSLocalizedString("Invitation.Code.Share", comment: "")
 		case .invitationWelcome	: return NSLocalizedString("Invitation.Welcome.Try", comment: "")
 		case .invitationStep	: return NSLocalizedString("Invitation.Step.CTA", comment: "")
+        case .invitationHelp    : return NSLocalizedString("Done", comment: "")
 		}
 	}
 
@@ -92,7 +98,8 @@ enum DialogOption {
 		case .postcard			: return "Mehr Informationen"
 		case .invitationCode	: return nil
 		case .invitationWelcome	: return NSLocalizedString("Invitation.Welcome.Later", comment: "")
-		case .invitationStep	: return nil
+        case .invitationStep	: return nil
+        case .invitationHelp    : return nil
 		}
 	}
 
@@ -102,6 +109,7 @@ enum DialogOption {
 		case .invitationCode	: return NSLocalizedString("Invitation.Code.Done", comment: "")
 		case .invitationWelcome	: return NSLocalizedString("Invitation.Welcome.Dont.Ask", comment: "")
 		case .invitationStep	: return NSLocalizedString("Invitation.Step.Undo", comment: "")
+        case .invitationHelp    : return nil
 		}
 	}
 }

enzevalos_iphone/SendViewController+Invitation.swift

@@ -192,6 +192,7 @@ extension SendViewController {
         let controller = DialogViewController.present(on: self, with: .invitationWelcome) { [weak self] in
             self?.view.endEditing(true)
         }
+
         controller?.ctaAction = {
             controller?.hideDialog(completion: nil)
         }
@@ -210,6 +211,7 @@ extension SendViewController {
         self.view.endEditing(true)
         InvitationUserDefaults.shouldNotShowSecondDialog.set(true)
         let controller = DialogViewController.present(on: self, with: .invitationStep)
+
         controller?.ctaAction = {
             controller?.hideDialog(completion: nil)
         }
@@ -219,6 +221,14 @@ extension SendViewController {
             self?.layoutText()
         }
     }
+
+    func showHelpDialog() {
+        let controller = DialogViewController.present(on: self, with: .invitationHelp)
+
+        controller?.ctaAction = {
+            controller?.hideDialog(completion: nil)
+        }
+    }
 }
 
 // MARK: - MarkHandler

enzevalos_iphone/StudySettings.swift

@@ -19,7 +19,7 @@ enum StudyParamter: Int {
             case .Warning:
                 return "warning"
             case .Invitation:
-                    return "invitation"
+                return "invitation"
             }
         }
     }