Refactored product visibility name fields

Author: pmusolino

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/Visibility/ProductVisibility.swift

@@ -5,19 +5,19 @@ import Yosemite
 ///
 enum ProductVisibility {
 
-    case publicVisibility
+    case `public`
     case passwordProtected
-    case privateVisibility
+    case `private`
 
     /// Returns the localized text version of the Enum
     ///
     public var description: String {
         switch self {
-        case .publicVisibility:
+        case .public:
             return NSLocalizedString("Public", comment: "One of the possible options in Product Visibility")
         case .passwordProtected:
             return NSLocalizedString("Password Protected", comment: "One of the possible options in Product Visibility")
-        case .privateVisibility:
+        case .private:
             return NSLocalizedString("Private", comment: "One of the possible options in Product Visibility")
         }
     }
@@ -33,10 +33,10 @@ enum ProductVisibility {
             self = .passwordProtected
         }
         else if status == .privateStatus {
-            self = .privateVisibility
+            self = .private
         }
         else {
-            self = .publicVisibility
+            self = .public
         }
     }
 }

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/Visibility/ProductVisibilityViewController.swift

@@ -14,7 +14,7 @@ final class ProductVisibilityViewController: UIViewController {
 
     private let productSettings: ProductSettings
 
-    private var visibility: ProductVisibility = .publicVisibility
+    private var visibility: ProductVisibility = .public
 
     private lazy var keyboardFrameObserver: KeyboardFrameObserver = {
         let keyboardFrameObserver = KeyboardFrameObserver { [weak self] keyboardFrame in
@@ -52,7 +52,7 @@ final class ProductVisibilityViewController: UIViewController {
             if visibility != .passwordProtected {
                 productSettings.password = ""
             }
-            
+
             onCompletion(productSettings)
         }
     }
@@ -73,7 +73,7 @@ final class ProductVisibilityViewController: UIViewController {
 
     private func getProductStatus(_ productVibility: ProductVisibility) -> ProductStatus {
         switch productVibility {
-        case .privateVisibility:
+        case .private:
             return .privateStatus
         default:
             return .publish
@@ -278,11 +278,11 @@ extension ProductVisibilityViewController {
         var visibility: ProductVisibility {
             switch self {
             case .publicVisibility:
-                return .publicVisibility
+                return .public
             case .passwordVisibility, .passwordField:
                 return .passwordProtected
             case .privateVisibility:
-                return .privateVisibility
+                return .private
             }
         }
     }

WooCommerce/WooCommerceTests/Model/ProductVisibilityTests.swift

@@ -11,26 +11,26 @@ final class ProductVisibilityTests: XCTestCase {
         let visibility = ProductVisibility(status: .publish, password: nil)
         let visibility2 = ProductVisibility(status: .publish, password: "")
 
-        XCTAssertEqual(visibility, .publicVisibility)
-        XCTAssertEqual(visibility2, .publicVisibility)
+        XCTAssertEqual(visibility, .public)
+        XCTAssertEqual(visibility2, .public)
     }
 
     func testProductVisibilityWithPrivateStatus() {
         let visibility = ProductVisibility(status: .privateStatus, password: nil)
 
-        XCTAssertEqual(visibility, .privateVisibility)
+        XCTAssertEqual(visibility, .private)
     }
 
     func testProductVisibilityWithPendingStatus() {
         let visibility = ProductVisibility(status: .pending, password: nil)
 
-        XCTAssertEqual(visibility, .publicVisibility)
+        XCTAssertEqual(visibility, .public)
     }
 
     func testProductVisibilityWithDraftStatus() {
         let visibility = ProductVisibility(status: .draft, password: nil)
 
-        XCTAssertEqual(visibility, .publicVisibility)
+        XCTAssertEqual(visibility, .public)
     }
 
     func testProductVisibilityPasswordProtected() {