Skip to content

Solve issue #120 #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dKasabwala wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Solve issue #120 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
681bf69
- updated swipe to support nested scrollview
Aug 4, 2014
cd4dae7
- updated pod
Aug 4, 2014
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
4 changes: 4 additions & 0 deletions Examples/Paging Example/SwipeViewExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
0148359513A36C3700E687AC /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0148358F13A36C3700E687AC /* MainWindow.xib */; };
0148359613A36C3700E687AC /* ExampleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0148359113A36C3700E687AC /* ExampleViewController.xib */; };
01715D4917FD6D980060B615 /* SwipeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 01715D4817FD6D980060B615 /* SwipeView.m */; };
9EBC5A741990262400EE552E /* SwipeView.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 9EBC5A731990262400EE552E /* SwipeView.podspec */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -39,6 +40,7 @@
01715D4A17FD6F070060B615 /* SwipeViewExample-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SwipeViewExample-Info.plist"; sourceTree = SOURCE_ROOT; };
01715D4B17FD6F070060B615 /* SwipeViewExample-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SwipeViewExample-Prefix.pch"; sourceTree = SOURCE_ROOT; };
018BBCB413A375AF005CA505 /* SwipeViewExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwipeViewExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
9EBC5A731990262400EE552E /* SwipeView.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SwipeView.podspec; path = ../SwipeView.podspec; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -115,6 +117,7 @@
01715D4617FD6D980060B615 /* SwipeView */ = {
isa = PBXGroup;
children = (
9EBC5A731990262400EE552E /* SwipeView.podspec */,
01715D4717FD6D980060B615 /* SwipeView.h */,
01715D4817FD6D980060B615 /* SwipeView.m */,
);
Expand Down Expand Up @@ -172,6 +175,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9EBC5A741990262400EE552E /* SwipeView.podspec in Resources */,
0148359513A36C3700E687AC /* MainWindow.xib in Resources */,
0148359613A36C3700E687AC /* ExampleViewController.xib in Resources */,
013F5C60168A59F500355CAD /* [email protected] in Resources */,
Expand Down
7 changes: 7 additions & 0 deletions ...es/Paging Example/SwipeViewExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

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

41 changes: 41 additions & 0 deletions ...e/SwipeViewExample.xcodeproj/project.xcworkspace/xcshareddata/SwipeViewExample.xccheckout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>8396646C-6E8D-456E-8B7B-A72B8808FED9</string>
<key>IDESourceControlProjectName</key>
<string>SwipeViewExample</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>30F3C808-E689-4069-87A5-1FB94C39E9E5</key>
<string>ssh://github.com/Dipak99041012/SwipeView.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>Examples/Paging Example/SwipeViewExample.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>30F3C808-E689-4069-87A5-1FB94C39E9E5</key>
<string>../../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>ssh://github.com/Dipak99041012/SwipeView.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>30F3C808-E689-4069-87A5-1FB94C39E9E5</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>30F3C808-E689-4069-87A5-1FB94C39E9E5</string>
<key>IDESourceControlWCCName</key>
<string>SwipeView</string>
</dict>
</array>
</dict>
</plist>
Binary file added ...xcodeproj/project.xcworkspace/xcuserdata/Dipak.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions ...wipeViewExample.xcodeproj/xcuserdata/Dipak.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?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>SuppressBuildableAutocreation</key>
<dict>
<key>01308D8D13491C3500453707</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
4 changes: 2 additions & 2 deletions SwipeView.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = "SwipeView"
s.version = "1.3.2"
s.version = "1.3.3"
s.summary = "Horizontal, paged scrolling views based on UIScrollView, with convenient functionality in UITableView-style."
s.description = "SwipeView is a class designed to simplify the implementation of horizontal, paged scrolling views on iOS. It is based on a UIScrollView, but adds convenient functionality such as a UITableView-style dataSource/delegate interface and efficient view loading, unloading and recycling."
s.homepage = "https://github.com/nicklockwood/SwipeView"
s.license = { :type => 'zlib', :file => 'LICENCE.md' }
s.author = { "Nick Lockwood" => "[email protected]" }
s.source = { :git => "https://github.com/nicklockwood/SwipeView.git", :tag => "1.3.2" }
s.source = { :git => "git@github.com:Dipak99041012/SwipeView.git", :tag => "1.3.3" }
s.source_files = 'SwipeView'
s.requires_arc = true
s.platform = :ios
Expand Down
2 changes: 1 addition & 1 deletion SwipeView/SwipeView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ - (void)setFrameForView:(UIView *)view atIndex:(NSInteger)index
view.center = CGPointMake(center.x, _scrollView.frame.size.height/2.0f);
}

view.bounds = CGRectMake(0.0f, 0.0f, _itemSize.width, _itemSize.height);
// view.bounds = CGRectMake(0.0f, 0.0f, _itemSize.width, _itemSize.height);

if (disableAnimation && animationEnabled) [UIView setAnimationsEnabled:YES];
}
Expand Down