material-motion · huangboju · Oct 31, 2017 · Jan 19, 2020 · Jan 19, 2020
diff --git a/Podfile b/Podfile
@@ -13,14 +13,3 @@ target "UnitTests" do
 
   project 'examples/apps/Catalog/MaterialMotionCatalog.xcodeproj'
 end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |configuration|
-      configuration.build_settings['SWIFT_VERSION'] = "3.0"
-      if target.name.start_with?("Material")
-        configuration.build_settings['WARNING_CFLAGS'] ="$(inherited) -Wall -Wcast-align -Wconversion -Werror -Wextra -Wimplicit-atomic-properties -Wmissing-prototypes -Wno-sign-conversion -Wno-unused-parameter -Woverlength-strings -Wshadow -Wstrict-selector-match -Wundeclared-selector -Wunreachable-code"
-      end
-    end
-  end
-end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - CatalogByConvention (2.1.0)
+  - CatalogByConvention (2.5.1)
   - IndefiniteObservable (4.0.0):
     - IndefiniteObservable/lib (= 4.0.0)
   - IndefiniteObservable/lib (4.0.0)
@@ -10,15 +10,20 @@ DEPENDENCIES:
   - CatalogByConvention
   - MaterialMotion (from `./`)
 
+SPEC REPOS:
+  trunk:
+    - CatalogByConvention
+    - IndefiniteObservable
+
 EXTERNAL SOURCES:
   MaterialMotion:
-    :path: ./
+    :path: "./"
 
 SPEC CHECKSUMS:
-  CatalogByConvention: ef0913973b86b4234bcadf22aa84037c4a47cbbd
+  CatalogByConvention: 2b58a9b64e5b1049abb5d3f8e764a551bbe843a7
   IndefiniteObservable: 1ee6af37efa8763a222cc6d414cd125e26ed9b6a
   MaterialMotion: a412b109cfe4ab7b1fd956409a5da9a3635d3dce
 
-PODFILE CHECKSUM: f503265a0d60526a0d28c96dd4bdcfb40fb562fc
+PODFILE CHECKSUM: 04070b6b0e30166a620e99ef4fe5ec69fd90cf85
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.8.3
diff --git a/examples/ContextualTransitionExample.swift b/examples/ContextualTransitionExample.swift
@@ -221,7 +221,7 @@ class PhotoAlbumViewController: UIViewController, UICollectionViewDataSource, UI
 
     navigationController?.setNavigationBarHidden(true, animated: animated)
 
-    let photoIndex = album.photos.index { $0.image == currentPhoto.image }!
+    let photoIndex = album.photos.firstIndex { $0.image == currentPhoto.image }!
     let indexPath = IndexPath(item: photoIndex, section: 0)
     collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: false)
   }

diff --git a/examples/FabTransitionExample.swift b/examples/FabTransitionExample.swift
@@ -27,7 +27,7 @@ class FabTransitionExampleViewController: ExampleViewController, TransitionConte
     actionButton.backgroundColor = .primaryColor
     actionButton.bounds = .init(x: 0, y: 0, width: 50, height: 50)
     actionButton.layer.cornerRadius = actionButton.bounds.width / 2
-    actionButton.layer.position = .init(x: view.bounds.width - actionButton.bounds.width / 2 - 24,
+    actionButton.layer.position = CGPoint(x: view.bounds.width - actionButton.bounds.width / 2 - 24,
                                         y: view.bounds.height - actionButton.bounds.height / 2 - 24)
     actionButton.autoresizingMask = [.flexibleLeftMargin, .flexibleTopMargin]
     actionButton.layer.shadowOpacity = 0.5
@@ -39,7 +39,7 @@ class FabTransitionExampleViewController: ExampleViewController, TransitionConte
     actionButton.addTarget(self, action: #selector(didTap), for: .touchUpInside)
   }
 
-  func didTap() {
+    @objc func didTap() {
     let vc = ModalViewController()
     vc.transitionController.transition = CircularRevealTransition()
     present(vc, animated: true)
@@ -69,7 +69,7 @@ private class ModalViewController: UIViewController {
     view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTap)))
   }
 
-  func didTap() {
+    @objc func didTap() {
     dismiss(animated: true)
   }
 }

diff --git a/examples/InteractivePushBackTransitionExample.swift b/examples/InteractivePushBackTransitionExample.swift
@@ -25,7 +25,7 @@ class InteractivePushBackTransitionExampleViewController: ExampleViewController
     view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTap)))
   }
 
-  func didTap() {
+    @objc func didTap() {
     let vc = ModalViewController()
     present(vc, animated: true)
   }

diff --git a/examples/MaterialExpansionExample.swift b/examples/MaterialExpansionExample.swift
@@ -59,7 +59,7 @@ class MaterialExpansionExampleViewController: ExampleViewController {
                                           system: coreAnimation)
 
     let floodExpansion = Tween<CGFloat>(duration: 0.375, values: [0, 1])
-    floodExpansion.timingFunctions.value = [CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut)]
+    floodExpansion.timingFunctions.value = [CAMediaTimingFunction(name: .easeOut)]
     let fadeOut = Tween<CGFloat>(duration: 0.375, values: [0.75, 0])
     fadeOut.offsets.value = [0.2, 1]
 

diff --git a/examples/ModalDialogExample.swift b/examples/ModalDialogExample.swift
@@ -25,7 +25,7 @@ class ModalDialogExampleViewController: ExampleViewController {
     view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTap)))
   }
 
-  func didTap() {
+    @objc func didTap() {
     let vc = ModalDialogViewController()
     present(vc, animated: true)
   }

diff --git a/examples/PushBackTransitionExample.swift b/examples/PushBackTransitionExample.swift
@@ -25,7 +25,7 @@ class PushBackTransitionExampleViewController: ExampleViewController {
     view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTap)))
   }
 
-  func didTap() {
+    @objc func didTap() {
     let vc = ModalViewController()
     present(vc, animated: true)
   }
@@ -56,7 +56,7 @@ private class ModalViewController: UIViewController {
     view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTap)))
   }
 
-  func didTap() {
+    @objc func didTap() {
     dismiss(animated: true)
   }
 

diff --git a/examples/StickerPickerExample.swift b/examples/StickerPickerExample.swift
@@ -43,7 +43,7 @@ class StickerPickerExampleViewController: ExampleViewController, StickerListView
     runtime.add(DirectlyManipulable(), to: stickerView)
   }
 
-  func didTapAdd() {
+    @objc func didTapAdd() {
     let picker = StickerListViewController()
     picker.delegate = self
     present(picker, animated: true)

diff --git a/examples/apps/Catalog/Catalog/AppDelegate.swift b/examples/apps/Catalog/Catalog/AppDelegate.swift
@@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
     let window = UIWindow(frame: UIScreen.main.bounds)
     self.window = window
 

diff --git a/examples/apps/Catalog/Catalog/Base.lproj/LaunchScreen.storyboard b/examples/apps/Catalog/Catalog/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -13,10 +16,9 @@
                         <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>

diff --git a/examples/apps/Catalog/Catalog/TableOfContents.swift b/examples/apps/Catalog/Catalog/TableOfContents.swift
@@ -19,81 +19,81 @@
 import Foundation
 
 extension CarouselExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Carousel"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Carousel"] }
 }
 
 extension ContextualTransitionExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Contextual transition"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Contextual transition"] }
 }
 
 extension FabTransitionExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Case studies", "FAB transition"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Case studies", "FAB transition"] }
 }
 
 extension MaterialExpansionExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Material expansion"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Material expansion"] }
 }
 
 extension ModalDialogExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Modal dialog"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Modal dialog"] }
 }
 
 extension PushBackTransitionExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Push back transition"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Push back transition"] }
 }
 
 extension InteractivePushBackTransitionExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Push back transition (interactive)"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Push back transition (interactive)"] }
 }
 
 extension StickerPickerExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Sticker picker"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Case studies", "Sticker picker"] }
 }
 
 extension HowToUseReactiveConstraintsExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["How to...", "Use reactive constraints"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["How to...", "Use reactive constraints"] }
 }
 
 extension HowToMakeACustomOperatorExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["How to...", "Make a custom operator"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["How to...", "Make a custom operator"] }
 }
 
 extension ArcMoveExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Arc move"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Arc move"] }
 }
 
 extension ChangeDirectionOnReleaseExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Change direction on release"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Change direction on release"] }
 }
 
 extension DirectlyManipulableExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Directly manipulable"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Directly manipulable"] }
 }
 
 extension DraggableExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Draggable"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Draggable"] }
 }
 
 extension RotatableExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Rotatable"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Rotatable"] }
 }
 
 extension ScalableExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Scalable"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Scalable"] }
 }
 
 extension SetPositionOnTapExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Set position on tap"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Set position on tap"] }
 }
 
 extension SpringExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Spring"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Spring"] }
 }
 
 extension TweenExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Tween"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Tween"] }
 }
 
 extension TossableExampleViewController {
-  class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Tossable"] }
+  @objc class func catalogBreadcrumbs() -> [String] { return ["Interactions", "Tossable"] }
 }