From 7f7999774e79ff4c6bfe396520ef0298f13ee377 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Tue, 14 Apr 2020 14:28:57 -0400
Subject: [PATCH] revised secure entry

---
 MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift    | 5 ++++-
 .../Atomic/Atoms/TextFields/DigitEntryFieldModel.swift     | 7 -------
 MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift     | 2 +-
 .../Atomic/Atoms/TextFields/TextEntryFieldModel.swift      | 1 +
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
index 2bf80e9d..d5648342 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
@@ -328,7 +328,10 @@ import UIKit
         guard let model = model as? DigitEntryFieldModel else { return }
         
         numberOfDigits = model.digits
-        setAsSecureTextEntry(model.secureEntry)
+        
+        if let entryType = model.type  {
+            setAsSecureTextEntry(entryType == .secure || entryType == .password)
+        }
         
         for digitBox in digitBoxes {
             digitBox.digitField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: delegateObject?.observingTextFieldDelegate ?? self,
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryFieldModel.swift
index 423c1d7d..e91eca77 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryFieldModel.swift
@@ -17,7 +17,6 @@
     }
     
     public var digits: Int = 4
-    public var secureEntry: Bool = false
 
     //--------------------------------------------------
     // MARK: - Keys
@@ -26,7 +25,6 @@
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case digits
-        case secureEntry
     }
     
     //--------------------------------------------------
@@ -40,10 +38,6 @@
         if let digits = try typeContainer.decodeIfPresent(Int.self, forKey: .digits) {
             self.digits = digits
         }
-        
-        if let secureEntry = try typeContainer.decodeIfPresent(Bool.self, forKey: .secureEntry) {
-            self.secureEntry = secureEntry
-        }
     }
     
     public override func encode(to encoder: Encoder) throws {
@@ -51,6 +45,5 @@
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(digits, forKey: .digits)
-        try container.encode(secureEntry, forKey: .secureEntry)
     }
 }
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index a90ad63b..0f4960be 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -321,7 +321,7 @@ import UIKit
         placeholder = model.placeholder
         
         switch model.type {
-        case .password:
+        case .password, .secure:
             textField.isSecureTextEntry = true
             
         case .number:
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
index 99a5dba4..c12b92ac 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
@@ -14,6 +14,7 @@
     
     public enum EntryType: String, Codable {
         case password
+        case secure
         case number
         case email
     }