Skip to content

GitLab

Unverified Commit 5e8c4e38 authored by Zach Knox's avatar Zach Knox
Browse files

fixed large title text 

lol rendering white on white
parent dfe62431
Hide whitespace changes
Inline Side-by-side
WhatsOpen/WhatsOpen/Base.lproj/LaunchScreen.storyboard
View file @ 5e8c4e38
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="49O-ie-MPO">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="49O-ie-MPO">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
......@@ -13,10 +13,6 @@
<scene sceneID="Zyo-V7-Z0R">
<objects>
<viewController id="rgX-hK-Yk9" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="abj-II-4Y1"/>
<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="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
......@@ -35,10 +31,11 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="dLQ-LD-ZYN" secondAttribute="trailing" id="5dW-Pp-BXz"/>
<constraint firstItem="dLQ-LD-ZYN" firstAttribute="leading" secondItem="v6Q-ll-llg" secondAttribute="leading" id="DgE-50-feH"/>
<constraint firstItem="uEj-Wh-tIe" firstAttribute="top" secondItem="dLQ-LD-ZYN" secondAttribute="bottom" id="vxR-Lb-0T3"/>
<constraint firstItem="S6o-JX-Hs6" firstAttribute="trailing" secondItem="dLQ-LD-ZYN" secondAttribute="trailing" id="5dW-Pp-BXz"/>
<constraint firstItem="dLQ-LD-ZYN" firstAttribute="leading" secondItem="S6o-JX-Hs6" secondAttribute="leading" id="DgE-50-feH"/>
<constraint firstItem="S6o-JX-Hs6" firstAttribute="bottom" secondItem="dLQ-LD-ZYN" secondAttribute="bottom" id="vxR-Lb-0T3"/>
</constraints>
<viewLayoutGuide key="safeArea" id="S6o-JX-Hs6"/>
</view>
<navigationItem key="navigationItem" id="oR9-Bj-2qk">
<nil key="title"/>
......
WhatsOpen/WhatsOpen/Base.lproj/Main.storyboard
View file @ 5e8c4e38
......@@ -157,11 +157,11 @@
<objects>
<viewController id="aaB-Go-aWd" customClass="FacilitiesListViewController" customModule="WhatsOpen" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="avG-8M-sVI">
<rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="naC-sZ-bcy">
<rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
<rect key="frame" x="0.0" y="64" width="375" height="559"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="eqw-AF-DSB">
......@@ -238,7 +238,7 @@
</connections>
</collectionView>
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8FA-yc-q3z">
<rect key="frame" x="0.0" y="559" width="375" height="44"/>
<rect key="frame" x="0.0" y="623" width="375" height="44"/>
<items>
<barButtonItem image="Gear" id="MHZ-t0-Moj">
<connections>
......@@ -271,7 +271,7 @@
</constraints>
<viewLayoutGuide key="safeArea" id="uyS-pc-zem"/>
</view>
<navigationItem key="navigationItem" title="What's Open" id="lS5-pu-Adr">
<navigationItem key="navigationItem" title="What's Open" largeTitleDisplayMode="always" id="lS5-pu-Adr">
<barButtonItem key="leftBarButtonItem" title="Filter" id="v4j-oA-7Fa">
<color key="tintColor" red="0.0" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
<connections>
......@@ -589,15 +589,15 @@
<navigationController title="Root Navigation" automaticallyAdjustsScrollViewInsets="NO" id="DGD-49-9Ue" sceneMemberID="viewController">
<toolbarItems/>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="ulx-sh-XJ1">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="ulx-sh-XJ1">
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<textAttributes key="titleTextAttributes">
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textAttributes>
<textAttributes key="largeTitleTextAttributes">
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textAttributes>
</navigationBar>
<nil name="viewControllers"/>
......
WhatsOpen/WhatsOpen/Info.plist
View file @ 5e8c4e38
......@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>What's Open?</string>
<string>What's Open</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
......
WhatsOpen/WhatsOpen/Views/FacilitiesListViewController.swift
View file @ 5e8c4e38
......@@ -79,10 +79,6 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
override func viewWillAppear(_ animated: Bool) {
LastUpdatedLabel.isEnabled = false
navigationItem.title = "What's Open?"
}
@objc func tapRecognizer(_ sender: UITapGestureRecognizer) {
......@@ -118,19 +114,17 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
override func viewDidLoad() {
super.viewDidLoad()
navigationItem.title = "What's Open?"
if( traitCollection.forceTouchCapability == .available){
if(traitCollection.forceTouchCapability == .available) {
registerForPreviewing(with: self, sourceView: self.LocationsList!)
}
let searchController = UISearchController(searchResultsController: nil) //TODO: ADD SEARCH
navigationItem.title = "What's Open"
navigationController?.navigationBar.prefersLargeTitles = true
navigationItem.searchController = searchController
navigationItem.hidesSearchBarWhenScrolling = true
navigationItem.searchController?.searchBar.barTintColor = UIColor.white
navigationItem.searchController?.searchBar.barStyle = .default
let searchController = UISearchController(searchResultsController: nil) //TODO: ADD SEARCH
navigationItem.searchController = searchController
navigationItem.hidesSearchBarWhenScrolling = true
LocationsListLayout.invalidateLayout()
......
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 to comment