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.

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

first draft #6

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
9256d39
first commit
Xiulanshi Aug 22, 2015
6b2767b
beginnings
sheyoshida Aug 22, 2015
b429746
changes
Xiulanshi Aug 22, 2015
fc7749a
stopwatch increases and stops
sheyoshida Aug 22, 2015
a8d2f1b
button text changes when clicked
sheyoshida Aug 22, 2015
e86397d
end of day 1
sheyoshida Aug 22, 2015
cb944ef
timer ready for xiulan
sheyoshida Aug 23, 2015
9b5d450
one more time
sheyoshida Aug 23, 2015
084ab53
moved label
sheyoshida Aug 23, 2015
b86de7f
swipe gesture and new views added
sheyoshida Aug 23, 2015
aa2fe9b
TimerBarController
Xiulanshi Aug 23, 2015
ec07e9b
stopwatch lap button fixed
sheyoshida Aug 23, 2015
ed81e74
after stopwatch tour
sheyoshida Aug 23, 2015
6899661
tableview now displays lap times
sheyoshida Aug 25, 2015
6e163b8
table view without test code
sheyoshida Aug 26, 2015
35128c7
Add AlertView when time ends
Xiulanshi Aug 26, 2015
2929ea0
table view and scroll view added
sheyoshida Aug 28, 2015
281dc5a
fixed wobbly scroll view
sheyoshida Aug 28, 2015
86fa065
one more
sheyoshida Aug 28, 2015
ed3d8be
morning push
sheyoshida Aug 28, 2015
d567644
beginnings of new layout added
sheyoshida Aug 28, 2015
fdcbc2f
so much UI stuff added today
sheyoshida Aug 28, 2015
9d13848
stop animation when timer ends
Xiulanshi Aug 29, 2015
4809a1e
we still need to fix that memory leak
sheyoshida Aug 29, 2015
10b2c8c
Update ui for preset Timer detail and add screen
Xiulanshi Aug 29, 2015
bc9c266
one more try
sheyoshida Aug 29, 2015
75dd292
Added preset timer detail and add
Xiulanshi Aug 29, 2015
915ec51
Add Detail and Add screen
Xiulanshi Aug 29, 2015
097610c
added everything so far
Xiulanshi Aug 29, 2015
f45cc1e
scroll view fixed
sheyoshida Aug 29, 2015
de89b0f
Update Preset Timer Detail and it works now
Xiulanshi Aug 30, 2015
8baca97
Added commons totwo places
Xiulanshi Aug 30, 2015
d155e55
new buttons
sheyoshida Aug 30, 2015
7021cd4
Fixed the Edit button and the Add timer functionality
Xiulanshi Aug 30, 2015
d6a04ef
minor change
Xiulanshi Aug 30, 2015
a7db3d4
navigation bar button color fixed
sheyoshida Aug 31, 2015
86695c3
change order
Xiulanshi Sep 1, 2015
ab41d03
first draft
sheyoshida Sep 1, 2015
8c5dc96
added custom app icon
sheyoshida Sep 1, 2015
6a30408
added accurate cook times
sheyoshida Sep 1, 2015
9aa83c8
Navigation Bar dispear due to the setting on eventcountdown page prob…
Xiulanshi Sep 2, 2015
44e362a
Add AVFoundation Framework to play audio when time ends for the timer
Xiulanshi Sep 2, 2015
68b917d
Add audio to the PresetTimerDetail screen
Xiulanshi Sep 2, 2015
02f1c60
move some files to supporting files
Xiulanshi Sep 2, 2015
4f1c932
added weight detail
sheyoshida Sep 2, 2015
c7857bc
adjusted UI
sheyoshida Sep 2, 2015
c90360c
Added Special Turkey Preset Timer
Xiulanshi Sep 2, 2015
33598fd
Fixed the special timer
Xiulanshi Sep 2, 2015
a7f75eb
small changes to the icon name
Xiulanshi Sep 2, 2015
364e355
Set Weight and NewTime as property
Xiulanshi Sep 2, 2015
ada7771
Fixed a bug
Xiulanshi Sep 3, 2015
ed982ce
fixed the dismiss keyboard issue and the negative weight issue
Xiulanshi Sep 3, 2015
91ff9ea
commented out the NSLog
Xiulanshi Sep 3, 2015
c56ec78
preset event dates fixed
sheyoshida Sep 3, 2015
29d46b9
text edits
sheyoshida Sep 3, 2015
0a316be
adjusted pizza constraints
sheyoshida Sep 3, 2015
9c09c2a
Added default image for any new user input preset timers
Xiulanshi Sep 3, 2015
75589fe
update 2 buttons
Xiulanshi Sep 3, 2015
1f1a11d
indentation
Xiulanshi Sep 3, 2015
d670839
fix typo
Xiulanshi Sep 3, 2015
d21dbe0
updaunix timestamp updated
sheyoshida Mar 30, 2016
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
132 changes: 125 additions & 7 deletions Time/Time.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file added Time/Time/Akkurat Bold.otf
Binary file not shown.
Binary file added Time/Time/Akkurat Regular.otf
Binary file not shown.
24 changes: 23 additions & 1 deletion Time/Time/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,29 @@ @implementation AppDelegate


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

// remove translucent layer on navigation items
[UINavigationBar appearance].translucent = NO;
[UITabBar appearance].translucent = NO;

//[UITabBar appearance].backgroundColor = [UIColor blueColor];

// change tab bar controller background color
UINavigationController *nav = (UINavigationController *)self.window.rootViewController;
UITabBarController *bc = nav.viewControllers[0];
//bc.tabBar.barTintColor = [UIColor colorWithRed:235/256.0 green:235/256.0 blue:241/256.0 alpha:1.0]; // grey
bc.tabBar.barTintColor = [UIColor colorWithRed:249/256.0 green:205/256.0 blue:78/256.0 alpha:1.0]; // yellow

// change header navigation bar background color
//[UINavigationBar appearance].barTintColor = [UIColor colorWithRed:235/256.0 green:235/256.0 blue:241/256.0 alpha:1.0]; // grey
[UINavigationBar appearance].barTintColor = [UIColor colorWithRed:249/256.0 green:205/256.0 blue:78/256.0 alpha:1.0]; // yellow

// change top navigation bar button color
[[UINavigationBar appearance] setTintColor:[UIColor blackColor]];

self.window.backgroundColor = [UIColor groupTableViewBackgroundColor];


return YES;
}

Expand Down
4 changes: 2 additions & 2 deletions Time/Time/Base.lproj/LaunchScreen.xib
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="14D136" 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
951 changes: 941 additions & 10 deletions Time/Time/Base.lproj/Main.storyboard

Large diffs are not rendered by default.

Binary file added Time/Time/Bokeh.sks
Binary file not shown.
14 changes: 14 additions & 0 deletions Time/Time/BokehScene.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// BokehScene.h
// Time
//
// Created by Shena Yoshida on 8/28/15.
// Copyright (c) 2015 Mike Kavouras. All rights reserved.
//

#import <UIKit/UIKit.h>
@import SpriteKit; // create module

@interface BokehScene : SKScene

@end
28 changes: 28 additions & 0 deletions Time/Time/BokehScene.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// BokehScene.m
// Time
//
// Created by Shena Yoshida on 8/28/15.
// Copyright (c) 2015 Mike Kavouras. All rights reserved.
//

#import "BokehScene.h"

@implementation BokehScene

-(id)initWithSize:(CGSize)size {
if (self = [super initWithSize:size]) {
//self.backgroundColor = [SKColor blackColor];
self.scene.backgroundColor = [SKColor colorWithRed:251/255.0f green:207/255.0f blue:79/255.0f alpha:1.0];

NSString *emitterPath = [[NSBundle mainBundle] pathForResource:@"Bokeh" ofType:@"sks"];
SKEmitterNode *bokeh = [NSKeyedUnarchiver unarchiveObjectWithFile:emitterPath];
bokeh.position = CGPointMake(CGRectGetMidX(self.frame), self.size.height/2);
bokeh.name = @"particleBokeh";
bokeh.targetNode = self.scene;
[self addChild:bokeh];
}
return self;
}

@end
70 changes: 62 additions & 8 deletions Time/Time/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,117 @@
{
"images" : [
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "icon7.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "icon1.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "icon2.png",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "icon3.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "icon4.png",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"size" : "60x60",
"filename" : "icon8.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "icon9.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "icon5.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "iTunesArtwork@2x copy 7.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "icon7-1.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "icon8-1.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "icon40px copy.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "icon80px-1.png",
"scale" : "2x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"filename" : "icon50px.png",
"scale" : "1x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"size" : "40x40",
"filename" : "icon100px.png",
"scale" : "2x"
},
{
"size" : "72x72",
"idiom" : "ipad",
"size" : "76x76",
"filename" : "icon72px.png",
"scale" : "1x"
},
{
"size" : "72x72",
"idiom" : "ipad",
"filename" : "icon144px.png",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "icon76.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "icon152.png",
"scale" : "2x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Time/Time/Images.xcassets/Banana Cupcakes.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "Cupcake-icon.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Time/Time/Images.xcassets/Birthday Cake.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "Cake-icon.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
6 changes: 6 additions & 0 deletions Time/Time/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
21 changes: 21 additions & 0 deletions Time/Time/Images.xcassets/Cow.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "Cow-icon.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Time/Time/Images.xcassets/Delicious Cookies.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "Cookie-Man-icon.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Time/Time/Images.xcassets/Frozen Pizza.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "Pizza-icon.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Time/Time/Images.xcassets/Fruits.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "Fruits-icon.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Time/Time/Images.xcassets/Poached Eggs.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "Eggs-icon.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading