Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Shaik Ghouse
/
StoryBook
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
1
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
672c1c5c
authored
Sep 28, 2017
by
Shaik Ghouse
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix menu conflicts
parent
0dae3559
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
1 deletions
StoryBook/ViewControllers/DetailedViewController.swift
StoryBook/ViewControllers/HomeViewController.swift
StoryBook/ViewControllers/MenuViewController.swift
StoryBook/ViewControllers/RecentViewController.swift
StoryBook/ViewControllers/DetailedViewController.swift
View file @
672c1c5c
...
@@ -13,7 +13,7 @@ class DetailedViewController: UIViewController {
...
@@ -13,7 +13,7 @@ class DetailedViewController: UIViewController {
override
func
viewDidLoad
()
{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
print
(
"Hello first line in detailedVC"
)
print
(
"Hello first line in detailedVC"
)
print
(
"Commit checking for Squash"
)
}
}
override
func
didReceiveMemoryWarning
()
{
override
func
didReceiveMemoryWarning
()
{
...
...
StoryBook/ViewControllers/HomeViewController.swift
View file @
672c1c5c
...
@@ -13,6 +13,8 @@ class HomeViewController: UIViewController {
...
@@ -13,6 +13,8 @@ class HomeViewController: UIViewController {
override
func
viewDidLoad
()
{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
print
(
"Hello first line in homeviewcontroller"
)
print
(
"Hello first line in homeviewcontroller"
)
print
(
"Lets start the project"
)
print
(
"Commit checking for Squash"
)
}
}
override
func
didReceiveMemoryWarning
()
{
override
func
didReceiveMemoryWarning
()
{
...
...
StoryBook/ViewControllers/MenuViewController.swift
View file @
672c1c5c
...
@@ -14,6 +14,13 @@ class MenuViewController: UIViewController {
...
@@ -14,6 +14,13 @@ class MenuViewController: UIViewController {
super
.
viewDidLoad
()
super
.
viewDidLoad
()
print
(
"Hello first line in MenuVC"
)
print
(
"Hello first line in MenuVC"
)
menuList
=
[
"Home"
,
"Recent"
,
"Settings"
,
"Logout"
]
menuList
=
[
"Home"
,
"Recent"
,
"Settings"
,
"Logout"
]
print
(
"Commit checking for Squash"
)
menuList
=
[
"Home"
,
"Recent"
,
"Settings"
,
"Logout"
]
if
let
menuArray
=
menuList
{
for
menu
in
menuArray
{
print
(
menu
)
}
}
}
}
override
func
didReceiveMemoryWarning
()
{
override
func
didReceiveMemoryWarning
()
{
...
...
StoryBook/ViewControllers/RecentViewController.swift
View file @
672c1c5c
...
@@ -13,6 +13,7 @@ class RecentViewController: UIViewController {
...
@@ -13,6 +13,7 @@ class RecentViewController: UIViewController {
override
func
viewDidLoad
()
{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
print
(
"Hello first line in Recent"
)
print
(
"Hello first line in Recent"
)
print
(
"Commit checking for Squash"
)
}
}
override
func
didReceiveMemoryWarning
()
{
override
func
didReceiveMemoryWarning
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment