Permalink
Browse files

updated SDWebImage and removed UIActivityIndicator-for-SDWebImage. Th…

…is paves the way for using ShareKit in Swift.

fixes: #1067 (a final fix)
fixes: #1058 (a final fix)
  • Loading branch information...
VilemKurz committed Dec 14, 2017
1 parent ad82b3a commit 185a2a0b040d6adb8a7d30682aa86955b00f8d02
Showing with 235 additions and 142 deletions.
  1. +11 −4 Classes/ShareKit/UI/SHKFormFieldLargeTextSettings.m
  2. +1 −2 ShareKit.podspec
  3. +222 −135 ShareKit.xcodeproj/project.pbxproj
  4. +1 −1 Submodules/SDWebImage
@@ -9,7 +9,8 @@
#import "SHKFormFieldLargeTextSettings.h"
#import "UIImage+OurBundle.h"
#import "UIImageView+UIActivityIndicatorForSDWebImage.h"
#import <SDWebImage/UIImageView+WebCache.h>
#import <SDWebImage/UIView+WebCache.h>
@interface SHKFormFieldLargeTextSettings ()
@@ -48,11 +49,15 @@ - (void)setupThumbnailOnImageView:(UIImageView *)imageView {
if (self.item.image) {
imageView.image = self.item.image;
} else if (self.item.URLPictureURI) {
[imageView setImageWithURL:self.item.URLPictureURI placeholderImage:[UIImage imageNamedFromOurBundle:@"DETweetURLAttachment.png"] usingActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
[imageView sd_setShowActivityIndicatorView:YES];
[imageView sd_setIndicatorStyle:UIActivityIndicatorViewStyleWhite];
[imageView sd_setImageWithURL:self.item.URLPictureURI placeholderImage:[UIImage imageNamedFromOurBundle:@"DETweetURLAttachment.png"]];
} else {
if (self.item.URLContentType == SHKURLContentTypeImage) {
[imageView setImageWithURL:self.item.URL placeholderImage:[UIImage imageNamedFromOurBundle:@"DETweetURLAttachment.png"] usingActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
[imageView sd_setShowActivityIndicatorView:YES];
[imageView sd_setIndicatorStyle:UIActivityIndicatorViewStyleWhite];
[imageView sd_setImageWithURL:self.item.URL placeholderImage:[UIImage imageNamedFromOurBundle:@"DETweetURLAttachment.png"]];
} else {
imageView.image = [UIImage imageNamedFromOurBundle:@"DETweetURLAttachment.png"];
}
@@ -70,7 +75,9 @@ - (void)setupThumbnailOnImageView:(UIImageView *)imageView {
}
if (!imageView.image && self.item.URLPictureURI) {
[imageView setImageWithURL:self.item.URLPictureURI placeholderImage:[UIImage imageNamedFromOurBundle:@"DETweetURLAttachment.png"] usingActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
[imageView sd_setShowActivityIndicatorView:YES];
[imageView sd_setIndicatorStyle:UIActivityIndicatorViewStyleWhite];
[imageView sd_setImageWithURL:self.item.URLPictureURI placeholderImage:[UIImage imageNamedFromOurBundle:@"DETweetURLAttachment.png"]];
} else if (!imageView.image) {
self.shouldShowExtension = YES;
imageView.image = [UIImage imageNamedFromOurBundle:@"SHKShareFileIcon.png"];
View
@@ -21,9 +21,8 @@ Pod::Spec.new do |s|
core.dependency 'SAMKeychain'
core.dependency 'SAMTextView', '~> 0.2.1'
core.dependency 'ShareKit/Reachability'
core.dependency 'SDWebImage', '~> 3.7'
core.dependency 'SDWebImage', '~> 4.2'
core.dependency 'PKMultipartInputStream'
core.dependency 'UIActivityIndicator-for-SDWebImage', '~> 1.2'
end
s.subspec 'Reachability' do |reachability|
Oops, something went wrong.

0 comments on commit 185a2a0

Please sign in to comment.