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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-07-10 13:32:24 +02:00
commit 313c671dd6
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/gpx_split_segment_fragment.xml
View file

@ -309,7 +309,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:background="@null" android:background="@null"
android:text="@string/range" android:text="@string/range_min_max"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_split_segments_sub" /> android:textSize="@dimen/default_split_segments_sub" />

8
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -275,7 +275,7 @@ public class GPXUtilities {
public double minElevation = 99999; public double minElevation = 99999;
public double maxElevation = -100; public double maxElevation = -100;
public float minSpeed = 0; public float minSpeed = Float.MAX_VALUE;
public float maxSpeed = 0; public float maxSpeed = 0;
public float avgSpeed; public float avgSpeed;
@ -519,13 +519,9 @@ public class GPXUtilities {
hasElevationData = true; hasElevationData = true;
} }
minSpeed = Math.min(speed, minSpeed);
if (speed > 0) { if (speed > 0) {
totalSpeedSum += speed; totalSpeedSum += speed;
if (minSpeed == 0) {
minSpeed = speed;
} else {
minSpeed = Math.min(speed, minSpeed);
}
maxSpeed = Math.max(speed, maxSpeed); maxSpeed = Math.max(speed, maxSpeed);
speedCount++; speedCount++;
} }

10
OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
View file

@ -48,6 +48,10 @@ public class TrackActivity extends TabActivity {
private List<GpxDisplayGroup> originalGroups = new ArrayList<>(); private List<GpxDisplayGroup> originalGroups = new ArrayList<>();
private boolean stopped = false; private boolean stopped = false;
public PagerSlidingTabStrip getSlidingTabLayout() {
return slidingTabLayout;
}
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
((OsmandApplication) getApplication()).applyTheme(this); ((OsmandApplication) getApplication()).applyTheme(this);
@ -235,6 +239,9 @@ public class TrackActivity extends TabActivity {
} }
} }
getSupportFragmentManager().popBackStack(); getSupportFragmentManager().popBackStack();
if (isHavingWayPoints() || isHavingRoutePoints()) {
getSlidingTabLayout().setVisibility(View.VISIBLE);
}
return true; return true;
} }
} }
@ -265,6 +272,9 @@ public class TrackActivity extends TabActivity {
} }
} }
getSupportFragmentManager().popBackStack(); getSupportFragmentManager().popBackStack();
if (isHavingWayPoints() || isHavingRoutePoints()) {
getSlidingTabLayout().setVisibility(View.VISIBLE);
}
return; return;
} }
} }

2
OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java
View file

@ -544,7 +544,7 @@ public class SplitSegmentFragment extends OsmAndListFragment {
String maxSpeed = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app); String maxSpeed = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app);
String minSpeed = OsmAndFormatter.getFormattedSpeed(analysis.minSpeed, app); String minSpeed = OsmAndFormatter.getFormattedSpeed(analysis.minSpeed, app);
String max_min_speed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed.substring(0, minSpeed.indexOf(" "))); String max_min_speed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed);
if (minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0") || minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0.0")) { if (minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0") || minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0.0")) {
(convertView.findViewById(R.id.max_speed_value)) (convertView.findViewById(R.id.max_speed_value))
.setVisibility(View.VISIBLE); .setVisibility(View.VISIBLE);

1
OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
View file

@ -1477,6 +1477,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
.replace(R.id.track_activity_layout, new SplitSegmentFragment()) .replace(R.id.track_activity_layout, new SplitSegmentFragment())
.addToBackStack(SplitSegmentFragment.TAG) .addToBackStack(SplitSegmentFragment.TAG)
.commit(); .commit();
getMyActivity().getSlidingTabLayout().setVisibility(View.GONE);
} }
private class SplitTrackAsyncTask extends AsyncTask<Void, Void, Void> { private class SplitTrackAsyncTask extends AsyncTask<Void, Void, Void> {