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

Mesfin and Elber Time Project #12

Open
wants to merge 94 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
7e429f9
First commit
mesbekmek Aug 22, 2015
792c198
got stopwatch rolling
Aug 22, 2015
ed49e8b
setting up the pause button
Aug 22, 2015
0f1cb55
Local changes
mesbekmek Aug 22, 2015
2a9f6df
extra copy
mesbekmek Aug 22, 2015
84cb601
Timer Label and Lap Label functioning properly
mesbekmek Aug 22, 2015
1b584e4
stopwatch basic functionality done
Aug 22, 2015
ee1d523
changed the font size of the display
Aug 22, 2015
33f8a3c
added pickerview and set up pickerview display
Aug 22, 2015
1fb09d2
added buttons in timer viewcontroler
Aug 22, 2015
8363be9
tweaked storyboard position
Aug 22, 2015
81066bb
changed color scheme and font of stopwatch layout and added phantom n…
Aug 23, 2015
ae452ec
messing around with some colors
Aug 23, 2015
7ed37d9
changed colors back to original but left color setup code commented o…
Aug 23, 2015
2b681f1
added looping functionality to pickerview
mesbekmek Aug 23, 2015
23a9167
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
mesbekmek Aug 23, 2015
7fb8d34
added tableview controller for custom presets
Aug 23, 2015
31cd973
worked on presets for timer
Aug 23, 2015
9776487
got tableview to display preset names and times and added navigation …
Aug 23, 2015
72fd92d
added delegate protocol to presetsTableViewController
Aug 23, 2015
f62218d
tweaking presetTableViewController
Aug 23, 2015
e8859ac
Coutdown functionality implemented
mesbekmek Aug 23, 2015
ba0fe03
Countdown timer
mesbekmek Aug 23, 2015
313d11a
changed value of preset timer array to arrays of strings
Aug 23, 2015
ddd87c7
cleaned up code in PresetsTableViewController
Aug 23, 2015
e61b89e
working on custom preset picker
Aug 23, 2015
6cfe2e9
Final changes for countdown including hour functionality
mesbekmek Aug 23, 2015
f4a3548
Committing merge
mesbekmek Aug 23, 2015
e9813b1
commit
mesbekmek Aug 23, 2015
e599e09
Added new Delegate for new preset timer
Aug 23, 2015
fa60e9c
timer animation working
mesbekmek Aug 23, 2015
a8b6713
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
mesbekmek Aug 23, 2015
6140ddc
finished new preset timer functionality
Aug 23, 2015
cc8bcf6
Cleaned up animate methodfor timer
mesbekmek Aug 24, 2015
16457ac
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
mesbekmek Aug 24, 2015
8a2cd94
Functioning reset button
mesbekmek Aug 24, 2015
3769a17
Disabled start button and timer components when timer is running...an…
mesbekmek Aug 24, 2015
c8ff4b0
reformatting code
Aug 25, 2015
2233f2e
merge from master
Aug 25, 2015
7fc25c1
added tableviewcontroller for date countdown and added it to tabbarco…
Aug 26, 2015
8574e27
Added start/pause functionality to timer
mesbekmek Aug 26, 2015
529174d
Added start/pause functionality
mesbekmek Aug 26, 2015
6429cab
Re-arranged order of methods in Timer View Controller
mesbekmek Aug 26, 2015
27197bb
Added the ability to use a preset timer
mesbekmek Aug 26, 2015
1843b81
Fixed bugs with Preset Timers
mesbekmek Aug 26, 2015
426d6c0
Broken code
mesbekmek Aug 27, 2015
001e4c8
merge
Aug 27, 2015
b3fb714
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
Aug 27, 2015
18e7dfe
stuff
mesbekmek Aug 27, 2015
4e488cf
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
mesbekmek Aug 27, 2015
d06d905
All the work, still lags tho haha
mesbekmek Aug 27, 2015
0e2b02e
added controller for date countdown
Aug 27, 2015
84c7696
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
Aug 27, 2015
f91b98b
Fixed the lag
mesbekmek Aug 27, 2015
487281e
editing date countdown
Aug 28, 2015
41e03ea
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
Aug 28, 2015
2440762
merge
Aug 28, 2015
e947049
Fixed reset bug with LapTableViewController
mesbekmek Aug 28, 2015
7a7681b
Fixed merge conflict
mesbekmek Aug 28, 2015
0307336
Done
mesbekmek Aug 28, 2015
2cecd6c
added special event countdown functionality with timer and display up…
Aug 29, 2015
e301f1a
worked on interface of new event view
Aug 29, 2015
357c65c
Added Timer label to indicate the chosen preset timer
mesbekmek Aug 29, 2015
8f8cc98
Fixed start/pause speed bug
mesbekmek Aug 29, 2015
0263a78
finishing delegate for new event preset
Aug 29, 2015
bfb1021
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
Aug 29, 2015
86381a2
finished new event setup
Aug 29, 2015
0c7ddc1
fixed minor bug
Aug 29, 2015
fc68393
added alpha sorting for custom timers and chrono sorting for custom e…
Aug 29, 2015
c1ffb3d
added event textfield check
mesbekmek Aug 29, 2015
d7e99a0
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
mesbekmek Aug 29, 2015
2857f9c
playing with interface look of timer
Aug 29, 2015
0ebf22b
UI changes
mesbekmek Aug 30, 2015
9305084
added singleton for preset data persistence
Aug 30, 2015
e260263
Fixed bug with timer
mesbekmek Aug 30, 2015
04ab379
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
mesbekmek Aug 30, 2015
aa5fed1
UI Changes
mesbekmek Aug 30, 2015
ebb3f2d
tweaking interface
Aug 31, 2015
d5d45a3
Fixed Timer bugs,fixed code so that viewWillAppear is less cluttered
mesbekmek Aug 31, 2015
4d08c2f
restoring some of the old appearance
Sep 1, 2015
f949a83
added custom datePicker class and tweaked it some more to allow for c…
Sep 1, 2015
15aceec
customized PIDatePicker even more. and worked on its positioning on t…
Sep 1, 2015
aef29e9
merge
Sep 1, 2015
65937b7
small merge fixes
Sep 1, 2015
9fc5708
Minor tweaks on UI for consistency
mesbekmek Sep 1, 2015
7dc2e2e
UI Changes
mesbekmek Sep 1, 2015
430684c
tweaked event date picker
Sep 1, 2015
e4c70ac
Polishing...
mesbekmek Sep 1, 2015
29021c9
merge
Sep 1, 2015
98a8987
merge tweak
Sep 1, 2015
7f87997
More UI tweaks
mesbekmek Sep 1, 2015
dbd8f52
small fixes of datePicker setup
Sep 1, 2015
cfbed6b
Merge branch 'master' of https://github.com/mesbekmek/unit-1-final-pr…
Sep 1, 2015
4c4ec0b
made timer pickerview background color green, adjusted size of event …
Sep 1, 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
17 changes: 4 additions & 13 deletions Time/Time/Base.lproj/LaunchScreen.xib → Time/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="14E46" 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 All @@ -11,26 +11,17 @@
<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"/>
<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">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.24705882352941178" green="0.31764705882352939" blue="0.70980392156862748" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
Expand Down
633 changes: 633 additions & 0 deletions Time/Main.storyboard

Large diffs are not rendered by default.

213 changes: 180 additions & 33 deletions Time/Time.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Time/Time/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ @implementation AppDelegate

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:255.0/255 green:128.0/255 blue:169.0/255 alpha:1]];
//[[UITabBar appearance] setAlpha:1];
[[UITabBar appearance] setBarTintColor:[UIColor colorWithRed:48.0/255 green:66.0/255 blue:154.0/255 alpha:1]];
sleep(2);
return YES;
}

Expand Down
25 changes: 0 additions & 25 deletions Time/Time/Base.lproj/Main.storyboard

This file was deleted.

17 changes: 17 additions & 0 deletions Time/Time/DataSingleton.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// DataSingleton.h
// Time
//
// Created by Elber Carneiro on 8/30/15.
// Copyright (c) 2015 Mike Kavouras. All rights reserved.
//

#import <Foundation/Foundation.h>
#import "OrderedDictionary.h"

@interface DataSingleton : NSObject
@property (nonatomic) OrderedDictionary *presetTimers;
@property (nonatomic) NSMutableArray *alphabeticalKeys;
+ (id)sharedDataSingleton;
- (void)setTimer:(NSArray *)time withName:(NSString *)name;
@end
68 changes: 68 additions & 0 deletions Time/Time/DataSingleton.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
//
// DataSingleton.m
// Time
//
// Created by Elber Carneiro on 8/30/15.
// Copyright (c) 2015 Mike Kavouras. All rights reserved.
//

#import "DataSingleton.h"

@implementation DataSingleton

+ (id)sharedDataSingleton {
static DataSingleton *sharedDataSingleton = nil;

static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
sharedDataSingleton = [[self alloc] init];
});

return sharedDataSingleton;
}

- (id)init {
if (self = [super init]) {
[self setupDefaultPresets];
}
return self;
}

- (void)setupDefaultPresets {
self.presetTimers = [[OrderedDictionary alloc] init];

NSArray *keys = @[@"Commercials", @"Dryer", @"Morning Meditation",
@"Popcorn", @"Quick Jog", @"Washing Machine"];

NSArray *values = @[@[@"00", @"01", @"00"],
@[@"00", @"45", @"00"],
@[@"00", @"05", @"00"],
@[@"00", @"03", @"30"],
@[@"00", @"25", @"00"],
@[@"00", @"35", @"00"]];

for (int i = 0; i < [keys count]; i++) {
[self.presetTimers setObject:values[i] forKey:keys[i]];
}

self.alphabeticalKeys = [NSMutableArray arrayWithArray:[self.presetTimers allKeys]];
}

- (void)setTimer:(NSArray *)time withName:(NSString *)name {
[self.presetTimers setObject:time forKey:name];

self.alphabeticalKeys = [NSMutableArray arrayWithArray:[self.presetTimers allKeys]];
NSLog(@"Alpha Keys %@", self.alphabeticalKeys);
NSArray* sortedArray = [self.alphabeticalKeys sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
self.alphabeticalKeys = [NSMutableArray arrayWithArray:sortedArray];

NSMutableArray *temp = [[NSMutableArray alloc] init];
for (NSString *key in self.alphabeticalKeys) {
[temp addObject:[self.presetTimers objectForKey:key]];
}

self.presetTimers = [OrderedDictionary dictionaryWithObjects:temp forKeys:self.alphabeticalKeys];
NSLog(@"Preset Timers: %@", self.presetTimers);
}

@end
13 changes: 13 additions & 0 deletions Time/Time/DateCountdownTableViewController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// DateCountdownTableViewController.h
// Time
//
// Created by Elber Carneiro on 8/27/15.
// Copyright (c) 2015 Mike Kavouras. All rights reserved.
//

#import <UIKit/UIKit.h>
#import "NewEventViewControllerDelegate.h"

@interface DateCountdownTableViewController : UITableViewController <NewEventViewControllerDelegate>
@end
169 changes: 169 additions & 0 deletions Time/Time/DateCountdownTableViewController.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
//
// DateCountdownTableViewController.m
// Time
//
// Created by Elber Carneiro on 8/27/15.
// Copyright (c) 2015 Mike Kavouras. All rights reserved.
//

#import "DateCountdownTableViewController.h"
#import "OrderedDictionary.h"
#import "NewEventViewController.h"

@interface DateCountdownTableViewController ()
@property (nonatomic) OrderedDictionary *eventDates;
@property (nonatomic) NSMutableArray *chronologicalKeys;
@property (nonatomic) NSDateFormatter *dateFormatter;
@property (nonatomic) UIColor *pink;
@end

@implementation DateCountdownTableViewController

- (void)viewDidLoad {
[super viewDidLoad];
[self setupDefaultPresets];

[[self.navigationController navigationBar] setBarTintColor:[UIColor colorWithRed:63.0/255 green:81.0/255 blue:181.0/255 alpha:1.0]];

[self.navigationController.navigationBar
setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}];

// This is here just in case the screen stays active on the user's phone for a bit.
// Refreshes every 5 minutes.
[NSTimer scheduledTimerWithTimeInterval:300.0
target:self
selector:@selector(reloadCountdown)
userInfo:nil
repeats:YES];
}

- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self.tableView reloadData];
}

- (void)reloadCountdown {
[self.tableView reloadData];
}

- (void)setupDefaultPresets {
self.eventDates = [[OrderedDictionary alloc] init];

NSArray *description = @[@"CD Player Day",
@"International Day for Failure",
@"Push-Button Phone Day",
@"International Shareware Day",
@"International Programmer's Day",
@"Macintosh Computer Day"];

NSArray *keys = @[@"2015 10 01",
@"2015 10 13",
@"2015 11 18",
@"2015 12 13",
@"2016 01 07",
@"2016 01 24"];

[self.eventDates setDictionary:[NSDictionary dictionaryWithObjects:description forKeys:keys]];

self.dateFormatter = [[NSDateFormatter alloc] init];
[self.dateFormatter setDateFormat:@"yyyy MM dd"];

self.chronologicalKeys = [NSMutableArray arrayWithArray:[self.eventDates allKeys]];
NSLog(@"Chrono Keys %@", self.chronologicalKeys);

self.pink = [UIColor colorWithRed:255.0/255 green:128.0/255 blue:169.0/255 alpha:1.0];
}

- (NSDate *)convertToNSDate:(NSString *)date {
NSDate *event = [self.dateFormatter dateFromString:date];
return event;
}

- (NSString *)timeToEvent:(NSDate *)event {
NSDate *now = [NSDate new];

// These next two lines are just for debugging and can be deleted before submission
NSTimeInterval timeLeft = [event timeIntervalSinceDate:now];
NSLog(@"%f", timeLeft);

// Get our computer's local calendar
NSCalendar *sysCalendar = [NSCalendar currentCalendar];

// Create the calendar unit flags we want to use (minutes are included for debugging, to
// check that the timer is firing every 5 minutes).
NSCalendarUnit unitFlags = NSCalendarUnitMinute | NSCalendarUnitHour | NSCalendarUnitDay | NSCalendarUnitMonth;

// Create the date components using our unit flags, the difference between the two dates,
// and the local calendar which will automatically compensate for any time difference from
// GMT.
NSDateComponents *breakdownInfo = [sysCalendar components:unitFlags fromDate:now toDate:event options:0];
NSLog(@"Break down: %lu minutes : %lu hours : %lu days : %lu months", [breakdownInfo minute], [breakdownInfo hour], [breakdownInfo day], [breakdownInfo month]);

NSString *timeToEvent = [NSString stringWithFormat:@"%02lumo %02lud %02luh", [breakdownInfo month], [breakdownInfo day], [breakdownInfo hour]];

return timeToEvent;
}

- (IBAction)newEventButtonPressed:(id)sender {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
NewEventViewController *newEventVC = [storyboard instantiateViewControllerWithIdentifier:@"newEventVC"];
newEventVC.delegate = self;

[self presentViewController:newEventVC animated:YES completion:nil];
}

#pragma mark - Table view data source
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
return 1;
}

- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return [self.eventDates count];
}

- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {

UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"dateIdentifier" forIndexPath:indexPath];

NSString *key = self.chronologicalKeys[indexPath.row];
NSDate *eventDate = [self convertToNSDate:key];
NSString *countdown = [self timeToEvent:eventDate];

UIView *selectionColor = [[UIView alloc] init];
selectionColor.backgroundColor = [UIColor colorWithRed:198.0/255 green:230.0/255 blue:204.0/255 alpha:1.0];
cell.selectedBackgroundView = selectionColor;

cell.textLabel.lineBreakMode = NSLineBreakByWordWrapping;
cell.textLabel.numberOfLines = 0;
cell.textLabel.text = [NSString stringWithFormat:@"%@", [self.eventDates objectForKey:key]];
cell.detailTextLabel.text = countdown;

return cell;
}

- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
return 80.0;
}

-(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
cell.backgroundColor = [UIColor whiteColor];
cell.textLabel.textColor = [UIColor colorWithRed:115.0/255 green:115.0/255 blue:115.0/255 alpha:1];
cell.textLabel.highlightedTextColor = [UIColor colorWithRed:66.0/255 green:66.0/255 blue:66.0/255 alpha:1];
cell.detailTextLabel.textColor = self.pink;

[cell.textLabel setFont:[UIFont fontWithName:@"Orbitron-Regular" size:17]];
[cell.detailTextLabel setFont:[UIFont fontWithName:@"Orbitron-Regular" size:13]];
}

#pragma mark - delegate Implementation
- (void)presetCreated:(NSDate *)eventDate withName:(NSString *)eventName {
NSString *date = [self.dateFormatter stringFromDate:eventDate];
NSString *capitalizedEventName = [eventName capitalizedString];
[self.eventDates setObject:capitalizedEventName forKey:date];

self.chronologicalKeys = [NSMutableArray arrayWithArray:[self.eventDates allKeys]];
NSArray* sortedArray = [self.chronologicalKeys sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
self.chronologicalKeys = [NSMutableArray arrayWithArray:sortedArray];
}

@end
21 changes: 21 additions & 0 deletions Time/Time/Images.xcassets/StopwatchOrange.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "StopwatchOrange.png"
},
{
"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/TimerOrange.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "TimerOrange.png"
},
{
"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