Rename image property

mono0926 · May 28, 2017 · da88052 · da88052
1 parent 7929dd2
commit da88052
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/NativePopup/NativePopup.swift b/NativePopup/NativePopup.swift
@@ -35,7 +35,7 @@ public class NativePopup: UIView {
                  message: String?) {
         effectView = UIVisualEffectView(effect: UIBlurEffect(style: .extraLight))
 
-        let imageValue = image.image
+        let imageValue = image.npImage
         imageValue.validate()
         switch imageValue {
         case .image(let image):

diff --git a/NativePopup/Preset.swift b/NativePopup/Preset.swift
@@ -30,7 +30,7 @@ public struct Preset {
             }
         }
 
-        public var image: Image {
+        public var npImage: Image {
             switch self {
             case .good, .bad:
                 return .image(UIImage(nativePopupNamed: "feedback_\(rawValue)"))

diff --git a/NativePopup/UIImageConvertible.swift b/NativePopup/UIImageConvertible.swift
@@ -26,7 +26,7 @@ public enum Image {
 }
 
 public protocol ImageConvertible {
-    var image: Image { get }
+    var npImage: Image { get }
     var additionalMarginTop: CGFloat { get }
     var additionalMarginBottom: CGFloat { get }
 }
@@ -37,13 +37,13 @@ extension ImageConvertible {
 }
 
 extension UIImage: ImageConvertible {
-    public var image: Image { return .image(self) }
+    public var npImage: Image { return .image(self) }
 }
 
 extension Character: ImageConvertible {
-    public var image: Image { return .emoji(self) }
+    public var npImage: Image { return .emoji(self) }
 }
 
 extension UIView: ImageConvertible {
-    public var image: Image { return .view(self) }
+    public var npImage: Image { return .view(self) }
 }