Merge pull request onevcat#470 from onevcat/fix/mutable-wrapper

Use class for kf wrapper
jam891 · Oct 6, 2016 · 3b0e9ad · 3b0e9ad
2 parents 20749fb + bc657b6
commit 3b0e9ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/Sources/Image.swift b/Sources/Image.swift
@@ -303,11 +303,11 @@ extension Kingfisher where Base: Image {
                 guard let (images, gifDuration) = decode(from: imageSource, for: options) else {
                     return nil
                 }
-                var image = Kingfisher<Image>.animated(with: images, forDuration: duration <= 0.0 ? gifDuration : duration)
+                let image = Kingfisher<Image>.animated(with: images, forDuration: duration <= 0.0 ? gifDuration : duration)
                 image?.kf.animatedImageData = data
                 return image
             } else {
-                var image = Image(data: data)
+                let image = Image(data: data)
                 image?.kf.animatedImageData = data
                 image?.kf.imageSource = ImageSource(ref: imageSource)
                 return image

diff --git a/Sources/ImageView+Kingfisher.swift b/Sources/ImageView+Kingfisher.swift
@@ -263,10 +263,7 @@ extension ImageView {
     @available(*, deprecated, message: "Extensions directly on image views are deprecated. Use `imageView.kf.indicatorType` instead.", renamed: "kf.indicatorType")
     public var kf_indicatorType: IndicatorType {
         get { return kf.indicatorType }
-        set {
-            var holder = kf
-            holder.indicatorType = newValue
-        }
+        set { kf.indicatorType = newValue }
     }
 
     @available(*, deprecated, message: "Extensions directly on image views are deprecated. Use `imageView.kf.indicator` instead.", renamed: "kf.indicator")
@@ -275,10 +272,7 @@ extension ImageView {
     /// It will be `nil` if `kf_indicatorType` is `.none`.
     public private(set) var kf_indicator: Indicator? {
         get { return kf.indicator }
-        set {
-            var holder = kf
-            holder.indicator = newValue
-        }
+        set { kf.indicator = newValue }
     }
 
     @available(*, deprecated, message: "Extensions directly on image views are deprecated.", renamed: "kf.imageTask")

diff --git a/Sources/Kingfisher.swift b/Sources/Kingfisher.swift
@@ -43,7 +43,7 @@ import ImageIO
     #endif
 #endif
 
-public struct Kingfisher<Base> {
+public final class Kingfisher<Base> {
     public let base: Base
     public init(_ base: Base) {
         self.base = base
@@ -61,7 +61,6 @@ public protocol KingfisherCompatible {
 public extension KingfisherCompatible {
     public var kf: Kingfisher<Self> {
         get { return Kingfisher(self) }
-        set { }
     }
 }