commit 1a412370ab03af8f3865ccbfaaa8dcff1d0ac0ad
author Siqi LIU <me@siqi.fr> Mon Sep 09 15:06:01 2013 +0200
committer Siqi LIU <me@siqi.fr> Fri Sep 13 08:10:01 2013 +0200
tree a7bd44e83bc3d241af65570307d3c925a0a0ed14
parent 24f277a4ad53a8655902d5fb3aab05643d90f57e

auto scroll to default time widget fix

Change-Id: Ib71adb544c02b764fe85b2fd32fda2097efc41d0

ios/iosremote/iosremote/AppDelegate.h

diff --git a/ios/iosremote/iosremote/AppDelegate.h b/ios/iosremote/iosremote/AppDelegate.h
index ff1dd19..fe5d6e6 100644
--- a/ios/iosremote/iosremote/AppDelegate.h
+++ b/ios/iosremote/iosremote/AppDelegate.h
@@ -16,4 +16,6 @@

@property (strong, nonatomic) UIWindow *window;

- (void) reconfigure;

@end

ios/iosremote/iosremote/AppDelegate.m

diff --git a/ios/iosremote/iosremote/AppDelegate.m b/ios/iosremote/iosremote/AppDelegate.m
index 6eeb124..2b8f5ea 100644
--- a/ios/iosremote/iosremote/AppDelegate.m
+++ b/ios/iosremote/iosremote/AppDelegate.m
@@ -68,6 +68,8 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
    kStopwatchAutoStart = [[NSUserDefaults standardUserDefaults] boolForKey:@"STOPWATCH_AUTO_START"];
    kCountDownTimerAutoStart = [[NSUserDefaults standardUserDefaults] boolForKey:@"TIMER_AUTO_START"];
    kCountDownTimerVibration = [[NSUserDefaults standardUserDefaults] boolForKey:@"TIMER_VIBRATION"];
    
    NSLog(@"Setting kDefaultTimerWidget to %d", kDefaultTimerWidget);
}

- (void)applicationWillResignActive:(UIApplication *)application

ios/iosremote/iosremote/BasePresentationViewController.m

diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m b/ios/iosremote/iosremote/BasePresentationViewController.m
index d4ad6bd..8d53e09 100644
--- a/ios/iosremote/iosremote/BasePresentationViewController.m
+++ b/ios/iosremote/iosremote/BasePresentationViewController.m
@@ -322,12 +322,6 @@
    [self.timerView setShadowLight];
    self.timer.delegate = self;
    self.stopWatchTimerScrollView.contentSize = CGSizeMake(1240, 62);
    

    CGRect frame = self.stopWatchTimerScrollView.frame;
    frame.origin.x = frame.size.width * kDefaultTimerWidget;
    frame.origin.y = 0;
    [self.stopWatchTimerScrollView scrollRectToVisible:frame animated:YES];
}

- (void)viewDidAppear:(BOOL)animated
@@ -412,6 +406,12 @@
                [self.stopWatch start];
            if (kCountDownTimerAutoStart)
                [self.timer start];
            CGRect frame = self.stopWatchTimerScrollView.frame;
            frame.origin.x = frame.size.width * kDefaultTimerWidget;
            frame.origin.y = 0;
            [self.stopWatchTimerScrollView scrollRectToVisible:frame animated:YES];
            [self.timer setSecondsLeft:kCountDownTimerDefaultDuration * 60];
            
        }];
        self.slideshow.delegate = self;
    }

ios/iosremote/iosremote/slideShowPreviewTable_vc.m

diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m
index 87ba962..388cf0a 100644
--- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m
+++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m
@@ -11,9 +11,10 @@
#import "CommandTransmitter.h"
#import "CommandInterpreter.h"
#import "SlideShow.h"
#import "AppDelegate.h"
#import "IASKAppSettingsViewController.h"

@interface slideShowPreviewTable_vc ()
@interface slideShowPreviewTable_vc () <IASKSettingsDelegate>

@property (nonatomic, strong) IASKAppSettingsViewController *appSettingsViewController;

@@ -25,6 +26,12 @@
@synthesize titleObserver = _titleObserver;
@synthesize appSettingsViewController = _appSettingsViewController;

#pragma mark IASKSettingsDelegate
- (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController*)sender
{
    [(AppDelegate *)[[UIApplication sharedApplication] delegate] reconfigure];
}

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
{
    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)

ios/iosremote/iosremote/slideShowSwipeInList_iphone.m

diff --git a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
index 984d2cf..f3d0637 100644
--- a/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
+++ b/ios/iosremote/iosremote/slideShowSwipeInList_iphone.m
@@ -216,7 +216,7 @@ dispatch_queue_t backgroundQueue;
        scroll.contentSize = CGSizeMake(412, 120);
        
        CGRect frame = scroll.frame;
        frame.origin.x = frame.size.width * kDefaultTimerWidget;
        frame.origin.x = frame.size.width * self.currentPage;
        frame.origin.y = 0;
        [scroll scrollRectToVisible:frame animated:YES];