Skip to content

Zouf-and-Justine_Time_Unit-1-Final #10

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

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

Zouf-and-Justine_Time_Unit-1-Final #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
e1ade91
first commit
Aug 22, 2015
eeae6d8
Began storyboard layout
Aug 22, 2015
6b7a2a8
properties added
zoufishanmehdi Aug 22, 2015
1795612
Began to hook up the Set Timer picker view
Aug 22, 2015
69f2fdd
TimerHomepage pickerView works
zoufishanmehdi Aug 22, 2015
db51e14
edited PresetTimer
zoufishanmehdi Aug 22, 2015
5abbea9
Added singleton class
Aug 22, 2015
5375340
changed back to NSMutableArray
zoufishanmehdi Aug 22, 2015
848825f
singleton class is set up and working
Aug 23, 2015
ad2e9c8
started working on stopwatch
zoufishanmehdi Aug 23, 2015
df0ab71
Working on picker views
Aug 23, 2015
ef34b7a
picker views functioning, will work on updating labels on timer hompa…
Aug 23, 2015
4378276
timer time label working
zoufishanmehdi Aug 23, 2015
5587d2b
timelabel and presettimerlabel are functioning, will work on setting …
Aug 23, 2015
571f074
user can set timer without saving, without setting a preset name
Aug 23, 2015
e20a750
setting up startPauseButton
Aug 23, 2015
cb814f4
timer start button and user selection working
Aug 26, 2015
1523ef8
reorganizing data in TimerHomepageViewController
Aug 26, 2015
65ff22d
changes made to Stopwatch storyboard
zoufishanmehdi Aug 26, 2015
b286411
changes made to stopwatch.m and stopwatch TVC
zoufishanmehdi Aug 27, 2015
ae24121
Stopwatch works
zoufishanmehdi Aug 28, 2015
2c15900
still reconfiguring timerHomepageViewController and setTimerViewContr…
Aug 27, 2015
fdcedb7
timer working, test next
Aug 28, 2015
d493260
added Countdown
zoufishanmehdi Aug 29, 2015
341b32e
event countdown works
zoufishanmehdi Aug 29, 2015
62aa926
Working on UI
Aug 29, 2015
e5fec75
tab bar icons working
Aug 29, 2015
e541a7e
timer homepage ui first draft complete
Aug 30, 2015
4bc1d94
stopwatch ui in process
Aug 30, 2015
24829d0
working on setTimer ui
Aug 30, 2015
0b3969e
sounds added
zoufishanmehdi Aug 30, 2015
5cf9cfb
setTimer ui looking alright :)
Aug 30, 2015
2fa2acd
sound files fixed
zoufishanmehdi Aug 30, 2015
12f926c
justine changes
zoufishanmehdi Aug 30, 2015
239075e
countdown label separated into days, hrs, mins and secs
zoufishanmehdi Aug 30, 2015
1899965
playing with timer animations
Aug 30, 2015
632355b
UI done
Aug 31, 2015
f553144
entire background color changes when done
zoufishanmehdi Sep 1, 2015
ff284ba
Cleaned up a few bugs with animations, start button on timer, stopwat…
Sep 1, 2015
00fd286
fixed the countdown clock, user cannot choose a past date
Sep 2, 2015
9b00117
countdown timer bugs fixed
Sep 3, 2015
89361ed
Fixed Timer Bugs
Sep 3, 2015
81fd6dc
cleaned up timer
Sep 3, 2015
eccccd7
clean up before demo
Sep 4, 2015
106e4da
added lost font file, changed bundle identifier
Sep 10, 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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
09/01 - Practice demos
09/03 - Final demos


## Feature Requirements
2 primary screens

Expand Down
150 changes: 143 additions & 7 deletions Time/Time.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 19 additions & 1 deletion Time/Time/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

#import "AppDelegate.h"
#import "PresetTimerData.h"

@interface AppDelegate ()

Expand All @@ -16,7 +17,24 @@ @implementation AppDelegate


- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.

// NSArray *familyNames = [[NSArray alloc] initWithArray:[UIFont familyNames]];
// NSArray *fontNames;
// NSInteger indFamily, indFont;
// for (indFamily=0; indFamily<[familyNames count]; ++indFamily)
// {
// NSLog(@"Family name: %@", [familyNames objectAtIndex:indFamily]);
// fontNames = [[NSArray alloc] initWithArray:
// [UIFont fontNamesForFamilyName:
// [familyNames objectAtIndex:indFamily]]];
// for (indFont=0; indFont<[fontNames count]; ++indFont)
// {
// NSLog(@" Font name: %@", [fontNames objectAtIndex:indFont]);
// }
// }

[[UITabBar appearance] setTintColor:[PresetTimerData sharedModel].eggplant];

return YES;
}

Expand Down
11 changes: 6 additions & 5 deletions Time/Time/Base.lproj/LaunchScreen.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?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="8173.3" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8142"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
Expand All @@ -11,13 +12,13 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 Mike Kavouras. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text=" Copyright (c) 2015 Mike Kavouras, Zoufishan Mehdi, Justine Kay. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="401" width="439" height="59"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Neo Retro Timer" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
Expand Down
Loading