Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

final #14

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

final #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
630fc1c
Configured TableView in TabController
Aug 22, 2015
0f64e17
Timer Start and Stop
Aug 22, 2015
f6986c1
Timer Start now resumes from stopped time
Aug 22, 2015
13795e7
bunch of updates
Aug 23, 2015
2a95de6
Fixed
Aug 23, 2015
1c3fb93
Added Lapping
Aug 23, 2015
5216fef
scroll view
Aug 23, 2015
f14f403
Lap Time Edit
Aug 28, 2015
e1fe24f
Fixed Lap Time, now need to fix lapTimeLabel to count
Aug 28, 2015
6e8511b
fixed stuff
Aug 28, 2015
06c31d1
deleted old lines of code, fixed formatting
Aug 28, 2015
9be0a6f
added ui for timer
Aug 29, 2015
156c126
Combined Timer with Stopwatch
Aug 30, 2015
7646521
Working on Countdown Timer, minutes decrementing by 1 instead of seconds
Sep 2, 2015
8f050c3
Fixed Timer to count down in seconds, problems: resume button resets …
Sep 2, 2015
4d2b897
Special Events Timer works
Sep 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 47 additions & 13 deletions Time/Time.xcodeproj/project.pbxproj
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
objects = {

/* Begin PBXBuildFile section */
151FFE2F1B86B5E2008675B8 /* StopwatchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 151FFE2E1B86B5E2008675B8 /* StopwatchViewController.m */; };
1545AAB41B88CDDD00E7B5C6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1545AAB31B88CDDD00E7B5C6 /* QuartzCore.framework */; };
159ECBB91B982203002293F1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 159ECBB81B982203002293F1 /* AVFoundation.framework */; };
159ECBBF1B98256D002293F1 /* SpecialEventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 159ECBBE1B98256D002293F1 /* SpecialEventsViewController.m */; };
15F9B1381B92B4A900FDCC82 /* TimerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 15F9B1371B92B4A900FDCC82 /* TimerViewController.m */; };
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 */; };
/* End PBXBuildFile section */
Expand All @@ -27,15 +30,20 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
151FFE2D1B86B5E2008675B8 /* StopwatchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StopwatchViewController.h; sourceTree = "<group>"; };
151FFE2E1B86B5E2008675B8 /* StopwatchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StopwatchViewController.m; sourceTree = "<group>"; };
1545AAB31B88CDDD00E7B5C6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
159ECBB81B982203002293F1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
159ECBBD1B98256D002293F1 /* SpecialEventsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpecialEventsViewController.h; sourceTree = "<group>"; };
159ECBBE1B98256D002293F1 /* SpecialEventsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpecialEventsViewController.m; sourceTree = "<group>"; };
15F9B1361B92B4A900FDCC82 /* TimerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimerViewController.h; sourceTree = "<group>"; };
15F9B1371B92B4A900FDCC82 /* TimerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimerViewController.m; sourceTree = "<group>"; };
8D0537581B86687B00588318 /* Time.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Time.app; sourceTree = BUILT_PRODUCTS_DIR; };
8D05375C1B86687B00588318 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8D05375D1B86687C00588318 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8D05375F1B86687C00588318 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8D0537601B86687C00588318 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
8D0537621B86687C00588318 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
8D0537631B86687C00588318 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
8D0537661B86687C00588318 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8D0537681B86687C00588318 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
8D05376B1B86687C00588318 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
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 = "<group>"; };
Expand All @@ -47,6 +55,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
159ECBB91B982203002293F1 /* AVFoundation.framework in Frameworks */,
1545AAB41B88CDDD00E7B5C6 /* QuartzCore.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -63,6 +73,8 @@
8D05374F1B86687B00588318 = {
isa = PBXGroup;
children = (
1545AAB31B88CDDD00E7B5C6 /* QuartzCore.framework */,
159ECBB81B982203002293F1 /* AVFoundation.framework */,
8D05375A1B86687B00588318 /* Time */,
8D0537741B86687C00588318 /* TimeTests */,
8D0537591B86687B00588318 /* Products */,
Expand All @@ -83,10 +95,13 @@
children = (
8D05375F1B86687C00588318 /* AppDelegate.h */,
8D0537601B86687C00588318 /* AppDelegate.m */,
8D0537621B86687C00588318 /* ViewController.h */,
8D0537631B86687C00588318 /* ViewController.m */,
151FFE2D1B86B5E2008675B8 /* StopwatchViewController.h */,
151FFE2E1B86B5E2008675B8 /* StopwatchViewController.m */,
15F9B1361B92B4A900FDCC82 /* TimerViewController.h */,
15F9B1371B92B4A900FDCC82 /* TimerViewController.m */,
159ECBBD1B98256D002293F1 /* SpecialEventsViewController.h */,
159ECBBE1B98256D002293F1 /* SpecialEventsViewController.m */,
8D0537651B86687C00588318 /* Main.storyboard */,
8D0537681B86687C00588318 /* Images.xcassets */,
8D05376A1B86687C00588318 /* LaunchScreen.xib */,
8D05375B1B86687B00588318 /* Supporting Files */,
);
Expand Down Expand Up @@ -163,11 +178,12 @@
8D0537501B86687B00588318 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0640;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "Mike Kavouras";
TargetAttributes = {
8D0537571B86687B00588318 = {
CreatedOnToolsVersion = 6.4;
DevelopmentTeam = 2AGNSFK7FM;
};
8D0537701B86687C00588318 = {
CreatedOnToolsVersion = 6.4;
Expand Down Expand Up @@ -201,7 +217,6 @@
files = (
8D0537671B86687C00588318 /* Main.storyboard in Resources */,
8D05376C1B86687C00588318 /* LaunchScreen.xib in Resources */,
8D0537691B86687C00588318 /* Images.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -219,7 +234,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D0537641B86687C00588318 /* ViewController.m in Sources */,
15F9B1381B92B4A900FDCC82 /* TimerViewController.m in Sources */,
151FFE2F1B86B5E2008675B8 /* StopwatchViewController.m in Sources */,
159ECBBF1B98256D002293F1 /* SpecialEventsViewController.m in Sources */,
8D0537611B86687C00588318 /* AppDelegate.m in Sources */,
8D05375E1B86687C00588318 /* main.m in Sources */,
);
Expand Down Expand Up @@ -284,6 +301,7 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -299,7 +317,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -337,7 +355,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -349,19 +367,29 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
INFOPLIST_FILE = Time/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.mikekavouras.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Debug;
};
8D05377D1B86687C00588318 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
INFOPLIST_FILE = Time/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.mikekavouras.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Release;
};
Expand All @@ -378,7 +406,9 @@
"$(inherited)",
);
INFOPLIST_FILE = TimeTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.mikekavouras.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Time.app/Time";
};
Expand All @@ -393,7 +423,9 @@
"$(inherited)",
);
INFOPLIST_FILE = TimeTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.mikekavouras.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Time.app/Time";
};
Expand All @@ -418,6 +450,7 @@
8D05377D1B86687C00588318 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8D05377E1B86687C00588318 /* Build configuration list for PBXNativeTarget "TimeTests" */ = {
isa = XCConfigurationList;
Expand All @@ -426,6 +459,7 @@
8D0537801B86687C00588318 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
Empty file modified Time/Time.xcodeproj/project.xcworkspace/contents.xcworkspacedata
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified Time/Time/AppDelegate.h
100644 → 100755
View file
Open in desktop
Empty file.
15 changes: 14 additions & 1 deletion Time/Time/AppDelegate.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,23 @@ @interface AppDelegate ()
@implementation AppDelegate


- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
[[UITabBar appearance] setTintColor:[UIColor redColor]];

if ([UIApplication instancesRespondToSelector:@selector(registerUserNotificationSettings:)]){
[application registerUserNotificationSettings:[UIUserNotificationSettings settingsForTypes:UIUserNotificationTypeAlert|UIUserNotificationTypeBadge|UIUserNotificationTypeSound categories:nil]];
}
// Override point for customization after application launch.

return YES;
}


-(void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {

}

- (void)applicationWillResignActive:(UIApplication *)application {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
Expand All @@ -42,4 +54,5 @@ - (void)applicationWillTerminate:(UIApplication *)application {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}


@end
4 changes: 2 additions & 2 deletions Time/Time/Base.lproj/LaunchScreen.xib
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
Expand Down
Loading