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
74851260
Unverified
Commit
74851260
authored
Oct 02, 2017
by
Zach Knox
Browse files
the popover works on iPads
doesn't look quite right though
parent
20e8d297
Changes
4
Hide whitespace changes
Inline
Side-by-side
WhatsOpen/WhatsOpen/Base.lproj/LaunchScreen.storyboard
View file @
74851260
...
...
@@ -18,19 +18,19 @@
<viewControllerLayoutGuide
type=
"bottom"
id=
"uEj-Wh-tIe"
/>
</layoutGuides>
<view
key=
"view"
contentMode=
"scaleToFill"
id=
"v6Q-ll-llg"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"
667
"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"
551
"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
heightSizable=
"YES"
/>
<subviews>
<toolbar
clearsContextBeforeDrawing=
"NO"
contentMode=
"scaleToFill"
translucent=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"dLQ-LD-ZYN"
>
<rect
key=
"frame"
x=
"0.0"
y=
"623"
width=
"375"
height=
"44"
/>
<color
key=
"backgroundColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"507"
width=
"375"
height=
"44"
/>
<items>
<barButtonItem
image=
"Gear"
style=
"plain"
id=
"UZb-P7-xWV"
/>
<barButtonItem
image=
"Gear"
style=
"plain"
id=
"UZb-P7-xWV"
>
<color
key=
"tintColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
</barButtonItem>
<barButtonItem
style=
"plain"
systemItem=
"flexibleSpace"
id=
"Cjx-w1-vgo"
/>
<barButtonItem
systemItem=
"refresh"
id=
"Sxw-4d-pD1"
/>
</items>
<color
key=
"tintColor"
white=
"1"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
<color
key=
"barTintColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"tintColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
</toolbar>
</subviews>
<color
key=
"backgroundColor"
white=
"1"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
...
...
@@ -49,7 +49,7 @@
<segment
title=
""
/>
<segment
title=
""
/>
</segments>
<color
key=
"tintColor"
white=
"
1"
alpha=
"1"
colorSpace=
"calibrated
White
"
/>
<color
key=
"tintColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.2000000000000000
1"
alpha=
"1"
colorSpace=
"calibrated
RGB
"
/>
</segmentedControl>
</navigationItem>
</viewController>
...
...
@@ -62,12 +62,11 @@
<objects>
<navigationController
id=
"49O-ie-MPO"
sceneMemberID=
"viewController"
>
<simulatedStatusBarMetrics
key=
"simulatedStatusBarMetrics"
statusBarStyle=
"lightContent"
/>
<navigationBar
key=
"navigationBar"
contentMode=
"scaleToFill"
misplaced=
"YES"
barStyle=
"black
"
id=
"lQp-4M-AdE"
>
<rect
key=
"frame"
x=
"0.0"
y=
"20"
width=
"375"
height=
"
44
"
/>
<navigationBar
key=
"navigationBar"
contentMode=
"scaleToFill"
misplaced=
"YES"
translucent=
"NO"
largeTitles=
"YES
"
id=
"lQp-4M-AdE"
>
<rect
key=
"frame"
x=
"0.0"
y=
"20"
width=
"375"
height=
"
96
"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<color
key=
"backgroundColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"tintColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"barTintColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
</navigationBar>
<connections>
<segue
destination=
"rgX-hK-Yk9"
kind=
"relationship"
relationship=
"rootViewController"
id=
"PjG-Yg-Yf2"
/>
...
...
WhatsOpen/WhatsOpen/Base.lproj/Main.storyboard
View file @
74851260
...
...
@@ -669,5 +669,5 @@
<image
name=
"Gear"
width=
"25"
height=
"25"
/>
<image
name=
"WO_Black_TextLight"
width=
"2355"
height=
"692"
/>
</resources>
<color
key=
"tintColor"
white=
"
1"
alpha=
"1"
colorSpace=
"calibrated
White
"
/>
<color
key=
"tintColor"
red=
"0.0"
green=
"0.40000000000000002"
blue=
"0.2000000000000000
1"
alpha=
"1"
colorSpace=
"calibrated
RGB
"
/>
</document>
WhatsOpen/WhatsOpen/MainTableViewController.swift
View file @
74851260
...
...
@@ -17,6 +17,10 @@ class MainTableViewController: UITableViewController {
override
func
viewWillAppear
(
_
animated
:
Bool
)
{
mainNavigationBar
.
titleView
=
UIImageView
(
image
:
#
imageLiteral
(
resourceName
:
"Navigation Bar TitleView"
))
}
override
var
preferredStatusBarStyle
:
UIStatusBarStyle
{
return
.
default
}
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
...
...
WhatsOpen/WhatsOpen/Views/FacilitiesListViewController.swift
View file @
74851260
...
...
@@ -100,6 +100,12 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
if
(
self
.
view
.
traitCollection
.
horizontalSizeClass
==
.
regular
&&
self
.
view
.
traitCollection
.
verticalSizeClass
==
.
regular
)
{
//do a popover here for the iPad
//iPads are cool right?
destination
.
modalPresentationStyle
=
.
popover
let
popoverController
=
destination
.
popoverPresentationController
popoverController
?
.
permittedArrowDirections
=
.
any
popoverController
?
.
sourceView
=
destination
.
view
present
(
destination
,
animated
:
true
,
completion
:
nil
)
}
else
{
let
destDelegate
=
DeckTransitioningDelegate
()
...
...
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