diff --git a/Documents/2_composition.md b/Documents/2_composition.md deleted file mode 100644 index 4cc88b2..0000000 --- a/Documents/2_composition.md +++ /dev/null @@ -1,2 +0,0 @@ - -WIP 💥💥💥💥💥💥 diff --git a/Documents/3_search.md b/Documents/2_search.md similarity index 100% rename from Documents/3_search.md rename to Documents/2_search.md diff --git a/Documents/3_composition.md b/Documents/3_composition.md new file mode 100644 index 0000000..aaad73d --- /dev/null +++ b/Documents/3_composition.md @@ -0,0 +1 @@ +💥💥💥💥💥💥 WIP 💥💥💥💥💥💥 diff --git a/RACNest.xcodeproj/project.pbxproj b/RACNest.xcodeproj/project.pbxproj index 0303c44..c2c9c9b 100644 --- a/RACNest.xcodeproj/project.pbxproj +++ b/RACNest.xcodeproj/project.pbxproj @@ -16,6 +16,7 @@ C72D330F1C471B3000F88B11 /* TableViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72D330E1C471B3000F88B11 /* TableViewProtocols.swift */; }; C76C205B1C504B9D0083F4F5 /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C76C205A1C504B9D0083F4F5 /* SearchViewController.swift */; }; C76C20601C5053660083F4F5 /* words.txt in Resources */ = {isa = PBXBuildFile; fileRef = C76C205F1C5053660083F4F5 /* words.txt */; }; + C7738EA01C5987F200246AAE /* CompositionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7738E9F1C5987F200246AAE /* CompositionViewController.swift */; }; C7852C331C4ACAAA00375089 /* StoryboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7852C321C4ACAAA00375089 /* StoryboardViewController.swift */; }; C7852C351C4ACB6B00375089 /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7852C341C4ACB6B00375089 /* Storyboard.swift */; }; C7852C3D1C4ACF9500375089 /* FormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7852C3C1C4ACF9500375089 /* FormViewController.swift */; }; @@ -57,6 +58,7 @@ C72D330E1C471B3000F88B11 /* TableViewProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewProtocols.swift; sourceTree = ""; }; C76C205A1C504B9D0083F4F5 /* SearchViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = ""; }; C76C205F1C5053660083F4F5 /* words.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = words.txt; sourceTree = ""; }; + C7738E9F1C5987F200246AAE /* CompositionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CompositionViewController.swift; sourceTree = ""; }; C7852C321C4ACAAA00375089 /* StoryboardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardViewController.swift; sourceTree = ""; }; C7852C341C4ACB6B00375089 /* Storyboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Storyboard.swift; sourceTree = ""; }; C7852C3C1C4ACF9500375089 /* FormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormViewController.swift; sourceTree = ""; }; @@ -165,6 +167,7 @@ C72D32F61C470FE000F88B11 /* ViewControllers */ = { isa = PBXGroup; children = ( + C7738E9E1C5987EA00246AAE /* Composition */, C7852C3B1C4ACF9500375089 /* Form */, C76C20591C504B750083F4F5 /* Search */, C7852C3E1C4ACFE000375089 /* Main */, @@ -211,6 +214,14 @@ path = DataSource; sourceTree = ""; }; + C7738E9E1C5987EA00246AAE /* Composition */ = { + isa = PBXGroup; + children = ( + C7738E9F1C5987F200246AAE /* CompositionViewController.swift */, + ); + path = Composition; + sourceTree = ""; + }; C7852C311C4ACA9F00375089 /* AppRelated */ = { isa = PBXGroup; children = ( @@ -415,6 +426,7 @@ C7852C441C4ACFE000375089 /* MainViewModel.swift in Sources */, C72D32F81C470FE000F88B11 /* AppDelegate.swift in Sources */, C7CB87171C51AC7000ED9AE6 /* SearchViewModel.swift in Sources */, + C7738EA01C5987F200246AAE /* CompositionViewController.swift in Sources */, C7CB87161C51AC7000ED9AE6 /* SearchCellItem.swift in Sources */, C7CB87121C51AB8E00ED9AE6 /* GenericTableCell.swift in Sources */, C7852C461C4ACFE000375089 /* MainCellItem.swift in Sources */, diff --git a/RACNest/AppRelated/StoryboardViewController.swift b/RACNest/AppRelated/StoryboardViewController.swift index 545bf2c..5f793c2 100644 --- a/RACNest/AppRelated/StoryboardViewController.swift +++ b/RACNest/AppRelated/StoryboardViewController.swift @@ -11,4 +11,5 @@ import UIKit enum StoryboardViewController : String, StoryboardViewControllerType { case Form = "FormViewController" case Search = "SearchViewController" + case Composition = "CompositionViewController" } \ No newline at end of file diff --git a/RACNest/Resources/Base.lproj/Main.storyboard b/RACNest/Resources/Base.lproj/Main.storyboard index c3dd791..d90614f 100644 --- a/RACNest/Resources/Base.lproj/Main.storyboard +++ b/RACNest/Resources/Base.lproj/Main.storyboard @@ -121,7 +121,25 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/RACNest/ViewControllers/Composition/CompositionViewController.swift b/RACNest/ViewControllers/Composition/CompositionViewController.swift new file mode 100644 index 0000000..d41928a --- /dev/null +++ b/RACNest/ViewControllers/Composition/CompositionViewController.swift @@ -0,0 +1,14 @@ +// +// CompositionViewController.swift +// RACNest +// +// Created by Rui Peres on 27/01/2016. +// Copyright © 2016 Rui Peres. All rights reserved. +// + +import Foundation +import UIKit + +final class CompositionViewController: UIViewController { + +} \ No newline at end of file diff --git a/RACNest/ViewControllers/Main/Components/MainViewModel.swift b/RACNest/ViewControllers/Main/Components/MainViewModel.swift index fd831a3..43d9385 100644 --- a/RACNest/ViewControllers/Main/Components/MainViewModel.swift +++ b/RACNest/ViewControllers/Main/Components/MainViewModel.swift @@ -16,8 +16,9 @@ final class MainViewModel: NSObject { let item1 = MainCellItem(title: "1. Form 🐥", identifier: .Form) let item2 = MainCellItem(title: "2. Search 🔍", identifier: .Search) - - items = [item1, item2] + let item3 = MainCellItem(title: "3. Composition 🚕 🚗 🚙", identifier: .Composition) + + items = [item1, item2, item3] super.init() } diff --git a/README.md b/README.md index 260682c..ba12e8b 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,9 @@ Examples -------- 1. [Form 🐥](Documents/1_form.md) -2. [Composition 🚗🚕🚙] (Documents/2_composition.md) 2. [Search 🔍] (Documents/3_search.md) +3. [Composition 🚗🚕🚙] (Documents/2_composition.md) + Contributing -----------