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
d7bea33c
Unverified
Commit
d7bea33c
authored
Oct 29, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
development: upadted to latest Xcode 8.1
parent
3b5e5a0b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
13 deletions
+18
-13
Material.xcodeproj/xcshareddata/xcschemes/Material iOS.xcscheme
+1
-1
Material.xcodeproj/xcshareddata/xcschemes/Material macOS.xcscheme
+1
-1
Sources/iOS/Grid.swift
+2
-2
Sources/iOS/Menu.swift
+10
-5
Sources/iOS/PageTabBarController.swift
+1
-1
Sources/iOS/Photos/PhotoLibrary.swift
+3
-3
No files found.
Material.xcodeproj/xcshareddata/xcschemes/Material iOS.xcscheme
View file @
d7bea33c
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<Scheme
LastUpgradeVersion =
"08
0
0"
LastUpgradeVersion =
"08
1
0"
version =
"1.3"
>
version =
"1.3"
>
<BuildAction
<BuildAction
parallelizeBuildables =
"YES"
parallelizeBuildables =
"YES"
...
...
Material.xcodeproj/xcshareddata/xcschemes/Material macOS.xcscheme
View file @
d7bea33c
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<Scheme
LastUpgradeVersion =
"08
0
0"
LastUpgradeVersion =
"08
1
0"
version =
"1.3"
>
version =
"1.3"
>
<BuildAction
<BuildAction
parallelizeBuildables =
"YES"
parallelizeBuildables =
"YES"
...
...
Sources/iOS/Grid.swift
View file @
d7bea33c
...
@@ -220,8 +220,8 @@ public class Grid {
...
@@ -220,8 +220,8 @@ public class Grid {
return
return
}
}
var
n
:
Int
=
0
var
n
=
0
var
i
:
Int
=
0
var
i
=
0
for
v
in
views
{
for
v
in
views
{
guard
let
canvas
=
context
else
{
guard
let
canvas
=
context
else
{
...
...
Sources/iOS/Menu.swift
View file @
d7bea33c
...
@@ -68,14 +68,14 @@ open class Menu: View {
...
@@ -68,14 +68,14 @@ open class Menu: View {
/// The space between views.
/// The space between views.
open
var
interimSpace
:
InterimSpace
=
0
{
open
var
interimSpace
:
InterimSpace
=
0
{
didSet
{
didSet
{
reload
()
layoutSubviews
()
}
}
}
}
/// The direction in which the animation opens the menu.
/// The direction in which the animation opens the menu.
open
var
direction
=
MenuDirection
.
up
{
open
var
direction
=
MenuDirection
.
up
{
didSet
{
didSet
{
reload
()
layoutSubviews
()
}
}
}
}
...
@@ -93,7 +93,7 @@ open class Menu: View {
...
@@ -93,7 +93,7 @@ open class Menu: View {
addSubview
(
v
)
addSubview
(
v
)
}
}
reload
()
layoutSubviews
()
}
}
}
}
...
@@ -142,10 +142,15 @@ open class Menu: View {
...
@@ -142,10 +142,15 @@ open class Menu: View {
interimSpacePreset
=
.
interimSpace6
interimSpacePreset
=
.
interimSpace6
}
}
open
override
func
layoutSubviews
()
{
super
.
layoutSubviews
()
reload
()
}
/// Reload the view layout.
/// Reload the view layout.
open
func
reload
()
{
open
func
reload
()
{
isOpened
=
false
isOpened
=
false
layout
Button
s
()
layout
View
s
()
}
}
/**
/**
...
@@ -577,7 +582,7 @@ open class Menu: View {
...
@@ -577,7 +582,7 @@ open class Menu: View {
}
}
/// Layout the views.
/// Layout the views.
private
func
layout
Button
s
()
{
private
func
layout
View
s
()
{
guard
let
base
=
views
.
first
else
{
guard
let
base
=
views
.
first
else
{
return
return
}
}
...
...
Sources/iOS/PageTabBarController.swift
View file @
d7bea33c
...
@@ -114,7 +114,7 @@ open class PageTabBarController: RootController {
...
@@ -114,7 +114,7 @@ open class PageTabBarController: RootController {
open
internal(set)
var
isTabSelectedAnimation
=
false
open
internal(set)
var
isTabSelectedAnimation
=
false
/// The currently selected UIViewController.
/// The currently selected UIViewController.
open
internal(set)
var
selectedIndex
:
Int
=
0
open
internal(set)
var
selectedIndex
=
0
/// PageTabBar alignment setting.
/// PageTabBar alignment setting.
open
var
pageTabBarAlignment
=
PageTabBarAlignment
.
bottom
open
var
pageTabBarAlignment
=
PageTabBarAlignment
.
bottom
...
...
Sources/iOS/Photos/PhotoLibrary.swift
View file @
d7bea33c
...
@@ -280,7 +280,7 @@ extension PhotoLibrary {
...
@@ -280,7 +280,7 @@ extension PhotoLibrary {
/// PHCollectionList.
/// PHCollectionList.
extension
PhotoLibrary
{
extension
PhotoLibrary
{
/**
/**
A PHAssetCollection
Type
Moment collection type will be contained
A PHAssetCollectionMoment collection type will be contained
by a PHCollectionListSubtypeMomentListCluster and a
by a PHCollectionListSubtypeMomentListCluster and a
PHCollectionListSubtypeMomentListYear. Non-moment PHAssetCollections
PHCollectionListSubtypeMomentListYear. Non-moment PHAssetCollections
will only be contained by a single collection list.
will only be contained by a single collection list.
...
@@ -400,7 +400,7 @@ extension PhotoLibrary {
...
@@ -400,7 +400,7 @@ extension PhotoLibrary {
/**
/**
Fetch asset collections of a single type and subtype provided
Fetch asset collections of a single type and subtype provided
(use PHAssetCollectionSubtypeAny to match all subtypes).
(use PHAssetCollectionSubtypeAny to match all subtypes).
- Parameter with type: A PHAssetCollection
Type
.
- Parameter with type: A PHAssetCollection.
- Parameter subtype: A PHAssetCollectionSubtype.
- Parameter subtype: A PHAssetCollectionSubtype.
- Parameter options: An optional PHFetchOptions object.
- Parameter options: An optional PHFetchOptions object.
- Parameter completion: A completion block.
- Parameter completion: A completion block.
...
@@ -413,7 +413,7 @@ extension PhotoLibrary {
...
@@ -413,7 +413,7 @@ extension PhotoLibrary {
/**
/**
Smart Albums are not supported, only Albums and Moments.
Smart Albums are not supported, only Albums and Moments.
- Parameter asset: A PHAsset.
- Parameter asset: A PHAsset.
- Parameter with type: A PHAssetCollection
Type
.
- Parameter with type: A PHAssetCollection.
- Parameter options: An optional PHFetchOptions object.
- Parameter options: An optional PHFetchOptions object.
- Parameter completion: A completion block.
- Parameter completion: A completion block.
*/
*/
...
...
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