git.iko.soy/melk
on master help sign in
Seem to have finalized Card design and animation
commit79558ba01295ac999ffed4f1352cb09f770c0f3c authorilyakooo0 <ilyakooo0@gmail.com> dateSat 22 Jul 2017, 22:04 (9 years ago) parentd4bc7b8
3 files changed+21−3
compare with master
unifiedsplit
Melk/CardContainer.swift+18 Melk/CardView.swift+1−1 Melk/SecondaryViewController.swift+2−2
Melk/CardContainer.swift+18
@@ -14,8 +14,14 @@ class CardContainer: UIView {
1414 blurView.effect = blur
1515 card.transform = smallTransform
1616 card.layer.opacity = 0
17+ shadowView.layer.opacity = 0
18+ shadowView.transform = smallTransform
19+ shadowView.layer.shadowRadius = 0
1720 UIView.animate(withDuration: 0.5, delay: 0, options: [.curveEaseInOut], animations: {
1821 self.card.transform = self.normalTransform
22+ self.shadowView.transform = self.normalTransform
23+ self.shadowView.layer.shadowRadius = self.shadowRadius
24+ self.shadowView.layer.opacity = 1
1925 self.blurView.effect = nil
2026 self.card.layer.opacity = 1
2127 }, completion: nil)
@@ -52,15 +58,25 @@ class CardContainer: UIView {
5258
5359 private let card: CardView
5460 private let blurView = UIVisualEffectView()
61+ private let shadowView = UIView()
5562 private let blur = UIBlurEffect(style: UIBlurEffectStyle.light)
5663 private let scale: CGFloat = 0.5
5764 private let smallTransform: CGAffineTransform
5865 private let normalTransform = CGAffineTransform(scaleX: 1, y: 1)
66+ private let shadowRadius: CGFloat = 12
67+ private let shadowOpacity: Float = 0.3
5968
6069 override init(frame: CGRect) {
6170 card = CardView(frame: frame)
6271 smallTransform = CGAffineTransform(scaleX: scale, y: scale)
6372 super.init(frame: frame)
73+ shadowView.layer.shadowColor = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 1).cgColor
74+ shadowView.layer.shadowRadius = shadowRadius
75+ shadowView.layer.shadowOpacity = shadowOpacity
76+ shadowView.backgroundColor = UIColor.clear
77+ shadowView.clipsToBounds = false
78+ shadowView.layer.shadowOffset = CGSize.zero
79+ addSubview(shadowView)
6480 addSubview(card)
6581 addSubview(blurView)
6682 }
@@ -73,6 +89,8 @@ class CardContainer: UIView {
7389 super.layoutSubviews()
7490 card.layoutIfNeeded()
7591 self.frame = card.frame
92+ shadowView.layer.shadowPath = CGPath(roundedRect: card.frame, cornerWidth: card.layer.cornerRadius, cornerHeight: card.layer.cornerRadius, transform: nil)
93+ shadowView.frame = card.frame
7694 blurView.frame = card.frame
7795 }
7896
Melk/CardView.swift+1−1
@@ -31,7 +31,7 @@ class CardView: UIView {
3131 super.init(frame: frame)
3232 layer.masksToBounds = true
3333 layer.cornerRadius = 20
34− backgroundColor = #colorLiteral(red: 0.8039215803, green: 0.8039215803, blue: 0.8039215803, alpha: 1)
34+ backgroundColor = #colorLiteral(red: 0.9638966278, green: 0.9734401588, blue: 0.9734401588, alpha: 1)
3535 }
3636
3737 required init?(coder aDecoder: NSCoder) {
Melk/SecondaryViewController.swift+2−2
@@ -29,7 +29,7 @@ class SecondaryViewController: UIViewController {
2929class SecondaryView: UIView {
3030
3131
32− private let spacer: CGFloat = 16
32+ private let spacer: CGFloat = 32
3333
3434 func add(result: StreamingServiceResult) {
3535 switch result {
@@ -49,6 +49,7 @@ class SecondaryView: UIView {
4949
5050 override init(frame: CGRect) {
5151 super.init(frame: frame)
52+ backgroundColor = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1)
5253 addSubview(cards)
5354 }
5455
@@ -77,7 +78,6 @@ class SecondaryView: UIView {
7778 break
7879 }
7980 }
80− print(cards.arrangedSubviews.count)
8181 }
8282
8383 private let padding = CGPoint(x: 32, y: 32)