[android] Place page saving during configuration change

android/src/com/mapswithme/maps/MwmActivity.java

@@ -697,7 +697,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public boolean closePlacePage()
   {
     mPlacePageController.close();
-    Framework.nativeDeactivatePopup();
     return true;
   }
 
@@ -752,8 +751,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       RoutingController.get().prepare(canUseMyPositionAsStart, endPoint);
 
       // TODO: check for tablet.
-      /*if (mPlacePage.isDocked() || !mPlacePage.isFloating())
-        closePlacePage();*/
+      closePlacePage();
     });
   }
 
@@ -814,6 +812,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @Override
   protected void onSaveInstanceState(Bundle outState)
   {
+    mPlacePageController.onSave(outState);
     if (!mIsTabletLayout && RoutingController.get().isPlanning())
       mRoutingPlanInplaceController.onSaveState(outState);
 
@@ -852,7 +851,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState)
   {
     super.onRestoreInstanceState(savedInstanceState);
-
+    mPlacePageController.onRestore(savedInstanceState);
     if (mIsTabletLayout)
     {
       RoutingPlanFragment fragment = (RoutingPlanFragment) getFragment(RoutingPlanFragment.class);

android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java

@@ -5,6 +5,7 @@ import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.graphics.Rect;
 import android.location.Location;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
@@ -28,6 +29,7 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
   private static final float ANCHOR_RATIO = 0.3f;
   private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
   private static final String TAG = BottomSheetPlacePageController.class.getSimpleName();
+  private static final String EXTRA_MAP_OBJECT = "extra_map_object";
   @NonNull
   private final Activity mActivity;
   @SuppressWarnings("NullableProblems")
@@ -64,6 +66,7 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
 
       if (newState == AnchorBottomSheetBehavior.STATE_HIDDEN)
       {
+        Framework.nativeDeactivatePopup();
         hideButtons();
         return;
       }
@@ -130,20 +133,20 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
   private void openPlacePage()
   {
     mPlacePage.post(() -> {
-      collapsePlacePage();
+      setPeekHeight();
+      mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_COLLAPSED);
       setPlacePageAnchor();
     });
   }
 
-  private void collapsePlacePage()
+  private void setPeekHeight()
   {
     int peekHeight = getPeekHeight();
     LOGGER.d(TAG, "Peek height = " + peekHeight);
     mLastPeekHeight = peekHeight;
     mPlacePageBehavior.setPeekHeight(mLastPeekHeight);
-    mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_COLLAPSED);
   }
-  
+
   private void setPlacePageAnchor()
   {
     View parent = (View) mPlacePage.getParent();
@@ -226,33 +229,42 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
       oldTop, int oldRight, int oldBottom)
   {
     LOGGER.d(TAG, "Layout changed, current state  = " + toString(mPlacePageBehavior.getState()));
+    if (mLastPeekHeight == 0)
+    {
+      LOGGER.d(TAG, "Layout changed - ignoring, peek height not calculated yet");
+      return;
+    }
+
+    updateViewPortRect();
+
     if (mPlacePageBehavior.getState() != AnchorBottomSheetBehavior.STATE_COLLAPSED)
       return;
 
     if (getPeekHeight() == mLastPeekHeight)
       return;
 
-    openPlacePage();
+    mPlacePage.post(this::setPeekHeight);
   }
 
   private void updateViewPortRect()
   {
-    View coordinatorLayout = (ViewGroup) mPlacePage.getParent();
-    int viewPortWidth = coordinatorLayout.getWidth();
-    int viewPortHeight = coordinatorLayout.getHeight();
-    Rect sheetRect = new Rect();
-    mPlacePage.getGlobalVisibleRect(sheetRect);
-    if (sheetRect.top < mViewportMinHeight)
-      return;
+    mPlacePage.post(() -> {
+      View coordinatorLayout = (ViewGroup) mPlacePage.getParent();
+      int viewPortWidth = coordinatorLayout.getWidth();
+      int viewPortHeight = coordinatorLayout.getHeight();
+      Rect sheetRect = new Rect();
+      mPlacePage.getGlobalVisibleRect(sheetRect);
+      if (sheetRect.top < mViewportMinHeight)
+        return;
 
-    if (sheetRect.top >= viewPortHeight)
-    {
+      if (sheetRect.top >= viewPortHeight)
+      {
+        Framework.nativeSetVisibleRect(0, 0, viewPortWidth, viewPortHeight);
+        return;
+      }
+      viewPortHeight -= sheetRect.height();
       Framework.nativeSetVisibleRect(0, 0, viewPortWidth, viewPortHeight);
-      return;
-    }
-    viewPortHeight -= sheetRect.height();
-    LOGGER.d(TAG, "Viewport room: 0, 0, " + viewPortWidth + ", " + viewPortHeight);
-    Framework.nativeSetVisibleRect(0, 0, viewPortWidth, viewPortHeight);
+    });
   }
 
   @NonNull
@@ -276,4 +288,33 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
         throw new AssertionError("Unsupported state detected: " + state);
     }
   }
+
+  @Override
+  public void onSave(@NonNull Bundle outState)
+  {
+    outState.putParcelable(EXTRA_MAP_OBJECT, mPlacePage.getMapObject());
+  }
+
+  @Override
+  public void onRestore(@NonNull Bundle inState)
+  {
+    if (mPlacePageBehavior.getState() == AnchorBottomSheetBehavior.STATE_HIDDEN)
+      return;
+
+    MapObject object = inState.getParcelable(EXTRA_MAP_OBJECT);
+    if (object == null)
+      return;
+
+    mPlacePage.setMapObject(object, true, this::restorePlacePage);
+    mToolbar.setTitle(object.getTitle());
+  }
+
+  private void restorePlacePage()
+  {
+    mPlacePage.post(() -> {
+      setPeekHeight();
+      setPlacePageAnchor();
+      showButtons();
+    });
+  }
 }

android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java

@@ -1,11 +1,13 @@
 package com.mapswithme.maps.widget.placepage;
 
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 
 import com.mapswithme.maps.base.Initializable;
+import com.mapswithme.maps.base.Savable;
 import com.mapswithme.maps.bookmarks.data.MapObject;
 
-public interface PlacePageController extends Initializable
+public interface PlacePageController extends Initializable, Savable<Bundle>
 {
   void openFor(@NonNull MapObject object);
   void close();

android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java

@@ -993,18 +993,6 @@ public class PlacePageView extends NestedScrollView
     attrArray.recycle();
   }
 
-  public void restore()
-  {
-    if (mMapObject == null)
-    {
-      // FIXME query map object again
-      LOGGER.e(TAG, "A place page cannot be restored, mMapObject is null!");
-      return;
-    }
-
-    setMapObject(mMapObject, true, null);
-  }
-
   public boolean isDocked()
   {
     return mIsDocked;
@@ -1760,7 +1748,6 @@ public class PlacePageView extends NestedScrollView
         RoutingController.get().prepare(LocationHelper.INSTANCE.getMyPosition(), mMapObject,
                                         Framework.ROUTER_TYPE_TAXI);
         hide();
-        Framework.nativeDeactivatePopup();
         if (mMapObject != null)
         {
           List<TaxiType> types = mMapObject.getReachableByTaxiTypes();