Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix button width in plan route and divider in follow track

Browse source
This commit is contained in:
Vitaliy 2020-09-23 16:29:16 +03:00
parent 7712d144d9
commit 1f65840dd4
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/layout/fragment_measurement_tool.xml
View file

@ -216,10 +216,12 @@
<include <include
android:id="@+id/add_point_button" android:id="@+id/add_point_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="@dimen/measurement_tool_button_width"
android:layout_gravity="end" android:layout_gravity="end"
layout="@layout/bottom_sheet_dialog_button" /> android:minWidth="@dimen/measurement_tool_button_width" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

8
OsmAnd/src/net/osmand/plus/routepreparationmenu/FollowTrackFragment.java
View file

@ -205,7 +205,6 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
SelectTrackCard selectTrackCard = new SelectTrackCard(mapActivity); SelectTrackCard selectTrackCard = new SelectTrackCard(mapActivity);
selectTrackCard.setListener(this); selectTrackCard.setListener(this);
cardsContainer.addView(selectTrackCard.build(mapActivity)); cardsContainer.addView(selectTrackCard.build(mapActivity));
cardsContainer.addView(buildDividerView(cardsContainer, false));
ApplicationMode mode = app.getRoutingHelper().getAppMode(); ApplicationMode mode = app.getRoutingHelper().getAppMode();
@ -213,13 +212,16 @@ public class FollowTrackFragment extends ContextMenuScrollFragment implements Ca
GPXRouteParamsBuilder rparams = routingHelper.getCurrentGPXRoute(); GPXRouteParamsBuilder rparams = routingHelper.getCurrentGPXRoute();
boolean osmandRouter = mode.getRouteService() == RouteProvider.RouteService.OSMAND; boolean osmandRouter = mode.getRouteService() == RouteProvider.RouteService.OSMAND;
if (rparams != null && osmandRouter) { if (rparams != null && osmandRouter) {
if (!gpxFile.hasRoute() || gpxFile.hasRtePt()) { boolean showReverseCard = !gpxFile.hasRoute() || gpxFile.hasRtePt();
if (showReverseCard) {
cardsContainer.addView(buildDividerView(cardsContainer, false));
ReverseTrackCard reverseTrackCard = new ReverseTrackCard(mapActivity, rparams.isReverse()); ReverseTrackCard reverseTrackCard = new ReverseTrackCard(mapActivity, rparams.isReverse());
reverseTrackCard.setListener(this); reverseTrackCard.setListener(this);
cardsContainer.addView(reverseTrackCard.build(mapActivity)); cardsContainer.addView(reverseTrackCard.build(mapActivity));
} }
if (!gpxFile.hasRtePt() && !gpxFile.hasRoute()) { if (!gpxFile.hasRtePt() && !gpxFile.hasRoute()) {
cardsContainer.addView(buildDividerView(cardsContainer, true)); cardsContainer.addView(buildDividerView(cardsContainer, showReverseCard));
AttachTrackToRoadsCard attachTrackCard = new AttachTrackToRoadsCard(mapActivity); AttachTrackToRoadsCard attachTrackCard = new AttachTrackToRoadsCard(mapActivity);
attachTrackCard.setListener(this); attachTrackCard.setListener(this);