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

[ios][iphone] Fixed white gap bug in web articles

Browse source
This commit is contained in:
Alex Zolotarev 2011-04-07 16:24:17 +02:00 • committed by Alex Zolotarev
parent e778cdd3cc
commit a74f919056
5 changed files with 27 additions and 8 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)willShowArticleVC:(ArticleVC *) articleVC
- (void)willShowArticleVC:(ArticleVC *) viewController
{
[super willShowArticleVC:articleVC];
articleVC.articleFormat = @
[super willShowArticleVC:viewController];
viewController.articleFormat = @
"<html>"
" <head>"
" <meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>"

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

@ -13,6 +13,8 @@
unsigned int m_articleId;
double m_fontScale;
double m_fontScaleOnPinchStart;
/// used for transition
UIView * previousView;
}
@property (nonatomic, retain) UIWebView * webView;
@ -21,8 +23,9 @@
@property (nonatomic, retain) UINavigationItem * navArticle;
@property (nonatomic, retain) UIPinchGestureRecognizer * pinchGestureRecognizer;
@property (nonatomic, retain) NSString * articleFormat;
@property (nonatomic, assign) UIView * previousView;
- (id)initWithNibName:(NSString *)nibName bundle:(NSBundle *)nibBundle;
- (id)initWithPreviousView:(UIView *)previousView;
- (void)setArticleById:(unsigned int)articleId;
@end

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

@ -14,6 +14,7 @@
@synthesize navArticle;
@synthesize pinchGestureRecognizer;
@synthesize articleFormat;
@synthesize previousView;
- (void)dealloc
{
@ -26,11 +27,12 @@
[super dealloc];
}
- (id)initWithNibName:(NSString *)nibName bundle:(NSBundle *)nibBundle
- (id)initWithPreviousView:(UIView *)prevView
{
if ((self = [super initWithNibName:nil bundle:nil]))
{
self.articleFormat = @"<html><body style='-webkit-text-size-adjust:%d%%'>%@</body></html>";
self.previousView = prevView;
}
return self;
}
@ -137,7 +139,11 @@
animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
[[superView layer] addAnimation:animation forKey:@"SwitchToSearchView"];
[self dismissModalViewControllerAnimated:NO];
[UIView transitionFromView:self.view
toView:self.previousView
duration:0
options:UIViewAnimationOptionTransitionNone
completion:nil];
return NO;
}

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

@ -10,10 +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)willShowArticleVC:(ArticleVC *) articleVC;
- (void)onEmptySearch;

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

@ -24,12 +24,14 @@ struct SloynikData
@synthesize searchBar;
@synthesize resultsView;
@synthesize articleVC;
- (void)dealloc
{
delete m_pSloynikData;
[searchBar release];
[resultsView release];
[articleVC release];
[super dealloc];
}
@ -47,6 +49,8 @@ struct SloynikData
m_pSloynikData = new SloynikData;
GetSloynikEngine()->Search("", m_pSloynikData->m_SearchResult);
self.articleVC = [[ArticleVC alloc] initWithPreviousView:self.view];
[self onEmptySearch];
}
@ -64,6 +68,7 @@ struct SloynikData
// e.g. self.myOutlet = nil;
self.searchBar = nil;
self.resultsView = nil;
self.articleVC = nil;
}
- (void)searchBar:(UISearchBar *)sender textDidChange:(NSString *)searchText
@ -145,7 +150,6 @@ struct SloynikData
sl::SloynikEngine::WordId const wordId = indexPath.row;
if (wordId < GetSloynikEngine()->WordCount())
{
ArticleVC * articleVC = [[[ArticleVC alloc] initWithNibName:nil bundle:nil] autorelease];
[self willShowArticleVC:articleVC];
[articleVC setArticleById:wordId];
@ -166,7 +170,11 @@ struct SloynikData
animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
[[self.view.superview layer] addAnimation:animation forKey:@"SwitchToArticleView"];
[self presentModalViewController:articleVC animated:NO];
[UIView transitionFromView:self.view
toView:articleVC.view
duration:0
options:UIViewAnimationOptionTransitionNone
completion:nil];
}
}