From 7e429f9de22429befb5e7c570dbe6a750cb65547 Mon Sep 17 00:00:00 2001 From: Mesfin Date: Sat, 22 Aug 2015 12:04:04 -0400 Subject: [PATCH 01/74] First commit --- Time/Time.xcodeproj/project.pbxproj | 14 ++- Time/Time/Base.lproj/Main.storyboard | 182 +++++++++++++++++++++++++-- Time/Time/StopwatchViewController.h | 13 ++ Time/Time/StopwatchViewController.m | 59 +++++++++ Time/Time/ViewController.h | 15 --- Time/Time/ViewController.m | 27 ---- 6 files changed, 252 insertions(+), 58 deletions(-) create mode 100644 Time/Time/StopwatchViewController.h create mode 100644 Time/Time/StopwatchViewController.m delete mode 100644 Time/Time/ViewController.h delete mode 100644 Time/Time/ViewController.m diff --git a/Time/Time.xcodeproj/project.pbxproj b/Time/Time.xcodeproj/project.pbxproj index c8743f0..c0da440 100644 --- a/Time/Time.xcodeproj/project.pbxproj +++ b/Time/Time.xcodeproj/project.pbxproj @@ -9,11 +9,11 @@ /* Begin PBXBuildFile section */ 8D05375E1B86687C00588318 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D05375D1B86687C00588318 /* main.m */; }; 8D0537611B86687C00588318 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D0537601B86687C00588318 /* AppDelegate.m */; }; - 8D0537641B86687C00588318 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D0537631B86687C00588318 /* ViewController.m */; }; 8D0537671B86687C00588318 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D0537651B86687C00588318 /* Main.storyboard */; }; 8D0537691B86687C00588318 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D0537681B86687C00588318 /* Images.xcassets */; }; 8D05376C1B86687C00588318 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8D05376A1B86687C00588318 /* LaunchScreen.xib */; }; 8D0537781B86687C00588318 /* TimeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D0537771B86687C00588318 /* TimeTests.m */; }; + DC7C33FF1B88C2B40051C061 /* StopwatchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7C33FE1B88C2B40051C061 /* StopwatchViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -32,14 +32,14 @@ 8D05375D1B86687C00588318 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 8D05375F1B86687C00588318 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 8D0537601B86687C00588318 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 8D0537621B86687C00588318 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 8D0537631B86687C00588318 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; 8D0537661B86687C00588318 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 8D0537681B86687C00588318 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 8D05376B1B86687C00588318 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 8D0537711B86687C00588318 /* TimeTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TimeTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 8D0537761B86687C00588318 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8D0537771B86687C00588318 /* TimeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TimeTests.m; sourceTree = ""; }; + DC7C33FD1B88C2B40051C061 /* StopwatchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StopwatchViewController.h; sourceTree = ""; }; + DC7C33FE1B88C2B40051C061 /* StopwatchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StopwatchViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -83,8 +83,8 @@ children = ( 8D05375F1B86687C00588318 /* AppDelegate.h */, 8D0537601B86687C00588318 /* AppDelegate.m */, - 8D0537621B86687C00588318 /* ViewController.h */, - 8D0537631B86687C00588318 /* ViewController.m */, + DC7C33FD1B88C2B40051C061 /* StopwatchViewController.h */, + DC7C33FE1B88C2B40051C061 /* StopwatchViewController.m */, 8D0537651B86687C00588318 /* Main.storyboard */, 8D0537681B86687C00588318 /* Images.xcassets */, 8D05376A1B86687C00588318 /* LaunchScreen.xib */, @@ -219,9 +219,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8D0537641B86687C00588318 /* ViewController.m in Sources */, 8D0537611B86687C00588318 /* AppDelegate.m in Sources */, 8D05375E1B86687C00588318 /* main.m in Sources */, + DC7C33FF1B88C2B40051C061 /* StopwatchViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -418,6 +418,7 @@ 8D05377D1B86687C00588318 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 8D05377E1B86687C00588318 /* Build configuration list for PBXNativeTarget "TimeTests" */ = { isa = XCConfigurationList; @@ -426,6 +427,7 @@ 8D0537801B86687C00588318 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/Time/Time/Base.lproj/Main.storyboard b/Time/Time/Base.lproj/Main.storyboard index f56d2f3..3498663 100644 --- a/Time/Time/Base.lproj/Main.storyboard +++ b/Time/Time/Base.lproj/Main.storyboard @@ -1,25 +1,187 @@ - + - + + - - + + - + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Time/Time/StopwatchViewController.h b/Time/Time/StopwatchViewController.h new file mode 100644 index 0000000..33ff9ec --- /dev/null +++ b/Time/Time/StopwatchViewController.h @@ -0,0 +1,13 @@ +// +// StopwatchViewController.h +// Time +// +// Created by Mesfin Bekele Mekonnen on 8/22/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import + +@interface StopwatchViewController : UIViewController + +@end diff --git a/Time/Time/StopwatchViewController.m b/Time/Time/StopwatchViewController.m new file mode 100644 index 0000000..3901a69 --- /dev/null +++ b/Time/Time/StopwatchViewController.m @@ -0,0 +1,59 @@ +// +// StopwatchViewController.m +// Time +// +// Created by Mesfin Bekele Mekonnen on 8/22/15. +// Copyright (c) 2015 Mike Kavouras. All rights reserved. +// + +#import "StopwatchViewController.h" + +@interface StopwatchViewController () +@property (weak, nonatomic) IBOutlet UIView *timerView; +@property (weak, nonatomic) IBOutlet UIButton *startButton; +@property (weak, nonatomic) IBOutlet UIButton *lapButton; +@property (weak, nonatomic) IBOutlet UILabel *timerLabel; + +@property (nonatomic) CADisplayLink *stopwatchTimer; + +@end + +@implementation StopwatchViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + + self.stopwatchTimer = [CADisplayLink displayLinkWithTarget:self selector:@selector(refreshTimerLabel)]; + NSDate *initialDate = [NSDate new]; +} + +-(void)refreshTimerLabel{ + + + + NSDate *currentDate = [NSDate new]; + +} +- (IBAction)startButtonTapped:(UIButton *)sender { + +} + +- (IBAction)lapButtonTapped:(UIButton *)sender { +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/Time/Time/ViewController.h b/Time/Time/ViewController.h deleted file mode 100644 index 9d0e38f..0000000 --- a/Time/Time/ViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// ViewController.h -// Time -// -// Created by Michael Kavouras on 8/20/15. -// Copyright (c) 2015 Mike Kavouras. All rights reserved. -// - -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/Time/Time/ViewController.m b/Time/Time/ViewController.m deleted file mode 100644 index 194fe5f..0000000 --- a/Time/Time/ViewController.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// ViewController.m -// Time -// -// Created by Michael Kavouras on 8/20/15. -// Copyright (c) 2015 Mike Kavouras. All rights reserved. -// - -#import "ViewController.h" - -@interface ViewController () - -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -@end From 792c198252cd69f503a9bbdf6b466db9679b9002 Mon Sep 17 00:00:00 2001 From: elberdev Date: Sat, 22 Aug 2015 14:44:31 -0400 Subject: [PATCH 02/74] got stopwatch rolling --- Time/Time/StopwatchViewController.m | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Time/Time/StopwatchViewController.m b/Time/Time/StopwatchViewController.m index 3901a69..2d4bcc4 100644 --- a/Time/Time/StopwatchViewController.m +++ b/Time/Time/StopwatchViewController.m @@ -7,12 +7,14 @@ // #import "StopwatchViewController.h" +//@import QuartzCore; @interface StopwatchViewController () @property (weak, nonatomic) IBOutlet UIView *timerView; @property (weak, nonatomic) IBOutlet UIButton *startButton; @property (weak, nonatomic) IBOutlet UIButton *lapButton; @property (weak, nonatomic) IBOutlet UILabel *timerLabel; +@property (nonatomic) CFTimeInterval initialTime; @property (nonatomic) CADisplayLink *stopwatchTimer; @@ -23,18 +25,30 @@ @implementation StopwatchViewController - (void)viewDidLoad { [super viewDidLoad]; - self.stopwatchTimer = [CADisplayLink displayLinkWithTarget:self selector:@selector(refreshTimerLabel)]; - NSDate *initialDate = [NSDate new]; + self.stopwatchTimer = [CADisplayLink displayLinkWithTarget:self + selector:@selector(refreshTimerLabel)]; } -(void)refreshTimerLabel{ + CFTimeInterval currentTime = CACurrentMediaTime(); + CFTimeInterval difference = currentTime - self.initialTime; + + NSString *string = [NSString stringWithFormat:@"%02li:%02li:%02li.%03li", + lround(floor(difference / 3600.)) % 100, + lround(floor(difference / 60.)) % 60, + lround(floor(difference)) % 60, + lround(floor(difference * 1000)) % 1000]; - - - NSDate *currentDate = [NSDate new]; + self.timerLabel.text = string; } + - (IBAction)startButtonTapped:(UIButton *)sender { + [self.stopwatchTimer addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; + self.initialTime = CACurrentMediaTime(); +} + +- (IBAction)stopButtonTapped:(UIButton *)sender { } From ed49e8b43c63d1cd9b7b2df40415c5394f8cb6d2 Mon Sep 17 00:00:00 2001 From: elberdev Date: Sat, 22 Aug 2015 15:07:21 -0400 Subject: [PATCH 03/74] setting up the pause button --- Time/Time/StopwatchViewController.m | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Time/Time/StopwatchViewController.m b/Time/Time/StopwatchViewController.m index 2d4bcc4..e6522fe 100644 --- a/Time/Time/StopwatchViewController.m +++ b/Time/Time/StopwatchViewController.m @@ -27,6 +27,7 @@ - (void)viewDidLoad { self.stopwatchTimer = [CADisplayLink displayLinkWithTarget:self selector:@selector(refreshTimerLabel)]; + [self.stopwatchTimer addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; } -(void)refreshTimerLabel{ @@ -44,8 +45,17 @@ -(void)refreshTimerLabel{ } - (IBAction)startButtonTapped:(UIButton *)sender { - [self.stopwatchTimer addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; - self.initialTime = CACurrentMediaTime(); + + if ([self.startButton.titleLabel.text isEqualToString:@"Start"]) { + [self.stopwatchTimer setPaused:NO]; + self.initialTime = CACurrentMediaTime(); + [self.startButton setTitle:@"Pause" forState:UIControlStateNormal]; + NSLog(@"%@", self.startButton.titleLabel.text); + } else { + [self.stopwatchTimer setPaused:YES]; + [self.startButton setTitle:@"Start" forState:UIControlStateNormal]; + } + } - (IBAction)stopButtonTapped:(UIButton *)sender { From 0f1cb5543119bca4644dbdcefee2f398f96d46cb Mon Sep 17 00:00:00 2001 From: Mesfin Date: Sat, 22 Aug 2015 15:08:34 -0400 Subject: [PATCH 04/74] Local changes --- Time/Time/StopwatchViewController.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Time/Time/StopwatchViewController.m b/Time/Time/StopwatchViewController.m index 2d4bcc4..30b71fe 100644 --- a/Time/Time/StopwatchViewController.m +++ b/Time/Time/StopwatchViewController.m @@ -46,6 +46,8 @@ -(void)refreshTimerLabel{ - (IBAction)startButtonTapped:(UIButton *)sender { [self.stopwatchTimer addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; self.initialTime = CACurrentMediaTime(); + + } - (IBAction)stopButtonTapped:(UIButton *)sender { From 84cb60133e00bda7e4f0d8d196ec7164539e7a6e Mon Sep 17 00:00:00 2001 From: Mesfin Date: Sat, 22 Aug 2015 16:23:56 -0400 Subject: [PATCH 05/74] Timer Label and Lap Label functioning properly --- Time/Time.xcodeproj/project.pbxproj | 56 ++++++++++++++++++++++++++ Time/Time/Base.lproj/Main.storyboard | 21 ++++++++-- Time/Time/Info.plist | 11 ++++++ Time/Time/StopwatchViewController.m | 59 +++++++++++++++++++--------- 4 files changed, 126 insertions(+), 21 deletions(-) diff --git a/Time/Time.xcodeproj/project.pbxproj b/Time/Time.xcodeproj/project.pbxproj index c0da440..e840952 100644 --- a/Time/Time.xcodeproj/project.pbxproj +++ b/Time/Time.xcodeproj/project.pbxproj @@ -14,6 +14,18 @@ 8D05376C1B86687C00588318 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8D05376A1B86687C00588318 /* LaunchScreen.xib */; }; 8D0537781B86687C00588318 /* TimeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D0537771B86687C00588318 /* TimeTests.m */; }; DC7C33FF1B88C2B40051C061 /* StopwatchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7C33FE1B88C2B40051C061 /* StopwatchViewController.m */; }; + DC7C34051B8904670051C061 /* Orbitron-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C34011B89044D0051C061 /* Orbitron-Black.ttf */; }; + DC7C34061B8904670051C061 /* Orbitron-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C34021B89044D0051C061 /* Orbitron-Bold.ttf */; }; + DC7C34071B8904670051C061 /* Orbitron-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C34031B89044D0051C061 /* Orbitron-Medium.ttf */; }; + DC7C34081B8904670051C061 /* Orbitron-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C34041B89044D0051C061 /* Orbitron-Regular.ttf */; }; + DC7C34111B8905950051C061 /* Digir___.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C34091B8905950051C061 /* Digir___.ttf */; }; + DC7C34121B8905950051C061 /* Digirc__.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C340A1B8905950051C061 /* Digirc__.ttf */; }; + DC7C34131B8905950051C061 /* Digircu_.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C340B1B8905950051C061 /* Digircu_.ttf */; }; + DC7C34141B8905950051C061 /* Digire__.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C340C1B8905950051C061 /* Digire__.ttf */; }; + DC7C34151B8905950051C061 /* Digireu_.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C340D1B8905950051C061 /* Digireu_.ttf */; }; + DC7C34161B8905950051C061 /* DIGIRT__.TTF in Resources */ = {isa = PBXBuildFile; fileRef = DC7C340E1B8905950051C061 /* DIGIRT__.TTF */; }; + DC7C34171B8905950051C061 /* Digirtu_.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DC7C340F1B8905950051C061 /* Digirtu_.ttf */; }; + DC7C34181B8905950051C061 /* DIGIRU__.TTF in Resources */ = {isa = PBXBuildFile; fileRef = DC7C34101B8905950051C061 /* DIGIRU__.TTF */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,6 +52,18 @@ 8D0537771B86687C00588318 /* TimeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TimeTests.m; sourceTree = ""; }; DC7C33FD1B88C2B40051C061 /* StopwatchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StopwatchViewController.h; sourceTree = ""; }; DC7C33FE1B88C2B40051C061 /* StopwatchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StopwatchViewController.m; sourceTree = ""; }; + DC7C34011B89044D0051C061 /* Orbitron-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Orbitron-Black.ttf"; path = "../../../../../../../Downloads/Orbitron/Orbitron-Black.ttf"; sourceTree = ""; }; + DC7C34021B89044D0051C061 /* Orbitron-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Orbitron-Bold.ttf"; path = "../../../../../../../Downloads/Orbitron/Orbitron-Bold.ttf"; sourceTree = ""; }; + DC7C34031B89044D0051C061 /* Orbitron-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Orbitron-Medium.ttf"; path = "../../../../../../../Downloads/Orbitron/Orbitron-Medium.ttf"; sourceTree = ""; }; + DC7C34041B89044D0051C061 /* Orbitron-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Orbitron-Regular.ttf"; path = "../../../../../../../Downloads/Orbitron/Orbitron-Regular.ttf"; sourceTree = ""; }; + DC7C34091B8905950051C061 /* Digir___.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Digir___.ttf"; path = "../../../../../../../Downloads/digreadout/Digir___.ttf"; sourceTree = ""; }; + DC7C340A1B8905950051C061 /* Digirc__.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Digirc__.ttf; path = ../../../../../../../Downloads/digreadout/Digirc__.ttf; sourceTree = ""; }; + DC7C340B1B8905950051C061 /* Digircu_.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Digircu_.ttf; path = ../../../../../../../Downloads/digreadout/Digircu_.ttf; sourceTree = ""; }; + DC7C340C1B8905950051C061 /* Digire__.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Digire__.ttf; path = ../../../../../../../Downloads/digreadout/Digire__.ttf; sourceTree = ""; }; + DC7C340D1B8905950051C061 /* Digireu_.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Digireu_.ttf; path = ../../../../../../../Downloads/digreadout/Digireu_.ttf; sourceTree = ""; }; + DC7C340E1B8905950051C061 /* DIGIRT__.TTF */ = {isa = PBXFileReference; lastKnownFileType = file; name = DIGIRT__.TTF; path = ../../../../../../../Downloads/digreadout/DIGIRT__.TTF; sourceTree = ""; }; + DC7C340F1B8905950051C061 /* Digirtu_.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Digirtu_.ttf; path = ../../../../../../../Downloads/digreadout/Digirtu_.ttf; sourceTree = ""; }; + DC7C34101B8905950051C061 /* DIGIRU__.TTF */ = {isa = PBXFileReference; lastKnownFileType = file; name = DIGIRU__.TTF; path = ../../../../../../../Downloads/digreadout/DIGIRU__.TTF; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -85,6 +109,7 @@ 8D0537601B86687C00588318 /* AppDelegate.m */, DC7C33FD1B88C2B40051C061 /* StopwatchViewController.h */, DC7C33FE1B88C2B40051C061 /* StopwatchViewController.m */, + DC7C34001B8904400051C061 /* Fonts */, 8D0537651B86687C00588318 /* Main.storyboard */, 8D0537681B86687C00588318 /* Images.xcassets */, 8D05376A1B86687C00588318 /* LaunchScreen.xib */, @@ -119,6 +144,25 @@ name = "Supporting Files"; sourceTree = ""; }; + DC7C34001B8904400051C061 /* Fonts */ = { + isa = PBXGroup; + children = ( + DC7C34091B8905950051C061 /* Digir___.ttf */, + DC7C340A1B8905950051C061 /* Digirc__.ttf */, + DC7C340B1B8905950051C061 /* Digircu_.ttf */, + DC7C340C1B8905950051C061 /* Digire__.ttf */, + DC7C340D1B8905950051C061 /* Digireu_.ttf */, + DC7C340E1B8905950051C061 /* DIGIRT__.TTF */, + DC7C340F1B8905950051C061 /* Digirtu_.ttf */, + DC7C34101B8905950051C061 /* DIGIRU__.TTF */, + DC7C34011B89044D0051C061 /* Orbitron-Black.ttf */, + DC7C34021B89044D0051C061 /* Orbitron-Bold.ttf */, + DC7C34031B89044D0051C061 /* Orbitron-Medium.ttf */, + DC7C34041B89044D0051C061 /* Orbitron-Regular.ttf */, + ); + name = Fonts; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -199,7 +243,19 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + DC7C34151B8905950051C061 /* Digireu_.ttf in Resources */, + DC7C34051B8904670051C061 /* Orbitron-Black.ttf in Resources */, + DC7C34141B8905950051C061 /* Digire__.ttf in Resources */, + DC7C34171B8905950051C061 /* Digirtu_.ttf in Resources */, + DC7C34061B8904670051C061 /* Orbitron-Bold.ttf in Resources */, + DC7C34161B8905950051C061 /* DIGIRT__.TTF in Resources */, + DC7C34071B8904670051C061 /* Orbitron-Medium.ttf in Resources */, + DC7C34121B8905950051C061 /* Digirc__.ttf in Resources */, + DC7C34081B8904670051C061 /* Orbitron-Regular.ttf in Resources */, + DC7C34111B8905950051C061 /* Digir___.ttf in Resources */, + DC7C34131B8905950051C061 /* Digircu_.ttf in Resources */, 8D0537671B86687C00588318 /* Main.storyboard in Resources */, + DC7C34181B8905950051C061 /* DIGIRU__.TTF in Resources */, 8D05376C1B86687C00588318 /* LaunchScreen.xib in Resources */, 8D0537691B86687C00588318 /* Images.xcassets in Resources */, ); diff --git a/Time/Time/Base.lproj/Main.storyboard b/Time/Time/Base.lproj/Main.storyboard index 3498663..7af135a 100644 --- a/Time/Time/Base.lproj/Main.storyboard +++ b/Time/Time/Base.lproj/Main.storyboard @@ -4,6 +4,12 @@ + + + DigitalReadoutExpUpright + DigitalReadoutExpUpright + + @@ -20,9 +26,15 @@ -