forked from richardtop/CalendarKit
-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
Intergation custom table view to vc #4
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c6442c0
Scroll to current time minus 4 hours
igover 91eca48
Scroll to current time minus 4 hours (implemented)
igover f710bbd
Change events gap (in case if second event starts in the end time of …
igover 1dcac2c
Added min date for Public API
igover 5af918a
Fix logic for min date
igover 4d4c923
Fix scroll to current time method
igover File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,23 +60,22 @@ public final class TimelineContainer: UIScrollView { | |
} | ||
|
||
public func scroollToCurrentTime(animated: Bool) { | ||
let allDayViewHeight = timeline.allDayViewHeight | ||
let padding = allDayViewHeight + 200 | ||
if let yToScroll = timeline.currentTimeYPosition { | ||
setTimelineOffset(CGPoint(x: contentOffset.x, y: yToScroll - padding), animated: animated) | ||
} | ||
let timeToScroll = Date().timeOnly() - 4 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Тут еще какие-то магические 4 единицы чего-то отнимаются... |
||
scrollTo(hour24: timeToScroll, animated: animated) | ||
} | ||
|
||
public func scrollTo(hour24: Float, animated: Bool = true) { | ||
let percentToScroll = CGFloat(hour24 / 24) | ||
let yToScroll = contentSize.height * percentToScroll | ||
let padding: CGFloat = 8 | ||
setTimelineOffset(CGPoint(x: contentOffset.x, y: yToScroll - padding), animated: animated) | ||
if let parent = parent?.parent as? CKPageViewController { | ||
parent.commonOffset?.y = yToScroll | ||
} | ||
setTimelineOffset(CGPoint(x: contentOffset.x, y: yToScroll), animated: animated) | ||
} | ||
|
||
private func setTimelineOffset(_ offset: CGPoint, animated: Bool) { | ||
let yToScroll = offset.y | ||
let bottomOfScrollView = contentSize.height - bounds.size.height | ||
let bottomOfScrollView = contentSize.height - bounds.size.height + 30 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Опять магическая цифра) |
||
let newContentY = (yToScroll < bottomOfScrollView) ? yToScroll : bottomOfScrollView | ||
setContentOffset(CGPoint(x: offset.x, y: newContentY), animated: animated) | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
честно сказать, так и не понял, что этот метод возвращает... Float... Time... В каких единицах измерения возвращается timeOnly?