Skip to content

[Ink] Add nonnull to the MDCInkTouchController initializer #1123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2017
Merged

[Ink] Add nonnull to the MDCInkTouchController initializer #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a844d55
Specify `nonnull` on the MDCInkTouchController initializer.
samsymons Jan 4, 2017
1fea1a8
Update Shrine to use the nonnull MDCInkTouchController initializer.
samsymons Jan 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catalog/MDCCatalog/MDCCatalogComponentsController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class MDCCatalogComponentsController: UICollectionViewController, MDCInkTouchCon
override func viewDidLoad() {
super.viewDidLoad()

inkController = MDCInkTouchController(view: self.collectionView!)!
inkController = MDCInkTouchController(view: self.collectionView!)
inkController!.addInkView()
inkController!.delaysInkSpread = true
inkController!.delegate = self
Expand Down
2 changes: 1 addition & 1 deletion components/Ink/src/MDCInkTouchController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

@param view View that responds to touch events for ink.
*/
- (nullable instancetype)initWithView:(nonnull UIView *)view NS_DESIGNATED_INITIALIZER;
- (nonnull instancetype)initWithView:(nonnull UIView *)view NS_DESIGNATED_INITIALIZER;

/**
When called the @c defaultInkView is added to the @c view.
Expand Down
2 changes: 1 addition & 1 deletion demos/Shrine/Shrine/ShrineInkOverlay.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ShrineInkOverlay: UIView, MDCInkTouchControllerDelegate {
override init(frame: CGRect) {
super.init(frame: frame)
let cyan = UIColor(red: 22 / 255, green: 240 / 255, blue: 240 / 255, alpha: 0.2)
self.inkTouchController = MDCInkTouchController(view:self)!
self.inkTouchController = MDCInkTouchController(view:self)
self.inkTouchController!.defaultInkView.inkColor = cyan
self.inkTouchController!.addInkView()
self.inkTouchController!.delegate = self
Expand Down