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
cb12b1bf
Commit
cb12b1bf
authored
Jun 01, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #418 from mohpor/development
Reverted commit related to 417
parents
4500782a
2cda2fe3
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
60 additions
and
66 deletions
+60
-66
Examples/Programmatic/App/App.xcodeproj/project.pbxproj
+0
-6
Sources/iOS/BarController.swift
+1
-1
Sources/iOS/CaptureSession.swift
+2
-2
Sources/iOS/CaptureView.swift
+5
-5
Sources/iOS/ControlView.swift
+1
-1
Sources/iOS/Grid.swift
+3
-3
Sources/iOS/ImageCardView.swift
+1
-1
Sources/iOS/MaterialButton.swift
+2
-2
Sources/iOS/MaterialCollectionReusableView.swift
+2
-2
Sources/iOS/MaterialCollectionViewCell.swift
+2
-2
Sources/iOS/MaterialCollectionViewLayout.swift
+3
-3
Sources/iOS/MaterialLayer.swift
+1
-1
Sources/iOS/MaterialPulseView.swift
+1
-1
Sources/iOS/MaterialSwitch.swift
+2
-2
Sources/iOS/MaterialTableViewCell.swift
+2
-2
Sources/iOS/MaterialView.swift
+1
-1
Sources/iOS/Menu.swift
+1
-1
Sources/iOS/MenuController.swift
+2
-2
Sources/iOS/MenuView.swift
+1
-1
Sources/iOS/NavigationItem.swift
+2
-2
Sources/iOS/SearchBar.swift
+2
-2
Sources/iOS/SearchBarController.swift
+1
-1
Sources/iOS/SideNavigationController.swift
+11
-11
Sources/iOS/TabBar.swift
+1
-1
Sources/iOS/Text.swift
+1
-1
Sources/iOS/TextField.swift
+6
-6
Sources/iOS/Toolbar.swift
+2
-2
Sources/iOS/ToolbarController.swift
+1
-1
No files found.
Examples/Programmatic/App/App.xcodeproj/project.pbxproj
View file @
cb12b1bf
...
@@ -283,13 +283,10 @@
...
@@ -283,13 +283,10 @@
isa
=
XCBuildConfiguration
;
isa
=
XCBuildConfiguration
;
buildSettings
=
{
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CODE_SIGN_IDENTITY
=
"iPhone Developer"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
INFOPLIST_FILE
=
App/Info.plist
;
INFOPLIST_FILE
=
App/Info.plist
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
io.cosmicmind.App
;
PRODUCT_BUNDLE_IDENTIFIER
=
io.cosmicmind.App
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
""
;
};
};
name
=
Debug
;
name
=
Debug
;
};
};
...
@@ -297,13 +294,10 @@
...
@@ -297,13 +294,10 @@
isa
=
XCBuildConfiguration
;
isa
=
XCBuildConfiguration
;
buildSettings
=
{
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CODE_SIGN_IDENTITY
=
"iPhone Developer"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
INFOPLIST_FILE
=
App/Info.plist
;
INFOPLIST_FILE
=
App/Info.plist
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
io.cosmicmind.App
;
PRODUCT_BUNDLE_IDENTIFIER
=
io.cosmicmind.App
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
""
;
};
};
name
=
Release
;
name
=
Release
;
};
};
...
...
Sources/iOS/BarController.swift
View file @
cb12b1bf
...
@@ -61,7 +61,7 @@ public class BarController : UIViewController {
...
@@ -61,7 +61,7 @@ public class BarController : UIViewController {
is recommended to use the transitionFromRootViewController
is recommended to use the transitionFromRootViewController
helper method.
helper method.
*/
*/
public
internal
(set)
var
rootViewController
:
UIViewController
!
public
private
(set)
var
rootViewController
:
UIViewController
!
/**
/**
An initializer that initializes the object with a NSCoder object.
An initializer that initializes the object with a NSCoder object.
...
...
Sources/iOS/CaptureSession.swift
View file @
cb12b1bf
...
@@ -172,12 +172,12 @@ public class CaptureSession : NSObject, AVCaptureFileOutputRecordingDelegate {
...
@@ -172,12 +172,12 @@ public class CaptureSession : NSObject, AVCaptureFileOutputRecordingDelegate {
/**
/**
:name: isRunning
:name: isRunning
*/
*/
public
internal
(set)
lazy
var
isRunning
:
Bool
=
false
public
private
(set)
lazy
var
isRunning
:
Bool
=
false
/**
/**
:name: isRecording
:name: isRecording
*/
*/
public
internal
(set)
lazy
var
isRecording
:
Bool
=
false
public
private
(set)
lazy
var
isRecording
:
Bool
=
false
/**
/**
:name: recordedDuration
:name: recordedDuration
...
...
Sources/iOS/CaptureView.swift
View file @
cb12b1bf
...
@@ -203,27 +203,27 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
...
@@ -203,27 +203,27 @@ public class CaptureView : MaterialView, UIGestureRecognizerDelegate {
/**
/**
:name: previewView
:name: previewView
*/
*/
public
internal
(set)
lazy
var
previewView
:
CapturePreview
=
CapturePreview
()
public
private
(set)
lazy
var
previewView
:
CapturePreview
=
CapturePreview
()
/**
/**
:name: capture
:name: capture
*/
*/
public
internal
(set)
lazy
var
captureSession
:
CaptureSession
=
CaptureSession
()
public
private
(set)
lazy
var
captureSession
:
CaptureSession
=
CaptureSession
()
/**
/**
:name: focusLayer
:name: focusLayer
*/
*/
public
internal
(set)
var
focusLayer
:
MaterialLayer
?
public
private
(set)
var
focusLayer
:
MaterialLayer
?
/**
/**
:name: exposureLayer
:name: exposureLayer
*/
*/
public
internal
(set)
var
exposureLayer
:
MaterialLayer
?
public
private
(set)
var
exposureLayer
:
MaterialLayer
?
/**
/**
:name: resetLayer
:name: resetLayer
*/
*/
public
internal
(set)
var
resetLayer
:
MaterialLayer
?
public
private
(set)
var
resetLayer
:
MaterialLayer
?
/**
/**
:name: cameraButton
:name: cameraButton
...
...
Sources/iOS/ControlView.swift
View file @
cb12b1bf
...
@@ -82,7 +82,7 @@ public class ControlView : MaterialView {
...
@@ -82,7 +82,7 @@ public class ControlView : MaterialView {
}
}
/// ContentView that holds the any desired subviews.
/// ContentView that holds the any desired subviews.
public
internal
(set)
var
contentView
:
MaterialView
!
public
private
(set)
var
contentView
:
MaterialView
!
/// Left side UIControls.
/// Left side UIControls.
public
var
leftControls
:
Array
<
UIControl
>
?
{
public
var
leftControls
:
Array
<
UIControl
>
?
{
...
...
Sources/iOS/Grid.swift
View file @
cb12b1bf
...
@@ -120,10 +120,10 @@ public class Grid {
...
@@ -120,10 +120,10 @@ public class Grid {
}
}
/// Offsets for rows and columns.
/// Offsets for rows and columns.
public
internal
(set)
var
offset
:
GridOffset
!
public
private
(set)
var
offset
:
GridOffset
!
/// The axis in which the Grid is laying out its views.
/// The axis in which the Grid is laying out its views.
public
internal
(set)
var
axis
:
GridAxis
!
public
private
(set)
var
axis
:
GridAxis
!
/// Preset inset value for grid.
/// Preset inset value for grid.
public
var
layoutInsetPreset
:
MaterialEdgeInset
=
.
None
{
public
var
layoutInsetPreset
:
MaterialEdgeInset
=
.
None
{
...
@@ -242,7 +242,7 @@ private var GridKey: UInt8 = 0
...
@@ -242,7 +242,7 @@ private var GridKey: UInt8 = 0
/// Grid extension for UIView.
/// Grid extension for UIView.
public
extension
UIView
{
public
extension
UIView
{
/// Grid reference.
/// Grid reference.
public
internal
(set)
var
grid
:
Grid
{
public
private
(set)
var
grid
:
Grid
{
get
{
get
{
return
MaterialAssociatedObject
(
self
,
key
:
&
GridKey
)
{
return
MaterialAssociatedObject
(
self
,
key
:
&
GridKey
)
{
return
Grid
()
return
Grid
()
...
...
Sources/iOS/ImageCardView.swift
View file @
cb12b1bf
...
@@ -75,7 +75,7 @@ public class ImageCardView : MaterialPulseView {
...
@@ -75,7 +75,7 @@ public class ImageCardView : MaterialPulseView {
/**
/**
:name: imageLayer
:name: imageLayer
*/
*/
public
internal
(set)
var
imageLayer
:
CAShapeLayer
?
public
private
(set)
var
imageLayer
:
CAShapeLayer
?
/**
/**
:name: image
:name: image
...
...
Sources/iOS/MaterialButton.swift
View file @
cb12b1bf
...
@@ -39,7 +39,7 @@ public class MaterialButton : UIButton {
...
@@ -39,7 +39,7 @@ public class MaterialButton : UIButton {
allows the dropshadow effect on the backing layer, while clipping
allows the dropshadow effect on the backing layer, while clipping
the image to a desired shape within the visualLayer.
the image to a desired shape within the visualLayer.
*/
*/
public
internal
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
public
private
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
/**
/**
A base delegate reference used when subclassing MaterialView.
A base delegate reference used when subclassing MaterialView.
...
@@ -47,7 +47,7 @@ public class MaterialButton : UIButton {
...
@@ -47,7 +47,7 @@ public class MaterialButton : UIButton {
public
weak
var
delegate
:
MaterialDelegate
?
public
weak
var
delegate
:
MaterialDelegate
?
/// An Array of pulse layers.
/// An Array of pulse layers.
public
internal
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
public
private
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
/// The opacity value for the pulse animation.
/// The opacity value for the pulse animation.
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
...
...
Sources/iOS/MaterialCollectionReusableView.swift
View file @
cb12b1bf
...
@@ -39,7 +39,7 @@ public class MaterialCollectionReusableView : UICollectionReusableView {
...
@@ -39,7 +39,7 @@ public class MaterialCollectionReusableView : UICollectionReusableView {
allows the dropshadow effect on the backing layer, while clipping
allows the dropshadow effect on the backing layer, while clipping
the image to a desired shape within the visualLayer.
the image to a desired shape within the visualLayer.
*/
*/
public
internal
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
public
private
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
/**
/**
A base delegate reference used when subclassing MaterialView.
A base delegate reference used when subclassing MaterialView.
...
@@ -47,7 +47,7 @@ public class MaterialCollectionReusableView : UICollectionReusableView {
...
@@ -47,7 +47,7 @@ public class MaterialCollectionReusableView : UICollectionReusableView {
public
weak
var
delegate
:
MaterialDelegate
?
public
weak
var
delegate
:
MaterialDelegate
?
/// An Array of pulse layers.
/// An Array of pulse layers.
public
internal
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
public
private
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
/// The opcaity value for the pulse animation.
/// The opcaity value for the pulse animation.
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
...
...
Sources/iOS/MaterialCollectionViewCell.swift
View file @
cb12b1bf
...
@@ -39,7 +39,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
...
@@ -39,7 +39,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
allows the dropshadow effect on the backing layer, while clipping
allows the dropshadow effect on the backing layer, while clipping
the image to a desired shape within the visualLayer.
the image to a desired shape within the visualLayer.
*/
*/
public
internal
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
public
private
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
/**
/**
A base delegate reference used when subclassing MaterialView.
A base delegate reference used when subclassing MaterialView.
...
@@ -47,7 +47,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
...
@@ -47,7 +47,7 @@ public class MaterialCollectionViewCell : UICollectionViewCell {
public
weak
var
delegate
:
MaterialDelegate
?
public
weak
var
delegate
:
MaterialDelegate
?
/// An Array of pulse layers.
/// An Array of pulse layers.
public
internal
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
public
private
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
/// The opcaity value for the pulse animation.
/// The opcaity value for the pulse animation.
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
...
...
Sources/iOS/MaterialCollectionViewLayout.swift
View file @
cb12b1bf
...
@@ -48,13 +48,13 @@ public class MaterialCollectionViewLayout : UICollectionViewLayout {
...
@@ -48,13 +48,13 @@ public class MaterialCollectionViewLayout : UICollectionViewLayout {
public
var
contentInset
:
UIEdgeInsets
=
UIEdgeInsetsZero
public
var
contentInset
:
UIEdgeInsets
=
UIEdgeInsetsZero
/// Size of the content.
/// Size of the content.
public
internal
(set)
var
contentSize
:
CGSize
=
CGSizeZero
public
private
(set)
var
contentSize
:
CGSize
=
CGSizeZero
/// Layout attribute items.
/// Layout attribute items.
public
internal
(set)
var
layoutItems
:
Array
<
(
UICollectionViewLayoutAttributes
,
NSIndexPath
)
>
=
Array
<
(
UICollectionViewLayoutAttributes
,
NSIndexPath
)
>
()
public
private
(set)
var
layoutItems
:
Array
<
(
UICollectionViewLayoutAttributes
,
NSIndexPath
)
>
=
Array
<
(
UICollectionViewLayoutAttributes
,
NSIndexPath
)
>
()
/// Cell data source items.
/// Cell data source items.
public
internal
(set)
var
dataSourceItems
:
Array
<
MaterialDataSourceItem
>
?
public
private
(set)
var
dataSourceItems
:
Array
<
MaterialDataSourceItem
>
?
/// Scroll direction.
/// Scroll direction.
public
var
scrollDirection
:
UICollectionViewScrollDirection
=
.
Vertical
public
var
scrollDirection
:
UICollectionViewScrollDirection
=
.
Vertical
...
...
Sources/iOS/MaterialLayer.swift
View file @
cb12b1bf
...
@@ -41,7 +41,7 @@ public class MaterialLayer : CAShapeLayer {
...
@@ -41,7 +41,7 @@ public class MaterialLayer : CAShapeLayer {
allows the dropshadow effect on the backing layer, while clipping
allows the dropshadow effect on the backing layer, while clipping
the image to a desired shape within the visualLayer.
the image to a desired shape within the visualLayer.
*/
*/
public
internal
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
public
private
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
/// A property that accesses the layer.frame.origin.x property.
/// A property that accesses the layer.frame.origin.x property.
@IBInspectable
public
var
x
:
CGFloat
{
@IBInspectable
public
var
x
:
CGFloat
{
...
...
Sources/iOS/MaterialPulseView.swift
View file @
cb12b1bf
...
@@ -32,7 +32,7 @@ import UIKit
...
@@ -32,7 +32,7 @@ import UIKit
public
class
MaterialPulseView
:
MaterialView
{
public
class
MaterialPulseView
:
MaterialView
{
/// An Array of pulse layers.
/// An Array of pulse layers.
public
internal
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
public
private
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
/// The opcaity value for the pulse animation.
/// The opcaity value for the pulse animation.
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
...
...
Sources/iOS/MaterialSwitch.swift
View file @
cb12b1bf
...
@@ -181,14 +181,14 @@ public class MaterialSwitch : UIControl {
...
@@ -181,14 +181,14 @@ public class MaterialSwitch : UIControl {
}
}
/// Track view reference.
/// Track view reference.
public
internal
(set)
var
trackLayer
:
MaterialLayer
{
public
private
(set)
var
trackLayer
:
MaterialLayer
{
didSet
{
didSet
{
prepareTrack
()
prepareTrack
()
}
}
}
}
/// Button view reference.
/// Button view reference.
public
internal
(set)
var
button
:
FabButton
{
public
private
(set)
var
button
:
FabButton
{
didSet
{
didSet
{
prepareButton
()
prepareButton
()
}
}
...
...
Sources/iOS/MaterialTableViewCell.swift
View file @
cb12b1bf
...
@@ -38,7 +38,7 @@ public class MaterialTableViewCell : UITableViewCell {
...
@@ -38,7 +38,7 @@ public class MaterialTableViewCell : UITableViewCell {
allows the dropshadow effect on the backing layer, while clipping
allows the dropshadow effect on the backing layer, while clipping
the image to a desired shape within the visualLayer.
the image to a desired shape within the visualLayer.
*/
*/
public
internal
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
public
private
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
/**
/**
A base delegate reference used when subclassing MaterialView.
A base delegate reference used when subclassing MaterialView.
...
@@ -46,7 +46,7 @@ public class MaterialTableViewCell : UITableViewCell {
...
@@ -46,7 +46,7 @@ public class MaterialTableViewCell : UITableViewCell {
public
weak
var
delegate
:
MaterialDelegate
?
public
weak
var
delegate
:
MaterialDelegate
?
/// An Array of pulse layers.
/// An Array of pulse layers.
public
internal
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
public
private
(set)
lazy
var
pulseLayers
:
Array
<
CAShapeLayer
>
=
Array
<
CAShapeLayer
>
()
/// The opcaity value for the pulse animation.
/// The opcaity value for the pulse animation.
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
@IBInspectable
public
var
pulseOpacity
:
CGFloat
=
0.25
...
...
Sources/iOS/MaterialView.swift
View file @
cb12b1bf
...
@@ -39,7 +39,7 @@ public class MaterialView : UIView {
...
@@ -39,7 +39,7 @@ public class MaterialView : UIView {
allows the dropshadow effect on the backing layer, while clipping
allows the dropshadow effect on the backing layer, while clipping
the image to a desired shape within the visualLayer.
the image to a desired shape within the visualLayer.
*/
*/
public
internal
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
public
private
(set)
lazy
var
visualLayer
:
CAShapeLayer
=
CAShapeLayer
()
/**
/**
A base delegate reference used when subclassing MaterialView.
A base delegate reference used when subclassing MaterialView.
...
...
Sources/iOS/Menu.swift
View file @
cb12b1bf
...
@@ -39,7 +39,7 @@ public enum MenuDirection {
...
@@ -39,7 +39,7 @@ public enum MenuDirection {
public
class
Menu
{
public
class
Menu
{
/// A Boolean that indicates if the menu is open or not.
/// A Boolean that indicates if the menu is open or not.
public
internal
(set)
var
opened
:
Bool
=
false
public
private
(set)
var
opened
:
Bool
=
false
/// The rectangular bounds that the menu animates.
/// The rectangular bounds that the menu animates.
public
var
origin
:
CGPoint
{
public
var
origin
:
CGPoint
{
...
...
Sources/iOS/MenuController.swift
View file @
cb12b1bf
...
@@ -51,7 +51,7 @@ public extension UIViewController {
...
@@ -51,7 +51,7 @@ public extension UIViewController {
@IBDesignable
@IBDesignable
public
class
MenuController
:
UIViewController
{
public
class
MenuController
:
UIViewController
{
/// Reference to the MenuView.
/// Reference to the MenuView.
public
internal
(set)
lazy
var
menuView
:
MenuView
=
MenuView
()
public
private
(set)
lazy
var
menuView
:
MenuView
=
MenuView
()
/**
/**
A Boolean property used to enable and disable interactivity
A Boolean property used to enable and disable interactivity
...
@@ -72,7 +72,7 @@ public class MenuController : UIViewController {
...
@@ -72,7 +72,7 @@ public class MenuController : UIViewController {
is recommended to use the transitionFromRootViewController
is recommended to use the transitionFromRootViewController
helper method.
helper method.
*/
*/
public
internal
(set)
var
rootViewController
:
UIViewController
!
public
private
(set)
var
rootViewController
:
UIViewController
!
/**
/**
An initializer that initializes the object with a NSCoder object.
An initializer that initializes the object with a NSCoder object.
...
...
Sources/iOS/MenuView.swift
View file @
cb12b1bf
...
@@ -39,7 +39,7 @@ public protocol MenuViewDelegate : MaterialDelegate {
...
@@ -39,7 +39,7 @@ public protocol MenuViewDelegate : MaterialDelegate {
public
class
MenuView
:
MaterialPulseView
{
public
class
MenuView
:
MaterialPulseView
{
/// References the Menu instance.
/// References the Menu instance.
public
internal
(set)
lazy
var
menu
:
Menu
=
Menu
()
public
private
(set)
lazy
var
menu
:
Menu
=
Menu
()
/**
/**
Prepares the view instance when intialized. When subclassing,
Prepares the view instance when intialized. When subclassing,
...
...
Sources/iOS/NavigationItem.swift
View file @
cb12b1bf
...
@@ -41,10 +41,10 @@ public class MaterialAssociatedObjectNavigationItem {
...
@@ -41,10 +41,10 @@ public class MaterialAssociatedObjectNavigationItem {
public
var
contentView
:
UIView
?
public
var
contentView
:
UIView
?
/// Title label.
/// Title label.
public
internal
(set)
var
titleLabel
:
UILabel
!
public
private
(set)
var
titleLabel
:
UILabel
!
/// Detail label.
/// Detail label.
public
internal
(set)
var
detailLabel
:
UILabel
!
public
private
(set)
var
detailLabel
:
UILabel
!
/// Left controls.
/// Left controls.
public
var
leftControls
:
Array
<
UIControl
>
?
public
var
leftControls
:
Array
<
UIControl
>
?
...
...
Sources/iOS/SearchBar.swift
View file @
cb12b1bf
...
@@ -32,10 +32,10 @@ import UIKit
...
@@ -32,10 +32,10 @@ import UIKit
public
class
SearchBar
:
BarView
{
public
class
SearchBar
:
BarView
{
/// The UITextField for the searchBar.
/// The UITextField for the searchBar.
public
internal
(set)
var
textField
:
UITextField
!
public
private
(set)
var
textField
:
UITextField
!
/// Reference to the clearButton.
/// Reference to the clearButton.
public
internal
(set)
var
clearButton
:
IconButton
!
public
private
(set)
var
clearButton
:
IconButton
!
/// Handle the clearButton manually.
/// Handle the clearButton manually.
@IBInspectable
public
var
clearButtonAutoHandleEnabled
:
Bool
=
true
{
@IBInspectable
public
var
clearButtonAutoHandleEnabled
:
Bool
=
true
{
...
...
Sources/iOS/SearchBarController.swift
View file @
cb12b1bf
...
@@ -50,7 +50,7 @@ public extension UIViewController {
...
@@ -50,7 +50,7 @@ public extension UIViewController {
public
class
SearchBarController
:
BarController
{
public
class
SearchBarController
:
BarController
{
/// Reference to the SearchBar.
/// Reference to the SearchBar.
public
internal
(set)
var
searchBar
:
SearchBar
!
public
private
(set)
var
searchBar
:
SearchBar
!
public
override
func
viewWillLayoutSubviews
()
{
public
override
func
viewWillLayoutSubviews
()
{
super
.
viewWillLayoutSubviews
()
super
.
viewWillLayoutSubviews
()
...
...
Sources/iOS/SideNavigationController.swift
View file @
cb12b1bf
...
@@ -127,25 +127,25 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
...
@@ -127,25 +127,25 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
A UIPanGestureRecognizer property internally used for the
A UIPanGestureRecognizer property internally used for the
leftView pan gesture.
leftView pan gesture.
*/
*/
internal
internal
(set)
var
leftPanGesture
:
UIPanGestureRecognizer
?
internal
private
(set)
var
leftPanGesture
:
UIPanGestureRecognizer
?
/**
/**
A UIPanGestureRecognizer property internally used for the
A UIPanGestureRecognizer property internally used for the
rightView pan gesture.
rightView pan gesture.
*/
*/
internal
internal
(set)
var
rightPanGesture
:
UIPanGestureRecognizer
?
internal
private
(set)
var
rightPanGesture
:
UIPanGestureRecognizer
?
/**
/**
A UITapGestureRecognizer property internally used for the
A UITapGestureRecognizer property internally used for the
leftView tap gesture.
leftView tap gesture.
*/
*/
internal
internal
(set)
var
leftTapGesture
:
UITapGestureRecognizer
?
internal
private
(set)
var
leftTapGesture
:
UITapGestureRecognizer
?
/**
/**
A UITapGestureRecognizer property internally used for the
A UITapGestureRecognizer property internally used for the
rightView tap gesture.
rightView tap gesture.
*/
*/
internal
internal
(set)
var
rightTapGesture
:
UITapGestureRecognizer
?
internal
private
(set)
var
rightTapGesture
:
UITapGestureRecognizer
?
/**
/**
A CGFloat property that accesses the leftView threshold of
A CGFloat property that accesses the leftView threshold of
...
@@ -317,14 +317,14 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
...
@@ -317,14 +317,14 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
leftViewController. It is very rare that this property will
leftViewController. It is very rare that this property will
need to be accessed externally.
need to be accessed externally.
*/
*/
public
internal
(set)
var
leftView
:
MaterialView
?
public
private
(set)
var
leftView
:
MaterialView
?
/**
/**
A MaterialView property that is used to hide and reveal the
A MaterialView property that is used to hide and reveal the
rightViewController. It is very rare that this property will
rightViewController. It is very rare that this property will
need to be accessed externally.
need to be accessed externally.
*/
*/
public
internal
(set)
var
rightView
:
MaterialView
?
public
private
(set)
var
rightView
:
MaterialView
?
/// Indicates whether the leftView or rightView is opened.
/// Indicates whether the leftView or rightView is opened.
public
var
opened
:
Bool
{
public
var
opened
:
Bool
{
...
@@ -353,31 +353,31 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
...
@@ -353,31 +353,31 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
is recommended to use the transitionFromRootViewController
is recommended to use the transitionFromRootViewController
helper method.
helper method.
*/
*/
public
internal
(set)
var
rootViewController
:
UIViewController
!
public
private
(set)
var
rootViewController
:
UIViewController
!
/**
/**
A UIViewController property that references the
A UIViewController property that references the
active left UIViewController.
active left UIViewController.
*/
*/
public
internal
(set)
var
leftViewController
:
UIViewController
?
public
private
(set)
var
leftViewController
:
UIViewController
?
/**
/**
A UIViewController property that references the
A UIViewController property that references the
active right UIViewController.
active right UIViewController.
*/
*/
public
internal
(set)
var
rightViewController
:
UIViewController
?
public
private
(set)
var
rightViewController
:
UIViewController
?
/**
/**
A CGFloat property to access the width that the leftView
A CGFloat property to access the width that the leftView
opens up to.
opens up to.
*/
*/
@IBInspectable
public
internal
(set)
var
leftViewWidth
:
CGFloat
!
@IBInspectable
public
private
(set)
var
leftViewWidth
:
CGFloat
!
/**
/**
A CGFloat property to access the width that the rightView
A CGFloat property to access the width that the rightView
opens up to.
opens up to.
*/
*/
@IBInspectable
public
internal
(set)
var
rightViewWidth
:
CGFloat
!
@IBInspectable
public
private
(set)
var
rightViewWidth
:
CGFloat
!
/**
/**
An initializer for the SideNavigationController.
An initializer for the SideNavigationController.
...
...
Sources/iOS/TabBar.swift
View file @
cb12b1bf
...
@@ -37,7 +37,7 @@ public enum TabBarLineAlignment {
...
@@ -37,7 +37,7 @@ public enum TabBarLineAlignment {
public
class
TabBar
:
MaterialView
{
public
class
TabBar
:
MaterialView
{
/// A reference to the line UIView.
/// A reference to the line UIView.
public
internal
(set)
var
line
:
UIView
!
public
private
(set)
var
line
:
UIView
!
/// A value for the line alignment.
/// A value for the line alignment.
public
var
lineAlignment
:
TabBarLineAlignment
=
.
Bottom
{
public
var
lineAlignment
:
TabBarLineAlignment
=
.
Bottom
{
...
...
Sources/iOS/Text.swift
View file @
cb12b1bf
...
@@ -73,7 +73,7 @@ public class Text : NSObject {
...
@@ -73,7 +73,7 @@ public class Text : NSObject {
}
}
/// TextStorage instance that is observed while editing.
/// TextStorage instance that is observed while editing.
public
internal
(set)
var
textStorage
:
TextStorage
=
TextStorage
()
public
private
(set)
var
textStorage
:
TextStorage
=
TextStorage
()
/// Delegation object for pre and post text processing.
/// Delegation object for pre and post text processing.
public
weak
var
delegate
:
TextDelegate
?
public
weak
var
delegate
:
TextDelegate
?
...
...
Sources/iOS/TextField.swift
View file @
cb12b1bf
...
@@ -35,7 +35,7 @@ public protocol TextFieldDelegate : UITextFieldDelegate {}
...
@@ -35,7 +35,7 @@ public protocol TextFieldDelegate : UITextFieldDelegate {}
@IBDesignable
@IBDesignable
public
class
TextField
:
UITextField
{
public
class
TextField
:
UITextField
{
/// A Boolean that indicates if the TextField is in an animating state.
/// A Boolean that indicates if the TextField is in an animating state.
public
internal
(set)
var
animating
:
Bool
=
false
public
private
(set)
var
animating
:
Bool
=
false
/**
/**
This property is the same as clipsToBounds. It crops any of the view's
This property is the same as clipsToBounds. It crops any of the view's
...
@@ -118,7 +118,7 @@ public class TextField : UITextField {
...
@@ -118,7 +118,7 @@ public class TextField : UITextField {
}
}
/// Reference to the divider.
/// Reference to the divider.
public
internal
(set)
lazy
var
divider
:
CAShapeLayer
=
CAShapeLayer
()
public
private
(set)
lazy
var
divider
:
CAShapeLayer
=
CAShapeLayer
()
/// Divider height.
/// Divider height.
@IBInspectable
public
var
dividerHeight
:
CGFloat
=
1
@IBInspectable
public
var
dividerHeight
:
CGFloat
=
1
...
@@ -176,7 +176,7 @@ public class TextField : UITextField {
...
@@ -176,7 +176,7 @@ public class TextField : UITextField {
}
}
/// The placeholder UILabel.
/// The placeholder UILabel.
@IBInspectable
public
internal
(set)
lazy
var
placeholderLabel
:
UILabel
=
UILabel
(
frame
:
CGRectZero
)
@IBInspectable
public
private
(set)
lazy
var
placeholderLabel
:
UILabel
=
UILabel
(
frame
:
CGRectZero
)
/// Placeholder textColor.
/// Placeholder textColor.
@IBInspectable
public
var
placeholderColor
:
UIColor
=
MaterialColor
.
darkText
.
others
{
@IBInspectable
public
var
placeholderColor
:
UIColor
=
MaterialColor
.
darkText
.
others
{
...
@@ -205,7 +205,7 @@ public class TextField : UITextField {
...
@@ -205,7 +205,7 @@ public class TextField : UITextField {
public
var
placeholderVerticalOffset
:
CGFloat
=
0
public
var
placeholderVerticalOffset
:
CGFloat
=
0
/// The detailLabel UILabel that is displayed.
/// The detailLabel UILabel that is displayed.
@IBInspectable
public
internal
(set)
lazy
var
detailLabel
:
UILabel
=
UILabel
(
frame
:
CGRectZero
)
@IBInspectable
public
private
(set)
lazy
var
detailLabel
:
UILabel
=
UILabel
(
frame
:
CGRectZero
)
/// The detailLabel text value.
/// The detailLabel text value.
...
@@ -327,10 +327,10 @@ public class TextField : UITextField {
...
@@ -327,10 +327,10 @@ public class TextField : UITextField {
}
}
/// A reference to the clearIconButton.
/// A reference to the clearIconButton.
public
internal
(set)
var
clearIconButton
:
IconButton
?
public
private
(set)
var
clearIconButton
:
IconButton
?
/// A reference to the visibilityIconButton.
/// A reference to the visibilityIconButton.
public
internal
(set)
var
visibilityIconButton
:
IconButton
?
public
private
(set)
var
visibilityIconButton
:
IconButton
?
/**
/**
An initializer that initializes the object with a NSCoder object.
An initializer that initializes the object with a NSCoder object.
...
...
Sources/iOS/Toolbar.swift
View file @
cb12b1bf
...
@@ -43,7 +43,7 @@ public class Toolbar : BarView {
...
@@ -43,7 +43,7 @@ public class Toolbar : BarView {
}
}
/// Title label.
/// Title label.
public
internal
(set)
var
titleLabel
:
UILabel
!
public
private
(set)
var
titleLabel
:
UILabel
!
/// A convenience property to set the detailLabel text.
/// A convenience property to set the detailLabel text.
public
var
detail
:
String
?
{
public
var
detail
:
String
?
{
...
@@ -57,7 +57,7 @@ public class Toolbar : BarView {
...
@@ -57,7 +57,7 @@ public class Toolbar : BarView {
}
}
/// Detail label.
/// Detail label.
public
internal
(set)
var
detailLabel
:
UILabel
!
public
private
(set)
var
detailLabel
:
UILabel
!
public
override
func
layoutSubviews
()
{
public
override
func
layoutSubviews
()
{
super
.
layoutSubviews
()
super
.
layoutSubviews
()
...
...
Sources/iOS/ToolbarController.swift
View file @
cb12b1bf
...
@@ -69,7 +69,7 @@ public class ToolbarController : BarController {
...
@@ -69,7 +69,7 @@ public class ToolbarController : BarController {
private
var
internalFloatingViewController
:
UIViewController
?
private
var
internalFloatingViewController
:
UIViewController
?
/// Reference to the Toolbar.
/// Reference to the Toolbar.
public
internal
(set)
var
toolbar
:
Toolbar
!
public
private
(set)
var
toolbar
:
Toolbar
!
/// Delegation handler.
/// Delegation handler.
public
weak
var
delegate
:
ToolbarControllerDelegate
?
public
weak
var
delegate
:
ToolbarControllerDelegate
?
...
...
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