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

Puzzle 🏖 #4

Open
wants to merge 16 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
60 changes: 60 additions & 0 deletions RACNest.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
B20B7B851EA2EFC100BC5ABA /* RacExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20B7B841EA2EFC100BC5ABA /* RacExtensions.swift */; };
B25D051B1EA2CCBD0039D323 /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B25D051A1EA2CCBD0039D323 /* ReactiveSwift.framework */; };
C72D32E21C470F5300F88B11 /* RACNestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72D32E11C470F5300F88B11 /* RACNestTests.swift */; };
C72D32F81C470FE000F88B11 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72D32ED1C470FE000F88B11 /* AppDelegate.swift */; };
Expand All @@ -15,6 +16,10 @@
C72D32FB1C470FE000F88B11 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C72D32F21C470FE000F88B11 /* Main.storyboard */; };
C72D330D1C471B0C00F88B11 /* CellProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72D330C1C471B0C00F88B11 /* CellProtocols.swift */; };
C72D330F1C471B3000F88B11 /* TableViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = C72D330E1C471B3000F88B11 /* TableViewProtocols.swift */; };
C741B5A31C5E940400C69372 /* PuzzleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C741B5A21C5E940400C69372 /* PuzzleViewController.swift */; };
C741B5A61C5E96DF00C69372 /* PuzzleBoard.swift in Sources */ = {isa = PBXBuildFile; fileRef = C741B5A51C5E96DF00C69372 /* PuzzleBoard.swift */; };
C741B5A81C5EA01900C69372 /* PuzzlePiece.swift in Sources */ = {isa = PBXBuildFile; fileRef = C741B5A71C5EA01900C69372 /* PuzzlePiece.swift */; };
C741B5B81C5EC65600C69372 /* PuzzlePieceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C741B5B61C5EC65600C69372 /* PuzzlePieceViewModel.swift */; };
C76C205B1C504B9D0083F4F5 /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C76C205A1C504B9D0083F4F5 /* SearchViewController.swift */; };
C76C20601C5053660083F4F5 /* words.txt in Resources */ = {isa = PBXBuildFile; fileRef = C76C205F1C5053660083F4F5 /* words.txt */; };
C7852C331C4ACAAA00375089 /* StoryboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7852C321C4ACAAA00375089 /* StoryboardViewController.swift */; };
Expand All @@ -27,6 +32,8 @@
C7CB87121C51AB8E00ED9AE6 /* GenericTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7CB87111C51AB8E00ED9AE6 /* GenericTableCell.swift */; };
C7CB87161C51AC7000ED9AE6 /* SearchCellItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7CB87141C51AC7000ED9AE6 /* SearchCellItem.swift */; };
C7CB87171C51AC7000ED9AE6 /* SearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7CB87151C51AC7000ED9AE6 /* SearchViewModel.swift */; };
C7E353681C680DC200A6C9DE /* PuzzleBoardDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7E353671C680DC200A6C9DE /* PuzzleBoardDataSource.swift */; };
C7E3536A1C680E5C00A6C9DE /* PuzzleBoardAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7E353691C680E5C00A6C9DE /* PuzzleBoardAnimator.swift */; };
C7F740501C4B219D00519895 /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C7F7404D1C4B219D00519895 /* ReactiveCocoa.framework */; };
C7F740511C4B219D00519895 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C7F7404E1C4B219D00519895 /* Result.framework */; };
C7F740591C4B2A2F00519895 /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7F740581C4B2A2F00519895 /* UserDefaults.swift */; };
Expand All @@ -43,6 +50,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
B20B7B841EA2EFC100BC5ABA /* RacExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RacExtensions.swift; path = ../../../../../Desktop/RacExtensions.swift; sourceTree = "<group>"; };
B25D051A1EA2CCBD0039D323 /* ReactiveSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveSwift.framework; path = Carthage/Build/iOS/ReactiveSwift.framework; sourceTree = "<group>"; };
C72D32C91C470F5200F88B11 /* RACNest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RACNest.app; sourceTree = BUILT_PRODUCTS_DIR; };
C72D32DD1C470F5300F88B11 /* RACNestTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RACNestTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -55,6 +63,10 @@
C72D32F51C470FE000F88B11 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C72D330C1C471B0C00F88B11 /* CellProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CellProtocols.swift; sourceTree = "<group>"; };
C72D330E1C471B3000F88B11 /* TableViewProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewProtocols.swift; sourceTree = "<group>"; };
C741B5A21C5E940400C69372 /* PuzzleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PuzzleViewController.swift; sourceTree = "<group>"; };
C741B5A51C5E96DF00C69372 /* PuzzleBoard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PuzzleBoard.swift; sourceTree = "<group>"; };
C741B5A71C5EA01900C69372 /* PuzzlePiece.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PuzzlePiece.swift; sourceTree = "<group>"; };
C741B5B61C5EC65600C69372 /* PuzzlePieceViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PuzzlePieceViewModel.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>"; };
C7852C321C4ACAAA00375089 /* StoryboardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardViewController.swift; sourceTree = "<group>"; };
Expand All @@ -67,6 +79,8 @@
C7CB87111C51AB8E00ED9AE6 /* GenericTableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GenericTableCell.swift; sourceTree = "<group>"; };
C7CB87141C51AC7000ED9AE6 /* SearchCellItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchCellItem.swift; sourceTree = "<group>"; };
C7CB87151C51AC7000ED9AE6 /* SearchViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchViewModel.swift; sourceTree = "<group>"; };
C7E353671C680DC200A6C9DE /* PuzzleBoardDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PuzzleBoardDataSource.swift; sourceTree = "<group>"; };
C7E353691C680E5C00A6C9DE /* PuzzleBoardAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PuzzleBoardAnimator.swift; sourceTree = "<group>"; };
C7F7404C1C4B219D00519895 /* Rex.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Rex.framework; path = Carthage/Build/iOS/Rex.framework; sourceTree = "<group>"; };
C7F7404D1C4B219D00519895 /* ReactiveCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveCocoa.framework; path = Carthage/Build/iOS/ReactiveCocoa.framework; sourceTree = "<group>"; };
C7F7404E1C4B219D00519895 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/iOS/Result.framework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -94,6 +108,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
B20B7B7F1EA2EF9B00BC5ABA /* RAC Extensions */ = {
isa = PBXGroup;
children = (
B20B7B841EA2EFC100BC5ABA /* RacExtensions.swift */,
);
path = "RAC Extensions";
sourceTree = "<group>";
};
C72D32C01C470F5200F88B11 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -164,6 +186,7 @@
C72D32F61C470FE000F88B11 /* ViewControllers */ = {
isa = PBXGroup;
children = (
C741B5A11C5E93E400C69372 /* Puzzle */,
C7852C3B1C4ACF9500375089 /* Form */,
C76C20591C504B750083F4F5 /* Search */,
C7852C3E1C4ACFE000375089 /* Main */,
Expand All @@ -174,6 +197,7 @@
C72D330A1C471ADB00F88B11 /* Components */ = {
isa = PBXGroup;
children = (
B20B7B7F1EA2EF9B00BC5ABA /* RAC Extensions */,
C7F740571C4B2A2700519895 /* UserDefaults */,
C72D330B1C471AEE00F88B11 /* UI */,
);
Expand All @@ -191,6 +215,35 @@
path = UI;
sourceTree = "<group>";
};
C741B5A11C5E93E400C69372 /* Puzzle */ = {
isa = PBXGroup;
children = (
C741B5A21C5E940400C69372 /* PuzzleViewController.swift */,
C741B5A41C5E96D800C69372 /* Board */,
);
path = Puzzle;
sourceTree = "<group>";
};
C741B5A41C5E96D800C69372 /* Board */ = {
isa = PBXGroup;
children = (
C741B5A51C5E96DF00C69372 /* PuzzleBoard.swift */,
C741B5A71C5EA01900C69372 /* PuzzlePiece.swift */,
C741B5B41C5EC65600C69372 /* ViewModel */,
);
path = Board;
sourceTree = "<group>";
};
C741B5B41C5EC65600C69372 /* ViewModel */ = {
isa = PBXGroup;
children = (
C7E353671C680DC200A6C9DE /* PuzzleBoardDataSource.swift */,
C7E353691C680E5C00A6C9DE /* PuzzleBoardAnimator.swift */,
C741B5B61C5EC65600C69372 /* PuzzlePieceViewModel.swift */,
);
path = ViewModel;
sourceTree = "<group>";
};
C76C20591C504B750083F4F5 /* Search */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -405,19 +458,26 @@
files = (
C7852C441C4ACFE000375089 /* MainViewModel.swift in Sources */,
C72D32F81C470FE000F88B11 /* AppDelegate.swift in Sources */,
B20B7B851EA2EFC100BC5ABA /* RacExtensions.swift in Sources */,
C7CB87171C51AC7000ED9AE6 /* SearchViewModel.swift in Sources */,
C7CB87161C51AC7000ED9AE6 /* SearchCellItem.swift in Sources */,
C7CB87121C51AB8E00ED9AE6 /* GenericTableCell.swift in Sources */,
C7852C461C4ACFE000375089 /* MainCellItem.swift in Sources */,
C741B5A81C5EA01900C69372 /* PuzzlePiece.swift in Sources */,
C7F740591C4B2A2F00519895 /* UserDefaults.swift in Sources */,
C741B5A31C5E940400C69372 /* PuzzleViewController.swift in Sources */,
C7852C331C4ACAAA00375089 /* StoryboardViewController.swift in Sources */,
C7E353681C680DC200A6C9DE /* PuzzleBoardDataSource.swift in Sources */,
C741B5B81C5EC65600C69372 /* PuzzlePieceViewModel.swift in Sources */,
C72D330F1C471B3000F88B11 /* TableViewProtocols.swift in Sources */,
C76C205B1C504B9D0083F4F5 /* SearchViewController.swift in Sources */,
C741B5A61C5E96DF00C69372 /* PuzzleBoard.swift in Sources */,
C72D330D1C471B0C00F88B11 /* CellProtocols.swift in Sources */,
C7852C4C1C4B0E2B00375089 /* FormViewModel.swift in Sources */,
C7852C351C4ACB6B00375089 /* Storyboard.swift in Sources */,
C7852C3D1C4ACF9500375089 /* FormViewController.swift in Sources */,
C7852C471C4ACFE000375089 /* MainViewController.swift in Sources */,
C7E3536A1C680E5C00A6C9DE /* PuzzleBoardAnimator.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
1 change: 1 addition & 0 deletions RACNest/AppRelated/StoryboardViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ import UIKit
enum StoryboardViewController : String, StoryboardViewControllerType {
case Form = "FormViewController"
case Search = "SearchViewController"
case Puzzle = "PuzzleViewController"
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
Expand Down
6 changes: 6 additions & 0 deletions RACNest/Resources/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "japan_forest.jpg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions RACNest/Resources/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,24 @@
</objects>
<point key="canvasLocation" x="2308" y="1272"/>
</scene>
<!--Puzzle View Controller-->
<scene sceneID="S8V-qc-xaa">
<objects>
<viewController storyboardIdentifier="PuzzleViewController" id="JEK-gn-Dpb" customClass="PuzzleViewController" customModule="RACNest" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="uU8-OI-F4h"/>
<viewControllerLayoutGuide type="bottom" id="jzb-Ed-w4H"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="nJC-ha-mbW">
<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="ZdO-cT-agg" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2308" y="2166"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="I5L-7e-bbr">
<objects>
Expand Down
3 changes: 2 additions & 1 deletion RACNest/ViewControllers/Main/Components/MainViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ final class MainViewModel: NSObject {

let item1 = MainCellItem(title: "1. Form 🐥", identifier: .Form)
let item2 = MainCellItem(title: "2. Search 🔍", identifier: .Search)
let item3 = MainCellItem(title: "3. Puzzle 🏖", identifier: .Puzzle)

items = [item1, item2]
items = [item1, item2, item3]

super.init()
}
Expand Down
129 changes: 129 additions & 0 deletions RACNest/ViewControllers/Puzzle/Board/PuzzleBoard.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
import UIKit
import ReactiveSwift
import ReactiveCocoa
import Result

struct PuzzleBoardDimension {
let numberOfRows: Int
let numberOfColumns: Int
}

final class PuzzleBoard: UIView {

private let boardDimension: PuzzleBoardDimension
private let puzzlePieceSize: CGSize
private var dataSource: PuzzleBoardDataSource
private var animator: PuzzleBoardAnimator

var puzzleBoardLinesColor = UIColor.gray
var puzzleBoardBackgroudColor = UIColor.white

init(boardDimension: PuzzleBoardDimension, image: UIImage, puzzlePieceSize: CGSize = CGSize(width: 100, height: 100)) {

self.boardDimension = boardDimension
self.puzzlePieceSize = puzzlePieceSize
self.dataSource = PuzzleBoardDataSource(image: image, dimension: boardDimension)
self.animator = PuzzleBoardAnimator(dimension: boardDimension)

let width = Int(puzzlePieceSize.width) * boardDimension.numberOfRows
let height = Int(puzzlePieceSize.height) * boardDimension.numberOfColumns

super.init(frame: CGRect(x: 0, y: 0, width: width, height: height))

backgroundColor = puzzleBoardBackgroudColor

bootstrap()
}

required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

// MARK: - Board bootstrap

private func bootstrap() {

let piecesDataSource = dataSource.piecesViewModels
.observe(on: QueueScheduler.main)
.map { (viewModels, skippedPiece) in (viewModels, skippedPiece, self.puzzlePieceSize)}
.flatMap(.latest, transform: addPieces)
.on(completed: { self.defineBoardBoundaries() })
.flatMap(.latest, transform: animator.movePieceRandomly)

piecesDataSource.start()
}

// MARK - Animation

private func pieceAnimation(pieceSize: CGSize) -> (PuzzlePiece, PuzzlePiecePosition) -> Void {

return { (puzzlePiece, piecePosition) in

UIView.animate(withDuration: 0.3) {

let newX = piecePosition.column * Int(pieceSize.width)
let newY = piecePosition.row * Int(pieceSize.height)

let newLocation = CGPoint(x: newX, y: newY)
puzzlePiece.frame.origin = newLocation
}
}
}

// MARK: - Board Construction

private func addPieces(viewModels: [PuzzlePieceViewModel], skippedPiece: PuzzlePiecePosition, puzzlePieceSize: CGSize) -> SignalProducer<([PuzzlePieceViewModel], PuzzlePiecePosition), NoError> {

return SignalProducer {o, d in

viewModels.forEach { viewModel in

let animation = self.pieceAnimation(pieceSize: self.puzzlePieceSize)
let piece = PuzzlePiece(size: puzzlePieceSize, moveAnimation: animation, viewModel: viewModel)
self.addSubview(piece)

piece.frame = CGRect(origin: piece.frame.origin, size: puzzlePieceSize)
}

o.send(value: (viewModels,skippedPiece))
o.sendCompleted()
}
}

private func defineBoardBoundaries() {

defineBorder()
defineSquares()
}

private func defineBorder() {

layer.borderColor = puzzleBoardLinesColor.cgColor
layer.borderWidth = 1.0
}

private func defineSquares() {

for i in 0..<boardDimension.numberOfColumns {

let column = CALayer()
let columnHeight = boardDimension.numberOfRows * Int(puzzlePieceSize.height)
column.frame = CGRect(origin: CGPoint(x: i * Int(puzzlePieceSize.width), y: 0), size: CGSize(width: 1, height: columnHeight))

column.backgroundColor = puzzleBoardLinesColor.cgColor
layer.addSublayer(column)
}

for i in 0..<boardDimension.numberOfRows {

let row = CALayer()
let rownWidth = boardDimension.numberOfColumns * Int(puzzlePieceSize.width)
row.frame = CGRect(origin: CGPoint(x: 0, y: i * Int(puzzlePieceSize.width)), size: CGSize(width: rownWidth, height: 1))

row.backgroundColor = puzzleBoardLinesColor.cgColor
layer.addSublayer(row)
}
}
}


Loading