pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Deleted lite version handler in SearchVC and BookmarksRootVC

Browse source
This commit is contained in:
Igor Khmurets 2013-12-03 18:41:00 +03:00 • committed by Alex Zolotarev
parent 8772034938
commit a9cd26964f
2 changed files with 9 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
iphone/Maps/Bookmarks/BookmarksRootVC.mm
View file

@ -211,21 +211,6 @@
}
}
//// Banner dialog handler
//- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex
//{
// if (buttonIndex != alertView.cancelButtonIndex)
// {
// // Launch appstore
// [APP openURL:[NSURL URLWithString:MAPSWITHME_PREMIUM_APPSTORE_URL]];
// [[Statistics instance] logProposalReason:@"Bookmark Screen" withAnswer:@"YES"];
// }
// else
// [[Statistics instance] logProposalReason:@"Bookmark Screen" withAnswer:@"NO"];
// // Close view
// [self.navigationController popToRootViewControllerAnimated:YES];
//}
- (void)viewDidLoad
{
[super viewDidLoad];
@ -236,30 +221,14 @@
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
// Disable bookmarks for free version
// if (!GetPlatform().HasBookmarks())
// {
// // Display banner for paid version
// UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"bookmarks_in_pro_version", nil)
// message:nil
// delegate:self
// cancelButtonTitle:NSLocalizedString(@"cancel", nil)
// otherButtonTitles:NSLocalizedString(@"get_it_now", nil), nil];
//
// [alert show];
// [alert release];
// }
// else
// {
// Display Edit button only if table is not empty
if (GetFramework().GetBmCategoriesCount())
self.navigationItem.rightBarButtonItem = self.editButtonItem;
else
self.navigationItem.rightBarButtonItem = nil;
// Display Edit button only if table is not empty
if (GetFramework().GetBmCategoriesCount())
self.navigationItem.rightBarButtonItem = self.editButtonItem;
else
self.navigationItem.rightBarButtonItem = nil;
// Always reload table - we can open it after deleting bookmarks in any category
[self.tableView reloadData];
// }
// Always reload table - we can open it after deleting bookmarks in any category
[self.tableView reloadData];
}
// Used to remove active UITextField from the cell

36
iphone/Maps/Classes/SearchVC.mm
View file

@ -247,43 +247,12 @@ static void OnSearchResultCallback(search::Results const & res)
self.navigationItem.titleView = self.searchBar;
}
//// Banner dialog handler
//- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex
//{
// if (buttonIndex != alertView.cancelButtonIndex)
// {
// // Launch appstore
// [APP openURL:[NSURL URLWithString:MAPSWITHME_PREMIUM_APPSTORE_URL]];
// [[Statistics instance] logProposalReason:@"Search Screen" withAnswer:@"YES"];
// }
// else
// [[Statistics instance] logProposalReason:@"Search Screen" withAnswer:@"NO"];
//
// // Close view
// [self.navigationController popToRootViewControllerAnimated:YES];
//}
- (void)viewWillAppear:(BOOL)animated
{
// // Disable search for free version
// if (!GetPlatform().IsPro())
// {
// // Display banner for paid version
// UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"search_available_in_pro_version", nil)
// message:nil
// delegate:self
// cancelButtonTitle:NSLocalizedString(@"cancel", nil)
// otherButtonTitles:NSLocalizedString(@"get_it_now", nil), nil];
//
// [alert show];
// }
// else
// {
[m_locationManager start:self];
// show keyboard
// }
[super viewWillAppear:animated];
[m_locationManager start:self];
[self performAfterDelay:0 block:^{
[self resizeNavigationBar];
}];
@ -311,7 +280,6 @@ static void OnSearchResultCallback(search::Results const & res)
[self.searchBar becomeFirstResponder];
}
- (void)viewWillDisappear:(BOOL)animated
{
[m_locationManager stop:self];