From ffc8150def4093d9ecc5be34fc6be0600e3f3356 Mon Sep 17 00:00:00 2001
From: Altynaika <altynaika.toktomuratovaa@gmail.com>
Date: Wed, 3 Feb 2021 20:27:01 +0600
Subject: [PATCH] [android] Disabled the traffic button in navigation mode.

Signed-off-by: Altynaika <altynaika.toktomuratovaa@gmail.com>
---
 android/res/layout/layout_nav_bottom.xml         | 14 +++++++-------
 android/src/com/mapswithme/maps/MwmActivity.java |  2 +-
 .../maps/routing/NavigationController.java       | 16 ++++++++--------
 .../com/mapswithme/maps/widget/menu/NavMenu.java |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/android/res/layout/layout_nav_bottom.xml b/android/res/layout/layout_nav_bottom.xml
index b8f57f017b..e42f10f417 100644
--- a/android/res/layout/layout_nav_bottom.xml
+++ b/android/res/layout/layout_nav_bottom.xml
@@ -63,13 +63,13 @@
       android:src="@drawable/ic_voice_on"
       android:background="?selectableItemBackgroundBorderless"/>
 
-    <ImageView
-      android:id="@+id/traffic"
-      android:layout_weight="0.2"
-      android:layout_width="0dp"
-      android:layout_height="@dimen/nav_icon_size"
-      android:scaleType="center"
-      android:background="?selectableItemBackgroundBorderless"/>
+<!--    <ImageView-->
+<!--      android:id="@+id/traffic"-->
+<!--      android:layout_weight="0.2"-->
+<!--      android:layout_width="0dp"-->
+<!--      android:layout_height="@dimen/nav_icon_size"-->
+<!--      android:scaleType="center"-->
+<!--      android:background="?selectableItemBackgroundBorderless"/>-->
 
     <ImageView
       android:id="@+id/subway"
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 0622e033ce..6361530496 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -678,7 +678,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     mNavigationController = new NavigationController(this);
-    TrafficManager.INSTANCE.attach(mNavigationController);
+    //TrafficManager.INSTANCE.attach(mNavigationController);
 
     initMainMenu();
     initOnmapDownloader();
diff --git a/android/src/com/mapswithme/maps/routing/NavigationController.java b/android/src/com/mapswithme/maps/routing/NavigationController.java
index 12b01b9074..bc77c6462f 100644
--- a/android/src/com/mapswithme/maps/routing/NavigationController.java
+++ b/android/src/com/mapswithme/maps/routing/NavigationController.java
@@ -169,12 +169,12 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie
       TtsPlayer.setEnabled(!TtsPlayer.isEnabled());
       mNavMenu.refreshTts();
       break;
-    case TRAFFIC:
-      TrafficManager.INSTANCE.toggle();
-      parent.onTrafficLayerSelected();
-      mNavMenu.refreshTraffic();
-      //TODO: Add statistics reporting (in separate task)
-      break;
+//    case TRAFFIC:
+//      TrafficManager.INSTANCE.toggle();
+//      parent.onTrafficLayerSelected();
+//      mNavMenu.refreshTraffic();
+//      //TODO: Add statistics reporting (in separate task)
+//      break;
     case TOGGLE:
       mNavMenu.toggle(true);
       parent.refreshFade();
@@ -384,13 +384,13 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie
   @Override
   public void onEnabled()
   {
-    mNavMenu.refreshTraffic();
+   // mNavMenu.refreshTraffic();
   }
 
   @Override
   public void onDisabled()
   {
-    mNavMenu.refreshTraffic();
+   // mNavMenu.refreshTraffic();
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/widget/menu/NavMenu.java b/android/src/com/mapswithme/maps/widget/menu/NavMenu.java
index 566fffc02f..eb6d2e2288 100644
--- a/android/src/com/mapswithme/maps/widget/menu/NavMenu.java
+++ b/android/src/com/mapswithme/maps/widget/menu/NavMenu.java
@@ -226,7 +226,7 @@ public class NavMenu extends BaseMenu
   public void refresh()
   {
     refreshTts();
-    refreshTraffic();
+//    refreshTraffic();
   }
 
   public void refreshTts()
@@ -241,7 +241,7 @@ public class NavMenu extends BaseMenu
     Drawable onIcon = Graphics.tint(mFrame.getContext(), R.drawable.ic_setting_traffic_on,
                                     R.attr.colorAccent);
     Drawable offIcon = Graphics.tint(mFrame.getContext(), R.drawable.ic_setting_traffic_off);
-    mTraffic.setImageDrawable(TrafficManager.INSTANCE.isEnabled() ? onIcon : offIcon);
+   mTraffic.setImageDrawable(TrafficManager.INSTANCE.isEnabled() ? onIcon : offIcon);
   }
 
   @Override
@@ -286,6 +286,6 @@ public class NavMenu extends BaseMenu
     @Framework.RouterType
     int routerType = Framework.nativeGetRouter();
     UiUtils.showIf(show, mTts);
-    UiUtils.showIf(show && routerType == Framework.ROUTER_TYPE_VEHICLE, mTraffic);
+//    UiUtils.showIf(show && routerType == Framework.ROUTER_TYPE_VEHICLE, mTraffic);
   }
 }