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

Switching on turn sound notification by entering ?sound. Switching of turn sound notification by entering ?nosound.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2015-08-06 15:53:52 +03:00 • committed by Alex Zolotarev
parent b9820e4a2b
commit 25eaba7e72
2 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -25,6 +25,7 @@ import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmRecyclerFragment;
import com.mapswithme.maps.base.OnBackPressListener;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.sound.TTSPlayer;
import com.mapswithme.util.InputUtils;
import com.mapswithme.util.Language;
import com.mapswithme.util.StringUtils;
@ -157,6 +158,10 @@ public class SearchFragment extends BaseMwmRecyclerFragment implements View.OnCl
if (tryChangeRouter(s.toString()))
return;
// TODO: This code only for demonstration purposes and will be removed soon
if (trySwitchOnTurnSound(s.toString()))
return;
if (s.length() == 0)
{
UiUtils.hide(mBtnClearQuery);
@ -276,6 +281,13 @@ public class SearchFragment extends BaseMwmRecyclerFragment implements View.OnCl
setSearchQuery(query);
}
private void hideSearchPanel()
{
mEtSearchQuery.setText(null);
InputUtils.hideKeyboard(mEtSearchQuery);
navigateUpToParent();
}
// FIXME: This code only for demonstration purposes and will be removed soon
private boolean tryChangeMapStyle(String str)
{
@ -287,9 +299,7 @@ public class SearchFragment extends BaseMwmRecyclerFragment implements View.OnCl
return false;
// close Search panel
mEtSearchQuery.setText(null);
InputUtils.hideKeyboard(mEtSearchQuery);
navigateUpToParent();
hideSearchPanel();
// change map style for the Map activity
final int mapStyle = isDark ? Framework.MAP_STYLE_DARK : Framework.MAP_STYLE_LIGHT;
@ -306,15 +316,27 @@ public class SearchFragment extends BaseMwmRecyclerFragment implements View.OnCl
if (!pedestrian && !vehicle)
return false;
mEtSearchQuery.setText(null);
InputUtils.hideKeyboard(mEtSearchQuery);
navigateUpToParent();
hideSearchPanel();
final int routerType = pedestrian ? Framework.ROUTER_TYPE_PEDESTRIAN : Framework.ROUTER_TYPE_VEHICLE;
Framework.setRouter(routerType);
return true;
}
private boolean trySwitchOnTurnSound(String query)
{
final boolean sound = query.equals("?sound");
final boolean nosound = query.equals("?nosound");
if (!sound && !nosound)
return false;
hideSearchPanel();
TTSPlayer.get().enable(sound);
return sound;
}
// FIXME: This code only for demonstration purposes and will be removed soon
protected void showSingleResultOnMap(int resultIndex)

3
map/framework.cpp
View file

@ -1618,11 +1618,10 @@ void Framework::SetupMeasurementSystem()
{
Settings::Units units = Settings::Metric;
Settings::Get("Units", units);
// @TODO(vbykoianko) Try to rewrite code to use only one structure fo LengthUnits
// @TODO(vbykoianko) Rewrites code to use enum class LengthUnits only.
m_routingSession.SetTurnNotificationsUnits(units == Settings::Foot ?
routing::turns::sound::LengthUnits::Feet :
routing::turns::sound::LengthUnits::Meters);
this->EnableTurnNotifications(true);
m_informationDisplay.measurementSystemChanged();
Invalidate();