Shrine refactor header page into it's own file (#1157)

* Extracts header code into method removing repetition

* [AppBar] Header stack view in AppBarController (#1121)

Since the header stack view is going to be laid out with auto layout, it should be inited with a CGRectZero. Doing it with self.view.bounds creates a tiny loop since the view is not loaded yet.

* [ThumbTrack] Remove extra UIColor categories (#1122)

* Pull the functionality of UIColor+MDC into MDCThumbTrack.

MDCThumbTrack is now the only class using this behaviour, so three extra files have been removed now that they are no longer necessary.

* Fixed colon alignment.

* [Ink] Add nonnull to the MDCInkTouchController initializer (#1123)

* Specify `nonnull` on the MDCInkTouchController initializer.

This is a quick change since the initializer was never returning nil to begin with.

* Update Shrine to use the nonnull MDCInkTouchController initializer.

* Formatted all Objective-C sources with clang-format. (#1133)

* [Scripts] Add scripts for "prepping" and cleaning the library/catalog/demo apps. (#1130)

* Changed build_all to echo the xcodebuild command it is executing.

* Added a clean_all script.

* Added a prep_all script.

* Updated README.md with new scripts.

* Change Travis CI to use the new `prep_all` script.

* Added a script to format Objective-C sources with clang-format. (#1132)

* Added comment about Travis CI's 10.1 device bug. (#1135)

* Removed the private/Color subspec. (#1128)

* [Catalog] Center views in the Buttons (Swift and Storyboard) demo (#1126)

* Center the Storyboard button demo.

This uses an outer container to set up a view which is 50% the screen width (to allow for the other half of the button demo), and then an inner container to vertically and horizontally center the buttons.

* Center the buttons added programatically.

* Weakify strongify asynchronously dispatched snackbar view dismissal (#1136)

* Update the button’s custom title color when the tint color changes. (#1134)

* Add travis_wait prefixes on long-running commands.

* Render Snackbar labels correctly for RTL (#1137)

* Change the MDCInteractionTest deployment target to 8.0. (#1131)

* Turn `inkController` into a lazy var. (#1139)

This removes the need for storing it as an optional.

* [ProgressView] Backward animation support (#1138)

* Add backward progress animation mode support.

This allows users to animate the progress view backward if they are giving it progress which is lesser than the current value.

* Demonstrate the backward progress animation support.

* Update the assets for the progress view.

* Change ProgressViewExample with new enum name.

* Updated enum names.

* Update with new enum names.

* Added script to install SwiftLint. (#1143)

* Ran scripts/format_all. (#1141)

* [Scripts] SwiftLint integration (#1129)

* Integrate SwiftLint in the Catalog.

* Update the disabled SwiftLint rules.

* Reference a local swiftlint.yml symlink.

This prevents us from getting warnings about code style violations from the other demos.

* Fix SwiftLint violations in the Catalog and Components.

* Ignore the `third_party` directory when running the linter.

We should not have to deal with warnings in code we may not be able to fix easily.

* Integrate SwiftLint into Shrine.

Additionally, fix a number of warnings introduced.

* Run SwiftLint on Travis.

* Enable many of the previously disabled rules and correct them.

* Fix control statement violations from SwiftLint.

* Update README.md

* Ignore "error" from already-installed brew packages.

* [FlexibleHeader] - Update tests so as not to have 0 in contentSize (#1146)

* Fixed broken links to versions.md.

* Added component changes to CHANGELOG.md.

* Added API diff, determined new version number is 20.0.0.

* Bumped version number to 20.0.0.

* Tell `brew install` to stop failing if swiftlint is already installed.

* Changed clean script to force-clean Xcode projects. (#1144)

* Fix SwiftLint warnings (#1149)

* Exclude catalog/third_party from SwiftLint.

* Added line length to .swiftlint.yml

* Fixed SwiftLint warnings with some minor refactors.

* Install SwiftLint via the install_contributor_tools script. (#1145)

* Install SwiftLint via the install_contributor_tools script.

* Exclude catalog/third_party from SwiftLint.

* Added line length to .swiftlint.yml

* Fixed SwiftLint warnings with some minor refactors.

* Revert "Fixed SwiftLint warnings with some minor refactors."

This reverts commit 2c19802.

* Revert "Added line length to .swiftlint.yml"

This reverts commit 12a6781.

* Revert "Exclude catalog/third_party from SwiftLint."

This reverts commit 8a00ad8.

* [Collections] Added custom Storyboard cell to the Storyboard example. (#1152)

* [Feature highlight] Dynamically size inner highlight (#1151)

* Use instance based inner radius

* Warning re ios sim

* Scale outer highlight to encircle inner highlight

* Dont scale innerhighlight pulsing with inner highlight size

* Reset highlight example supplemental:

* Build fix: CGFloat casts missing from MDCFeatureHighlightView.m.

* More SwiftLint fixes for unit tests and example apps. (#1154)

* ClangFormat changes.

* Added swiftlint to scripts/format_all.`

* Fix scripts/lint_all to work from any directory.

* Fixed swiftlint invocation.

* Remove the checks for force casting (! operator).

* Some fixes.

* More Swift fixes.

* [Snackbar] Message View Styling. (#1120)

* Snackbar Message View Styling.

* Small alteration to how colors are generated for the unit tests.

* Not styling the snack bar in the init method.

* Default styling for background views.

* Remove overriding the styling in init.

* Looks like swiftlint is already installed by default on travis-ci
boxes. Trying this as an experiment.

* Trying this?

* Cant get unit tests to pass as there’s no window to add the message
view to with logic tests.

* Fixed Shrine compilation.

* [AppBar] - Added Modal Presentation App Bar Example (#1153)

* ModalAppBar - Added additional AppBar example to display modal AppBar vc example

* ModalAppBar - Added swift modal example

* ModalAppBar - Updated naming

* ModalAppBar - Updated swift example

* ModalAppBar - Indentions and removed setting nil to title property

* Moves the initialization of the header page into separate file

* Moves the initialization of the header page into separate file

Author: kul3r4

demos/Shrine/Podfile.lock

@@ -45,9 +45,9 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   MaterialComponents:
-    :path: "../../"
+    :path: ../../
   RemoteImageServiceForMDCDemos:
-    :path: "../supplemental"
+    :path: ../supplemental
 
 SPEC CHECKSUMS:
   MaterialComponents: cd8bd56c35bcba349631d762dd5219108324f4e8

demos/Shrine/Shrine.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		6B0C01BA37AC5D6B39F49F16 /* Pods_Shrine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E79DB3BB3A6DCA8E56C685D /* Pods_Shrine.framework */; };
+		CBAF7A311E1577380022A08F /* ShrineHeaderPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBAF7A301E1577380022A08F /* ShrineHeaderPage.swift */; };
 		DE064E731C83D20E00B17776 /* ShrineFlexibleHeaderContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE064E721C83D20E00B17776 /* ShrineFlexibleHeaderContainerViewController.swift */; };
 		DE34DEBB1C88E90000E04B65 /* ShrineInkOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE34DEBA1C88E90000E04B65 /* ShrineInkOverlay.swift */; };
 		DE34DEBF1C8A34B100E04B65 /* ShrineHeaderContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE34DEBE1C8A34B100E04B65 /* ShrineHeaderContentView.swift */; };
@@ -27,6 +28,7 @@
 		1C7F50E40E35B48C29C884F8 /* Pods-Shrine.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Shrine.release.xcconfig"; path = "Pods/Target Support Files/Pods-Shrine/Pods-Shrine.release.xcconfig"; sourceTree = "<group>"; };
 		2E79DB3BB3A6DCA8E56C685D /* Pods_Shrine.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Shrine.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D22DA7C0F576B707C1CA5BE /* Pods-Shrine.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Shrine.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Shrine/Pods-Shrine.debug.xcconfig"; sourceTree = "<group>"; };
+		CBAF7A301E1577380022A08F /* ShrineHeaderPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShrineHeaderPage.swift; sourceTree = "<group>"; };
 		DE064E721C83D20E00B17776 /* ShrineFlexibleHeaderContainerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShrineFlexibleHeaderContainerViewController.swift; sourceTree = "<group>"; };
 		DE34DEBA1C88E90000E04B65 /* ShrineInkOverlay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShrineInkOverlay.swift; sourceTree = "<group>"; };
 		DE34DEBE1C8A34B100E04B65 /* ShrineHeaderContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShrineHeaderContentView.swift; sourceTree = "<group>"; };
@@ -109,6 +111,7 @@
 				DE064E721C83D20E00B17776 /* ShrineFlexibleHeaderContainerViewController.swift */,
 				DE34DEBE1C8A34B100E04B65 /* ShrineHeaderContentView.swift */,
 				DE34DEBA1C88E90000E04B65 /* ShrineInkOverlay.swift */,
+				CBAF7A301E1577380022A08F /* ShrineHeaderPage.swift */,
 			);
 			path = Shrine;
 			sourceTree = "<group>";
@@ -268,6 +271,7 @@
 				DE5D2A481C81068100C9C650 /* AppDelegate.swift in Sources */,
 				DE5D2A5C1C810E6600C9C650 /* ShrineCollectionViewController.swift in Sources */,
 				DE34DEBF1C8A34B100E04B65 /* ShrineHeaderContentView.swift in Sources */,
+				CBAF7A311E1577380022A08F /* ShrineHeaderPage.swift in Sources */,
 				DE064E731C83D20E00B17776 /* ShrineFlexibleHeaderContainerViewController.swift in Sources */,
 				DE6887F31C84FCD40074A8C5 /* ShrineData.swift in Sources */,
 				DE34DEBB1C88E90000E04B65 /* ShrineInkOverlay.swift in Sources */,

demos/Shrine/Shrine/ShrineHeaderContentView.swift

@@ -16,19 +16,9 @@
 
 import UIKit
 import MaterialComponents.MaterialPageControl
-import RemoteImageServiceForMDCDemos
 
 class ShrineHeaderContentView: UIView, UIScrollViewDelegate {
 
-  let fontAbril = UIFont(name: "AbrilFatface-Regular", size: 36)
-  let fontHelvetica = UIFont(name: "Helvetica", size: 14)
-  let textColor = UIColor(red: 10 / 255, green: 49 / 255, blue: 66 / 255, alpha: 1)
-  let cyanBoxColor = UIColor(red: 0.19, green: 0.94, blue: 0.94, alpha: 1)
-  let descColor = UIColor(white: 0.54, alpha: 1)
-  let descString = "Leave the tunnel and the rain is fallin amazing things happen when you wait"
-
-  var remoteImageService = RemoteImageService()
-
   var pageControl = MDCPageControl()
   var scrollView = UIScrollView()
   var logoImageView = UIImageView(image: UIImage(named: "ShrineLogo"))
@@ -87,60 +77,15 @@ class ShrineHeaderContentView: UIView, UIScrollViewDelegate {
                           for: UIControlEvents.valueChanged)
     self.addSubview(pageControl)
 
-    addPageContent()
+    addHeaderPages()
     self.addSubview(logoImageView)
     self.addSubview(logoTextImageView)
   }
 
-  func addPage(page: UIView, imageView: UIImageView, label: UILabel, labelDesc: UILabel,
-               cyanBox: UIView, imageName: String, description: String) {
-    imageView.contentMode = UIViewContentMode.scaleAspectFill
-    imageView.autoresizingMask = .flexibleHeight
-    (page as AnyObject).addSubview(imageView)
-    let url = URL(string: ShrineData.baseURL + imageName)
-    remoteImageService.fetchImageAndThumbnail(from: url) { (image: UIImage?, _) -> Void in
-      DispatchQueue.main.async(execute: {
-        imageView.image = image
-        imageView.setNeedsDisplay()
-      })
-    }
-
-    label.font = fontAbril
-    label.textColor = textColor
-    label.lineBreakMode = .byWordWrapping
-    label.numberOfLines = 2
-    label.attributedText = attributedString(description, lineHeightMultiple: 0.8)
-    label.sizeToFit()
-    (page as AnyObject).addSubview(label)
-
-    labelDesc.lineBreakMode = .byWordWrapping
-    labelDesc.numberOfLines = 3
-    labelDesc.font = fontHelvetica
-    labelDesc.textColor = descColor
-    labelDesc.attributedText = attributedString(descString, lineHeightMultiple: 1.2)
-    labelDesc.autoresizingMask = .flexibleWidth
-    (page as AnyObject).addSubview(labelDesc)
-
-    cyanBox.backgroundColor = cyanBoxColor
-    (page as AnyObject).addSubview(cyanBox)
-
-    let inkOverlay = ShrineInkOverlay(frame: (page as AnyObject).bounds)
-    inkOverlay.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-    (page as AnyObject).addSubview(inkOverlay)
-
-  }
-
-  func addPageContent() {
-    let firstPage = pages[0]
-    let secondPage = pages[1]
-    let thirdPage = pages[2]
-
-    addPage(page: firstPage as! UIView, imageView: imageView, label: label, labelDesc: labelDesc,
-            cyanBox: cyanBox, imageName: "chair.png", description: "Green \ncomfort chair")
-    addPage(page: secondPage as! UIView, imageView: imageView2, label: label2, labelDesc: labelDesc2,
-            cyanBox: cyanBox2, imageName: "backpack.png", description: "Best gift for \nthe traveler")
-    addPage(page: thirdPage as! UIView, imageView: imageView3, label: label3, labelDesc: labelDesc3,
-            cyanBox: cyanBox3, imageName: "heels.png", description: "Better \nwearing heels")
+  func addHeaderPages() {
+    _ = ShrineHeaderPage(page: pages[0] as! UIView, imageView: imageView, label: label, labelDesc: labelDesc, cyanBox: cyanBox, imageName: "chair.png", description: "Green \ncomfort chair")
+    _ = ShrineHeaderPage(page: pages[1] as! UIView, imageView: imageView2, label: label2, labelDesc: labelDesc2, cyanBox: cyanBox2, imageName: "backpack.png", description: "Best gift for \nthe traveler")
+    _ = ShrineHeaderPage(page: pages[2] as! UIView, imageView: imageView3, label: label3, labelDesc: labelDesc3, cyanBox: cyanBox3, imageName: "heels.png", description: "Better \nwearing heels")
   }
 
   override func layoutSubviews() {
@@ -191,15 +136,6 @@ class ShrineHeaderContentView: UIView, UIScrollViewDelegate {
     imageView3.frame = CGRect(x: -180, y: 40, width: 420, height: self.frame.size.height)
   }
 
-  func attributedString(_ string: String, lineHeightMultiple: CGFloat) -> NSMutableAttributedString {
-    let paragraphStyle = NSMutableParagraphStyle()
-    paragraphStyle.lineHeightMultiple = lineHeightMultiple
-    let attrString = NSMutableAttributedString(string: string)
-    attrString.addAttribute(NSParagraphStyleAttributeName, value:paragraphStyle,
-      range:NSMakeRange(0, attrString.length))
-    return attrString
-  }
-
   func scrollViewDidScroll(_ scrollView: UIScrollView) {
     pageControl.scrollViewDidScroll(scrollView)
   }

demos/Shrine/Shrine/ShrineHeaderPage.swift

@@ -0,0 +1,96 @@
+/*
+ Copyright 2016-present the Material Components for iOS authors. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import UIKit
+import RemoteImageServiceForMDCDemos
+
+struct ShrineHeaderPage {
+
+  let textColor = UIColor(red: 10 / 255, green: 49 / 255, blue: 66 / 255, alpha: 1)
+  let fontAbril = UIFont(name: "AbrilFatface-Regular", size: 36)
+  let fontHelvetica = UIFont(name: "Helvetica", size: 14)
+  let cyanBoxColor = UIColor(red: 0.19, green: 0.94, blue: 0.94, alpha: 1)
+  let descColor = UIColor(white: 0.54, alpha: 1)
+  let descString = "Leave the tunnel and the rain is fallin amazing things happen when you wait"
+
+  var remoteImageService = RemoteImageService()
+
+  var page: UIView
+  var imageView: UIView
+  var label: UILabel
+  var labelDesc: UILabel
+  var cyanBox: UIView
+  var imageName: String
+  var description: String
+
+  init(page: UIView, imageView: UIImageView, label: UILabel, labelDesc: UILabel,
+       cyanBox: UIView, imageName: String, description: String) {
+    self.page = page
+    self.imageView = imageView
+    self.label = label
+    self.labelDesc = labelDesc
+    self.cyanBox = cyanBox
+    self.imageName = imageName
+    self.description = description
+
+    imageView.contentMode = UIViewContentMode.scaleAspectFill
+    imageView.autoresizingMask = .flexibleHeight
+    (page as AnyObject).addSubview(imageView)
+    let url = URL(string: ShrineData.baseURL + imageName)
+    remoteImageService.fetchImageAndThumbnail(from: url) { (image:UIImage?,
+      thumbnailImage:UIImage?) -> Void in
+      DispatchQueue.main.async(execute: {
+        imageView.image = image;
+        imageView.setNeedsDisplay()
+      })
+    }
+
+    label.font = fontAbril
+    label.textColor = textColor
+    label.lineBreakMode = .byWordWrapping
+    label.numberOfLines = 2
+    label.attributedText = attributedString(description, lineHeightMultiple: 0.8)
+    label.sizeToFit();
+    (page as AnyObject).addSubview(label)
+
+    labelDesc.lineBreakMode = .byWordWrapping
+    labelDesc.numberOfLines = 3
+    labelDesc.font = fontHelvetica
+    labelDesc.textColor = descColor
+    labelDesc.attributedText = attributedString(descString, lineHeightMultiple: 1.2)
+    labelDesc.autoresizingMask = .flexibleWidth
+    (page as AnyObject).addSubview(labelDesc)
+
+    cyanBox.backgroundColor = cyanBoxColor
+    (page as AnyObject).addSubview(cyanBox)
+
+    let inkOverlay = ShrineInkOverlay(frame: (page as AnyObject).bounds)
+    inkOverlay.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+    (page as AnyObject).addSubview(inkOverlay)
+
+  }
+
+  func attributedString(_ string: String, lineHeightMultiple: CGFloat) -> NSMutableAttributedString {
+    let paragraphStyle = NSMutableParagraphStyle()
+    paragraphStyle.lineHeightMultiple = lineHeightMultiple
+    let attrString = NSMutableAttributedString(string: string)
+    attrString.addAttribute(NSParagraphStyleAttributeName, value:paragraphStyle,
+                            range:NSMakeRange(0, attrString.length))
+    return attrString
+  }
+
+
+}