Skip to content

Shaik Ghouse / StoryBook

Go to a project
Commit 23e040f1 by Shaik Ghouse
Options

Merge branch 'master' into 'feature/development' 

# Conflicts:
#   StoryBook.xcodeproj/project.pbxproj
parents 7eb04399 7cb98d1b
Inline Side-by-side
Showing with 114 additions and 0 deletions
StoryBook.xcodeproj/project.pbxproj
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
64AE37CA1F7B7C210030D911 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37C51F7B7C210030D911 /* ViewController.swift */; }; 64AE37CA1F7B7C210030D911 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37C51F7B7C210030D911 /* ViewController.swift */; };
64AE37CC1F7BA5B90030D911 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37CB1F7BA5B90030D911 /* HomeViewController.swift */; }; 64AE37CC1F7BA5B90030D911 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37CB1F7BA5B90030D911 /* HomeViewController.swift */; };
64AE37D01F7BA75F0030D911 /* DetailedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37CF1F7BA75F0030D911 /* DetailedViewController.swift */; }; 64AE37D01F7BA75F0030D911 /* DetailedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37CF1F7BA75F0030D911 /* DetailedViewController.swift */; };
64AE37CE1F7BA6DD0030D911 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37CD1F7BA6DD0030D911 /* MenuViewController.swift */; };
64AE37D21F7BA8080030D911 /* RecentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37D11F7BA8080030D911 /* RecentViewController.swift */; };
B365E6A8B0D3A8F9DC74F791 /* Pods_StoryBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DB33BB75FA79A76464A6E95 /* Pods_StoryBook.framework */; }; B365E6A8B0D3A8F9DC74F791 /* Pods_StoryBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DB33BB75FA79A76464A6E95 /* Pods_StoryBook.framework */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -29,6 +31,8 @@ ...@@ -29,6 +31,8 @@
64AE37C51F7B7C210030D911 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; 64AE37C51F7B7C210030D911 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
64AE37CB1F7BA5B90030D911 /* HomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; }; 64AE37CB1F7BA5B90030D911 /* HomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
64AE37CF1F7BA75F0030D911 /* DetailedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailedViewController.swift; sourceTree = "<group>"; }; 64AE37CF1F7BA75F0030D911 /* DetailedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailedViewController.swift; sourceTree = "<group>"; };
64AE37CD1F7BA6DD0030D911 /* MenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
64AE37D11F7BA8080030D911 /* RecentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentViewController.swift; sourceTree = "<group>"; };
6DB33BB75FA79A76464A6E95 /* Pods_StoryBook.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_StoryBook.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6DB33BB75FA79A76464A6E95 /* Pods_StoryBook.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_StoryBook.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -114,6 +118,8 @@ ...@@ -114,6 +118,8 @@
64AE37C51F7B7C210030D911 /* ViewController.swift */, 64AE37C51F7B7C210030D911 /* ViewController.swift */,
64AE37CB1F7BA5B90030D911 /* HomeViewController.swift */, 64AE37CB1F7BA5B90030D911 /* HomeViewController.swift */,
64AE37CF1F7BA75F0030D911 /* DetailedViewController.swift */, 64AE37CF1F7BA75F0030D911 /* DetailedViewController.swift */,
64AE37CD1F7BA6DD0030D911 /* MenuViewController.swift */,
64AE37D11F7BA8080030D911 /* RecentViewController.swift */,
); );
path = ViewControllers; path = ViewControllers;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -283,6 +289,8 @@ ...@@ -283,6 +289,8 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
64AE37CA1F7B7C210030D911 /* ViewController.swift in Sources */, 64AE37CA1F7B7C210030D911 /* ViewController.swift in Sources */,
64AE37D21F7BA8080030D911 /* RecentViewController.swift in Sources */,
64AE37CE1F7BA6DD0030D911 /* MenuViewController.swift in Sources */,
64AE37C71F7B7C210030D911 /* AppDelegate.swift in Sources */, 64AE37C71F7B7C210030D911 /* AppDelegate.swift in Sources */,
64AE37D01F7BA75F0030D911 /* DetailedViewController.swift in Sources */, 64AE37D01F7BA75F0030D911 /* DetailedViewController.swift in Sources */,
64AE37CC1F7BA5B90030D911 /* HomeViewController.swift in Sources */, 64AE37CC1F7BA5B90030D911 /* HomeViewController.swift in Sources */,
......
StoryBook/Storyboards/Main.storyboard
...@@ -9,6 +9,42 @@ ...@@ -9,6 +9,42 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--Menu View Controller-->
<scene sceneID="EFo-yr-l4U">
<objects>
<viewController id="dct-wq-sjc" customClass="MenuViewController" customModule="StoryBook" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Vj8-yi-Vce"/>
<viewControllerLayoutGuide type="bottom" id="YHB-0M-KKg"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="3gw-hc-TjX">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="G4s-FT-kVa" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="207" y="-539"/>
</scene>
<!--Recent View Controller-->
<scene sceneID="wnY-1q-FBO">
<objects>
<viewController id="iSs-3c-5SU" customClass="RecentViewController" customModule="StoryBook" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Huc-O8-1DW"/>
<viewControllerLayoutGuide type="bottom" id="uTQ-2p-qOb"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="SZa-O9-sI9">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="kGS-fl-i46" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1001" y="-687"/>
</scene>
<!--View Controller--> <!--View Controller-->
<scene sceneID="tne-QT-ifu"> <scene sceneID="tne-QT-ifu">
<objects> <objects>
......
StoryBook/ViewControllers/MenuViewController.swift 0 → 100644
//
// MenuViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class MenuViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destinationViewController.
// Pass the selected object to the new view controller.
}
*/
}
StoryBook/ViewControllers/RecentViewController.swift 0 → 100644
//
// RecentViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class RecentViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destinationViewController.
// Pass the selected object to the new view controller.
}
*/
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment