organicmaps/travelguide
Archived
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

[iOS] counting number of pages

Browse source
This commit is contained in:
Kirill Zhdanovich 2013-08-09 10:26:28 +03:00
parent 44b64ae5df
commit 82a267f56e
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iOS/offlineguides/GuideVC.h
View file

@ -3,7 +3,6 @@
@interface GuideVC : UIViewController <UIWebViewDelegate, UIGestureRecognizerDelegate>
-(void)loadPage:(NSString *)pageUrl;
@property (nonatomic, strong) NSMutableArray * webPages;
-(void)clearPreviosViews;

18
iOS/offlineguides/GuideVC.mm
View file

@ -10,6 +10,7 @@
{
float m_webViewScale;
float m_webViewScaleOnStart;
size_t m_numberOfPages;
}
@property (nonatomic, strong) UIWebView * webView;
@ -33,7 +34,7 @@
self.view = self.webView;
m_webViewScale = 1.0;
m_webViewScaleOnStart = 0.0;
_webPages = [[NSMutableArray alloc] initWithObjects:nil];
m_numberOfPages = 0;
}
return self;
}
@ -65,7 +66,7 @@
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
self.navigationItem.rightBarButtonItem = [self getCustomButtonWithImage:@"ic_articleselection"];
if ([self.webPages count])
if (m_numberOfPages)
self.navigationItem.leftBarButtonItem = [self getCustomButtonWithImage:@"ic_back"];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
self.navigationItem.leftBarButtonItem = [self getCustomButtonWithImage:@"ic_back"];
@ -80,12 +81,12 @@
{
NSString * str = [self normalizeUrl:[[request URL] absoluteString]];
[self updateTitle:str];
[self.webPages addObject:str];
++m_numberOfPages;
if ([self isImage:str])
self.webView.scalesPageToFit = YES;
else
self.webView.scalesPageToFit = NO;
if ([self.webPages count] > 1 && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
if (m_numberOfPages > 1 && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
self.navigationItem.leftBarButtonItem = [self getCustomButtonWithImage:@"ic_back"];
return YES;
}
@ -119,8 +120,8 @@ shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherG
-(void)back
{
[self.webPages removeLastObject];
if ([self.webPages count] == 0)
--m_numberOfPages;
if (m_numberOfPages == 0)
{
[self.navigationController popToRootViewControllerAnimated:YES];
return;
@ -130,10 +131,9 @@ shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherG
[self.webView goBack];
[self updateTitle:[self normalizeUrl:[[self.webView.request URL] absoluteString]]];
}
if ([self.webPages count] == 1 && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
if (m_numberOfPages == 1 && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
self.navigationItem.leftBarButtonItem = nil;
[self.webPages removeLastObject];
--m_numberOfPages;
}
-(UIBarButtonItem *)getCustomButtonWithImage:(NSString *)name

1
iOS/offlineguides/IPadSplitVC.m
View file

@ -41,7 +41,6 @@
UINavigationController * navVC = (UINavigationController*)[self.viewControllers objectAtIndex:1];
GuideVC * g = (GuideVC *)navVC.visibleViewController;
g.navigationItem.leftBarButtonItem = nil;
g.webPages = [NSMutableArray arrayWithArray:@[]];
[g loadPage:url];
[self.pop dismissPopoverAnimated:YES];
}