From 4c2b0780530e479b51ea2ae7a08c51c8ab8e0d07 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Tue, 13 Jun 2017 10:31:38 +0400
Subject: [PATCH] [android] Added bookmark button on map. Move search and
 bookmark buttons to P2P mode.

---
 android/res/layout-land/layout_nav_search.xml | 15 +++++++++++
 android/res/layout/layout_nav_search.xml      | 14 ++++++++++
 .../src/com/mapswithme/maps/MwmActivity.java  |  6 +++++
 .../maps/routing/NavigationController.java    | 27 ++++++++++++++++++-
 4 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/android/res/layout-land/layout_nav_search.xml b/android/res/layout-land/layout_nav_search.xml
index 9b0283c55b..67bed59bea 100644
--- a/android/res/layout-land/layout_nav_search.xml
+++ b/android/res/layout-land/layout_nav_search.xml
@@ -69,4 +69,19 @@
     android:background="?nav_background"
     android:src="@drawable/ic_menu_search"
     android:tint="@null"/>
+
+  <ImageButton
+    android:id="@+id/btn_bookmarks"
+    style="@style/MwmWidget.SearchNavigationButton"
+    android:layout_width="64dp"
+    android:layout_height="64dp"
+    android:layout_marginStart="@dimen/margin_eighth"
+    android:layout_marginLeft="@dimen/margin_eighth"
+    android:layout_above="@id/btn_search"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:background="?nav_background"
+    android:src="@drawable/ic_menu_bookmarks"
+    android:tint="@null"/>
+
 </RelativeLayout>
diff --git a/android/res/layout/layout_nav_search.xml b/android/res/layout/layout_nav_search.xml
index dafc48f3f4..da10c70609 100644
--- a/android/res/layout/layout_nav_search.xml
+++ b/android/res/layout/layout_nav_search.xml
@@ -21,6 +21,20 @@
     android:layout_height="match_parent"
     android:visibility="gone"/>
 
+  <ImageButton
+    android:id="@+id/btn_bookmarks"
+    style="@style/MwmWidget.SearchNavigationButton"
+    android:layout_width="64dp"
+    android:layout_height="64dp"
+    android:layout_marginStart="@dimen/margin_eighth"
+    android:layout_marginLeft="@dimen/margin_eighth"
+    android:layout_above="@id/anchor_center"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:background="?nav_background"
+    android:src="@drawable/ic_menu_bookmarks"
+    android:tint="@null"/>
+
   <RelativeLayout
     android:id="@+id/search_frame"
     android:layout_width="200dp"
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index f3e7e731ce..c2c74a5d2a 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1564,6 +1564,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
       @Override
       public void run()
       {
+        if (mNavigationController != null)
+        {
+          mNavigationController.showSearchButtons(RoutingController.get().isPlanning()
+                                                  || RoutingController.get().isBuilt());
+        }
+
         if (RoutingController.get().isNavigating())
         {
           if (mNavigationController != null)
diff --git a/android/src/com/mapswithme/maps/routing/NavigationController.java b/android/src/com/mapswithme/maps/routing/NavigationController.java
index 4e43bf7b98..6f9fd5b4fe 100644
--- a/android/src/com/mapswithme/maps/routing/NavigationController.java
+++ b/android/src/com/mapswithme/maps/routing/NavigationController.java
@@ -1,6 +1,7 @@
 package com.mapswithme.maps.routing;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.location.Location;
 import android.os.Build;
@@ -16,6 +17,7 @@ import android.widget.TextView;
 import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.MwmActivity;
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
 import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
 import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.maps.settings.SettingsActivity;
@@ -23,6 +25,7 @@ import com.mapswithme.maps.sound.TtsPlayer;
 import com.mapswithme.maps.traffic.TrafficManager;
 import com.mapswithme.maps.widget.FlatProgressView;
 import com.mapswithme.maps.widget.menu.NavMenu;
+import com.mapswithme.util.Graphics;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
@@ -35,7 +38,7 @@ import java.util.Calendar;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
-public class NavigationController implements TrafficManager.TrafficCallback
+public class NavigationController implements TrafficManager.TrafficCallback, View.OnClickListener
 {
   private static final String STATE_SHOW_TIME_LEFT = "ShowTimeLeft";
 
@@ -121,6 +124,11 @@ public class NavigationController implements TrafficManager.TrafficCallback
 
     mSearchButtonFrame = activity.findViewById(R.id.search_button_frame);
     mSearchWheel = new SearchWheel(mSearchButtonFrame);
+
+    ImageView bookmarkButton = (ImageView) mSearchButtonFrame.findViewById(R.id.btn_bookmarks);
+    bookmarkButton.setImageDrawable(Graphics.tint(bookmarkButton.getContext(),
+                                                  R.drawable.ic_menu_bookmarks));
+    bookmarkButton.setOnClickListener(this);
   }
 
   public void onResume()
@@ -297,6 +305,11 @@ public class NavigationController implements TrafficManager.TrafficCallback
     update(Framework.nativeGetRouteFollowingInfo());
   }
 
+  public void showSearchButtons(boolean show)
+  {
+    UiUtils.showIf(show, mSearchButtonFrame);
+  }
+
   public void show(boolean show)
   {
     UiUtils.showIf(show, mFrame);
@@ -368,4 +381,16 @@ public class NavigationController implements TrafficManager.TrafficCallback
   {
     // no op
   }
+
+  @Override
+  public void onClick(View v)
+  {
+    switch (v.getId())
+    {
+      case R.id.btn_bookmarks:
+        Context context = mFrame.getContext();
+        context.startActivity(new Intent(context, BookmarkCategoriesActivity.class));
+        break;
+    }
+  }
 }