Skip to content

M
Material
Commit ffadec90 by Daniel Dahan
Options

updated Motion to swift-4.2 and fixed compiler issues.

parent 5081086a
Showing with 8 additions and 43 deletions
Material.xcodeproj/project.pbxproj
...@@ -326,7 +326,6 @@ ...@@ -326,7 +326,6 @@
children = ( children = (
96BCB7611CB40DC500C806FE /* Grid.swift */, 96BCB7611CB40DC500C806FE /* Grid.swift */,
); );
name = Grid;
path = Grid; path = Grid;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -340,7 +339,6 @@ ...@@ -340,7 +339,6 @@
96BCB79D1CB40DC500C806FE /* TextStorage.swift */, 96BCB79D1CB40DC500C806FE /* TextStorage.swift */,
96BCB79E1CB40DC500C806FE /* TextView.swift */, 96BCB79E1CB40DC500C806FE /* TextView.swift */,
); );
name = Text;
path = Text; path = Text;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -350,7 +348,6 @@ ...@@ -350,7 +348,6 @@
961154CB1F32A7B100A78D74 /* ChipBar.swift */, 961154CB1F32A7B100A78D74 /* ChipBar.swift */,
961527B81F3A509900E8B2AC /* ChipBarController.swift */, 961527B81F3A509900E8B2AC /* ChipBarController.swift */,
); );
name = Chip;
path = Chip; path = Chip;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -367,7 +364,6 @@ ...@@ -367,7 +364,6 @@
children = ( children = (
961E6BDE1DDA2A95004E6C93 /* Application.swift */, 961E6BDE1DDA2A95004E6C93 /* Application.swift */,
); );
name = Application;
path = Application; path = Application;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -376,7 +372,6 @@ ...@@ -376,7 +372,6 @@
children = ( children = (
961E6BE11DDA2AF3004E6C93 /* Screen.swift */, 961E6BE11DDA2AF3004E6C93 /* Screen.swift */,
); );
name = Screen;
path = Screen; path = Screen;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -385,7 +380,6 @@ ...@@ -385,7 +380,6 @@
children = ( children = (
96BCB7971CB40DC500C806FE /* NavigationDrawerController.swift */, 96BCB7971CB40DC500C806FE /* NavigationDrawerController.swift */,
); );
name = NavigationDrawer;
path = NavigationDrawer; path = NavigationDrawer;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -394,7 +388,6 @@ ...@@ -394,7 +388,6 @@
children = ( children = (
96230AB71D6A520C00AF47DC /* Divider.swift */, 96230AB71D6A520C00AF47DC /* Divider.swift */,
); );
name = Divider;
path = Divider; path = Divider;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -403,7 +396,6 @@ ...@@ -403,7 +396,6 @@
children = ( children = (
96BCB7981CB40DC500C806FE /* Bar.swift */, 96BCB7981CB40DC500C806FE /* Bar.swift */,
); );
name = Bar;
path = Bar; path = Bar;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -413,7 +405,6 @@ ...@@ -413,7 +405,6 @@
9626CA961DAB53A8003E2611 /* DisplayStyle.swift */, 9626CA961DAB53A8003E2611 /* DisplayStyle.swift */,
96BCB7991CB40DC500C806FE /* TransitionController.swift */, 96BCB7991CB40DC500C806FE /* TransitionController.swift */,
); );
name = Transition;
path = Transition; path = Transition;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -422,7 +413,6 @@ ...@@ -422,7 +413,6 @@
children = ( children = (
9626CB9A1DAD3D1D003E2611 /* HeightPreset.swift */, 9626CB9A1DAD3D1D003E2611 /* HeightPreset.swift */,
); );
name = Height;
path = Height; path = Height;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -431,7 +421,6 @@ ...@@ -431,7 +421,6 @@
children = ( children = (
96BCB7581CB40DC500C806FE /* BottomNavigationController.swift */, 96BCB7581CB40DC500C806FE /* BottomNavigationController.swift */,
); );
name = BottomTabBar;
path = BottomTabBar; path = BottomTabBar;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -448,7 +437,6 @@ ...@@ -448,7 +437,6 @@
children = ( children = (
96BCB7771CB40DC500C806FE /* DataSourceItem.swift */, 96BCB7771CB40DC500C806FE /* DataSourceItem.swift */,
); );
name = Data;
path = Data; path = Data;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -477,7 +465,6 @@ ...@@ -477,7 +465,6 @@
963FBEFC1D669510008F8512 /* Snackbar.swift */, 963FBEFC1D669510008F8512 /* Snackbar.swift */,
961EFC571D738FF600E84652 /* SnackbarController.swift */, 961EFC571D738FF600E84652 /* SnackbarController.swift */,
); );
name = Snackbar;
path = Snackbar; path = Snackbar;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -487,7 +474,6 @@ ...@@ -487,7 +474,6 @@
96BCB79F1CB40DC500C806FE /* Toolbar.swift */, 96BCB79F1CB40DC500C806FE /* Toolbar.swift */,
96BCB7A01CB40DC500C806FE /* ToolbarController.swift */, 96BCB7A01CB40DC500C806FE /* ToolbarController.swift */,
); );
name = Toolbar;
path = Toolbar; path = Toolbar;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -497,7 +483,6 @@ ...@@ -497,7 +483,6 @@
96BCB79A1CB40DC500C806FE /* TabBar.swift */, 96BCB79A1CB40DC500C806FE /* TabBar.swift */,
96E09DC71F2287E50000B121 /* TabsController.swift */, 96E09DC71F2287E50000B121 /* TabsController.swift */,
); );
name = Tab;
path = Tab; path = Tab;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -507,7 +492,6 @@ ...@@ -507,7 +492,6 @@
96A183621E0C6CE200083C30 /* FABMenu.swift */, 96A183621E0C6CE200083C30 /* FABMenu.swift */,
96A183641E0C6DD400083C30 /* FABMenuController.swift */, 96A183641E0C6DD400083C30 /* FABMenuController.swift */,
); );
name = FABMenu;
path = FABMenu; path = FABMenu;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -517,7 +501,6 @@ ...@@ -517,7 +501,6 @@
96BCB7951CB40DC500C806FE /* SearchBar.swift */, 96BCB7951CB40DC500C806FE /* SearchBar.swift */,
96BCB7961CB40DC500C806FE /* SearchBarController.swift */, 96BCB7961CB40DC500C806FE /* SearchBarController.swift */,
); );
name = SearchBar;
path = SearchBar; path = SearchBar;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -527,7 +510,6 @@ ...@@ -527,7 +510,6 @@
9656895E1F002F16001C656D /* CardCollectionViewCell.swift */, 9656895E1F002F16001C656D /* CardCollectionViewCell.swift */,
965689601F002F4C001C656D /* CardCollectionViewController.swift */, 965689601F002F4C001C656D /* CardCollectionViewController.swift */,
); );
name = CardCollectionView;
path = CardCollectionView; path = CardCollectionView;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -538,7 +520,6 @@ ...@@ -538,7 +520,6 @@
96BCB7891CB40DC500C806FE /* TableViewCell.swift */, 96BCB7891CB40DC500C806FE /* TableViewCell.swift */,
96328B981E05C0CE009A4C90 /* TableViewController.swift */, 96328B981E05C0CE009A4C90 /* TableViewController.swift */,
); );
name = Table;
path = Table; path = Table;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -547,7 +528,6 @@ ...@@ -547,7 +528,6 @@
children = ( children = (
967A48181D0F425A00B8CEB7 /* StatusBarController.swift */, 967A48181D0F425A00B8CEB7 /* StatusBarController.swift */,
); );
name = StatusBar;
path = StatusBar; path = StatusBar;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -564,7 +544,6 @@ ...@@ -564,7 +544,6 @@
children = ( children = (
96BCB7881CB40DC500C806FE /* Switch.swift */, 96BCB7881CB40DC500C806FE /* Switch.swift */,
); );
name = Switch;
path = Switch; path = Switch;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -637,7 +616,6 @@ ...@@ -637,7 +616,6 @@
children = ( children = (
96BCB7761CB40DC500C806FE /* Color.swift */, 96BCB7761CB40DC500C806FE /* Color.swift */,
); );
name = Color;
path = Color; path = Color;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -648,7 +626,6 @@ ...@@ -648,7 +626,6 @@
96BCB7911CB40DC500C806FE /* NavigationController.swift */, 96BCB7911CB40DC500C806FE /* NavigationController.swift */,
96BCB7921CB40DC500C806FE /* NavigationItem.swift */, 96BCB7921CB40DC500C806FE /* NavigationItem.swift */,
); );
name = Navigation;
path = Navigation; path = Navigation;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -659,7 +636,6 @@ ...@@ -659,7 +636,6 @@
96BCB7621CB40DC500C806FE /* ImageCard.swift */, 96BCB7621CB40DC500C806FE /* ImageCard.swift */,
9631A7C01D95E3AC00CFB109 /* PresenterCard.swift */, 9631A7C01D95E3AC00CFB109 /* PresenterCard.swift */,
); );
name = Card;
path = Card; path = Card;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -675,7 +651,6 @@ ...@@ -675,7 +651,6 @@
9DF352431FED20ED00B2A11B /* RadioButton.swift */, 9DF352431FED20ED00B2A11B /* RadioButton.swift */,
96BCB7931CB40DC500C806FE /* RaisedButton.swift */, 96BCB7931CB40DC500C806FE /* RaisedButton.swift */,
); );
name = Button;
path = Button; path = Button;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -687,7 +662,6 @@ ...@@ -687,7 +662,6 @@
9D494A37217F6B63003D66F1 /* LayoutAttribute.swift */, 9D494A37217F6B63003D66F1 /* LayoutAttribute.swift */,
9D494A3B217F6B7D003D66F1 /* LayoutConstraint.swift */, 9D494A3B217F6B7D003D66F1 /* LayoutConstraint.swift */,
); );
name = Layout;
path = Layout; path = Layout;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -701,7 +675,6 @@ ...@@ -701,7 +675,6 @@
96328B791E020A41009A4C90 /* CollectionViewController.swift */, 96328B791E020A41009A4C90 /* CollectionViewController.swift */,
96BCB7751CB40DC500C806FE /* CollectionViewLayout.swift */, 96BCB7751CB40DC500C806FE /* CollectionViewLayout.swift */,
); );
name = Collection;
path = Collection; path = Collection;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -716,7 +689,6 @@ ...@@ -716,7 +689,6 @@
968C99461D377849000074FF /* Offset.swift */, 968C99461D377849000074FF /* Offset.swift */,
96BCB7861CB40DC500C806FE /* Shape.swift */, 96BCB7861CB40DC500C806FE /* Shape.swift */,
); );
name = Type;
path = Type; path = Type;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -727,7 +699,6 @@ ...@@ -727,7 +699,6 @@
96BCB77B1CB40DC500C806FE /* Font.swift */, 96BCB77B1CB40DC500C806FE /* Font.swift */,
96BCB7941CB40DC500C806FE /* RobotoFont.swift */, 96BCB7941CB40DC500C806FE /* RobotoFont.swift */,
); );
name = Font;
path = Font; path = Font;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -736,7 +707,6 @@ ...@@ -736,7 +707,6 @@
children = ( children = (
96BCB77D1CB40DC500C806FE /* Icon.swift */, 96BCB77D1CB40DC500C806FE /* Icon.swift */,
); );
name = Icon;
path = Icon; path = Icon;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -757,7 +727,6 @@ ...@@ -757,7 +727,6 @@
9618006C1F4D384200CD77A1 /* Material+UIViewController.swift */, 9618006C1F4D384200CD77A1 /* Material+UIViewController.swift */,
962864591D53FE3E00690B69 /* Material+UIWindow.swift */, 962864591D53FE3E00690B69 /* Material+UIWindow.swift */,
); );
name = Extension;
path = Extension; path = Extension;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -766,7 +735,6 @@ ...@@ -766,7 +735,6 @@
children = ( children = (
96BCB7791CB40DC500C806FE /* Device.swift */, 96BCB7791CB40DC500C806FE /* Device.swift */,
); );
name = Device;
path = Device; path = Device;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -777,7 +745,6 @@ ...@@ -777,7 +745,6 @@
96BCB78C1CB40DC500C806FE /* View.swift */, 96BCB78C1CB40DC500C806FE /* View.swift */,
9D39A81A20FE8ED100BA8FA1 /* ViewController.swift */, 9D39A81A20FE8ED100BA8FA1 /* ViewController.swift */,
); );
name = View;
path = View; path = View;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -786,7 +753,6 @@ ...@@ -786,7 +753,6 @@
children = ( children = (
96BCB7801CB40DC500C806FE /* Layer.swift */, 96BCB7801CB40DC500C806FE /* Layer.swift */,
); );
name = Layer;
path = Layer; path = Layer;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -810,7 +776,6 @@ ...@@ -810,7 +776,6 @@
96BCB7821CB40DC500C806FE /* PulseAnimation.swift */, 96BCB7821CB40DC500C806FE /* PulseAnimation.swift */,
965532281E47E388005C2792 /* SpringAnimation.swift */, 965532281E47E388005C2792 /* SpringAnimation.swift */,
); );
name = Animation;
path = Animation; path = Animation;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -819,7 +784,6 @@ ...@@ -819,7 +784,6 @@
children = ( children = (
9D00EBB3216675FB00DBCD69 /* Theme.swift */, 9D00EBB3216675FB00DBCD69 /* Theme.swift */,
); );
name = Theme;
path = Theme; path = Theme;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -830,7 +794,6 @@ ...@@ -830,7 +794,6 @@
9DE25DE12170D7C0000C04DF /* DialogController.swift */, 9DE25DE12170D7C0000C04DF /* DialogController.swift */,
9DE25DE32170D7FF000C04DF /* DialogView.swift */, 9DE25DE32170D7FF000C04DF /* DialogView.swift */,
); );
name = Dialogs;
path = Dialogs; path = Dialogs;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -841,7 +804,6 @@ ...@@ -841,7 +804,6 @@
9DE84D711FF0252500586C8B /* CheckButtonGroup.swift */, 9DE84D711FF0252500586C8B /* CheckButtonGroup.swift */,
9DE84D6F1FF0252500586C8B /* RadioButtonGroup.swift */, 9DE84D6F1FF0252500586C8B /* RadioButtonGroup.swift */,
); );
name = ButtonGroup;
path = ButtonGroup; path = ButtonGroup;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -962,7 +924,7 @@ ...@@ -962,7 +924,7 @@
attributes = { attributes = {
LastSwiftMigration = 0710; LastSwiftMigration = 0710;
LastSwiftUpdateCheck = 0730; LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 1000; LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "CosmicMind, Inc."; ORGANIZATIONNAME = "CosmicMind, Inc.";
TargetAttributes = { TargetAttributes = {
963832351B88DFD80015F710 = { 963832351B88DFD80015F710 = {
...@@ -976,10 +938,11 @@ ...@@ -976,10 +938,11 @@
}; };
buildConfigurationList = 963832301B88DFD80015F710 /* Build configuration list for PBXProject "Material" */; buildConfigurationList = 963832301B88DFD80015F710 /* Build configuration list for PBXProject "Material" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = en;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
en, en,
Base,
); );
mainGroup = 9638322C1B88DFD80015F710; mainGroup = 9638322C1B88DFD80015F710;
productRefGroup = 963832371B88DFD80015F710 /* Products */; productRefGroup = 963832371B88DFD80015F710 /* Products */;
...@@ -1144,6 +1107,7 @@ ...@@ -1144,6 +1107,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
...@@ -1207,6 +1171,7 @@ ...@@ -1207,6 +1171,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
......
Material.xcodeproj/xcshareddata/xcschemes/Material.xcscheme
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1020"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
......
Motion @ 713926bc
Subproject commit 7c7f32529142fafe66eb37bd60134cfe14a942a0 Subproject commit 713926bca23ccfb6f68d2ffe525cdb91dc55ff44
Sources/iOS/Switch/Switch.swift
...@@ -405,7 +405,7 @@ fileprivate extension Switch { ...@@ -405,7 +405,7 @@ fileprivate extension Switch {
state was changed by a user interaction, true if yes, false otherwise. state was changed by a user interaction, true if yes, false otherwise.
- Parameter completion: An Optional completion block. - Parameter completion: An Optional completion block.
*/ */
fileprivate func updateSwitchState(state: SwitchState, animated: Bool, isTriggeredByUserInteraction: Bool, completion: ((Switch) -> Void)? = nil) { func updateSwitchState(state: SwitchState, animated: Bool, isTriggeredByUserInteraction: Bool, completion: ((Switch) -> Void)? = nil) {
guard isEnabled && internalSwitchState != state else { guard isEnabled && internalSwitchState != state else {
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment