From ec1eccd903a62ff59fa992f4628c85fd0d5df3c0 Mon Sep 17 00:00:00 2001 From: Raimund Wege Date: Wed, 27 Sep 2017 09:06:13 +0200 Subject: [PATCH] Removed custom fonts --- .../SAPTracker.xcodeproj/project.pbxproj | 24 -- .../src/xcode/SAPTracker/AppDelegate.swift | 1 - .../src/xcode/SAPTracker/Constants.swift | 11 - .../src/xcode/SAPTracker/Extensions.swift | 22 +- .../src/xcode/SAPTracker/Info.plist | 7 - .../xcode/SAPTracker/LaunchScreen.storyboard | 17 +- .../src/xcode/SAPTracker/Main.storyboard | 283 +++++++----------- .../src/xcode/SAPTracker/OpenSans-Bold.ttf | Bin 224592 -> 0 bytes .../src/xcode/SAPTracker/OpenSans-Light.ttf | Bin 222412 -> 0 bytes .../src/xcode/SAPTracker/OpenSans-Regular.ttf | Bin 217360 -> 0 bytes .../xcode/SAPTracker/OpenSans-Semibold.ttf | Bin 221328 -> 0 bytes .../src/xcode/SAPTracker/SignUp.storyboard | 129 ++++---- .../src/xcode/SAPTracker/TitleView.swift | 4 +- .../TrainingCheckInTableViewController.swift | 2 +- 14 files changed, 195 insertions(+), 305 deletions(-) delete mode 100755 ios/SAPTracker/src/xcode/SAPTracker/OpenSans-Bold.ttf delete mode 100755 ios/SAPTracker/src/xcode/SAPTracker/OpenSans-Light.ttf delete mode 100755 ios/SAPTracker/src/xcode/SAPTracker/OpenSans-Regular.ttf delete mode 100755 ios/SAPTracker/src/xcode/SAPTracker/OpenSans-Semibold.ttf diff --git a/ios/SAPTracker/src/xcode/SAPTracker.xcodeproj/project.pbxproj b/ios/SAPTracker/src/xcode/SAPTracker.xcodeproj/project.pbxproj index 9071f41758d..b3740475a4f 100755 --- a/ios/SAPTracker/src/xcode/SAPTracker.xcodeproj/project.pbxproj +++ b/ios/SAPTracker/src/xcode/SAPTracker.xcodeproj/project.pbxproj @@ -283,10 +283,6 @@ 7F83F15819F154F000C53328 /* RegattaCheckInTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F83F15719F154F000C53328 /* RegattaCheckInTableViewController.swift */; }; 7F83F16C19F154F000C53328 /* SAPTrackerAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F83F16B19F154F000C53328 /* SAPTrackerAPITests.swift */; }; 7F83F17619F1574700C53328 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F83F17519F1574700C53328 /* CoreLocation.framework */; }; - 7F87CAA11A2CCE8B0076C617 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F87CA9D1A2CCE8B0076C617 /* OpenSans-Bold.ttf */; }; - 7F87CAA21A2CCE8B0076C617 /* OpenSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F87CA9E1A2CCE8B0076C617 /* OpenSans-Light.ttf */; }; - 7F87CAA31A2CCE8B0076C617 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F87CA9F1A2CCE8B0076C617 /* OpenSans-Regular.ttf */; }; - 7F87CAA41A2CCE8B0076C617 /* OpenSans-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F87CAA01A2CCE8B0076C617 /* OpenSans-Semibold.ttf */; }; 7F8B8D3F1A37356C00C34B88 /* TrackingPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F8B8D3E1A37356C00C34B88 /* TrackingPageViewController.swift */; }; 7F8B8D411A373B0200C34B88 /* SpeedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F8B8D401A373B0200C34B88 /* SpeedViewController.swift */; }; 7F8B8D431A373D4400C34B88 /* CourseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F8B8D421A373D4400C34B88 /* CourseViewController.swift */; }; @@ -700,10 +696,6 @@ 7F83F16A19F154F000C53328 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7F83F16B19F154F000C53328 /* SAPTrackerAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SAPTrackerAPITests.swift; sourceTree = ""; }; 7F83F17519F1574700C53328 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; - 7F87CA9D1A2CCE8B0076C617 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Bold.ttf"; sourceTree = ""; }; - 7F87CA9E1A2CCE8B0076C617 /* OpenSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Light.ttf"; sourceTree = ""; }; - 7F87CA9F1A2CCE8B0076C617 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Regular.ttf"; sourceTree = ""; }; - 7F87CAA01A2CCE8B0076C617 /* OpenSans-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Semibold.ttf"; sourceTree = ""; }; 7F8B8D3E1A37356C00C34B88 /* TrackingPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrackingPageViewController.swift; sourceTree = ""; }; 7F8B8D401A373B0200C34B88 /* SpeedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpeedViewController.swift; sourceTree = ""; }; 7F8B8D421A373D4400C34B88 /* CourseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseViewController.swift; sourceTree = ""; }; @@ -1460,22 +1452,10 @@ isa = PBXGroup; children = ( 7F14A0031A13B9A6001C1ECB /* Flags */, - C89C60141D0FF63C002AAAD2 /* Fonts */, ); name = Resources; sourceTree = ""; }; - C89C60141D0FF63C002AAAD2 /* Fonts */ = { - isa = PBXGroup; - children = ( - 7F87CA9D1A2CCE8B0076C617 /* OpenSans-Bold.ttf */, - 7F87CA9E1A2CCE8B0076C617 /* OpenSans-Light.ttf */, - 7F87CA9F1A2CCE8B0076C617 /* OpenSans-Regular.ttf */, - 7F87CAA01A2CCE8B0076C617 /* OpenSans-Semibold.ttf */, - ); - name = Fonts; - sourceTree = ""; - }; C8BFCC1B1D50F17800FC1A27 /* SMTWiFiStatus */ = { isa = PBXGroup; children = ( @@ -1911,7 +1891,6 @@ 7F14A1C71A13B9A6001C1ECB /* OM.png in Resources */, 7F14A1F21A13B9A6001C1ECB /* TJ.png in Resources */, 7F14A12C1A13B9A6001C1ECB /* AX.png in Resources */, - 7F87CAA11A2CCE8B0076C617 /* OpenSans-Bold.ttf in Resources */, 7F14A1951A13B9A6001C1ECB /* KW.png in Resources */, 7F14A1C21A13B9A6001C1ECB /* NO.png in Resources */, 7F14A16E1A13B9A6001C1ECB /* GI.png in Resources */, @@ -1976,13 +1955,10 @@ 7F14A10F1A13B9A6001C1ECB /* _gosquared.png in Resources */, 7F14A1171A13B9A6001C1ECB /* _scotland.png in Resources */, 7F14A1FB1A13B9A6001C1ECB /* TW.png in Resources */, - 7F87CAA41A2CCE8B0076C617 /* OpenSans-Semibold.ttf in Resources */, 7F14A1451A13B9A6001C1ECB /* CG.png in Resources */, 7F14A1F11A13B9A6001C1ECB /* TH.png in Resources */, 7F14A1AC1A13B9A6001C1ECB /* ML.png in Resources */, - 7F87CAA31A2CCE8B0076C617 /* OpenSans-Regular.ttf in Resources */, 7F14A1AE1A13B9A6001C1ECB /* MN.png in Resources */, - 7F87CAA21A2CCE8B0076C617 /* OpenSans-Light.ttf in Resources */, 7F14A1D41A13B9A6001C1ECB /* PY.png in Resources */, 7F14A1E11A13B9A6001C1ECB /* SI.png in Resources */, 7F14A1921A13B9A6001C1ECB /* KN.png in Resources */, diff --git a/ios/SAPTracker/src/xcode/SAPTracker/AppDelegate.swift b/ios/SAPTracker/src/xcode/SAPTracker/AppDelegate.swift index b55781de987..532eb4e7ad7 100644 --- a/ios/SAPTracker/src/xcode/SAPTracker/AppDelegate.swift +++ b/ios/SAPTracker/src/xcode/SAPTracker/AppDelegate.swift @@ -96,7 +96,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { fileprivate func setupNavigationBarApperance() { UINavigationBar.appearance().tintColor = Colors.NavigationBarTintColor - UINavigationBar.appearance().titleTextAttributes = [NSForegroundColorAttributeName: Colors.NavigationBarTitleColor, NSFontAttributeName: Fonts.OpenSansBold17] } fileprivate func setupPageControlApperance() { diff --git a/ios/SAPTracker/src/xcode/SAPTracker/Constants.swift b/ios/SAPTracker/src/xcode/SAPTracker/Constants.swift index 3304450afdc..d31014443b1 100644 --- a/ios/SAPTracker/src/xcode/SAPTracker/Constants.swift +++ b/ios/SAPTracker/src/xcode/SAPTracker/Constants.swift @@ -39,17 +39,6 @@ struct Colors { static let NavigationBarTintColor = UIColor(hex: 0x009de0) } -struct FontNames { - static let OpenSans = "OpenSans" - static let OpenSansBold = "OpenSans-Bold" -} - -struct Fonts { - static let OpenSansBold17 = UIFont(name: FontNames.OpenSansBold, size: CGFloat(17.0)) ?? UIFont.systemFont(ofSize: 17.0) - static let OpenSansBold13 = UIFont(name: FontNames.OpenSansBold, size: CGFloat(13.0)) ?? UIFont.systemFont(ofSize: 13.0) - static let OpenSans10 = UIFont(name: FontNames.OpenSans, size: CGFloat(10.0)) ?? UIFont.systemFont(ofSize: 10.0) -} - struct Images { static let BlueButton = UIImage(color: Colors.BlueButton) static let BlueButtonHighlighted = UIImage(color: Colors.BlueButtonHighlighted) diff --git a/ios/SAPTracker/src/xcode/SAPTracker/Extensions.swift b/ios/SAPTracker/src/xcode/SAPTracker/Extensions.swift index b70522d11d6..7a72e24e654 100644 --- a/ios/SAPTracker/src/xcode/SAPTracker/Extensions.swift +++ b/ios/SAPTracker/src/xcode/SAPTracker/Extensions.swift @@ -93,19 +93,15 @@ extension UITableViewCell { extension UIViewController { - func makeViewRoundWithShadow(_ view: UIView) { - + func makeRoundWithShadow(view: UIView) { + // Corner radius view.layer.cornerRadius = view.frame.height / 2 - - // Border - view.layer.borderWidth = 1.0 - view.layer.borderColor = UIColor.black.cgColor - + // Shadow view.layer.shadowColor = UIColor.black.cgColor view.layer.shadowOffset = CGSize(width: 3, height: 3) - view.layer.shadowOpacity = 0.2 + view.layer.shadowOpacity = 0.5 view.layer.shadowRadius = 4.0 } @@ -113,35 +109,35 @@ extension UIViewController { button.setTitleColor(Colors.BlueButtonTitleColor, for: .normal) button.setBackgroundImage(Images.BlueButton, for: .normal) button.setBackgroundImage(Images.BlueButtonHighlighted, for: .highlighted) - button.updateLayer(cornerRadius: 1) + button.updateLayer(cornerRadius: 4) } func makeGray(button: UIButton) { button.setTitleColor(Colors.GrayButtonTitleColor, for: .normal) button.setBackgroundImage(Images.GrayButton, for: .normal) button.setBackgroundImage(Images.GrayButtonHighlighted, for: .highlighted) - button.updateLayer(cornerRadius: 1, borderColor: Colors.GrayButtonBorder) + button.updateLayer(cornerRadius: 4, borderColor: Colors.GrayButtonBorder) } func makeGreen(button: UIButton) { button.setTitleColor(Colors.GreenButtonTitleColor, for: .normal) button.setBackgroundImage(Images.GreenButton, for: .normal) button.setBackgroundImage(Images.GreenButtonHighlighted, for: .highlighted) - button.updateLayer(cornerRadius: 1) + button.updateLayer(cornerRadius: 4) } func makeRed(button: UIButton) { button.setTitleColor(Colors.RedButtonTitleColor, for: .normal) button.setBackgroundImage(Images.RedButton, for: .normal) button.setBackgroundImage(Images.RedButtonHighlighted, for: .highlighted) - button.updateLayer(cornerRadius: 1) + button.updateLayer(cornerRadius: 4) } func makeTranslucent(button: UIButton) { button.setTitleColor(Colors.TranslucentButtonTitleColor, for: .normal) button.setBackgroundImage(Images.TranslucentButton, for: .normal) button.setBackgroundImage(Images.TranslucentButtonHighlighted, for: .highlighted) - button.updateLayer(cornerRadius: 1, borderColor: Colors.TranslucentButtonBorder) + button.updateLayer(cornerRadius: 4, borderColor: Colors.TranslucentButtonBorder) } func presentAboutViewController() { diff --git a/ios/SAPTracker/src/xcode/SAPTracker/Info.plist b/ios/SAPTracker/src/xcode/SAPTracker/Info.plist index f83bb27ca3a..3cc8e2a54c8 100644 --- a/ios/SAPTracker/src/xcode/SAPTracker/Info.plist +++ b/ios/SAPTracker/src/xcode/SAPTracker/Info.plist @@ -48,13 +48,6 @@ NSLocationAlwaysUsageDescription - UIAppFonts - - OpenSans-Bold.ttf - OpenSans-Light.ttf - OpenSans-Regular.ttf - OpenSans-Semibold.ttf - UIBackgroundModes fetch diff --git a/ios/SAPTracker/src/xcode/SAPTracker/LaunchScreen.storyboard b/ios/SAPTracker/src/xcode/SAPTracker/LaunchScreen.storyboard index 38c24f05ba0..bc95b27502c 100644 --- a/ios/SAPTracker/src/xcode/SAPTracker/LaunchScreen.storyboard +++ b/ios/SAPTracker/src/xcode/SAPTracker/LaunchScreen.storyboard @@ -1,19 +1,14 @@ - - + + - + - - - OpenSans - - @@ -28,7 +23,7 @@ - + @@ -37,8 +32,8 @@ diff --git a/ios/SAPTracker/src/xcode/SAPTracker/Main.storyboard b/ios/SAPTracker/src/xcode/SAPTracker/Main.storyboard index 13b3cd1a8d7..a5736817995 100644 --- a/ios/SAPTracker/src/xcode/SAPTracker/Main.storyboard +++ b/ios/SAPTracker/src/xcode/SAPTracker/Main.storyboard @@ -9,20 +9,6 @@ - - - OpenSans-Bold - - - OpenSans-Light - - - OpenSans - - - OpenSans-Semibold - - @@ -40,7 +26,7 @@ - + @@ -48,7 +34,7 @@ @@ -68,7 +54,7 @@ - + @@ -90,29 +76,29 @@ @@ -144,7 +130,7 @@ - + @@ -357,9 +343,9 @@ - @@ -609,7 +595,7 @@ @@ -629,7 +615,7 @@ - + @@ -651,51 +637,22 @@ - - - - - - - - - - + + - - @@ -704,14 +661,14 @@ - @@ -2141,13 +2093,10 @@ - + - - - @@ -2159,7 +2108,7 @@ - + @@ -2233,8 +2182,8 @@ - + - + - + - + - + - + - + - + - + - + @@ -435,50 +428,50 @@ - + - + - + - + - +