Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Grechuhin <i.grechuhin@mapswithme.com>2015-07-27 14:30:40 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:57:42 +0300
commit3aed797094458e649e769c482fccbec63424d8d2 (patch)
treea4d979a296f56ea0c538e8b4215a470d4cf0296e /iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
parentac13b9b9ef6dd83258a595f5ec442a2aa6638ea0 (diff)
[ios] Fixed PP description display.
Diffstat (limited to 'iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm')
-rw-r--r--iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm13
1 files changed, 6 insertions, 7 deletions
diff --git a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
index 4d6e2c5b81..5a34d9b097 100644
--- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
+++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
@@ -14,7 +14,6 @@
#import "UIViewController+Navigation.h"
static NSString * const kBookmarkDescriptionViewControllerNibName = @"MWMBookmarkDescriptionViewController";
-static CGFloat const kIpadPlacePageDefaultHeight = 288.;
typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
{
@@ -83,10 +82,6 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
return;
[self.iPadOwnerNavigationController setNavigationBarHidden:NO];
- CGFloat const bottomOffset = 12.;
- self.iPadOwnerNavigationController.view.height = kIpadPlacePageDefaultHeight;
- self.textView.height = kIpadPlacePageDefaultHeight - bottomOffset;
- self.webView.height = kIpadPlacePageDefaultHeight - bottomOffset;
}
- (void)setState:(BookmarkDescriptionState)state
@@ -109,6 +104,8 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
- (void)setupForEditingWithText:(NSString *)text
{
+ self.textView.hidden = NO;
+ self.textView.text = text;
[UIView animateWithDuration:0.2f animations:^
{
self.webView.alpha = 0.;
@@ -116,13 +113,15 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
}
completion:^(BOOL finished)
{
- self.textView.text = text;
+ self.webView.hidden = YES;
}];
[self configureNavigationBarForEditing];
}
- (void)setupForViewWithText:(NSString *)text
{
+ self.webView.hidden = NO;
+ [self.webView loadHTMLString:text baseURL:nil];
[UIView animateWithDuration:0.2f animations:^
{
self.webView.alpha = 1.;
@@ -130,7 +129,7 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
}
completion:^(BOOL finished)
{
- [self.webView loadHTMLString:text baseURL:nil];
+ self.textView.hidden = YES;
}];
[self configureNavigationBarForView];
}