Skip to content

M
Material
Commit 1c8824e5 by danieldahan
Options

MenuView position working

parent 63694ee6
Showing with 119 additions and 39 deletions
Examples/Programmatic/MenuView/MenuView/ViewController.swift
...@@ -87,12 +87,13 @@ class ViewController: UIViewController { ...@@ -87,12 +87,13 @@ class ViewController: UIViewController {
btn4.setImage(image, forState: .Highlighted) btn4.setImage(image, forState: .Highlighted)
menuView = MenuView(frame: view.bounds) menuView = MenuView(frame: view.bounds)
menuView.direction = .Right // menuView.menuPosition = .BottomLeft
// menuView.menuDirection = .Up
menuView.baseSize = CGSizeMake(36, 36) menuView.baseSize = CGSizeMake(36, 36)
menuView.itemSize = CGSizeMake(36, 36) menuView.itemSize = CGSizeMake(36, 36)
view.addSubview(menuView) view.addSubview(menuView)
menuView.items = [ menuView.menuItems = [
MenuViewItem(button: btn1), MenuViewItem(button: btn1),
MenuViewItem(button: btn2), MenuViewItem(button: btn2),
MenuViewItem(button: btn3), MenuViewItem(button: btn3),
......
Sources/MenuView.swift
...@@ -37,6 +37,13 @@ public enum MenuViewDirection { ...@@ -37,6 +37,13 @@ public enum MenuViewDirection {
case Right case Right
} }
public enum MenuViewPosition {
case TopLeft
case TopRight
case BottomLeft
case BottomRight
}
public struct MenuViewItem { public struct MenuViewItem {
/// UIButton. /// UIButton.
public var button: UIButton public var button: UIButton
...@@ -54,11 +61,18 @@ public class MenuView : MaterialView { ...@@ -54,11 +61,18 @@ public class MenuView : MaterialView {
/// A Boolean that indicates if the menu is open or not. /// A Boolean that indicates if the menu is open or not.
public private(set) var opened: Bool = false public private(set) var opened: Bool = false
/// The position of the menu.
public var menuPosition: MenuViewPosition = .BottomRight {
didSet {
reloadView()
}
}
/// The direction in which the animation opens the menu. /// The direction in which the animation opens the menu.
public var direction: MenuViewDirection = .Up public var menuDirection: MenuViewDirection = .Up
/// An Array of MenuViewItems. /// An Array of MenuViewItems.
public var items: Array<MenuViewItem>? { public var menuItems: Array<MenuViewItem>? {
didSet { didSet {
reloadView() reloadView()
} }
...@@ -74,36 +88,20 @@ public class MenuView : MaterialView { ...@@ -74,36 +88,20 @@ public class MenuView : MaterialView {
v.removeFromSuperview() v.removeFromSuperview()
} }
if let v: Array<MenuViewItem> = items { switch menuPosition {
for var i: Int = 0, l: Int = v.count; i < l; ++i { case .TopLeft:
let item: MenuViewItem = v[i] layoutTopLeft()
case .TopRight:
if 0 == i { layoutTopRight()
item.button.frame.size = baseSize case .BottomLeft:
// bottom right layoutBottomLeft()
// item.button.frame.origin.x = width - baseItemSize.width - 16 case .BottomRight:
// item.button.frame.origin.y = height - baseItemSize.height - 16 layoutBottomRight()
// top left
item.button.frame.origin.x = 16
item.button.frame.origin.y = 16
addSubview(item.button)
} else {
item.button.alpha = 0
item.button.frame.size = itemSize
// bottom right
// item.button.frame.origin.x = width - (baseItemSize.width + itemSize.width) / 2 - 16
// item.button.frame.origin.y = height - (baseItemSize.height + itemSize.height) / 2 - 16
// top left
item.button.frame.origin.x = (baseSize.width - itemSize.width) / 2 + 16
item.button.frame.origin.y = (baseSize.height - itemSize.height) / 2 + 16
insertSubview(item.button, belowSubview: v[i - 1].button)
}
}
} }
} }
public func open(completion: ((MenuViewItem) -> Void)? = nil) { public func open(completion: ((MenuViewItem) -> Void)? = nil) {
switch direction { switch menuDirection {
case .Up: case .Up:
openUpAnimation(completion) openUpAnimation(completion)
case .Down: case .Down:
...@@ -116,7 +114,7 @@ public class MenuView : MaterialView { ...@@ -116,7 +114,7 @@ public class MenuView : MaterialView {
} }
public func close(completion: ((MenuViewItem) -> Void)? = nil) { public func close(completion: ((MenuViewItem) -> Void)? = nil) {
switch direction { switch menuDirection {
case .Up: case .Up:
closeUpAnimation(completion) closeUpAnimation(completion)
case .Down: case .Down:
...@@ -129,7 +127,7 @@ public class MenuView : MaterialView { ...@@ -129,7 +127,7 @@ public class MenuView : MaterialView {
} }
private func openUpAnimation(completion: ((MenuViewItem) -> Void)? = nil) { private func openUpAnimation(completion: ((MenuViewItem) -> Void)? = nil) {
if let v: Array<MenuViewItem> = items { if let v: Array<MenuViewItem> = menuItems {
var base: MenuViewItem? var base: MenuViewItem?
for var i: Int = 1, l: Int = v.count; i < l; ++i { for var i: Int = 1, l: Int = v.count; i < l; ++i {
if nil == base { if nil == base {
...@@ -151,7 +149,7 @@ public class MenuView : MaterialView { ...@@ -151,7 +149,7 @@ public class MenuView : MaterialView {
} }
public func closeUpAnimation(completion: ((MenuViewItem) -> Void)? = nil) { public func closeUpAnimation(completion: ((MenuViewItem) -> Void)? = nil) {
if let v: Array<MenuViewItem> = items { if let v: Array<MenuViewItem> = menuItems {
for var i: Int = 1, l: Int = v.count; i < l; ++i { for var i: Int = 1, l: Int = v.count; i < l; ++i {
let item: MenuViewItem = v[i] let item: MenuViewItem = v[i]
UIView.animateWithDuration(0.15, UIView.animateWithDuration(0.15,
...@@ -169,7 +167,7 @@ public class MenuView : MaterialView { ...@@ -169,7 +167,7 @@ public class MenuView : MaterialView {
} }
private func openDownAnimation(completion: ((MenuViewItem) -> Void)? = nil) { private func openDownAnimation(completion: ((MenuViewItem) -> Void)? = nil) {
if let v: Array<MenuViewItem> = items { if let v: Array<MenuViewItem> = menuItems {
var base: MenuViewItem? var base: MenuViewItem?
for var i: Int = 1, l: Int = v.count; i < l; ++i { for var i: Int = 1, l: Int = v.count; i < l; ++i {
if nil == base { if nil == base {
...@@ -191,7 +189,7 @@ public class MenuView : MaterialView { ...@@ -191,7 +189,7 @@ public class MenuView : MaterialView {
} }
public func closeDownAnimation(completion: ((MenuViewItem) -> Void)? = nil) { public func closeDownAnimation(completion: ((MenuViewItem) -> Void)? = nil) {
if let v: Array<MenuViewItem> = items { if let v: Array<MenuViewItem> = menuItems {
for var i: Int = 1, l: Int = v.count; i < l; ++i { for var i: Int = 1, l: Int = v.count; i < l; ++i {
let item: MenuViewItem = v[i] let item: MenuViewItem = v[i]
UIView.animateWithDuration(0.15, UIView.animateWithDuration(0.15,
...@@ -209,7 +207,7 @@ public class MenuView : MaterialView { ...@@ -209,7 +207,7 @@ public class MenuView : MaterialView {
} }
private func openLeftAnimation(completion: ((MenuViewItem) -> Void)? = nil) { private func openLeftAnimation(completion: ((MenuViewItem) -> Void)? = nil) {
if let v: Array<MenuViewItem> = items { if let v: Array<MenuViewItem> = menuItems {
var base: MenuViewItem? var base: MenuViewItem?
for var i: Int = 1, l: Int = v.count; i < l; ++i { for var i: Int = 1, l: Int = v.count; i < l; ++i {
if nil == base { if nil == base {
...@@ -231,7 +229,7 @@ public class MenuView : MaterialView { ...@@ -231,7 +229,7 @@ public class MenuView : MaterialView {
} }
public func closeLeftAnimation(completion: ((MenuViewItem) -> Void)? = nil) { public func closeLeftAnimation(completion: ((MenuViewItem) -> Void)? = nil) {
if let v: Array<MenuViewItem> = items { if let v: Array<MenuViewItem> = menuItems {
for var i: Int = 1, l: Int = v.count; i < l; ++i { for var i: Int = 1, l: Int = v.count; i < l; ++i {
let item: MenuViewItem = v[i] let item: MenuViewItem = v[i]
UIView.animateWithDuration(0.15, UIView.animateWithDuration(0.15,
...@@ -249,7 +247,7 @@ public class MenuView : MaterialView { ...@@ -249,7 +247,7 @@ public class MenuView : MaterialView {
} }
private func openRightAnimation(completion: ((MenuViewItem) -> Void)? = nil) { private func openRightAnimation(completion: ((MenuViewItem) -> Void)? = nil) {
if let v: Array<MenuViewItem> = items { if let v: Array<MenuViewItem> = menuItems {
var base: MenuViewItem? var base: MenuViewItem?
for var i: Int = 1, l: Int = v.count; i < l; ++i { for var i: Int = 1, l: Int = v.count; i < l; ++i {
if nil == base { if nil == base {
...@@ -271,7 +269,7 @@ public class MenuView : MaterialView { ...@@ -271,7 +269,7 @@ public class MenuView : MaterialView {
} }
public func closeRightAnimation(completion: ((MenuViewItem) -> Void)? = nil) { public func closeRightAnimation(completion: ((MenuViewItem) -> Void)? = nil) {
if let v: Array<MenuViewItem> = items { if let v: Array<MenuViewItem> = menuItems {
for var i: Int = 1, l: Int = v.count; i < l; ++i { for var i: Int = 1, l: Int = v.count; i < l; ++i {
let item: MenuViewItem = v[i] let item: MenuViewItem = v[i]
UIView.animateWithDuration(0.15, UIView.animateWithDuration(0.15,
...@@ -287,4 +285,84 @@ public class MenuView : MaterialView { ...@@ -287,4 +285,84 @@ public class MenuView : MaterialView {
opened = false opened = false
} }
} }
private func layoutTopLeft() {
if let v: Array<MenuViewItem> = menuItems {
for var i: Int = 0, l: Int = v.count; i < l; ++i {
let item: MenuViewItem = v[i]
if 0 == i {
item.button.frame.size = baseSize
item.button.frame.origin.x = 16
item.button.frame.origin.y = 16
addSubview(item.button)
} else {
item.button.alpha = 0
item.button.frame.size = itemSize
item.button.frame.origin.x = (baseSize.width - itemSize.width) / 2 + 16
item.button.frame.origin.y = (baseSize.height - itemSize.height) / 2 + 16
insertSubview(item.button, belowSubview: v[i - 1].button)
}
}
}
}
private func layoutTopRight() {
if let v: Array<MenuViewItem> = menuItems {
for var i: Int = 0, l: Int = v.count; i < l; ++i {
let item: MenuViewItem = v[i]
if 0 == i {
item.button.frame.size = baseSize
item.button.frame.origin.x = width - baseSize.width - 16
item.button.frame.origin.y = 16
addSubview(item.button)
} else {
item.button.alpha = 0
item.button.frame.size = itemSize
item.button.frame.origin.x = width - (baseSize.width + itemSize.width) / 2 - 16
item.button.frame.origin.y = (baseSize.height - itemSize.height) / 2 + 16
insertSubview(item.button, belowSubview: v[i - 1].button)
}
}
}
}
private func layoutBottomLeft() {
if let v: Array<MenuViewItem> = menuItems {
for var i: Int = 0, l: Int = v.count; i < l; ++i {
let item: MenuViewItem = v[i]
if 0 == i {
item.button.frame.size = baseSize
item.button.frame.origin.x = 16
item.button.frame.origin.y = height - baseSize.height - 16
addSubview(item.button)
} else {
item.button.alpha = 0
item.button.frame.size = itemSize
item.button.frame.origin.x = (baseSize.width - itemSize.width) / 2 + 16
item.button.frame.origin.y = height - (baseSize.height + itemSize.height) / 2 - 16
insertSubview(item.button, belowSubview: v[i - 1].button)
}
}
}
}
private func layoutBottomRight() {
if let v: Array<MenuViewItem> = menuItems {
for var i: Int = 0, l: Int = v.count; i < l; ++i {
let item: MenuViewItem = v[i]
if 0 == i {
item.button.frame.size = baseSize
item.button.frame.origin.x = width - baseSize.width - 16
item.button.frame.origin.y = height - baseSize.height - 16
addSubview(item.button)
} else {
item.button.alpha = 0
item.button.frame.size = itemSize
item.button.frame.origin.x = width - (baseSize.width + itemSize.width) / 2 - 16
item.button.frame.origin.y = height - (baseSize.height + itemSize.height) / 2 - 16
insertSubview(item.button, belowSubview: v[i - 1].button)
}
}
}
}
} }
\ No newline at end of file
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