From 0a0665087bc8ca0330229ef0b5b6209296f4b44e Mon Sep 17 00:00:00 2001
From: Ilya Grechuhin <i.grechuhin@gmail.com>
Date: Wed, 7 Oct 2015 18:03:29 +0300
Subject: [PATCH] [ios] Fixed menu state restore.

---
 .../BottomMenu/MWMBottomMenuView.h            |  1 +
 .../BottomMenu/MWMBottomMenuView.mm           |  4 +++-
 .../BottomMenu/MWMBottomMenuViewController.mm | 20 ++++++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.h b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.h
index 2a2bcd072c..459da8ffec 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.h
@@ -13,6 +13,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuState)
 @interface MWMBottomMenuView : SolidTouchView
 
 @property(nonatomic) MWMBottomMenuState state;
+@property(nonatomic) MWMBottomMenuState restoreState;
 
 @property(nonatomic) CGFloat leftBound;
 @property(nonatomic) CGFloat layoutThreshold;
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
index 0ff61a56fb..dcfd5881ce 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
@@ -33,6 +33,7 @@
 {
   [super awakeFromNib];
   self.additionalButtons.hidden = self.goButton.hidden = self.streetLabel.hidden = self.downloadBadge.hidden = YES;
+  self.restoreState = MWMBottomMenuStateInactive;
 }
 
 - (void)layoutSubviews
@@ -288,6 +289,7 @@
       [self updateMenuButtonFromState:_state toState:state];
     break;
   case MWMBottomMenuStateActive:
+    self.restoreState = _state;
     [self updateMenuButtonFromState:_state toState:state];
     self.separator.hidden = self.additionalButtons.hidden = NO;
     self.p2pButton.hidden = self.searchButton.hidden = self.bookmarksButton.hidden = NO;
@@ -318,7 +320,7 @@
 - (void)setLeftBound:(CGFloat)leftBound
 {
   _leftBound = leftBound;
-  self.state = leftBound > 1.0 ? MWMBottomMenuStateCompact : MWMBottomMenuStateInactive;
+  self.state = leftBound > 1.0 ? MWMBottomMenuStateCompact : self.restoreState;
   [self setNeedsLayout];
 }
 
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
index ac93388a09..1dac4a6cd8 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
@@ -426,10 +426,14 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell)
 
 - (void)setState:(MWMBottomMenuState)state
 {
-  if (state == MWMBottomMenuStateActive)
-    self.restoreState = self.state;
   [self toggleDimBackgroundVisible:state == MWMBottomMenuStateActive];
-  ((MWMBottomMenuView *)self.view).state = state;
+  MWMBottomMenuView * view = (MWMBottomMenuView *)self.view;
+  if (view.state == MWMBottomMenuStateCompact &&
+      (state == MWMBottomMenuStatePlanning || state == MWMBottomMenuStateGo ||
+       state == MWMBottomMenuStateText))
+    self.restoreState = state;
+  else
+    view.state = state;
 }
 
 - (MWMBottomMenuState)state
@@ -437,6 +441,16 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell)
   return ((MWMBottomMenuView *)self.view).state;
 }
 
+- (void)setRestoreState:(MWMBottomMenuState)restoreState
+{
+  ((MWMBottomMenuView *)self.view).restoreState = restoreState;
+}
+
+- (MWMBottomMenuState)restoreState
+{
+  return ((MWMBottomMenuView *)self.view).restoreState;
+}
+
 - (void)setLeftBound:(CGFloat)leftBound
 {
   ((MWMBottomMenuView *)self.view).leftBound = leftBound;