From a28cc686cd49b36b1c938ae7fdbbead7218a596b Mon Sep 17 00:00:00 2001 From: Siqi LIU Date: Sat, 7 Sep 2013 22:18:43 +0200 Subject: [PATCH] major UI chages in order to embed Timer/Stopwatch Change-Id: Ib37033ba73d44647ad2f2b20ad6875d485e2c147 --- ios/iosremote/UIView+Shadowing.h | 15 ++ ios/iosremote/UIView+Shadowing.m | 24 +++ .../iosremote.xcodeproj/project.pbxproj | 18 +- ios/iosremote/iosremote/Timer.h | 13 ++ ios/iosremote/iosremote/Timer.m | 13 ++ .../iosremote/TimerCountdownTimePicker.h | 13 ++ .../iosremote/TimerCountdownTimePicker.m | 31 +++ .../iosremote/UIImageView+setImageAnimated.m | 1 - .../en.lproj/iPhone_autoSize.storyboard | 126 ++++++++--- .../en.lproj/iPhone_autoSize.strings | Bin 2954 -> 3162 bytes .../en.lproj/iPhone_autoSize_old.storyboard | 196 ++++++++---------- .../fr.lproj/iPhone_autoSize.storyboard | 196 ++++++++---------- .../fr.lproj/iPhone_autoSize_old.storyboard | 196 ++++++++---------- .../iosremote/slideShowSwipeInList_iphone.m | 93 ++++++++- ios/iosremote/iosremote/slideShow_vc_iphone.m | 17 +- ios/iosremote/iosremote/timer_clear_btn.png | Bin 3970 -> 3521 bytes .../iosremote/timer_clear_btn@2x.png | Bin 6655 -> 4442 bytes ios/iosremote/iosremote/timer_pause_btn.png | Bin 3975 -> 2884 bytes .../iosremote/timer_pause_btn@2x.png | Bin 6682 -> 3002 bytes .../iosremote/timer_resume_btn@2x.png | Bin 9844 -> 3520 bytes ...r_resume_btn.png => timer_settime_btn.png} | Bin 4260 -> 3897 bytes .../iosremote/timer_settime_btn@2x.png | Bin 0 -> 5148 bytes ios/iosremote/iosremote/timer_start_btn.png | Bin 4182 -> 3139 bytes .../iosremote/timer_start_btn@2x.png | Bin 7252 -> 3728 bytes .../zh-Hans.lproj/iPhone_autoSize.storyboard | 196 ++++++++---------- .../iPhone_autoSize_old.storyboard | 196 ++++++++---------- 26 files changed, 762 insertions(+), 582 deletions(-) create mode 100644 ios/iosremote/UIView+Shadowing.h create mode 100644 ios/iosremote/UIView+Shadowing.m create mode 100644 ios/iosremote/iosremote/Timer.h create mode 100644 ios/iosremote/iosremote/Timer.m create mode 100644 ios/iosremote/iosremote/TimerCountdownTimePicker.h create mode 100644 ios/iosremote/iosremote/TimerCountdownTimePicker.m rename ios/iosremote/iosremote/{timer_resume_btn.png => timer_settime_btn.png} (63%) create mode 100644 ios/iosremote/iosremote/timer_settime_btn@2x.png diff --git a/ios/iosremote/UIView+Shadowing.h b/ios/iosremote/UIView+Shadowing.h new file mode 100644 index 000000000000..223c4fd0b5ef --- /dev/null +++ b/ios/iosremote/UIView+Shadowing.h @@ -0,0 +1,15 @@ +// +// UIView+Shadowing.h +// iosremote +// +// Created by Siqi Liu on 9/6/13. +// Copyright (c) 2013 libreoffice. All rights reserved. +// + +#import + +@interface UIView (Shadowing) + +- (void) setShadow; + +@end diff --git a/ios/iosremote/UIView+Shadowing.m b/ios/iosremote/UIView+Shadowing.m new file mode 100644 index 000000000000..343063c2c88c --- /dev/null +++ b/ios/iosremote/UIView+Shadowing.m @@ -0,0 +1,24 @@ +// +// UIView+Shadowing.m +// iosremote +// +// Created by Siqi Liu on 9/6/13. +// Copyright (c) 2013 libreoffice. All rights reserved. +// + +#import "UIView+Shadowing.h" +#import + +@implementation UIView (Shadowing) + +- (void) setShadow +{ + self.layer.shadowColor = [[UIColor blackColor] CGColor]; + self.layer.shadowOpacity = 0.5; + self.layer.shadowRadius = 4.0; + self.layer.shadowOffset = CGSizeMake(3.0f, 3.0f); + self.layer.shadowPath = [UIBezierPath bezierPathWithRect:self.bounds].CGPath; + self.clipsToBounds = NO; +} + +@end diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index 45e36b5ce345..cc25b6c10d45 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -44,7 +44,6 @@ 57C6E430175E076900E8BC5F /* CommandInterpreter.m in Sources */ = {isa = PBXBuildFile; fileRef = 57C6E42B175E076900E8BC5F /* CommandInterpreter.m */; }; 57C6E431175E076900E8BC5F /* Server.m in Sources */ = {isa = PBXBuildFile; fileRef = 57C6E42D175E076900E8BC5F /* Server.m */; }; 57CC48C6178B42A400075DE4 /* timer_pause_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */; }; - 57CC48C7178B42A400075DE4 /* timer_resume_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */; }; 57CFED9917838FDC00E82E05 /* EditableTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */; }; 57DC7007178D84490050FC58 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57DC7006178D84490050FC58 /* CoreMotion.framework */; }; 57DC7012178E16A40050FC58 /* UIViewTransitionCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 57DC7011178E16A40050FC58 /* UIViewTransitionCategory.m */; }; @@ -88,6 +87,7 @@ 8C1A16FD17A2853700B4BB3C /* iosremote_iphone_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */; }; 8C1A16FF17A2853F00B4BB3C /* iosremote_ipad_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */; }; 8C1A170117A2854300B4BB3C /* iosremote_ipad_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon@2x.png */; }; + 8C23B46917DA158C00FB4DE6 /* UIView+Shadowing.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C23B46817DA158C00FB4DE6 /* UIView+Shadowing.m */; }; 8C26E5C617A5539D007DA4B7 /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8C26E5C517A5539D007DA4B7 /* UserDefaults.plist */; }; 8C26E5C917A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C26E5C817A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.m */; }; 8C26E5D017A58703007DA4B7 /* HorizontalSlideCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C26E5CF17A58703007DA4B7 /* HorizontalSlideCell.m */; }; @@ -179,7 +179,6 @@ 57C6E42C175E076900E8BC5F /* Server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Server.h; path = iosremote/Communication/Server.h; sourceTree = ""; }; 57C6E42D175E076900E8BC5F /* Server.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Server.m; path = iosremote/Communication/Server.m; sourceTree = ""; }; 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_pause_btn.png; path = iosremote/timer_pause_btn.png; sourceTree = ""; }; - 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_resume_btn.png; path = iosremote/timer_resume_btn.png; sourceTree = ""; }; 57CFED9717838FDC00E82E05 /* EditableTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditableTableViewCell.h; path = iosremote/EditableTableViewCell.h; sourceTree = ""; }; 57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EditableTableViewCell.m; path = iosremote/EditableTableViewCell.m; sourceTree = ""; }; 57DC7006178D84490050FC58 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; @@ -242,6 +241,8 @@ 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iosremote_iphone_icon.png; sourceTree = ""; }; 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iosremote_ipad_icon.png; sourceTree = ""; }; 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iosremote_ipad_icon@2x.png"; sourceTree = ""; }; + 8C23B46717DA158C00FB4DE6 /* UIView+Shadowing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Shadowing.h"; sourceTree = ""; }; + 8C23B46817DA158C00FB4DE6 /* UIView+Shadowing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Shadowing.m"; sourceTree = ""; }; 8C26E5BE17A525FC007DA4B7 /* MGSplitCornersView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGSplitCornersView.h; sourceTree = ""; }; 8C26E5BF17A525FC007DA4B7 /* MGSplitCornersView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGSplitCornersView.m; sourceTree = ""; }; 8C26E5C017A525FC007DA4B7 /* MGSplitDividerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGSplitDividerView.h; sourceTree = ""; }; @@ -465,7 +466,6 @@ 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */, 8C1A16FA17A2853100B4BB3C /* iosremote_iphone_icon@2x.png */, 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */, - 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */, 571BFAD0178AADA200EF1BDB /* more_icon.png */, 57AEEDB417899BB4007F4F97 /* slide_finished.png */, 57AEEDB017895BF5007F4F97 /* pointer_pushed.png */, @@ -569,6 +569,8 @@ 8C26E5CF17A58703007DA4B7 /* HorizontalSlideCell.m */, 8C0323A917A943720037432E /* UIImageView+setImageAnimated.h */, 8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */, + 8C23B46717DA158C00FB4DE6 /* UIView+Shadowing.h */, + 8C23B46817DA158C00FB4DE6 /* UIView+Shadowing.m */, 8C19F42917B04EC6005BDB61 /* UINavigationController+Theme.h */, 8C19F42A17B04EC6005BDB61 /* UINavigationController+Theme.m */, 8C19F42D17B05089005BDB61 /* LibONavigationController.h */, @@ -613,12 +615,20 @@ 8C1A170917A28E6500B4BB3C /* iPhone */ = { isa = PBXGroup; children = ( + 8C23B46217DA03D700FB4DE6 /* Views */, 8CAD658917A2F00500CFB661 /* Controllers */, 57DF0A83178FFFAB008B2D3D /* iPhone_autosize.storyboard */, ); name = iPhone; sourceTree = ""; }; + 8C23B46217DA03D700FB4DE6 /* Views */ = { + isa = PBXGroup; + children = ( + ); + name = Views; + sourceTree = ""; + }; 8C26E5C417A52607007DA4B7 /* MGSplitViewController */ = { isa = PBXGroup; children = ( @@ -742,7 +752,6 @@ 571D4807178B2F080063D93B /* timer_clear_btn.png in Resources */, 571D4808178B2F080063D93B /* timer_start_btn.png in Resources */, 57CC48C6178B42A400075DE4 /* timer_pause_btn.png in Resources */, - 57CC48C7178B42A400075DE4 /* timer_resume_btn.png in Resources */, 57DF0A85178FFFAB008B2D3D /* iPhone_autosize.storyboard in Resources */, 5711026D1794127E007D343B /* README.md in Resources */, 5711026E1794127E007D343B /* release_notes.md in Resources */, @@ -858,6 +867,7 @@ 8C19F43617B10D49005BDB61 /* UIViewController+LibOStyling.m in Sources */, 8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in Sources */, 8CD6EC7017CC3FA00071827A /* WalkThroughContainerViewController.m in Sources */, + 8C23B46917DA158C00FB4DE6 /* UIView+Shadowing.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/iosremote/iosremote/Timer.h b/ios/iosremote/iosremote/Timer.h new file mode 100644 index 000000000000..9ed22c5bb12b --- /dev/null +++ b/ios/iosremote/iosremote/Timer.h @@ -0,0 +1,13 @@ +// +// Timer.h +// iosremote +// +// Created by Siqi Liu on 9/7/13. +// Copyright (c) 2013 libreoffice. All rights reserved. +// + +#import + +@interface Timer : NSObject + +@end diff --git a/ios/iosremote/iosremote/Timer.m b/ios/iosremote/iosremote/Timer.m new file mode 100644 index 000000000000..af1ad023ce81 --- /dev/null +++ b/ios/iosremote/iosremote/Timer.m @@ -0,0 +1,13 @@ +// +// Timer.m +// iosremote +// +// Created by Siqi Liu on 9/7/13. +// Copyright (c) 2013 libreoffice. All rights reserved. +// + +#import "Timer.h" + +@implementation Timer + +@end diff --git a/ios/iosremote/iosremote/TimerCountdownTimePicker.h b/ios/iosremote/iosremote/TimerCountdownTimePicker.h new file mode 100644 index 000000000000..b9853c798464 --- /dev/null +++ b/ios/iosremote/iosremote/TimerCountdownTimePicker.h @@ -0,0 +1,13 @@ +// +// TimerCountdownTimePicker.h +// iosremote +// +// Created by Siqi Liu on 9/7/13. +// Copyright (c) 2013 libreoffice. All rights reserved. +// + +#import + +@interface TimerCountdownTimePicker : UIView + +@end diff --git a/ios/iosremote/iosremote/TimerCountdownTimePicker.m b/ios/iosremote/iosremote/TimerCountdownTimePicker.m new file mode 100644 index 000000000000..d35757959301 --- /dev/null +++ b/ios/iosremote/iosremote/TimerCountdownTimePicker.m @@ -0,0 +1,31 @@ +// +// TimerCountdownTimePicker.m +// iosremote +// +// Created by Siqi Liu on 9/7/13. +// Copyright (c) 2013 libreoffice. All rights reserved. +// + +#import "TimerCountdownTimePicker.h" + +@implementation TimerCountdownTimePicker + +- (id)initWithFrame:(CGRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code + } + return self; +} + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect +{ + // Drawing code +} +*/ + +@end diff --git a/ios/iosremote/iosremote/UIImageView+setImageAnimated.m b/ios/iosremote/iosremote/UIImageView+setImageAnimated.m index 47692f787970..ca163df48211 100644 --- a/ios/iosremote/iosremote/UIImageView+setImageAnimated.m +++ b/ios/iosremote/iosremote/UIImageView+setImageAnimated.m @@ -27,5 +27,4 @@ { [self setImage:image animated:animated Duration:0.5]; } - @end diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index 3dcb3a137054..dd2302514dfc 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -194,51 +194,109 @@ + - - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings index 35bb01a86844dfcc78b5b62c8d0a0bd3f5bfd876..8f60258ce29e280918e52c715620e784961d4d9c 100644 GIT binary patch delta 77 zcmeAYza_E3jM3Db!IhzuL6^asp$teGGL$e>GAJ=vGbk` + - - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -537,76 +595,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard index 3415ad743c4c..720e3ed866da 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard @@ -196,51 +196,109 @@ Contrôle Distant + - - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -539,76 +597,6 @@ Contrôle Distant - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard index 3415ad743c4c..720e3ed866da 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard @@ -196,51 +196,109 @@ Contrôle Distant + - - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -539,76 +597,6 @@ Contrôle Distant - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m index a4031c7587f0..bc405780288a 100644 --- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m +++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m @@ -15,22 +15,28 @@ #import "slideShowPreviewTable_vc.h" #import "ControlVariables.h" #import "stopWatch.h" +#import "UIImageView+setImageAnimated.h" +#import "UIView+Shadowing.h" #import +#import -@interface slideShowSwipeInList () +@interface slideShowSwipeInList () @property (nonatomic, strong) CommunicationManager *comManager; @property (nonatomic, strong) SlideShow *slideshow; +@property NSInteger currentPage; @end @implementation slideShowSwipeInList @synthesize comManager = _comManager; +@synthesize currentPage = _currentPage; @synthesize slideshow = _slideshow; dispatch_queue_t backgroundQueue; + - (void) viewDidLoad { [super viewDidLoad]; @@ -40,6 +46,8 @@ dispatch_queue_t backgroundQueue; self.slideshow.secondaryDelegate = self; self.clearsSelectionOnViewWillAppear = NO; + // set stopwatch as default, users may swipe for a timer + self.currentPage = 0; self.stopWatch = [[stopWatch alloc] init]; if ([[NSUserDefaults standardUserDefaults] boolForKey:KEY_TIMER]) { @@ -114,7 +122,16 @@ dispatch_queue_t backgroundQueue; NSString *sectionTitle; switch (section) { case 0: - sectionTitle = NSLocalizedString(@"Stop Watch", @"Sidebar section header"); + switch (self.currentPage) { + case 0: + sectionTitle = NSLocalizedString(@"Stop Watch", @"Sidebar section header"); + break; + case 1: + sectionTitle = NSLocalizedString(@"Timer", @"Sidebar section header"); + break; + default: + break; + } break; case 1: sectionTitle = NSLocalizedString(@"Slides", @"Sidebar section header"); @@ -132,8 +149,22 @@ dispatch_queue_t backgroundQueue; // Create header view and add label as a subview UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 23)]; view.backgroundColor = [UIColor colorWithRed:1.0 green:0.662745098 blue:0.074509804 alpha:0.9]; + [view addSubview:label]; + if (section == 0) + { + UIPageControl * pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(self.revealViewController.rearViewRevealWidth - 20, view.frame.origin.y + 3, 40, 20)]; + pageControl.numberOfPages = 2; + pageControl.currentPage = self.currentPage; + pageControl.currentPageIndicatorTintColor = [UIColor whiteColor]; + pageControl.pageIndicatorTintColor = [UIColor lightGrayColor]; + pageControl.tag = -100; + view.tag = -99; + label.tag = -98; + [view addSubview:pageControl]; + } + return view; } @@ -149,7 +180,20 @@ dispatch_queue_t backgroundQueue; UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier: CellIdentifier]; [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; - cell.contentView.backgroundColor = [UIColor whiteColor]; + UIView * view = [cell viewWithTag:8]; + [view.layer setCornerRadius:5.0f]; + view.layer.masksToBounds = YES; + view.clipsToBounds = YES; + [view setShadow]; + + view = [cell viewWithTag:9]; + [view.layer setCornerRadius:5.0f]; + view.layer.masksToBounds = YES; + view.clipsToBounds = YES; + [view setShadow]; + + UIScrollView * scroll = (UIScrollView *) [cell viewWithTag:7]; + scroll.contentSize = CGSizeMake(417,120); return cell; } else { static NSString *CellIdentifier = @"slide"; @@ -163,12 +207,9 @@ dispatch_queue_t backgroundQueue; [self.slideshow getContentAtIndex:indexPath.row forView:cell]; [slideNumber setText:[NSString stringWithFormat:@"%u", indexPath.row+1]]; - image.layer.shadowColor = [[UIColor blackColor] CGColor]; - image.layer.shadowOpacity = 0.5; - image.layer.shadowRadius = 4.0; - image.layer.shadowOffset = CGSizeMake(3.0f, 3.0f); - image.layer.shadowPath = [UIBezierPath bezierPathWithRect:image.bounds].CGPath; - image.clipsToBounds = NO; + [image setShadow]; + + cell.contentView.backgroundColor = [UIColor colorWithRed:.674509804-0.02 * indexPath.row green:.729411765-0.02 * indexPath.row blue:.760784314-0.02 * indexPath.row alpha:1.0]; return cell; } @@ -193,10 +234,42 @@ dispatch_queue_t backgroundQueue; [self.revealViewController revealToggle: self]; } - - (void)viewDidUnload { [self setStopWatch:nil]; [super viewDidUnload]; } +#pragma mark scrollview delegate + +- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView +{ + if (scrollView.tag == 7) { + CGFloat pageWidth = scrollView.frame.size.width; + float fractionalPage = scrollView.contentOffset.x / pageWidth; + NSInteger page = lround(fractionalPage); + if (self.currentPage != page) { + UIPageControl * pageControl = (UIPageControl *) ([[self.tableView viewWithTag:-99] viewWithTag:-100]); + UILabel * label = (UILabel *) ([[self.tableView viewWithTag:-99] viewWithTag:-98]); + + CATransition *animation = [CATransition animation]; + animation.duration = 0.5; + animation.type = kCATransitionMoveIn; + animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault]; + [label.layer addAnimation:animation forKey:@"changeTextTransition"]; + + switch (page) { + case 0: + [label setText:NSLocalizedString(@"Stop Watch", @"Sidebar section header")]; + break; + case 1: + [label setText:NSLocalizedString(@"Timer", @"Sidebar section header")]; + default: + break; + } + [pageControl setCurrentPage:page]; + self.currentPage = page; + } + } +} + @end diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m b/ios/iosremote/iosremote/slideShow_vc_iphone.m index ace2508a7e63..577b1171819f 100644 --- a/ios/iosremote/iosremote/slideShow_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m @@ -17,6 +17,8 @@ #import "slideShowPreviewTable_vc.h" #import "slideShowSwipeInList_iphone.h" #import +#import "UIImageView+setImageAnimated.h" +#import "UIView+Shadowing.h" #import @@ -368,19 +370,8 @@ usingBlock:^(NSNotification *note) { [self.navigationController popViewControllerAnimated:YES]; }]; - self.slideView.layer.shadowColor = [[UIColor blackColor] CGColor]; - self.slideView.layer.shadowOpacity = 0.5; - self.slideView.layer.shadowRadius = 4.0; - self.slideView.layer.shadowOffset = CGSizeMake(3.0f, 3.0f); - self.slideView.layer.shadowPath = [UIBezierPath bezierPathWithRect:self.slideView.bounds].CGPath; - self.slideView.clipsToBounds = NO; - - self.secondarySlideView.layer.shadowColor = [[UIColor blackColor] CGColor]; - self.secondarySlideView.layer.shadowOpacity = 0.5; - self.secondarySlideView.layer.shadowRadius = 4.0; - self.secondarySlideView.layer.shadowOffset = CGSizeMake(3.0f, 3.0f); - self.secondarySlideView.layer.shadowPath = [UIBezierPath bezierPathWithRect:self.secondarySlideView.bounds].CGPath; - self.secondarySlideView.clipsToBounds = NO; + [self.slideView setShadow]; + [self.secondarySlideView setShadow]; // We calibrate once when presentation starts. needs a users alert to inform users to point at the center of the screen at the beginning self.pointerCalibrationOn = YES; diff --git a/ios/iosremote/iosremote/timer_clear_btn.png b/ios/iosremote/iosremote/timer_clear_btn.png index 92d5e54bce641342023af33e252ced622b6c6ba0..bde789acf7309b1da0b737711c8bf83a3a69544f 100644 GIT binary patch delta 786 zcmV+t1MU2RAHf^2y$XKxPDCQw+gK?GrV+G?0UHB`SVRO95YCT)XYeZoK}cfeZ?h-MxO;nd z?&Vf94~CoFd2jChxS4rx=Eg{3DMv^7dPY>epywg78@S>Piu1`J7h8P{K`BB|nHt;JefvOTD`Na~kVP_jIh z)KiT=m6Tcn_eh#id*4oaZO}IF=S0Zd*WNHpaIQ`Xe__?cJ z!WKzKBA_p175J3n=#->foLz}Uuh;2kHmktzLQXD7>WBkNTID5;I?yN50?t)A^}B&N zU>;Zi+JH@=_DR43dxFo^z|%mVG7^l7z?0DPN#I`H7A=2Cw-RFMyz~4_(y|J_Bb=<{ z)B1(YU;MXJ09wn`Z3U)Eg}6WBr7;hIqru}hU~RoO4_#&I^~S*#hj&x~zK7JBvankk z1@0#3i~x74?0;pbK3CUF%W>+n<6Kx;fKS!zxPZ4ndr*HLs@HWt`~x^0({?Tj_IEri zExR4SH+6qaEhEaXvnr1y#qWezJm~ayCJU={ST;CGetR$s6IbMjA$@lyQK=Zj{TB;O1fdK z-EXa3Z>?>x);3vdw@ErKX(%FFvyyhE?Vm~W7EgafsObR49kp5D3(yFxi|J|(I0y`9 z;>4qZ_2Ct;y+XS&;24nq*UqH{oGl|8E6N0LK8V5jS~+DF<6@emc4JI8ur~-{tAb%W z4df*a8DkzT#zDOCH}O2M2ll`o*aLfD5A1uSrBfRCwCt+g)hYbsWd>*Uo17u(SzTLTP5r!k)C5N{L!| zQFIdq27y?h`GByD9?V;-(M3W*Y6Y5iMb=dXrD?b_AEuSr1Ey&MBL!(oMQvgizwdO& zblcgPp7Y-aemC1W|Nr-Weh=T@@B97!%4%zC^?(N89!$hI48eaDZCZJJ?lexdX@{^4 zo6&${g*L3Bz|WhE$1wo|aU6~K5r5#XfH)qX?;k(TP>jGZJb|atjPLLfzAh%e&?QP}bsDhmxf6uZL3)L@y*uVrCNO?ZK!g#sQCJ=u&~!#@^_ z8p5XL==qzv3w&KX^tbpWk0?GJ3EO_b58)c~0=^30-~fLnp+)hkC2ZV>Z^QO31Fwz6 zU~-YeYO_t9gg#+=mw;cwG&~gZqg2!!Hc!Li&H~?s*TTQPFQ{MsUW+7fItT7fHLhq6I-wILWQ zb8(0t5`HVI+7yg6xd_iRMc5>(+KPWLAs0uhJpr9nH3ef$4uhr8YSy(6gLCMMKYIc2 z0rYJJKHLj{52IgB3dT3}0^nwp=cMG;f4u|WpAtx1`Y{CN>2A&d(M_XfBAEG+CzB?-GfmVp&Tpf&O zgLr@SaYUS(!QP!Kl|9wB1%|ir7;elE?C@YZn`3GVyc&N?snV=yaV%D=+5s@~!?R&8*p6OCu^ZF73ULVKZ=@yfqsn#7mLP9 zHI`LU&E?*XzR=lf+Qxuxh*nz!u+N4q--m6Do%vE%>ZOn3k#JedVu83EJF?N?LEe7| zTOQVhdlmUq#Menl^eeGFd|ve>0IiO9ZAZVbp{}bB$@k8~j@XSYly0BY<6Wr`wa}Uz z&#sSmEsT|TM?MehZi?l-XtSd|D&?9tMBA$Cm#qd!@wKVZZjSl6B*42Dp(yapw5j3r zC&sGYB;{orrHfhzW4@gT-&q;M^BPX)E@};zf{I6^8)|D6u;8Z9Nwn6Ut&Cn8A9L-_ z@R5C_Y-L3p*-lBB%NFOZ;(Z{M8s&4zt3&-i074%dsnLF!d;kCd07*qoM6N<$g0^aB AB>(^b diff --git a/ios/iosremote/iosremote/timer_clear_btn@2x.png b/ios/iosremote/iosremote/timer_clear_btn@2x.png index eb41194fb16a381052bcf2ddd596c0b7fb7fe2d9..d7260d38ef61c3fed2647a697752b94a8984a819 100644 GIT binary patch delta 1714 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 JWt~$(697tuLT~^8 delta 1243 zcmV<11SI>!7Kb0Oy$XK>v`IukRCwCt+e>WJRTRhZPp8PUijatsD2QmmRHHx<5D`#V z;7&1NVM1^L@(78N7)7@}8W);qq9O}$;l_wAjGCwfg$nX0XcW{S2sXh8Nu{+Ap25XE z1C^B0PNy*Q?=QKV|NQ^=p6}fEJ?B;&{dA-r&>&2}6imc0^lg8WD&xJgIMpT{#&&E$ z1CABju!zIU@ZT`SUtigNHDy~`$FT%4Jf=}>4fEH6T@B|*iKX@&`3sSDY z?`os=-o)3@R~LWw0IbM!VRVx(@m7>wd!>M%i-G0e7?_q|ub$UlEXBAedwbZ@W59#( z8S1bC4`a70uRT%rim>H#R291q565?r@tl}4N{D}?=tYZ=(E#H z99ElU>NH#vws#5mdCbPF=pW^xmaus?R(2Nn9=sa!>rcv0KZotF;NH$mOPiw!Kd8L5 zF`D<3j%s*5#>a}L+_fZDW%DluT!9zyel&}6*KVv0ri%7}7vRR|zgbaTFfC{gcqu-{ zfeZm3h;4uCvWtPI#tLOskqSE3K`O@kUD3O^IT+6a&x`HXR@u|mV4If*u8I}P2HDky zV64i;7Hb$bWf*u5W|2*)KUI2Uq19Fo0p}7|Tx1cg7Ik!&t0^omB=$n&#Lw$MyaG!h)pOFsPv#x_58v|wz=Nxs!hcqqfbGlH=-f2Q>zs-x<&*qp0_@%$lP zeQbXb7iSQ7u@v@H-xe6&#-q43L$D)*>7D$8w!mxgx8y3#idM#8wWdAbb9h;DOVo6; zpo$JsG2ZWtYJ%k@Z4UG=KV@r5{+lTEr#FxdKyr_&}pNa}wcJUAG0q=^o zzY2GkA?#g}Kk0>F`G4Q(ATaH#_;|Dn;l6+6u;<+;`G#k;_d-WeJaYqdeHqp6`q=Ky zz0?aG0k=dy7!%8~$`S^x3>(KtZqepKfZ>o7!aoi>tyML!_rm0QQ-%<%h7Xu`?faC0@D}kHnPqMht%t zHCF+&MvB6JJ#3ky3->AtiHNV0oap_qBj&v7D*##@W$nO#u%WK2nG|~GVP~wymP@x! z>aki1L@ll88IrlN!YT diff --git a/ios/iosremote/iosremote/timer_pause_btn@2x.png b/ios/iosremote/iosremote/timer_pause_btn@2x.png index cdcc54375e29b450cd05173e764daaa2fc217fcc..f71fd9800e069cdccd4b7b76a0274fffbd60e7be 100644 GIT binary patch delta 262 zcmbPbvP*o!UaoqE=bkQ(Ar-gY+_}ifpupj9u;*L+O*f8Tr}mgPxU}zgOXK@{`wMFW zYXlTAa&KUOAZD=yMi@H4qyt3=mDbz4_I!RO5@2I;pADqL0GskUCLWl{tP(Jjk(DyC z!Axelvqg*j;Nl-O(qIvUMF=M$YlJyzO|mot!~g%x47#SQpD!G8{=onQp00i_>zopr E0Ciqe(f|Me delta 3971 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 diff --git a/ios/iosremote/iosremote/timer_resume_btn.png b/ios/iosremote/iosremote/timer_settime_btn.png similarity index 63% rename from ios/iosremote/iosremote/timer_resume_btn.png rename to ios/iosremote/iosremote/timer_settime_btn.png index 1ff1681093d33bbf1db9c6da6923ed26e86c7d3c..5db2f3226de731a16318bd7de80ee709d8bf4a37 100644 GIT binary patch delta 1181 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 diff --git a/ios/iosremote/iosremote/timer_settime_btn@2x.png b/ios/iosremote/iosremote/timer_settime_btn@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9fcbd62f802b1e71e2d02adb58bba3c44d68acf2 GIT binary patch literal 5148 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 literal 0 HcmV?d00001 diff --git a/ios/iosremote/iosremote/timer_start_btn.png b/ios/iosremote/iosremote/timer_start_btn.png index 0ba1051da474ec38625b348a4608f275b75ea640..0beff7bf31d305379842b159a3a5252d3a796e0f 100644 GIT binary patch delta 401 zcmcbna9Co)Uaoq^0#6smkcwMxZW(&ZIEpYlc<-XUQJ}NeY+}Mg`w#3A0@2dBM}xej z4YST2^HOS2h~QY%dn2+VBi%uFt%+j70i|29)7{P=()`0%zWw>RY6G9`hmY@>`MvC> z*WS44!6hejm}DL>uv;8pZ(5Tgh}pbJ%iZg7uwc4rakMAI4l}gWOdj% z;+T2OiIAlPsF7p=M^*~2@hEUnXdptH2bth7Sl`VIfxu_qUPd~r-9Z{yVH z<)+=tHRo1topVIc&tRgr{@qr?H;>rjr9WOcSAOCB_hp8&xPS0XUs*F%D(3KabIrA9 z9)!MGayK_)i}Vl0`mM92&qghXJ+MD$dFat%V{t91Kh~vT)jzIxv39fkKWg!B%Fo=F znoHlCxJC8qCbd8Ru=s@Wm79ysSROOu>)t0joAsUNXVz&2egEGE@Xcbi`~K@}mhkeo qAuqH)zD`8)FpT-Me>x+B-Al_ow|?48XJBC9WbkzLb6Mw<&;$UDt-dD! delta 1452 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 gpB=;}< + - - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -537,76 +595,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard index 376532df6ec3..3f906d03eb31 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard @@ -194,51 +194,109 @@ + - - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -537,76 +595,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -