Commit ccd12f9a by Daniel Dahan

updated Grid example project

parent 8a9fb4f5
...@@ -40,11 +40,11 @@ class ViewController: UIViewController { ...@@ -40,11 +40,11 @@ class ViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
prepareView() prepareView()
// prepareHorizontalGridViewExample() prepareHorizontalGridViewExample()
// prepareVerticalGridViewExample() // prepareVerticalGridViewExample()
// prepareSmallCardViewExample() // prepareSmallCardViewExample()
// prepareMediumCardViewExample() // prepareMediumCardViewExample()
prepareLargeCardViewExample() // prepareLargeCardViewExample()
} }
...@@ -77,7 +77,7 @@ class ViewController: UIViewController { ...@@ -77,7 +77,7 @@ class ViewController: UIViewController {
image = UIImage(named: "ic_flash_on_white")?.imageWithRenderingMode(.AlwaysTemplate) image = UIImage(named: "ic_flash_on_white")?.imageWithRenderingMode(.AlwaysTemplate)
let btn3: FlatButton = FlatButton() let btn3: FlatButton = FlatButton()
btn3.grid.columns = 4 btn3.grid.columns = 3
btn3.pulseColor = MaterialColor.blueGrey.darken4 btn3.pulseColor = MaterialColor.blueGrey.darken4
btn3.tintColor = MaterialColor.blueGrey.darken4 btn3.tintColor = MaterialColor.blueGrey.darken4
btn3.backgroundColor = MaterialColor.grey.lighten3 btn3.backgroundColor = MaterialColor.grey.lighten3
...@@ -85,7 +85,7 @@ class ViewController: UIViewController { ...@@ -85,7 +85,7 @@ class ViewController: UIViewController {
btn3.setImage(image, forState: .Highlighted) btn3.setImage(image, forState: .Highlighted)
view.addSubview(btn3) view.addSubview(btn3)
// view.grid.columns = 9 view.grid.columns = 9
view.grid.spacing = 16 view.grid.spacing = 16
view.grid.contentInset.left = 16 view.grid.contentInset.left = 16
view.grid.contentInset.right = 16 view.grid.contentInset.right = 16
......
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '1.31.3' s.version = '1.31.4'
s.license = 'BSD' s.license = 'BSD'
s.summary = 'Material is a graphics and animation framework. It may be used for Google\'s Material Design and Apple\'s Flat UI.' s.summary = 'Material is an animation and graphics framework. It may be used for Google\'s Material Design and Apple\'s Flat UI.'
s.homepage = 'http://cosmicmind.io' s.homepage = 'http://cosmicmind.io'
s.social_media_url = 'https://www.facebook.com/graphkit' s.social_media_url = 'https://www.facebook.com/graphkit'
s.authors = { 'CosmicMind, Inc.' => 'support@cosmicmind.io' } s.authors = { 'CosmicMind, Inc.' => 'support@cosmicmind.io' }
......
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
# Welcome to Material # Welcome to Material
Material is a graphics and animation framework. It may be used for Google's Material Design and Apple's Flat UI. It is designed to allow the creativity of others to easily be expressed. Material is an animation and graphics framework. It may be used for Google's Material Design and Apple's Flat UI. Material allows the creativity of others to easily be expressed.
## Features ## Features
- [x] Fully Configurable UI Components - [x] Fully Configurable UI Components
- [x] Grid System For Complex UIs - [x] Grid System For Complex UIs
- [x] Layout Library To Simplify AutoLayout
- [x] Base Material Layers & Material Views To Create New UI Components - [x] Base Material Layers & Material Views To Create New UI Components
- [x] Side Navigation View Controller - [x] Side Navigation View Controller
- [x] Navigation Bar View - [x] Navigation Bar View
- [x] Material Buttons - [x] Material Buttons
- [x] Material Card Views - [x] Material Card Views
- [x] Camera / Video Extension With Extensive Functionality - [x] Camera / Video Extension With Extensive Functionality
- [x] Layout Library To Simplify AutoLayout
- [x] Animation Extension To Create Intricate Animations - [x] Animation Extension To Create Intricate Animations
- [x] Complete Material Color Library - [x] Complete Material Color Library
- [x] Example Projects - [x] Example Projects
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.31.3</string> <string>1.31.4</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
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