Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Composition #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Documents/2_composition.md

This file was deleted.

File renamed without changes.
1 change: 1 addition & 0 deletions Documents/3_composition.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
💥💥💥💥💥💥 WIP 💥💥💥💥💥💥
12 changes: 12 additions & 0 deletions RACNest.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -57,6 +58,7 @@
C72D330E1C471B3000F88B11 /* TableViewProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewProtocols.swift; sourceTree = "<group>"; };
C76C205A1C504B9D0083F4F5 /* SearchViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
C76C205F1C5053660083F4F5 /* words.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = words.txt; sourceTree = "<group>"; };
C7738E9F1C5987F200246AAE /* CompositionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CompositionViewController.swift; sourceTree = "<group>"; };
C7852C321C4ACAAA00375089 /* StoryboardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardViewController.swift; sourceTree = "<group>"; };
C7852C341C4ACB6B00375089 /* Storyboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Storyboard.swift; sourceTree = "<group>"; };
C7852C3C1C4ACF9500375089 /* FormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -165,6 +167,7 @@
C72D32F61C470FE000F88B11 /* ViewControllers */ = {
isa = PBXGroup;
children = (
C7738E9E1C5987EA00246AAE /* Composition */,
C7852C3B1C4ACF9500375089 /* Form */,
C76C20591C504B750083F4F5 /* Search */,
C7852C3E1C4ACFE000375089 /* Main */,
Expand Down Expand Up @@ -211,6 +214,14 @@
path = DataSource;
sourceTree = "<group>";
};
C7738E9E1C5987EA00246AAE /* Composition */ = {
isa = PBXGroup;
children = (
C7738E9F1C5987F200246AAE /* CompositionViewController.swift */,
);
path = Composition;
sourceTree = "<group>";
};
C7852C311C4ACA9F00375089 /* AppRelated */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -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 */,
Expand Down
1 change: 1 addition & 0 deletions RACNest/AppRelated/StoryboardViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ import UIKit
enum StoryboardViewController : String, StoryboardViewControllerType {
case Form = "FormViewController"
case Search = "SearchViewController"
case Composition = "CompositionViewController"
}
20 changes: 19 additions & 1 deletion RACNest/Resources/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,25 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="oii-tE-Mvs" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2308" y="1272"/>
<point key="canvasLocation" x="2404" y="1240"/>
</scene>
<!--Composition View Controller-->
<scene sceneID="NeH-5h-dnD">
<objects>
<viewController storyboardIdentifier="CompositionViewController" id="YL2-kZ-nT6" customClass="CompositionViewController" customModule="RACNest" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Jrk-Vj-uu8"/>
<viewControllerLayoutGuide type="bottom" id="wnE-8v-S9m"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="jWg-5Q-wfh">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Yo2-Vq-VkK" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2408" y="1978"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="I5L-7e-bbr">
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

}
5 changes: 3 additions & 2 deletions RACNest/ViewControllers/Main/Components/MainViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----------
Expand Down