From 2b0ca8d4997cb34f20620821661f7de7903167e4 Mon Sep 17 00:00:00 2001 From: Victor Peschenkov Date: Thu, 19 Oct 2017 13:39:24 +0100 Subject: [PATCH] Downgrade to iOS 8 #2 --- LetterAvatarKit.podspec | 4 +- LetterAvatarKit.xcodeproj/project.pbxproj | 40 +++++++++- LetterAvatarKit/Info.plist | 2 +- LetterAvatarKit/LetterAvatarBuilder.swift | 6 +- .../project.pbxproj | 2 + LetterAvatarKitExample/Podfile.lock | 4 +- .../LetterAvatarKit.podspec.json | 11 +-- LetterAvatarKitExample/Pods/Manifest.lock | 4 +- .../LetterAvatarKit/Info.plist | 2 +- .../LetterAvatarKit/LetterAvatarKit.xcconfig | 1 - ...Pods-LetterAvatarKitExample.debug.xcconfig | 1 - ...ds-LetterAvatarKitExample.release.xcconfig | 1 - LetterAvatarKitObjcExample/Podfile.lock | 4 +- .../LetterAvatarKit.podspec.json | 11 +-- LetterAvatarKitObjcExample/Pods/Manifest.lock | 4 +- .../Pods/Pods.xcodeproj/project.pbxproj | 38 +++------ .../LetterAvatarKit/Info.plist | 2 +- .../LetterAvatarKit/LetterAvatarKit.xcconfig | 1 - ...-LetterAvatarKitObjcExample.debug.xcconfig | 1 - ...etterAvatarKitObjcExample.release.xcconfig | 1 - .../Assets.xcassets/Contents.json | 6 -- .../Contents.json | 22 ----- .../LetterAvatarEmptyTestImage@2x.png | Bin 3536 -> 0 bytes .../Contents.json | 22 ----- .../LetterAvatarTestImage@2x.png | Bin 2733 -> 0 bytes .../Extensions/UIImageExtensionTests.swift | 4 +- .../LetterAvatarBuilderTests.swift | 5 +- .../LetterAvatarEmptyTestImage@2x.png | Bin 0 -> 3721 bytes .../LetterAvatarEmptyTestImage@3x.png | Bin .../Resources/LetterAvatarTestImage@2x.png | Bin 0 -> 1740 bytes .../LetterAvatarTestImage@3x.png | Bin .../Utilities/UIImage+CompareOfPixels.swift | 75 ++++++++++++++++++ 32 files changed, 152 insertions(+), 122 deletions(-) delete mode 100644 LetterAvatarKitTests/Assets.xcassets/Contents.json delete mode 100644 LetterAvatarKitTests/Assets.xcassets/LetterAvatarEmptyTestImage.imageset/Contents.json delete mode 100644 LetterAvatarKitTests/Assets.xcassets/LetterAvatarEmptyTestImage.imageset/LetterAvatarEmptyTestImage@2x.png delete mode 100644 LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/Contents.json delete mode 100644 LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/LetterAvatarTestImage@2x.png create mode 100644 LetterAvatarKitTests/Resources/LetterAvatarEmptyTestImage@2x.png rename LetterAvatarKitTests/{Assets.xcassets/LetterAvatarEmptyTestImage.imageset => Resources}/LetterAvatarEmptyTestImage@3x.png (100%) create mode 100644 LetterAvatarKitTests/Resources/LetterAvatarTestImage@2x.png rename LetterAvatarKitTests/{Assets.xcassets/LetterAvatarTestImage.imageset => Resources}/LetterAvatarTestImage@3x.png (100%) create mode 100644 LetterAvatarKitTests/Utilities/UIImage+CompareOfPixels.swift diff --git a/LetterAvatarKit.podspec b/LetterAvatarKit.podspec index 425145a..0f88e05 100644 --- a/LetterAvatarKit.podspec +++ b/LetterAvatarKit.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'LetterAvatarKit' - s.platform = :ios, '9.0' - s.version = '1.0.0' + s.platform = :ios, '8.0' + s.version = '1.0.1' s.license = { :type => 'MIT' } s.homepage = 'https://github.com/vpeschenkov/LetterAvatarKit' s.authors = { 'Victor Peschenkov' => 'nerevarxx@gmail.com' } diff --git a/LetterAvatarKit.xcodeproj/project.pbxproj b/LetterAvatarKit.xcodeproj/project.pbxproj index 22dcd6d..5668d70 100644 --- a/LetterAvatarKit.xcodeproj/project.pbxproj +++ b/LetterAvatarKit.xcodeproj/project.pbxproj @@ -7,13 +7,17 @@ objects = { /* Begin PBXBuildFile section */ - EB28495F1F87F28E00286070 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EB28495E1F87F28E00286070 /* Assets.xcassets */; }; EB516B651F8810D200BEA1F2 /* CharacterExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB516B621F8810D200BEA1F2 /* CharacterExtension.swift */; }; EB516B661F8810D200BEA1F2 /* UIColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB516B631F8810D200BEA1F2 /* UIColorExtension.swift */; }; EB516B671F8810D200BEA1F2 /* UIImageExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB516B641F8810D200BEA1F2 /* UIImageExtension.swift */; }; EB516B6C1F88110A00BEA1F2 /* CharacterExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB516B691F88110A00BEA1F2 /* CharacterExtensionTests.swift */; }; EB516B6D1F88110A00BEA1F2 /* UIColorExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB516B6A1F88110A00BEA1F2 /* UIColorExtensionTests.swift */; }; EB516B6E1F88110A00BEA1F2 /* UIImageExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB516B6B1F88110A00BEA1F2 /* UIImageExtensionTests.swift */; }; + EB821DF61F98B906009B3775 /* LetterAvatarEmptyTestImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = EB821DF21F98B906009B3775 /* LetterAvatarEmptyTestImage@2x.png */; }; + EB821DF71F98B906009B3775 /* LetterAvatarEmptyTestImage@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = EB821DF31F98B906009B3775 /* LetterAvatarEmptyTestImage@3x.png */; }; + EB821DF81F98B906009B3775 /* LetterAvatarTestImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = EB821DF41F98B906009B3775 /* LetterAvatarTestImage@2x.png */; }; + EB821DF91F98B906009B3775 /* LetterAvatarTestImage@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = EB821DF51F98B906009B3775 /* LetterAvatarTestImage@3x.png */; }; + EB821DFC1F98C233009B3775 /* UIImage+CompareOfPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB821DFB1F98C233009B3775 /* UIImage+CompareOfPixels.swift */; }; EB8EC4131F85929E000B7641 /* LetterAvatarKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EB8EC4091F85929E000B7641 /* LetterAvatarKit.framework */; }; EB8EC4181F85929E000B7641 /* LetterAvatarBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB8EC4171F85929E000B7641 /* LetterAvatarBuilderTests.swift */; }; EB8EC41A1F85929E000B7641 /* LetterAvatarKit.h in Headers */ = {isa = PBXBuildFile; fileRef = EB8EC40C1F85929E000B7641 /* LetterAvatarKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -31,13 +35,17 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - EB28495E1F87F28E00286070 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; EB516B621F8810D200BEA1F2 /* CharacterExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterExtension.swift; sourceTree = ""; }; EB516B631F8810D200BEA1F2 /* UIColorExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIColorExtension.swift; sourceTree = ""; }; EB516B641F8810D200BEA1F2 /* UIImageExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImageExtension.swift; sourceTree = ""; }; EB516B691F88110A00BEA1F2 /* CharacterExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterExtensionTests.swift; sourceTree = ""; }; EB516B6A1F88110A00BEA1F2 /* UIColorExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIColorExtensionTests.swift; sourceTree = ""; }; EB516B6B1F88110A00BEA1F2 /* UIImageExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImageExtensionTests.swift; sourceTree = ""; }; + EB821DF21F98B906009B3775 /* LetterAvatarEmptyTestImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LetterAvatarEmptyTestImage@2x.png"; sourceTree = ""; }; + EB821DF31F98B906009B3775 /* LetterAvatarEmptyTestImage@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LetterAvatarEmptyTestImage@3x.png"; sourceTree = ""; }; + EB821DF41F98B906009B3775 /* LetterAvatarTestImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LetterAvatarTestImage@2x.png"; sourceTree = ""; }; + EB821DF51F98B906009B3775 /* LetterAvatarTestImage@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LetterAvatarTestImage@3x.png"; sourceTree = ""; }; + EB821DFB1F98C233009B3775 /* UIImage+CompareOfPixels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+CompareOfPixels.swift"; sourceTree = ""; }; EB8EC4091F85929E000B7641 /* LetterAvatarKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LetterAvatarKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EB8EC40C1F85929E000B7641 /* LetterAvatarKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LetterAvatarKit.h; sourceTree = ""; }; EB8EC40D1F85929E000B7641 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -86,6 +94,25 @@ path = Extensions; sourceTree = ""; }; + EB821DF11F98B906009B3775 /* Resources */ = { + isa = PBXGroup; + children = ( + EB821DF21F98B906009B3775 /* LetterAvatarEmptyTestImage@2x.png */, + EB821DF31F98B906009B3775 /* LetterAvatarEmptyTestImage@3x.png */, + EB821DF41F98B906009B3775 /* LetterAvatarTestImage@2x.png */, + EB821DF51F98B906009B3775 /* LetterAvatarTestImage@3x.png */, + ); + path = Resources; + sourceTree = ""; + }; + EB821DFA1F98C0D4009B3775 /* Utilities */ = { + isa = PBXGroup; + children = ( + EB821DFB1F98C233009B3775 /* UIImage+CompareOfPixels.swift */, + ); + path = Utilities; + sourceTree = ""; + }; EB8EC3FF1F85929E000B7641 = { isa = PBXGroup; children = ( @@ -118,9 +145,10 @@ EB8EC4161F85929E000B7641 /* LetterAvatarKitTests */ = { isa = PBXGroup; children = ( + EB821DFA1F98C0D4009B3775 /* Utilities */, + EB821DF11F98B906009B3775 /* Resources */, EB516B681F88110A00BEA1F2 /* Extensions */, EB8EC4171F85929E000B7641 /* LetterAvatarBuilderTests.swift */, - EB28495E1F87F28E00286070 /* Assets.xcassets */, EB8EC4191F85929E000B7641 /* Info.plist */, ); path = LetterAvatarKitTests; @@ -227,7 +255,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - EB28495F1F87F28E00286070 /* Assets.xcassets in Resources */, + EB821DF91F98B906009B3775 /* LetterAvatarTestImage@3x.png in Resources */, + EB821DF71F98B906009B3775 /* LetterAvatarEmptyTestImage@3x.png in Resources */, + EB821DF81F98B906009B3775 /* LetterAvatarTestImage@2x.png in Resources */, + EB821DF61F98B906009B3775 /* LetterAvatarEmptyTestImage@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -252,6 +283,7 @@ EB8EC4181F85929E000B7641 /* LetterAvatarBuilderTests.swift in Sources */, EB516B6D1F88110A00BEA1F2 /* UIColorExtensionTests.swift in Sources */, EB516B6C1F88110A00BEA1F2 /* CharacterExtensionTests.swift in Sources */, + EB821DFC1F98C233009B3775 /* UIImage+CompareOfPixels.swift in Sources */, EB516B6E1F88110A00BEA1F2 /* UIImageExtensionTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LetterAvatarKit/Info.plist b/LetterAvatarKit/Info.plist index 4c0d218..139f35e 100644 --- a/LetterAvatarKit/Info.plist +++ b/LetterAvatarKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.0 + 1.0.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/LetterAvatarKit/LetterAvatarBuilder.swift b/LetterAvatarKit/LetterAvatarBuilder.swift index 81bbc6c..ae4468b 100644 --- a/LetterAvatarKit/LetterAvatarBuilder.swift +++ b/LetterAvatarKit/LetterAvatarBuilder.swift @@ -98,9 +98,9 @@ open class LetterAvatarBuilder: NSObject { let lettersSize = letters.size(withAttributes: attributes) #else let attributes = [ - NSParagraphStyleAttributeName: style, - NSFontAttributeName: letterFont.withSize(min(size.height, size.width) / 2.0), - NSForegroundColorAttributeName: letterColor + NSParagraphStyleAttributeName: style, + NSFontAttributeName: letterFont.withSize(min(size.height, size.width) / 2.0), + NSForegroundColorAttributeName: letterColor ] let lettersSize = letters.size(attributes: attributes) diff --git a/LetterAvatarKitExample/LetterAvatarKitExample.xcodeproj/project.pbxproj b/LetterAvatarKitExample/LetterAvatarKitExample.xcodeproj/project.pbxproj index b1ea0d3..16e7cc0 100644 --- a/LetterAvatarKitExample/LetterAvatarKitExample.xcodeproj/project.pbxproj +++ b/LetterAvatarKitExample/LetterAvatarKitExample.xcodeproj/project.pbxproj @@ -352,6 +352,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = LetterAvatarKitExample/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = org.peschenkov.LetterAvatarKitExample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -367,6 +368,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = LetterAvatarKitExample/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = org.peschenkov.LetterAvatarKitExample; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/LetterAvatarKitExample/Podfile.lock b/LetterAvatarKitExample/Podfile.lock index d5a53da..e31cb34 100644 --- a/LetterAvatarKitExample/Podfile.lock +++ b/LetterAvatarKitExample/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - LetterAvatarKit (1.0.0) + - LetterAvatarKit (1.0.1) DEPENDENCIES: - LetterAvatarKit (from `../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - LetterAvatarKit: 17cba94f8f47810185656869b022d1301e68de3f + LetterAvatarKit: 3f39edc7f5d6c53b9f6ec9169bad73e044684049 PODFILE CHECKSUM: 407d67c5c51bb4907e98b407342cb20aaddc7148 diff --git a/LetterAvatarKitExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json b/LetterAvatarKitExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json index 859d644..970f2b5 100644 --- a/LetterAvatarKitExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json +++ b/LetterAvatarKitExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json @@ -3,7 +3,7 @@ "platforms": { "ios": "8.0" }, - "version": "1.0.0", + "version": "1.0.1", "license": { "type": "MIT" }, @@ -11,10 +11,10 @@ "authors": { "Victor Peschenkov": "nerevarxx@gmail.com" }, - "summary": "hh", + "summary": "UIImage extension that generates letter-based avatars written in Swift.", "source": { "git": "https://github.com/vpeschenkov/LetterAvatarKit.git", - "tag": "1.0.0" + "tag": "1.0.1" }, "source_files": [ "LetterAvatarKit/*.{h,swift}", @@ -24,8 +24,5 @@ "frameworks": [ "Foundation", "UIKit" - ], - "xcconfig": { - "SWIFT_VERSION": "4.0" - } + ] } diff --git a/LetterAvatarKitExample/Pods/Manifest.lock b/LetterAvatarKitExample/Pods/Manifest.lock index d5a53da..e31cb34 100644 --- a/LetterAvatarKitExample/Pods/Manifest.lock +++ b/LetterAvatarKitExample/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - LetterAvatarKit (1.0.0) + - LetterAvatarKit (1.0.1) DEPENDENCIES: - LetterAvatarKit (from `../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - LetterAvatarKit: 17cba94f8f47810185656869b022d1301e68de3f + LetterAvatarKit: 3f39edc7f5d6c53b9f6ec9169bad73e044684049 PODFILE CHECKSUM: 407d67c5c51bb4907e98b407342cb20aaddc7148 diff --git a/LetterAvatarKitExample/Pods/Target Support Files/LetterAvatarKit/Info.plist b/LetterAvatarKitExample/Pods/Target Support Files/LetterAvatarKit/Info.plist index 2243fe6..3c175b6 100644 --- a/LetterAvatarKitExample/Pods/Target Support Files/LetterAvatarKit/Info.plist +++ b/LetterAvatarKitExample/Pods/Target Support Files/LetterAvatarKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.0 + 1.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/LetterAvatarKitExample/Pods/Target Support Files/LetterAvatarKit/LetterAvatarKit.xcconfig b/LetterAvatarKitExample/Pods/Target Support Files/LetterAvatarKit/LetterAvatarKit.xcconfig index c6c3f8d..40d6704 100644 --- a/LetterAvatarKitExample/Pods/Target Support Files/LetterAvatarKit/LetterAvatarKit.xcconfig +++ b/LetterAvatarKitExample/Pods/Target Support Files/LetterAvatarKit/LetterAvatarKit.xcconfig @@ -9,4 +9,3 @@ PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES -SWIFT_VERSION = 4.0 diff --git a/LetterAvatarKitExample/Pods/Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.debug.xcconfig b/LetterAvatarKitExample/Pods/Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.debug.xcconfig index 0e38e80..e8cea3b 100644 --- a/LetterAvatarKitExample/Pods/Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.debug.xcconfig +++ b/LetterAvatarKitExample/Pods/Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.debug.xcconfig @@ -9,4 +9,3 @@ PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods -SWIFT_VERSION = 4.0 diff --git a/LetterAvatarKitExample/Pods/Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.release.xcconfig b/LetterAvatarKitExample/Pods/Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.release.xcconfig index 0e38e80..e8cea3b 100644 --- a/LetterAvatarKitExample/Pods/Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.release.xcconfig +++ b/LetterAvatarKitExample/Pods/Target Support Files/Pods-LetterAvatarKitExample/Pods-LetterAvatarKitExample.release.xcconfig @@ -9,4 +9,3 @@ PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods -SWIFT_VERSION = 4.0 diff --git a/LetterAvatarKitObjcExample/Podfile.lock b/LetterAvatarKitObjcExample/Podfile.lock index db3af87..df8ee48 100644 --- a/LetterAvatarKitObjcExample/Podfile.lock +++ b/LetterAvatarKitObjcExample/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - LetterAvatarKit (1.0.0) + - LetterAvatarKit (1.0.1) DEPENDENCIES: - LetterAvatarKit (from `../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - LetterAvatarKit: 17cba94f8f47810185656869b022d1301e68de3f + LetterAvatarKit: 3f39edc7f5d6c53b9f6ec9169bad73e044684049 PODFILE CHECKSUM: acab86cc8cc5517bd2b945abae924096efac0c35 diff --git a/LetterAvatarKitObjcExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json b/LetterAvatarKitObjcExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json index 859d644..970f2b5 100644 --- a/LetterAvatarKitObjcExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json +++ b/LetterAvatarKitObjcExample/Pods/Local Podspecs/LetterAvatarKit.podspec.json @@ -3,7 +3,7 @@ "platforms": { "ios": "8.0" }, - "version": "1.0.0", + "version": "1.0.1", "license": { "type": "MIT" }, @@ -11,10 +11,10 @@ "authors": { "Victor Peschenkov": "nerevarxx@gmail.com" }, - "summary": "hh", + "summary": "UIImage extension that generates letter-based avatars written in Swift.", "source": { "git": "https://github.com/vpeschenkov/LetterAvatarKit.git", - "tag": "1.0.0" + "tag": "1.0.1" }, "source_files": [ "LetterAvatarKit/*.{h,swift}", @@ -24,8 +24,5 @@ "frameworks": [ "Foundation", "UIKit" - ], - "xcconfig": { - "SWIFT_VERSION": "4.0" - } + ] } diff --git a/LetterAvatarKitObjcExample/Pods/Manifest.lock b/LetterAvatarKitObjcExample/Pods/Manifest.lock index db3af87..df8ee48 100644 --- a/LetterAvatarKitObjcExample/Pods/Manifest.lock +++ b/LetterAvatarKitObjcExample/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - LetterAvatarKit (1.0.0) + - LetterAvatarKit (1.0.1) DEPENDENCIES: - LetterAvatarKit (from `../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - LetterAvatarKit: 17cba94f8f47810185656869b022d1301e68de3f + LetterAvatarKit: 3f39edc7f5d6c53b9f6ec9169bad73e044684049 PODFILE CHECKSUM: acab86cc8cc5517bd2b945abae924096efac0c35 diff --git a/LetterAvatarKitObjcExample/Pods/Pods.xcodeproj/project.pbxproj b/LetterAvatarKitObjcExample/Pods/Pods.xcodeproj/project.pbxproj index 97a2310..19acc44 100644 --- a/LetterAvatarKitObjcExample/Pods/Pods.xcodeproj/project.pbxproj +++ b/LetterAvatarKitObjcExample/Pods/Pods.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 48; objects = { /* Begin PBXBuildFile section */ @@ -35,27 +35,27 @@ 00FBD1B5464104C8B2802C88F9929B71 /* LetterAvatarKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = LetterAvatarKit.xcconfig; sourceTree = ""; }; 1483EA1276876246E7A1655BD9E2E39E /* Pods-LetterAvatarKitObjcExample-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-LetterAvatarKitObjcExample-acknowledgements.plist"; sourceTree = ""; }; 158D56B9EDD724C8DE52BE040FC895AF /* UIColorExtension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UIColorExtension.swift; sourceTree = ""; }; - 16F1A9A504754D1ABCE12F5D7B38C950 /* Pods_LetterAvatarKitObjcExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LetterAvatarKitObjcExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 16F1A9A504754D1ABCE12F5D7B38C950 /* Pods_LetterAvatarKitObjcExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_LetterAvatarKitObjcExample.framework; path = "Pods-LetterAvatarKitObjcExample.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 20AC1AD4EC2DAAE27D8EC98C5CA21CB6 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 20F2535D0F8EB530323ACE82251F696C /* Pods-LetterAvatarKitObjcExample-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-LetterAvatarKitObjcExample-acknowledgements.markdown"; sourceTree = ""; }; 31B9D4B9DD74813A0DA3AF43B61A8E57 /* CharacterExtension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CharacterExtension.swift; sourceTree = ""; }; - 35EEB2554B69B3AF3E1A84F0FEB82416 /* Pods-LetterAvatarKitObjcExample.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-LetterAvatarKitObjcExample.modulemap"; sourceTree = ""; }; + 35EEB2554B69B3AF3E1A84F0FEB82416 /* Pods-LetterAvatarKitObjcExample.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-LetterAvatarKitObjcExample.modulemap"; sourceTree = ""; }; 4789C879FC4015C20393BEA677AE7BE3 /* Pods-LetterAvatarKitObjcExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-LetterAvatarKitObjcExample.release.xcconfig"; sourceTree = ""; }; 6543FC3746EA07703BE2B28233A6F4AF /* LetterAvatarKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LetterAvatarKit-prefix.pch"; sourceTree = ""; }; 711EDE325E49A8EC716F39E59BF84A38 /* UIImageExtension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UIImageExtension.swift; sourceTree = ""; }; 7B1BCD83AC13B2ADE91342914D805D51 /* Pods-LetterAvatarKitObjcExample-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-LetterAvatarKitObjcExample-resources.sh"; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; A81F06FA3A730238284C0D1538B69A60 /* Pods-LetterAvatarKitObjcExample-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-LetterAvatarKitObjcExample-dummy.m"; sourceTree = ""; }; A8ABB6675AF90C5EA9D397B715889BB4 /* LetterAvatarBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LetterAvatarBuilder.swift; sourceTree = ""; }; B331B683E4ACA05EE4E28681D2973EA6 /* LetterAvatarKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "LetterAvatarKit-umbrella.h"; sourceTree = ""; }; B63C6A64CF66340668996F78DA6BB482 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; B6D22B6E25820A59EB6A16E2CC3C5692 /* Pods-LetterAvatarKitObjcExample-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-LetterAvatarKitObjcExample-umbrella.h"; sourceTree = ""; }; - BBF009C023AC24FF8F70B3F9208456E4 /* LetterAvatarKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LetterAvatarKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BBF009C023AC24FF8F70B3F9208456E4 /* LetterAvatarKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = LetterAvatarKit.framework; path = LetterAvatarKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CCC9089ADCF350A35E80E508E034DB91 /* LetterAvatarKit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = LetterAvatarKit.h; sourceTree = ""; }; CF0D92D9FFB2E1068BF50803B5EE07CC /* LetterAvatarKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "LetterAvatarKit-dummy.m"; sourceTree = ""; }; D88AAE1F92055A60CC2FC970D7D34634 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; DE9C83939DB7B6D8EDD470B7B0BB56D0 /* Pods-LetterAvatarKitObjcExample-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-LetterAvatarKitObjcExample-frameworks.sh"; sourceTree = ""; }; - E494C3C48570CF6BFFEF4A8E271C71EE /* LetterAvatarKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = LetterAvatarKit.modulemap; sourceTree = ""; }; + E494C3C48570CF6BFFEF4A8E271C71EE /* LetterAvatarKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = LetterAvatarKit.modulemap; sourceTree = ""; }; EC75467232694C1A773815FA89159748 /* Pods-LetterAvatarKitObjcExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-LetterAvatarKitObjcExample.debug.xcconfig"; sourceTree = ""; }; F4C89909FD8B718FD0DE89EFADD4B678 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -165,6 +165,7 @@ CCC9089ADCF350A35E80E508E034DB91 /* LetterAvatarKit.h */, FD094A9FD0DC4E0D95833CB102D55261 /* Extensions */, ); + name = LetterAvatarKit; path = LetterAvatarKit; sourceTree = ""; }; @@ -193,6 +194,7 @@ 158D56B9EDD724C8DE52BE040FC895AF /* UIColorExtension.swift */, 711EDE325E49A8EC716F39E59BF84A38 /* UIImageExtension.swift */, ); + name = Extensions; path = Extensions; sourceTree = ""; }; @@ -261,7 +263,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0700; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -318,7 +320,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = EC75467232694C1A773815FA89159748 /* Pods-LetterAvatarKitObjcExample.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -364,9 +365,7 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -374,21 +373,15 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_DEBUG=1", @@ -414,7 +407,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 4789C879FC4015C20393BEA677AE7BE3 /* Pods-LetterAvatarKitObjcExample.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -476,7 +468,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -511,7 +503,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -528,9 +520,7 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -538,20 +528,14 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_RELEASE=1", "$(inherited)", diff --git a/LetterAvatarKitObjcExample/Pods/Target Support Files/LetterAvatarKit/Info.plist b/LetterAvatarKitObjcExample/Pods/Target Support Files/LetterAvatarKit/Info.plist index 2243fe6..3c175b6 100644 --- a/LetterAvatarKitObjcExample/Pods/Target Support Files/LetterAvatarKit/Info.plist +++ b/LetterAvatarKitObjcExample/Pods/Target Support Files/LetterAvatarKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.0 + 1.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/LetterAvatarKitObjcExample/Pods/Target Support Files/LetterAvatarKit/LetterAvatarKit.xcconfig b/LetterAvatarKitObjcExample/Pods/Target Support Files/LetterAvatarKit/LetterAvatarKit.xcconfig index c6c3f8d..40d6704 100644 --- a/LetterAvatarKitObjcExample/Pods/Target Support Files/LetterAvatarKit/LetterAvatarKit.xcconfig +++ b/LetterAvatarKitObjcExample/Pods/Target Support Files/LetterAvatarKit/LetterAvatarKit.xcconfig @@ -9,4 +9,3 @@ PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES -SWIFT_VERSION = 4.0 diff --git a/LetterAvatarKitObjcExample/Pods/Target Support Files/Pods-LetterAvatarKitObjcExample/Pods-LetterAvatarKitObjcExample.debug.xcconfig b/LetterAvatarKitObjcExample/Pods/Target Support Files/Pods-LetterAvatarKitObjcExample/Pods-LetterAvatarKitObjcExample.debug.xcconfig index d883796..f736f72 100644 --- a/LetterAvatarKitObjcExample/Pods/Target Support Files/Pods-LetterAvatarKitObjcExample/Pods-LetterAvatarKitObjcExample.debug.xcconfig +++ b/LetterAvatarKitObjcExample/Pods/Target Support Files/Pods-LetterAvatarKitObjcExample/Pods-LetterAvatarKitObjcExample.debug.xcconfig @@ -9,4 +9,3 @@ PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods -SWIFT_VERSION = 4.0 diff --git a/LetterAvatarKitObjcExample/Pods/Target Support Files/Pods-LetterAvatarKitObjcExample/Pods-LetterAvatarKitObjcExample.release.xcconfig b/LetterAvatarKitObjcExample/Pods/Target Support Files/Pods-LetterAvatarKitObjcExample/Pods-LetterAvatarKitObjcExample.release.xcconfig index d883796..f736f72 100644 --- a/LetterAvatarKitObjcExample/Pods/Target Support Files/Pods-LetterAvatarKitObjcExample/Pods-LetterAvatarKitObjcExample.release.xcconfig +++ b/LetterAvatarKitObjcExample/Pods/Target Support Files/Pods-LetterAvatarKitObjcExample/Pods-LetterAvatarKitObjcExample.release.xcconfig @@ -9,4 +9,3 @@ PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods -SWIFT_VERSION = 4.0 diff --git a/LetterAvatarKitTests/Assets.xcassets/Contents.json b/LetterAvatarKitTests/Assets.xcassets/Contents.json deleted file mode 100644 index da4a164..0000000 --- a/LetterAvatarKitTests/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LetterAvatarKitTests/Assets.xcassets/LetterAvatarEmptyTestImage.imageset/Contents.json b/LetterAvatarKitTests/Assets.xcassets/LetterAvatarEmptyTestImage.imageset/Contents.json deleted file mode 100644 index ed410fb..0000000 --- a/LetterAvatarKitTests/Assets.xcassets/LetterAvatarEmptyTestImage.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LetterAvatarEmptyTestImage@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LetterAvatarEmptyTestImage@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LetterAvatarKitTests/Assets.xcassets/LetterAvatarEmptyTestImage.imageset/LetterAvatarEmptyTestImage@2x.png b/LetterAvatarKitTests/Assets.xcassets/LetterAvatarEmptyTestImage.imageset/LetterAvatarEmptyTestImage@2x.png deleted file mode 100644 index 1487a0fd762ca2f006f8c110e7839a43802873c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3536 zcmeHKX*?9%9v(G?u}e{}nC#hR3Sk;#OCw8`$}%ysWtqW@7=|!XR8m>P3}Y#jCB>j@ z+1HTeeaVEuFtQ9~r%Ug9-+S+e`~7~n=l473f6nuN&hz~L=i7<7VrIkxIspOz06d6G z29|p0C*F}we56h?+kXnWN8Wj1j_&b;dcRm%{?f51^~DX z1pt^R005Q(00{f0S6RUK5}dx5Y;gd{+Ef zh7v9a*4F~;e!G1>pI=^x$UndA+c}t_xQ6;e-F2RIbm>r zwYAqEWIqErqYQ=ot-W^@zK_Dpu^z5_&ine>XW+k>|AGDG1BdLJ|64JCcKQq5YgHQr zhy49)+8~pUvbF#K*EqsJ*BZ|@kF@trH#*uKJmgU9M+}gMEfo zlZ`oI>JEZ+b8Et_fzkJb*o^yx9Y7y?WjDj|hty&oP^=64hhOke#x0Wv8)NiEhXPyH zxH77l0V?jRYnxwp7~AJXYu7VYK6O4{2|Z6$ao@cVI&|57@{Whp*bqJJvfzQ_Kl}vHiV94K5r+&u*71hmyOZdGt4Mi^ADbicbkcA84YbS zOC>%bmfzUWKi@u|P~aer{kj;l~4U3gq8&XWHRyP=l{0^6}-Y zqRzA#YPw+rvE^0jtyjiGijn+pdFj_bUVw7%V!P05*8R(N3wB$Pi9e<&dT3TQ>sn#D zMXSCqn19`4ZubF7AbYCls!k%g>AixdCrGl$Yc&hZS6`A-E{Dy^ZQzQB7pfcseLZ4& zepLu~;6A;Jd=B+C@vXq4d)fkCFrgJ;(ceA>%F#qY8W90fp+9LQSjbt8vH`A8W6~$J z#nEflSsXj*Uwo6A1hMXj#4r<-OofECf9dVourXgu+v=t7tIv!Xa6CbkR_Y|?d_0Bo z9*J~R&9M-z?&f>$!OXI!rw40IGC2Xp*9?8cE_CYpvka8Y?)<$QGona-mpm%!@))8t zoOz;ld1OvpUd{UGJst5vtGh^qBR|rbA3i!b`vE_GKrVlc_F$O#al+*+YpK1p?knaI z@_8+#b^N216cTZm=$@RMSC%qTGf?udeMeH$ZnQwv4ewMQ$b{W>H)2n?&Sx+eTH4_b zUU$E){JrauLNs`zY53={xJ^SVfMbr!7gd}QN4lR_1P9uFP(zYC>weVfLtlpm z%|tG=m2sMEH1Pd=Q*hC+HO*U5eqOHl+VGQaHJlrjy%7Tgjo~{U&5{G#mzB;D*&1SY z$!)n&=B)L}*^Q*fg)Y^bZI|!;v?C`d6K*?A7k`#Crt`M!)^dv3rE3Mv-Z&&ArJz5a zvEEi~=>B=ly?F}}9j&LyozIo*pEPvkpsBG20s0ND9&p?q;kgvri*E76WMfyJRl5$v zj-NGzObH%$IQhQxT~*d(jt;MM>wSlG4yB~crclkKkmr)!$K?|v6-Cz6*1K;#dq~w&y1++PWo_)PAp$v=KJi| zULKD8+>h>P<1OZBdfO8VeR%n3nT*rwDXwRRUU)Thw)f4^uP0J%+y|DMSnE+^O#_LH zO+p?)L4*U9>Gr&Nf-*r+C_nA(l+=WL#bFiizjKIh^i<7T_S!vJ?GzH;Z|SDIO$=jt zqI6Mho`Nlwj_$7ibh%g0-B!9G?a0u~G`Xlh!ICB&Y5;u{5|n4YS4P6d!De%t(+Vk$ zXF6c<5tKYHldj0QlNFQW$ewKKu7t?N7dW4tiXU&IZ++)DWQQh54Vz`*ptU!Xa-SdN zJem76BKU2hrI>W65%i1w%fqS*g?J}coZV{B-2;W!I_@WF+8w*!s3CuClAUg<=m)Qn z6sf3-%_K3!iagi#Zl@hc7e;v3oMBT?b9M`Lo=BDGm+_mvpml1gwzQG8{uGsY&+PSW znUGo!bLR?cE-&6F4s=U6#d@8cBx~6gZ{oSuK5TKywlSMMLomI&`cO+x{-9Z7Z4l5X z%kG30=Z3;$;}C^ML%znqOmZP^&@lGvAnSB}oid5wolWKraz>cXAzvisU0Aq97}eWd-00H!7fG+xBk@}1`4Nk(chj@0}5kY*Nlu5Rt5gj&rTS@U3?>Wr>! zx={=A6XD3K#XaFvj@r%5t>Roa9P5$mN?W;EF8Css3XsvoPXgq*Ghsyra;Q_!ca*U6 zRJC{Apn_3bB7HmvE8rEjG1!H9O)ASFq`3ndxRIV&>eb+ud8;96s~;{Wvm{2r$BzMb_oPoz8RsKOY9F%-YiuGD_waqW!W zCX3I}Pr1EDtjo70MW*Yke{hjhIH;|oqxX9re@cUCV-N4d#{BFHg?~s{Lc)YQchL@l z+;7Ke%z;WO5{xC}l#)U+kC7*bE&*OYY(HWMWo}ytceqHB zBnz}e$^i^hMqI>>aDz)?dk?p`Jnm&=jok9*o$gSVRRPtuBYWGE25_R63%6xN*2z^l zakO^+;Cahy1Oe3s(8*Gdz=7z-$X6W{>!jjk@>ttc6Jv`oJJo37+k26bnVA%0BJbag zV>QoAReDJC5rxS;T>{4EhT1;JiX;WT^z%V;fOzE-Yy^b-1n!hkvRn?&n=?*BKFOiM zB1`qvQC)t5E!^Vo=qtkv>$8fr8{T%rMa9^%pn!ogvTjY5Yh2i@_5sEyB3BxCaImIqMyZQR?K@R8UjrV?fF0<&I-yrI%1@VQGG%vB zW|~?xiV>a0UVO11o)O)&_^4V@DeUZMlzdlXvSuW0kp*PFcffwNIXz1NzGl|f7^P7n z^q>c4WUhkhWqRFuq=72o7|UFKZ$b3o8~;!ImnYffdpNL@k!~jzzyEJS7@8Rr>7j`K E0FDZ8?*IS* diff --git a/LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/Contents.json b/LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/Contents.json deleted file mode 100644 index 099704d..0000000 --- a/LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LetterAvatarTestImage@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LetterAvatarTestImage@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/LetterAvatarTestImage@2x.png b/LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/LetterAvatarTestImage@2x.png deleted file mode 100644 index 0e5261048fa45da69b6eb8f51bdb5642b220488f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2733 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≪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 bd=zTml+2%_B&oerej*hN66?zTCyDVpi2E(f literal 0 HcmV?d00001 diff --git a/LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/LetterAvatarTestImage@3x.png b/LetterAvatarKitTests/Resources/LetterAvatarTestImage@3x.png similarity index 100% rename from LetterAvatarKitTests/Assets.xcassets/LetterAvatarTestImage.imageset/LetterAvatarTestImage@3x.png rename to LetterAvatarKitTests/Resources/LetterAvatarTestImage@3x.png diff --git a/LetterAvatarKitTests/Utilities/UIImage+CompareOfPixels.swift b/LetterAvatarKitTests/Utilities/UIImage+CompareOfPixels.swift new file mode 100644 index 0000000..ae4385e --- /dev/null +++ b/LetterAvatarKitTests/Utilities/UIImage+CompareOfPixels.swift @@ -0,0 +1,75 @@ +// +// UIImage+CompareOfPixels.swift +// LetterAvatarKitTests +// +// Copyright 2017 Victor Peschenkov +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// o this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// + +import UIKit +import Foundation + +extension UIImage { + func isEqualToAnotherImage(image: UIImage, density: CGFloat = 0.001, accuracy: Double = 0.01) -> Bool { + if !self.size.equalTo(image.size) { + return false + } + + let pixelsWidth: Int = self.cgImage!.width + let pixelsHeight: Int = self.cgImage!.height + let pixelsToCompare: Int = Int(CGFloat(pixelsWidth * pixelsHeight) * density) + + var pixel1 = UInt() + let context1 = CGContext( + data: &pixel1, + width: 1, + height: 1, + bitsPerComponent: 8, + bytesPerRow: 4, + space: CGColorSpaceCreateDeviceRGB(), + bitmapInfo: CGImageAlphaInfo.noneSkipFirst.rawValue + ) + + var pixel2 = UInt() + let context2 = CGContext(data: &pixel2, + width: 1, + height: 1, + bitsPerComponent: 8, + bytesPerRow: 4, + space: CGColorSpaceCreateDeviceRGB(), + bitmapInfo: CGImageAlphaInfo.noneSkipFirst.rawValue + ) + + var misses = 0 + for _ in 0..