Skip to content

Commit

Permalink
Add CatalogByConvention.
Browse files Browse the repository at this point in the history
Summary: Closes #18

Reviewers: O4 Material Motion Apple platform reviewers, O2 Material Motion, markwei

Reviewed By: O4 Material Motion Apple platform reviewers, O2 Material Motion, markwei

Tags: #material_motion

Differential Revision: http://codereview.cc/D1836
  • Loading branch information
Jeff Verkoeyen committed Nov 1, 2016
1 parent cd7e9ce commit b4418fa
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 2 deletions.
1 change: 1 addition & 0 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
abstract_target 'MaterialMotionDirectManipulationFamily' do
pod 'MaterialMotionRuntime'
pod 'CatalogByConvention'

pod 'MaterialMotionDirectManipulationFamily', :path => './'

Expand Down
5 changes: 4 additions & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
PODS:
- CatalogByConvention (2.0.0)
- MaterialMotionDirectManipulationFamily (1.0.0):
- MaterialMotionRuntime (~> 4.0)
- MaterialMotionRuntime (4.0.0)

DEPENDENCIES:
- CatalogByConvention
- MaterialMotionDirectManipulationFamily (from `./`)
- MaterialMotionRuntime

Expand All @@ -12,9 +14,10 @@ EXTERNAL SOURCES:
:path: "./"

SPEC CHECKSUMS:
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
MaterialMotionDirectManipulationFamily: 5c4e71a9adddea0b704f6e54a5707dbd20278316
MaterialMotionRuntime: 0542afcb0329e032f198d711941fc667f42cc0a2

PODFILE CHECKSUM: 06eea88950656fc1ab4f35bce0269a517172e959
PODFILE CHECKSUM: 9103685dd4a7cb2c3f2ddbb3dc20de80f8e57c86

COCOAPODS: 1.1.1
4 changes: 4 additions & 0 deletions examples/apps/Catalog/Catalog.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
047DC51A59DEB258F091159F /* Pods_MaterialMotionDirectManipulationFamily_UnitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 211A19D660FB04114F03F7E7 /* Pods_MaterialMotionDirectManipulationFamily_UnitTests.framework */; };
664A5AB41DC93E410082B5DF /* TableOfContents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664A5AB31DC93E410082B5DF /* TableOfContents.swift */; };
666FAA841D384A6B000363DA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 666FAA831D384A6B000363DA /* AppDelegate.swift */; };
666FAA8B1D384A6B000363DA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 666FAA8A1D384A6B000363DA /* Assets.xcassets */; };
666FAA8E1D384A6B000363DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 666FAA8C1D384A6B000363DA /* LaunchScreen.storyboard */; };
Expand Down Expand Up @@ -35,6 +36,7 @@
1614649213BE7E305369FE5D /* Pods_MaterialMotionGesturesFamily_UnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MaterialMotionGesturesFamily_UnitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
211A19D660FB04114F03F7E7 /* Pods_MaterialMotionDirectManipulationFamily_UnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MaterialMotionDirectManipulationFamily_UnitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
47AD29C808E6149118D934CA /* Pods_MaterialMotionDirectManipulationFamily_Catalog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MaterialMotionDirectManipulationFamily_Catalog.framework; sourceTree = BUILT_PRODUCTS_DIR; };
664A5AB31DC93E410082B5DF /* TableOfContents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableOfContents.swift; sourceTree = "<group>"; };
666FAA801D384A6B000363DA /* Catalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Catalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
666FAA831D384A6B000363DA /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Catalog/AppDelegate.swift; sourceTree = "<group>"; };
666FAA8A1D384A6B000363DA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -80,6 +82,7 @@
666FAA771D384A6B000363DA = {
isa = PBXGroup;
children = (
664A5AB31DC93E410082B5DF /* TableOfContents.swift */,
666FAAA31D384B13000363DA /* examples */,
666FAAA61D384B77000363DA /* catalog */,
666FAA971D384A6B000363DA /* tests */,
Expand Down Expand Up @@ -393,6 +396,7 @@
files = (
DE7977851D4FF53900691A95 /* DirectManipulationViewController.swift in Sources */,
666FAA841D384A6B000363DA /* AppDelegate.swift in Sources */,
664A5AB41DC93E410082B5DF /* TableOfContents.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
7 changes: 6 additions & 1 deletion examples/apps/Catalog/Catalog/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

import UIKit
import CatalogByConvention

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
Expand All @@ -24,7 +25,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
let window = UIWindow(frame: UIScreen.main.bounds)
self.window = window
window.rootViewController = UINavigationController(rootViewController: DirectManipulationViewController())

let rootViewController = CBCNodeListViewController(node: CBCCreateNavigationTree())
rootViewController.title = "Material Motion Direct Manipulation Family"
window.rootViewController = UINavigationController(rootViewController: rootViewController)

window.makeKeyAndVisible()
return true
}
Expand Down
23 changes: 23 additions & 0 deletions examples/apps/Catalog/TableOfContents.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
Copyright 2016-present The Material Motion 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.
*/

// MARK: Catalog by convention

extension DirectManipulationViewController {
class func catalogBreadcrumbs() -> [String] {
return ["1. Direct manipulation"]
}
}

0 comments on commit b4418fa

Please sign in to comment.