From ba4a577d0be91352fcab302765791c3ccd8d5a99 Mon Sep 17 00:00:00 2001 From: yuxiang Date: Wed, 23 Apr 2014 22:52:36 +0800 Subject: [PATCH 1/5] Support iOS7 Support the lastest iOS --- .../Classes/VerticalSwipeScrollView.h | 6 ++ .../Classes/VerticalSwipeScrollView.m | 12 ++- VerticalSwipeArticles/Default-568h@2x.png | Bin 0 -> 18594 bytes .../project.pbxproj | 16 +++- .../contents.xcworkspacedata | 7 ++ .../WorkspaceSettings.xcsettings | 10 ++ .../xcschemes/VerticalSwipeArticles.xcscheme | 86 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 22 +++++ 8 files changed, 150 insertions(+), 9 deletions(-) create mode 100644 VerticalSwipeArticles/Default-568h@2x.png create mode 100644 VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings create mode 100644 VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme create mode 100644 VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h index afaae5f..b84170f 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h @@ -25,6 +25,12 @@ // THE SOFTWARE // +#define iOS7 [[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0 +#define STATUS_BAR_HEIGHT 20 +#define NAVIGATION_BAR_HEIGHT 44 +#define SCREEN_WIDTH [[UIScreen mainScreen] bounds].size.width +#define SCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height + @class VerticalSwipeScrollView; @protocol VerticalSwipeScrollViewDelegate -(UIView*) viewForScrollView:(VerticalSwipeScrollView*)scrollView atPage:(NSUInteger)page; diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m index 74a696d..3177ef0 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m @@ -65,7 +65,7 @@ - (id) initWithFrame:(CGRect)frame headerView:(UIView*)theHeaderView footerView: self.currentPageIndex = pageIndex; self.headerView = theHeaderView; self.footerView = theFooterView; - self.contentSize = self.frame.size; + self.contentSize =iOS7?CGSizeMake(SCREEN_WIDTH,SCREEN_HEIGHT-STATUS_BAR_HEIGHT-NAVIGATION_BAR_HEIGHT):self.frame.size; } return self; } @@ -92,7 +92,7 @@ -(void) setHeaderView:(UIView*)newValue headerView = [newValue retain]; // Place the header above the scroll view - headerView.frame = CGRectMake(0, -headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); + headerView.frame = CGRectMake(0, iOS7?-(STATUS_BAR_HEIGHT+NAVIGATION_BAR_HEIGHT):-headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); [self addSubview:headerView]; // Hide the header if there is no previous page @@ -155,14 +155,16 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView if (!scrollView.dragging) return; // The user is dragging down, we are loading/unloading the header/previous page view - if (scrollView.contentOffset.y < 0) + + + if (scrollView.contentOffset.y < (iOS7?-(headerView.frame.size.height+NAVIGATION_BAR_HEIGHT+STATUS_BAR_HEIGHT):0)) { // If the header is hidden, then there is no previous page and nothing for us to do if (headerView.hidden) return; // If the user has pulled down more than the height of the header - if (scrollView.contentOffset.y < -headerView.frame.size.height) - { + if (scrollView.contentOffset.y < (iOS7==YES?-135:-headerView.frame.size.height)) + { // The header is already loaded, nothing for us to do if (_headerLoaded) return; diff --git a/VerticalSwipeArticles/Default-568h@2x.png b/VerticalSwipeArticles/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607 GIT binary patch literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u literal 0 HcmV?d00001 diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj index 4a9cdac..46262b2 100755 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -26,6 +26,7 @@ 7F840F3D12C85C12003D9FD1 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3612C85C12003D9FD1 /* SBJsonBase.m */; }; 7F840F3E12C85C12003D9FD1 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */; }; 7F840F3F12C85C12003D9FD1 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */; }; + 892456451907F7FA0094EFD4 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 892456441907F7FA0094EFD4 /* Default-568h@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -60,6 +61,7 @@ 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonParser.m; sourceTree = ""; }; 7F840F3912C85C12003D9FD1 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = ""; }; 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = ""; }; + 892456441907F7FA0094EFD4 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 8D1107310486CEB800E47090 /* VerticalSwipeArticles-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "VerticalSwipeArticles-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -103,6 +105,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 892456441907F7FA0094EFD4 /* Default-568h@2x.png */, 080E96DDFE201D6D7F000001 /* Classes */, 7F840F2F12C85C12003D9FD1 /* JSON */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -189,8 +192,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "VerticalSwipeArticles" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -219,6 +225,7 @@ 7F59B5F512C86F0700160998 /* PullArrow.png in Resources */, 7F59B5F612C86F0700160998 /* PullArrow@2x.png in Resources */, 7F59B60212C8720800160998 /* DetailViewController.xib in Resources */, + 892456451907F7FA0094EFD4 /* Default-568h@2x.png in Resources */, 7F59B60E12C872E400160998 /* DetailView.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -276,11 +283,12 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = iphoneos; }; @@ -289,11 +297,11 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PREBINDING = NO; SDKROOT = iphoneos; diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..873fae8 --- /dev/null +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..659c876 --- /dev/null +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + + diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme new file mode 100644 index 0000000..4712b23 --- /dev/null +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/xcschememanagement.plist b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..d3fd667 --- /dev/null +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + VerticalSwipeArticles.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 1D6058900D05DD3D006BFB54 + + primary + + + + + From 53d5b9c083ca42aa1413546d7de235f2aedbe52d Mon Sep 17 00:00:00 2001 From: yuxiang Date: Thu, 24 Apr 2014 11:42:45 +0800 Subject: [PATCH 2/5] Revert "Support iOS7" This reverts commit ba4a577d0be91352fcab302765791c3ccd8d5a99. --- .../Classes/VerticalSwipeScrollView.h | 6 --- .../Classes/VerticalSwipeScrollView.m | 12 ++--- VerticalSwipeArticles/Default-568h@2x.png | Bin 18594 -> 0 bytes .../project.pbxproj | 16 ++----- .../WorkspaceSettings.xcsettings | 10 ---- .../xcschemes/VerticalSwipeArticles.xcscheme | 43 ------------------ 6 files changed, 9 insertions(+), 78 deletions(-) delete mode 100644 VerticalSwipeArticles/Default-568h@2x.png delete mode 100644 VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h index b84170f..afaae5f 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h @@ -25,12 +25,6 @@ // THE SOFTWARE // -#define iOS7 [[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0 -#define STATUS_BAR_HEIGHT 20 -#define NAVIGATION_BAR_HEIGHT 44 -#define SCREEN_WIDTH [[UIScreen mainScreen] bounds].size.width -#define SCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height - @class VerticalSwipeScrollView; @protocol VerticalSwipeScrollViewDelegate -(UIView*) viewForScrollView:(VerticalSwipeScrollView*)scrollView atPage:(NSUInteger)page; diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m index 3177ef0..74a696d 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m @@ -65,7 +65,7 @@ - (id) initWithFrame:(CGRect)frame headerView:(UIView*)theHeaderView footerView: self.currentPageIndex = pageIndex; self.headerView = theHeaderView; self.footerView = theFooterView; - self.contentSize =iOS7?CGSizeMake(SCREEN_WIDTH,SCREEN_HEIGHT-STATUS_BAR_HEIGHT-NAVIGATION_BAR_HEIGHT):self.frame.size; + self.contentSize = self.frame.size; } return self; } @@ -92,7 +92,7 @@ -(void) setHeaderView:(UIView*)newValue headerView = [newValue retain]; // Place the header above the scroll view - headerView.frame = CGRectMake(0, iOS7?-(STATUS_BAR_HEIGHT+NAVIGATION_BAR_HEIGHT):-headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); + headerView.frame = CGRectMake(0, -headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); [self addSubview:headerView]; // Hide the header if there is no previous page @@ -155,16 +155,14 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView if (!scrollView.dragging) return; // The user is dragging down, we are loading/unloading the header/previous page view - - - if (scrollView.contentOffset.y < (iOS7?-(headerView.frame.size.height+NAVIGATION_BAR_HEIGHT+STATUS_BAR_HEIGHT):0)) + if (scrollView.contentOffset.y < 0) { // If the header is hidden, then there is no previous page and nothing for us to do if (headerView.hidden) return; // If the user has pulled down more than the height of the header - if (scrollView.contentOffset.y < (iOS7==YES?-135:-headerView.frame.size.height)) - { + if (scrollView.contentOffset.y < -headerView.frame.size.height) + { // The header is already loaded, nothing for us to do if (_headerLoaded) return; diff --git a/VerticalSwipeArticles/Default-568h@2x.png b/VerticalSwipeArticles/Default-568h@2x.png deleted file mode 100644 index 0891b7aabfcf3422423b109c8beed2bab838c607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj index 46262b2..4a9cdac 100755 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 45; objects = { /* Begin PBXBuildFile section */ @@ -26,7 +26,6 @@ 7F840F3D12C85C12003D9FD1 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3612C85C12003D9FD1 /* SBJsonBase.m */; }; 7F840F3E12C85C12003D9FD1 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */; }; 7F840F3F12C85C12003D9FD1 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */; }; - 892456451907F7FA0094EFD4 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 892456441907F7FA0094EFD4 /* Default-568h@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -61,7 +60,6 @@ 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonParser.m; sourceTree = ""; }; 7F840F3912C85C12003D9FD1 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = ""; }; 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = ""; }; - 892456441907F7FA0094EFD4 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 8D1107310486CEB800E47090 /* VerticalSwipeArticles-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "VerticalSwipeArticles-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -105,7 +103,6 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - 892456441907F7FA0094EFD4 /* Default-568h@2x.png */, 080E96DDFE201D6D7F000001 /* Classes */, 7F840F2F12C85C12003D9FD1 /* JSON */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -192,11 +189,8 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; - attributes = { - LastUpgradeCheck = 0510; - }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "VerticalSwipeArticles" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 3.1"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -225,7 +219,6 @@ 7F59B5F512C86F0700160998 /* PullArrow.png in Resources */, 7F59B5F612C86F0700160998 /* PullArrow@2x.png in Resources */, 7F59B60212C8720800160998 /* DetailViewController.xib in Resources */, - 892456451907F7FA0094EFD4 /* Default-568h@2x.png in Resources */, 7F59B60E12C872E400160998 /* DetailView.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -283,12 +276,11 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; - ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = iphoneos; }; @@ -297,11 +289,11 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PREBINDING = NO; SDKROOT = iphoneos; diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings deleted file mode 100644 index 659c876..0000000 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,10 +0,0 @@ - - - - - HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - SnapshotAutomaticallyBeforeSignificantChanges - - - diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme index 4712b23..6029e1c 100644 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme @@ -5,22 +5,6 @@ - - - - - - - - - - - - - - @@ -66,15 +32,6 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> - - - - From 0c01e6bc878e816e69d2fa2d547afa191a1f98ce Mon Sep 17 00:00:00 2001 From: yuxiang Date: Thu, 24 Apr 2014 12:20:04 +0800 Subject: [PATCH 3/5] Revert ba4a577..53d5b9c This rolls back to commit ba4a577d0be91352fcab302765791c3ccd8d5a99. --- .gitignore | 20 ++++++++ .../Classes/VerticalSwipeScrollView.h | 6 +++ .../Classes/VerticalSwipeScrollView.m | 12 +++-- VerticalSwipeArticles/Default-568h@2x.png | Bin 0 -> 18594 bytes .../project.pbxproj | 16 +++++-- .../xcschemes/VerticalSwipeArticles.xcscheme | 43 ++++++++++++++++++ 6 files changed, 88 insertions(+), 9 deletions(-) create mode 100644 .gitignore create mode 100644 VerticalSwipeArticles/Default-568h@2x.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..500ab0c --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ + +*.xcsettings + +*.xcscheme + +*.pbxproj + +*.pbxproj + +*.pbxproj + +VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj + +VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj + +VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj + +*.pbxproj + +*.pbxproj diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h index afaae5f..b84170f 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h @@ -25,6 +25,12 @@ // THE SOFTWARE // +#define iOS7 [[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0 +#define STATUS_BAR_HEIGHT 20 +#define NAVIGATION_BAR_HEIGHT 44 +#define SCREEN_WIDTH [[UIScreen mainScreen] bounds].size.width +#define SCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height + @class VerticalSwipeScrollView; @protocol VerticalSwipeScrollViewDelegate -(UIView*) viewForScrollView:(VerticalSwipeScrollView*)scrollView atPage:(NSUInteger)page; diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m index 74a696d..3177ef0 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m @@ -65,7 +65,7 @@ - (id) initWithFrame:(CGRect)frame headerView:(UIView*)theHeaderView footerView: self.currentPageIndex = pageIndex; self.headerView = theHeaderView; self.footerView = theFooterView; - self.contentSize = self.frame.size; + self.contentSize =iOS7?CGSizeMake(SCREEN_WIDTH,SCREEN_HEIGHT-STATUS_BAR_HEIGHT-NAVIGATION_BAR_HEIGHT):self.frame.size; } return self; } @@ -92,7 +92,7 @@ -(void) setHeaderView:(UIView*)newValue headerView = [newValue retain]; // Place the header above the scroll view - headerView.frame = CGRectMake(0, -headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); + headerView.frame = CGRectMake(0, iOS7?-(STATUS_BAR_HEIGHT+NAVIGATION_BAR_HEIGHT):-headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); [self addSubview:headerView]; // Hide the header if there is no previous page @@ -155,14 +155,16 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView if (!scrollView.dragging) return; // The user is dragging down, we are loading/unloading the header/previous page view - if (scrollView.contentOffset.y < 0) + + + if (scrollView.contentOffset.y < (iOS7?-(headerView.frame.size.height+NAVIGATION_BAR_HEIGHT+STATUS_BAR_HEIGHT):0)) { // If the header is hidden, then there is no previous page and nothing for us to do if (headerView.hidden) return; // If the user has pulled down more than the height of the header - if (scrollView.contentOffset.y < -headerView.frame.size.height) - { + if (scrollView.contentOffset.y < (iOS7==YES?-135:-headerView.frame.size.height)) + { // The header is already loaded, nothing for us to do if (_headerLoaded) return; diff --git a/VerticalSwipeArticles/Default-568h@2x.png b/VerticalSwipeArticles/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607 GIT binary patch literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u literal 0 HcmV?d00001 diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj index 4a9cdac..46262b2 100755 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -26,6 +26,7 @@ 7F840F3D12C85C12003D9FD1 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3612C85C12003D9FD1 /* SBJsonBase.m */; }; 7F840F3E12C85C12003D9FD1 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */; }; 7F840F3F12C85C12003D9FD1 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */; }; + 892456451907F7FA0094EFD4 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 892456441907F7FA0094EFD4 /* Default-568h@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -60,6 +61,7 @@ 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonParser.m; sourceTree = ""; }; 7F840F3912C85C12003D9FD1 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = ""; }; 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = ""; }; + 892456441907F7FA0094EFD4 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 8D1107310486CEB800E47090 /* VerticalSwipeArticles-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "VerticalSwipeArticles-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -103,6 +105,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 892456441907F7FA0094EFD4 /* Default-568h@2x.png */, 080E96DDFE201D6D7F000001 /* Classes */, 7F840F2F12C85C12003D9FD1 /* JSON */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -189,8 +192,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "VerticalSwipeArticles" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -219,6 +225,7 @@ 7F59B5F512C86F0700160998 /* PullArrow.png in Resources */, 7F59B5F612C86F0700160998 /* PullArrow@2x.png in Resources */, 7F59B60212C8720800160998 /* DetailViewController.xib in Resources */, + 892456451907F7FA0094EFD4 /* Default-568h@2x.png in Resources */, 7F59B60E12C872E400160998 /* DetailView.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -276,11 +283,12 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = iphoneos; }; @@ -289,11 +297,11 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PREBINDING = NO; SDKROOT = iphoneos; diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme index 6029e1c..4712b23 100644 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme @@ -5,6 +5,22 @@ + + + + + + + + + + + + + + @@ -32,6 +66,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + From ae534f7722ea1f26fc7ab566b1c87f17bd2f866d Mon Sep 17 00:00:00 2001 From: yuxiang Date: Thu, 24 Apr 2014 12:21:32 +0800 Subject: [PATCH 4/5] Revert "Revert ba4a577..53d5b9c" This reverts commit ba4a577d0be91352fcab302765791c3ccd8d5a99. --- .gitignore | 20 -------- .../Classes/VerticalSwipeScrollView.h | 6 --- .../Classes/VerticalSwipeScrollView.m | 12 ++--- VerticalSwipeArticles/Default-568h@2x.png | Bin 18594 -> 0 bytes .../project.pbxproj | 16 ++----- .../WorkspaceSettings.xcsettings | 10 ++++ .../xcschemes/VerticalSwipeArticles.xcscheme | 43 ------------------ 7 files changed, 19 insertions(+), 88 deletions(-) delete mode 100644 .gitignore delete mode 100644 VerticalSwipeArticles/Default-568h@2x.png create mode 100644 VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 500ab0c..0000000 --- a/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ - -*.xcsettings - -*.xcscheme - -*.pbxproj - -*.pbxproj - -*.pbxproj - -VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj - -VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj - -VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj - -*.pbxproj - -*.pbxproj diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h index b84170f..afaae5f 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h @@ -25,12 +25,6 @@ // THE SOFTWARE // -#define iOS7 [[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0 -#define STATUS_BAR_HEIGHT 20 -#define NAVIGATION_BAR_HEIGHT 44 -#define SCREEN_WIDTH [[UIScreen mainScreen] bounds].size.width -#define SCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height - @class VerticalSwipeScrollView; @protocol VerticalSwipeScrollViewDelegate -(UIView*) viewForScrollView:(VerticalSwipeScrollView*)scrollView atPage:(NSUInteger)page; diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m index 3177ef0..74a696d 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m @@ -65,7 +65,7 @@ - (id) initWithFrame:(CGRect)frame headerView:(UIView*)theHeaderView footerView: self.currentPageIndex = pageIndex; self.headerView = theHeaderView; self.footerView = theFooterView; - self.contentSize =iOS7?CGSizeMake(SCREEN_WIDTH,SCREEN_HEIGHT-STATUS_BAR_HEIGHT-NAVIGATION_BAR_HEIGHT):self.frame.size; + self.contentSize = self.frame.size; } return self; } @@ -92,7 +92,7 @@ -(void) setHeaderView:(UIView*)newValue headerView = [newValue retain]; // Place the header above the scroll view - headerView.frame = CGRectMake(0, iOS7?-(STATUS_BAR_HEIGHT+NAVIGATION_BAR_HEIGHT):-headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); + headerView.frame = CGRectMake(0, -headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); [self addSubview:headerView]; // Hide the header if there is no previous page @@ -155,16 +155,14 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView if (!scrollView.dragging) return; // The user is dragging down, we are loading/unloading the header/previous page view - - - if (scrollView.contentOffset.y < (iOS7?-(headerView.frame.size.height+NAVIGATION_BAR_HEIGHT+STATUS_BAR_HEIGHT):0)) + if (scrollView.contentOffset.y < 0) { // If the header is hidden, then there is no previous page and nothing for us to do if (headerView.hidden) return; // If the user has pulled down more than the height of the header - if (scrollView.contentOffset.y < (iOS7==YES?-135:-headerView.frame.size.height)) - { + if (scrollView.contentOffset.y < -headerView.frame.size.height) + { // The header is already loaded, nothing for us to do if (_headerLoaded) return; diff --git a/VerticalSwipeArticles/Default-568h@2x.png b/VerticalSwipeArticles/Default-568h@2x.png deleted file mode 100644 index 0891b7aabfcf3422423b109c8beed2bab838c607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj index 46262b2..4a9cdac 100755 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 45; objects = { /* Begin PBXBuildFile section */ @@ -26,7 +26,6 @@ 7F840F3D12C85C12003D9FD1 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3612C85C12003D9FD1 /* SBJsonBase.m */; }; 7F840F3E12C85C12003D9FD1 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */; }; 7F840F3F12C85C12003D9FD1 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */; }; - 892456451907F7FA0094EFD4 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 892456441907F7FA0094EFD4 /* Default-568h@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -61,7 +60,6 @@ 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonParser.m; sourceTree = ""; }; 7F840F3912C85C12003D9FD1 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = ""; }; 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = ""; }; - 892456441907F7FA0094EFD4 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 8D1107310486CEB800E47090 /* VerticalSwipeArticles-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "VerticalSwipeArticles-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -105,7 +103,6 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - 892456441907F7FA0094EFD4 /* Default-568h@2x.png */, 080E96DDFE201D6D7F000001 /* Classes */, 7F840F2F12C85C12003D9FD1 /* JSON */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -192,11 +189,8 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; - attributes = { - LastUpgradeCheck = 0510; - }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "VerticalSwipeArticles" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 3.1"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -225,7 +219,6 @@ 7F59B5F512C86F0700160998 /* PullArrow.png in Resources */, 7F59B5F612C86F0700160998 /* PullArrow@2x.png in Resources */, 7F59B60212C8720800160998 /* DetailViewController.xib in Resources */, - 892456451907F7FA0094EFD4 /* Default-568h@2x.png in Resources */, 7F59B60E12C872E400160998 /* DetailView.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -283,12 +276,11 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; - ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = iphoneos; }; @@ -297,11 +289,11 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PREBINDING = NO; SDKROOT = iphoneos; diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..659c876 --- /dev/null +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.xcworkspace/xcuserdata/qinyuxiang.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + + diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme index 4712b23..6029e1c 100644 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme @@ -5,22 +5,6 @@ - - - - - - - - - - - - - - @@ -66,15 +32,6 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> - - - - From eaed01c20e7325cfb0c1a691441b2b52482f1cf5 Mon Sep 17 00:00:00 2001 From: yuxiang Date: Thu, 24 Apr 2014 12:24:28 +0800 Subject: [PATCH 5/5] Revert "Revert "Support iOS7"" This reverts commit 0c01e6bc878e816e69d2fa2d547afa191a1f98ce. remove the VerticalSwipeArticles.xcodeproj/project.xcworkspace --- .gitignore | 2 + .../Classes/VerticalSwipeScrollView.h | 6 + .../Classes/VerticalSwipeScrollView.m | 12 +- VerticalSwipeArticles/Default-568h@2x.png | Bin 0 -> 18594 bytes .../project.pbxproj | 327 ------------------ .../xcschemes/VerticalSwipeArticles.xcscheme | 43 +++ 6 files changed, 58 insertions(+), 332 deletions(-) create mode 100644 .gitignore create mode 100644 VerticalSwipeArticles/Default-568h@2x.png delete mode 100755 VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8b9ee9d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h index afaae5f..b84170f 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h @@ -25,6 +25,12 @@ // THE SOFTWARE // +#define iOS7 [[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0 +#define STATUS_BAR_HEIGHT 20 +#define NAVIGATION_BAR_HEIGHT 44 +#define SCREEN_WIDTH [[UIScreen mainScreen] bounds].size.width +#define SCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height + @class VerticalSwipeScrollView; @protocol VerticalSwipeScrollViewDelegate -(UIView*) viewForScrollView:(VerticalSwipeScrollView*)scrollView atPage:(NSUInteger)page; diff --git a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m index 74a696d..3177ef0 100644 --- a/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m +++ b/VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m @@ -65,7 +65,7 @@ - (id) initWithFrame:(CGRect)frame headerView:(UIView*)theHeaderView footerView: self.currentPageIndex = pageIndex; self.headerView = theHeaderView; self.footerView = theFooterView; - self.contentSize = self.frame.size; + self.contentSize =iOS7?CGSizeMake(SCREEN_WIDTH,SCREEN_HEIGHT-STATUS_BAR_HEIGHT-NAVIGATION_BAR_HEIGHT):self.frame.size; } return self; } @@ -92,7 +92,7 @@ -(void) setHeaderView:(UIView*)newValue headerView = [newValue retain]; // Place the header above the scroll view - headerView.frame = CGRectMake(0, -headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); + headerView.frame = CGRectMake(0, iOS7?-(STATUS_BAR_HEIGHT+NAVIGATION_BAR_HEIGHT):-headerView.frame.size.height, headerView.frame.size.width, headerView.frame.size.height); [self addSubview:headerView]; // Hide the header if there is no previous page @@ -155,14 +155,16 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView if (!scrollView.dragging) return; // The user is dragging down, we are loading/unloading the header/previous page view - if (scrollView.contentOffset.y < 0) + + + if (scrollView.contentOffset.y < (iOS7?-(headerView.frame.size.height+NAVIGATION_BAR_HEIGHT+STATUS_BAR_HEIGHT):0)) { // If the header is hidden, then there is no previous page and nothing for us to do if (headerView.hidden) return; // If the user has pulled down more than the height of the header - if (scrollView.contentOffset.y < -headerView.frame.size.height) - { + if (scrollView.contentOffset.y < (iOS7==YES?-135:-headerView.frame.size.height)) + { // The header is already loaded, nothing for us to do if (_headerLoaded) return; diff --git a/VerticalSwipeArticles/Default-568h@2x.png b/VerticalSwipeArticles/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607 GIT binary patch literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u literal 0 HcmV?d00001 diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj deleted file mode 100755 index 4a9cdac..0000000 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj +++ /dev/null @@ -1,327 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 45; - objects = { - -/* Begin PBXBuildFile section */ - 1D3623260D0F684500981E51 /* VerticalSwipeArticlesAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* VerticalSwipeArticlesAppDelegate.m */; }; - 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; - 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; - 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; - 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */; }; - 28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD735F0D9D9599002E5188 /* MainWindow.xib */; }; - 28C286E10D94DF7D0034E888 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28C286E00D94DF7D0034E888 /* RootViewController.m */; }; - 28F335F11007B36200424DE2 /* RootViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F335F01007B36200424DE2 /* RootViewController.xib */; }; - 7F59B5F512C86F0700160998 /* PullArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F59B5F312C86F0700160998 /* PullArrow.png */; }; - 7F59B5F612C86F0700160998 /* PullArrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F59B5F412C86F0700160998 /* PullArrow@2x.png */; }; - 7F59B5FC12C86F1500160998 /* VerticalSwipeScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F59B5FA12C86F1500160998 /* VerticalSwipeScrollView.m */; }; - 7F59B60212C8720800160998 /* DetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F59B60112C8720800160998 /* DetailViewController.xib */; }; - 7F59B60512C8720F00160998 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F59B60412C8720F00160998 /* DetailViewController.m */; }; - 7F59B60E12C872E400160998 /* DetailView.html in Resources */ = {isa = PBXBuildFile; fileRef = 7F59B60D12C872E400160998 /* DetailView.html */; }; - 7F840F3B12C85C12003D9FD1 /* NSObject+SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3212C85C12003D9FD1 /* NSObject+SBJSON.m */; }; - 7F840F3C12C85C12003D9FD1 /* NSString+SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3412C85C12003D9FD1 /* NSString+SBJSON.m */; }; - 7F840F3D12C85C12003D9FD1 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3612C85C12003D9FD1 /* SBJsonBase.m */; }; - 7F840F3E12C85C12003D9FD1 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */; }; - 7F840F3F12C85C12003D9FD1 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 1D3623240D0F684500981E51 /* VerticalSwipeArticlesAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VerticalSwipeArticlesAppDelegate.h; sourceTree = ""; }; - 1D3623250D0F684500981E51 /* VerticalSwipeArticlesAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VerticalSwipeArticlesAppDelegate.m; sourceTree = ""; }; - 1D6058910D05DD3D006BFB54 /* VerticalSwipeArticles.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VerticalSwipeArticles.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 28A0AAE50D9B0CCF005BE974 /* VerticalSwipeArticles_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VerticalSwipeArticles_Prefix.pch; sourceTree = ""; }; - 28AD735F0D9D9599002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; - 28C286DF0D94DF7D0034E888 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = ""; }; - 28C286E00D94DF7D0034E888 /* RootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RootViewController.m; sourceTree = ""; }; - 28F335F01007B36200424DE2 /* RootViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RootViewController.xib; sourceTree = ""; }; - 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 7F59B5F312C86F0700160998 /* PullArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PullArrow.png; sourceTree = ""; }; - 7F59B5F412C86F0700160998 /* PullArrow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "PullArrow@2x.png"; sourceTree = ""; }; - 7F59B5F912C86F1500160998 /* VerticalSwipeScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VerticalSwipeScrollView.h; sourceTree = ""; }; - 7F59B5FA12C86F1500160998 /* VerticalSwipeScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VerticalSwipeScrollView.m; sourceTree = ""; }; - 7F59B60112C8720800160998 /* DetailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DetailViewController.xib; sourceTree = ""; }; - 7F59B60312C8720F00160998 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailViewController.h; sourceTree = ""; }; - 7F59B60412C8720F00160998 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailViewController.m; sourceTree = ""; }; - 7F59B60D12C872E400160998 /* DetailView.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = DetailView.html; sourceTree = ""; }; - 7F840F3012C85C12003D9FD1 /* JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSON.h; sourceTree = ""; }; - 7F840F3112C85C12003D9FD1 /* NSObject+SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+SBJSON.h"; sourceTree = ""; }; - 7F840F3212C85C12003D9FD1 /* NSObject+SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+SBJSON.m"; sourceTree = ""; }; - 7F840F3312C85C12003D9FD1 /* NSString+SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+SBJSON.h"; sourceTree = ""; }; - 7F840F3412C85C12003D9FD1 /* NSString+SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+SBJSON.m"; sourceTree = ""; }; - 7F840F3512C85C12003D9FD1 /* SBJsonBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonBase.h; sourceTree = ""; }; - 7F840F3612C85C12003D9FD1 /* SBJsonBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonBase.m; sourceTree = ""; }; - 7F840F3712C85C12003D9FD1 /* SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonParser.h; sourceTree = ""; }; - 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonParser.m; sourceTree = ""; }; - 7F840F3912C85C12003D9FD1 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = ""; }; - 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* VerticalSwipeArticles-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "VerticalSwipeArticles-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, - 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, - 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 080E96DDFE201D6D7F000001 /* Classes */ = { - isa = PBXGroup; - children = ( - 28C286DF0D94DF7D0034E888 /* RootViewController.h */, - 28C286E00D94DF7D0034E888 /* RootViewController.m */, - 1D3623240D0F684500981E51 /* VerticalSwipeArticlesAppDelegate.h */, - 1D3623250D0F684500981E51 /* VerticalSwipeArticlesAppDelegate.m */, - 7F59B60312C8720F00160998 /* DetailViewController.h */, - 7F59B60412C8720F00160998 /* DetailViewController.m */, - 7F59B5F912C86F1500160998 /* VerticalSwipeScrollView.h */, - 7F59B5FA12C86F1500160998 /* VerticalSwipeScrollView.m */, - ); - path = Classes; - sourceTree = ""; - }; - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 1D6058910D05DD3D006BFB54 /* VerticalSwipeArticles.app */, - ); - name = Products; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { - isa = PBXGroup; - children = ( - 080E96DDFE201D6D7F000001 /* Classes */, - 7F840F2F12C85C12003D9FD1 /* JSON */, - 29B97315FDCFA39411CA2CEA /* Other Sources */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - ); - name = CustomTemplate; - sourceTree = ""; - }; - 29B97315FDCFA39411CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 28A0AAE50D9B0CCF005BE974 /* VerticalSwipeArticles_Prefix.pch */, - 29B97316FDCFA39411CA2CEA /* main.m */, - ); - name = "Other Sources"; - sourceTree = ""; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 28F335F01007B36200424DE2 /* RootViewController.xib */, - 28AD735F0D9D9599002E5188 /* MainWindow.xib */, - 7F59B60112C8720800160998 /* DetailViewController.xib */, - 8D1107310486CEB800E47090 /* VerticalSwipeArticles-Info.plist */, - 7F59B5F312C86F0700160998 /* PullArrow.png */, - 7F59B5F412C86F0700160998 /* PullArrow@2x.png */, - 7F59B60D12C872E400160998 /* DetailView.html */, - ); - name = Resources; - sourceTree = ""; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, - 1D30AB110D05D00D00671497 /* Foundation.framework */, - 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 7F840F2F12C85C12003D9FD1 /* JSON */ = { - isa = PBXGroup; - children = ( - 7F840F3012C85C12003D9FD1 /* JSON.h */, - 7F840F3112C85C12003D9FD1 /* NSObject+SBJSON.h */, - 7F840F3212C85C12003D9FD1 /* NSObject+SBJSON.m */, - 7F840F3312C85C12003D9FD1 /* NSString+SBJSON.h */, - 7F840F3412C85C12003D9FD1 /* NSString+SBJSON.m */, - 7F840F3512C85C12003D9FD1 /* SBJsonBase.h */, - 7F840F3612C85C12003D9FD1 /* SBJsonBase.m */, - 7F840F3712C85C12003D9FD1 /* SBJsonParser.h */, - 7F840F3812C85C12003D9FD1 /* SBJsonParser.m */, - 7F840F3912C85C12003D9FD1 /* SBJsonWriter.h */, - 7F840F3A12C85C12003D9FD1 /* SBJsonWriter.m */, - ); - path = JSON; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* VerticalSwipeArticles */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "VerticalSwipeArticles" */; - buildPhases = ( - 1D60588D0D05DD3D006BFB54 /* Resources */, - 1D60588E0D05DD3D006BFB54 /* Sources */, - 1D60588F0D05DD3D006BFB54 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = VerticalSwipeArticles; - productName = VerticalSwipeArticles; - productReference = 1D6058910D05DD3D006BFB54 /* VerticalSwipeArticles.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "VerticalSwipeArticles" */; - compatibilityVersion = "Xcode 3.1"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - en, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 1D6058900D05DD3D006BFB54 /* VerticalSwipeArticles */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 1D60588D0D05DD3D006BFB54 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 28AD73600D9D9599002E5188 /* MainWindow.xib in Resources */, - 28F335F11007B36200424DE2 /* RootViewController.xib in Resources */, - 7F59B5F512C86F0700160998 /* PullArrow.png in Resources */, - 7F59B5F612C86F0700160998 /* PullArrow@2x.png in Resources */, - 7F59B60212C8720800160998 /* DetailViewController.xib in Resources */, - 7F59B60E12C872E400160998 /* DetailView.html in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 1D60588E0D05DD3D006BFB54 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 1D60589B0D05DD56006BFB54 /* main.m in Sources */, - 1D3623260D0F684500981E51 /* VerticalSwipeArticlesAppDelegate.m in Sources */, - 28C286E10D94DF7D0034E888 /* RootViewController.m in Sources */, - 7F840F3B12C85C12003D9FD1 /* NSObject+SBJSON.m in Sources */, - 7F840F3C12C85C12003D9FD1 /* NSString+SBJSON.m in Sources */, - 7F840F3D12C85C12003D9FD1 /* SBJsonBase.m in Sources */, - 7F840F3E12C85C12003D9FD1 /* SBJsonParser.m in Sources */, - 7F840F3F12C85C12003D9FD1 /* SBJsonWriter.m in Sources */, - 7F59B5FC12C86F1500160998 /* VerticalSwipeScrollView.m in Sources */, - 7F59B60512C8720F00160998 /* DetailViewController.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 1D6058940D05DD3E006BFB54 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = VerticalSwipeArticles_Prefix.pch; - INFOPLIST_FILE = "VerticalSwipeArticles-Info.plist"; - PRODUCT_NAME = VerticalSwipeArticles; - }; - name = Debug; - }; - 1D6058950D05DD3E006BFB54 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = VerticalSwipeArticles_Prefix.pch; - INFOPLIST_FILE = "VerticalSwipeArticles-Info.plist"; - PRODUCT_NAME = VerticalSwipeArticles; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = iphoneos; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - PREBINDING = NO; - SDKROOT = iphoneos; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "VerticalSwipeArticles" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D6058940D05DD3E006BFB54 /* Debug */, - 1D6058950D05DD3E006BFB54 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "VerticalSwipeArticles" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme index 6029e1c..4712b23 100644 --- a/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme +++ b/VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/xcuserdata/qinyuxiang.xcuserdatad/xcschemes/VerticalSwipeArticles.xcscheme @@ -5,6 +5,22 @@ + + + + + + + + + + + + + + @@ -32,6 +66,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + +