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
1dd83602
Commit
1dd83602
authored
Jul 31, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
additional updates to @objc declarations for enums
parent
e9f9a8e0
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
27 additions
and
26 deletions
+27
-26
Sources/iOS/Animation.swift
+1
-1
Sources/iOS/Border.swift
+1
-1
Sources/iOS/BottomNavigationController.swift
+1
-1
Sources/iOS/Capture.swift
+1
-1
Sources/iOS/CaptureSession.swift
+1
-1
Sources/iOS/CornerRadius.swift
+1
-1
Sources/iOS/Depth.swift
+1
-1
Sources/iOS/Direction.swift
+1
-1
Sources/iOS/EdgeInsets.swift
+1
-1
Sources/iOS/Grid.swift
+1
-1
Sources/iOS/InterimSpace.swift
+1
-1
Sources/iOS/KeyframeAnimation.swift
+1
-1
Sources/iOS/Material+UIImage.swift
+1
-1
Sources/iOS/MaterialGravity.swift
+1
-1
Sources/iOS/NavigationBar.swift
+1
-1
Sources/iOS/NavigationDrawerController.swift
+1
-1
Sources/iOS/PulseAnimation.swift
+1
-1
Sources/iOS/Shape.swift
+1
-1
Sources/iOS/Switch.swift
+6
-5
Sources/iOS/TabBar.swift
+1
-1
Sources/iOS/TransitionAnimation.swift
+2
-2
No files found.
Sources/iOS/Animation.swift
View file @
1dd83602
...
@@ -32,7 +32,7 @@ import UIKit
...
@@ -32,7 +32,7 @@ import UIKit
public
typealias
AnimationFillModeType
=
String
public
typealias
AnimationFillModeType
=
String
@objc
@objc
(AnimationFillMode)
public
enum
AnimationFillMode
:
Int
{
public
enum
AnimationFillMode
:
Int
{
case
forwards
case
forwards
case
backwards
case
backwards
...
...
Sources/iOS/Border.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(BorderWidthPreset)
public
enum
BorderWidthPreset
:
Int
{
public
enum
BorderWidthPreset
:
Int
{
case
none
case
none
case
border1
case
border1
...
...
Sources/iOS/BottomNavigationController.swift
View file @
1dd83602
...
@@ -53,7 +53,7 @@ public class BottomNavigationFadeAnimatedTransitioning : NSObject, UIViewControl
...
@@ -53,7 +53,7 @@ public class BottomNavigationFadeAnimatedTransitioning : NSObject, UIViewControl
}
}
}
}
@objc
@objc
(BottomNavigationTransitionAnimation)
public
enum
BottomNavigationTransitionAnimation
:
Int
{
public
enum
BottomNavigationTransitionAnimation
:
Int
{
case
none
case
none
case
fade
case
fade
...
...
Sources/iOS/Capture.swift
View file @
1dd83602
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
import
UIKit
import
UIKit
import
AVFoundation
import
AVFoundation
@objc
@objc
(CaptureMode)
public
enum
CaptureMode
:
Int
{
public
enum
CaptureMode
:
Int
{
case
photo
case
photo
case
video
case
video
...
...
Sources/iOS/CaptureSession.swift
View file @
1dd83602
...
@@ -33,7 +33,7 @@ import AVFoundation
...
@@ -33,7 +33,7 @@ import AVFoundation
private
var
CaptureSessionAdjustingExposureContext
:
UInt8
=
1
private
var
CaptureSessionAdjustingExposureContext
:
UInt8
=
1
@objc
@objc
(CaptureSessionPreset)
public
enum
CaptureSessionPreset
:
Int
{
public
enum
CaptureSessionPreset
:
Int
{
case
presetPhoto
case
presetPhoto
case
presetHigh
case
presetHigh
...
...
Sources/iOS/CornerRadius.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(CornerRadiusPreset)
public
enum
CornerRadiusPreset
:
Int
{
public
enum
CornerRadiusPreset
:
Int
{
case
none
case
none
case
cornerRadius1
case
cornerRadius1
...
...
Sources/iOS/Depth.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(DepthPreset)
public
enum
DepthPreset
:
Int
{
public
enum
DepthPreset
:
Int
{
case
none
case
none
case
depth1
case
depth1
...
...
Sources/iOS/Direction.swift
View file @
1dd83602
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
*/
@objc
@objc
(Direction)
public
enum
Direction
:
Int
{
public
enum
Direction
:
Int
{
case
up
case
up
case
down
case
down
...
...
Sources/iOS/EdgeInsets.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(EdgeInsetsPreset)
public
enum
EdgeInsetsPreset
:
Int
{
public
enum
EdgeInsetsPreset
:
Int
{
case
none
case
none
...
...
Sources/iOS/Grid.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(GridAxisDirection)
public
enum
GridAxisDirection
:
Int
{
public
enum
GridAxisDirection
:
Int
{
case
none
case
none
case
horizontal
case
horizontal
...
...
Sources/iOS/InterimSpace.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(InterimSpacePreset)
public
enum
InterimSpacePreset
:
Int
{
public
enum
InterimSpacePreset
:
Int
{
case
none
case
none
case
interimSpace1
case
interimSpace1
...
...
Sources/iOS/KeyframeAnimation.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(AnimationRotationMode)
public
enum
AnimationRotationMode
:
Int
{
public
enum
AnimationRotationMode
:
Int
{
case
none
case
none
case
auto
case
auto
...
...
Sources/iOS/Material+UIImage.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(ImageFormat)
public
enum
ImageFormat
:
Int
{
public
enum
ImageFormat
:
Int
{
case
png
case
png
case
jpeg
case
jpeg
...
...
Sources/iOS/MaterialGravity.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(MaterialGravity)
public
enum
MaterialGravity
:
Int
{
public
enum
MaterialGravity
:
Int
{
case
Center
case
Center
case
Top
case
Top
...
...
Sources/iOS/NavigationBar.swift
View file @
1dd83602
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
import
UIKit
import
UIKit
/// NavigationBar styles.
/// NavigationBar styles.
@objc
@objc
(NavigationBarStyle)
public
enum
NavigationBarStyle
:
Int
{
public
enum
NavigationBarStyle
:
Int
{
case
Tiny
case
Tiny
case
Default
case
Default
...
...
Sources/iOS/NavigationDrawerController.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(NavigationDrawerPosition)
public
enum
NavigationDrawerPosition
:
Int
{
public
enum
NavigationDrawerPosition
:
Int
{
case
left
case
left
case
right
case
right
...
...
Sources/iOS/PulseAnimation.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(PulseAnimation)
public
enum
PulseAnimation
:
Int
{
public
enum
PulseAnimation
:
Int
{
case
none
case
none
case
center
case
center
...
...
Sources/iOS/Shape.swift
View file @
1dd83602
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
*/
@objc
@objc
(ShapePreset)
public
enum
ShapePreset
:
Int
{
public
enum
ShapePreset
:
Int
{
case
none
case
none
case
square
case
square
...
...
Sources/iOS/Switch.swift
View file @
1dd83602
...
@@ -30,19 +30,19 @@
...
@@ -30,19 +30,19 @@
import
UIKit
import
UIKit
@objc
@objc
(SwitchStyle)
public
enum
SwitchStyle
:
Int
{
public
enum
SwitchStyle
:
Int
{
case
light
case
light
case
dark
case
dark
}
}
@objc
@objc
(SwitchState)
public
enum
SwitchState
:
Int
{
public
enum
SwitchState
:
Int
{
case
on
case
on
case
off
case
off
}
}
@objc
@objc
(SwitchSize)
public
enum
SwitchSize
:
Int
{
public
enum
SwitchSize
:
Int
{
case
small
case
small
case
medium
case
medium
...
@@ -360,7 +360,7 @@ public class Switch: UIControl {
...
@@ -360,7 +360,7 @@ public class Switch: UIControl {
- Parameter sender: A UIButton.
- Parameter sender: A UIButton.
- Parameter event: A UIEvent.
- Parameter event: A UIEvent.
*/
*/
@objc
(handleTouchUpOutsideOrCanceled:event:)
@objc
internal
func
handleTouchUpOutsideOrCanceled
(
sender
:
FabButton
,
event
:
UIEvent
)
{
internal
func
handleTouchUpOutsideOrCanceled
(
sender
:
FabButton
,
event
:
UIEvent
)
{
if
let
v
:
UITouch
=
event
.
touches
(
for
:
sender
)?
.
first
{
if
let
v
:
UITouch
=
event
.
touches
(
for
:
sender
)?
.
first
{
let
q
:
CGFloat
=
sender
.
x
+
v
.
location
(
in
:
sender
)
.
x
-
v
.
previousLocation
(
in
:
sender
)
.
x
let
q
:
CGFloat
=
sender
.
x
+
v
.
location
(
in
:
sender
)
.
x
-
v
.
previousLocation
(
in
:
sender
)
.
x
...
@@ -369,6 +369,7 @@ public class Switch: UIControl {
...
@@ -369,6 +369,7 @@ public class Switch: UIControl {
}
}
/// Handles the TouchUpInside event.
/// Handles the TouchUpInside event.
@objc
internal
func
handleTouchUpInside
()
{
internal
func
handleTouchUpInside
()
{
toggle
()
toggle
()
}
}
...
@@ -378,7 +379,7 @@ public class Switch: UIControl {
...
@@ -378,7 +379,7 @@ public class Switch: UIControl {
- Parameter sender: A UIButton.
- Parameter sender: A UIButton.
- Parameter event: A UIEvent.
- Parameter event: A UIEvent.
*/
*/
@objc
(handleTouchDragInside:event:)
@objc
internal
func
handleTouchDragInside
(
sender
:
FabButton
,
event
:
UIEvent
)
{
internal
func
handleTouchDragInside
(
sender
:
FabButton
,
event
:
UIEvent
)
{
if
let
v
=
event
.
touches
(
for
:
sender
)?
.
first
{
if
let
v
=
event
.
touches
(
for
:
sender
)?
.
first
{
let
q
:
CGFloat
=
max
(
min
(
sender
.
x
+
v
.
location
(
in
:
sender
)
.
x
-
v
.
previousLocation
(
in
:
sender
)
.
x
,
onPosition
),
offPosition
)
let
q
:
CGFloat
=
max
(
min
(
sender
.
x
+
v
.
location
(
in
:
sender
)
.
x
-
v
.
previousLocation
(
in
:
sender
)
.
x
,
onPosition
),
offPosition
)
...
...
Sources/iOS/TabBar.swift
View file @
1dd83602
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
@objc
@objc
(TabBarLineAlignment)
public
enum
TabBarLineAlignment
:
Int
{
public
enum
TabBarLineAlignment
:
Int
{
case
top
case
top
case
bottom
case
bottom
...
...
Sources/iOS/TransitionAnimation.swift
View file @
1dd83602
...
@@ -33,7 +33,7 @@ import UIKit
...
@@ -33,7 +33,7 @@ import UIKit
public
typealias
AnimationTransitionType
=
String
public
typealias
AnimationTransitionType
=
String
public
typealias
AnimationTransitionSubTypeType
=
String
public
typealias
AnimationTransitionSubTypeType
=
String
@objc
@objc
(AnimationTransition)
public
enum
AnimationTransition
:
Int
{
public
enum
AnimationTransition
:
Int
{
case
Fade
case
Fade
case
MoveIn
case
MoveIn
...
@@ -41,7 +41,7 @@ public enum AnimationTransition: Int {
...
@@ -41,7 +41,7 @@ public enum AnimationTransition: Int {
case
Reveal
case
Reveal
}
}
@objc
@objc
(AnimationTransitionSubType)
public
enum
AnimationTransitionSubType
:
Int
{
public
enum
AnimationTransitionSubType
:
Int
{
case
Right
case
Right
case
Left
case
Left
...
...
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