From b4505f29ff474c7bc81790785ebf2cdb02d0ad7b Mon Sep 17 00:00:00 2001 From: yanff <506735300@QQ.com> Date: Sun, 9 Oct 2016 15:37:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Classes/MMPopupView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/MMPopupView.m b/Classes/MMPopupView.m index b931be7..8a47afc 100644 --- a/Classes/MMPopupView.m +++ b/Classes/MMPopupView.m @@ -245,7 +245,7 @@ - (MMPopupBlock)sheetShowAnimation make.centerX.equalTo(self.attachedView); make.bottom.equalTo(self.attachedView.mas_bottom).offset(self.attachedView.frame.size.height); }]; - [self layoutIfNeeded]; + [self.superview layoutIfNeeded]; } [UIView animateWithDuration:self.animationDuration From f68892484f79c2783da0106b9374f3e63791d940 Mon Sep 17 00:00:00 2001 From: yanff <506735300@QQ.com> Date: Sun, 9 Oct 2016 15:47:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Classes/MMPopupView.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Classes/MMPopupView.m b/Classes/MMPopupView.m index 8a47afc..2bedfef 100644 --- a/Classes/MMPopupView.m +++ b/Classes/MMPopupView.m @@ -174,7 +174,7 @@ - (MMPopupBlock)alertShowAnimation [self mas_updateConstraints:^(MASConstraintMaker *make) { make.center.equalTo(self.attachedView).centerOffset(CGPointMake(0, self.withKeyboard?-216/2:0)); }]; - [self layoutIfNeeded]; + [self.superview layoutIfNeeded]; } self.layer.transform = CATransform3DMakeScale(1.2f, 1.2f, 1.0f); @@ -257,7 +257,7 @@ - (MMPopupBlock)sheetShowAnimation make.bottom.equalTo(self.attachedView.mas_bottom).offset(0); }]; - [self layoutIfNeeded]; + [self.superview layoutIfNeeded]; } completion:^(BOOL finished) { @@ -288,7 +288,7 @@ - (MMPopupBlock)sheetHideAnimation make.bottom.equalTo(self.attachedView.mas_bottom).offset(self.attachedView.frame.size.height); }]; - [self layoutIfNeeded]; + [self.superview layoutIfNeeded]; } completion:^(BOOL finished) { @@ -321,7 +321,7 @@ - (MMPopupBlock)customShowAnimation [self mas_updateConstraints:^(MASConstraintMaker *make) { make.center.equalTo(self.attachedView).centerOffset(CGPointMake(0, -self.attachedView.bounds.size.height)); }]; - [self layoutIfNeeded]; + [self.superview layoutIfNeeded]; } [UIView animateWithDuration:self.animationDuration @@ -335,7 +335,7 @@ - (MMPopupBlock)customShowAnimation make.center.equalTo(self.attachedView).centerOffset(CGPointMake(0, self.withKeyboard?-216/2:0)); }]; - [self layoutIfNeeded]; + [self.superview layoutIfNeeded]; } completion:^(BOOL finished) { @@ -365,7 +365,7 @@ - (MMPopupBlock)customHideAnimation make.center.equalTo(self.attachedView).centerOffset(CGPointMake(0, self.attachedView.bounds.size.height)); }]; - [self layoutIfNeeded]; + [self.superview layoutIfNeeded]; } completion:^(BOOL finished) { From 9eca3125f4654f6d249d346575bf73c4f31e3142 Mon Sep 17 00:00:00 2001 From: yanff <15820480109@163.com> Date: Fri, 12 May 2017 10:06:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes Classes/MMPopupView.h | 3 + Classes/MMPopupView.m | 3 + MMPopupView/.DS_Store | Bin 0 -> 6148 bytes .../MMPopupView.xcodeproj/project.pbxproj | 67 +-- MMPopupView/Podfile.lock | 4 +- MMPopupView/Pods/Manifest.lock | 4 +- .../Pods/Pods.xcodeproj/project.pbxproj | 380 ++++++++++-------- .../Masonry/Masonry-prefix.pch | 8 + .../Masonry/Masonry.xcconfig | 7 +- ...Pods-MMPopupView-acknowledgements.markdown | 2 +- .../Pods-MMPopupView-acknowledgements.plist | 4 +- .../Pods-MMPopupView-frameworks.sh | 32 +- .../Pods-MMPopupView-resources.sh | 101 ++--- .../Pods-MMPopupView.debug.xcconfig | 6 +- .../Pods-MMPopupView.release.xcconfig | 6 +- 16 files changed, 372 insertions(+), 255 deletions(-) create mode 100644 .DS_Store create mode 100644 MMPopupView/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b220e11dde8f4f2c1414f0c03d1c33f5da9db184 GIT binary patch literal 6148 zcmeHKyKciU3?$niFp$M#NBu(oKnR>6vwxrgT6k$wAVE5N%6IkCdVDO7+s$2qBS4)* z@g(R5(-aZiUS6L?S`lgBhH|xGZnkeevxkf*5RNn6A>JE0C0t{8|L0i z0E-2HHE|3?1g1d+2351g(4Zq;GOs3%fk79|=0o#l%??HVcAQ^4U9<*rqyki6s=#9` zTdV&&_#gfMl*APkpaOTLfUdf}+u})CTW626T3g^RaLf6In_=!03|@|bUXHP_a{S~; bkymVv{hBxiIvsJR1Nk#xy3nY=e=G0<#efxc literal 0 HcmV?d00001 diff --git a/Classes/MMPopupView.h b/Classes/MMPopupView.h index 4264226..f821de2 100644 --- a/Classes/MMPopupView.h +++ b/Classes/MMPopupView.h @@ -12,6 +12,9 @@ #import "MMPopupCategory.h" #import "MMPopupDefine.h" +//hide notification +UIKIT_EXTERN NSString *const MMPopupViewWillDisappearNotification; + typedef NS_ENUM(NSUInteger, MMPopupType) { MMPopupTypeAlert, MMPopupTypeSheet, diff --git a/Classes/MMPopupView.m b/Classes/MMPopupView.m index 2bedfef..44e227b 100644 --- a/Classes/MMPopupView.m +++ b/Classes/MMPopupView.m @@ -13,6 +13,7 @@ #import static NSString * const MMPopupViewHideAllNotification = @"MMPopupViewHideAllNotification"; +NSString * const MMPopupViewWillDisappearNotification = @"MMPopupViewWillDisappearNotification"; @implementation MMPopupView @@ -155,6 +156,8 @@ - (void)hideWithBlock:(MMPopupCompletionBlock)block [self hideKeyboard]; } + [[NSNotificationCenter defaultCenter] postNotificationName:MMPopupViewWillDisappearNotification object:self]; + MMPopupBlock hideAnimation = self.hideAnimation; NSAssert(hideAnimation, @"hide animation must be there"); diff --git a/MMPopupView/.DS_Store b/MMPopupView/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..13234df6b3a7de395e50901cc624ae01427aef80 GIT binary patch literal 6148 zcmeHK!AiqG5Pe&FsPxi{=yAV5sK=f{iASMO@T?@oiiQL=)MI|mPw;dkh?Z)8Bu z?id$*7N~i4ALqBhDV|YaL;nNr@W|0?_E+~e(`8Xtjc(^`y#ESSo#$oyQ~;# zMEQ+O!nV{B5)%zG!%mSSl%SzR4GmUe1P!M@+PuuLQ`B$-D?Wm~Iaq}f(%ZRyOw$oE zMYqm?GqB6Rfp#a7|Ifd!|96AD=L|Rle~N)H%$NC`Te95R+nnUuNWG$p$h=PRJ%o*v giaA$O@d-5v{ZSgk%&=3WhvGj1i3T^$z>hNU2KoC!YybcN literal 0 HcmV?d00001 diff --git a/MMPopupView/MMPopupView.xcodeproj/project.pbxproj b/MMPopupView/MMPopupView.xcodeproj/project.pbxproj index fa80695..9814b2e 100644 --- a/MMPopupView/MMPopupView.xcodeproj/project.pbxproj +++ b/MMPopupView/MMPopupView.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - C3A6D7C7352C468FC6AFBD15 /* libPods-MMPopupView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A4EBFF7F54A0C418E7302440 /* libPods-MMPopupView.a */; }; + 2CEA378AEA340C8637F54D36 /* libPods-MMPopupView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B568234704CF4337331B9CAA /* libPods-MMPopupView.a */; }; ED1E99341B9BD5C20093760A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = ED1E99331B9BD5C20093760A /* main.m */; }; ED1E99371B9BD5C20093760A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = ED1E99361B9BD5C20093760A /* AppDelegate.m */; }; ED1E993A1B9BD5C20093760A /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ED1E99391B9BD5C20093760A /* ViewController.m */; }; @@ -25,8 +25,9 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 41200EBF1F3357F293167C6D /* Pods-MMPopupView.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MMPopupView.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.debug.xcconfig"; sourceTree = ""; }; - A4EBFF7F54A0C418E7302440 /* libPods-MMPopupView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MMPopupView.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9AA0334C18AA365A38A27680 /* Pods-MMPopupView.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MMPopupView.release.xcconfig"; path = "Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.release.xcconfig"; sourceTree = ""; }; + B568234704CF4337331B9CAA /* libPods-MMPopupView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MMPopupView.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + CDDB23700F4179B097716169 /* Pods-MMPopupView.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MMPopupView.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.debug.xcconfig"; sourceTree = ""; }; ED1E992F1B9BD5C20093760A /* MMPopupView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MMPopupView.app; sourceTree = BUILT_PRODUCTS_DIR; }; ED1E99331B9BD5C20093760A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; ED1E99351B9BD5C20093760A /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -54,7 +55,6 @@ ED1E995E1B9C22F50093760A /* MMPinView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MMPinView.m; path = ../MMPinView.m; sourceTree = ""; }; EDB365101B9D3323003A0B05 /* MMDateView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDateView.h; sourceTree = SOURCE_ROOT; }; EDB365111B9D3323003A0B05 /* MMDateView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMDateView.m; sourceTree = SOURCE_ROOT; }; - FF8DF09A03ED96B87C4FB5EA /* Pods-MMPopupView.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MMPopupView.release.xcconfig"; path = "Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -62,28 +62,28 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C3A6D7C7352C468FC6AFBD15 /* libPods-MMPopupView.a in Frameworks */, + 2CEA378AEA340C8637F54D36 /* libPods-MMPopupView.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 04B67B65790C00235A9743EA /* Pods */ = { + A0164A309D756A0891167D70 /* Frameworks */ = { isa = PBXGroup; children = ( - 41200EBF1F3357F293167C6D /* Pods-MMPopupView.debug.xcconfig */, - FF8DF09A03ED96B87C4FB5EA /* Pods-MMPopupView.release.xcconfig */, + B568234704CF4337331B9CAA /* libPods-MMPopupView.a */, ); - name = Pods; + name = Frameworks; sourceTree = ""; }; - 72E8955E140DFCE33AE55500 /* Frameworks */ = { + E2DC714EE5FC1189F33235BC /* Pods */ = { isa = PBXGroup; children = ( - A4EBFF7F54A0C418E7302440 /* libPods-MMPopupView.a */, + CDDB23700F4179B097716169 /* Pods-MMPopupView.debug.xcconfig */, + 9AA0334C18AA365A38A27680 /* Pods-MMPopupView.release.xcconfig */, ); - name = Frameworks; + name = Pods; sourceTree = ""; }; ED1E99261B9BD5C20093760A = { @@ -92,8 +92,8 @@ ED1E99491B9BD8340093760A /* Classes */, ED1E99311B9BD5C20093760A /* MMPopupView */, ED1E99301B9BD5C20093760A /* Products */, - 04B67B65790C00235A9743EA /* Pods */, - 72E8955E140DFCE33AE55500 /* Frameworks */, + E2DC714EE5FC1189F33235BC /* Pods */, + A0164A309D756A0891167D70 /* Frameworks */, ); sourceTree = ""; }; @@ -160,11 +160,12 @@ isa = PBXNativeTarget; buildConfigurationList = ED1E99461B9BD5C20093760A /* Build configuration list for PBXNativeTarget "MMPopupView" */; buildPhases = ( - 74FFA79FF8D797EA4CE69C18 /* Check Pods Manifest.lock */, + CB006E07D1D1C2E5830FE6F9 /* [CP] Check Pods Manifest.lock */, ED1E992B1B9BD5C20093760A /* Sources */, ED1E992C1B9BD5C20093760A /* Frameworks */, ED1E992D1B9BD5C20093760A /* Resources */, - A788DF5FB597189F611CD16C /* Copy Pods Resources */, + E3A0620399046E4DB316B872 /* [CP] Embed Pods Frameworks */, + 48CCF6F27B7DED811E089776 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -186,6 +187,7 @@ TargetAttributes = { ED1E992E1B9BD5C20093760A = { CreatedOnToolsVersion = 7.0; + DevelopmentTeam = QD5JT3AFJU; }; }; }; @@ -221,34 +223,49 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 74FFA79FF8D797EA4CE69C18 /* Check Pods Manifest.lock */ = { + 48CCF6F27B7DED811E089776 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-resources.sh\"\n"; showEnvVarsInLog = 0; }; - A788DF5FB597189F611CD16C /* Copy Pods Resources */ = { + CB006E07D1D1C2E5830FE6F9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; + E3A0620399046E4DB316B872 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -378,11 +395,12 @@ }; ED1E99471B9BD5C20093760A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 41200EBF1F3357F293167C6D /* Pods-MMPopupView.debug.xcconfig */; + baseConfigurationReference = CDDB23700F4179B097716169 /* Pods-MMPopupView.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = QD5JT3AFJU; INFOPLIST_FILE = MMPopupView/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -394,11 +412,12 @@ }; ED1E99481B9BD5C20093760A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FF8DF09A03ED96B87C4FB5EA /* Pods-MMPopupView.release.xcconfig */; + baseConfigurationReference = 9AA0334C18AA365A38A27680 /* Pods-MMPopupView.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = QD5JT3AFJU; INFOPLIST_FILE = MMPopupView/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/MMPopupView/Podfile.lock b/MMPopupView/Podfile.lock index bfe97d3..eb4cf0c 100644 --- a/MMPopupView/Podfile.lock +++ b/MMPopupView/Podfile.lock @@ -7,4 +7,6 @@ DEPENDENCIES: SPEC CHECKSUMS: Masonry: 362e8a1cc0beada4a4c4832d5e863da2a51533be -COCOAPODS: 0.39.0.beta.4 +PODFILE CHECKSUM: c4ca4688f88d069cced47a34b8071f8ba6290b25 + +COCOAPODS: 1.2.1 diff --git a/MMPopupView/Pods/Manifest.lock b/MMPopupView/Pods/Manifest.lock index bfe97d3..eb4cf0c 100644 --- a/MMPopupView/Pods/Manifest.lock +++ b/MMPopupView/Pods/Manifest.lock @@ -7,4 +7,6 @@ DEPENDENCIES: SPEC CHECKSUMS: Masonry: 362e8a1cc0beada4a4c4832d5e863da2a51533be -COCOAPODS: 0.39.0.beta.4 +PODFILE CHECKSUM: c4ca4688f88d069cced47a34b8071f8ba6290b25 + +COCOAPODS: 1.2.1 diff --git a/MMPopupView/Pods/Pods.xcodeproj/project.pbxproj b/MMPopupView/Pods/Pods.xcodeproj/project.pbxproj index 40e1f52..143ea68 100644 --- a/MMPopupView/Pods/Pods.xcodeproj/project.pbxproj +++ b/MMPopupView/Pods/Pods.xcodeproj/project.pbxproj @@ -7,44 +7,44 @@ objects = { /* Begin PBXBuildFile section */ - 052C3B879A266D399BF6018BB86D64D8 /* View+MASShorthandAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9F610CB90E57B81F8F7DCA2176E0FD /* View+MASShorthandAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 11357208F261EDBA3ED7C4C1C96D9E58 /* MASViewConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = C7C02266037F030E22468AC86802DB57 /* MASViewConstraint.m */; }; - 1B526EB7B3F8C327A5456EE40681D2BB /* ViewController+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = FA891F8E85C079B4FB101DDD5BC7A477 /* ViewController+MASAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1C461ECACDA810B7A972C6F69C787397 /* MASCompositeConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EC6EDDDD3E503C5B2E967D3FEECFEB /* MASCompositeConstraint.m */; }; - 1DE51D68DDDD90AE2B86F55B501291D3 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C762C4F3A304C10AF7EBEA6AAA8508A0 /* NSLayoutConstraint+MASDebugAdditions.m */; }; - 31541DB3AF731E3DA365D7B8466D1092 /* MASConstraintMaker.h in Headers */ = {isa = PBXBuildFile; fileRef = 780A86CEB0A0131C88BE12414D500734 /* MASConstraintMaker.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3A3AC7D7727C682D5C925D05B569F9BE /* MASConstraintMaker.m in Sources */ = {isa = PBXBuildFile; fileRef = F8AB44751192F0AA8DA5F75A06138D15 /* MASConstraintMaker.m */; }; - 42D0A288C1E65F9F7F855F15E8478F47 /* ViewController+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 25CED739CF35B6D0A1D95AE17D712A7F /* ViewController+MASAdditions.m */; }; - 4C12BFFC3F71ECDF32127BECB8921104 /* MASViewAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = 82F28AEAAF722BC62BF5B37D6663BBC2 /* MASViewAttribute.m */; }; - 5485597DDEB2D7025F6A5AE20D89C32E /* MASConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 3162AC8E29FA7F3BF0D8641F7F4D9B60 /* MASConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5E863EA053C3FADFEA25A08BABB0F888 /* MASLayoutConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 807FFD255E8235D5B42FE078299B5F1B /* MASLayoutConstraint.m */; }; - 5EA8A9FD8E8D6F430936D2FE3D62BEA8 /* View+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FCC2A09AC3DCD0E4A3D268DAABC5135 /* View+MASAdditions.m */; }; - 60E191C313DE523BB83E3F232C42E0F7 /* MASViewConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 043FB94CF93050E20D8E4C071ACFA5D2 /* MASViewConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 61EDE90E273AFCEC97EEB118384BDEDB /* View+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E7E17DB5590A8C4D9625D67E6FBD243 /* View+MASAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 645C48AE737D9E1514D0D3C878972284 /* NSArray+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8229525E7067F22D3977D2628DF5F2C3 /* NSArray+MASAdditions.m */; }; - 6DBB7730462A1CBDEEA2AAD0CF548B21 /* MASLayoutConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = B48867DE203BCF3BB3DFCAB8FDC7516B /* MASLayoutConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 6EF752739FCA1A1E9FB849326AE3E5D3 /* Masonry-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A231E76AF7DC6CB887B5B2C522A7A /* Masonry-dummy.m */; }; - 706D2ACFB4E76C74459B1BE498D3A9B0 /* NSLayoutConstraint+MASDebugAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = E158FC65C5404E098F16E26F478DA504 /* NSLayoutConstraint+MASDebugAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 74DAED1C9885E9715AF1A45749EE7598 /* Pods-MMPopupView-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = A34A87ABED10EC92E3D1FFA85A46F460 /* Pods-MMPopupView-dummy.m */; }; - 7590EA3C945D86A1D37BAD772100DA3F /* NSArray+MASShorthandAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = FBE23E70FF64ACC81816A368E171B903 /* NSArray+MASShorthandAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 7D8D32C5FA2B9A9605907887228D8E34 /* Masonry.h in Headers */ = {isa = PBXBuildFile; fileRef = EC0384F145CF471A951BA8E9486AD626 /* Masonry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 81C869A62FD2B6F65FC0B8E5B49EA1C5 /* NSArray+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = B179F4D3D34A3CE25A698B8D9AC9D6C2 /* NSArray+MASAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8D845BA8FCC93A9E7F7403AAF821AFF5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2ABA085A0DE1A5CF85703336C9D51FF /* Foundation.framework */; }; - 9A09D04537113CF1464D3E25C224A70C /* MASCompositeConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 475326F2A929CD1AFFB74850961F32C0 /* MASCompositeConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C0FDB6F733E89170F0C864120B18F0C3 /* MASUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1321572A3ED9C894C94A131BE29B81B2 /* MASUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DDAA0D63D591A12992E201839D17CBD0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2ABA085A0DE1A5CF85703336C9D51FF /* Foundation.framework */; }; - DE9EC3C84498AF3B38FBC436F958E056 /* MASViewAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 915A6FF0E04F5A5C0ACDE0E32BD2F193 /* MASViewAttribute.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E1ACB576F4318C916E29800737046BFC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C52062E1754C6EA5350AC0EDA8AF3F12 /* UIKit.framework */; }; - E2C0BE9E14C1D36606C06A75433C7E0A /* MASConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F937BDEB8DF93A08D20C5355C0FDB5C /* MASConstraint.m */; }; - EFF455197F24C234BF9063A684C357D8 /* MASConstraint+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 22E2395DA2EBCF6241A0DA0E1859FF45 /* MASConstraint+Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 01E09711F001C49F92A97060414E262B /* MASCompositeConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 475326F2A929CD1AFFB74850961F32C0 /* MASCompositeConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 13635B78121B99E5C03C92506A161607 /* MASViewAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = 82F28AEAAF722BC62BF5B37D6663BBC2 /* MASViewAttribute.m */; }; + 1F3BD3BC28432BB5E2F73501E06E4579 /* MASUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1321572A3ED9C894C94A131BE29B81B2 /* MASUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 2DBB74B8B5DDB1F621433DD12BF35102 /* MASViewConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = C7C02266037F030E22468AC86802DB57 /* MASViewConstraint.m */; }; + 3E8E6916C563B9CB12AA417275FC6EB3 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C762C4F3A304C10AF7EBEA6AAA8508A0 /* NSLayoutConstraint+MASDebugAdditions.m */; }; + 490CA524521F7D444EA58FA915D7E99C /* NSArray+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = B179F4D3D34A3CE25A698B8D9AC9D6C2 /* NSArray+MASAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 49B903D576E09560C52AA92FDCC31A68 /* Masonry.h in Headers */ = {isa = PBXBuildFile; fileRef = EC0384F145CF471A951BA8E9486AD626 /* Masonry.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CBE1B46550A3FB90FDD1CB9CBA7B7FE /* MASConstraint+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 22E2395DA2EBCF6241A0DA0E1859FF45 /* MASConstraint+Private.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 5D485A2CB9FB2BB5A8AE6186989D7380 /* Pods-MMPopupView-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = A34A87ABED10EC92E3D1FFA85A46F460 /* Pods-MMPopupView-dummy.m */; }; + 61CCEA01CBE8EFFA5515E7A0D8635AAE /* MASCompositeConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = D5EC6EDDDD3E503C5B2E967D3FEECFEB /* MASCompositeConstraint.m */; }; + 6209E20926D79222E59F58B962BFAA1E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B63C6A64CF66340668996F78DA6BB482 /* UIKit.framework */; }; + 6249770A7D163B0F3001D5A76C5FA01C /* MASConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 3162AC8E29FA7F3BF0D8641F7F4D9B60 /* MASConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 68F98758BA84B8EC3472A8C6FD646D16 /* Masonry-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A231E76AF7DC6CB887B5B2C522A7A /* Masonry-dummy.m */; }; + 7BDDE51AF16FA53A09506EDB91E1C3C2 /* NSArray+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8229525E7067F22D3977D2628DF5F2C3 /* NSArray+MASAdditions.m */; }; + 86EE1CB5473A4A07081D8DE3A2C45924 /* View+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E7E17DB5590A8C4D9625D67E6FBD243 /* View+MASAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 89450A58FD91E5B227171FC75160E4EA /* MASConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F937BDEB8DF93A08D20C5355C0FDB5C /* MASConstraint.m */; }; + 955BE39896CA35F2A585DC3309E5FDA5 /* MASLayoutConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 807FFD255E8235D5B42FE078299B5F1B /* MASLayoutConstraint.m */; }; + 983CB852CBBFBC04C2A6BA407E34F59B /* View+MASShorthandAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9F610CB90E57B81F8F7DCA2176E0FD /* View+MASShorthandAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9934AEA2C891C201D8ED5746FF42FE1B /* NSLayoutConstraint+MASDebugAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = E158FC65C5404E098F16E26F478DA504 /* NSLayoutConstraint+MASDebugAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A1FA046FDFC42676D17FEC387B10D24A /* View+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FCC2A09AC3DCD0E4A3D268DAABC5135 /* View+MASAdditions.m */; }; + A6436E3CFFCBFE591E2D2A68ED90CAC6 /* MASLayoutConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = B48867DE203BCF3BB3DFCAB8FDC7516B /* MASLayoutConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A83991D7C1373DF66020C2FDFC5D7564 /* MASViewConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 043FB94CF93050E20D8E4C071ACFA5D2 /* MASViewConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AB7CC6A8DF7373936D921AE9048DECF2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D88AAE1F92055A60CC2FC970D7D34634 /* Foundation.framework */; }; + C88F85D3200060BD98FC13EA58121706 /* ViewController+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = FA891F8E85C079B4FB101DDD5BC7A477 /* ViewController+MASAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D7CE05A743B7ACD50796191FA442814C /* ViewController+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 25CED739CF35B6D0A1D95AE17D712A7F /* ViewController+MASAdditions.m */; }; + DF7F88B58B564EDF169EC0C9CF8E5124 /* MASConstraintMaker.m in Sources */ = {isa = PBXBuildFile; fileRef = F8AB44751192F0AA8DA5F75A06138D15 /* MASConstraintMaker.m */; }; + E072DA57403C4BFF9B10467BE05604C5 /* NSArray+MASShorthandAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = FBE23E70FF64ACC81816A368E171B903 /* NSArray+MASShorthandAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E1E771349813022263F549BDF33CB4BB /* MASViewAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 915A6FF0E04F5A5C0ACDE0E32BD2F193 /* MASViewAttribute.h */; settings = {ATTRIBUTES = (Public, ); }; }; + EC48DE078CA5E55922CCE02354D475CD /* MASConstraintMaker.h in Headers */ = {isa = PBXBuildFile; fileRef = 780A86CEB0A0131C88BE12414D500734 /* MASConstraintMaker.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F0B56A7D38A399A2F67F9920C9526A66 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D88AAE1F92055A60CC2FC970D7D34634 /* Foundation.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - E4BD56EA436595424AB553E86A34C0F4 /* PBXContainerItemProxy */ = { + 0FA1FACC87B878D1235F9A4C32AD0174 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = EF95F09D04CB63C8B438B8645649B3EC; + remoteGlobalIDString = 9DC8D9E02903E93BD0B2FEC9D846EA20; remoteInfo = Masonry; }; /* End PBXContainerItemProxy section */ @@ -58,9 +58,9 @@ 2FCC2A09AC3DCD0E4A3D268DAABC5135 /* View+MASAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "View+MASAdditions.m"; path = "Masonry/View+MASAdditions.m"; sourceTree = ""; }; 3162AC8E29FA7F3BF0D8641F7F4D9B60 /* MASConstraint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASConstraint.h; path = Masonry/MASConstraint.h; sourceTree = ""; }; 34DA416F188CF982164E5F5A87EFBD0C /* Pods-MMPopupView-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MMPopupView-acknowledgements.markdown"; sourceTree = ""; }; - 36B9A9F5FB8D6C66106BB343DE90CD67 /* libMasonry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMasonry.a; sourceTree = BUILT_PRODUCTS_DIR; }; 475326F2A929CD1AFFB74850961F32C0 /* MASCompositeConstraint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASCompositeConstraint.h; path = Masonry/MASCompositeConstraint.h; sourceTree = ""; }; 538A2AC167AA94356353F633F9009CEF /* Pods-MMPopupView.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MMPopupView.debug.xcconfig"; sourceTree = ""; }; + 5511C0767E7235CC1F885D38740D626C /* libPods-MMPopupView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-MMPopupView.a"; path = "libPods-MMPopupView.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 61D2ED1DD327BB14648C67E26B63F08F /* Pods-MMPopupView-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MMPopupView-acknowledgements.plist"; sourceTree = ""; }; 780A86CEB0A0131C88BE12414D500734 /* MASConstraintMaker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASConstraintMaker.h; path = Masonry/MASConstraintMaker.h; sourceTree = ""; }; 787F255CD0B5AB266FCAD4DE9EF09367 /* Pods-MMPopupView-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MMPopupView-frameworks.sh"; sourceTree = ""; }; @@ -72,19 +72,19 @@ 8A9F610CB90E57B81F8F7DCA2176E0FD /* View+MASShorthandAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "View+MASShorthandAdditions.h"; path = "Masonry/View+MASShorthandAdditions.h"; sourceTree = ""; }; 8E7E17DB5590A8C4D9625D67E6FBD243 /* View+MASAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "View+MASAdditions.h"; path = "Masonry/View+MASAdditions.h"; sourceTree = ""; }; 915A6FF0E04F5A5C0ACDE0E32BD2F193 /* MASViewAttribute.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASViewAttribute.h; path = Masonry/MASViewAttribute.h; sourceTree = ""; }; - 958F50DDAABE1B40901CA9EF3C7D49EC /* libPods-MMPopupView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MMPopupView.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9F937BDEB8DF93A08D20C5355C0FDB5C /* MASConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASConstraint.m; path = Masonry/MASConstraint.m; sourceTree = ""; }; A2F75C96947B2651F82FC18F66C43B49 /* Masonry-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Masonry-prefix.pch"; sourceTree = ""; }; A34A87ABED10EC92E3D1FFA85A46F460 /* Pods-MMPopupView-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MMPopupView-dummy.m"; sourceTree = ""; }; A713DBF21636664E7E197CB8F15935BA /* Pods-MMPopupView-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MMPopupView-resources.sh"; sourceTree = ""; }; B179F4D3D34A3CE25A698B8D9AC9D6C2 /* NSArray+MASAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSArray+MASAdditions.h"; path = "Masonry/NSArray+MASAdditions.h"; sourceTree = ""; }; B48867DE203BCF3BB3DFCAB8FDC7516B /* MASLayoutConstraint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASLayoutConstraint.h; path = Masonry/MASLayoutConstraint.h; sourceTree = ""; }; - BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - C2ABA085A0DE1A5CF85703336C9D51FF /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - C52062E1754C6EA5350AC0EDA8AF3F12 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + 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; }; C762C4F3A304C10AF7EBEA6AAA8508A0 /* NSLayoutConstraint+MASDebugAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSLayoutConstraint+MASDebugAdditions.m"; path = "Masonry/NSLayoutConstraint+MASDebugAdditions.m"; sourceTree = ""; }; C7C02266037F030E22468AC86802DB57 /* MASViewConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASViewConstraint.m; path = Masonry/MASViewConstraint.m; sourceTree = ""; }; D5EC6EDDDD3E503C5B2E967D3FEECFEB /* MASCompositeConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASCompositeConstraint.m; path = Masonry/MASCompositeConstraint.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; }; + DDB7886C3ECBE506966D21E57165FFB3 /* libMasonry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libMasonry.a; path = libMasonry.a; sourceTree = BUILT_PRODUCTS_DIR; }; E158FC65C5404E098F16E26F478DA504 /* NSLayoutConstraint+MASDebugAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSLayoutConstraint+MASDebugAdditions.h"; path = "Masonry/NSLayoutConstraint+MASDebugAdditions.h"; sourceTree = ""; }; EC0384F145CF471A951BA8E9486AD626 /* Masonry.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Masonry.h; path = Masonry/Masonry.h; sourceTree = ""; }; F8AB44751192F0AA8DA5F75A06138D15 /* MASConstraintMaker.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASConstraintMaker.m; path = Masonry/MASConstraintMaker.m; sourceTree = ""; }; @@ -93,20 +93,20 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 1B3AF78ACC1062530F83704B93E08992 /* Frameworks */ = { + 6FD8312A1AEB348F49A81C438DB25115 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DDAA0D63D591A12992E201839D17CBD0 /* Foundation.framework in Frameworks */, - E1ACB576F4318C916E29800737046BFC /* UIKit.framework in Frameworks */, + F0B56A7D38A399A2F67F9920C9526A66 /* Foundation.framework in Frameworks */, + 6209E20926D79222E59F58B962BFAA1E /* UIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - F93BA1AEB81D6D988468A84E902192C0 /* Frameworks */ = { + F39DDD9B7896BC540AFECC64982BF64B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8D845BA8FCC93A9E7F7403AAF821AFF5 /* Foundation.framework in Frameworks */, + AB7CC6A8DF7373936D921AE9048DECF2 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -143,17 +143,27 @@ 25CED739CF35B6D0A1D95AE17D712A7F /* ViewController+MASAdditions.m */, 4854BD850DB1ADEB02DE483F0C44E016 /* Support Files */, ); + name = Masonry; path = Masonry; sourceTree = ""; }; 433CD3331B6C3787F473C941B61FC68F /* Frameworks */ = { isa = PBXGroup; children = ( - D0FB9306D21AF23A056944AE037CBFFF /* iOS */, + 438B396F6B4147076630CAEFE34282C1 /* iOS */, ); name = Frameworks; sourceTree = ""; }; + 438B396F6B4147076630CAEFE34282C1 /* iOS */ = { + isa = PBXGroup; + children = ( + D88AAE1F92055A60CC2FC970D7D34634 /* Foundation.framework */, + B63C6A64CF66340668996F78DA6BB482 /* UIKit.framework */, + ); + name = iOS; + sourceTree = ""; + }; 4854BD850DB1ADEB02DE483F0C44E016 /* Support Files */ = { isa = PBXGroup; children = ( @@ -168,8 +178,8 @@ 73F2AFE2C99F0C63A2827258FE327121 /* Products */ = { isa = PBXGroup; children = ( - 36B9A9F5FB8D6C66106BB343DE90CD67 /* libMasonry.a */, - 958F50DDAABE1B40901CA9EF3C7D49EC /* libPods-MMPopupView.a */, + DDB7886C3ECBE506966D21E57165FFB3 /* libMasonry.a */, + 5511C0767E7235CC1F885D38740D626C /* libPods-MMPopupView.a */, ); name = Products; sourceTree = ""; @@ -192,7 +202,7 @@ 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( - BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */, + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, 433CD3331B6C3787F473C941B61FC68F /* Frameworks */, E9B49E9D4F6BC02AA78DCF86BCED2145 /* Pods */, 73F2AFE2C99F0C63A2827258FE327121 /* Products */, @@ -208,15 +218,6 @@ name = "Targets Support Files"; sourceTree = ""; }; - D0FB9306D21AF23A056944AE037CBFFF /* iOS */ = { - isa = PBXGroup; - children = ( - C2ABA085A0DE1A5CF85703336C9D51FF /* Foundation.framework */, - C52062E1754C6EA5350AC0EDA8AF3F12 /* UIKit.framework */, - ); - name = iOS; - sourceTree = ""; - }; E9B49E9D4F6BC02AA78DCF86BCED2145 /* Pods */ = { isa = PBXGroup; children = ( @@ -228,55 +229,55 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 3EB2A33CCCA5F058AB98614F28A11C59 /* Headers */ = { + BDF73468622762862D2FB76ED4AC0D8E /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 9A09D04537113CF1464D3E25C224A70C /* MASCompositeConstraint.h in Headers */, - EFF455197F24C234BF9063A684C357D8 /* MASConstraint+Private.h in Headers */, - 5485597DDEB2D7025F6A5AE20D89C32E /* MASConstraint.h in Headers */, - 31541DB3AF731E3DA365D7B8466D1092 /* MASConstraintMaker.h in Headers */, - 6DBB7730462A1CBDEEA2AAD0CF548B21 /* MASLayoutConstraint.h in Headers */, - 7D8D32C5FA2B9A9605907887228D8E34 /* Masonry.h in Headers */, - C0FDB6F733E89170F0C864120B18F0C3 /* MASUtilities.h in Headers */, - DE9EC3C84498AF3B38FBC436F958E056 /* MASViewAttribute.h in Headers */, - 60E191C313DE523BB83E3F232C42E0F7 /* MASViewConstraint.h in Headers */, - 81C869A62FD2B6F65FC0B8E5B49EA1C5 /* NSArray+MASAdditions.h in Headers */, - 7590EA3C945D86A1D37BAD772100DA3F /* NSArray+MASShorthandAdditions.h in Headers */, - 706D2ACFB4E76C74459B1BE498D3A9B0 /* NSLayoutConstraint+MASDebugAdditions.h in Headers */, - 61EDE90E273AFCEC97EEB118384BDEDB /* View+MASAdditions.h in Headers */, - 052C3B879A266D399BF6018BB86D64D8 /* View+MASShorthandAdditions.h in Headers */, - 1B526EB7B3F8C327A5456EE40681D2BB /* ViewController+MASAdditions.h in Headers */, + 01E09711F001C49F92A97060414E262B /* MASCompositeConstraint.h in Headers */, + 4CBE1B46550A3FB90FDD1CB9CBA7B7FE /* MASConstraint+Private.h in Headers */, + 6249770A7D163B0F3001D5A76C5FA01C /* MASConstraint.h in Headers */, + EC48DE078CA5E55922CCE02354D475CD /* MASConstraintMaker.h in Headers */, + A6436E3CFFCBFE591E2D2A68ED90CAC6 /* MASLayoutConstraint.h in Headers */, + 49B903D576E09560C52AA92FDCC31A68 /* Masonry.h in Headers */, + 1F3BD3BC28432BB5E2F73501E06E4579 /* MASUtilities.h in Headers */, + E1E771349813022263F549BDF33CB4BB /* MASViewAttribute.h in Headers */, + A83991D7C1373DF66020C2FDFC5D7564 /* MASViewConstraint.h in Headers */, + 490CA524521F7D444EA58FA915D7E99C /* NSArray+MASAdditions.h in Headers */, + E072DA57403C4BFF9B10467BE05604C5 /* NSArray+MASShorthandAdditions.h in Headers */, + 9934AEA2C891C201D8ED5746FF42FE1B /* NSLayoutConstraint+MASDebugAdditions.h in Headers */, + 86EE1CB5473A4A07081D8DE3A2C45924 /* View+MASAdditions.h in Headers */, + 983CB852CBBFBC04C2A6BA407E34F59B /* View+MASShorthandAdditions.h in Headers */, + C88F85D3200060BD98FC13EA58121706 /* ViewController+MASAdditions.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 4CC02417726444EC4869317947B4E3E9 /* Pods-MMPopupView */ = { + 11FB19DC8E7271B53A7EA8DF3FCE6903 /* Pods-MMPopupView */ = { isa = PBXNativeTarget; - buildConfigurationList = 7181F1980E5D127DD39D270935451522 /* Build configuration list for PBXNativeTarget "Pods-MMPopupView" */; + buildConfigurationList = 6823740FE78BD9DBDA0BB0E87EE3A111 /* Build configuration list for PBXNativeTarget "Pods-MMPopupView" */; buildPhases = ( - D515AEE7A170F84ED2C0196EFC9611DD /* Sources */, - F93BA1AEB81D6D988468A84E902192C0 /* Frameworks */, + F660116CEEB27413DD6DB53FF9459481 /* Sources */, + F39DDD9B7896BC540AFECC64982BF64B /* Frameworks */, ); buildRules = ( ); dependencies = ( - 79CFCAB1EC926ED98E9D29C7896C9BF1 /* PBXTargetDependency */, + 5B9803A3C201578EC505084EFC2F0A15 /* PBXTargetDependency */, ); name = "Pods-MMPopupView"; productName = "Pods-MMPopupView"; - productReference = 958F50DDAABE1B40901CA9EF3C7D49EC /* libPods-MMPopupView.a */; + productReference = 5511C0767E7235CC1F885D38740D626C /* libPods-MMPopupView.a */; productType = "com.apple.product-type.library.static"; }; - EF95F09D04CB63C8B438B8645649B3EC /* Masonry */ = { + 9DC8D9E02903E93BD0B2FEC9D846EA20 /* Masonry */ = { isa = PBXNativeTarget; - buildConfigurationList = 50771AC10829B2CDCFBF776E35A103C2 /* Build configuration list for PBXNativeTarget "Masonry" */; + buildConfigurationList = 34CAE1CB89EDBF2E53735CC5D4E5E69F /* Build configuration list for PBXNativeTarget "Masonry" */; buildPhases = ( - 312D8A158EB120D66646CCC01895CA3C /* Sources */, - 1B3AF78ACC1062530F83704B93E08992 /* Frameworks */, - 3EB2A33CCCA5F058AB98614F28A11C59 /* Headers */, + C4BE2DC1E815E7367562323223772531 /* Sources */, + 6FD8312A1AEB348F49A81C438DB25115 /* Frameworks */, + BDF73468622762862D2FB76ED4AC0D8E /* Headers */, ); buildRules = ( ); @@ -284,7 +285,7 @@ ); name = Masonry; productName = Masonry; - productReference = 36B9A9F5FB8D6C66106BB343DE90CD67 /* libMasonry.a */; + productReference = DDB7886C3ECBE506966D21E57165FFB3 /* libMasonry.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -293,7 +294,7 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0700; + LastSwiftUpdateCheck = 0830; LastUpgradeCheck = 0700; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; @@ -308,158 +309,193 @@ projectDirPath = ""; projectRoot = ""; targets = ( - EF95F09D04CB63C8B438B8645649B3EC /* Masonry */, - 4CC02417726444EC4869317947B4E3E9 /* Pods-MMPopupView */, + 9DC8D9E02903E93BD0B2FEC9D846EA20 /* Masonry */, + 11FB19DC8E7271B53A7EA8DF3FCE6903 /* Pods-MMPopupView */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 312D8A158EB120D66646CCC01895CA3C /* Sources */ = { + C4BE2DC1E815E7367562323223772531 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1C461ECACDA810B7A972C6F69C787397 /* MASCompositeConstraint.m in Sources */, - E2C0BE9E14C1D36606C06A75433C7E0A /* MASConstraint.m in Sources */, - 3A3AC7D7727C682D5C925D05B569F9BE /* MASConstraintMaker.m in Sources */, - 5E863EA053C3FADFEA25A08BABB0F888 /* MASLayoutConstraint.m in Sources */, - 6EF752739FCA1A1E9FB849326AE3E5D3 /* Masonry-dummy.m in Sources */, - 4C12BFFC3F71ECDF32127BECB8921104 /* MASViewAttribute.m in Sources */, - 11357208F261EDBA3ED7C4C1C96D9E58 /* MASViewConstraint.m in Sources */, - 645C48AE737D9E1514D0D3C878972284 /* NSArray+MASAdditions.m in Sources */, - 1DE51D68DDDD90AE2B86F55B501291D3 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */, - 5EA8A9FD8E8D6F430936D2FE3D62BEA8 /* View+MASAdditions.m in Sources */, - 42D0A288C1E65F9F7F855F15E8478F47 /* ViewController+MASAdditions.m in Sources */, + 61CCEA01CBE8EFFA5515E7A0D8635AAE /* MASCompositeConstraint.m in Sources */, + 89450A58FD91E5B227171FC75160E4EA /* MASConstraint.m in Sources */, + DF7F88B58B564EDF169EC0C9CF8E5124 /* MASConstraintMaker.m in Sources */, + 955BE39896CA35F2A585DC3309E5FDA5 /* MASLayoutConstraint.m in Sources */, + 68F98758BA84B8EC3472A8C6FD646D16 /* Masonry-dummy.m in Sources */, + 13635B78121B99E5C03C92506A161607 /* MASViewAttribute.m in Sources */, + 2DBB74B8B5DDB1F621433DD12BF35102 /* MASViewConstraint.m in Sources */, + 7BDDE51AF16FA53A09506EDB91E1C3C2 /* NSArray+MASAdditions.m in Sources */, + 3E8E6916C563B9CB12AA417275FC6EB3 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */, + A1FA046FDFC42676D17FEC387B10D24A /* View+MASAdditions.m in Sources */, + D7CE05A743B7ACD50796191FA442814C /* ViewController+MASAdditions.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - D515AEE7A170F84ED2C0196EFC9611DD /* Sources */ = { + F660116CEEB27413DD6DB53FF9459481 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 74DAED1C9885E9715AF1A45749EE7598 /* Pods-MMPopupView-dummy.m in Sources */, + 5D485A2CB9FB2BB5A8AE6186989D7380 /* Pods-MMPopupView-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 79CFCAB1EC926ED98E9D29C7896C9BF1 /* PBXTargetDependency */ = { + 5B9803A3C201578EC505084EFC2F0A15 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Masonry; - target = EF95F09D04CB63C8B438B8645649B3EC /* Masonry */; - targetProxy = E4BD56EA436595424AB553E86A34C0F4 /* PBXContainerItemProxy */; + target = 9DC8D9E02903E93BD0B2FEC9D846EA20 /* Masonry */; + targetProxy = 0FA1FACC87B878D1235F9A4C32AD0174 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 219CABB62EEE959A9CAE941DAE43EF68 /* Release */ = { + 34FE9531DA9AF2820790339988D5FF41 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = 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; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_RELEASE=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + STRIP_INSTALLED_PRODUCT = NO; + SYMROOT = "${SRCROOT}/../build"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 5A6ACE61C4D128598EA7472C87982601 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7882AB8492CA4F59F730C76CC3BBF57A /* Masonry.xcconfig */; buildSettings = { + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; + PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; }; - name = Release; + name = Debug; }; - 5792384E765B7488334A037FB3E69148 /* Debug */ = { + 6AF3020B2C7192E79C80E72E789ECD9E /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 538A2AC167AA94356353F633F9009CEF /* Pods-MMPopupView.debug.xcconfig */; buildSettings = { + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACH_O_TYPE = staticlib; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; }; name = Debug; }; - A69745CCED23A539213FDA7401E4F200 /* Debug */ = { + 6CA42F62CE0652819ED46936FE31E065 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7882AB8492CA4F59F730C76CC3BBF57A /* Masonry.xcconfig */; buildSettings = { + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = YES; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; + PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; }; - name = Debug; - }; - A70CDAD61F90AC503C7D04CC22DA2923 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - ONLY_ACTIVE_ARCH = YES; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Debug; + name = Release; }; - B4B32FB1971555424E4D6D5B8CE24F55 /* Release */ = { + 9883FE06555DE9AEFF91F3B18707B79E /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 12483D46E5C63B1CDD582E5598D3601C /* Pods-MMPopupView.release.xcconfig */; buildSettings = { + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACH_O_TYPE = staticlib; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; }; name = Release; }; - FB45FFD90572718D82AB9092B750F0CA /* Release */ = { + C104F7F091290C3D1E248192F07FE689 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -467,16 +503,27 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1"; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -484,11 +531,12 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + ONLY_ACTIVE_ARCH = YES; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; }; - name = Release; + name = Debug; }; /* End XCBuildConfiguration section */ @@ -496,26 +544,26 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - A70CDAD61F90AC503C7D04CC22DA2923 /* Debug */, - FB45FFD90572718D82AB9092B750F0CA /* Release */, + C104F7F091290C3D1E248192F07FE689 /* Debug */, + 34FE9531DA9AF2820790339988D5FF41 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 50771AC10829B2CDCFBF776E35A103C2 /* Build configuration list for PBXNativeTarget "Masonry" */ = { + 34CAE1CB89EDBF2E53735CC5D4E5E69F /* Build configuration list for PBXNativeTarget "Masonry" */ = { isa = XCConfigurationList; buildConfigurations = ( - A69745CCED23A539213FDA7401E4F200 /* Debug */, - 219CABB62EEE959A9CAE941DAE43EF68 /* Release */, + 5A6ACE61C4D128598EA7472C87982601 /* Debug */, + 6CA42F62CE0652819ED46936FE31E065 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7181F1980E5D127DD39D270935451522 /* Build configuration list for PBXNativeTarget "Pods-MMPopupView" */ = { + 6823740FE78BD9DBDA0BB0E87EE3A111 /* Build configuration list for PBXNativeTarget "Pods-MMPopupView" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5792384E765B7488334A037FB3E69148 /* Debug */, - B4B32FB1971555424E4D6D5B8CE24F55 /* Release */, + 6AF3020B2C7192E79C80E72E789ECD9E /* Debug */, + 9883FE06555DE9AEFF91F3B18707B79E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/MMPopupView/Pods/Target Support Files/Masonry/Masonry-prefix.pch b/MMPopupView/Pods/Target Support Files/Masonry/Masonry-prefix.pch index aa992a4..beb2a24 100644 --- a/MMPopupView/Pods/Target Support Files/Masonry/Masonry-prefix.pch +++ b/MMPopupView/Pods/Target Support Files/Masonry/Masonry-prefix.pch @@ -1,4 +1,12 @@ #ifdef __OBJC__ #import +#else +#ifndef FOUNDATION_EXPORT +#if defined(__cplusplus) +#define FOUNDATION_EXPORT extern "C" +#else +#define FOUNDATION_EXPORT extern +#endif +#endif #endif diff --git a/MMPopupView/Pods/Target Support Files/Masonry/Masonry.xcconfig b/MMPopupView/Pods/Target Support Files/Masonry/Masonry.xcconfig index f450f4c..bec66ad 100644 --- a/MMPopupView/Pods/Target Support Files/Masonry/Masonry.xcconfig +++ b/MMPopupView/Pods/Target Support Files/Masonry/Masonry.xcconfig @@ -1,5 +1,10 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Masonry GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Masonry" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = -framework "Foundation" -framework "UIKit" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PODS_TARGET_SRCROOT = ${PODS_ROOT}/Masonry +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-acknowledgements.markdown b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-acknowledgements.markdown index 56a5907..2a48181 100644 --- a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-acknowledgements.markdown +++ b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-acknowledgements.markdown @@ -22,4 +22,4 @@ 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. -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-acknowledgements.plist b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-acknowledgements.plist index 834a37e..ae25b59 100644 --- a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-acknowledgements.plist +++ b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-acknowledgements.plist @@ -33,6 +33,8 @@ 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. + License + MIT Title Masonry Type @@ -40,7 +42,7 @@ THE SOFTWARE. FooterText - Generated by CocoaPods - http://cocoapods.org + Generated by CocoaPods - https://cocoapods.org Title Type diff --git a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-frameworks.sh b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-frameworks.sh index ca8b6aa..0f29f13 100755 --- a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-frameworks.sh +++ b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-frameworks.sh @@ -16,7 +16,7 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." @@ -42,14 +42,16 @@ install_framework() # Resign the code if required by the build settings to avoid unstable apps code_sign_if_enabled "${destination}/$(basename "$1")" - # Embed linked Swift runtime libraries - local swift_runtime_libs - swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u && exit ${PIPESTATUS[0]}) - for lib in $swift_runtime_libs; do - echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\"" - rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}" - code_sign_if_enabled "${destination}/${lib}" - done + # Embed linked Swift runtime libraries. No longer necessary as of Xcode 7. + if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then + local swift_runtime_libs + swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u && exit ${PIPESTATUS[0]}) + for lib in $swift_runtime_libs; do + echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\"" + rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}" + code_sign_if_enabled "${destination}/${lib}" + done + fi } # Signs a framework with the provided identity @@ -57,8 +59,13 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + + if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + code_sign_cmd="$code_sign_cmd &" + fi + echo "$code_sign_cmd" + eval "$code_sign_cmd" fi } @@ -80,3 +87,6 @@ strip_invalid_archs() { fi } +if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then + wait +fi diff --git a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-resources.sh b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-resources.sh index 16774fb..aed060f 100755 --- a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-resources.sh +++ b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView-resources.sh @@ -1,65 +1,87 @@ #!/bin/sh set -e -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" XCASSET_FILES=() -realpath() { - DIRECTORY="$(cd "${1%/*}" && pwd)" - FILENAME="${1##*/}" - echo "$DIRECTORY/$FILENAME" -} +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + 3) + TARGET_DEVICE_ARGS="--target-device tv" + ;; + 4) + TARGET_DEVICE_ARGS="--target-device watch" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac install_resource() { - case $1 in + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") + ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH" XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" + echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -68,28 +90,13 @@ rm -f "$RESOURCES_TO_COPY" if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do - if [[ $line != "`realpath $PODS_ROOT`*" ]]; then + if [[ $line != "${PODS_ROOT}*" ]]; then XCASSET_FILES+=("$line") fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi diff --git a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.debug.xcconfig b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.debug.xcconfig index 3d0e6e3..1087da7 100644 --- a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.debug.xcconfig +++ b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.debug.xcconfig @@ -1,5 +1,9 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Masonry" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +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 diff --git a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.release.xcconfig b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.release.xcconfig index 3d0e6e3..1087da7 100644 --- a/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.release.xcconfig +++ b/MMPopupView/Pods/Target Support Files/Pods-MMPopupView/Pods-MMPopupView.release.xcconfig @@ -1,5 +1,9 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Masonry" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +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 From 1aa7161b04e2ae38109397090cdd1a6822de16e7 Mon Sep 17 00:00:00 2001 From: yanff <15820480109@163.com> Date: Fri, 12 May 2017 10:29:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Classes/MMPopupView.h | 4 +--- Classes/MMPopupView.m | 19 ++++++++++++++++--- Classes/MMPopupWindow.h | 14 ++++++++++++++ Classes/MMPopupWindow.m | 4 ++++ MMPopupView/.DS_Store | Bin 6148 -> 6148 bytes MMPopupView/MMPinView.m | 5 +++++ 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/Classes/MMPopupView.h b/Classes/MMPopupView.h index f821de2..e25d420 100644 --- a/Classes/MMPopupView.h +++ b/Classes/MMPopupView.h @@ -12,8 +12,6 @@ #import "MMPopupCategory.h" #import "MMPopupDefine.h" -//hide notification -UIKIT_EXTERN NSString *const MMPopupViewWillDisappearNotification; typedef NS_ENUM(NSUInteger, MMPopupType) { MMPopupTypeAlert, @@ -26,7 +24,7 @@ typedef NS_ENUM(NSUInteger, MMPopupType) { typedef void(^MMPopupBlock)(MMPopupView *); typedef void(^MMPopupCompletionBlock)(MMPopupView *, BOOL); -@interface MMPopupView : UIView +@interface MMPopupView : UIView @property (nonatomic, assign, readonly) BOOL visible; // default is NO. diff --git a/Classes/MMPopupView.m b/Classes/MMPopupView.m index 44e227b..936e458 100644 --- a/Classes/MMPopupView.m +++ b/Classes/MMPopupView.m @@ -13,7 +13,7 @@ #import static NSString * const MMPopupViewHideAllNotification = @"MMPopupViewHideAllNotification"; -NSString * const MMPopupViewWillDisappearNotification = @"MMPopupViewWillDisappearNotification"; + @implementation MMPopupView @@ -36,11 +36,14 @@ - (void)setup self.attachedView = [MMPopupWindow sharedWindow].attachView; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notifyHideAll:) name:MMPopupViewHideAllNotification object:nil]; + + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(notifyTouchWildToHide:) name:MMPopupWindowWildToHideNotification object:self]; } - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self name:MMPopupViewHideAllNotification object:nil]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:MMPopupWindowWildToHideNotification object:self]; } - (void)notifyHideAll:(NSNotification*)n @@ -51,6 +54,18 @@ - (void)notifyHideAll:(NSNotification*)n } } +- (void)notifyTouchWildToHide:(NSNotification*)n{ + + if ([self isEqual:n.object]) { + + if ([self respondsToSelector:@selector(touchwildToHideHandler)]) { + + [self touchwildToHideHandler]; + } + } + +} + + (void)hideAll { [[NSNotificationCenter defaultCenter] postNotificationName:MMPopupViewHideAllNotification object:[self class]]; @@ -156,8 +171,6 @@ - (void)hideWithBlock:(MMPopupCompletionBlock)block [self hideKeyboard]; } - [[NSNotificationCenter defaultCenter] postNotificationName:MMPopupViewWillDisappearNotification object:self]; - MMPopupBlock hideAnimation = self.hideAnimation; NSAssert(hideAnimation, @"hide animation must be there"); diff --git a/Classes/MMPopupWindow.h b/Classes/MMPopupWindow.h index 0861c5c..06ccee2 100644 --- a/Classes/MMPopupWindow.h +++ b/Classes/MMPopupWindow.h @@ -8,6 +8,20 @@ #import +//touchWildToHide notification +UIKIT_EXTERN NSString *const MMPopupWindowWildToHideNotification; + +@protocol MMPopupWindowWildToHideProtocol + +/** + MMPopupWindowWildToHideHandler + */ +- (void)touchwildToHideHandler; + +@end + + + @interface MMPopupWindow : UIWindow @property (nonatomic, assign) BOOL touchWildToHide; // default is NO. When YES, popup views will be hidden when user touch the translucent background. diff --git a/Classes/MMPopupWindow.m b/Classes/MMPopupWindow.m index 00c8c10..4bf7049 100644 --- a/Classes/MMPopupWindow.m +++ b/Classes/MMPopupWindow.m @@ -11,6 +11,8 @@ #import "MMPopupDefine.h" #import "MMPopupView.h" +NSString * const MMPopupWindowWildToHideNotification = @"MMPopupWindowWildToHideNotification"; + @interface MMPopupWindow() < UIGestureRecognizerDelegate @@ -68,6 +70,8 @@ - (void)actionTap:(UITapGestureRecognizer*)gesture { MMPopupView *popupView = (MMPopupView*)v; [popupView hide]; + //发送通知 + [[NSNotificationCenter defaultCenter] postNotificationName:MMPopupWindowWildToHideNotification object:popupView]; } } } diff --git a/MMPopupView/.DS_Store b/MMPopupView/.DS_Store index 13234df6b3a7de395e50901cc624ae01427aef80..d53c81a9f35a551ec3acc1ca6e5566dab709e232 100644 GIT binary patch delta 33 pcmZoMXffE}!^GtGdGZ7%lgUj?6Br9ND>6T0nb^R$nVsV=KLE=53&{Wg delta 33 pcmZoMXffE}!^C97J$V9?$>b)c35)@o6`7y0Ol;uW%+B$b9{{kv3Z(!5 diff --git a/MMPopupView/MMPinView.m b/MMPopupView/MMPinView.m index 265717d..e9f3554 100644 --- a/MMPopupView/MMPinView.m +++ b/MMPopupView/MMPinView.m @@ -168,6 +168,11 @@ - (void)startCountDown // [self checkCountDown]; } +- (void)touchwildToHideHandler{ + + NSLog(@"66666"); +} + - (void)stopCountDown { // [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(checkCountDown) object:nil]; From e35b32287610d3ea179966ca739e93bcf889b1c7 Mon Sep 17 00:00:00 2001 From: yanfj Date: Tue, 26 Sep 2017 21:42:38 -0500 Subject: [PATCH 5/5] @optional --- Classes/MMPopupWindow.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Classes/MMPopupWindow.h b/Classes/MMPopupWindow.h index 06ccee2..88f276a 100644 --- a/Classes/MMPopupWindow.h +++ b/Classes/MMPopupWindow.h @@ -12,7 +12,8 @@ UIKIT_EXTERN NSString *const MMPopupWindowWildToHideNotification; @protocol MMPopupWindowWildToHideProtocol - + +@optional /** MMPopupWindowWildToHideHandler */