Skip to content

M
Material
Commit e773c782 by Daniel Dahan
Options

storyboard-examples: preparation for 2.1.1 release

parent f1c4b4d9
Showing with 286 additions and 160 deletions
Examples/Programmatic/NavigationController/NavigationController/RootViewController.swift
...@@ -36,7 +36,6 @@ class RootViewController: UIViewController { ...@@ -36,7 +36,6 @@ class RootViewController: UIViewController {
private var menuButton: IconButton! private var menuButton: IconButton!
private var starButton: IconButton! private var starButton: IconButton!
private var searchButton: IconButton! private var searchButton: IconButton!
private var switchControl: Switch!
/// Trigger to go to the next view controller. /// Trigger to go to the next view controller.
private var nextButton: FlatButton! private var nextButton: FlatButton!
...@@ -78,9 +77,7 @@ class RootViewController: UIViewController { ...@@ -78,9 +77,7 @@ class RootViewController: UIViewController {
navigationItem.detail = "Build Beautiful Software" navigationItem.detail = "Build Beautiful Software"
navigationItem.detailLabel.textColor = Color.lightBlue.lighten5 navigationItem.detailLabel.textColor = Color.lightBlue.lighten5
switchControl = Switch() navigationItem.leftViews = [menuButton]
navigationItem.leftViews = [switchControl, menuButton]
navigationItem.rightViews = [starButton, searchButton] navigationItem.rightViews = [starButton, searchButton]
} }
......
Examples/Programmatic/NavigationDrawerController/NavigationDrawerController.xcodeproj/project.pbxproj
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
96784E8C1D8FFEA20061C06C /* LeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784E8B1D8FFEA10061C06C /* LeftViewController.swift */; }; 96784E8C1D8FFEA20061C06C /* LeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784E8B1D8FFEA10061C06C /* LeftViewController.swift */; };
96784E8E1D8FFEC80061C06C /* RightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784E8D1D8FFEC80061C06C /* RightViewController.swift */; }; 96784E8E1D8FFEC80061C06C /* RightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784E8D1D8FFEC80061C06C /* RightViewController.swift */; };
96784E901D8FFEEF0061C06C /* AppNavigationDrawerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784E8F1D8FFEEF0061C06C /* AppNavigationDrawerController.swift */; }; 96784E901D8FFEEF0061C06C /* AppNavigationDrawerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96784E8F1D8FFEEF0061C06C /* AppNavigationDrawerController.swift */; };
968948791DA995C400DA9FD9 /* AppToolbarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 968948781DA995C400DA9FD9 /* AppToolbarController.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
96784E8B1D8FFEA10061C06C /* LeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LeftViewController.swift; sourceTree = "<group>"; }; 96784E8B1D8FFEA10061C06C /* LeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LeftViewController.swift; sourceTree = "<group>"; };
96784E8D1D8FFEC80061C06C /* RightViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RightViewController.swift; sourceTree = "<group>"; }; 96784E8D1D8FFEC80061C06C /* RightViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RightViewController.swift; sourceTree = "<group>"; };
96784E8F1D8FFEEF0061C06C /* AppNavigationDrawerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppNavigationDrawerController.swift; sourceTree = "<group>"; }; 96784E8F1D8FFEEF0061C06C /* AppNavigationDrawerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppNavigationDrawerController.swift; sourceTree = "<group>"; };
968948781DA995C400DA9FD9 /* AppToolbarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppToolbarController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -73,6 +75,7 @@ ...@@ -73,6 +75,7 @@
children = ( children = (
96784E761D8FFE230061C06C /* AppDelegate.swift */, 96784E761D8FFE230061C06C /* AppDelegate.swift */,
96784E8F1D8FFEEF0061C06C /* AppNavigationDrawerController.swift */, 96784E8F1D8FFEEF0061C06C /* AppNavigationDrawerController.swift */,
968948781DA995C400DA9FD9 /* AppToolbarController.swift */,
96784E781D8FFE230061C06C /* RootViewController.swift */, 96784E781D8FFE230061C06C /* RootViewController.swift */,
96784E8B1D8FFEA10061C06C /* LeftViewController.swift */, 96784E8B1D8FFEA10061C06C /* LeftViewController.swift */,
96784E8D1D8FFEC80061C06C /* RightViewController.swift */, 96784E8D1D8FFEC80061C06C /* RightViewController.swift */,
...@@ -156,6 +159,7 @@ ...@@ -156,6 +159,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
96784E8C1D8FFEA20061C06C /* LeftViewController.swift in Sources */, 96784E8C1D8FFEA20061C06C /* LeftViewController.swift in Sources */,
968948791DA995C400DA9FD9 /* AppToolbarController.swift in Sources */,
96784E8E1D8FFEC80061C06C /* RightViewController.swift in Sources */, 96784E8E1D8FFEC80061C06C /* RightViewController.swift in Sources */,
96784E901D8FFEEF0061C06C /* AppNavigationDrawerController.swift in Sources */, 96784E901D8FFEEF0061C06C /* AppNavigationDrawerController.swift in Sources */,
96784E791D8FFE230061C06C /* RootViewController.swift in Sources */, 96784E791D8FFE230061C06C /* RootViewController.swift in Sources */,
......
Examples/Programmatic/NavigationDrawerController/NavigationDrawerController/AppDelegate.swift
...@@ -37,8 +37,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ...@@ -37,8 +37,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow? var window: UIWindow?
func applicationDidFinishLaunching(_ application: UIApplication) { func applicationDidFinishLaunching(_ application: UIApplication) {
let appToolbarController = AppToolbarController(rootViewController: RootViewController())
let leftViewController = LeftViewController()
let rightViewController = RightViewController()
window = UIWindow(frame: Device.bounds) window = UIWindow(frame: Device.bounds)
window!.rootViewController = AppNavigationDrawerController(rootViewController: RootViewController(), leftViewController: LeftViewController(), rightViewController: RightViewController()) window!.rootViewController = AppNavigationDrawerController(rootViewController: appToolbarController, leftViewController: leftViewController, rightViewController: rightViewController)
window!.makeKeyAndVisible() window!.makeKeyAndVisible()
} }
} }
......
Examples/Programmatic/NavigationDrawerController/NavigationDrawerController/AppToolbarController.swift 0 → 100644
/*
* 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
import Material
class AppToolbarController: ToolbarController {
open override func prepare() {
super.prepare()
statusBarStyle = .default
}
}
Examples/Programmatic/NavigationDrawerController/NavigationDrawerController/RootViewController.swift
...@@ -32,8 +32,62 @@ import UIKit ...@@ -32,8 +32,62 @@ import UIKit
import Material import Material
class RootViewController: UIViewController { class RootViewController: UIViewController {
/// Toolbar buttons.
private var menuButton: IconButton!
private var switchControl: Switch!
private var moreButton: IconButton!
open override func viewDidLoad() { open override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = Color.white view.backgroundColor = Color.white
} }
open override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
prepareMenuButton()
prepareSwitch()
prepareMoreButton()
prepareToolbar()
}
@objc
internal func handleMenuButton() {
navigationDrawerController?.toggleLeftView()
}
@objc
internal func handleMoreButton() {
navigationDrawerController?.toggleRightView()
}
private func prepareMenuButton() {
menuButton = IconButton(image: Icon.cm.menu, tintColor: Color.blue.base)
menuButton.addTarget(self, action: #selector(handleMenuButton), for: .touchUpInside)
}
private func prepareSwitch() {
switchControl = Switch(state: .off, style: .light, size: .small)
}
private func prepareMoreButton() {
moreButton = IconButton(image: Icon.cm.moreVertical, tintColor: Color.blue.base)
moreButton.addTarget(self, action: #selector(handleMoreButton), for: .touchUpInside)
}
private func prepareToolbar() {
guard let tc = toolbarController else {
return
}
tc.toolbar.title = "Marterial"
// tc.toolbar.titleLabel.textAlignment = .left
tc.toolbar.detail = "Build Beautiful Software"
// tc.toolbar.detailLabel.textAlignment = .left
tc.toolbar.leftViews = [menuButton]
tc.toolbar.rightViews = [switchControl, moreButton]
}
} }
Examples/Programmatic/PageTabBarController/PageTabBarController/BlueViewController.swift
...@@ -47,8 +47,7 @@ class BlueViewController: UIViewController { ...@@ -47,8 +47,7 @@ class BlueViewController: UIViewController {
view.backgroundColor = Color.blue.base view.backgroundColor = Color.blue.base
} }
/// Prepares the pageTabBarItem. private func preparePageTabBarItem() {
internal func preparePageTabBarItem() {
pageTabBarItem.title = "Blue" pageTabBarItem.title = "Blue"
pageTabBarItem.titleColor = Color.blueGrey.base pageTabBarItem.titleColor = Color.blueGrey.base
} }
......
Examples/Programmatic/PageTabBarController/PageTabBarController/GreenViewController.swift
...@@ -47,8 +47,7 @@ class GreenViewController: UIViewController { ...@@ -47,8 +47,7 @@ class GreenViewController: UIViewController {
view.backgroundColor = Color.green.base view.backgroundColor = Color.green.base
} }
/// Prepares the pageTabBarItem. private func preparePageTabBarItem() {
internal func preparePageTabBarItem() {
pageTabBarItem.title = "Green" pageTabBarItem.title = "Green"
pageTabBarItem.titleColor = Color.blueGrey.base pageTabBarItem.titleColor = Color.blueGrey.base
} }
......
Examples/Programmatic/PageTabBarController/PageTabBarController/RedViewController.swift
...@@ -47,8 +47,7 @@ class RedViewController: UIViewController { ...@@ -47,8 +47,7 @@ class RedViewController: UIViewController {
view.backgroundColor = Color.red.base view.backgroundColor = Color.red.base
} }
/// Prepares the pageTabBarItem. private func preparePageTabBarItem() {
internal func preparePageTabBarItem() {
pageTabBarItem.title = "Red" pageTabBarItem.title = "Red"
pageTabBarItem.titleColor = Color.blueGrey.base pageTabBarItem.titleColor = Color.blueGrey.base
} }
......
Examples/Programmatic/SearchBarController/SearchBarController/RootViewController.swift
...@@ -32,7 +32,6 @@ import UIKit ...@@ -32,7 +32,6 @@ import UIKit
import Material import Material
class RootViewController: UIViewController { class RootViewController: UIViewController {
/// SearchBar buttons.
private var menuButton: IconButton! private var menuButton: IconButton!
private var moreButton: IconButton! private var moreButton: IconButton!
......
Examples/Programmatic/SnackbarController/SnackbarController/RootViewController.swift
...@@ -32,27 +32,26 @@ import UIKit ...@@ -32,27 +32,26 @@ import UIKit
import Material import Material
class RootViewController: UIViewController { class RootViewController: UIViewController {
/// A reference to the Undo button.
private var undoButton: FlatButton! private var undoButton: FlatButton!
open override func viewDidLoad() { open override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = Color.white view.backgroundColor = Color.grey.lighten5
prepareUndoButton()
} }
open override func viewDidAppear(_ animated: Bool) { open override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated) super.viewDidAppear(animated)
prepareUndoButton()
prepareSnackbar() prepareSnackbar()
animateSnackbar() animateSnackbar()
scheduleAnimation()
} }
private func prepareUndoButton() { private func prepareUndoButton() {
undoButton = FlatButton(title: "Undo", titleColor: Color.yellow.base) undoButton = FlatButton(title: "Undo", titleColor: Color.yellow.base)
undoButton.pulseAnimation = .backing undoButton.pulseAnimation = .backing
undoButton.titleLabel?.font = RobotoFont.regular(with: 14) undoButton.titleLabel?.font = snackbarController?.snackbar.textLabel.font
} }
private func prepareSnackbar() { private func prepareSnackbar() {
...@@ -64,6 +63,11 @@ class RootViewController: UIViewController { ...@@ -64,6 +63,11 @@ class RootViewController: UIViewController {
sc.snackbar.rightViews = [undoButton] sc.snackbar.rightViews = [undoButton]
} }
private func scheduleAnimation() {
_ = Timer.scheduledTimer(timeInterval: 6, target: self, selector: #selector(animateSnackbar), userInfo: nil, repeats: true)
}
@objc
private func animateSnackbar() { private func animateSnackbar() {
guard let sc = snackbarController else { guard let sc = snackbarController else {
return return
......
Examples/Storyboards/BottomNavigationController/BottomNavigationController.xcodeproj/project.pbxproj
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = BottomNavigationController/Info.plist; INFOPLIST_FILE = BottomNavigationController/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.BottomNavigationController; PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.BottomNavigationController;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 3.0;
}; };
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = BottomNavigationController/Info.plist; INFOPLIST_FILE = BottomNavigationController/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.BottomNavigationController; PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.BottomNavigationController;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 3.0;
}; };
......
Examples/Storyboards/BottomNavigationController/BottomNavigationController/AudioViewController.swift
...@@ -37,15 +37,14 @@ class AudioViewController: UIViewController { ...@@ -37,15 +37,14 @@ class AudioViewController: UIViewController {
prepareTabBarItem() prepareTabBarItem()
} }
/// Prepare tabBarItem. open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.blue.base
}
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.title = nil tabBarItem.title = nil
tabBarItem.image = Icon.cm.audioLibrary?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.image = Icon.cm.audioLibrary?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal)
tabBarItem.selectedImage = Icon.cm.audioLibrary?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.selectedImage = Icon.cm.audioLibrary?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal)
} }
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.blue.base
}
} }
Examples/Storyboards/BottomNavigationController/BottomNavigationController/Info.plist
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
</dict> </dict>
</plist> </plist>
Examples/Storyboards/BottomNavigationController/BottomNavigationController/PhotoViewController.swift
...@@ -37,15 +37,14 @@ class PhotoViewController: UIViewController { ...@@ -37,15 +37,14 @@ class PhotoViewController: UIViewController {
prepareTabBarItem() prepareTabBarItem()
} }
/// Prepare tabBarItem. open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.red.base
}
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.title = nil tabBarItem.title = nil
tabBarItem.image = Icon.cm.photoCamera?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.image = Icon.cm.photoCamera?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal)
tabBarItem.selectedImage = Icon.cm.photoCamera?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.selectedImage = Icon.cm.photoCamera?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal)
} }
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.red.base
}
} }
Examples/Storyboards/BottomNavigationController/BottomNavigationController/RemindersViewController.swift
...@@ -37,15 +37,14 @@ class RemindersViewController: UIViewController { ...@@ -37,15 +37,14 @@ class RemindersViewController: UIViewController {
prepareTabBarItem() prepareTabBarItem()
} }
/// Prepare tabBarItem. open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.yellow.base
}
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.title = nil tabBarItem.title = nil
tabBarItem.image = Icon.cm.bell?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.image = Icon.cm.bell?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal)
tabBarItem.selectedImage = Icon.cm.bell?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.selectedImage = Icon.cm.bell?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal)
} }
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.yellow.base
}
} }
Examples/Storyboards/BottomNavigationController/BottomNavigationController/SearchViewController.swift
...@@ -37,15 +37,14 @@ class SearchViewController: UIViewController { ...@@ -37,15 +37,14 @@ class SearchViewController: UIViewController {
prepareTabBarItem() prepareTabBarItem()
} }
/// Prepare tabBarItem. open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.blueGrey.base
}
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.title = nil tabBarItem.title = nil
tabBarItem.image = Icon.cm.search?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.image = Icon.cm.search?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal)
tabBarItem.selectedImage = Icon.cm.search?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.selectedImage = Icon.cm.search?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal)
} }
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.blueGrey.base
}
} }
Examples/Storyboards/BottomNavigationController/BottomNavigationController/VideoViewController.swift
...@@ -37,15 +37,14 @@ class VideoViewController: UIViewController { ...@@ -37,15 +37,14 @@ class VideoViewController: UIViewController {
prepareTabBarItem() prepareTabBarItem()
} }
/// Prepare tabBarItem. open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.green.base
}
private func prepareTabBarItem() { private func prepareTabBarItem() {
tabBarItem.title = nil tabBarItem.title = nil
tabBarItem.image = Icon.cm.videocam?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.image = Icon.cm.videocam?.tintWithColor(color: Color.blueGrey.base)?.withRenderingMode(.alwaysOriginal)
tabBarItem.selectedImage = Icon.cm.videocam?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal) tabBarItem.selectedImage = Icon.cm.videocam?.tintWithColor(color: Color.blue.base)?.withRenderingMode(.alwaysOriginal)
} }
open override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = Color.green.base
}
} }
Examples/Storyboards/Button/Button.xcodeproj/project.pbxproj
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Button/Info.plist; INFOPLIST_FILE = Button/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.Button; PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.Button;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 3.0;
}; };
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Button/Info.plist; INFOPLIST_FILE = Button/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.Button; PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.Button;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 3.0;
}; };
......
Examples/Storyboards/Button/Button/AppDelegate.swift
...@@ -34,6 +34,5 @@ import UIKit ...@@ -34,6 +34,5 @@ import UIKit
class AppDelegate: UIResponder, UIApplicationDelegate { class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow? var window: UIWindow?
} }
Examples/Storyboards/Button/Button/Info.plist
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
</dict> </dict>
</plist> </plist>
Examples/Storyboards/NavigationController/NavigationController.xcodeproj/project.pbxproj
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
9689485C1DA97CD400DA9FD9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9689485B1DA97CD400DA9FD9 /* Main.storyboard */; };
96CC49CD1D8DD984002CAB55 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC49CC1D8DD984002CAB55 /* AppDelegate.swift */; }; 96CC49CD1D8DD984002CAB55 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC49CC1D8DD984002CAB55 /* AppDelegate.swift */; };
96CC49CF1D8DD984002CAB55 /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC49CE1D8DD984002CAB55 /* RootViewController.swift */; }; 96CC49CF1D8DD984002CAB55 /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC49CE1D8DD984002CAB55 /* RootViewController.swift */; };
96CC49D41D8DD984002CAB55 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96CC49D31D8DD984002CAB55 /* Assets.xcassets */; }; 96CC49D41D8DD984002CAB55 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96CC49D31D8DD984002CAB55 /* Assets.xcassets */; };
96CC49D71D8DD984002CAB55 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96CC49D51D8DD984002CAB55 /* LaunchScreen.storyboard */; }; 96CC49D71D8DD984002CAB55 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 96CC49D51D8DD984002CAB55 /* LaunchScreen.storyboard */; };
96CC49E51D8DDF61002CAB55 /* NextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC49E41D8DDF61002CAB55 /* NextViewController.swift */; }; 96CC49E51D8DDF61002CAB55 /* NextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC49E41D8DDF61002CAB55 /* NextViewController.swift */; };
9A5634E11D9EF705004BFC00 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9A5634E01D9EF705004BFC00 /* Main.storyboard */; };
9A5634E61D9EF9A7004BFC00 /* AppNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5634E51D9EF9A7004BFC00 /* AppNavigationController.swift */; }; 9A5634E61D9EF9A7004BFC00 /* AppNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5634E51D9EF9A7004BFC00 /* AppNavigationController.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
9689485B1DA97CD400DA9FD9 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
96CC49C91D8DD984002CAB55 /* NavigationController.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NavigationController.app; sourceTree = BUILT_PRODUCTS_DIR; }; 96CC49C91D8DD984002CAB55 /* NavigationController.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NavigationController.app; sourceTree = BUILT_PRODUCTS_DIR; };
96CC49CC1D8DD984002CAB55 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 96CC49CC1D8DD984002CAB55 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
96CC49CE1D8DD984002CAB55 /* RootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewController.swift; sourceTree = "<group>"; }; 96CC49CE1D8DD984002CAB55 /* RootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewController.swift; sourceTree = "<group>"; };
...@@ -37,7 +38,6 @@ ...@@ -37,7 +38,6 @@
96CC49D61D8DD984002CAB55 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 96CC49D61D8DD984002CAB55 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
96CC49D81D8DD984002CAB55 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 96CC49D81D8DD984002CAB55 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
96CC49E41D8DDF61002CAB55 /* NextViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NextViewController.swift; sourceTree = "<group>"; }; 96CC49E41D8DDF61002CAB55 /* NextViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NextViewController.swift; sourceTree = "<group>"; };
9A5634E01D9EF705004BFC00 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
9A5634E51D9EF9A7004BFC00 /* AppNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppNavigationController.swift; sourceTree = "<group>"; }; 9A5634E51D9EF9A7004BFC00 /* AppNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppNavigationController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -75,10 +75,10 @@ ...@@ -75,10 +75,10 @@
9A5634E51D9EF9A7004BFC00 /* AppNavigationController.swift */, 9A5634E51D9EF9A7004BFC00 /* AppNavigationController.swift */,
96CC49CE1D8DD984002CAB55 /* RootViewController.swift */, 96CC49CE1D8DD984002CAB55 /* RootViewController.swift */,
96CC49E41D8DDF61002CAB55 /* NextViewController.swift */, 96CC49E41D8DDF61002CAB55 /* NextViewController.swift */,
9689485B1DA97CD400DA9FD9 /* Main.storyboard */,
96CC49D31D8DD984002CAB55 /* Assets.xcassets */, 96CC49D31D8DD984002CAB55 /* Assets.xcassets */,
96CC49D51D8DD984002CAB55 /* LaunchScreen.storyboard */, 96CC49D51D8DD984002CAB55 /* LaunchScreen.storyboard */,
96CC49D81D8DD984002CAB55 /* Info.plist */, 96CC49D81D8DD984002CAB55 /* Info.plist */,
9A5634E01D9EF705004BFC00 /* Main.storyboard */,
); );
path = NavigationController; path = NavigationController;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
9A5634E11D9EF705004BFC00 /* Main.storyboard in Resources */, 9689485C1DA97CD400DA9FD9 /* Main.storyboard in Resources */,
96CC49D71D8DD984002CAB55 /* LaunchScreen.storyboard in Resources */, 96CC49D71D8DD984002CAB55 /* LaunchScreen.storyboard in Resources */,
96CC49D41D8DD984002CAB55 /* Assets.xcassets in Resources */, 96CC49D41D8DD984002CAB55 /* Assets.xcassets in Resources */,
); );
......
Examples/Storyboards/NavigationController/NavigationController/Info.plist
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<string>1</string> <string>1</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSMainNibFile</key>
<string>Main</string>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>LaunchScreen</string> <string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>
<array> <array>
<string>armv7</string> <string>armv7</string>
......
Examples/Storyboards/NavigationController/NavigationController/Main.storyboard
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="O4j-jr-GhC"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A313a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="O4j-jr-GhC">
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
<!--App Navigation Controller--> <!--App Navigation Controller-->
<scene sceneID="uvK-GO-nSj"> <scene sceneID="uvK-GO-nSj">
<objects> <objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="O4j-jr-GhC" customClass="AppNavigationController" customModule="Material" sceneMemberID="viewController"> <navigationController automaticallyAdjustsScrollViewInsets="NO" id="O4j-jr-GhC" customClass="AppNavigationController" customModule="NavigationController" customModuleProvider="target" sceneMemberID="viewController">
<toolbarItems/> <toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="ruX-44-ffD"> <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="ruX-44-ffD" customClass="NavigationBar" customModule="Material">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/> <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</navigationBar> </navigationBar>
......
Examples/Storyboards/NavigationController/NavigationController/RootViewController.swift
...@@ -77,7 +77,6 @@ class RootViewController: UIViewController { ...@@ -77,7 +77,6 @@ class RootViewController: UIViewController {
private func prepareNextButton() { private func prepareNextButton() {
nextButton = FlatButton() nextButton = FlatButton()
nextButton.pulseAnimation = .none
nextButton.addTarget(self, action: #selector(handleNextButton), for: .touchUpInside) nextButton.addTarget(self, action: #selector(handleNextButton), for: .touchUpInside)
view.layout(nextButton).edges() view.layout(nextButton).edges()
} }
......
Examples/Storyboards/NavigationDrawerController/NavigationDrawerController.xcodeproj/project.pbxproj
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = NavigationDrawerController/Info.plist; INFOPLIST_FILE = NavigationDrawerController/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.NavigationDrawerController; PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.NavigationDrawerController;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 3.0;
}; };
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = NavigationDrawerController/Info.plist; INFOPLIST_FILE = NavigationDrawerController/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.NavigationDrawerController; PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.NavigationDrawerController;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 3.0;
}; };
......
Examples/Storyboards/NavigationDrawerController/NavigationDrawerController/Info.plist
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
</dict> </dict>
</plist> </plist>
Examples/Storyboards/PageTabBarController/PageTabBarController.xcodeproj/project.pbxproj
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = PageTabBarController/Info.plist; INFOPLIST_FILE = PageTabBarController/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.PageTabBarController; PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.PageTabBarController;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 3.0;
}; };
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = PageTabBarController/Info.plist; INFOPLIST_FILE = PageTabBarController/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cosmicmind.PageTabBarController; PRODUCT_BUNDLE_IDENTIFIER = io.cosmicmind.PageTabBarController;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 3.0;
}; };
......
Examples/Storyboards/PageTabBarController/PageTabBarController/AppDelegate.swift
...@@ -53,11 +53,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ...@@ -53,11 +53,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return UIStoryboard.viewController(identifier: "RedViewController") as! RedViewController return UIStoryboard.viewController(identifier: "RedViewController") as! RedViewController
}() }()
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { func applicationDidFinishLaunching(_ application: UIApplication) {
window = UIWindow(frame: UIScreen.main.bounds) window = UIWindow(frame: UIScreen.main.bounds)
window!.rootViewController = AppPageTabBarController(viewControllers: [redViewController, greenViewController, blueViewController], selectedIndex: 0) window!.rootViewController = AppPageTabBarController(viewControllers: [redViewController, greenViewController, blueViewController], selectedIndex: 0)
window!.makeKeyAndVisible() window!.makeKeyAndVisible()
return true
} }
} }
Examples/Storyboards/PageTabBarController/PageTabBarController/AppPageTabBarController.swift
...@@ -39,7 +39,6 @@ class AppPageTabBarController: PageTabBarController { ...@@ -39,7 +39,6 @@ class AppPageTabBarController: PageTabBarController {
preparePageTabBar() preparePageTabBar()
} }
/// Prepares the pageTabBar.
private func preparePageTabBar() { private func preparePageTabBar() {
pageTabBar.lineColor = Color.grey.darken1 pageTabBar.lineColor = Color.grey.darken1
} }
......
Examples/Storyboards/PageTabBarController/PageTabBarController/BlueViewController.swift
...@@ -47,8 +47,7 @@ class BlueViewController: UIViewController { ...@@ -47,8 +47,7 @@ class BlueViewController: UIViewController {
view.backgroundColor = Color.blue.base view.backgroundColor = Color.blue.base
} }
/// Prepares the pageTabBarItem. private func preparePageTabBarItem() {
internal func preparePageTabBarItem() {
pageTabBarItem.title = "Blue" pageTabBarItem.title = "Blue"
pageTabBarItem.titleColor = Color.blueGrey.base pageTabBarItem.titleColor = Color.blueGrey.base
} }
......
Examples/Storyboards/PageTabBarController/PageTabBarController/GreenViewController.swift
...@@ -47,8 +47,7 @@ class GreenViewController: UIViewController { ...@@ -47,8 +47,7 @@ class GreenViewController: UIViewController {
view.backgroundColor = Color.green.base view.backgroundColor = Color.green.base
} }
/// Prepares the pageTabBarItem. private func preparePageTabBarItem() {
internal func preparePageTabBarItem() {
pageTabBarItem.title = "Green" pageTabBarItem.title = "Green"
pageTabBarItem.titleColor = Color.blueGrey.base pageTabBarItem.titleColor = Color.blueGrey.base
} }
......
Examples/Storyboards/PageTabBarController/PageTabBarController/Info.plist
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array> </array>
</dict> </dict>
</plist> </plist>
Examples/Storyboards/PageTabBarController/PageTabBarController/RedViewController.swift
...@@ -47,8 +47,7 @@ class RedViewController: UIViewController { ...@@ -47,8 +47,7 @@ class RedViewController: UIViewController {
view.backgroundColor = Color.red.base view.backgroundColor = Color.red.base
} }
/// Prepares the pageTabBarItem. private func preparePageTabBarItem() {
internal func preparePageTabBarItem() {
pageTabBarItem.title = "Red" pageTabBarItem.title = "Red"
pageTabBarItem.titleColor = Color.blueGrey.base pageTabBarItem.titleColor = Color.blueGrey.base
} }
......
Examples/Storyboards/SearchBarController/SearchBarController.xcodeproj/project.pbxproj
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
96784EC51D9012980061C06C /* AppDelegate.swift */, 96784EC51D9012980061C06C /* AppDelegate.swift */,
96784F231D901E7D0061C06C /* AppSearchBarController.swift */, 96784F231D901E7D0061C06C /* AppSearchBarController.swift */,
96784EC71D9012980061C06C /* RootViewController.swift */, 96784EC71D9012980061C06C /* RootViewController.swift */,
9AC456331D9DE1F900A7ABF0 /* Main.storyboard */,
96784ECC1D9012980061C06C /* Assets.xcassets */, 96784ECC1D9012980061C06C /* Assets.xcassets */,
96784ECE1D9012980061C06C /* LaunchScreen.storyboard */, 96784ECE1D9012980061C06C /* LaunchScreen.storyboard */,
96784ED11D9012980061C06C /* Info.plist */, 96784ED11D9012980061C06C /* Info.plist */,
9AC456331D9DE1F900A7ABF0 /* Main.storyboard */,
); );
path = SearchBarController; path = SearchBarController;
sourceTree = "<group>"; sourceTree = "<group>";
......
Examples/Storyboards/SearchBarController/SearchBarController/RootViewController.swift
...@@ -32,7 +32,6 @@ import UIKit ...@@ -32,7 +32,6 @@ import UIKit
import Material import Material
class RootViewController: UIViewController { class RootViewController: UIViewController {
/// SearchBar buttons.
private var menuButton: IconButton! private var menuButton: IconButton!
private var moreButton: IconButton! private var moreButton: IconButton!
......
Examples/Storyboards/SnackbarController/SnackbarController/RootViewController.swift
...@@ -32,27 +32,26 @@ import UIKit ...@@ -32,27 +32,26 @@ import UIKit
import Material import Material
class RootViewController: UIViewController { class RootViewController: UIViewController {
/// A reference to the Undo button.
private var undoButton: FlatButton! private var undoButton: FlatButton!
open override func viewDidLoad() { open override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = Color.grey.lighten5 view.backgroundColor = Color.grey.lighten5
prepareUndoButton()
} }
open override func viewDidAppear(_ animated: Bool) { open override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated) super.viewDidAppear(animated)
prepareUndoButton()
prepareSnackbar() prepareSnackbar()
animateSnackbar()
scheduleAnimation() scheduleAnimation()
} }
private func prepareUndoButton() { private func prepareUndoButton() {
undoButton = FlatButton(title: "Undo", titleColor: Color.yellow.base) undoButton = FlatButton(title: "Undo", titleColor: Color.yellow.base)
undoButton.pulseAnimation = .backing undoButton.pulseAnimation = .backing
undoButton.titleLabel?.font = RobotoFont.regular(with: 14) undoButton.titleLabel?.font = snackbarController?.snackbar.textLabel.font
} }
private func prepareSnackbar() { private func prepareSnackbar() {
...@@ -65,10 +64,11 @@ class RootViewController: UIViewController { ...@@ -65,10 +64,11 @@ class RootViewController: UIViewController {
} }
private func scheduleAnimation() { private func scheduleAnimation() {
_ = Timer.scheduledTimer(timeInterval: 5, target: self, selector: #selector(self.animateSnackbar), userInfo: nil, repeats: true) _ = Timer.scheduledTimer(timeInterval: 6, target: self, selector: #selector(animateSnackbar), userInfo: nil, repeats: true)
} }
@objc private func animateSnackbar() { @objc
private func animateSnackbar() {
guard let sc = snackbarController else { guard let sc = snackbarController else {
return return
} }
......
Examples/Storyboards/StatusBarController/StatusBarController.xcodeproj/project.pbxproj
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
96784EE31D9012B00061C06C /* AppDelegate.swift */, 96784EE31D9012B00061C06C /* AppDelegate.swift */,
96784F191D901DEF0061C06C /* AppStatusBarController.swift */, 96784F191D901DEF0061C06C /* AppStatusBarController.swift */,
96784EE51D9012B00061C06C /* RootViewController.swift */, 96784EE51D9012B00061C06C /* RootViewController.swift */,
9AC456311D9DE0B300A7ABF0 /* Main.storyboard */,
96784EEA1D9012B00061C06C /* Assets.xcassets */, 96784EEA1D9012B00061C06C /* Assets.xcassets */,
96784EEC1D9012B10061C06C /* LaunchScreen.storyboard */, 96784EEC1D9012B10061C06C /* LaunchScreen.storyboard */,
96784EEF1D9012B10061C06C /* Info.plist */, 96784EEF1D9012B10061C06C /* Info.plist */,
9AC456311D9DE0B300A7ABF0 /* Main.storyboard */,
); );
path = StatusBarController; path = StatusBarController;
sourceTree = "<group>"; sourceTree = "<group>";
......
Material.podspec
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '2.1.0' s.version = '2.1.1'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'
s.summary = 'Material is an animation and graphics framework that is used to create beautiful applications.' s.summary = 'Material is an animation and graphics framework that is used to create beautiful applications.'
s.homepage = 'http://cosmicmind.io' s.homepage = 'http://cosmicmind.io'
......
README.md
...@@ -81,13 +81,23 @@ Icons is a library of Google and CosmicMind icons that are available for use wit ...@@ -81,13 +81,23 @@ Icons is a library of Google and CosmicMind icons that are available for use wit
![Icon](http://www.cosmicmind.io/MK/MaterialMaterialIcon.png) ![Icon](http://www.cosmicmind.io/MK/MaterialMaterialIcon.png)
[Learn More](http://cosmicmind.io/material/icons)
## Colors
Try the Material Colors app to see the wonderful colors available in Material, or use the online version at [materialColors.io](http://materialcolors.io)
![MaterialColors](http://www.cosmicmind.io/gifs/MaterialColors.gif)
[Get Material Colors on the AppStore](https://itunes.apple.com/app/x/id1111994400?mt=8)
## TextField ## TextField
A TextField is an excellent way to improve UX. It allows for a placeholder and additional hint details. A TextField is an excellent way to improve UX. It allows for a placeholder and additional hint details.
![TextField](http://www.cosmicmind.io/gifs/TextField.gif) ![TextField](http://www.cosmicmind.io/gifs/TextField.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/TextField) [Learn More](http://cosmicmind.io/material/textfield)
## Button ## Button
...@@ -95,7 +105,7 @@ A button is used to trigger an action through a touch event. Material comes with ...@@ -95,7 +105,7 @@ A button is used to trigger an action through a touch event. Material comes with
![Material Image](http://www.cosmicmind.io/material/white/button.gif) ![Material Image](http://www.cosmicmind.io/material/white/button.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/Button) [Learn More](http://cosmicmind.io/material/button)
## Switch ## Switch
...@@ -103,7 +113,7 @@ A switch is a control component that toggles between on and off states. ...@@ -103,7 +113,7 @@ A switch is a control component that toggles between on and off states.
![Material Image](http://www.cosmicmind.io/material/white/switch.gif) ![Material Image](http://www.cosmicmind.io/material/white/switch.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/Switch) [Learn More](http://cosmicmind.io/material/switch)
## Card ## Card
...@@ -111,7 +121,7 @@ A Card is a flexible component that may be configured in any way you like. It ha ...@@ -111,7 +121,7 @@ A Card is a flexible component that may be configured in any way you like. It ha
![Material Image](http://www.cosmicmind.io/material/white/card.gif) ![Material Image](http://www.cosmicmind.io/material/white/card.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/Card) [Learn More](http://cosmicmind.io/material/card)
## ImageCard ## ImageCard
...@@ -119,7 +129,7 @@ An ImageCard is an expansion of the base Card. The Toolbar overlays an image are ...@@ -119,7 +129,7 @@ An ImageCard is an expansion of the base Card. The Toolbar overlays an image are
![Material Image](http://www.cosmicmind.io/material/white/image-card.gif) ![Material Image](http://www.cosmicmind.io/material/white/image-card.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/ImageCard) [Learn More](http://cosmicmind.io/material/imagecard)
## PresenterCard ## PresenterCard
...@@ -127,7 +137,7 @@ The PresenterCard is a completely new card style. It allows for a primary presen ...@@ -127,7 +137,7 @@ The PresenterCard is a completely new card style. It allows for a primary presen
![Material Image](http://www.cosmicmind.io/material/white/presenter-card.gif) ![Material Image](http://www.cosmicmind.io/material/white/presenter-card.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/PresenterCard) [Learn More](http://cosmicmind.io/material/presentercard)
## Menu ## Menu
...@@ -135,7 +145,7 @@ A Menu manages a collection of views. A new MenuItem type has been added that ma ...@@ -135,7 +145,7 @@ A Menu manages a collection of views. A new MenuItem type has been added that ma
![Material Image](http://www.cosmicmind.io/material/white/menu-controller.gif) ![Material Image](http://www.cosmicmind.io/material/white/menu-controller.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/MenuController) [Learn More](http://cosmicmind.io/material/menu)
## Toolbar ## Toolbar
...@@ -143,7 +153,7 @@ Toolbars are super flexible and add excellent control to your navigation flow. T ...@@ -143,7 +153,7 @@ Toolbars are super flexible and add excellent control to your navigation flow. T
![Material Image](http://www.cosmicmind.io/gifs/Toolbar.gif) ![Material Image](http://www.cosmicmind.io/gifs/Toolbar.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/ToolbarController) [Learn More](http://cosmicmind.io/material/toolbar)
## SearchBar ## SearchBar
...@@ -151,7 +161,7 @@ A SearchBar is a powerful navigation tool that allows for user's input with an i ...@@ -151,7 +161,7 @@ A SearchBar is a powerful navigation tool that allows for user's input with an i
![Material Image](http://www.cosmicmind.io/gifs/SearchBar.gif) ![Material Image](http://www.cosmicmind.io/gifs/SearchBar.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/SearchBarController) [Learn More](http://cosmicmind.io/material/searchbar)
## PageTabBar ## PageTabBar
...@@ -159,7 +169,23 @@ A PageTabBar is a new component that links a customizable TabBar to a UIPageView ...@@ -159,7 +169,23 @@ A PageTabBar is a new component that links a customizable TabBar to a UIPageView
![Material Image](http://www.cosmicmind.io/material/white/page-tab-bar-controller.gif) ![Material Image](http://www.cosmicmind.io/material/white/page-tab-bar-controller.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/PageTabBarController) [Learn More](http://cosmicmind.io/material/pagetabbar)
## NavigationController
A NavigationController is a specialized view controller that manages a hierarchy of content efficiently, making it easier for users to move within an application.
![Material Image](http://www.cosmicmind.io/material/white/navigation-controller.gif)
[Learn More](http://cosmicmind.io/material/navigationcontroller)
## NavigationDrawer
A NavigationDrawer slides in from the left or right and contains the navigation destinations for your application.
![Material Image](http://www.cosmicmind.io/material/shared/navigation-drawer-controller.gif)
[Learn More](http://cosmicmind.io/material/navigationdrawer)
## Snackbar ## Snackbar
...@@ -167,7 +193,7 @@ A Snackbar is a new component that is very simple in its behavior and very power ...@@ -167,7 +193,7 @@ A Snackbar is a new component that is very simple in its behavior and very power
![Material Image](http://www.cosmicmind.io/material/white/snackbar-controller.gif) ![Material Image](http://www.cosmicmind.io/material/white/snackbar-controller.gif)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/SnackbarController) [Learn More](http://cosmicmind.io/material/snackbar)
## PhotoLibrary ## PhotoLibrary
...@@ -175,7 +201,7 @@ PhotoLibrary is a new component that simplifies the Photos framework and allows ...@@ -175,7 +201,7 @@ PhotoLibrary is a new component that simplifies the Photos framework and allows
![Material Image](http://www.cosmicmind.io/material/shared/photolibrary-controller.png) ![Material Image](http://www.cosmicmind.io/material/shared/photolibrary-controller.png)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/PhotoLibraryController) [Learn More](http://cosmicmind.io/material/photolibrary)
## Capture ## Capture
...@@ -183,7 +209,7 @@ Capture is an API that simplifies iOS' AVFoundation framework. It allows for pho ...@@ -183,7 +209,7 @@ Capture is an API that simplifies iOS' AVFoundation framework. It allows for pho
![Material Image](http://www.cosmicmind.io/material/shared/capture-controller.png) ![Material Image](http://www.cosmicmind.io/material/shared/capture-controller.png)
[Example Project](https://github.com/CosmicMind/Material/tree/development/Examples/Programmatic/CaptureController) [Learn More](http://cosmicmind.io/material/capture)
## Sticker Sheet ## Sticker Sheet
...@@ -193,14 +219,6 @@ To help template your project, checkout Material Sticker Sheet. ...@@ -193,14 +219,6 @@ To help template your project, checkout Material Sticker Sheet.
[Get Material Sticker Sheet](http://www.materialup.com/posts/material-design-sticker-sheets) [Get Material Sticker Sheet](http://www.materialup.com/posts/material-design-sticker-sheets)
## Material Colors
Try the Material Colors app to see the wonderful colors available in Material, or use the online version at [materialColors.io](http://materialcolors.io)
![MaterialColors](http://www.cosmicmind.io/gifs/MaterialColors.gif)
[Get Material Colors on the AppStore](https://itunes.apple.com/app/x/id1111994400?mt=8)
## Much More... ## Much More...
So much more inside. Enjoy! So much more inside. Enjoy!
......
Sources/Info.plist
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.1.0</string> <string>2.1.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Sources/iOS/Bar.swift
...@@ -171,7 +171,6 @@ open class Bar: View { ...@@ -171,7 +171,6 @@ open class Bar: View {
self.centerViews = centerViews ?? [] self.centerViews = centerViews ?? []
frame.size = intrinsicContentSize frame.size = intrinsicContentSize
} }
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
guard willLayout else { guard willLayout else {
...@@ -190,10 +189,14 @@ open class Bar: View { ...@@ -190,10 +189,14 @@ open class Bar: View {
grid.axis.columns = columns grid.axis.columns = columns
for v in leftViews { for v in leftViews {
(v as? UIButton)?.contentEdgeInsets = .zero if let b = v as? UIButton {
b.contentEdgeInsets = .zero
b.titleEdgeInsets = .zero
}
v.width = v.intrinsicContentSize.width v.width = v.intrinsicContentSize.width
v.sizeToFit() v.sizeToFit()
v.grid.columns = Int(ceil(v.width / gridFactor)) + 1 v.grid.columns = Int(ceil(v.width / gridFactor)) + 2
lc += v.grid.columns lc += v.grid.columns
...@@ -203,10 +206,14 @@ open class Bar: View { ...@@ -203,10 +206,14 @@ open class Bar: View {
grid.views.append(contentView) grid.views.append(contentView)
for v in rightViews { for v in rightViews {
(v as? UIButton)?.contentEdgeInsets = .zero if let b = v as? UIButton {
b.contentEdgeInsets = .zero
b.titleEdgeInsets = .zero
}
v.width = v.intrinsicContentSize.width v.width = v.intrinsicContentSize.width
v.sizeToFit() v.sizeToFit()
v.grid.columns = Int(ceil(v.width / gridFactor)) + 1 v.grid.columns = Int(ceil(v.width / gridFactor)) + 2
rc += v.grid.columns rc += v.grid.columns
...@@ -244,8 +251,8 @@ open class Bar: View { ...@@ -244,8 +251,8 @@ open class Bar: View {
open override func prepare() { open override func prepare() {
super.prepare() super.prepare()
autoresizingMask = .flexibleWidth autoresizingMask = .flexibleWidth
interimSpacePreset = .interimSpace4 interimSpacePreset = .interimSpace3
contentEdgeInsetsPreset = .wideRectangle2 contentEdgeInsetsPreset = .square1
prepareContentView() prepareContentView()
} }
......
Sources/iOS/Button.swift
...@@ -189,7 +189,6 @@ open class Button: UIButton { ...@@ -189,7 +189,6 @@ open class Button: UIButton {
layoutShape() layoutShape()
layoutVisualLayer() layoutVisualLayer()
} }
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
layoutShadowPath() layoutShadowPath()
......
Sources/iOS/Card.swift
...@@ -166,7 +166,6 @@ open class Card: PulseView { ...@@ -166,7 +166,6 @@ open class Card: PulseView {
self.init(frame: .zero) self.init(frame: .zero)
prepareProperties(toolbar: toolbar, contentView: contentView, bottomBar: bottomBar) prepareProperties(toolbar: toolbar, contentView: contentView, bottomBar: bottomBar)
} }
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
guard willLayout else { guard willLayout else {
......
Sources/iOS/MenuController.swift
...@@ -99,11 +99,7 @@ open class MenuController: RootController { ...@@ -99,11 +99,7 @@ open class MenuController: RootController {
} }
} }
/**
To execute in the order of the layout chain, override this
method. LayoutSubviews should be called immediately, unless you
have a certain need.
*/
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
rootViewController.view.frame = view.bounds rootViewController.view.frame = view.bounds
......
Sources/iOS/NavigationBar.swift
...@@ -208,10 +208,14 @@ open class NavigationBar: UINavigationBar { ...@@ -208,10 +208,14 @@ open class NavigationBar: UINavigationBar {
item.titleView!.grid.axis.columns = columns item.titleView!.grid.axis.columns = columns
for v in item.leftViews { for v in item.leftViews {
(v as? UIButton)?.contentEdgeInsets = .zero if let b = v as? UIButton {
b.contentEdgeInsets = .zero
b.titleEdgeInsets = .zero
}
v.width = v.intrinsicContentSize.width v.width = v.intrinsicContentSize.width
v.sizeToFit() v.sizeToFit()
v.grid.columns = Int(ceil(v.width / gridFactor)) + 1 v.grid.columns = Int(ceil(v.width / gridFactor)) + 2
lc += v.grid.columns lc += v.grid.columns
...@@ -221,10 +225,14 @@ open class NavigationBar: UINavigationBar { ...@@ -221,10 +225,14 @@ open class NavigationBar: UINavigationBar {
item.titleView!.grid.views.append(item.contentView) item.titleView!.grid.views.append(item.contentView)
for v in item.rightViews { for v in item.rightViews {
(v as? UIButton)?.contentEdgeInsets = .zero if let b = v as? UIButton {
b.contentEdgeInsets = .zero
b.titleEdgeInsets = .zero
}
v.width = v.intrinsicContentSize.width v.width = v.intrinsicContentSize.width
v.sizeToFit() v.sizeToFit()
v.grid.columns = Int(ceil(v.width / gridFactor)) + 1 v.grid.columns = Int(ceil(v.width / gridFactor)) + 2
rc += v.grid.columns rc += v.grid.columns
...@@ -296,8 +304,8 @@ open class NavigationBar: UINavigationBar { ...@@ -296,8 +304,8 @@ open class NavigationBar: UINavigationBar {
barStyle = .black barStyle = .black
isTranslucent = false isTranslucent = false
depthPreset = .depth1 depthPreset = .depth1
interimSpacePreset = .interimSpace4 interimSpacePreset = .interimSpace3
contentEdgeInsetsPreset = .wideRectangle2 contentEdgeInsetsPreset = .square1
contentScaleFactor = Device.scale contentScaleFactor = Device.scale
backButtonImage = Icon.cm.arrowBack backButtonImage = Icon.cm.arrowBack
let image = UIImage.imageWithColor(color: Color.clear, size: CGSize(width: 1, height: 1)) let image = UIImage.imageWithColor(color: Color.clear, size: CGSize(width: 1, height: 1))
......
Sources/iOS/PageTabBarController.swift
...@@ -143,11 +143,6 @@ open class PageTabBarController: RootController { ...@@ -143,11 +143,6 @@ open class PageTabBarController: RootController {
prepare() prepare()
} }
/**
To execute in the order of the layout chain, override this
method. LayoutSubviews should be called immediately, unless you
have a certain need.
*/
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
......
Sources/iOS/SearchBarController.swift
...@@ -52,11 +52,7 @@ open class SearchBarController: RootController { ...@@ -52,11 +52,7 @@ open class SearchBarController: RootController {
/// Reference to the SearchBar. /// Reference to the SearchBar.
open private(set) lazy var searchBar: SearchBar = SearchBar() open private(set) lazy var searchBar: SearchBar = SearchBar()
/**
To execute in the order of the layout chain, override this
method. LayoutSubviews should be called immediately, unless you
have a certain need.
*/
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
......
Sources/iOS/Snackbar.swift
...@@ -76,14 +76,18 @@ open class Snackbar: Bar { ...@@ -76,14 +76,18 @@ open class Snackbar: Bar {
return super.hitTest(point, with: event) return super.hitTest(point, with: event)
} }
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
guard willLayout else { guard willLayout else {
return return
} }
textLabel.frame = contentView.bounds reload()
}
/// Reloads the view.
open func reload() {
centerViews = [textLabel]
} }
/** /**
...@@ -111,6 +115,5 @@ open class Snackbar: Bar { ...@@ -111,6 +115,5 @@ open class Snackbar: Bar {
textLabel.textAlignment = .left textLabel.textAlignment = .left
textLabel.textColor = Color.white textLabel.textColor = Color.white
textLabel.numberOfLines = 0 textLabel.numberOfLines = 0
contentView.addSubview(textLabel)
} }
} }
Sources/iOS/SnackbarController.swift
...@@ -146,17 +146,22 @@ open class SnackbarController: RootController { ...@@ -146,17 +146,22 @@ open class SnackbarController: RootController {
} }
} }
/** open override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
To execute in the order of the layout chain, override this super.viewWillTransition(to: size, with: coordinator)
method. LayoutSubviews should be called immediately, unless you reload()
have a certain need. }
*/
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
guard !isAnimating else { guard !isAnimating else {
return return
} }
reload()
}
/// Reloads the view.
open func reload() {
snackbar.width = view.width snackbar.width = view.width
snackbar.height = snackbar.intrinsicContentSize.height + snackbar.grid.layoutEdgeInsets.top + snackbar.grid.layoutEdgeInsets.bottom snackbar.height = snackbar.intrinsicContentSize.height + snackbar.grid.layoutEdgeInsets.top + snackbar.grid.layoutEdgeInsets.bottom
layoutSnackbar(status: snackbar.status) layoutSnackbar(status: snackbar.status)
......
Sources/iOS/Switch.swift
...@@ -61,6 +61,11 @@ public protocol SwitchDelegate { ...@@ -61,6 +61,11 @@ public protocol SwitchDelegate {
@objc(Switch) @objc(Switch)
open class Switch: UIControl { open class Switch: UIControl {
/// Will render the view.
open var willLayout: Bool {
return 0 < width && 0 < height && nil != superview
}
/// An internal reference to the switchState public property. /// An internal reference to the switchState public property.
private var internalSwitchState = SwitchState.off private var internalSwitchState = SwitchState.off
...@@ -297,6 +302,10 @@ open class Switch: UIControl { ...@@ -297,6 +302,10 @@ open class Switch: UIControl {
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
guard willLayout else {
return
}
reload() reload()
} }
...@@ -421,7 +430,7 @@ open class Switch: UIControl { ...@@ -421,7 +430,7 @@ open class Switch: UIControl {
prepareSwitchSize() prepareSwitchSize()
} }
/// Laout the button and track views. /// Reloads the view.
open func reload() { open func reload() {
var w: CGFloat = intrinsicContentSize.width var w: CGFloat = intrinsicContentSize.width
let px: CGFloat = (width - w) / 2 let px: CGFloat = (width - w) / 2
......
Sources/iOS/TabBar.swift
...@@ -126,7 +126,6 @@ open class TabBar: Bar { ...@@ -126,7 +126,6 @@ open class TabBar: Bar {
line.height = value line.height = value
} }
} }
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
guard willLayout else { guard willLayout else {
......
Sources/iOS/Toolbar.swift
...@@ -100,13 +100,17 @@ open class Toolbar: Bar { ...@@ -100,13 +100,17 @@ open class Toolbar: Bar {
} }
contentViewAlignment = .center == titleLabel.textAlignment ? .center : .any contentViewAlignment = .center == titleLabel.textAlignment ? .center : .any
} }
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
guard willLayout else { guard willLayout else {
return return
} }
reload()
}
/// Reloads the view.
open func reload() {
if nil != title && "" != title { if nil != title && "" != title {
if nil == titleLabel.superview { if nil == titleLabel.superview {
contentView.addSubview(titleLabel) contentView.addSubview(titleLabel)
......
Sources/iOS/ToolbarController.swift
...@@ -122,8 +122,6 @@ open class ToolbarController: RootController { ...@@ -122,8 +122,6 @@ open class ToolbarController: RootController {
view.insertSubview(v.view, aboveSubview: toolbar) view.insertSubview(v.view, aboveSubview: toolbar)
v.view.layer.zPosition = 1500 v.view.layer.zPosition = 1500
v.didMove(toParentViewController: self) v.didMove(toParentViewController: self)
// Animate the noteButton out and the noteViewController! in.
v.view.isHidden = false v.view.isHidden = false
v.view.layer.rasterizationScale = Device.scale v.view.layer.rasterizationScale = Device.scale
v.view.layer.shouldRasterize = true v.view.layer.shouldRasterize = true
...@@ -134,14 +132,19 @@ open class ToolbarController: RootController { ...@@ -134,14 +132,19 @@ open class ToolbarController: RootController {
toolbar.isUserInteractionEnabled = false toolbar.isUserInteractionEnabled = false
delegate?.toolbarControllerWillOpenFloatingViewController?(toolbarController: self) delegate?.toolbarControllerWillOpenFloatingViewController?(toolbarController: self)
UIView.animate(withDuration: 0.5, UIView.animate(withDuration: 0.5,
animations: { [weak self] in animations: { [weak self, v = v] in
if let s = self { guard let s = self else {
return
}
v.view.center.y = s.view.bounds.height / 2 v.view.center.y = s.view.bounds.height / 2
s.toolbar.alpha = 0.5 s.toolbar.alpha = 0.5
s.rootViewController.view.alpha = 0.5 s.rootViewController.view.alpha = 0.5
}) { [weak self, v = v] _ in
guard let s = self else {
return
} }
}) { [weak self] _ in
if let s = self {
v.view.layer.shouldRasterize = false v.view.layer.shouldRasterize = false
s.view.layer.shouldRasterize = false s.view.layer.shouldRasterize = false
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
...@@ -153,13 +156,8 @@ open class ToolbarController: RootController { ...@@ -153,13 +156,8 @@ open class ToolbarController: RootController {
} }
} }
} }
}
/**
To execute in the order of the layout chain, override this
method. LayoutSubviews should be called immediately, unless you
have a certain need.
*/
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
......
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