Commit 70127d2a by Shaik Ghouse

Merge branch 'feature/development' into 'master'

Feature/development

See merge request !1
parents 7cb98d1b 23e040f1
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
64AE37C81F7B7C210030D911 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 64AE37C11F7B7C210030D911 /* LaunchScreen.storyboard */; }; 64AE37C81F7B7C210030D911 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 64AE37C11F7B7C210030D911 /* LaunchScreen.storyboard */; };
64AE37C91F7B7C210030D911 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 64AE37C21F7B7C210030D911 /* Main.storyboard */; }; 64AE37C91F7B7C210030D911 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 64AE37C21F7B7C210030D911 /* Main.storyboard */; };
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 */; };
64AE37D01F7BA75F0030D911 /* DetailedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37CF1F7BA75F0030D911 /* DetailedViewController.swift */; };
64AE37CE1F7BA6DD0030D911 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37CD1F7BA6DD0030D911 /* MenuViewController.swift */; }; 64AE37CE1F7BA6DD0030D911 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37CD1F7BA6DD0030D911 /* MenuViewController.swift */; };
64AE37D21F7BA8080030D911 /* RecentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE37D11F7BA8080030D911 /* RecentViewController.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 */; };
...@@ -27,6 +29,8 @@ ...@@ -27,6 +29,8 @@
64AE37C11F7B7C210030D911 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; }; 64AE37C11F7B7C210030D911 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
64AE37C21F7B7C210030D911 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; }; 64AE37C21F7B7C210030D911 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
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>"; };
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>"; }; 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>"; }; 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; };
...@@ -112,6 +116,8 @@ ...@@ -112,6 +116,8 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
64AE37C51F7B7C210030D911 /* ViewController.swift */, 64AE37C51F7B7C210030D911 /* ViewController.swift */,
64AE37CB1F7BA5B90030D911 /* HomeViewController.swift */,
64AE37CF1F7BA75F0030D911 /* DetailedViewController.swift */,
64AE37CD1F7BA6DD0030D911 /* MenuViewController.swift */, 64AE37CD1F7BA6DD0030D911 /* MenuViewController.swift */,
64AE37D11F7BA8080030D911 /* RecentViewController.swift */, 64AE37D11F7BA8080030D911 /* RecentViewController.swift */,
); );
...@@ -286,6 +292,8 @@ ...@@ -286,6 +292,8 @@
64AE37D21F7BA8080030D911 /* RecentViewController.swift in Sources */, 64AE37D21F7BA8080030D911 /* RecentViewController.swift in Sources */,
64AE37CE1F7BA6DD0030D911 /* MenuViewController.swift in Sources */, 64AE37CE1F7BA6DD0030D911 /* MenuViewController.swift in Sources */,
64AE37C71F7B7C210030D911 /* AppDelegate.swift in Sources */, 64AE37C71F7B7C210030D911 /* AppDelegate.swift in Sources */,
64AE37D01F7BA75F0030D911 /* DetailedViewController.swift in Sources */,
64AE37CC1F7BA5B90030D911 /* HomeViewController.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
......
...@@ -71,6 +71,43 @@ ...@@ -71,6 +71,43 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="289" y="-453"/>
</scene>
<!--Home View Controller-->
<scene sceneID="IH7-eA-c5r">
<objects>
<viewController id="yZt-bq-CrZ" customClass="HomeViewController" customModule="StoryBook" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="3n8-Di-4FU"/>
<viewControllerLayoutGuide type="bottom" id="C5C-SY-sfe"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="brL-hL-L6p">
<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="ju6-hG-0SR" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1241" y="-454"/>
</scene>
<!--Detailed View Controller-->
<scene sceneID="rgl-wH-za5">
<objects>
<viewController id="Tbf-ly-7O4" customClass="DetailedViewController" customModule="StoryBook" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="ec3-3y-Rrm"/>
<viewControllerLayoutGuide type="bottom" id="ua2-Oc-XdI"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="S7S-FI-yw5">
<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="zio-K6-IOv" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2191" y="-507"/>
</scene> </scene>
</scenes> </scenes>
</document> </document>
//
// DetailedViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class DetailedViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
}
}
//
// HomeViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class HomeViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
}
}
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