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

Merge pull request #11290 from osmandapp/fix_time_in_motion_elements

Browse source 
Fix "Time in motion" elements
This commit is contained in:
Vitaliy 2021-03-30 14:53:27 +03:00 committed by GitHub
commit 369ce31d8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/gpx_item_speed.xml
View file

@ -200,7 +200,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@null"
android:text="@string/shared_string_time_moving" android:text="@string/moving_time"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" /> android:textSize="@dimen/default_desc_text_size" />
@ -221,7 +221,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size" android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
osmand:srcCompat="@drawable/ic_action_time_span" /> osmand:srcCompat="@drawable/ic_action_time_moving_16" />
</LinearLayout> </LinearLayout>

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/SelectedGpxMenuBuilder.java
View file

@ -70,7 +70,7 @@ public class SelectedGpxMenuBuilder extends MenuBuilder {
String timeSpan = Algorithms.formatDuration((int) (analysis.timeSpan / 1000), app.accessibilityEnabled()); String timeSpan = Algorithms.formatDuration((int) (analysis.timeSpan / 1000), app.accessibilityEnabled());
String timeMoving = Algorithms.formatDuration((int) (analysis.timeMoving / 1000), app.accessibilityEnabled()); String timeMoving = Algorithms.formatDuration((int) (analysis.timeMoving / 1000), app.accessibilityEnabled());
String timeSpanTitle = app.getString(R.string.shared_string_time_span) + " / " + app.getString(R.string.shared_string_time_moving); String timeSpanTitle = app.getString(R.string.shared_string_time_span) + " / " + app.getString(R.string.moving_time);
buildRow(view, getThemedIcon(R.drawable.ic_action_time_span), null, timeSpanTitle, buildRow(view, getThemedIcon(R.drawable.ic_action_time_span), null, timeSpanTitle,
timeSpan + " / " + timeMoving, 0, null, timeSpan + " / " + timeMoving, 0, null,
false, null, false, 0, false, false, false, null, false); false, null, false, 0, false, false, false, null, false);

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

@ -308,7 +308,7 @@ public class GPXItemPagerAdapter extends PagerAdapter implements CustomTabProvid
((ImageView) view.findViewById(R.id.max_icon)) ((ImageView) view.findViewById(R.id.max_icon))
.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_max_speed)); .setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_max_speed));
((ImageView) view.findViewById(R.id.time_moving_icon)) ((ImageView) view.findViewById(R.id.time_moving_icon))
.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_time_span)); .setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_time_moving_16));
((ImageView) view.findViewById(R.id.distance_icon)) ((ImageView) view.findViewById(R.id.distance_icon))
.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_polygom_dark)); .setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_polygom_dark));

6
OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
View file

@ -253,10 +253,8 @@ public class GpxBlockStatisticsBuilder {
} }
public void prepareDataTimeMoving(long timeMoving) { public void prepareDataTimeMoving(long timeMoving) {
prepareData(app.getString(tabItem == GPX_TAB_ITEM_SPEED ? R.string.shared_string_time_moving : R.string.moving_time), prepareData(app.getString(R.string.moving_time), Algorithms.formatDuration((int) (timeMoving / 1000), app.accessibilityEnabled()),
Algorithms.formatDuration((int) (timeMoving / 1000), app.accessibilityEnabled()), R.drawable.ic_action_time_moving_16, GPXDataSetType.SPEED, null, ItemType.ITEM_TIME_MOVING);
tabItem == GPX_TAB_ITEM_SPEED ? R.drawable.ic_action_time_span_16 : R.drawable.ic_action_time_moving_16,
GPXDataSetType.SPEED, null, ItemType.ITEM_TIME_MOVING);
} }
public void prepareDataDistanceCorrected(float totalDistanceMoving) { public void prepareDataDistanceCorrected(float totalDistanceMoving) {