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

Merge pull request #4406 from alexzatsepin/master

Browse source 
Cherry-pick from the release-64
This commit is contained in:
Alexander Marchuk 2016-09-29 13:44:26 +03:00 • committed by GitHub
commit bdbc4e90f5
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/build.gradle
View file

@ -210,6 +210,13 @@ android {
android.sourceSets.blackberry.assets.srcDirs = ['flavors/mwm-ttf-assets']
buildConfigField 'String', 'REVIEW_URL', '"https://appworld.blackberry.com/webstore/content/51013892"'
}
nineStore {
versionName = android.defaultConfig.versionName + '-NineStore'
android.sourceSets.blackberry.assets.srcDirs = ['flavors/mwm-ttf-assets']
buildConfigField 'String', 'SUPPORT_MAIL', '"ninestore@mapswithme.com"'
buildConfigField 'String', 'REVIEW_URL', '"http://www.ninestore.ru/android-apps/mapswithme-maps-pro"'
}
}
// Currently (as of 1.2.3 gradle plugin) ABI filters aren't supported inside of product flavors, so we cannot generate splitted builds only for Google build.

2
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -92,6 +92,7 @@ public class RoutingController
private boolean mContainsCachedResult;
private int mLastResultCode;
private String[] mLastMissingMaps;
@Nullable
private RoutingInfo mCachedRoutingInfo;
@SuppressWarnings("FieldCanBeLocal")
@ -525,6 +526,7 @@ public class RoutingController
return mEndPoint;
}
@Nullable
RoutingInfo getCachedRoutingInfo()
{
return mCachedRoutingInfo;

20
android/src/com/mapswithme/maps/routing/RoutingPlanController.java
View file

@ -177,12 +177,25 @@ public class RoutingPlanController extends ToolbarController
}
private void showAltitudeChartAndRoutingDetails()
{
UiUtils.show(mAltitudeChartFrame);
mAltitudeChartShown = true;
showRoutingDetails();
}
private void showRoutingDetails()
{
final View numbersFrame = mAltitudeChartFrame.findViewById(R.id.numbers);
final RoutingInfo rinfo = RoutingController.get().getCachedRoutingInfo();
if (rinfo == null)
{
UiUtils.hide(numbersFrame);
return;
}
TextView numbersTime = (TextView) numbersFrame.findViewById(R.id.time);
TextView numbersDistance = (TextView) numbersFrame.findViewById(R.id.distance);
TextView numbersArrival = (TextView) numbersFrame.findViewById(R.id.arrival);
RoutingInfo rinfo = RoutingController.get().getCachedRoutingInfo();
numbersTime.setText(RoutingController.formatRoutingTime(mFrame.getContext(), rinfo.totalTimeInSeconds,
R.dimen.text_size_routing_number));
numbersDistance.setText(rinfo.distToTarget + " " + rinfo.targetUnits);
@ -192,11 +205,8 @@ public class RoutingPlanController extends ToolbarController
String arrivalTime = RoutingController.formatArrivalTime(rinfo.totalTimeInSeconds);
numbersArrival.setText(arrivalTime);
}
UiUtils.show(mAltitudeChartFrame);
mAltitudeChartShown = true;
}
private void hideAltitudeChartAndRoutingDetails()
{
if (UiUtils.isHidden(mAltitudeChartFrame))