Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6691322781 | |||
| 8bdbc44f39 | |||
| 5ae5c97f00 | |||
| 1108944654 | |||
| 365840db98 |
@@ -1,6 +1,6 @@
|
||||
# ScrollingContentViewController
|
||||
|
||||
[](https://travis-ci.com/drewolbrich/ScrollingContentViewController)
|
||||
[](https://app.travis-ci.com/github/drewolbrich/ScrollingContentViewController)
|
||||
[](http://developer.apple.com/ios)
|
||||
[](https://developer.apple.com/swift)
|
||||
[](LICENSE)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'ScrollingContentViewController'
|
||||
s.version = '1.6.2'
|
||||
s.version = '1.6.3'
|
||||
s.summary = 'A Swift library that simplifies making a view controller\'s view scrollable'
|
||||
|
||||
s.description = <<-DESC
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 50;
|
||||
objectVersion = 54;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
@@ -831,6 +831,7 @@
|
||||
/* Begin PBXShellScriptBuildPhase section */
|
||||
3ACE0D7A220B2D790093FE5A /* Run SwiftLint */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
alwaysOutOfDate = 1;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
@@ -845,7 +846,7 @@
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
|
||||
shellScript = "# If we don't do this, then SwiftLint won't be found on M1 macs,\n# because it's installed in /opt/homebrew/bin instead of /usr/local/bin\n# on that platform \nif test -d \"/opt/homebrew/bin/\"; then\n PATH=\"/opt/homebrew/bin/:${PATH}\"\nfi\nexport PATH\n\nif which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.6.1</string>
|
||||
<string>1.6.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>$(CURRENT_PROJECT_VERSION)</string>
|
||||
</dict>
|
||||
|
||||
@@ -111,7 +111,7 @@ public class ScrollingContentScrollView: UIScrollView {
|
||||
/// - view: The view to make visible.
|
||||
/// - animated: If `true`, the scrolling is animated.
|
||||
/// - margin: An optional margin to apply to the view. If left unspecified,
|
||||
/// `scrollToVisibleMargin` is used.
|
||||
/// `visibilityScrollMargin` is used.
|
||||
public func scrollViewToVisible(_ view: UIView, animated: Bool, margin: CGFloat? = nil) {
|
||||
scrollViewFilter?.submitScrollRectEvent(ScrollRectEvent(contentArea: .descendantViewRect(view.bounds, descendantView: view), animated: animated, margin: margin ?? visibilityScrollMargin))
|
||||
|
||||
@@ -124,7 +124,7 @@ public class ScrollingContentScrollView: UIScrollView {
|
||||
/// - Parameters:
|
||||
/// - animated: If `true`, the scrolling is animated.
|
||||
/// - margin: An optional margin to apply to the first responder. If left
|
||||
/// unspecified, `scrollToVisibleMargin` is used.
|
||||
/// unspecified, `visibilityScrollMargin` is used.
|
||||
public func scrollFirstResponderToVisible(animated: Bool, margin: CGFloat? = nil) {
|
||||
guard let view = self.firstResponder as? UIView else {
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user