witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Fix animation stuff

Browse source
This commit is contained in:
Yann Diorcet 2012-07-18 09:40:38 +02:00
parent cd3a646f0b
commit dbd4f01401
7 changed files with 59 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Classes/ContactDetailsViewController.m
View file

@ -209,7 +209,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[tableController viewWillDisappear:NO];
[tableController viewWillDisappear:animated];
}
[self disableEdit:FALSE];
self->contact = NULL;
@ -219,21 +219,21 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[tableController viewWillAppear:NO];
[tableController viewWillAppear:animated];
}
}
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[tableController viewDidAppear:NO];
[tableController viewDidAppear:animated];
}
}
- (void)viewDidDisappear:(BOOL)animated {
[super viewDidDisappear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[tableController viewDidDisappear:NO];
[tableController viewDidDisappear:animated];
}
}

8
Classes/ContactsViewController.m
View file

@ -74,14 +74,14 @@ typedef enum _HistoryView {
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[tableController viewWillDisappear:NO];
[tableController viewWillDisappear:animated];
}
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[tableController viewWillAppear:NO];
[tableController viewWillAppear:animated];
}
[self changeView:History_All];
@ -90,14 +90,14 @@ typedef enum _HistoryView {
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[tableController viewDidAppear:NO];
[tableController viewDidAppear:animated];
}
}
- (void)viewDidDisappear:(BOOL)animated {
[super viewDidDisappear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[tableController viewDidDisappear:NO];
[tableController viewDidDisappear:animated];
}
}

8
Classes/InCallViewController.m
View file

@ -113,7 +113,7 @@ const NSInteger SECURE_BUTTON_TAG=5;
hideControlsTimer = nil;
}
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[callTableController viewWillDisappear:NO];
[callTableController viewWillDisappear:animated];
}
@ -126,7 +126,7 @@ const NSInteger SECURE_BUTTON_TAG=5;
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[callTableController viewWillAppear:NO];
[callTableController viewWillAppear:animated];
}
// Set observer
@ -141,7 +141,7 @@ const NSInteger SECURE_BUTTON_TAG=5;
[self callUpdate:call state:state];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[callTableController viewDidAppear:NO];
[callTableController viewDidAppear:animated];
}
}
@ -153,7 +153,7 @@ const NSInteger SECURE_BUTTON_TAG=5;
device.proximityMonitoringEnabled = NO;
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[callTableController viewDidDisappear:NO];
[callTableController viewDidDisappear:animated];
}
}

27
Classes/LinphoneUI/UIMainBar.m
View file

@ -73,10 +73,6 @@
selector:@selector(textReceived:)
name:@"LinphoneTextReceived"
object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(applicationWillResignActive:)
name:UIApplicationWillResignActiveNotification
object:nil];
[self update];
}
@ -92,18 +88,33 @@
[[NSNotificationCenter defaultCenter] removeObserver:self
name:@"LinphoneTextReceived"
object:nil];
}
- (void)viewDidLoad {
[super viewDidLoad];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(applicationWillEnterForeground:)
name:UIApplicationWillEnterForegroundNotification
object:nil];
}
- (void)viewDidUnload {
[super viewDidUnload];
[[NSNotificationCenter defaultCenter] removeObserver:self
name:UIApplicationWillResignActiveNotification
name:UIApplicationWillEnterForegroundNotification
object:nil];
}
#pragma mark - Event Functions
- (void)applicationWillResignActive:(NSNotification*)notif {
// Refresh notifications
[historyNotificationView setHidden:TRUE];
- (void)applicationWillEnterForeground:(NSNotification*)notif {
// Force the animations
[[self.view layer] removeAllAnimations];
[chatNotificationView setHidden:TRUE];
[historyNotificationView setHidden:TRUE];
[self update];
}

14
Classes/LinphoneUI/UIModalViewController.m
View file

@ -49,11 +49,24 @@
return self;
}
- (void)hideView {
if([self.view superview] !=nil) {
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[self viewWillDisappear:NO];
}
[self.view removeFromSuperview];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[self viewDidDisappear:NO];
}
}
}
- (void)dismiss:(id)value {
if(modalDelegate != nil)
[modalDelegate modalViewDismiss:self value:value];
if(!dismissed) {
[self hideView];
dismissed = true;
[self autorelease];
}
@ -64,6 +77,7 @@
[modalDelegate modalViewDismiss:self value:nil];
if(!dismissed) {
[self hideView];
dismissed = true;
[self autorelease];
}

14
Classes/PhoneMainView.m
View file

@ -112,7 +112,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
[super viewWillAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[mainViewController viewWillAppear:NO];
[mainViewController viewWillAppear:animated];
}
// Set observers
@ -138,7 +138,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
[super viewWillDisappear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[mainViewController viewWillDisappear:NO];
[mainViewController viewWillDisappear:animated];
}
// Remove observers
@ -159,14 +159,14 @@ static PhoneMainView* phoneMainViewInstance=nil;
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[mainViewController viewDidAppear:NO];
[mainViewController viewDidAppear:animated];
}
}
- (void)viewDidDisappear:(BOOL)animated {
[super viewDidDisappear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[mainViewController viewDidDisappear:NO];
[mainViewController viewDidDisappear:animated];
}
}
@ -523,7 +523,13 @@ static PhoneMainView* phoneMainViewInstance=nil;
[controller setWantsFullScreenLayout:TRUE];
[controller setCall:call];
[controller setModalDelegate:self];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[controller viewWillAppear:NO];
}
[[self view] addModalView:[controller view]];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[controller viewDidAppear:NO];
}
}
}

8
Classes/SettingsViewController.m
View file

@ -76,28 +76,28 @@
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[settingsController viewWillDisappear:NO];
[settingsController viewWillDisappear:animated];
}
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[settingsController viewWillAppear:NO];
[settingsController viewWillAppear:animated];
}
}
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[settingsController viewDidAppear:NO];
[settingsController viewDidAppear:animated];
}
}
- (void)viewDidDisappear:(BOOL)animated {
[super viewDidDisappear:animated];
if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
[settingsController viewDidDisappear:NO];
[settingsController viewDidDisappear:animated];
}
}