Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MergeMerged master, add split view support
- Loading branch information
Showing
45 changed files
with
2,902 additions
and
612 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // | ||
| // Appearance.swift | ||
| // FiveCalls | ||
| // | ||
| // Created by Ben Scheirman on 2/22/17. | ||
| // Copyright © 2017 5calls. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class Appearance { | ||
|
|
||
| static var instance = Appearance() | ||
|
|
||
| var fontFamily: String { | ||
| return "Roboto Condensed" | ||
| } | ||
|
|
||
| var fontDescriptor: UIFontDescriptor? { | ||
| return UIFontDescriptor(fontAttributes: [ | ||
| UIFontDescriptorFamilyAttribute: fontFamily | ||
| ]).withSymbolicTraits([.traitBold, .traitCondensed]) // To match the website, fonts should be Bold and Condensed | ||
| } | ||
|
|
||
| func setup() { | ||
| let pageControlAppearance = UIPageControl.appearance() | ||
| pageControlAppearance.pageIndicatorTintColor = .fvc_lightBlue | ||
| pageControlAppearance.currentPageIndicatorTintColor = .fvc_darkBlue | ||
|
|
||
| // Fonts | ||
|
|
||
| if let substituteDescriptor = fontDescriptor { | ||
| UILabel.appearance().substituteFontDescriptor = substituteDescriptor | ||
| } | ||
|
|
||
| UINavigationBar.appearance().titleTextAttributes = | ||
| [NSFontAttributeName: headerFont, | ||
| NSForegroundColorAttributeName : UIColor.white] | ||
| } | ||
|
|
||
| private func appFont(size: CGFloat, bold: Bool) -> UIFont! { | ||
| if bold { | ||
| return R.font.robotoCondensedBold(size: size) | ||
| } else { | ||
| return R.font.robotoCondensedRegular(size: size) | ||
| } | ||
| } | ||
|
|
||
| var headerFont: UIFont { | ||
| return appFont(size: 18, bold: true) | ||
| } | ||
|
|
||
| var bodyTitleFont: UIFont { | ||
| return appFont(size: 16, bold: true) | ||
| } | ||
|
|
||
| var bodyFont: UIFont { | ||
| return appFont(size: 16, bold: false) | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
FiveCalls/FiveCalls/Assets.xcassets/refresh.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "filename" : "refresh@2x.png", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "filename" : "refresh@3x.png", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| } | ||
| } |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.