Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
whats-open-ios
Commits
0c04ee9d
Unverified
Commit
0c04ee9d
authored
Jan 17, 2018
by
Zach Knox
Browse files
fix peek and pop on alerts
parent
a2f40249
Changes
2
Hide whitespace changes
Inline
Side-by-side
WhatsOpen/WhatsOpen/Info.plist
View file @
0c04ee9d
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<key>
CFBundleShortVersionString
</key>
<key>
CFBundleShortVersionString
</key>
<string>
1.0
</string>
<string>
1.0
</string>
<key>
CFBundleVersion
</key>
<key>
CFBundleVersion
</key>
<string>
6
</string>
<string>
7
</string>
<key>
Fabric
</key>
<key>
Fabric
</key>
<dict>
<dict>
<key>
APIKey
</key>
<key>
APIKey
</key>
...
...
WhatsOpen/WhatsOpen/Views/FacilitiesListViewController.swift
View file @
0c04ee9d
...
@@ -814,12 +814,19 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
...
@@ -814,12 +814,19 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
func
previewingContext
(
_
previewingContext
:
UIViewControllerPreviewing
,
viewControllerForLocation
location
:
CGPoint
)
->
UIViewController
?
{
func
previewingContext
(
_
previewingContext
:
UIViewControllerPreviewing
,
viewControllerForLocation
location
:
CGPoint
)
->
UIViewController
?
{
guard
let
indexPath
=
LocationsList
?
.
indexPathForItem
(
at
:
location
)
else
{
return
nil
}
guard
let
indexPath
=
LocationsList
?
.
indexPathForItem
(
at
:
location
)
else
{
return
nil
}
let
cell
=
LocationsList
?
.
cellForItem
(
at
:
indexPath
)
as!
FacilityCollectionViewCell
if
(
indexPath
.
section
==
1
||
currentAlerts
.
count
==
0
)
{
guard
let
detailView
=
storyboard
?
.
instantiateViewController
(
withIdentifier
:
"detailView"
)
as?
FacilityDetailViewController
else
{
return
nil
}
let
cell
=
LocationsList
?
.
cellForItem
(
at
:
indexPath
)
as?
FacilityCollectionViewCell
guard
let
detailView
=
storyboard
?
.
instantiateViewController
(
withIdentifier
:
"detailView"
)
as?
FacilityDetailViewController
else
{
return
nil
}
detailView
.
facility
=
cell
.
facility
detailView
.
facility
=
cell
?
.
facility
return
detailView
}
else
{
let
cell
=
LocationsList
?
.
cellForItem
(
at
:
indexPath
)
as?
AlertCollectionViewCell
guard
let
detailView
=
storyboard
?
.
instantiateViewController
(
withIdentifier
:
"alertDetail"
)
as?
AlertDetailViewController
else
{
return
nil
}
detailView
.
alert
=
cell
?
.
alert
return
detailView
}
return
detailView
}
}
func
previewingContext
(
_
previewingContext
:
UIViewControllerPreviewing
,
commit
viewControllerToCommit
:
UIViewController
)
{
func
previewingContext
(
_
previewingContext
:
UIViewControllerPreviewing
,
commit
viewControllerToCommit
:
UIViewController
)
{
...
...
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