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

Small cleanup in gpx tabs xml

Browse source
This commit is contained in:
Vitaliy 2021-01-25 09:49:57 +02:00
parent 0fd282e4c2
commit 17133f8354
5 changed files with 840 additions and 864 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

551
OsmAnd/res/layout/gpx_item_altitude.xml
View file

@ -1,328 +1,321 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/bg_color" android:background="?attr/bg_color"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <com.github.mikephil.charting.charts.LineChart
android:layout_width="match_parent" android:id="@+id/chart"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="@dimen/list_item_description_width"
android:layout_gravity="center_vertical" />
<com.github.mikephil.charting.charts.LineChart <LinearLayout
android:id="@+id/chart" android:id="@+id/gpx_join_gaps_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/list_item_description_width" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" /> android:background="?attr/selectableItemBackground"
android:minHeight="@dimen/card_row_min_height"
android:orientation="horizontal">
<LinearLayout <net.osmand.plus.widgets.TextViewEx
android:id="@+id/gpx_join_gaps_container" android:id="@+id/gpx_join_gaps_text"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="?attr/selectableItemBackground" android:layout_weight="1"
android:minHeight="@dimen/card_row_min_height" android:gravity="center_vertical"
android:orientation="horizontal"> android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:text="@string/join_segments"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <androidx.appcompat.widget.SwitchCompat
android:id="@+id/gpx_join_gaps_text" android:id="@+id/gpx_join_gaps_switch"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:background="@null"
android:gravity="center_vertical" android:clickable="false"
android:paddingStart="@dimen/content_padding" android:focusable="false"
android:paddingLeft="@dimen/content_padding" android:focusableInTouchMode="false"
android:paddingEnd="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:text="@string/join_segments" android:paddingEnd="@dimen/content_padding"
android:textColor="?android:attr/textColorPrimary" android:paddingRight="@dimen/content_padding" />
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<androidx.appcompat.widget.SwitchCompat </LinearLayout>
android:id="@+id/gpx_join_gaps_switch"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" />
</LinearLayout> <LinearLayout
android:id="@+id/average_range"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/context_menu_first_line_top_margin"
android:paddingBottom="@dimen/content_padding_small">
<LinearLayout <LinearLayout
android:id="@+id/average_range" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginStart="@dimen/content_padding"
android:orientation="horizontal" android:layout_marginLeft="@dimen/content_padding"
android:paddingTop="@dimen/context_menu_first_line_top_margin" android:layout_marginEnd="@dimen/content_padding_small"
android:paddingBottom="@dimen/content_padding_small"> android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/average_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/average_altitude"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/average_desc" android:id="@+id/average_text"
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/average_altitude" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="40 m" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/average_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="40 m" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/average_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_altitude_average" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/average_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_altitude_average" />
</LinearLayout> <LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding_small" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding_small" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/range_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/altitude_range"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/range_desc" android:id="@+id/range_text"
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/altitude_range" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="30m - 53m" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/range_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="30m - 53m" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/range_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_altitude_average" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/range_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_altitude_average" />
</LinearLayout> </LinearLayout>
</LinearLayout> <LinearLayout
android:id="@+id/list_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout <View
android:id="@+id/list_divider" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginStart="@dimen/content_padding_small"
android:orientation="horizontal"> android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:background="?attr/dashboard_divider" />
<View </LinearLayout>
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:background="?attr/dashboard_divider" />
</LinearLayout> <LinearLayout
android:id="@+id/ascent_descent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/context_menu_first_line_top_margin"
android:paddingBottom="@dimen/content_padding_small">
<LinearLayout <LinearLayout
android:id="@+id/ascent_descent" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginStart="@dimen/content_padding"
android:orientation="horizontal" android:layout_marginLeft="@dimen/content_padding"
android:paddingTop="@dimen/context_menu_first_line_top_margin" android:layout_marginEnd="@dimen/content_padding_small"
android:paddingBottom="@dimen/content_padding_small"> android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/ascent_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/altitude_ascent"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/ascent_desc" android:id="@+id/ascent_text"
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/altitude_ascent" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="174" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/ascent_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="174" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ascent_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_altitude_ascent" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/ascent_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_altitude_ascent" />
</LinearLayout> <LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/descent_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/altitude_descent"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/descent_desc" android:id="@+id/descent_text"
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/altitude_descent" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="164" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/descent_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="164" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/descent_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_altitude_descent" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/descent_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_altitude_descent" />
</LinearLayout> </LinearLayout>
</LinearLayout> <View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dashboard_divider" />
<View <LinearLayout
android:layout_width="match_parent" android:id="@+id/details_view"
android:layout_height="1dp" android:layout_width="match_parent"
android:background="?attr/dashboard_divider" /> android:layout_height="48dp"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout <net.osmand.plus.widgets.TextViewEx
android:id="@+id/details_view" android:id="@+id/analyze_on_map"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="48dp" android:layout_height="match_parent"
android:gravity="center" android:layout_weight="1"
android:orientation="horizontal"> android:background="?attr/selectableItemBackground"
android:gravity="start|center_vertical"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:text="@string/analyze_on_map"
android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/analyze_on_map" android:id="@+id/overflow_menu"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:gravity="start|center_vertical" android:gravity="end|center_vertical"
android:paddingStart="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:text="@string/analyze_on_map" android:text="@string/shared_string_options"
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/overflow_menu"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="end|center_vertical"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:text="@string/shared_string_options"
android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

583
OsmAnd/res/layout/gpx_item_general.xml
View file

@ -1,346 +1,339 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/bg_color" android:background="?attr/bg_color"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <com.github.mikephil.charting.charts.LineChart
android:layout_width="match_parent" android:id="@+id/chart"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="@dimen/list_item_description_width"
android:layout_gravity="center_vertical" />
<com.github.mikephil.charting.charts.LineChart <LinearLayout
android:id="@+id/chart" android:id="@+id/gpx_join_gaps_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/list_item_description_width" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" /> android:background="?attr/selectableItemBackground"
android:minHeight="@dimen/card_row_min_height"
android:orientation="horizontal">
<LinearLayout <net.osmand.plus.widgets.TextViewEx
android:id="@+id/gpx_join_gaps_container" android:id="@+id/gpx_join_gaps_text"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="?attr/selectableItemBackground" android:layout_weight="1"
android:minHeight="@dimen/card_row_min_height" android:gravity="center_vertical"
android:orientation="horizontal"> android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:text="@string/join_segments"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <androidx.appcompat.widget.SwitchCompat
android:id="@+id/gpx_join_gaps_text" android:id="@+id/gpx_join_gaps_switch"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:background="@null"
android:gravity="center_vertical" android:clickable="false"
android:paddingStart="@dimen/content_padding" android:focusable="false"
android:paddingLeft="@dimen/content_padding" android:focusableInTouchMode="false"
android:paddingEnd="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:text="@string/join_segments" android:paddingEnd="@dimen/content_padding"
android:textColor="?android:attr/textColorPrimary" android:paddingRight="@dimen/content_padding" />
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<androidx.appcompat.widget.SwitchCompat </LinearLayout>
android:id="@+id/gpx_join_gaps_switch"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" />
</LinearLayout> <LinearLayout
android:id="@+id/distance_time_span"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/context_menu_first_line_top_margin"
android:paddingBottom="@dimen/content_padding">
<LinearLayout <LinearLayout
android:id="@+id/distance_time_span" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginStart="@dimen/content_padding"
android:orientation="horizontal" android:layout_marginLeft="@dimen/content_padding"
android:paddingTop="@dimen/context_menu_first_line_top_margin" android:layout_marginEnd="@dimen/content_padding_small"
android:paddingBottom="@dimen/content_padding"> android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/distance_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/distance"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/distance_desc" android:id="@+id/distance_text"
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/distance" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="40 km" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/distance_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="40 km" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/distance_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_distance_16" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/distance_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_distance_16" />
</LinearLayout> <LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/duration_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/shared_string_time_span"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/duration_desc" android:id="@+id/duration_text"
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_span" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="3:32:44" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/duration_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="3:32:44" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/duration_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_time_span_16" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/duration_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_time_span_16" />
</LinearLayout> </LinearLayout>
</LinearLayout> <LinearLayout
android:id="@+id/list_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout <View
android:id="@+id/list_divider" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginStart="@dimen/content_padding_small"
android:orientation="horizontal"> android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:background="?attr/dashboard_divider" />
<View </LinearLayout>
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:background="?attr/dashboard_divider" />
</LinearLayout> <LinearLayout
android:id="@+id/start_end_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/context_menu_first_line_top_margin"
android:paddingBottom="@dimen/content_padding_small">
<LinearLayout <LinearLayout
android:id="@+id/start_end_time" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginStart="@dimen/content_padding"
android:orientation="horizontal" android:layout_marginLeft="@dimen/content_padding"
android:paddingTop="@dimen/context_menu_first_line_top_margin" android:layout_marginEnd="@dimen/content_padding_small"
android:paddingBottom="@dimen/content_padding_small"> android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/start_time_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/shared_string_start_time"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/start_time_desc" android:id="@+id/start_time_text"
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_start_time" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="15:04:58" />
<net.osmand.plus.widgets.TextViewEx <TextView
android:id="@+id/start_time_text" android:id="@+id/start_date_text"
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:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" tools:text="Aug 8, 2016" />
tools:text="15:04:58" />
<TextView </LinearLayout>
android:id="@+id/start_date_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
tools:text="Aug 8, 2016" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/start_time_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_time_start_16" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/start_time_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_time_start_16" />
</LinearLayout> <LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/end_time_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/shared_string_end_time"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/end_time_desc" android:id="@+id/end_time_text"
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_end_time" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="20:58:00" />
<net.osmand.plus.widgets.TextViewEx <TextView
android:id="@+id/end_time_text" android:id="@+id/end_date_text"
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:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" tools:text="Aug 8, 2016" />
tools:text="20:58:00" />
<TextView </LinearLayout>
android:id="@+id/end_date_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
tools:text="Aug 8, 2016" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/end_time_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_time_end_16" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/end_time_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="@dimen/subHeaderPadding"
osmand:srcCompat="@drawable/ic_action_time_end_16" />
</LinearLayout> </LinearLayout>
</LinearLayout> <View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dashboard_divider" />
<View <LinearLayout
android:layout_width="match_parent" android:id="@+id/details_view"
android:layout_height="1dp" android:layout_width="match_parent"
android:background="?attr/dashboard_divider" /> android:layout_height="48dp"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout <net.osmand.plus.widgets.TextViewEx
android:id="@+id/details_view" android:id="@+id/analyze_on_map"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="48dp" android:layout_height="match_parent"
android:gravity="center" android:layout_weight="1"
android:orientation="horizontal"> android:background="?attr/selectableItemBackground"
android:gravity="start|center_vertical"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:text="@string/analyze_on_map"
android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/analyze_on_map" android:id="@+id/overflow_menu"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:gravity="start|center_vertical" android:gravity="end|center_vertical"
android:paddingStart="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:text="@string/analyze_on_map" android:text="@string/shared_string_options"
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/overflow_menu"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="end|center_vertical"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:text="@string/shared_string_options"
android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -1,330 +1,323 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/bg_color" android:background="?attr/bg_color"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <com.github.mikephil.charting.charts.LineChart
android:layout_width="match_parent" android:id="@+id/chart"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="150dp"
android:layout_gravity="center_vertical" />
<com.github.mikephil.charting.charts.LineChart <LinearLayout
android:id="@+id/chart" android:id="@+id/gpx_join_gaps_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="150dp" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" /> android:background="?attr/selectableItemBackground"
android:minHeight="@dimen/card_row_min_height"
android:orientation="horizontal">
<LinearLayout <net.osmand.plus.widgets.TextViewEx
android:id="@+id/gpx_join_gaps_container" android:id="@+id/gpx_join_gaps_text"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="?attr/selectableItemBackground" android:layout_weight="1"
android:minHeight="@dimen/card_row_min_height" android:gravity="center_vertical"
android:orientation="horizontal"> android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:text="@string/join_segments"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <androidx.appcompat.widget.SwitchCompat
android:id="@+id/gpx_join_gaps_text" android:id="@+id/gpx_join_gaps_switch"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:background="@null"
android:gravity="center_vertical" android:clickable="false"
android:paddingStart="@dimen/content_padding" android:focusable="false"
android:paddingLeft="@dimen/content_padding" android:focusableInTouchMode="false"
android:paddingEnd="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:text="@string/join_segments" android:paddingEnd="@dimen/content_padding"
android:textColor="?android:attr/textColorPrimary" android:paddingRight="@dimen/content_padding" />
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<androidx.appcompat.widget.SwitchCompat </LinearLayout>
android:id="@+id/gpx_join_gaps_switch"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" />
</LinearLayout> <LinearLayout
android:id="@+id/average_max"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="13dp"
android:paddingBottom="11dp">
<LinearLayout <LinearLayout
android:id="@+id/average_max" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginStart="@dimen/content_padding"
android:orientation="horizontal" android:layout_marginLeft="@dimen/content_padding"
android:paddingTop="13dp" android:layout_marginEnd="@dimen/content_padding_small"
android:paddingBottom="11dp"> android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/average_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/average_speed"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/average_desc" android:id="@+id/average_text"
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/average_speed" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="6.8 km/h" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/average_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="6.8 km/h" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/average_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="2dp"
osmand:srcCompat="@drawable/ic_action_speed" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/average_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="2dp"
osmand:srcCompat="@drawable/ic_action_speed" />
</LinearLayout> <LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding_small" android:layout_weight="1"
android:layout_marginLeft="@dimen/content_padding_small" android:orientation="vertical">
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout <TextView
android:layout_width="0dp" android:id="@+id/max_desc"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:orientation="vertical"> android:background="@null"
android:text="@string/max_speed"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" />
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/max_desc" android:id="@+id/max_text"
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/max_speed" android:textColor="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_desc_text_size"
android:textSize="@dimen/default_desc_text_size" /> osmand:typeface="@string/font_roboto_medium"
tools:text="31.3 km/h" />
<net.osmand.plus.widgets.TextViewEx </LinearLayout>
android:id="@+id/max_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="31.3 km/h" />
</LinearLayout> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/max_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="2dp"
osmand:srcCompat="@drawable/ic_action_max_speed_16" />
<androidx.appcompat.widget.AppCompatImageView </LinearLayout>
android:id="@+id/max_icon"
android:layout_width="wrap_content"
android:layout_height="@dimen/poi_icon_size"
android:layout_marginTop="2dp"
osmand:srcCompat="@drawable/ic_action_max_speed_16" />
</LinearLayout> </LinearLayout>
</LinearLayout> <LinearLayout
android:id="@+id/list_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout <View
android:id="@+id/list_divider" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:layout_marginStart="@dimen/content_padding_small"
android:orientation="horizontal"> android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:background="?attr/dashboard_divider" />
<View </LinearLayout>
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small"
android:background="?attr/dashboard_divider" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/time_distance" android:id="@+id/time_distance"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="13dp" android:paddingTop="13dp"
android:paddingBottom="11dp"> android:paddingBottom="11dp">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding_small" android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small" android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/time_moving_desc" android:id="@+id/time_moving_desc"
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/shared_string_time_moving"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" /> android:textSize="@dimen/default_desc_text_size" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/time_moving_text" android:id="@+id/time_moving_text"
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:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:text="174" /> tools:text="174" />
</LinearLayout> </LinearLayout>
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/time_moving_icon" android:id="@+id/time_moving_icon"
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_span" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/content_padding" android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding_small" android:layout_marginEnd="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding_small" android:layout_marginRight="@dimen/content_padding_small"
android:layout_weight="1" android:layout_weight="1"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/distance_desc" android:id="@+id/distance_desc"
android:layout_width="match_parent" android:layout_width="match_parent"
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/distance_moving" android:text="@string/distance_moving"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/default_desc_text_size" /> android:textSize="@dimen/default_desc_text_size" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/distance_text" android:id="@+id/distance_text"
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:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium" osmand:typeface="@string/font_roboto_medium"
tools:text="42 km" /> tools:text="42 km" />
</LinearLayout> </LinearLayout>
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/distance_icon" android:id="@+id/distance_icon"
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="5dp" android:layout_marginTop="5dp"
osmand:srcCompat="@drawable/ic_action_polygom_dark" /> osmand:srcCompat="@drawable/ic_action_polygom_dark" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider" />
<LinearLayout <LinearLayout
android:id="@+id/details_view" android:id="@+id/details_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/analyze_on_map" android:id="@+id/analyze_on_map"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:paddingStart="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:text="@string/analyze_on_map" android:text="@string/analyze_on_map"
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/overflow_menu" android:id="@+id/overflow_menu"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:gravity="end|center_vertical" android:gravity="end|center_vertical"
android:paddingStart="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding" android:paddingRight="@dimen/content_padding"
android:text="@string/shared_string_options" android:text="@string/shared_string_options"
android:textColor="?attr/color_dialog_buttons" android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -59,7 +59,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
private TrackDisplayHelper displayHelper; private TrackDisplayHelper displayHelper;
private TrackActivityFragmentAdapter fragmentAdapter; private TrackActivityFragmentAdapter fragmentAdapter;
private SegmentGPXAdapter adapter; private SegmentGPXAdapter adapter;
private final GpxDisplayItemType[] filterTypes = new GpxDisplayItemType[]{GpxDisplayItemType.TRACK_SEGMENT}; private final GpxDisplayItemType[] filterTypes = new GpxDisplayItemType[] {GpxDisplayItemType.TRACK_SEGMENT};
private IconPopupMenu optionsPopupMenu; private IconPopupMenu optionsPopupMenu;
private boolean updateEnable; private boolean updateEnable;
@ -304,7 +304,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
} }
@Override @Override
public void showOptionsPopupMenu(final View view, final TrkSegment segment, final boolean confirmDeletion, final GpxDisplayItem gpxItem) { public void showOptionsPopupMenu(View view, final TrkSegment segment, final boolean confirmDeletion, final GpxDisplayItem gpxItem) {
FragmentActivity activity = getActivity(); FragmentActivity activity = getActivity();
if (activity != null) { if (activity != null) {
IconPopupMenu optionsPopupMenu = new IconPopupMenu(activity, view.findViewById(R.id.overflow_menu)); IconPopupMenu optionsPopupMenu = new IconPopupMenu(activity, view.findViewById(R.id.overflow_menu));
@ -312,8 +312,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
optionsPopupMenu.getMenuInflater().inflate(R.menu.track_segment_menu, menu); optionsPopupMenu.getMenuInflater().inflate(R.menu.track_segment_menu, menu);
menu.findItem(R.id.action_edit).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_edit_dark)); menu.findItem(R.id.action_edit).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_edit_dark));
menu.findItem(R.id.action_delete).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_remove_dark)); menu.findItem(R.id.action_delete).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_remove_dark));
boolean isSelectedTrackRecordingNow = displayHelper.getGpx().showCurrentTrack; if (displayHelper.getGpx().showCurrentTrack) {
if (isSelectedTrackRecordingNow) {
menu.findItem(R.id.split_interval).setVisible(false); menu.findItem(R.id.split_interval).setVisible(false);
} else { } else {
menu.findItem(R.id.split_interval).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_split_interval)); menu.findItem(R.id.split_interval).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_split_interval));

10
OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
View file

@ -351,7 +351,6 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
if (mapActivity != null && trackChartPoints != null) { if (mapActivity != null && trackChartPoints != null) {
mapActivity.getMapLayers().getGpxLayer().setTrackChartPoints(trackChartPoints); mapActivity.getMapLayers().getGpxLayer().setTrackChartPoints(trackChartPoints);
} }
updateHeader();
startLocationUpdate(); startLocationUpdate();
} }
@ -570,7 +569,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
segment = segments.get(0); segment = segments.get(0);
} }
} }
GpxDisplayItemType[] filterTypes = new GpxDisplayItemType[]{GpxDisplayItemType.TRACK_SEGMENT}; GpxDisplayItemType[] filterTypes = new GpxDisplayItemType[] {GpxDisplayItemType.TRACK_SEGMENT};
List<GpxDisplayItem> items = TrackDisplayHelper.flatten(displayHelper.getOriginalGroups(filterTypes)); List<GpxDisplayItem> items = TrackDisplayHelper.flatten(displayHelper.getOriginalGroups(filterTypes));
if (segment != null && !Algorithms.isEmpty(items)) { if (segment != null && !Algorithms.isEmpty(items)) {
SplitSegmentDialogFragment.showInstance(fragmentManager, displayHelper, items.get(0), segment); SplitSegmentDialogFragment.showInstance(fragmentManager, displayHelper, items.get(0), segment);
@ -734,16 +733,15 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
} }
@Override @Override
public void showOptionsPopupMenu(final View view, final TrkSegment segment, final boolean confirmDeletion, final GpxDisplayItem gpxItem) { public void showOptionsPopupMenu(View view, final TrkSegment segment, final boolean confirmDeletion, final GpxDisplayItem gpxItem) {
FragmentActivity activity = getActivity(); FragmentActivity activity = getActivity();
if (activity != null) { if (activity != null) {
IconPopupMenu optionsPopupMenu = new IconPopupMenu(activity, view.findViewById(R.id.overflow_menu)); IconPopupMenu optionsPopupMenu = new IconPopupMenu(activity, view.findViewById(R.id.overflow_menu));
final Menu menu = optionsPopupMenu.getMenu(); Menu menu = optionsPopupMenu.getMenu();
optionsPopupMenu.getMenuInflater().inflate(R.menu.track_segment_menu, menu); optionsPopupMenu.getMenuInflater().inflate(R.menu.track_segment_menu, menu);
menu.findItem(R.id.action_edit).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_edit_dark)); menu.findItem(R.id.action_edit).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_edit_dark));
menu.findItem(R.id.action_delete).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_remove_dark)); menu.findItem(R.id.action_delete).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_remove_dark));
boolean isSelectedTrackRecordingNow = displayHelper.getGpx().showCurrentTrack; if (getGpx().showCurrentTrack) {
if (isSelectedTrackRecordingNow) {
menu.findItem(R.id.split_interval).setVisible(false); menu.findItem(R.id.split_interval).setVisible(false);
} else { } else {
menu.findItem(R.id.split_interval).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_split_interval)); menu.findItem(R.id.split_interval).setIcon(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_split_interval));