diff --git a/Project/CSStickyHeaderFlowLayoutDemo.xcodeproj/project.pbxproj b/Project/CSStickyHeaderFlowLayoutDemo.xcodeproj/project.pbxproj index 990cfcb..f37a478 100644 --- a/Project/CSStickyHeaderFlowLayoutDemo.xcodeproj/project.pbxproj +++ b/Project/CSStickyHeaderFlowLayoutDemo.xcodeproj/project.pbxproj @@ -12,6 +12,8 @@ 1A14657818F13832003B643B /* CSStickyParallaxHeaderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A14657718F13832003B643B /* CSStickyParallaxHeaderViewController.m */; }; 1A18AE5518F18764003DC8CF /* CSAlwaysOnTopHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1A18AE5418F18764003DC8CF /* CSAlwaysOnTopHeader.xib */; }; 1A18AE5818F1947B003DC8CF /* CSAlwaysOnTopHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A18AE5718F1947B003DC8CF /* CSAlwaysOnTopHeader.m */; }; + 1A7557EA19C8FE95006F894E /* CSBaseCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A7557E919C8FE95006F894E /* CSBaseCollectionViewCell.m */; }; + 1A7557ED19C90C08006F894E /* NSMutableArray+NSIndexPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A7557EC19C90C08006F894E /* NSMutableArray+NSIndexPath.m */; }; 1AC0D88518AA38380072B3F1 /* CSParallaxHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1AC0D88418AA38380072B3F1 /* CSParallaxHeader.xib */; }; 1AC0D88718AA39B50072B3F1 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC0D88618AA39B50072B3F1 /* MapKit.framework */; }; 1AC0D88918AA3AF80072B3F1 /* CSSearchBarHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1AC0D88818AA3AF80072B3F1 /* CSSearchBarHeader.xib */; }; @@ -55,6 +57,10 @@ 1A18AE5418F18764003DC8CF /* CSAlwaysOnTopHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CSAlwaysOnTopHeader.xib; sourceTree = ""; }; 1A18AE5618F1947B003DC8CF /* CSAlwaysOnTopHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSAlwaysOnTopHeader.h; sourceTree = ""; }; 1A18AE5718F1947B003DC8CF /* CSAlwaysOnTopHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSAlwaysOnTopHeader.m; sourceTree = ""; }; + 1A7557E819C8FE95006F894E /* CSBaseCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSBaseCollectionViewCell.h; sourceTree = ""; }; + 1A7557E919C8FE95006F894E /* CSBaseCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSBaseCollectionViewCell.m; sourceTree = ""; }; + 1A7557EB19C90C08006F894E /* NSMutableArray+NSIndexPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+NSIndexPath.h"; sourceTree = ""; }; + 1A7557EC19C90C08006F894E /* NSMutableArray+NSIndexPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+NSIndexPath.m"; sourceTree = ""; }; 1AC0D88418AA38380072B3F1 /* CSParallaxHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CSParallaxHeader.xib; sourceTree = ""; }; 1AC0D88618AA39B50072B3F1 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; 1AC0D88818AA3AF80072B3F1 /* CSSearchBarHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CSSearchBarHeader.xib; sourceTree = ""; }; @@ -113,6 +119,15 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 1A7557EE19C90C0D006F894E /* Helper */ = { + isa = PBXGroup; + children = ( + 1A7557EB19C90C08006F894E /* NSMutableArray+NSIndexPath.h */, + 1A7557EC19C90C08006F894E /* NSMutableArray+NSIndexPath.m */, + ); + name = Helper; + sourceTree = ""; + }; 1AFE0949187D677000CA880A = { isa = PBXGroup; children = ( @@ -152,6 +167,7 @@ 1AFE0964187D677000CA880A /* AppDelegate.h */, 1AFE0965187D677000CA880A /* AppDelegate.m */, 1AFE0967187D677000CA880A /* Main.storyboard */, + 1A7557EE19C90C0D006F894E /* Helper */, 1AFE098F187D685200CA880A /* Cell */, 1AFE098A187D67F500CA880A /* ViewControllers */, 1AFE096D187D677000CA880A /* Images.xcassets */, @@ -207,6 +223,8 @@ 1AFE098F187D685200CA880A /* Cell */ = { isa = PBXGroup; children = ( + 1A7557E819C8FE95006F894E /* CSBaseCollectionViewCell.h */, + 1A7557E919C8FE95006F894E /* CSBaseCollectionViewCell.m */, 1AFE0990187D688300CA880A /* CSCell.h */, 1AFE0991187D688300CA880A /* CSCell.m */, 1A18AE5618F1947B003DC8CF /* CSAlwaysOnTopHeader.h */, @@ -363,10 +381,12 @@ 1AFE096C187D677000CA880A /* CSParallaxHeaderViewController.m in Sources */, 1AFE0992187D688300CA880A /* CSCell.m in Sources */, 1AFE0966187D677000CA880A /* AppDelegate.m in Sources */, + 1A7557ED19C90C08006F894E /* NSMutableArray+NSIndexPath.m in Sources */, 1AFE0962187D677000CA880A /* main.m in Sources */, 1A0117F418AD036800AC836F /* CSGrowHeaderViewController.m in Sources */, 1A14657818F13832003B643B /* CSStickyParallaxHeaderViewController.m in Sources */, 1AC0D88C18AA3B300072B3F1 /* CSLockedHeaderViewController.m in Sources */, + 1A7557EA19C8FE95006F894E /* CSBaseCollectionViewCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Project/CSStickyHeaderFlowLayoutDemo.xcworkspace/xcshareddata/CSStickyHeaderFlowLayoutDemo.xccheckout b/Project/CSStickyHeaderFlowLayoutDemo.xcworkspace/xcshareddata/CSStickyHeaderFlowLayoutDemo.xccheckout index 8082dae..ecd6a08 100644 --- a/Project/CSStickyHeaderFlowLayoutDemo.xcworkspace/xcshareddata/CSStickyHeaderFlowLayoutDemo.xccheckout +++ b/Project/CSStickyHeaderFlowLayoutDemo.xcworkspace/xcshareddata/CSStickyHeaderFlowLayoutDemo.xccheckout @@ -5,36 +5,36 @@ IDESourceControlProjectFavoriteDictionaryKey IDESourceControlProjectIdentifier - 48E17D25-39A0-4DEC-83D6-22CE1C0C0217 + 3F83CD62-5795-4D2C-B544-27696BCFCC55 IDESourceControlProjectName CSStickyHeaderFlowLayoutDemo IDESourceControlProjectOriginsDictionary - 9FCEA6B4-6BFD-40A1-97AA-77294F4A62B7 - https://github.com/jamztang/CSStickyHeaderFlowLayout.git + 5187E190-6F2C-4DE6-BFD9-C50E3089CF95 + ssh://github.com/andreamazz/CSStickyHeaderFlowLayout.git IDESourceControlProjectPath Project/CSStickyHeaderFlowLayoutDemo.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary - 9FCEA6B4-6BFD-40A1-97AA-77294F4A62B7 + 5187E190-6F2C-4DE6-BFD9-C50E3089CF95 ../.. IDESourceControlProjectURL - https://github.com/jamztang/CSStickyHeaderFlowLayout.git + ssh://github.com/andreamazz/CSStickyHeaderFlowLayout.git IDESourceControlProjectVersion 110 IDESourceControlProjectWCCIdentifier - 9FCEA6B4-6BFD-40A1-97AA-77294F4A62B7 + 5187E190-6F2C-4DE6-BFD9-C50E3089CF95 IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - 9FCEA6B4-6BFD-40A1-97AA-77294F4A62B7 + 5187E190-6F2C-4DE6-BFD9-C50E3089CF95 IDESourceControlWCCName - CSStickyHeaderFlowLayout + sticky diff --git a/Project/CSStickyHeaderFlowLayoutDemo/Base.lproj/Main.storyboard b/Project/CSStickyHeaderFlowLayoutDemo/Base.lproj/Main.storyboard index d665a6b..fdce526 100644 --- a/Project/CSStickyHeaderFlowLayoutDemo/Base.lproj/Main.storyboard +++ b/Project/CSStickyHeaderFlowLayoutDemo/Base.lproj/Main.storyboard @@ -1,10 +1,11 @@ - + - + + - + @@ -26,9 +27,16 @@ + + + + + + + + - + @@ -108,7 +130,7 @@ - + @@ -132,7 +154,6 @@ - + @@ -191,7 +211,7 @@ - + @@ -215,7 +235,6 @@ - + @@ -274,7 +292,7 @@ - + @@ -297,7 +315,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Project/CSStickyHeaderFlowLayoutDemo/CSAlwaysOnTopHeader.h b/Project/CSStickyHeaderFlowLayoutDemo/CSAlwaysOnTopHeader.h index 935c6bd..d72a7c1 100644 --- a/Project/CSStickyHeaderFlowLayoutDemo/CSAlwaysOnTopHeader.h +++ b/Project/CSStickyHeaderFlowLayoutDemo/CSAlwaysOnTopHeader.h @@ -7,10 +7,12 @@ // #import "CSCell.h" +#import "CSBaseCollectionViewCell.h" -@interface CSAlwaysOnTopHeader : CSCell +@interface CSAlwaysOnTopHeader : CSBaseCollectionViewCell @property (weak, nonatomic) IBOutlet UILabel *titleLabel; @property (weak, nonatomic) IBOutlet UISearchBar *searchBar; @end + diff --git a/Project/CSStickyHeaderFlowLayoutDemo/CSAlwaysOnTopHeader.xib b/Project/CSStickyHeaderFlowLayoutDemo/CSAlwaysOnTopHeader.xib index 99281b7..684d1d7 100644 --- a/Project/CSStickyHeaderFlowLayoutDemo/CSAlwaysOnTopHeader.xib +++ b/Project/CSStickyHeaderFlowLayoutDemo/CSAlwaysOnTopHeader.xib @@ -1,7 +1,8 @@ - + - + + @@ -15,22 +16,18 @@ - - @@ -38,37 +35,30 @@ - - - - - @@ -101,7 +90,6 @@