Skip to content

M
Material
Commit 418f4090 by Daniel Dahan
Options

development: added PresenterCard sample project and reworked Cards

parent b701f1b7
Showing with 23 additions and 9 deletions
Examples/Programmatic/Card/Card/ViewController.swift
...@@ -41,9 +41,9 @@ class ViewController: UIViewController { ...@@ -41,9 +41,9 @@ class ViewController: UIViewController {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = Color.grey.lighten5 view.backgroundColor = Color.grey.lighten5
prepareFavoriteButton()
prepareToolbar() prepareToolbar()
prepareContentView() prepareContentView()
prepareFavoriteButton()
prepareBottomBar() prepareBottomBar()
prepareCard() prepareCard()
} }
...@@ -78,6 +78,7 @@ class ViewController: UIViewController { ...@@ -78,6 +78,7 @@ class ViewController: UIViewController {
card.toolbar = toolbar card.toolbar = toolbar
card.contentView = contentView card.contentView = contentView
card.bottomBar = bottomBar card.bottomBar = bottomBar
card.cornerRadiusPreset = .cornerRadius1
view.layout(card).top(100).left(20).right(20) view.layout(card).top(100).left(20).right(20)
} }
......
Examples/Programmatic/ImageCard/ImageCard/ViewController.swift
...@@ -42,11 +42,11 @@ class ViewController: UIViewController { ...@@ -42,11 +42,11 @@ class ViewController: UIViewController {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = Color.grey.lighten5 view.backgroundColor = Color.grey.lighten5
prepareFavoriteButton()
prepareBottomBar()
prepareImageView() prepareImageView()
prepareToolbar() prepareToolbar()
prepareContentView() prepareContentView()
prepareFavoriteButton()
prepareBottomBar()
prepareImageCard() prepareImageCard()
} }
...@@ -55,6 +55,7 @@ class ViewController: UIViewController { ...@@ -55,6 +55,7 @@ class ViewController: UIViewController {
imageView.image = UIImage(named: "frontier.jpg")?.resize(toWidth: view.width) imageView.image = UIImage(named: "frontier.jpg")?.resize(toWidth: view.width)
imageView.clipsToBounds = true imageView.clipsToBounds = true
imageView.contentMode = .scaleAspectFill imageView.contentMode = .scaleAspectFill
imageView.cornerRadiusPreset = .cornerRadius1
} }
private func prepareToolbar() { private func prepareToolbar() {
...@@ -98,6 +99,7 @@ class ViewController: UIViewController { ...@@ -98,6 +99,7 @@ class ViewController: UIViewController {
card.contentView = contentView card.contentView = contentView
card.bottomBar = bottomBar card.bottomBar = bottomBar
card.contentEdgeInsetsPreset = .square3 card.contentEdgeInsetsPreset = .square3
card.cornerRadiusPreset = .cornerRadius1
imageView?.layout(toolbar!).height(toolbar!.height + 32) imageView?.layout(toolbar!).height(toolbar!.height + 32)
view.layout(card).top(100).left(20).right(20) view.layout(card).top(100).left(20).right(20)
......
Examples/Programmatic/PresenterCard/PresenterCard/ViewController.swift
...@@ -45,11 +45,11 @@ class ViewController: UIViewController { ...@@ -45,11 +45,11 @@ class ViewController: UIViewController {
view.backgroundColor = Color.grey.lighten5 view.backgroundColor = Color.grey.lighten5
prepareImageView() prepareImageView()
prepareToolbar()
prepareContentView()
prepareFavoriteButton() prepareFavoriteButton()
prepareShareButton() prepareShareButton()
prepareStarButton() prepareStarButton()
prepareToolbar()
prepareContentView()
prepareBottomBar() prepareBottomBar()
prepareImageCard() prepareImageCard()
} }
...@@ -59,6 +59,7 @@ class ViewController: UIViewController { ...@@ -59,6 +59,7 @@ class ViewController: UIViewController {
imageView.image = UIImage(named: "frontier.jpg")?.resize(toWidth: view.width) imageView.image = UIImage(named: "frontier.jpg")?.resize(toWidth: view.width)
imageView.clipsToBounds = true imageView.clipsToBounds = true
imageView.contentMode = .scaleAspectFill imageView.contentMode = .scaleAspectFill
imageView.cornerRadiusPreset = .cornerRadius1
} }
private func prepareToolbar() { private func prepareToolbar() {
...@@ -74,6 +75,13 @@ class ViewController: UIViewController { ...@@ -74,6 +75,13 @@ class ViewController: UIViewController {
toolbar.contentEdgeInsetsPreset = .square3 toolbar.contentEdgeInsetsPreset = .square3
toolbar.backgroundColor = nil toolbar.backgroundColor = nil
toolbar.rightViews.append(starButton)
}
@objc
internal func handleButton(button: UIButton) {
print("hello")
} }
private func prepareContentView() { private func prepareContentView() {
...@@ -97,15 +105,16 @@ class ViewController: UIViewController { ...@@ -97,15 +105,16 @@ class ViewController: UIViewController {
private func prepareStarButton() { private func prepareStarButton() {
starButton = FlatButton(image: Icon.cm.star, tintColor: Color.grey.base) starButton = FlatButton(image: Icon.cm.star, tintColor: Color.grey.base)
starButton.pulse.color = Color.grey.base starButton.pulse.color = Color.green.base
starButton.grid.columns = 4 starButton.addTarget(self, action: #selector(handleButton(button:)), for: .touchUpInside)
// starButton.grid.columns = 4
} }
private func prepareBottomBar() { private func prepareBottomBar() {
bottomBar = Bar() bottomBar = Bar()
bottomBar.backgroundColor = nil bottomBar.backgroundColor = nil
bottomBar.contentEdgeInsetsPreset = .square1 bottomBar.contentEdgeInsetsPreset = .square1
bottomBar.contentView.grid.views = [favoriteButton, shareButton, starButton] bottomBar.contentView.grid.views = [favoriteButton, shareButton]
} }
private func prepareImageCard() { private func prepareImageCard() {
...@@ -115,6 +124,7 @@ class ViewController: UIViewController { ...@@ -115,6 +124,7 @@ class ViewController: UIViewController {
card.contentView = contentView card.contentView = contentView
card.bottomBar = bottomBar card.bottomBar = bottomBar
card.contentEdgeInsetsPreset = .square3 card.contentEdgeInsetsPreset = .square3
card.cornerRadiusPreset = .cornerRadius1
imageView?.layout(toolbar!).height(toolbar!.height + 32) imageView?.layout(toolbar!).height(toolbar!.height + 32)
view.layout(card).top(100).left(20).right(20) view.layout(card).top(100).left(20).right(20)
......
Sources/iOS/Card.swift
...@@ -174,7 +174,7 @@ open class Card: PulseView { ...@@ -174,7 +174,7 @@ open class Card: PulseView {
open override func prepare() { open override func prepare() {
super.prepare() super.prepare()
depthPreset = .depth1 depthPreset = .depth1
cornerRadiusPreset = .cornerRadius1 pulse.animation = .none
} }
/** /**
......
Sources/iOS/PresenterCard.swift
...@@ -97,6 +97,7 @@ open class PresenterCard: Card { ...@@ -97,6 +97,7 @@ open class PresenterCard: Card {
addConstraints(Layout.constraint(format: "\(format)|", options: [], metrics: metrics, views: views)) addConstraints(Layout.constraint(format: "\(format)|", options: [], metrics: metrics, views: views))
presenterView?.zPosition = 0 presenterView?.zPosition = 0
toolbar?.zPosition = 1000
visualLayer.zPosition = 1 visualLayer.zPosition = 1
contentView?.zPosition = 2 contentView?.zPosition = 2
bottomBar?.zPosition = 2 bottomBar?.zPosition = 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment