From 68f6f6be7d2580982f1633115acea0f6111f9116 Mon Sep 17 00:00:00 2001 From: Storix Date: Thu, 21 Apr 2016 20:12:46 +0300 Subject: [PATCH] Improve consistency with the original code --- CTAssetsPickerController/CTAssetScrollView.m | 7 +++---- CTAssetsPickerDemo.xcodeproj/project.pbxproj | 2 +- Podfile.lock | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CTAssetsPickerController/CTAssetScrollView.m b/CTAssetsPickerController/CTAssetScrollView.m index d3b8f3ab..7f802c06 100644 --- a/CTAssetsPickerController/CTAssetScrollView.m +++ b/CTAssetsPickerController/CTAssetScrollView.m @@ -295,10 +295,9 @@ - (void)bind:(PHAsset *)asset image:(UIImage *)image requestInfo:(NSDictionary * { BOOL zoom = (!self.image); self.image = image; - - self.imageView.image = image; - - if (isDegraded) + self.imageView.image = image; + + if (isDegraded) [self mimicProgress]; else [self setProgress:1]; diff --git a/CTAssetsPickerDemo.xcodeproj/project.pbxproj b/CTAssetsPickerDemo.xcodeproj/project.pbxproj index 94d2881b..21bfb175 100644 --- a/CTAssetsPickerDemo.xcodeproj/project.pbxproj +++ b/CTAssetsPickerDemo.xcodeproj/project.pbxproj @@ -135,7 +135,7 @@ ADD966021AAD5780002A26A2 /* CTAssetItemViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CTAssetItemViewController.h; sourceTree = ""; }; ADD966031AAD5780002A26A2 /* CTAssetItemViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CTAssetItemViewController.m; sourceTree = ""; }; ADD966041AAD5780002A26A2 /* CTAssetScrollView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CTAssetScrollView.h; sourceTree = ""; }; - ADD966051AAD5780002A26A2 /* CTAssetScrollView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CTAssetScrollView.m; sourceTree = ""; }; + ADD966051AAD5780002A26A2 /* CTAssetScrollView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CTAssetScrollView.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; ADD966061AAD5780002A26A2 /* CTAssetCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CTAssetCollectionViewCell.h; sourceTree = ""; }; ADD966071AAD5780002A26A2 /* CTAssetCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CTAssetCollectionViewCell.m; sourceTree = ""; }; ADD966081AAD5780002A26A2 /* CTAssetCollectionViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CTAssetCollectionViewController.h; sourceTree = ""; }; diff --git a/Podfile.lock b/Podfile.lock index 5ff495a4..5c22eb9c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,7 +14,7 @@ EXTERNAL SOURCES: :path: "." SPEC CHECKSUMS: - CTAssetsPickerController: b88d1ca098a4645399ab25e96b56b7b64550f2e7 + CTAssetsPickerController: d0e938e161a59cddf159621371c1be220a7d4b05 PureLayout: f35f5384c9c4e4479df041dbe33ad7577b71ddfb COCOAPODS: 0.39.0