Use CatalogByConvention to organize the catalog application.

material-motion-archive · Oct 3, 2016 · be727d7 · be727d7
1 parent d78f532
commit be727d7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/Podfile b/Podfile
@@ -1,5 +1,6 @@
 abstract_target 'MaterialMotionCoreAnimationFamily' do
   pod 'MaterialMotionRuntime'
+  pod 'CatalogByConvention'
 
   pod 'MaterialMotionCoreAnimationFamily', :path => './'
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,9 +1,11 @@
 PODS:
+  - CatalogByConvention (2.0.0)
   - MaterialMotionCoreAnimationFamily (1.0.0):
     - MaterialMotionRuntime (~> 3.0)
   - MaterialMotionRuntime (3.0.1)
 
 DEPENDENCIES:
+  - CatalogByConvention
   - MaterialMotionCoreAnimationFamily (from `./`)
   - MaterialMotionRuntime
 
@@ -12,9 +14,10 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
+  CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
   MaterialMotionCoreAnimationFamily: b1510c270b916d14f2d4c40f8d065a2eb2ac7e7d
   MaterialMotionRuntime: 056ed241097e4f63b7d25a34685d031703689a22
 
-PODFILE CHECKSUM: f3758cef32f3c3dffa982441bde398fb9dbbca2c
+PODFILE CHECKSUM: d57fe95da4a4c2d2f7d76f166968a12da45986d3
 
 COCOAPODS: 1.1.0.rc.2
diff --git a/...log/Catalog/PopupMenuViewController.swift → examples/PopupMenuViewController.swift b/...log/Catalog/PopupMenuViewController.swift → examples/PopupMenuViewController.swift
@@ -171,4 +171,7 @@ class PopupMenuViewController: UIViewController {
     return fade
   }
 
+  class func catalogBreadcrumbs() -> [String] {
+    return ["Popup menu"]
+  }
 }
diff --git a/examples/apps/Catalog/Catalog.xcodeproj/project.pbxproj b/examples/apps/Catalog/Catalog.xcodeproj/project.pbxproj
@@ -42,7 +42,7 @@
 		66E6202F1D47D2340021B138 /* SchedulerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchedulerDelegate.swift; sourceTree = "<group>"; };
 		B2AEAB79F993F15CB0185C24 /* Pods-MaterialMotionCoreAnimationFamily-UnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MaterialMotionCoreAnimationFamily-UnitTests.debug.xcconfig"; path = "../../../Pods/Target Support Files/Pods-MaterialMotionCoreAnimationFamily-UnitTests/Pods-MaterialMotionCoreAnimationFamily-UnitTests.debug.xcconfig"; sourceTree = "<group>"; };
 		CCEEB5C473CA229BD2A79788 /* Pods-MaterialMotionCoreAnimationFamily-Catalog.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MaterialMotionCoreAnimationFamily-Catalog.release.xcconfig"; path = "../../../Pods/Target Support Files/Pods-MaterialMotionCoreAnimationFamily-Catalog/Pods-MaterialMotionCoreAnimationFamily-Catalog.release.xcconfig"; sourceTree = "<group>"; };
-		D05136401D5122C800438C0F /* PopupMenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PopupMenuViewController.swift; path = Catalog/PopupMenuViewController.swift; sourceTree = "<group>"; };
+		D05136401D5122C800438C0F /* PopupMenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopupMenuViewController.swift; sourceTree = "<group>"; };
 		D0B8148CD2D7965DD1699653 /* Pods_MaterialMotionCoreAnimationFamily_Catalog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MaterialMotionCoreAnimationFamily_Catalog.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F2DA13259D089A0F11B2ECB8 /* Pods-MaterialMotionCoreAnimationFamily-Catalog.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MaterialMotionCoreAnimationFamily-Catalog.debug.xcconfig"; path = "../../../Pods/Target Support Files/Pods-MaterialMotionCoreAnimationFamily-Catalog/Pods-MaterialMotionCoreAnimationFamily-Catalog.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -123,6 +123,7 @@
 		666FAAA31D384B13000363DA /* examples */ = {
 			isa = PBXGroup;
 			children = (
+				D05136401D5122C800438C0F /* PopupMenuViewController.swift */,
 			);
 			name = examples;
 			path = ../..;
@@ -151,7 +152,6 @@
 			isa = PBXGroup;
 			children = (
 				666FAA831D384A6B000363DA /* AppDelegate.swift */,
-				D05136401D5122C800438C0F /* PopupMenuViewController.swift */,
 			);
 			name = catalog;
 			sourceTree = "<group>";

diff --git a/examples/apps/Catalog/Catalog/AppDelegate.swift b/examples/apps/Catalog/Catalog/AppDelegate.swift
@@ -15,6 +15,7 @@
  */
 
 import UIKit
+import CatalogByConvention
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -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: PopupMenuViewController())
+
+    let rootViewController = CBCNodeListViewController(node: CBCCreateNavigationTree())
+    rootViewController.title = "Material Motion Core Animation Family"
+    window.rootViewController = UINavigationController(rootViewController: rootViewController)
+
     window.makeKeyAndVisible()
     return true
   }