Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Material
Commits
f7cb0246
Commit
f7cb0246
authored
Apr 21, 2018
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development' of github.com:cosmicmind/Material into development
parents
06d223da
794e9558
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
Sources/iOS/Color.swift
+14
-0
Sources/iOS/FABMenu.swift
+1
-1
Sources/iOS/FABMenuController.swift
+1
-1
No files found.
Sources/iOS/Color.swift
View file @
f7cb0246
...
@@ -32,26 +32,40 @@ import UIKit
...
@@ -32,26 +32,40 @@ import UIKit
@objc(ColorPalette)
@objc(ColorPalette)
public
protocol
ColorPalette
{
public
protocol
ColorPalette
{
/// Material color code: 50
static
var
lighten5
:
UIColor
{
get
}
static
var
lighten5
:
UIColor
{
get
}
/// Material color code: 100
static
var
lighten4
:
UIColor
{
get
}
static
var
lighten4
:
UIColor
{
get
}
/// Material color code: 200
static
var
lighten3
:
UIColor
{
get
}
static
var
lighten3
:
UIColor
{
get
}
/// Material color code: 300
static
var
lighten2
:
UIColor
{
get
}
static
var
lighten2
:
UIColor
{
get
}
/// Material color code: 400
static
var
lighten1
:
UIColor
{
get
}
static
var
lighten1
:
UIColor
{
get
}
/// Material color code: 500
static
var
base
:
UIColor
{
get
}
static
var
base
:
UIColor
{
get
}
/// Material color code: 600
static
var
darken1
:
UIColor
{
get
}
static
var
darken1
:
UIColor
{
get
}
/// Material color code: 700
static
var
darken2
:
UIColor
{
get
}
static
var
darken2
:
UIColor
{
get
}
/// Material color code: 800
static
var
darken3
:
UIColor
{
get
}
static
var
darken3
:
UIColor
{
get
}
/// Material color code: 900
static
var
darken4
:
UIColor
{
get
}
static
var
darken4
:
UIColor
{
get
}
/// Material color code: A100
@objc
@objc
optional
static
var
accent1
:
UIColor
{
get
}
optional
static
var
accent1
:
UIColor
{
get
}
/// Material color code: A200
@objc
@objc
optional
static
var
accent2
:
UIColor
{
get
}
optional
static
var
accent2
:
UIColor
{
get
}
/// Material color code: A400
@objc
@objc
optional
static
var
accent3
:
UIColor
{
get
}
optional
static
var
accent3
:
UIColor
{
get
}
/// Material color code: A700
@objc
@objc
optional
static
var
accent4
:
UIColor
{
get
}
optional
static
var
accent4
:
UIColor
{
get
}
}
}
...
...
Sources/iOS/FABMenu.swift
View file @
f7cb0246
...
@@ -186,7 +186,7 @@ open class FABMenu: View {
...
@@ -186,7 +186,7 @@ open class FABMenu: View {
/// A reference to the SpringAnimation object.
/// A reference to the SpringAnimation object.
internal
let
spring
=
SpringAnimation
()
let
spring
=
SpringAnimation
()
open
var
fabMenuDirection
:
FABMenuDirection
{
open
var
fabMenuDirection
:
FABMenuDirection
{
get
{
get
{
...
...
Sources/iOS/FABMenuController.swift
View file @
f7cb0246
...
@@ -50,7 +50,7 @@ extension UIViewController {
...
@@ -50,7 +50,7 @@ extension UIViewController {
open
class
FABMenuController
:
TransitionController
{
open
class
FABMenuController
:
TransitionController
{
/// Reference to the MenuView.
/// Reference to the MenuView.
@IBInspectable
@IBInspectable
open
let
fabMenu
=
FABMenu
()
open
var
fabMenu
=
FABMenu
()
/// A FABMenuBacking value type.
/// A FABMenuBacking value type.
open
var
fabMenuBacking
=
FABMenuBacking
.
blur
open
var
fabMenuBacking
=
FABMenuBacking
.
blur
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment