From ae046d75d84c752381af8823caf6c2d0158f9280 Mon Sep 17 00:00:00 2001 From: Siqi LIU Date: Sun, 8 Sep 2013 18:16:25 +0200 Subject: Timer/Stopwatch for iPad redesigned Change-Id: I04f6e2f6fe0f5458b73e20614f5c99f810a4840a --- ios/iosremote/UIView+Shadowing.h | 1 + ios/iosremote/UIView+Shadowing.m | 10 + ios/iosremote/en.lproj/iPad_autosize.storyboard | 281 +++++++++++++++++---- ios/iosremote/en.lproj/iPad_autosize.strings | Bin 2470 -> 3990 bytes .../en.lproj/iPad_autosize_old.storyboard | 281 +++++++++++++++++---- ios/iosremote/fr.lproj/iPad_autosize.storyboard | 277 +++++++++++++++++--- ios/iosremote/fr.lproj/iPad_autosize.strings | Bin 2474 -> 3994 bytes .../fr.lproj/iPad_autosize_old.storyboard | 277 +++++++++++++++++--- ios/iosremote/iosremote.xcodeproj/project.pbxproj | 24 ++ .../iosremote/BasePresentationViewController.h | 16 +- .../iosremote/BasePresentationViewController.m | 44 +++- ios/iosremote/iosremote/Timer.h | 4 +- ios/iosremote/iosremote/Timer.m | 45 +++- ios/iosremote/iosremote/stopWatch.m | 46 +++- ios/iosremote/iosremote/timer_clear_btn_dark.png | Bin 0 -> 3502 bytes ios/iosremote/iosremote/timer_pause_btn_dark.png | Bin 0 -> 2894 bytes .../iosremote/timer_pause_btn_dark@2x.png | Bin 0 -> 3018 bytes ios/iosremote/iosremote/timer_resume_btn@2x.png | Bin 3520 -> 0 bytes ios/iosremote/iosremote/timer_settime_btn_dark.png | Bin 0 -> 4066 bytes .../iosremote/timer_settime_btn_dark@2x.png | Bin 0 -> 5310 bytes ios/iosremote/iosremote/timer_start_btn_dark.png | Bin 0 -> 3191 bytes .../zh-Hans.lproj/iPad_autosize.storyboard | 277 +++++++++++++++++--- ios/iosremote/zh-Hans.lproj/iPad_autosize.strings | Bin 2198 -> 3718 bytes .../zh-Hans.lproj/iPad_autosize_old.storyboard | 277 +++++++++++++++++--- 24 files changed, 1573 insertions(+), 287 deletions(-) create mode 100644 ios/iosremote/iosremote/timer_clear_btn_dark.png create mode 100644 ios/iosremote/iosremote/timer_pause_btn_dark.png create mode 100644 ios/iosremote/iosremote/timer_pause_btn_dark@2x.png delete mode 100644 ios/iosremote/iosremote/timer_resume_btn@2x.png create mode 100644 ios/iosremote/iosremote/timer_settime_btn_dark.png create mode 100644 ios/iosremote/iosremote/timer_settime_btn_dark@2x.png create mode 100644 ios/iosremote/iosremote/timer_start_btn_dark.png (limited to 'ios') diff --git a/ios/iosremote/UIView+Shadowing.h b/ios/iosremote/UIView+Shadowing.h index d7b3869f1770..f7f28697fefb 100644 --- a/ios/iosremote/UIView+Shadowing.h +++ b/ios/iosremote/UIView+Shadowing.h @@ -11,5 +11,6 @@ @interface UIView (Shadowing) - (void) setShadow; +- (void) setShadowLight; @end diff --git a/ios/iosremote/UIView+Shadowing.m b/ios/iosremote/UIView+Shadowing.m index 616bb187dfdc..40dfa3d3ed13 100644 --- a/ios/iosremote/UIView+Shadowing.m +++ b/ios/iosremote/UIView+Shadowing.m @@ -21,4 +21,14 @@ self.clipsToBounds = NO; } +- (void) setShadowLight +{ + self.layer.shadowColor = [[UIColor blackColor] CGColor]; + self.layer.shadowOpacity = 0.3; + self.layer.shadowRadius = 3.0; + self.layer.shadowOffset = CGSizeMake(4.0f, 3.0f); + self.layer.shadowPath = [UIBezierPath bezierPathWithRect:self.bounds].CGPath; + self.clipsToBounds = NO; +} + @end diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index 154bb4c87cec..d257bf74b584 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -1,9 +1,9 @@ - + - + - + @@ -329,46 +329,9 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -400,7 +499,14 @@ + + + + + + + @@ -514,9 +620,96 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/iosremote/en.lproj/iPad_autosize.strings b/ios/iosremote/en.lproj/iPad_autosize.strings index 890fc5abd512..1ed9cbdeaa13 100644 Binary files a/ios/iosremote/en.lproj/iPad_autosize.strings and b/ios/iosremote/en.lproj/iPad_autosize.strings differ diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index 154bb4c87cec..d257bf74b584 100644 --- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard @@ -1,9 +1,9 @@ - + - + - + @@ -329,46 +329,9 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -400,7 +499,14 @@ + + + + + + + @@ -514,9 +620,96 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index b9d5a57109db..462be6a40de1 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -1,7 +1,7 @@ - + @@ -329,46 +329,9 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -400,7 +499,14 @@ + + + + + + + @@ -514,9 +620,96 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/iosremote/fr.lproj/iPad_autosize.strings b/ios/iosremote/fr.lproj/iPad_autosize.strings index 3b1e8e016c61..4f924d49312c 100644 Binary files a/ios/iosremote/fr.lproj/iPad_autosize.strings and b/ios/iosremote/fr.lproj/iPad_autosize.strings differ diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index b9d5a57109db..6c9451e51931 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -1,7 +1,7 @@ - + @@ -329,46 +329,9 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -400,7 +499,14 @@ + + + + + + + @@ -514,9 +620,96 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index df2254cd6675..b8793aa6d4a6 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -93,6 +93,12 @@ 8C26E5D317A5AFE8007DA4B7 /* slideshowRail.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */; }; 8C26E5D417A5AFE8007DA4B7 /* slideshowRail@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */; }; 8C26E5D717A68154007DA4B7 /* stopWatch.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C26E5D617A68154007DA4B7 /* stopWatch.m */; }; + 8C3A648817DCBE9E004A77D9 /* timer_clear_btn_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648117DCBE9E004A77D9 /* timer_clear_btn_dark.png */; }; + 8C3A648A17DCBE9E004A77D9 /* timer_pause_btn_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648317DCBE9E004A77D9 /* timer_pause_btn_dark.png */; }; + 8C3A648B17DCBE9E004A77D9 /* timer_pause_btn_dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648417DCBE9E004A77D9 /* timer_pause_btn_dark@2x.png */; }; + 8C3A648C17DCBE9E004A77D9 /* timer_settime_btn_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648517DCBE9E004A77D9 /* timer_settime_btn_dark.png */; }; + 8C3A648D17DCBE9E004A77D9 /* timer_settime_btn_dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648617DCBE9E004A77D9 /* timer_settime_btn_dark@2x.png */; }; + 8C3A648E17DCBE9E004A77D9 /* timer_start_btn_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648717DCBE9E004A77D9 /* timer_start_btn_dark.png */; }; 8C94E69617CF7BF000B4848D /* WTPairingScreenshot.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C94E69517CF7BF000B4848D /* WTPairingScreenshot.png */; }; 8CAD658517A2E84A00CFB661 /* MainSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658417A2E84A00CFB661 /* MainSplitViewController.m */; }; 8CAD658817A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658717A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m */; }; @@ -258,6 +264,12 @@ 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "slideshowRail@2x.png"; sourceTree = ""; }; 8C26E5D517A68154007DA4B7 /* stopWatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stopWatch.h; path = iosremote/stopWatch.h; sourceTree = ""; }; 8C26E5D617A68154007DA4B7 /* stopWatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = stopWatch.m; path = iosremote/stopWatch.m; sourceTree = ""; }; + 8C3A648117DCBE9E004A77D9 /* timer_clear_btn_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_clear_btn_dark.png; path = iosremote/timer_clear_btn_dark.png; sourceTree = ""; }; + 8C3A648317DCBE9E004A77D9 /* timer_pause_btn_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_pause_btn_dark.png; path = iosremote/timer_pause_btn_dark.png; sourceTree = ""; }; + 8C3A648417DCBE9E004A77D9 /* timer_pause_btn_dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "timer_pause_btn_dark@2x.png"; path = "iosremote/timer_pause_btn_dark@2x.png"; sourceTree = ""; }; + 8C3A648517DCBE9E004A77D9 /* timer_settime_btn_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_settime_btn_dark.png; path = iosremote/timer_settime_btn_dark.png; sourceTree = ""; }; + 8C3A648617DCBE9E004A77D9 /* timer_settime_btn_dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "timer_settime_btn_dark@2x.png"; path = "iosremote/timer_settime_btn_dark@2x.png"; sourceTree = ""; }; + 8C3A648717DCBE9E004A77D9 /* timer_start_btn_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_start_btn_dark.png; path = iosremote/timer_start_btn_dark.png; sourceTree = ""; }; 8C94E69517CF7BF000B4848D /* WTPairingScreenshot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WTPairingScreenshot.png; path = iosremote/WTPairingScreenshot.png; sourceTree = ""; }; 8CAD658317A2E84A00CFB661 /* MainSplitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainSplitViewController.h; path = iosremote/MainSplitViewController.h; sourceTree = ""; }; 8CAD658417A2E84A00CFB661 /* MainSplitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainSplitViewController.m; path = iosremote/MainSplitViewController.m; sourceTree = ""; }; @@ -419,6 +431,12 @@ 8C06B31917B7EC62002F5CF8 /* assets */ = { isa = PBXGroup; children = ( + 8C3A648117DCBE9E004A77D9 /* timer_clear_btn_dark.png */, + 8C3A648317DCBE9E004A77D9 /* timer_pause_btn_dark.png */, + 8C3A648417DCBE9E004A77D9 /* timer_pause_btn_dark@2x.png */, + 8C3A648517DCBE9E004A77D9 /* timer_settime_btn_dark.png */, + 8C3A648617DCBE9E004A77D9 /* timer_settime_btn_dark@2x.png */, + 8C3A648717DCBE9E004A77D9 /* timer_start_btn_dark.png */, 8C23B46A17DB3B8600FB4DE6 /* timer_settime_btn.png */, 8C23B46B17DB3B8600FB4DE6 /* timer_settime_btn@2x.png */, 8CAF3DE117D1D5D600F931E5 /* more_ipad.png */, @@ -802,6 +820,12 @@ 8CAF3DE417D1D5D700F931E5 /* more_ipad@2x.png in Resources */, 8C23B46C17DB3B8600FB4DE6 /* timer_settime_btn.png in Resources */, 8C23B46D17DB3B8600FB4DE6 /* timer_settime_btn@2x.png in Resources */, + 8C3A648817DCBE9E004A77D9 /* timer_clear_btn_dark.png in Resources */, + 8C3A648A17DCBE9E004A77D9 /* timer_pause_btn_dark.png in Resources */, + 8C3A648B17DCBE9E004A77D9 /* timer_pause_btn_dark@2x.png in Resources */, + 8C3A648C17DCBE9E004A77D9 /* timer_settime_btn_dark.png in Resources */, + 8C3A648D17DCBE9E004A77D9 /* timer_settime_btn_dark@2x.png in Resources */, + 8C3A648E17DCBE9E004A77D9 /* timer_start_btn_dark.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/iosremote/iosremote/BasePresentationViewController.h b/ios/iosremote/iosremote/BasePresentationViewController.h index 690df0a6be01..8374ebf80711 100644 --- a/ios/iosremote/iosremote/BasePresentationViewController.h +++ b/ios/iosremote/iosremote/BasePresentationViewController.h @@ -31,12 +31,24 @@ @property (strong, nonatomic) UIView *welcome_blocking_page; @property (weak, nonatomic) IBOutlet UITableView *horizontalTableView; + +@property (weak, nonatomic) IBOutlet UIButton *gearButton; +- (IBAction)popOverUp:(id)sender; + +// Stopwatch/Timer + @property (weak, nonatomic) IBOutlet UIButton *startButton; @property (weak, nonatomic) IBOutlet UIButton *clearButton; @property (weak, nonatomic) IBOutlet UILabel *timeLabel; -@property (weak, nonatomic) IBOutlet UIButton *gearButton; -- (IBAction)popOverUp:(id)sender; +@property (weak, nonatomic) IBOutlet UIButton *timerStartButton; +@property (weak, nonatomic) IBOutlet UIButton *timerClearButton; +@property (weak, nonatomic) IBOutlet UIButton *timerSetTimeButton; +@property (weak, nonatomic) IBOutlet UILabel *timerTimeLabel; + +@property (weak, nonatomic) IBOutlet UIView *stopWatchView; +@property (weak, nonatomic) IBOutlet UIView *timerView; +@property (weak, nonatomic) IBOutlet UIScrollView *stopWatchTimerScrollView; //Reconnection - (void) didReceiveDisconnection; diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m b/ios/iosremote/iosremote/BasePresentationViewController.m index d77b45b7a33a..742ab66e0fba 100644 --- a/ios/iosremote/iosremote/BasePresentationViewController.m +++ b/ios/iosremote/iosremote/BasePresentationViewController.m @@ -15,8 +15,9 @@ #import "HorizontalSlideCell.h" #import "MainSplitViewController.h" #import "stopWatch.h" +#import "Timer.h" #import "PopoverView.h" - +#import "UIView+Shadowing.h" #import "ControlVariables.h" #import @@ -26,7 +27,7 @@ #define CURRENT_SLIDE_IMAGEVIEW 19 #define CURRENT_SLIDE_NOTES 18 -@interface BasePresentationViewController () +@interface BasePresentationViewController () @property (nonatomic, strong) CommunicationManager *comManager; @property (nonatomic, strong) id slideShowImageNoteReadyObserver; @@ -39,6 +40,8 @@ @property CGPoint refRightLowerGravity; @property (nonatomic, strong) stopWatch * stopWatch; +@property (nonatomic, strong) Timer * timer; +@property (nonatomic, strong) UIPopoverController * popoverTimePickerController; @property int count; @@ -51,6 +54,7 @@ @synthesize slideShowImageNoteReadyObserver = _slideShowImageNoteReadyObserver; @synthesize slideShowFinishedObserver = _slideShowFinishedObserver; @synthesize slideChangedObserver = _slideChangedObserver; +@synthesize popoverTimePickerController = _popoverTimePickerController; #pragma mark - UITableView delegate - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section @@ -316,6 +320,11 @@ } }]; self.stopWatch = [[stopWatch alloc] initWithStartButton:self.startButton ClearButton:self.clearButton TimeLabel:self.timeLabel]; + self.timer = [[Timer alloc] initWithStartButton:self.timerStartButton ClearButton:self.timerClearButton SetTimeButton:self.timerSetTimeButton TimeLabel:self.timerTimeLabel]; + [self.stopWatchView setShadowLight]; + [self.timerView setShadowLight]; + self.timer.delegate = self; + self.stopWatchTimerScrollView.contentSize = CGSizeMake(1240, 62); } - (void)viewDidAppear:(BOOL)animated @@ -444,6 +453,9 @@ [self setClearButton:nil]; [self setTimeLabel:nil]; [self setGearButton:nil]; + [self setStopWatchView:nil]; + [self setTimerView:nil]; + [self setStopWatchTimerScrollView:nil]; [super viewDidUnload]; } @@ -538,4 +550,32 @@ static BOOL isBlank = NO; } } +#pragma mark TimerDelegate + +- (void)changeDate:(UIDatePicker *)sender { + [self.timer setSecondsLeft: sender.countDownDuration]; +} + +- (void)startTimePickerwithTimer:(Timer *) timer +{ + UIViewController* popoverContent = [[UIViewController alloc] init]; //ViewController + + UIView *popoverView = [[UIView alloc] init]; //view + popoverView.backgroundColor = [UIColor blackColor]; + + UIDatePicker *datePicker=[[UIDatePicker alloc]init];//Date picker + datePicker.frame=CGRectMake(0,44,320, 216); + datePicker.datePickerMode = UIDatePickerModeCountDownTimer; + [datePicker setTag:10]; + [datePicker addTarget:self action:@selector(changeDate:) forControlEvents:UIControlEventValueChanged]; + [popoverView addSubview:datePicker]; + + popoverContent.view = popoverView; + self.popoverTimePickerController = [[UIPopoverController alloc] initWithContentViewController:popoverContent]; + self.popoverTimePickerController.delegate = self; + + [self.popoverTimePickerController setPopoverContentSize:CGSizeMake(320, 264) animated:NO]; + [self.popoverTimePickerController presentPopoverFromRect:self.timerSetTimeButton.frame inView:self.timerView permittedArrowDirections:UIPopoverArrowDirectionDown animated:YES]; +} + @end diff --git a/ios/iosremote/iosremote/Timer.h b/ios/iosremote/iosremote/Timer.h index 4ea0f4438f13..8e3e6a673d30 100644 --- a/ios/iosremote/iosremote/Timer.h +++ b/ios/iosremote/iosremote/Timer.h @@ -16,9 +16,11 @@ @protocol TimerDelegate -- (void) setTitle:(NSString *) title sender:(id)sender; - (void) startTimePickerwithTimer:(Timer *) timer; +@optional +- (void) setTitle:(NSString *) title sender:(id)sender; + @end @interface Timer : NSObject diff --git a/ios/iosremote/iosremote/Timer.m b/ios/iosremote/iosremote/Timer.m index 6e866d422f95..2929ca1fc589 100644 --- a/ios/iosremote/iosremote/Timer.m +++ b/ios/iosremote/iosremote/Timer.m @@ -153,18 +153,37 @@ int initSecondsLeft; - (void) updateStartButtonIcon { - switch (self.state) { - case TIMER_STATE_RUNNING: - [self.startButton setImage:[UIImage imageNamed:@"timer_pause_btn"] forState:UIControlStateNormal]; - break; - case TIMER_STATE_PAUSED: - [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; - break; - case TIMER_STATE_CLEARED: - [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; - break; - default: - break; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + switch (self.state) { + case TIMER_STATE_RUNNING: + [self.startButton setImage:[UIImage imageNamed:@"timer_pause_btn_dark"] forState:UIControlStateNormal]; + [self.startButton setTitle:NSLocalizedString(@"Pause", @"Update button text in diffrent states") forState:UIControlStateNormal]; + break; + case TIMER_STATE_PAUSED: + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn_dark"] forState:UIControlStateNormal]; + [self.startButton setTitle:NSLocalizedString(@"Start", @"Update button text in diffrent states") forState:UIControlStateNormal]; + break; + case TIMER_STATE_CLEARED: + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn_dark"] forState:UIControlStateNormal]; + [self.startButton setTitle:NSLocalizedString(@"Start", @"Update button text in diffrent states") forState:UIControlStateNormal]; + break; + default: + break; + } + } else { + switch (self.state) { + case TIMER_STATE_RUNNING: + [self.startButton setImage:[UIImage imageNamed:@"timer_pause_btn"] forState:UIControlStateNormal]; + break; + case TIMER_STATE_PAUSED: + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; + break; + case TIMER_STATE_CLEARED: + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; + break; + default: + break; + } } } @@ -174,7 +193,7 @@ int initSecondsLeft; self.timerTimer = nil; self.state = TIMER_STATE_CLEARED; - [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; + [self updateStartButtonIcon]; [self.delegate setTitle:@"" sender:self]; secondsLeft = initSecondsLeft; diff --git a/ios/iosremote/iosremote/stopWatch.m b/ios/iosremote/iosremote/stopWatch.m index 716508b6aa28..83f07b395073 100644 --- a/ios/iosremote/iosremote/stopWatch.m +++ b/ios/iosremote/iosremote/stopWatch.m @@ -123,18 +123,37 @@ - (void) updateStartButtonIcon { - switch (self.state) { - case TIMER_STATE_RUNNING: - [self.startButton setImage:[UIImage imageNamed:@"timer_pause_btn"] forState:UIControlStateNormal]; - break; - case TIMER_STATE_PAUSED: - [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; - break; - case TIMER_STATE_CLEARED: - [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; - break; - default: - break; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + switch (self.state) { + case TIMER_STATE_RUNNING: + [self.startButton setImage:[UIImage imageNamed:@"timer_pause_btn_dark"] forState:UIControlStateNormal]; + [self.startButton setTitle:NSLocalizedString(@"Pause", @"Update button text in diffrent states") forState:UIControlStateNormal]; + break; + case TIMER_STATE_PAUSED: + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn_dark"] forState:UIControlStateNormal]; + [self.startButton setTitle:NSLocalizedString(@"Start", @"Update button text in diffrent states") forState:UIControlStateNormal]; + break; + case TIMER_STATE_CLEARED: + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn_dark"] forState:UIControlStateNormal]; + [self.startButton setTitle:NSLocalizedString(@"Start", @"Update button text in diffrent states") forState:UIControlStateNormal]; + break; + default: + break; + } + } else { + switch (self.state) { + case TIMER_STATE_RUNNING: + [self.startButton setImage:[UIImage imageNamed:@"timer_pause_btn"] forState:UIControlStateNormal]; + break; + case TIMER_STATE_PAUSED: + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; + break; + case TIMER_STATE_CLEARED: + [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; + break; + default: + break; + } } } @@ -146,7 +165,8 @@ self.lastInterval = 0; self.state = TIMER_STATE_CLEARED; - [self.startButton setImage:[UIImage imageNamed:@"timer_start_btn"] forState:UIControlStateNormal]; + [self updateStartButtonIcon]; + [self updateTimer]; [self.delegate setTitle:@"" sender:self]; } diff --git a/ios/iosremote/iosremote/timer_clear_btn_dark.png b/ios/iosremote/iosremote/timer_clear_btn_dark.png new file mode 100644 index 000000000000..fe620cde740c Binary files /dev/null and b/ios/iosremote/iosremote/timer_clear_btn_dark.png differ diff --git a/ios/iosremote/iosremote/timer_pause_btn_dark.png b/ios/iosremote/iosremote/timer_pause_btn_dark.png new file mode 100644 index 000000000000..7131406b28dd Binary files /dev/null and b/ios/iosremote/iosremote/timer_pause_btn_dark.png differ diff --git a/ios/iosremote/iosremote/timer_pause_btn_dark@2x.png b/ios/iosremote/iosremote/timer_pause_btn_dark@2x.png new file mode 100644 index 000000000000..c02ed8eae2d4 Binary files /dev/null and b/ios/iosremote/iosremote/timer_pause_btn_dark@2x.png differ diff --git a/ios/iosremote/iosremote/timer_resume_btn@2x.png b/ios/iosremote/iosremote/timer_resume_btn@2x.png deleted file mode 100644 index 82e000e26187..000000000000 Binary files a/ios/iosremote/iosremote/timer_resume_btn@2x.png and /dev/null differ diff --git a/ios/iosremote/iosremote/timer_settime_btn_dark.png b/ios/iosremote/iosremote/timer_settime_btn_dark.png new file mode 100644 index 000000000000..abafec9c702d Binary files /dev/null and b/ios/iosremote/iosremote/timer_settime_btn_dark.png differ diff --git a/ios/iosremote/iosremote/timer_settime_btn_dark@2x.png b/ios/iosremote/iosremote/timer_settime_btn_dark@2x.png new file mode 100644 index 000000000000..56375417caac Binary files /dev/null and b/ios/iosremote/iosremote/timer_settime_btn_dark@2x.png differ diff --git a/ios/iosremote/iosremote/timer_start_btn_dark.png b/ios/iosremote/iosremote/timer_start_btn_dark.png new file mode 100644 index 000000000000..e3accb9c1be5 Binary files /dev/null and b/ios/iosremote/iosremote/timer_start_btn_dark.png differ diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard index 545e24b10bc2..3345e0e74b33 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard @@ -1,7 +1,7 @@ - + @@ -329,46 +329,9 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -400,7 +499,14 @@ + + + + + + + @@ -514,9 +620,96 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings b/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings index 6aa69735e671..07311c046eea 100644 Binary files a/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings and b/ios/iosremote/zh-Hans.lproj/iPad_autosize.strings differ diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard index 545e24b10bc2..4209ccedb509 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard @@ -1,7 +1,7 @@ - + @@ -329,46 +329,9 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -400,7 +499,14 @@ + + + + + + + @@ -514,9 +620,96 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit