home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-10 21:36:49 +10:00
Code Issues Packages Projects Releases Wiki Activity

new logic for menuDirectionUpThreshold

Browse Source
This commit is contained in:
nixzhu
2015-07-27 15:56:37 +08:00
parent 64c4a8ccd2
commit cbc3db4153
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Configs/YepConfig.swift
-4
View File
@@ -81,10 +81,6 @@ class YepConfig {
return 100
}
struct Conversation {
static let menuDirectionUpThreshold: CGFloat = 64 + 60
}
struct AudioRecord {
static let shortestDuration: NSTimeInterval = 0.5
static let longestDuration: NSTimeInterval = 60
Yep/ViewControllers/Conversation/ConversationViewController.swift
+5 -2
View File
@@ -83,6 +83,9 @@ class ConversationViewController: BaseViewController {
@IBOutlet weak var swipeUpView: UIView!
lazy var menuDirectionUpThreshold: CGFloat = {
return self.topBarsHeight + 60
}()
var currentMenu: BubbleMenuView?
func removeOldMenu() {
@@ -1766,7 +1769,7 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi
let bubbleFrame = cell.convertRect(cell.bubbleBodyImageView.frame, toView: strongSelf.view)
let arrowDirection: BubbleMenuView.ArrowDirection = CGRectGetMidY(bubbleFrame) < YepConfig.Conversation.menuDirectionUpThreshold ? .Up : .Down
let arrowDirection: BubbleMenuView.ArrowDirection = CGRectGetMidY(bubbleFrame) < strongSelf.menuDirectionUpThreshold ? .Up : .Down
let menu = BubbleMenuView(arrowDirection: arrowDirection, items: [copyItem])
@@ -2044,7 +2047,7 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi
let bubbleFrame = cell.convertRect(cell.bubbleBodyImageView.frame, toView: strongSelf.view)
let arrowDirection: BubbleMenuView.ArrowDirection = CGRectGetMidY(bubbleFrame) < YepConfig.Conversation.menuDirectionUpThreshold ? .Up : .Down
let arrowDirection: BubbleMenuView.ArrowDirection = CGRectGetMidY(bubbleFrame) < strongSelf.menuDirectionUpThreshold ? .Up : .Down
let menu = BubbleMenuView(arrowDirection: arrowDirection, items: [copyItem, deleteItem])
Yep/ViewControllers/Profile/ProfileLayout.swift
+2
View File
@@ -12,10 +12,12 @@ class ProfileLayout: UICollectionViewFlowLayout {
var scrollUpAction: ((progress: CGFloat) -> Void)?
let topBarsHeight: CGFloat = 64
let leftEdgeInset: CGFloat = YepConfig.Profile.leftEdgeInset
override func layoutAttributesForElementsInRect(rect: CGRect) -> [AnyObject]? {
let layoutAttributes = super.layoutAttributesForElementsInRect(rect) as! [UICollectionViewLayoutAttributes]
let contentInset = collectionView!.contentInset
let contentOffset = collectionView!.contentOffset
Yep/ViewControllers/Profile/ProfileViewController.swift
+1 -1
View File
@@ -316,7 +316,7 @@ class ProfileViewController: UIViewController {
if let coverCell = self.profileCollectionView.cellForItemAtIndexPath(indexPath) as? ProfileHeaderCell {
let beginChangePercentage: CGFloat = 1 - topBarsHeight / self.collectionViewWidth * profileAvatarAspectRatio
let beginChangePercentage: CGFloat = 1 - self.topBarsHeight / self.collectionViewWidth * profileAvatarAspectRatio
let normalizedProgressForChange: CGFloat = (progress - beginChangePercentage) / (1 - beginChangePercentage)
coverCell.avatarBlurImageView.alpha = progress < beginChangePercentage ? 0 : normalizedProgressForChange