gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Disabled the traffic button in navigation mode.

Browse source 
Signed-off-by: Altynaika <altynaika.toktomuratovaa@gmail.com>
This commit is contained in:
Altynaika 2021-02-03 20:27:01 +06:00 • committed by Roman Tsisyk
parent 05a98d3725
commit ffc8150def
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/res/layout/layout_nav_bottom.xml
View file

@ -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"

2
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -678,7 +678,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
mNavigationController = new NavigationController(this);
TrafficManager.INSTANCE.attach(mNavigationController);
//TrafficManager.INSTANCE.attach(mNavigationController);
initMainMenu();
initOnmapDownloader();

16
android/src/com/mapswithme/maps/routing/NavigationController.java
View file

@ -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

6
android/src/com/mapswithme/maps/widget/menu/NavMenu.java
View file

@ -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);
}
}