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
07159834
Unverified
Commit
07159834
authored
Jul 14, 2018
by
Zach Knox
Browse files
3D touch rollback
parent
95497c7a
Changes
2
Show whitespace changes
Inline
Side-by-side
WhatsOpen/WhatsOpen/Info.plist
View file @
07159834
...
...
@@ -23,7 +23,7 @@
<key>
CFBundleShortVersionString
</key>
<string>
1.1
</string>
<key>
CFBundleVersion
</key>
<string>
3
6
</string>
<string>
3
7
</string>
<key>
Fabric
</key>
<dict>
<key>
APIKey
</key>
...
...
WhatsOpen/WhatsOpen/Views/Primary Views/FacilitiesListViewController.swift
View file @
07159834
...
...
@@ -298,6 +298,10 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
self
.
definesPresentationContext
=
true
if
(
traitCollection
.
forceTouchCapability
==
.
available
)
{
registerForPreviewing
(
with
:
self
,
sourceView
:
self
.
LocationsList
!
)
}
navigationItem
.
title
=
"What's Open"
navigationController
?
.
navigationBar
.
prefersLargeTitles
=
true
navigationItem
.
largeTitleDisplayMode
=
.
always
...
...
@@ -745,9 +749,6 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
cell
.
layer
.
shadowPath
=
UIBezierPath
(
roundedRect
:
cell
.
bounds
,
cornerRadius
:
cell
.
layer
.
cornerRadius
)
.
cgPath
self
.
reloadInputViews
()
if
(
traitCollection
.
forceTouchCapability
==
.
available
)
{
self
.
registerForPreviewing
(
with
:
self
,
sourceView
:
cell
)
}
return
cell
}
else
{
...
...
@@ -778,9 +779,6 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
}
cell
.
messageLabel
.
text
=
currentAlerts
[
indexPath
.
row
]
.
message
if
(
traitCollection
.
forceTouchCapability
==
.
available
)
{
self
.
registerForPreviewing
(
with
:
self
,
sourceView
:
cell
)
}
return
cell
}
...
...
@@ -937,7 +935,6 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
guard
let
indexPath
=
LocationsList
?
.
indexPathForItem
(
at
:
location
)
else
{
return
nil
}
if
(
indexPath
.
section
==
1
||
currentAlerts
.
count
==
0
)
{
let
cell
=
LocationsList
?
.
cellForItem
(
at
:
indexPath
)
as?
FacilityCollectionViewCell
previewingContext
.
sourceRect
=
(
cell
?
.
bounds
)
!
guard
let
detailView
=
storyboard
?
.
instantiateViewController
(
withIdentifier
:
"detailView"
)
as?
FacilityDetailViewController
else
{
return
nil
}
detailView
.
facility
=
cell
?
.
facility
return
detailView
...
...
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