Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions Distrib/MoaDistrib.swift
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ public struct MoaHttpSession {
import Foundation

private var xoAssociationKey: UInt8 = 0

private var xo1AssociationKey: UInt8 = 1
/**

Image view extension for downloading images.
Expand All @@ -374,6 +374,25 @@ public extension MoaImageView {
imageView.moa.url = "http://site.com/image.jpg"

*/

public var activityIndicator: UIActivityIndicatorView {
get {
if let value = objc_getAssociatedObject(self, &xo1AssociationKey) as? UIActivityIndicatorView {
return value
} else {
let activity = UIActivityIndicatorView.init(frame: CGRect.init(x: 0, y: 0, width: 30, height: 30));
activity.tintColor = UIColor.lightGray
activity.center = self.center;
objc_setAssociatedObject(self, &xo1AssociationKey, activity, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
return activity
}
}

set {
objc_setAssociatedObject(self, &xoAssociationKey, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
}
}

public var moa: Moa {
get {
if let value = objc_getAssociatedObject(self, &xoAssociationKey) as? Moa {
Expand Down Expand Up @@ -596,6 +615,10 @@ public final class Moa {

init(imageView: MoaImageView) {
self.imageView = imageView
self.imageView?.image = nil;
self.imageView?.activityIndicator.frame = CGRect.init(x: 0, y: 0, width: (self.imageView?.frame.size.width)!, height: (self.imageView?.frame.size.height)!);
self.imageView?.addSubview((self.imageView?.activityIndicator)!);
self.imageView?.activityIndicator.startAnimating();
}

/**
Expand Down Expand Up @@ -771,7 +794,8 @@ public final class Moa {
}

imageView?.image = imageForView
}
imageView?.activityIndicator.stopAnimating();
imageView?.activityIndicator.removeFromSuperview(); }

/**

Expand All @@ -792,6 +816,8 @@ public final class Moa {
if let onError = onError {
DispatchQueue.main.async {
onError(error, response)
self.imageView?.activityIndicator.stopAnimating();
self.imageView?.activityIndicator.removeFromSuperview();
}
}
}
Expand Down
21 changes: 20 additions & 1 deletion Moa/ImageView+moa.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation

private var xoAssociationKey: UInt8 = 0

private var xo1AssociationKey: UInt8 = 1
/**

Image view extension for downloading images.
Expand All @@ -25,6 +25,25 @@ public extension MoaImageView {
imageView.moa.url = "http://site.com/image.jpg"

*/

public var activityIndicator: UIActivityIndicatorView {
get {
if let value = objc_getAssociatedObject(self, &xo1AssociationKey) as? UIActivityIndicatorView {
return value
} else {
let activity = UIActivityIndicatorView.init(frame: CGRect.init(x: 0, y: 0, width: 30, height: 30));
activity.tintColor = UIColor.lightGray
activity.center = self.center;
objc_setAssociatedObject(self, &xo1AssociationKey, activity, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
return activity
}
}

set {
objc_setAssociatedObject(self, &xoAssociationKey, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
}
}

public var moa: Moa {
get {
if let value = objc_getAssociatedObject(self, &xoAssociationKey) as? Moa {
Expand Down
9 changes: 8 additions & 1 deletion Moa/Moa.swift
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public final class Moa {

init(imageView: MoaImageView) {
self.imageView = imageView
self.imageView?.image = nil;
self.imageView?.activityIndicator.frame = CGRect.init(x: 0, y: 0, width: (self.imageView?.frame.size.width)!, height: (self.imageView?.frame.size.height)!);
self.imageView?.addSubview((self.imageView?.activityIndicator)!);
self.imageView?.activityIndicator.startAnimating();
}

/**
Expand Down Expand Up @@ -234,7 +238,8 @@ public final class Moa {
}

imageView?.image = imageForView
}
imageView?.activityIndicator.stopAnimating();
imageView?.activityIndicator.removeFromSuperview(); }

/**

Expand All @@ -255,6 +260,8 @@ public final class Moa {
if let onError = onError {
DispatchQueue.main.async {
onError(error, response)
self.imageView?.activityIndicator.stopAnimating();
self.imageView?.activityIndicator.removeFromSuperview();
}
}
}
Expand Down