1 files changed, 114 insertions, 29 deletions

diff --git a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
index bfce691780..6e7024c82f 100644
--- a/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
+++ b/iphone/Maps/Classes/MWMPlacePageBookmarkCell.mm
@@ -1,40 +1,95 @@
+#import "MWMBasePlacePageView.h"
+#import "MWMPlacePage.h"
 #import "MWMPlacePageBookmarkCell.h"
 #import "MWMPlacePageEntity.h"
-#import "MWMPlacePage.h"
 #import "MWMPlacePageViewManager.h"
-#import "MWMBasePlacePageView.h"
 #import "MWMTextView.h"
 
-extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @"WebViewDidFifishLoadContent";
+extern CGFloat const kBookmarkCellHeight = 136.0;
+
+static CGFloat const kSeparatorAndTitleHeight = 52.0;
+
+static NSUInteger sWebViewHeight = 0;
 
 @interface MWMPlacePageBookmarkCell () <UITextFieldDelegate, UIWebViewDelegate>
 
-@property (weak, nonatomic, readwrite) IBOutlet UITextField * title;
-@property (weak, nonatomic, readwrite) IBOutlet UIButton * categoryButton;
-@property (weak, nonatomic, readwrite) IBOutlet UIButton * markButton;
-@property (weak, nonatomic, readwrite) IBOutlet UILabel * descriptionLabel;
-@property (weak, nonatomic) IBOutlet UIImageView * icon;
+@property (weak, nonatomic) IBOutlet UITextField * title;
+@property (weak, nonatomic) IBOutlet UIButton * categoryButton;
+@property (weak, nonatomic) IBOutlet UIButton * markButton;
+
+@property (weak, nonatomic) IBOutlet UIView * note;
+@property (weak, nonatomic) IBOutlet UILabel * noteLabel;
+@property (weak, nonatomic) IBOutlet UIWebView * noteWebView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint * noteViewHeight;
+
+@property (weak, nonatomic) MWMPlacePage * placePage;
 
-@property (weak, nonatomic) IBOutlet UIView * firstSeparatorView;
-@property (weak, nonatomic) IBOutlet UIView * secondSeparatorView;
+@property (nonatomic) BOOL forHeight;
+
+@property (nonatomic) NSString * webViewContent;
 
 @end
 
 @implementation MWMPlacePageBookmarkCell
 
-- (void)configure
+- (void)config:(MWMPlacePage *)placePage forHeight:(BOOL)forHeight
 {
-  MWMPlacePageEntity const * entity = self.placePage.manager.entity;
-  self.title.text = entity.bookmarkTitle;
-  [self.categoryButton setTitle:[NSString stringWithFormat:@"%@ >", entity.bookmarkCategory] forState:UIControlStateNormal];
-  [self.markButton setImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@-on", entity.bookmarkColor]] forState:UIControlStateNormal];
+  self.placePage = placePage;
+  self.forHeight = forHeight;
+
+  [self configNote];
+
+  if (forHeight && self.entity.isHTMLDescription)
+    return;
+
+  self.title.text = self.entity.bookmarkTitle;
+  [self.categoryButton setTitle:[NSString stringWithFormat:@"%@ >", self.entity.bookmarkCategory]
+                       forState:UIControlStateNormal];
+  [self.markButton
+   setImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@-on", self.entity.bookmarkColor]]
+   forState:UIControlStateNormal];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(keyboardWillShown:)
-                                               name:UIKeyboardWillShowNotification object:nil];
+                                               name:UIKeyboardWillShowNotification
+                                             object:nil];
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(keyboardWillBeHidden)
-                                               name:UIKeyboardWillHideNotification object:nil];
+                                               name:UIKeyboardWillHideNotification
+                                             object:nil];
+}
+
+- (void)configNote
+{
+  if (self.entity.bookmarkDescription.length == 0)
+  {
+    self.note.hidden = YES;
+    self.noteViewHeight.constant = 0.0;
+  }
+  else
+  {
+    self.note.hidden = NO;
+    if (self.entity.isHTMLDescription)
+    {
+      self.noteWebView.hidden = NO;
+      self.noteLabel.hidden = YES;
+      if (!self.forHeight && ![self.webViewContent isEqualToString:self.entity.bookmarkDescription])
+      {
+        sWebViewHeight = 0.0;
+        self.webViewContent = self.entity.bookmarkDescription;
+        [self.noteWebView loadHTMLString:self.entity.bookmarkDescription baseURL:nil];
+        self.noteWebView.scrollView.scrollEnabled = NO;
+      }
+    }
+    else
+    {
+      self.noteWebView.hidden = YES;
+      self.noteLabel.hidden = NO;
+      self.noteLabel.text = self.entity.bookmarkDescription;
+      [self.noteLabel sizeToFit];
+      self.noteViewHeight.constant = kSeparatorAndTitleHeight + self.noteLabel.height;
+    }
+  }
 }
 
 - (void)keyboardWillShown:(NSNotification *)aNotification
@@ -48,24 +103,16 @@ extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @
 - (void)keyboardWillBeHidden
 {
   if ([self.title isEditing])
-    [self.placePage willFinishEditingBookmarkTitle:self.title.text.length > 0 ? self.title.text : self.placePage.manager.entity.title];
+    [self.placePage willFinishEditingBookmarkTitle:self.title.text.length > 0 ? self.title.text : self.entity.title];
 }
 
 - (void)textFieldDidEndEditing:(UITextField *)textField
 {
-  MWMPlacePageEntity * entity = self.placePage.manager.entity;
-  entity.bookmarkTitle = textField.text.length > 0 ? textField.text : self.placePage.manager.entity.title;
-  [entity synchronize];
+  self.entity.bookmarkTitle = textField.text.length > 0 ? textField.text : self.entity.title;
+  [self.entity synchronize];
   [textField resignFirstResponder];
 }
 
-- (void)layoutSubviews
-{
-  CGFloat const leftOffset = 16.;
-  CGFloat const topOffset = 15.;
-  self.icon.origin = CGPointMake(leftOffset, topOffset);
-}
-
 - (BOOL)textFieldShouldClear:(UITextField *)textField
 {
   return YES;
@@ -79,7 +126,8 @@ extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @
 
 - (void)dealloc
 {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  if (!self.forHeight)
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 - (IBAction)colorPickerButtonTap
@@ -100,4 +148,41 @@ extern NSString * const kBookmarkCellWebViewDidFinishLoadContetnNotification = @
   [self.title resignFirstResponder];
 }
 
+- (MWMPlacePageEntity *)entity
+{
+  return self.placePage.manager.entity;
+}
+
+- (CGFloat)cellHeight
+{
+  CGFloat const noteViewHeight = self.entity.isHTMLDescription ? sWebViewHeight : self.noteViewHeight.constant;
+  return kBookmarkCellHeight + ceil(self.note.hidden ? 0.0 : noteViewHeight);
+}
+
+#pragma mark - UIWebViewDelegate
+
+- (void)webViewDidFinishLoad:(UIWebView * _Nonnull)webView
+{
+  webView.height = webView.scrollView.contentSize.height;
+  NSUInteger webViewHeight = ceil(kSeparatorAndTitleHeight + webView.height);
+  self.noteViewHeight.constant = webViewHeight;
+  if (sWebViewHeight != webViewHeight)
+  {
+    sWebViewHeight = webViewHeight;
+    [self.placePage reloadBookmark];
+  }
+}
+
+- (BOOL)webView:(UIWebView *)inWeb
+    shouldStartLoadWithRequest:(NSURLRequest *)inRequest
+                navigationType:(UIWebViewNavigationType)inType
+{
+  if (inType == UIWebViewNavigationTypeLinkClicked)
+  {
+    [[UIApplication sharedApplication] openURL:[inRequest URL]];
+    return NO;
+  }
+  return YES;
+}
+
 @end