giuseppenuc/PNImagePickerViewController
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
- Fix Error

- Fix Error

See merge request !2
This commit is contained in:
Giuseppe Nucifora 2016-02-09 13:13:32 +00:00
commit 5485d2b74b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Pod/Classes/PNCollectionViewCell.m
View File

@ -8,12 +8,12 @@
#import "PNCollectionViewCell.h" #import "PNCollectionViewCell.h"
#import <PureLayout/PureLayout.h> #import <PureLayout/PureLayout.h>
#import <MMMaterialDesignSpinner/MMMaterialDesignSpinner.h> #import <DGActivityIndicatorView/DGActivityIndicatorView.h>
@interface PNCollectionViewCell() @interface PNCollectionViewCell()
@property (nonatomic, strong) UIImageView *photoImageView; @property (nonatomic, strong) UIImageView *photoImageView;
@property (nonatomic, strong) MMMaterialDesignSpinner *loadingSpinner; @property (nonatomic, strong) DGActivityIndicatorView *loadingSpinner;
@end @end
@ -35,7 +35,11 @@
[self.contentView addSubview:_photoImageView]; [self.contentView addSubview:_photoImageView];
_loadingSpinner = [MMMaterialDesignSpinner newAutoLayoutView]; _loadingSpinner = [[DGActivityIndicatorView alloc] initWithType:DGActivityIndicatorAnimationTypeBallClipRotate tintColor:[[UIColor lightGrayColor] colorWithAlphaComponent:0.7] size:35];
[_loadingSpinner setTranslatesAutoresizingMaskIntoConstraints:NO];
[self.contentView addSubview:_loadingSpinner];
[_loadingSpinner startAnimating];
} }
return self; return self;
} }
@ -56,12 +60,17 @@
[_photoImageView autoPinEdgeToSuperviewEdge:ALEdgeTrailing withInset:8]; [_photoImageView autoPinEdgeToSuperviewEdge:ALEdgeTrailing withInset:8];
[_photoImageView autoAlignAxisToSuperviewAxis:ALAxisVertical]; [_photoImageView autoAlignAxisToSuperviewAxis:ALAxisVertical];
[_photoImageView autoAlignAxisToSuperviewAxis:ALAxisHorizontal]; [_photoImageView autoAlignAxisToSuperviewAxis:ALAxisHorizontal];
[_loadingSpinner autoAlignAxisToSuperviewAxis:ALAxisHorizontal];
[_loadingSpinner autoAlignAxisToSuperviewAxis:ALAxisVertical];
} }
} }
- (void) setPhotoImage:(UIImage *)photoImage { - (void) setPhotoImage:(UIImage *)photoImage {
if (photoImage) { if (photoImage) {
[_photoImageView setImage:photoImage]; [_photoImageView setImage:photoImage];
[_loadingSpinner stopAnimating];
} }
} }