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
de0f26a3
Unverified
Commit
de0f26a3
authored
Dec 17, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
development: updated CollectionView and added TableView
parent
d114f592
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
192 additions
and
18 deletions
+192
-18
Material.xcodeproj/project.pbxproj
+32
-6
Sources/iOS/BottomNavigationController.swift
+2
-2
Sources/iOS/CollectionViewController.swift
+5
-4
Sources/iOS/CollectionViewLayout.swift
+2
-2
Sources/iOS/DataSourceItem.swift
+1
-1
Sources/iOS/Reminders/RemindersController.swift
+1
-1
Sources/iOS/Snackbar.swift
+1
-1
Sources/iOS/TableView.swift
+33
-0
Sources/iOS/TableViewController.swift
+114
-0
Sources/macOS/Color.swift
+1
-1
No files found.
Material.xcodeproj/project.pbxproj
View file @
de0f26a3
...
@@ -33,6 +33,13 @@
...
@@ -33,6 +33,13 @@
96328B7A1E020A41009A4C90
/* CollectionViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B791E020A41009A4C90
/* CollectionViewController.swift */
;
};
96328B7A1E020A41009A4C90
/* CollectionViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B791E020A41009A4C90
/* CollectionViewController.swift */
;
};
96328B911E05B6B5009A4C90
/* Reminders.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B901E05B6B5009A4C90
/* Reminders.swift */
;
};
96328B911E05B6B5009A4C90
/* Reminders.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B901E05B6B5009A4C90
/* Reminders.swift */
;
};
96328B931E05B6E5009A4C90
/* RemindersController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B921E05B6E5009A4C90
/* RemindersController.swift */
;
};
96328B931E05B6E5009A4C90
/* RemindersController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B921E05B6E5009A4C90
/* RemindersController.swift */
;
};
96328B971E05C0BB009A4C90
/* TableView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B961E05C0BB009A4C90
/* TableView.swift */
;
};
96328B991E05C0CE009A4C90
/* TableViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B981E05C0CE009A4C90
/* TableViewController.swift */
;
};
96328B9B1E05C24E009A4C90
/* CollectionViewController.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B791E020A41009A4C90
/* CollectionViewController.swift */
;
};
96328B9C1E05C24E009A4C90
/* Reminders.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B901E05B6B5009A4C90
/* Reminders.swift */
;
};
96328B9D1E05C24E009A4C90
/* RemindersController.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B921E05B6E5009A4C90
/* RemindersController.swift */
;
};
96328B9E1E05C24E009A4C90
/* TableView.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B961E05C0BB009A4C90
/* TableView.swift */
;
};
96328B9F1E05C24E009A4C90
/* TableViewController.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96328B981E05C0CE009A4C90
/* TableViewController.swift */
;
};
96334EF61C8B84660083986B
/* Assets.xcassets in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96334EF51C8B84660083986B
/* Assets.xcassets */
;
};
96334EF61C8B84660083986B
/* Assets.xcassets in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96334EF51C8B84660083986B
/* Assets.xcassets */
;
};
963832421B88DFD80015F710
/* Material.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
963832361B88DFD80015F710
/* Material.framework */
;
};
963832421B88DFD80015F710
/* Material.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
963832361B88DFD80015F710
/* Material.framework */
;
};
965E80C81DD4C50600D61E4B
/* Motion.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB76D1CB40DC500C806FE
/* Motion.swift */
;
};
965E80C81DD4C50600D61E4B
/* Motion.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB76D1CB40DC500C806FE
/* Motion.swift */
;
};
...
@@ -88,7 +95,7 @@
...
@@ -88,7 +95,7 @@
965E81041DD4D5C800D61E4B
/* CollectionViewCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7721CB40DC500C806FE
/* CollectionViewCell.swift */
;
};
965E81041DD4D5C800D61E4B
/* CollectionViewCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7721CB40DC500C806FE
/* CollectionViewCell.swift */
;
};
965E81071DD4D5C800D61E4B
/* CollectionViewLayout.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7751CB40DC500C806FE
/* CollectionViewLayout.swift */
;
};
965E81071DD4D5C800D61E4B
/* CollectionViewLayout.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7751CB40DC500C806FE
/* CollectionViewLayout.swift */
;
};
965E81081DD4D5C800D61E4B
/* CollectionReusableView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
966ECF291CF4C20100BB0BDF
/* CollectionReusableView.swift */
;
};
965E81081DD4D5C800D61E4B
/* CollectionReusableView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
966ECF291CF4C20100BB0BDF
/* CollectionReusableView.swift */
;
};
965E81091DD4D5C800D61E4B
/*
CollectionViewDataSourceItem.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7771CB40DC500C806FE
/* CollectionView
DataSourceItem.swift */
;
};
965E81091DD4D5C800D61E4B
/*
DataSourceItem.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7771CB40DC500C806FE
/*
DataSourceItem.swift */
;
};
965E810A1DD4D5C800D61E4B
/* Font.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB77B1CB40DC500C806FE
/* Font.swift */
;
};
965E810A1DD4D5C800D61E4B
/* Font.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB77B1CB40DC500C806FE
/* Font.swift */
;
};
965E810B1DD4D5C800D61E4B
/* RobotoFont.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7941CB40DC500C806FE
/* RobotoFont.swift */
;
};
965E810B1DD4D5C800D61E4B
/* RobotoFont.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7941CB40DC500C806FE
/* RobotoFont.swift */
;
};
965E810C1DD4D5C800D61E4B
/* DynamicFontType.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9628645E1D540AF300690B69
/* DynamicFontType.swift */
;
};
965E810C1DD4D5C800D61E4B
/* DynamicFontType.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
9628645E1D540AF300690B69
/* DynamicFontType.swift */
;
};
...
@@ -149,7 +156,7 @@
...
@@ -149,7 +156,7 @@
96BCB8161CB4115200C806FE
/* FlatButton.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7601CB40DC500C806FE
/* FlatButton.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8161CB4115200C806FE
/* FlatButton.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7601CB40DC500C806FE
/* FlatButton.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8171CB4115200C806FE
/* Button.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7701CB40DC500C806FE
/* Button.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8171CB4115200C806FE
/* Button.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7701CB40DC500C806FE
/* Button.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8181CB4115200C806FE
/* RaisedButton.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7931CB40DC500C806FE
/* RaisedButton.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8181CB4115200C806FE
/* RaisedButton.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7931CB40DC500C806FE
/* RaisedButton.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB81E1CB4115200C806FE
/*
CollectionViewDataSourceItem.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7771CB40DC500C806FE
/* CollectionView
DataSourceItem.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB81E1CB4115200C806FE
/*
DataSourceItem.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7771CB40DC500C806FE
/*
DataSourceItem.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB81F1CB4115200C806FE
/* CollectionView.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7711CB40DC500C806FE
/* CollectionView.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB81F1CB4115200C806FE
/* CollectionView.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7711CB40DC500C806FE
/* CollectionView.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8201CB4115200C806FE
/* CollectionViewCell.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7721CB40DC500C806FE
/* CollectionViewCell.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8201CB4115200C806FE
/* CollectionViewCell.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7721CB40DC500C806FE
/* CollectionViewCell.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8231CB4115200C806FE
/* CollectionViewLayout.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7751CB40DC500C806FE
/* CollectionViewLayout.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
96BCB8231CB4115200C806FE
/* CollectionViewLayout.swift in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
96BCB7751CB40DC500C806FE
/* CollectionViewLayout.swift */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
...
@@ -233,6 +240,8 @@
...
@@ -233,6 +240,8 @@
96328B791E020A41009A4C90
/* CollectionViewController.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CollectionViewController.swift
;
sourceTree
=
"<group>"
;
};
96328B791E020A41009A4C90
/* CollectionViewController.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CollectionViewController.swift
;
sourceTree
=
"<group>"
;
};
96328B901E05B6B5009A4C90
/* Reminders.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
name
=
Reminders.swift
;
path
=
Reminders/Reminders.swift
;
sourceTree
=
"<group>"
;
};
96328B901E05B6B5009A4C90
/* Reminders.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
name
=
Reminders.swift
;
path
=
Reminders/Reminders.swift
;
sourceTree
=
"<group>"
;
};
96328B921E05B6E5009A4C90
/* RemindersController.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
name
=
RemindersController.swift
;
path
=
Reminders/RemindersController.swift
;
sourceTree
=
"<group>"
;
};
96328B921E05B6E5009A4C90
/* RemindersController.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
name
=
RemindersController.swift
;
path
=
Reminders/RemindersController.swift
;
sourceTree
=
"<group>"
;
};
96328B961E05C0BB009A4C90
/* TableView.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
TableView.swift
;
sourceTree
=
"<group>"
;
};
96328B981E05C0CE009A4C90
/* TableViewController.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
TableViewController.swift
;
sourceTree
=
"<group>"
;
};
96334EF51C8B84660083986B
/* Assets.xcassets */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
folder.assetcatalog
;
path
=
Assets.xcassets
;
sourceTree
=
"<group>"
;
};
96334EF51C8B84660083986B
/* Assets.xcassets */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
folder.assetcatalog
;
path
=
Assets.xcassets
;
sourceTree
=
"<group>"
;
};
963832361B88DFD80015F710
/* Material.framework */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.framework
;
includeInIndex
=
0
;
path
=
Material.framework
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
963832361B88DFD80015F710
/* Material.framework */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.framework
;
includeInIndex
=
0
;
path
=
Material.framework
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
963832411B88DFD80015F710
/* Material.xctest */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.cfbundle
;
includeInIndex
=
0
;
path
=
Material.xctest
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
963832411B88DFD80015F710
/* Material.xctest */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.cfbundle
;
includeInIndex
=
0
;
path
=
Material.xctest
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
...
@@ -271,7 +280,7 @@
...
@@ -271,7 +280,7 @@
96BCB7721CB40DC500C806FE
/* CollectionViewCell.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CollectionViewCell.swift
;
sourceTree
=
"<group>"
;
};
96BCB7721CB40DC500C806FE
/* CollectionViewCell.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CollectionViewCell.swift
;
sourceTree
=
"<group>"
;
};
96BCB7751CB40DC500C806FE
/* CollectionViewLayout.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CollectionViewLayout.swift
;
sourceTree
=
"<group>"
;
};
96BCB7751CB40DC500C806FE
/* CollectionViewLayout.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CollectionViewLayout.swift
;
sourceTree
=
"<group>"
;
};
96BCB7761CB40DC500C806FE
/* Color.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
Color.swift
;
sourceTree
=
"<group>"
;
};
96BCB7761CB40DC500C806FE
/* Color.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
Color.swift
;
sourceTree
=
"<group>"
;
};
96BCB7771CB40DC500C806FE
/*
CollectionViewDataSourceItem.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CollectionView
DataSourceItem.swift
;
sourceTree
=
"<group>"
;
};
96BCB7771CB40DC500C806FE
/*
DataSourceItem.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
DataSourceItem.swift
;
sourceTree
=
"<group>"
;
};
96BCB7781CB40DC500C806FE
/* Depth.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
Depth.swift
;
sourceTree
=
"<group>"
;
};
96BCB7781CB40DC500C806FE
/* Depth.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
Depth.swift
;
sourceTree
=
"<group>"
;
};
96BCB7791CB40DC500C806FE
/* Device.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
Device.swift
;
sourceTree
=
"<group>"
;
};
96BCB7791CB40DC500C806FE
/* Device.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
Device.swift
;
sourceTree
=
"<group>"
;
};
96BCB77A1CB40DC500C806FE
/* EdgeInsets.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
EdgeInsets.swift
;
sourceTree
=
"<group>"
;
};
96BCB77A1CB40DC500C806FE
/* EdgeInsets.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
EdgeInsets.swift
;
sourceTree
=
"<group>"
;
};
...
@@ -465,6 +474,14 @@
...
@@ -465,6 +474,14 @@
name
=
Reminders
;
name
=
Reminders
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
96328B9A1E05C135009A4C90
/* Data */
=
{
isa
=
PBXGroup
;
children
=
(
96BCB7771CB40DC500C806FE
/* DataSourceItem.swift */
,
);
name
=
Data
;
sourceTree
=
"<group>"
;
};
9638322C1B88DFD80015F710
=
{
9638322C1B88DFD80015F710
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
...
@@ -559,6 +576,8 @@
...
@@ -559,6 +576,8 @@
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
96BCB7891CB40DC500C806FE
/* TableViewCell.swift */
,
96BCB7891CB40DC500C806FE
/* TableViewCell.swift */
,
96328B961E05C0BB009A4C90
/* TableView.swift */
,
96328B981E05C0CE009A4C90
/* TableViewController.swift */
,
);
);
name
=
Table
;
name
=
Table
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
...
@@ -609,6 +628,7 @@
...
@@ -609,6 +628,7 @@
96717B0C1DBE6AF600DA84DB
/* Capture */
,
96717B0C1DBE6AF600DA84DB
/* Capture */
,
96BCB8051CB40F9C00C806FE
/* Collection */
,
96BCB8051CB40F9C00C806FE
/* Collection */
,
96BCB8001CB40F0300C806FE
/* Color */
,
96BCB8001CB40F0300C806FE
/* Color */
,
96328B9A1E05C135009A4C90
/* Data */
,
96BCB80B1CB410CC00C806FE
/* Device */
,
96BCB80B1CB410CC00C806FE
/* Device */
,
96230AB61D6A51FD00AF47DC
/* Divider */
,
96230AB61D6A51FD00AF47DC
/* Divider */
,
961DED441DCC40AC00F425B6
/* Editor */
,
961DED441DCC40AC00F425B6
/* Editor */
,
...
@@ -717,7 +737,6 @@
...
@@ -717,7 +737,6 @@
96BCB7721CB40DC500C806FE
/* CollectionViewCell.swift */
,
96BCB7721CB40DC500C806FE
/* CollectionViewCell.swift */
,
966ECF291CF4C20100BB0BDF
/* CollectionReusableView.swift */
,
966ECF291CF4C20100BB0BDF
/* CollectionReusableView.swift */
,
96BCB7711CB40DC500C806FE
/* CollectionView.swift */
,
96BCB7711CB40DC500C806FE
/* CollectionView.swift */
,
96BCB7771CB40DC500C806FE
/* CollectionViewDataSourceItem.swift */
,
96BCB7751CB40DC500C806FE
/* CollectionViewLayout.swift */
,
96BCB7751CB40DC500C806FE
/* CollectionViewLayout.swift */
,
96328B791E020A41009A4C90
/* CollectionViewController.swift */
,
96328B791E020A41009A4C90
/* CollectionViewController.swift */
,
);
);
...
@@ -849,7 +868,7 @@
...
@@ -849,7 +868,7 @@
96BCB8161CB4115200C806FE
/* FlatButton.swift in Headers */
,
96BCB8161CB4115200C806FE
/* FlatButton.swift in Headers */
,
96BCB8171CB4115200C806FE
/* Button.swift in Headers */
,
96BCB8171CB4115200C806FE
/* Button.swift in Headers */
,
96BCB8181CB4115200C806FE
/* RaisedButton.swift in Headers */
,
96BCB8181CB4115200C806FE
/* RaisedButton.swift in Headers */
,
96BCB81E1CB4115200C806FE
/*
CollectionView
DataSourceItem.swift in Headers */
,
96BCB81E1CB4115200C806FE
/* DataSourceItem.swift in Headers */
,
96BCB81F1CB4115200C806FE
/* CollectionView.swift in Headers */
,
96BCB81F1CB4115200C806FE
/* CollectionView.swift in Headers */
,
96BCB8201CB4115200C806FE
/* CollectionViewCell.swift in Headers */
,
96BCB8201CB4115200C806FE
/* CollectionViewCell.swift in Headers */
,
96BCB8231CB4115200C806FE
/* CollectionViewLayout.swift in Headers */
,
96BCB8231CB4115200C806FE
/* CollectionViewLayout.swift in Headers */
,
...
@@ -925,6 +944,11 @@
...
@@ -925,6 +944,11 @@
9617B08F1DFCA8CF00410F8F
/* CharacterAttribute.swift in Headers */
,
9617B08F1DFCA8CF00410F8F
/* CharacterAttribute.swift in Headers */
,
9617B0901DFCA8CF00410F8F
/* Toolbar.swift in Headers */
,
9617B0901DFCA8CF00410F8F
/* Toolbar.swift in Headers */
,
9617B0911DFCA8CF00410F8F
/* ToolbarController.swift in Headers */
,
9617B0911DFCA8CF00410F8F
/* ToolbarController.swift in Headers */
,
96328B9B1E05C24E009A4C90
/* CollectionViewController.swift in Headers */
,
96328B9C1E05C24E009A4C90
/* Reminders.swift in Headers */
,
96328B9D1E05C24E009A4C90
/* RemindersController.swift in Headers */
,
96328B9E1E05C24E009A4C90
/* TableView.swift in Headers */
,
96328B9F1E05C24E009A4C90
/* TableViewController.swift in Headers */
,
);
);
runOnlyForDeploymentPostprocessing
=
0
;
runOnlyForDeploymentPostprocessing
=
0
;
};
};
...
@@ -1129,7 +1153,7 @@
...
@@ -1129,7 +1153,7 @@
965E81041DD4D5C800D61E4B
/* CollectionViewCell.swift in Sources */
,
965E81041DD4D5C800D61E4B
/* CollectionViewCell.swift in Sources */
,
965E81071DD4D5C800D61E4B
/* CollectionViewLayout.swift in Sources */
,
965E81071DD4D5C800D61E4B
/* CollectionViewLayout.swift in Sources */
,
965E81081DD4D5C800D61E4B
/* CollectionReusableView.swift in Sources */
,
965E81081DD4D5C800D61E4B
/* CollectionReusableView.swift in Sources */
,
965E81091DD4D5C800D61E4B
/*
CollectionView
DataSourceItem.swift in Sources */
,
965E81091DD4D5C800D61E4B
/* DataSourceItem.swift in Sources */
,
965E810A1DD4D5C800D61E4B
/* Font.swift in Sources */
,
965E810A1DD4D5C800D61E4B
/* Font.swift in Sources */
,
965E810B1DD4D5C800D61E4B
/* RobotoFont.swift in Sources */
,
965E810B1DD4D5C800D61E4B
/* RobotoFont.swift in Sources */
,
965E810C1DD4D5C800D61E4B
/* DynamicFontType.swift in Sources */
,
965E810C1DD4D5C800D61E4B
/* DynamicFontType.swift in Sources */
,
...
@@ -1169,10 +1193,12 @@
...
@@ -1169,10 +1193,12 @@
965E80E41DD4C53300D61E4B
/* PulseView.swift in Sources */
,
965E80E41DD4C53300D61E4B
/* PulseView.swift in Sources */
,
965E80E51DD4C53300D61E4B
/* MotionPulse.swift in Sources */
,
965E80E51DD4C53300D61E4B
/* MotionPulse.swift in Sources */
,
965E80FE1DD4D59500D61E4B
/* ToolbarController.swift in Sources */
,
965E80FE1DD4D59500D61E4B
/* ToolbarController.swift in Sources */
,
96328B971E05C0BB009A4C90
/* TableView.swift in Sources */
,
965E80C81DD4C50600D61E4B
/* Motion.swift in Sources */
,
965E80C81DD4C50600D61E4B
/* Motion.swift in Sources */
,
965E80C91DD4C50600D61E4B
/* MotionTransition.swift in Sources */
,
965E80C91DD4C50600D61E4B
/* MotionTransition.swift in Sources */
,
965E80CA1DD4C50600D61E4B
/* MotionKeyframe.swift in Sources */
,
965E80CA1DD4C50600D61E4B
/* MotionKeyframe.swift in Sources */
,
965E80F81DD4D59500D61E4B
/* ImageCard.swift in Sources */
,
965E80F81DD4D59500D61E4B
/* ImageCard.swift in Sources */
,
96328B991E05C0CE009A4C90
/* TableViewController.swift in Sources */
,
965E80F91DD4D59500D61E4B
/* PresenterCard.swift in Sources */
,
965E80F91DD4D59500D61E4B
/* PresenterCard.swift in Sources */
,
965E80CB1DD4C50600D61E4B
/* MotionBasic.swift in Sources */
,
965E80CB1DD4C50600D61E4B
/* MotionBasic.swift in Sources */
,
965E80CC1DD4C50600D61E4B
/* Bar.swift in Sources */
,
965E80CC1DD4C50600D61E4B
/* Bar.swift in Sources */
,
...
...
Sources/iOS/BottomNavigationController.swift
View file @
de0f26a3
...
@@ -141,7 +141,7 @@ open class BottomNavigationController: UITabBarController, UITabBarControllerDel
...
@@ -141,7 +141,7 @@ open class BottomNavigationController: UITabBarController, UITabBarControllerDel
open
func
prepare
()
{
open
func
prepare
()
{
view
.
clipsToBounds
=
true
view
.
clipsToBounds
=
true
view
.
contentScaleFactor
=
Screen
.
scale
view
.
contentScaleFactor
=
Screen
.
scale
view
.
backgroundColor
=
Color
.
white
view
.
backgroundColor
=
.
white
delegate
=
self
delegate
=
self
prepareTabBar
()
prepareTabBar
()
}
}
...
@@ -164,6 +164,6 @@ open class BottomNavigationController: UITabBarController, UITabBarControllerDel
...
@@ -164,6 +164,6 @@ open class BottomNavigationController: UITabBarController, UITabBarControllerDel
let
image
=
UIImage
.
image
(
with
:
Color
.
clear
,
size
:
CGSize
(
width
:
1
,
height
:
1
))
let
image
=
UIImage
.
image
(
with
:
Color
.
clear
,
size
:
CGSize
(
width
:
1
,
height
:
1
))
tabBar
.
shadowImage
=
image
tabBar
.
shadowImage
=
image
tabBar
.
backgroundImage
=
image
tabBar
.
backgroundImage
=
image
tabBar
.
backgroundColor
=
Color
.
white
tabBar
.
backgroundColor
=
.
white
}
}
}
}
Sources/iOS/CollectionViewController.swift
View file @
de0f26a3
...
@@ -35,9 +35,9 @@ public protocol CollectionViewDelegate: UICollectionViewDelegate {}
...
@@ -35,9 +35,9 @@ public protocol CollectionViewDelegate: UICollectionViewDelegate {}
public
protocol
CollectionViewDataSource
:
UICollectionViewDataSource
{
public
protocol
CollectionViewDataSource
:
UICollectionViewDataSource
{
/**
/**
Retrieves the data source items for the collectionView.
Retrieves the data source items for the collectionView.
- Returns: An Array of
CollectionView
DataSourceItem objects.
- Returns: An Array of DataSourceItem objects.
*/
*/
var
dataSourceItems
:
[
CollectionView
DataSourceItem
]
{
get
}
var
dataSourceItems
:
[
DataSourceItem
]
{
get
}
}
}
extension
UIViewController
{
extension
UIViewController
{
...
@@ -62,7 +62,7 @@ open class CollectionViewController: UIViewController {
...
@@ -62,7 +62,7 @@ open class CollectionViewController: UIViewController {
/// A reference to a Reminder.
/// A reference to a Reminder.
open
let
collectionView
=
CollectionView
()
open
let
collectionView
=
CollectionView
()
open
var
dataSourceItems
=
[
CollectionView
DataSourceItem
]()
open
var
dataSourceItems
=
[
DataSourceItem
]()
open
override
func
viewDidLoad
()
{
open
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
...
@@ -78,7 +78,7 @@ open class CollectionViewController: UIViewController {
...
@@ -78,7 +78,7 @@ open class CollectionViewController: UIViewController {
*/
*/
open
func
prepare
()
{
open
func
prepare
()
{
view
.
clipsToBounds
=
true
view
.
clipsToBounds
=
true
view
.
backgroundColor
=
Color
.
white
view
.
backgroundColor
=
.
white
view
.
contentScaleFactor
=
Screen
.
scale
view
.
contentScaleFactor
=
Screen
.
scale
prepareCollectionView
()
prepareCollectionView
()
}
}
...
@@ -94,6 +94,7 @@ extension CollectionViewController {
...
@@ -94,6 +94,7 @@ extension CollectionViewController {
}
}
extension
CollectionViewController
:
CollectionViewDelegate
{}
extension
CollectionViewController
:
CollectionViewDelegate
{}
extension
CollectionViewController
:
CollectionViewDataSource
{
extension
CollectionViewController
:
CollectionViewDataSource
{
@objc
@objc
open
func
numberOfSections
(
in
collectionView
:
UICollectionView
)
->
Int
{
open
func
numberOfSections
(
in
collectionView
:
UICollectionView
)
->
Int
{
...
...
Sources/iOS/CollectionViewLayout.swift
View file @
de0f26a3
...
@@ -54,7 +54,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
...
@@ -54,7 +54,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
open
fileprivate
(
set
)
lazy
var
layoutItems
=
[(
UICollectionViewLayoutAttributes
,
NSIndexPath
)]()
open
fileprivate
(
set
)
lazy
var
layoutItems
=
[(
UICollectionViewLayoutAttributes
,
NSIndexPath
)]()
/// Cell data source items.
/// Cell data source items.
open
fileprivate
(
set
)
var
dataSourceItems
:
[
CollectionView
DataSourceItem
]?
open
fileprivate
(
set
)
var
dataSourceItems
:
[
DataSourceItem
]?
/// Scroll direction.
/// Scroll direction.
open
var
scrollDirection
=
UICollectionViewScrollDirection
.
vertical
open
var
scrollDirection
=
UICollectionViewScrollDirection
.
vertical
...
@@ -129,7 +129,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
...
@@ -129,7 +129,7 @@ open class CollectionViewLayout: UICollectionViewLayout {
return
proposedContentOffset
return
proposedContentOffset
}
}
fileprivate
func
prepareLayoutForItems
(
dataSourceItems
:
[
CollectionView
DataSourceItem
])
{
fileprivate
func
prepareLayoutForItems
(
dataSourceItems
:
[
DataSourceItem
])
{
self
.
dataSourceItems
=
dataSourceItems
self
.
dataSourceItems
=
dataSourceItems
layoutItems
.
removeAll
()
layoutItems
.
removeAll
()
...
...
Sources/iOS/
CollectionView
DataSourceItem.swift
→
Sources/iOS/DataSourceItem.swift
View file @
de0f26a3
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
import
UIKit
import
UIKit
public
struct
CollectionView
DataSourceItem
{
public
struct
DataSourceItem
{
/// Stores an the data for the item.
/// Stores an the data for the item.
public
var
data
:
Any
?
public
var
data
:
Any
?
...
...
Sources/iOS/Reminders/RemindersController.swift
View file @
de0f26a3
...
@@ -66,7 +66,7 @@ open class RemindersController: UIViewController {
...
@@ -66,7 +66,7 @@ open class RemindersController: UIViewController {
*/
*/
open
func
prepare
()
{
open
func
prepare
()
{
view
.
clipsToBounds
=
true
view
.
clipsToBounds
=
true
view
.
backgroundColor
=
Color
.
white
view
.
backgroundColor
=
.
white
view
.
contentScaleFactor
=
Screen
.
scale
view
.
contentScaleFactor
=
Screen
.
scale
prepareReminders
()
prepareReminders
()
}
}
...
...
Sources/iOS/Snackbar.swift
View file @
de0f26a3
...
@@ -107,7 +107,7 @@ open class Snackbar: Bar {
...
@@ -107,7 +107,7 @@ open class Snackbar: Bar {
textLabel
.
contentScaleFactor
=
Screen
.
scale
textLabel
.
contentScaleFactor
=
Screen
.
scale
textLabel
.
font
=
RobotoFont
.
medium
(
with
:
14
)
textLabel
.
font
=
RobotoFont
.
medium
(
with
:
14
)
textLabel
.
textAlignment
=
.
left
textLabel
.
textAlignment
=
.
left
textLabel
.
textColor
=
Color
.
white
textLabel
.
textColor
=
.
white
textLabel
.
numberOfLines
=
0
textLabel
.
numberOfLines
=
0
}
}
}
}
Sources/iOS/TableView.swift
0 → 100644
View file @
de0f26a3
/*
* Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of CosmicMind nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
import
UIKit
open
class
TableView
:
UITableView
{}
Sources/iOS/TableViewController.swift
0 → 100644
View file @
de0f26a3
/*
* Copyright (C) 2015 - 2016, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.io>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of CosmicMind nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
import
UIKit
public
protocol
TableViewDelegate
:
UITableViewDelegate
{}
public
protocol
TableViewDataSource
:
UITableViewDataSource
{
/**
Retrieves the data source items for the tableView.
- Returns: An Array of DataSourceItem objects.
*/
var
dataSourceItems
:
[
DataSourceItem
]
{
get
}
}
extension
UIViewController
{
/**
A convenience property that provides access to the TableViewController.
This is the recommended method of accessing the TableViewController
through child UIViewControllers.
*/
public
var
tableViewController
:
TableViewController
?
{
var
viewController
:
UIViewController
?
=
self
while
nil
!=
viewController
{
if
viewController
is
TableViewController
{
return
viewController
as?
TableViewController
}
viewController
=
viewController
?
.
parent
}
return
nil
}
}
open
class
TableViewController
:
UIViewController
{
/// A reference to a Reminder.
open
let
tableView
=
TableView
()
/// An Array of DataSourceItems.
open
var
dataSourceItems
=
[
DataSourceItem
]()
open
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
prepare
()
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepareView method
to initialize property values and other setup operations.
The super.prepareView method should always be called immediately
when subclassing.
*/
open
func
prepare
()
{
view
.
clipsToBounds
=
true
view
.
backgroundColor
=
.
white
view
.
contentScaleFactor
=
Screen
.
scale
prepareTableView
()
}
}
extension
TableViewController
{
/// Prepares the tableView.
fileprivate
func
prepareTableView
()
{
tableView
.
delegate
=
self
tableView
.
dataSource
=
self
view
.
layout
(
tableView
)
.
edges
()
}
}
extension
TableViewController
:
TableViewDelegate
{}
extension
TableViewController
:
TableViewDataSource
{
@objc
open
func
numberOfSections
(
in
tableView
:
UITableView
)
->
Int
{
return
1
}
@objc
open
func
tableView
(
_
tableView
:
UITableView
,
numberOfRowsInSection
section
:
Int
)
->
Int
{
return
dataSourceItems
.
count
}
@objc
open
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
return
UITableViewCell
()
}
}
Sources/macOS/Color.swift
View file @
de0f26a3
...
@@ -67,7 +67,7 @@ open class Color: NSColor {
...
@@ -67,7 +67,7 @@ open class Color: NSColor {
// light text
// light text
open
class
lightText
{
open
class
lightText
{
open
static
let
primary
=
Color
.
white
open
static
let
primary
=
.
white
open
static
let
secondary
=
Color
.
white
.
withAlphaComponent
(
0.7
)
open
static
let
secondary
=
Color
.
white
.
withAlphaComponent
(
0.7
)
open
static
let
others
=
Color
.
white
.
withAlphaComponent
(
0.5
)
open
static
let
others
=
Color
.
white
.
withAlphaComponent
(
0.5
)
open
static
let
dividers
=
Color
.
white
.
withAlphaComponent
(
0.12
)
open
static
let
dividers
=
Color
.
white
.
withAlphaComponent
(
0.12
)
...
...
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