kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[ios] Don't store a reference to ArticleVC in SearchVC.

Browse source
This commit is contained in:
Yury Melnichek 2011-04-06 20:58:02 +02:00 • committed by Alex Zolotarev
parent 740ef15c6c
commit 0088ad1f3f
4 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Classes/GuideViewController.mm
View file

@ -60,10 +60,10 @@
// Do nothing. Don't hide the results view.
}
- (void)willShowArticle
- (void)willShowArticleVC:(ArticleVC *) articleVC
{
[super willShowArticle];
self.articleVC.articleFormat = @
[super willShowArticleVC:articleVC];
articleVC.articleFormat = @
"<html>"
" <head>"
" <meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>"

3
iphone/Sloynik/Shared/ArticleVC.mm
View file

@ -26,10 +26,11 @@
[super dealloc];
}
- (void)init
- (id)init
{
[super init];
self.articleFormat = @"<html><body style='-webkit-text-size-adjust:%d%%'>%@</body></html>";
return self;
}
- (void)loadWebView

5
iphone/Sloynik/Shared/SearchVC.h
View file

@ -10,15 +10,12 @@ typedef struct SloynikData SloynikData;
SloynikData * m_pSloynikData;
UISearchBar * searchBar;
UITableView * resultsView;
ArticleVC * articleVC;
}
@property (nonatomic, retain) IBOutlet UISearchBar * searchBar;
@property (nonatomic, retain) IBOutlet UITableView * resultsView;
@property (nonatomic, retain) ArticleVC * articleVC;
- (void)willShowArticle;
- (void)showArticle;
- (void)willShowArticleVC:(ArticleVC *) articleVC;
- (void)onEmptySearch;
@end

40
iphone/Sloynik/Shared/SearchVC.mm
View file

@ -24,14 +24,12 @@ struct SloynikData
@synthesize searchBar;
@synthesize resultsView;
@synthesize articleVC;
- (void)dealloc
{
delete m_pSloynikData;
[searchBar release];
[resultsView release];
[articleVC release];
[super dealloc];
}
@ -66,7 +64,6 @@ struct SloynikData
// e.g. self.myOutlet = nil;
self.searchBar = nil;
self.resultsView = nil;
self.articleVC = nil;
}
- (void)searchBar:(UISearchBar *)sender textDidChange:(NSString *)searchText
@ -148,31 +145,26 @@ struct SloynikData
sl::SloynikEngine::WordId const wordId = indexPath.row;
if (wordId < GetSloynikEngine()->WordCount())
{
[self willShowArticle];
[self.articleVC setArticleById:wordId];
[self showArticle];
ArticleVC * articleVC = [[[ArticleVC alloc] init] autorelease];
[articleVC setArticleById:wordId];
[self willShowArticleVC:articleVC];
[self.resultsView deselectRowAtIndexPath:[self.resultsView indexPathForSelectedRow] animated:NO];
CATransition * animation = [CATransition animation];
animation.duration = 0.2;
animation.type = kCATransitionPush;
animation.subtype = kCATransitionFromRight;
animation.timingFunction =
[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
[[self.view.superview layer] addAnimation:animation forKey:@"SwitchToArticleView"];
[self presentModalViewController:articleVC animated:NO];
}
}
- (void)willShowArticle
- (void)willShowArticleVC:(ArticleVC *) articleVC
{
if (!self.articleVC)
self.articleVC = [[[ArticleVC alloc] init] autorelease];
}
- (void)showArticle
{
[self.resultsView deselectRowAtIndexPath:[self.resultsView indexPathForSelectedRow] animated:NO];
CATransition * animation = [CATransition animation];
animation.duration = 0.2;
animation.type = kCATransitionPush;
animation.subtype = kCATransitionFromRight;
animation.timingFunction =
[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
[[self.view.superview layer] addAnimation:animation forKey:@"SwitchToArticleView"];
[self presentModalViewController:self.articleVC animated:NO];
}
- (void)onEmptySearch