Skip to content

M
Material
Commit 85a9bfc5 by Daniel Dahan
Options

updated sample projects

parent 26951675
Showing with 7 additions and 70 deletions
Examples/Programmatic/Bar/Bar.xcodeproj/project.pbxproj
......@@ -11,8 +11,6 @@
96D5A2891D91F24600D369C4 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D5A2881D91F24600D369C4 /* ViewController.swift */; };
96D5A28E1D91F24600D369C4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96D5A28D1D91F24600D369C4 /* Assets.xcassets */; };
96D5A2911D91F24600D369C4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96D5A28F1D91F24600D369C4 /* LaunchScreen.storyboard */; };
9AC456391D9DE68D00A7ABF0 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC456381D9DE68D00A7ABF0 /* Material.framework */; };
9AC4563A1D9DE68D00A7ABF0 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC456381D9DE68D00A7ABF0 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -22,7 +20,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
9AC4563A1D9DE68D00A7ABF0 /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -36,7 +33,6 @@
96D5A28D1D91F24600D369C4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
96D5A2901D91F24600D369C4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
96D5A2921D91F24600D369C4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9AC456381D9DE68D00A7ABF0 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Material.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -44,7 +40,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9AC456391D9DE68D00A7ABF0 /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -54,7 +49,6 @@
96D5A27A1D91F24600D369C4 = {
isa = PBXGroup;
children = (
9AC456381D9DE68D00A7ABF0 /* Material.framework */,
96D5A2851D91F24600D369C4 /* Bar */,
96D5A2841D91F24600D369C4 /* Products */,
);
......
Examples/Programmatic/BottomNavigationController/BottomNavigationController.xcodeproj/project.pbxproj
......@@ -16,8 +16,6 @@
96784FCC1D9069370061C06C /* AudioViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784FCB1D9069370061C06C /* AudioViewController.swift */; };
96784FCE1D90695C0061C06C /* RemindersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784FCD1D90695C0061C06C /* RemindersViewController.swift */; };
96784FD01D9069B20061C06C /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784FCF1D9069B20061C06C /* SearchViewController.swift */; };
9AC455F81D9DD6A700A7ABF0 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC455F71D9DD6A700A7ABF0 /* Material.framework */; };
9AC455F91D9DD6A700A7ABF0 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC455F71D9DD6A700A7ABF0 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -27,7 +25,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
9AC455F91D9DD6A700A7ABF0 /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -46,7 +43,6 @@
96784FCB1D9069370061C06C /* AudioViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioViewController.swift; sourceTree = "<group>"; };
96784FCD1D90695C0061C06C /* RemindersViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemindersViewController.swift; sourceTree = "<group>"; };
96784FCF1D9069B20061C06C /* SearchViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
9AC455F71D9DD6A700A7ABF0 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Material.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -54,7 +50,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9AC455F81D9DD6A700A7ABF0 /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -64,7 +59,6 @@
96784F851D9021530061C06C = {
isa = PBXGroup;
children = (
9AC455F71D9DD6A700A7ABF0 /* Material.framework */,
96784F901D9021530061C06C /* BottomNavigationController */,
96784F8F1D9021530061C06C /* Products */,
);
......
Examples/Programmatic/BottomNavigationController/BottomNavigationController/AppBottomNavigationController.swift
......@@ -37,22 +37,6 @@ class AppBottomNavigationController: BottomNavigationController {
prepareTabBar()
}
func tabBarController(_ tabBarController: UITabBarController, shouldSelectViewController viewController: UIViewController) -> Bool {
// if let _ = viewController as? PhotoBarController {
// let vc = PhotoSnackbarController()
// vc.modalTransitionStyle = .coverVertical
// present(vc, animated: true, completion: nil)
// return false
// } else if let _ = viewController as? SearchBarController {
// let vc = SearchSnackbarController()
// vc.modalTransitionStyle = .crossDissolve
// present(vc, animated: true, completion: nil)
// return false
// }
return true
}
/// Prepares the tabBar.
private func prepareTabBar() {
tabBar.depthPreset = .none
tabBar.dividerColor = Color.grey.lighten3
......
Examples/Programmatic/SnackbarController/SnackbarController.xcodeproj/project.pbxproj
......@@ -12,8 +12,6 @@
9697F7A81D8F2058004741EC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9697F7A71D8F2058004741EC /* Assets.xcassets */; };
9697F7AB1D8F2058004741EC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9697F7A91D8F2058004741EC /* LaunchScreen.storyboard */; };
9697F7B31D8F208F004741EC /* AppSnackbarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9697F7B21D8F208F004741EC /* AppSnackbarController.swift */; };
9AC456281D9DDCD000A7ABF0 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC456271D9DDCD000A7ABF0 /* Material.framework */; };
9AC456291D9DDCD000A7ABF0 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC456271D9DDCD000A7ABF0 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -23,7 +21,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
9AC456291D9DDCD000A7ABF0 /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -38,7 +35,6 @@
9697F7AA1D8F2058004741EC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
9697F7AC1D8F2058004741EC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9697F7B21D8F208F004741EC /* AppSnackbarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppSnackbarController.swift; sourceTree = "<group>"; };
9AC456271D9DDCD000A7ABF0 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Material.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -46,7 +42,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9AC456281D9DDCD000A7ABF0 /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -56,7 +51,6 @@
9697F7941D8F2058004741EC = {
isa = PBXGroup;
children = (
9AC456271D9DDCD000A7ABF0 /* Material.framework */,
9697F79F1D8F2058004741EC /* SnackbarController */,
9697F79E1D8F2058004741EC /* Products */,
);
......
Examples/Programmatic/StatusBarController/StatusBarController.xcodeproj/project.pbxproj
......@@ -12,8 +12,6 @@
96784EEB1D9012B00061C06C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96784EEA1D9012B00061C06C /* Assets.xcassets */; };
96784EEE1D9012B10061C06C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96784EEC1D9012B10061C06C /* LaunchScreen.storyboard */; };
96784F1A1D901DEF0061C06C /* AppStatusBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784F191D901DEF0061C06C /* AppStatusBarController.swift */; };
9AC4562F1D9DDDF800A7ABF0 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC4562E1D9DDDF800A7ABF0 /* Material.framework */; };
9AC456301D9DDDF800A7ABF0 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC4562E1D9DDDF800A7ABF0 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -23,7 +21,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
9AC456301D9DDDF800A7ABF0 /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -38,7 +35,6 @@
96784EED1D9012B10061C06C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
96784EEF1D9012B10061C06C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
96784F191D901DEF0061C06C /* AppStatusBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppStatusBarController.swift; sourceTree = "<group>"; };
9AC4562E1D9DDDF800A7ABF0 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Material.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -46,7 +42,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9AC4562F1D9DDDF800A7ABF0 /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -56,7 +51,6 @@
96784ED71D9012B00061C06C = {
isa = PBXGroup;
children = (
9AC4562E1D9DDDF800A7ABF0 /* Material.framework */,
96784EE21D9012B00061C06C /* StatusBarController */,
96784EE11D9012B00061C06C /* Products */,
);
......
Examples/Programmatic/ToolbarController/ToolbarController.xcodeproj/project.pbxproj
......@@ -12,8 +12,6 @@
96784EAF1D9012730061C06C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96784EAE1D9012730061C06C /* Assets.xcassets */; };
96784EB21D9012730061C06C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96784EB01D9012730061C06C /* LaunchScreen.storyboard */; };
96784F141D9014410061C06C /* AppToolbarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784F131D9014410061C06C /* AppToolbarController.swift */; };
9AC456251D9DDBE600A7ABF0 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC456241D9DDBE600A7ABF0 /* Material.framework */; };
9AC456261D9DDBE600A7ABF0 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC456241D9DDBE600A7ABF0 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -23,7 +21,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
9AC456261D9DDBE600A7ABF0 /* Material.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -38,7 +35,6 @@
96784EB11D9012730061C06C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
96784EB31D9012730061C06C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
96784F131D9014410061C06C /* AppToolbarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppToolbarController.swift; sourceTree = "<group>"; };
9AC456241D9DDBE600A7ABF0 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Material.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -46,7 +42,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9AC456251D9DDBE600A7ABF0 /* Material.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -56,7 +51,6 @@
96784E9B1D9012730061C06C = {
isa = PBXGroup;
children = (
9AC456241D9DDBE600A7ABF0 /* Material.framework */,
96784EA61D9012730061C06C /* ToolbarController */,
96784EA51D9012730061C06C /* Products */,
);
......
Examples/Storyboards/BottomNavigationController/BottomNavigationController.xcodeproj/project.pbxproj
......@@ -66,9 +66,9 @@
children = (
9AC456061D9DD77C00A7ABF0 /* AppDelegate.swift */,
9AC456181D9DD82100A7ABF0 /* AppBottomNavigationController.swift */,
9AC4561B1D9DD82100A7ABF0 /* PhotoViewController.swift */,
9AC456191D9DD82100A7ABF0 /* VideoViewController.swift */,
9AC4561A1D9DD82100A7ABF0 /* AudioViewController.swift */,
9AC4561B1D9DD82100A7ABF0 /* PhotoViewController.swift */,
9AC4561C1D9DD82100A7ABF0 /* RemindersViewController.swift */,
9AC4561D1D9DD82100A7ABF0 /* SearchViewController.swift */,
9AC4560A1D9DD77C00A7ABF0 /* Main.storyboard */,
......
Examples/Storyboards/BottomNavigationController/BottomNavigationController/AppBottomNavigationController.swift
......@@ -37,22 +37,6 @@ class AppBottomNavigationController: BottomNavigationController {
prepareTabBar()
}
func tabBarController(_ tabBarController: UITabBarController, shouldSelectViewController viewController: UIViewController) -> Bool {
// if let _ = viewController as? PhotoBarController {
// let vc = PhotoSnackbarController()
// vc.modalTransitionStyle = .coverVertical
// present(vc, animated: true, completion: nil)
// return false
// } else if let _ = viewController as? SearchBarController {
// let vc = SearchSnackbarController()
// vc.modalTransitionStyle = .crossDissolve
// present(vc, animated: true, completion: nil)
// return false
// }
return true
}
/// Prepares the tabBar.
private func prepareTabBar() {
tabBar.depthPreset = .none
tabBar.divider.color = Color.grey.lighten3
......
Examples/Storyboards/BottomNavigationController/BottomNavigationController/AppDelegate.swift
......@@ -9,7 +9,6 @@
import UIKit
extension UIStoryboard {
class func viewController(identifier: String) -> UIViewController {
return UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: identifier)
}
......
Examples/Storyboards/NavigationDrawerController/NavigationDrawerController.xcodeproj/project.pbxproj
......@@ -75,8 +75,8 @@
children = (
9AC455AF1D9DC7BD00A7ABF0 /* AppDelegate.swift */,
9AC455CB1D9DC8ED00A7ABF0 /* AppNavigationDrawerController.swift */,
9AC455C51D9DC8E500A7ABF0 /* LeftViewController.swift */,
9AC455C61D9DC8E500A7ABF0 /* RootViewController.swift */,
9AC455C51D9DC8E500A7ABF0 /* LeftViewController.swift */,
9AC455C71D9DC8E500A7ABF0 /* RightViewController.swift */,
9AC455B31D9DC7BE00A7ABF0 /* Main.storyboard */,
9AC455B61D9DC7BE00A7ABF0 /* Assets.xcassets */,
......
Examples/Storyboards/NavigationDrawerController/NavigationDrawerController/AppDelegate.swift
......@@ -32,7 +32,6 @@ import UIKit
import Material
extension UIStoryboard {
class func viewController(identifier: String) -> UIViewController {
return UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: identifier)
}
......
Examples/Storyboards/NavigationDrawerController/NavigationDrawerController/LeftViewController.swift
......@@ -34,5 +34,6 @@ import Material
class LeftViewController: UIViewController {
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.blue.base
}
}
Examples/Storyboards/NavigationDrawerController/NavigationDrawerController/RightViewController.swift
......@@ -34,5 +34,6 @@ import Material
class RightViewController: UIViewController {
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.blue.base
}
}
Examples/Storyboards/PageTabBarController/PageTabBarController/AppDelegate.swift
......@@ -9,7 +9,6 @@
import UIKit
extension UIStoryboard {
class func viewController(identifier: String) -> UIViewController {
return UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: identifier)
}
......
Examples/Storyboards/SnackbarController/SnackbarController/RootViewController.swift
......@@ -37,7 +37,7 @@ class RootViewController: UIViewController {
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.grey.lighten1
view.backgroundColor = Color.grey.lighten5
prepareUndoButton()
}
......@@ -51,7 +51,7 @@ class RootViewController: UIViewController {
private func prepareUndoButton() {
undoButton = FlatButton(title: "Undo", titleColor: Color.yellow.base)
undoButton.pulse.animation = .backing
undoButton.pulseAnimation = .backing
undoButton.titleLabel?.font = RobotoFont.regular(with: 14)
}
......
Examples/Storyboards/StatusBarController/StatusBarController/RootViewController.swift
......@@ -34,7 +34,7 @@ import Material
class RootViewController: UIViewController {
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.grey.lighten1
view.backgroundColor = Color.grey.lighten5
}
}
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