Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj
6 changes: 6 additions & 0 deletions VerticalSwipeArticles/Classes/VerticalSwipeScrollView.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 7 additions & 5 deletions VerticalSwipeArticles/Classes/VerticalSwipeScrollView.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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
Expand Down Expand Up @@ -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;

Expand Down
Binary file added VerticalSwipeArticles/Default-568h@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
327 changes: 0 additions & 327 deletions VerticalSwipeArticles/VerticalSwipeArticles.xcodeproj/project.pbxproj

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
<true/>
<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
BuildableName = "VerticalSwipeArticles.app"
BlueprintName = "VerticalSwipeArticles"
ReferencedContainer = "container:VerticalSwipeArticles.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
BuildableName = "VerticalSwipeArticles.app"
BlueprintName = "VerticalSwipeArticles"
ReferencedContainer = "container:VerticalSwipeArticles.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
BuildableName = "VerticalSwipeArticles.app"
BlueprintName = "VerticalSwipeArticles"
ReferencedContainer = "container:VerticalSwipeArticles.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
BuildableName = "VerticalSwipeArticles.app"
BlueprintName = "VerticalSwipeArticles"
ReferencedContainer = "container:VerticalSwipeArticles.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>VerticalSwipeArticles.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>1D6058900D05DD3D006BFB54</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>