mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-03 19:33:49 +00:00
Implement Track Selection and elevation info display on PP
Signed-off-by: kavikhalique <kavikhalique3@gmail.com>
This commit is contained in:
committed by
Konstantin Pastbin
parent
ebb7c45d1a
commit
f1628c70bc
10
android/app/src/main/res/drawable/ic_distance_travelled.xml
Normal file
10
android/app/src/main/res/drawable/ic_distance_travelled.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<vector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:height="24dp"
|
||||
android:viewportHeight="590.91"
|
||||
android:viewportWidth="590.91"
|
||||
android:width="24dp">
|
||||
<path
|
||||
android:fillColor="#000000"
|
||||
android:pathData="M541.67,295.45l-86.21,-86.21l0,71.21l-320,0l0,-71.21l-86.21,86.21l86.21,86.21l0,-71.21l320,0l0,71.21z" />
|
||||
</vector>
|
||||
@@ -3,7 +3,7 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/elevation_profile"
|
||||
android:layout_width="@dimen/place_page_width"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/margin_base"
|
||||
android:paddingBottom="@dimen/margin_base"
|
||||
|
||||
@@ -8,7 +8,9 @@
|
||||
<app.organicmaps.widget.placepage.ElevationProfileChart
|
||||
android:id="@+id/elevation_profile_chart"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true" />
|
||||
<app.organicmaps.widget.placepage.FloatingMarkerView
|
||||
android:id="@+id/floating_marker"
|
||||
android:visibility="gone"
|
||||
|
||||
@@ -1,37 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.core.widget.NestedScrollView
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/elevation_profile"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/margin_half_plus"
|
||||
android:paddingBottom="@dimen/margin_base"
|
||||
android:background="?cardBackground"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:fillViewport="true"
|
||||
android:focusable="true"
|
||||
app:behavior_peekHeight="@dimen/elevation_profile_peek_height"
|
||||
app:layout_behavior="@string/placepage_behavior">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:id="@+id/pull_icon_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/margin_half"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginStart="@dimen/margin_base"
|
||||
android:layout_marginEnd="@dimen/margin_base"
|
||||
android:layout_marginBottom="@dimen/margin_eighth"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
<ImageView
|
||||
android:id="@+id/pull_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" />
|
||||
</LinearLayout>
|
||||
<include layout="@layout/elevation_profile_internal" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
@@ -4,22 +4,188 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:showIn="@layout/elevation_profile_bottom_sheet">
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
<LinearLayout
|
||||
android:id="@+id/title_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/margin_half"
|
||||
android:layout_marginStart="@dimen/margin_base"
|
||||
android:layout_marginEnd="@dimen/margin_base"
|
||||
android:paddingBottom="@dimen/margin_base"
|
||||
android:textAppearance="?fontHeadline6"
|
||||
tools:text="Xindian Shitoushan Trail" />
|
||||
<include
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/margin_base"
|
||||
android:layout_marginEnd="@dimen/margin_base"
|
||||
android:paddingTop="@dimen/margin_half"
|
||||
android:paddingBottom="@dimen/margin_base"
|
||||
android:textAppearance="?fontHeadline6"
|
||||
tools:text="Xindian Shitoushan Trail" />
|
||||
<include
|
||||
layout="@layout/list_divider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/divider_height"
|
||||
android:layout_marginStart="@dimen/margin_base"
|
||||
android:layout_marginEnd="@dimen/margin_base" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/divider_height"
|
||||
android:layout_marginStart="@dimen/margin_base"
|
||||
android:layout_marginEnd="@dimen/margin_base"
|
||||
layout="@layout/list_divider" />
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/margin_half"
|
||||
android:layout_marginTop="@dimen/margin_quarter"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
android:layout_marginBottom="@dimen/margin_half_plus_eight"
|
||||
android:baselineAligned="false"
|
||||
android:orientation="horizontal">
|
||||
<!--card one-->
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center">
|
||||
<LinearLayout
|
||||
android:id="@+id/ascent_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:layout_width="@dimen/margin_base_plus_quarter"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_quarter"
|
||||
app:srcCompat="@drawable/ic_ascent"
|
||||
app:tint="?elevationProfilePropIconTint" />
|
||||
<TextView
|
||||
android:id="@+id/ascent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
tools:text="10000 m" />
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/ascent_container"
|
||||
android:layout_alignStart="@+id/ascent_container"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="@string/elevation_profile_ascent"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body5" />
|
||||
</RelativeLayout>
|
||||
<!--card two-->
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center">
|
||||
<LinearLayout
|
||||
android:id="@+id/descent_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:layout_width="@dimen/margin_base_plus_quarter"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_quarter"
|
||||
app:srcCompat="@drawable/ic_descent"
|
||||
app:tint="?elevationProfilePropIconTint" />
|
||||
<TextView
|
||||
android:id="@+id/descent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
tools:text="10000 m" />
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/descent_container"
|
||||
android:layout_alignStart="@+id/descent_container"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="@string/elevation_profile_descent"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body5" />
|
||||
</RelativeLayout>
|
||||
<!--card three-->
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:id="@+id/max_height_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_quarter"
|
||||
app:srcCompat="@drawable/ic_maxalt"
|
||||
app:tint="?elevationProfilePropIconTint" />
|
||||
<TextView
|
||||
android:id="@+id/max_altitude"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
tools:text="10000 m" />
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/max_height_container"
|
||||
android:layout_alignStart="@+id/max_height_container"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="@string/elevation_profile_max_elevation"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body5" />
|
||||
</RelativeLayout>
|
||||
<!--card four-->
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:id="@+id/min_elevation_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
app:srcCompat="@drawable/ic_minalt"
|
||||
app:tint="?elevationProfilePropIconTint" />
|
||||
<TextView
|
||||
android:id="@+id/min_altitude"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
tools:text="10000 m" />
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/min_elevation_container"
|
||||
android:layout_alignStart="@+id/min_elevation_container"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="@string/elevation_profile_min_elevation"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body5" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/chart_container"
|
||||
android:layout_width="match_parent"
|
||||
@@ -27,142 +193,13 @@
|
||||
android:gravity="center"
|
||||
android:minHeight="@dimen/elevation_profile_chart_min_height"
|
||||
android:orientation="vertical">
|
||||
<include layout="@layout/elevation_profile"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/margin_base"
|
||||
android:layout_marginStart="@dimen/margin_base"
|
||||
android:layout_marginEnd="@dimen/margin_base"
|
||||
android:minHeight="@dimen/elevation_profile_chart_info_min_height"
|
||||
android:orientation="horizontal"
|
||||
android:baselineAligned="false">
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="@dimen/margin_quarter"
|
||||
android:layout_weight="1"
|
||||
android:background="?elevationProfilePropertyBg"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/margin_quarter_plus">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:srcCompat="@drawable/ic_ascent"
|
||||
app:tint="?elevationProfilePropIconTint" />
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/margin_eighth"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="@string/elevation_profile_ascent"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body5" />
|
||||
<TextView
|
||||
android:id="@+id/ascent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:textAppearance"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
tools:text="10000 m" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="@dimen/margin_quarter"
|
||||
android:layout_weight="1"
|
||||
android:background="?elevationProfilePropertyBg"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/margin_quarter_plus">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:srcCompat="@drawable/ic_descent"
|
||||
app:tint="?elevationProfilePropIconTint" />
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/margin_eighth"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="@string/elevation_profile_descent"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body5" />
|
||||
<TextView
|
||||
android:id="@+id/descent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:textAppearance"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
tools:text="10000 m" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="@dimen/margin_quarter"
|
||||
android:layout_weight="1"
|
||||
android:background="?elevationProfilePropertyBg"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/margin_quarter_plus">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:srcCompat="@drawable/ic_maxalt"
|
||||
app:tint="?elevationProfilePropIconTint" />
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/margin_eighth"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="@string/elevation_profile_max_elevation"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body5" />
|
||||
<TextView
|
||||
android:id="@+id/max_altitude"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:textAppearance"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
tools:text="10000 m" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:background="?elevationProfilePropertyBg"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/margin_quarter_plus">
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:srcCompat="@drawable/ic_minalt"
|
||||
app:tint="?elevationProfilePropIconTint" />
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/margin_eighth"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:text="@string/elevation_profile_min_elevation"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body5" />
|
||||
<TextView
|
||||
android:id="@+id/min_altitude"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:textAppearance"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
tools:text="10000 m" />
|
||||
</LinearLayout>
|
||||
<include layout="@layout/elevation_profile" />
|
||||
</LinearLayout>
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/margin_base"
|
||||
android:layout_marginStart="@dimen/margin_base"
|
||||
android:layout_marginTop="@dimen/margin_quarter_plus"
|
||||
android:layout_marginEnd="@dimen/margin_base"
|
||||
android:orientation="horizontal">
|
||||
<LinearLayout
|
||||
@@ -174,21 +211,21 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:textAppearance"
|
||||
android:text="@string/elevation_profile_difficulty"/>
|
||||
android:text="@string/elevation_profile_difficulty"
|
||||
android:textAppearance="?android:textAppearance" />
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginBottom="@dimen/elevation_profile_dot_levels_margin"
|
||||
android:layout_gravity="bottom"
|
||||
android:layout_marginStart="@dimen/margin_half_plus_eight">
|
||||
android:layout_marginStart="@dimen/margin_half_plus_eight"
|
||||
android:layout_marginBottom="@dimen/elevation_profile_dot_levels_margin"
|
||||
android:orientation="horizontal">
|
||||
<TextView
|
||||
android:id="@+id/difficulty_level_1"
|
||||
android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
|
||||
android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
|
||||
android:background="@drawable/dot_elevation_difficulty"
|
||||
android:enabled="false"/>
|
||||
android:enabled="false" />
|
||||
<TextView
|
||||
android:id="@+id/difficulty_level_2"
|
||||
android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
|
||||
@@ -196,37 +233,37 @@
|
||||
android:layout_marginStart="@dimen/margin_quarter"
|
||||
android:layout_marginEnd="@dimen/margin_quarter"
|
||||
android:background="@drawable/dot_elevation_difficulty"
|
||||
android:enabled="false"/>
|
||||
android:enabled="false" />
|
||||
<TextView
|
||||
android:id="@+id/difficulty_level_3"
|
||||
android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
|
||||
android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
|
||||
android:background="@drawable/dot_elevation_difficulty"
|
||||
android:enabled="false"/>
|
||||
android:enabled="false" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_toEndOf="@id/difficulty_container"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:id="@+id/time_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_toEndOf="@id/difficulty_container"
|
||||
android:gravity="end"
|
||||
android:orientation="horizontal">
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:textAppearance"
|
||||
android:text="@string/elevation_profile_time" />
|
||||
android:text="@string/elevation_profile_time"
|
||||
android:textAppearance="?android:textAppearance" />
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/margin_half"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?android:textAppearanceMedium"
|
||||
android:textStyle="bold"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
tools:text="3 h. 25 min." />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
tools:ignore="Overdraw">
|
||||
<ImageView
|
||||
android:id="@+id/image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="@dimen/elevation_profile_marker_width"
|
||||
android:layout_height="@dimen/elevation_profile_marker_width"
|
||||
android:layout_centerVertical="true"
|
||||
app:srcCompat="@drawable/ic_graph_point" />
|
||||
<RelativeLayout
|
||||
@@ -43,39 +43,41 @@
|
||||
android:maxWidth="@dimen/dialog_min_height"
|
||||
android:padding="@dimen/margin_quarter_plus"
|
||||
tools:ignore="UnusedAttribute">
|
||||
<TextView
|
||||
android:id="@+id/distance_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:maxWidth="@dimen/dialog_min_height"
|
||||
android:singleLine="true"
|
||||
android:textSize="@dimen/margin_half_plus_eight" />
|
||||
<ImageView
|
||||
android:id="@+id/distance_icon"
|
||||
android:layout_width="@dimen/margin_half_plus"
|
||||
android:layout_height="@dimen/margin_half_plus"
|
||||
app:srcCompat="@drawable/ic_distance_travelled"
|
||||
app:tint="?ppFloatingMarkerIconColor" />
|
||||
<TextView
|
||||
android:id="@+id/distance_value"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/distance_text"
|
||||
android:layout_marginStart="@dimen/margin_quarter"
|
||||
android:layout_toEndOf="@+id/distance_icon"
|
||||
android:ellipsize="end"
|
||||
android:maxWidth="@dimen/dialog_min_height"
|
||||
android:singleLine="true"
|
||||
android:textSize="@dimen/margin_half_plus_eight" />
|
||||
android:textSize="@dimen/margin_half_plus_eight"
|
||||
tools:text="10 km" />
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignStart="@+id/distance_icon"
|
||||
android:layout_below="@id/distance_value"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
<ImageView
|
||||
android:id="@+id/triangle"
|
||||
android:layout_width="@dimen/margin_half_plus"
|
||||
android:layout_height="@dimen/margin_half_plus"
|
||||
android:layout_width="@dimen/margin_half_plus_eight"
|
||||
android:layout_height="@dimen/margin_half_plus_eight"
|
||||
app:srcCompat="?elevationProfileSelectedPointTriangle" />
|
||||
<TextView
|
||||
android:id="@+id/altitude"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
tools:text="900 m"
|
||||
android:layout_marginStart="@dimen/margin_quarter"
|
||||
android:ellipsize="end"
|
||||
android:singleLine="true"
|
||||
|
||||
@@ -18,16 +18,6 @@
|
||||
android:textAppearance="?android:attr/textAppearance"
|
||||
tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/tv__bookmark_edit"
|
||||
style="@style/PlacePageMetadataText.Button"
|
||||
android:gravity="center"
|
||||
android:layout_height="@dimen/height_block_base"
|
||||
android:background="?clickableBackground"
|
||||
android:paddingEnd="@dimen/margin_base"
|
||||
android:paddingStart="@dimen/margin_base"
|
||||
android:text="@string/placepage_edit_bookmark_button"/>
|
||||
|
||||
<include
|
||||
layout="@layout/divider_horizontal"/>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
tools:layout="@layout/place_page_bookmark_fragment" />
|
||||
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
android:id="@+id/place_page_wikipedia_fragment"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="@dimen/margin_quarter">
|
||||
android:orientation="vertical">
|
||||
<include
|
||||
android:id="@+id/pull_icon_container"
|
||||
layout="@layout/bottom_sheet_handle" />
|
||||
@@ -180,4 +179,62 @@
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/category_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/margin_half"
|
||||
android:orientation="vertical">
|
||||
<include layout="@layout/place_page_shadow_gap" />
|
||||
<RelativeLayout
|
||||
android:id="@+id/container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?ppBackground">
|
||||
<ImageView
|
||||
android:id="@+id/item_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?clickableBackground"
|
||||
android:layout_centerVertical="true"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:paddingHorizontal="8dp"
|
||||
android:paddingVertical="5dp" />
|
||||
<TextView
|
||||
android:id="@+id/tv__category"
|
||||
style="@style/PlacePageMetadataText.Button"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toStartOf="@id/edit_Bookmark"
|
||||
android:layout_toEndOf="@id/item_icon"
|
||||
android:background="?clickableBackground"
|
||||
android:paddingStart="@dimen/margin_quarter"
|
||||
android:paddingEnd="@dimen/margin_quarter"
|
||||
android:textAllCaps="false"
|
||||
tools:text="@string/categories" />
|
||||
<ImageView
|
||||
android:id="@+id/edit_Bookmark"
|
||||
style="@style/MwmWidget.Editor.MetadataIcon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:background="?clickableBackground"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:src="@drawable/ic_edit" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
android:id="@+id/place_page_track_fragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
tools:layout="@layout/placepage_track_fragment" />
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="horizontal"
|
||||
android:background="@color/black_8"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/margin_half" />
|
||||
12
android/app/src/main/res/layout/placepage_track_fragment.xml
Normal file
12
android/app/src/main/res/layout/placepage_track_fragment.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/place_page_track_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
<include layout="@layout/place_page_shadow_gap" />
|
||||
<include
|
||||
android:id="@+id/elevation_profile"
|
||||
layout="@layout/elevation_profile_bottom_sheet" />
|
||||
</LinearLayout>
|
||||
@@ -46,6 +46,8 @@
|
||||
<dimen name="place_page_width">320dp</dimen>
|
||||
<dimen name="place_page_buttons_height">56dp</dimen>
|
||||
<dimen name="place_page_top_button">40dp</dimen>
|
||||
<dimen name="place_page_icon_size">32dp</dimen>
|
||||
<dimen name="place_page_icon_mark_size">20dp</dimen>
|
||||
|
||||
<dimen name="downloader_status_size">40dp</dimen>
|
||||
<dimen name="search_progress_size">32dp</dimen>
|
||||
@@ -75,12 +77,13 @@
|
||||
<dimen name="viewport_min_width">300dp</dimen>
|
||||
<dimen name="elevation_profile_peek_height">260dp</dimen>
|
||||
<dimen name="elevation_profile_chart_min_height">144dp</dimen>
|
||||
<dimen name="elevation_profile_chart_info_min_height">68dp</dimen>
|
||||
<dimen name="elevation_profile_chart_info_min_height">54dp</dimen>
|
||||
<dimen name="elevation_profile_difficulty_dot_size">10dp</dimen>
|
||||
<dimen name="elevation_profile_content_height">144dp</dimen>
|
||||
<dimen name="elevation_profile_height">108dp</dimen>
|
||||
<dimen name="elevation_profile_half_height">54dp</dimen>
|
||||
<dimen name="elevation_profile_height">80dp</dimen>
|
||||
<dimen name="elevation_profile_half_height">40dp</dimen>
|
||||
<dimen name="elevation_profile_dot_levels_margin">3dp</dimen>
|
||||
<dimen name="elevation_profile_marker_width">25dp</dimen>
|
||||
<dimen name="map_button_size">48dp</dimen>
|
||||
<dimen name="map_button_icon_size">28dp</dimen>
|
||||
<dimen name="map_button_arrow_icon_size">34dp</dimen>
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
<dimen name="text_size_body_3">14sp</dimen>
|
||||
<dimen name="text_size_body_4">12sp</dimen>
|
||||
<dimen name="text_size_body_5">10sp</dimen>
|
||||
<dimen name="text_size_body_6">8sp</dimen>
|
||||
<dimen name="text_size_caption">14sp</dimen>
|
||||
<dimen name="text_size_icon_title">10sp</dimen>
|
||||
<dimen name="text_size_button">16sp</dimen>
|
||||
|
||||
@@ -971,4 +971,5 @@
|
||||
<string name="closed_now">Closed now</string>
|
||||
<!-- Used in place page preview for next open/close time. eg. "closing in 30 min • at 19:30" -->
|
||||
<string name="at">at %s</string>
|
||||
<string name="PP_track_bottom_sheet_title">Save Track As</string>
|
||||
</resources>
|
||||
|
||||
@@ -93,6 +93,11 @@
|
||||
<item name="android:textColor">?android:textColorSecondary</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.Body6">
|
||||
<item name="android:textSize">@dimen/text_size_body_6</item>
|
||||
<item name="android:textColor">?android:textColorSecondary</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.Button">
|
||||
<item name="android:textSize">@dimen/text_size_button</item>
|
||||
<item name="android:textColor">?colorSecondary</item>
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
<attr name="iconTintLight" format="color" />
|
||||
<attr name="ppBackground" format="color" />
|
||||
<attr name="ppButtonsBackground" format="color" />
|
||||
<attr name="ppFloatingMarkerIconColor" format="color" />
|
||||
<attr name="navNextTurnFrame" format="reference" />
|
||||
<attr name="navNextNextTurnFrame" format="reference" />
|
||||
<attr name="navLanesBackgroundColor" format="reference" />
|
||||
|
||||
Reference in New Issue
Block a user