From d1d6eaeb737e0c3383269dc892340050fa9f2d0d Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Thu, 24 May 2018 15:48:13 +0300
Subject: [PATCH] Add route calculation progress to the map route info menu

---
 OsmAnd/res/layout-land/plan_route_info.xml     | 11 +++++++++++
 OsmAnd/res/layout/plan_route_info.xml          | 11 +++++++++++
 .../osmand/plus/activities/MapActivity.java    |  3 ++-
 .../mapcontextmenu/other/MapRouteInfoMenu.java | 14 ++++++++++++++
 .../other/MapRouteInfoMenuFragment.java        | 18 ++++++++++++++++++
 5 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout-land/plan_route_info.xml b/OsmAnd/res/layout-land/plan_route_info.xml
index ed694f5509..0cfca0ac48 100644
--- a/OsmAnd/res/layout-land/plan_route_info.xml
+++ b/OsmAnd/res/layout-land/plan_route_info.xml
@@ -17,6 +17,17 @@
         android:clickable="true"
         android:orientation="vertical">
 
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:max="100"
+            android:minHeight="0dp"
+            android:visibility="gone"
+            tools:progress="60"
+            tools:visibility="visible" />
+
         <LinearLayout
             android:id="@+id/ModesLayout"
             android:layout_width="fill_parent"
diff --git a/OsmAnd/res/layout/plan_route_info.xml b/OsmAnd/res/layout/plan_route_info.xml
index 034b5cdc23..7d2923c0bb 100644
--- a/OsmAnd/res/layout/plan_route_info.xml
+++ b/OsmAnd/res/layout/plan_route_info.xml
@@ -17,6 +17,17 @@
         android:clickable="true"
         android:orientation="vertical">
 
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:max="100"
+            android:minHeight="0dp"
+            android:visibility="gone"
+            tools:progress="60"
+            tools:visibility="visible" />
+
         <LinearLayout
             android:id="@+id/ModesLayout"
             android:layout_width="fill_parent"
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 60a5450718..57303e6765 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -93,7 +93,6 @@ import net.osmand.plus.helpers.ExternalApiHelper;
 import net.osmand.plus.helpers.ImportHelper;
 import net.osmand.plus.helpers.ImportHelper.ImportGpxBottomSheetDialogFragment;
 import net.osmand.plus.helpers.WakeLockHelper;
-import net.osmand.plus.inapp.InAppPurchaseHelper;
 import net.osmand.plus.mapcontextmenu.AdditionalActionsBottomSheetDialogFragment;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.builders.cards.dialogs.ContextMenuCardDialogFragment;
@@ -436,6 +435,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 			@Override
 			public void updateProgress(int progress) {
+				mapLayers.getMapControlsLayer().getMapRouteInfoMenu().updateRouteCalculationProgress(progress);
 				if (findViewById(R.id.MapHudButtonsOverlay).getVisibility() == View.VISIBLE) {
 					if (pbExtView.getVisibility() == View.VISIBLE) {
 						pbExtView.setVisibility(View.GONE);
@@ -492,6 +492,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 			@Override
 			public void finish() {
+				mapLayers.getMapControlsLayer().getMapRouteInfoMenu().routeCalculationFinished();
 				pbExtView.setVisibility(View.GONE);
 				pb.setVisibility(View.GONE);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
index f75d78d842..f939c0e125 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
@@ -188,6 +188,20 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
 		}
 	}
 
+	public void updateRouteCalculationProgress(int progress) {
+		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
+		if (fragmentRef != null) {
+			fragmentRef.get().updateRouteCalculationProgress(progress);
+		}
+	}
+
+	public void routeCalculationFinished() {
+		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
+		if (fragmentRef != null) {
+			fragmentRef.get().hideRouteCalculationProgressBar();
+		}
+	}
+
 	public void updateMenu() {
 		WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
 		if (fragmentRef != null)
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
index ec64575323..d8c810d8bc 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
@@ -7,6 +7,7 @@ import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
@@ -106,6 +107,23 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
 		}
 	}
 
+	public void updateRouteCalculationProgress(int progress) {
+		ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.progress_bar);
+		if (progressBar != null) {
+			if (progressBar.getVisibility() != View.VISIBLE) {
+				progressBar.setVisibility(View.VISIBLE);
+			}
+			progressBar.setProgress(progress);
+		}
+	}
+
+	public void hideRouteCalculationProgressBar() {
+		View progressBar = mainView.findViewById(R.id.progress_bar);
+		if (progressBar != null) {
+			progressBar.setVisibility(View.GONE);
+		}
+	}
+
 	public void show(MapActivity mapActivity) {
 		int slideInAnim = 0;
 		int slideOutAnim = 0;