From ddcad2a979a38c601626479e76aa0af679a8452a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=93=D1=80=D0=B5=D1=87=D1=83?=
 =?UTF-8?q?=D1=85=D0=B8=D0=BD?= <i.grechuhin@gmail.com>
Date: Wed, 30 Dec 2015 18:41:55 +0300
Subject: [PATCH] [ios] Bug fixes.

---
 .../MWMPlacePageOpeningHoursCell.mm           | 42 ++++++++++---------
 .../MWMPlacePageOpeningHoursCell.xib          | 12 +++---
 .../MWMPlacePageOpeningHoursDayView.mm        |  5 ++-
 .../MWMOpeningHoursEditorViewController.mm    |  2 +
 .../OpeningHours/MWMOpeningHoursModel.mm      | 21 +++++++---
 5 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm
index f1fa423762..b1607acce8 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.mm
@@ -70,27 +70,25 @@ WeekDayView getWeekDayView()
       cd.mode = MWMPlacePageOpeningHoursDayViewModeRegular;
       self.isClosed = oh.IsClosed(time(nullptr));
       [self processSchedule];
-
-      BOOL const isExpanded = delegate.openingHoursCellExpanded;
-      self.middleSeparator.hidden = !isExpanded;
-      self.weekDaysView.hidden = !isExpanded;
-      self.editButton.hidden = !isExpanded;
-      self.expandImage.image = [UIImage imageNamed:isExpanded ? @"ic_arrow_gray_up" : @"ic_arrow_gray_down"];
-      [cd invalidate];
-      return;
     }
-    cd.mode = MWMPlacePageOpeningHoursDayViewModeCompatibility;
-    [cd setCompatibilityText:info];
+    else
+    {
+      cd.mode = MWMPlacePageOpeningHoursDayViewModeCompatibility;
+      [cd setCompatibilityText:info];
+    }
+    BOOL const isExpanded = delegate.openingHoursCellExpanded;
+    self.middleSeparator.hidden = !isExpanded;
+    self.weekDaysView.hidden = !isExpanded;
+    self.editButton.hidden = !isExpanded;
+    self.expandImage.image = [UIImage imageNamed:isExpanded ? @"ic_arrow_gray_up" : @"ic_arrow_gray_down"];
   }
   else
   {
     cd.mode = MWMPlacePageOpeningHoursDayViewModeEmpty;
+    self.middleSeparator.hidden = YES;
+    self.weekDaysView.hidden = YES;
+    self.editButton.hidden = YES;
   }
-
-  self.middleSeparator.hidden = YES;
-  self.weekDaysView.hidden = YES;
-  self.editButton.hidden = YES;
-  self.expandImage.hidden = YES;
   [cd invalidate];
 }
 
@@ -193,9 +191,14 @@ WeekDayView getWeekDayView()
 - (CGFloat)cellHeight
 {
   CGFloat height = self.currentDay.viewHeight;
-  BOOL const isRegular = (self.currentDay.mode == MWMPlacePageOpeningHoursDayViewModeRegular);
-  if (isRegular && self.delegate.openingHoursCellExpanded)
-    height += self.weekDaysViewHeight.constant + self.editButton.height;
+  if (self.delegate.openingHoursCellExpanded)
+  {
+    MWMPlacePageOpeningHoursDayViewMode const mode = self.currentDay.mode;
+    if (mode != MWMPlacePageOpeningHoursDayViewModeEmpty)
+      height += self.editButton.height;
+    if (mode == MWMPlacePageOpeningHoursDayViewModeRegular)
+      height += self.weekDaysViewHeight.constant;
+  }
   return ceil(height);
 }
 
@@ -205,9 +208,8 @@ WeekDayView getWeekDayView()
 {
   switch (self.currentDay.mode) {
     case MWMPlacePageOpeningHoursDayViewModeRegular:
-      [self.delegate setOpeningHoursCellExpanded:!self.delegate.openingHoursCellExpanded forCell:self];
-      break;
     case MWMPlacePageOpeningHoursDayViewModeCompatibility:
+      [self.delegate setOpeningHoursCellExpanded:!self.delegate.openingHoursCellExpanded forCell:self];
       break;
     case MWMPlacePageOpeningHoursDayViewModeEmpty:
       [self editButtonTap];
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.xib
index 59dbe2f7a7..42b7d53e4c 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.xib
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursCell.xib
@@ -17,8 +17,8 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="swk-um-XzG" customClass="MWMPlacePageOpeningHoursDayView">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="126"/>
                         <subviews>
-                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Mo-Su 11:00-24:00" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="228" translatesAutoresizingMaskIntoConstraints="NO" id="ZdV-4y-cz4">
-                                <rect key="frame" x="60" y="53" width="228" height="21"/>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mo-Su 11:00-24:00" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="228" translatesAutoresizingMaskIntoConstraints="NO" id="ZdV-4y-cz4">
+                                <rect key="frame" x="60" y="54" width="228" height="19"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="16"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -40,8 +40,8 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="10:00—20:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="140" translatesAutoresizingMaskIntoConstraints="NO" id="oTF-IZ-Un1">
-                                <rect key="frame" x="166" y="12" width="140" height="20"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:00—20:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="140" translatesAutoresizingMaskIntoConstraints="NO" id="oTF-IZ-Un1">
+                                <rect key="frame" x="166" y="12" width="140" height="19"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="up3-Kv-Z1P"/>
                                 </constraints>
@@ -66,8 +66,8 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Oa-hg-icC">
-                                <rect key="frame" x="166" y="36" width="140" height="58"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Oa-hg-icC">
+                                <rect key="frame" x="166" y="35" width="140" height="58"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="58" id="RWf-JS-tim"/>
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursDayView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursDayView.mm
index 6cdfc88cbc..c4b349c882 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursDayView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/PlacePage/Cells/OpeningHours/MWMPlacePageOpeningHoursDayView.mm
@@ -141,15 +141,16 @@
 {
   _mode = mode;
   BOOL const isRegular = (mode == MWMPlacePageOpeningHoursDayViewModeRegular);
+  BOOL const isEmpty = (mode == MWMPlacePageOpeningHoursDayViewModeEmpty);
   self.compatibilityLabel.hidden = isRegular;
   self.label.hidden = !isRegular;
   self.openTime.hidden = !isRegular;
   self.breakLabel.hidden = !isRegular;
   self.breaksHolder.hidden = !isRegular;
   self.closedLabel.hidden = !isRegular;
-  self.expandImage.hidden = !isRegular;
+  self.expandImage.hidden = isEmpty;
 
-  if (mode == MWMPlacePageOpeningHoursDayViewModeEmpty)
+  if (isEmpty)
     self.compatibilityLabel.text = L(@"add_opening_hours");
 }
 
diff --git a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm
index bbb8067423..fcd62c5681 100644
--- a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm
@@ -104,6 +104,7 @@ extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{
   [self.model updateOpeningHours];
   std::string str = self.openingHours.UTF8String;
   // TODO (AlexZ): Store edited opening time
+  [self.navigationController popViewControllerAnimated:YES];
 }
 
 #pragma mark - Table
@@ -219,6 +220,7 @@ extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{
   self.model.isSimpleMode = isSimpleMode;
   if (!isSimpleMode)
     self.exampleExpanded = NO;
+  self.toggleModeButton.enabled = self.model.isSimpleModeCapable;
 }
 
 - (BOOL)isSimpleMode
diff --git a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursModel.mm b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursModel.mm
index b83886fb8e..86488db873 100644
--- a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursModel.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursModel.mm
@@ -161,11 +161,19 @@ using namespace osmoh;
 {
   id<MWMOpeningHoursModelProtocol> delegate = self.delegate;
   NSString * oh = delegate.openingHours;
+
   if (!oh)
     isSimpleMode = YES;
-  if (_isSimpleMode == isSimpleMode)
-    return;
-  if (isSimpleMode && MakeTimeTableSet(osmoh::OpeningHours(oh.UTF8String), timeTableSet))
+  BOOL setSimple = NO;
+  if (isSimpleMode)
+  {
+    if (oh)
+      setSimple = MakeTimeTableSet(osmoh::OpeningHours(oh.UTF8String), timeTableSet);
+    else
+      setSimple = YES;
+  }
+
+  if (setSimple)
   {
     _isSimpleMode = YES;
     delegate.tableView.hidden = NO;
@@ -178,8 +186,11 @@ using namespace osmoh;
   }
   else
   {
-    _isSimpleMode = NO;
-    [self updateOpeningHours];
+    if (_isSimpleMode)
+    {
+      [self updateOpeningHours];
+      _isSimpleMode = NO;
+    }
     delegate.tableView.hidden = YES;
     delegate.advancedEditor.hidden = NO;
     [delegate.toggleModeButton setTitle:L(@"simple_mode") forState:UIControlStateNormal];