Compare commits

..

1 Commits

Author SHA1 Message Date
Jean-Baptiste
400c182b89 [android] Fix routing plan screen on low dpi devices
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2026-01-01 08:19:20 +01:00
4 changed files with 185 additions and 2 deletions

View File

@@ -0,0 +1,181 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/routing_plan_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:clipToPadding="false">
<FrameLayout android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/MwmWidget.ToolbarStyle"
android:theme="@style/MwmWidget.ToolbarTheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="0dp">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/back"
android:layout_width="wrap_content"
android:padding="@dimen/margin_half_plus_eight"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentStart="true"
android:background="?selectableItemBackgroundBorderless"
app:srcCompat="?homeAsUpIndicator"
android:scaleType="center" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<RadioGroup
android:id="@+id/route_type"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:contentDescription="@string/route_type"
android:orientation="horizontal">
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/vehicle"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginStart="@dimen/routing_selector_wheel_margin"
android:contentDescription="@string/vehicle"
tools:button="@drawable/ic_car"
tools:buttonTint="?colorSecondary" />
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/pedestrian"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:contentDescription="@string/pedestrian"
tools:button="@drawable/ic_pedestrian"
tools:buttonTint="?iconTintLight" />
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/transit"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginEnd="@dimen/margin_half_plus"
android:contentDescription="@string/subway"
tools:button="@drawable/ic_route_planning_metro_40px"
tools:buttonTint="?iconTintLight" />
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/bicycle"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginEnd="12dp"
android:contentDescription="@string/bicycle"
tools:button="@drawable/ic_bike"
tools:buttonTint="?iconTintLight" />
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/ruler"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginEnd="12dp"
android:contentDescription="@string/ruler"
tools:button="@drawable/ic_ruler_route"
tools:buttonTint="?iconTintLight" />
</RadioGroup>
<LinearLayout
android:id="@+id/progress_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@id/route_type"
android:layout_centerInParent="true"
android:orientation="horizontal"
tools:background="#80FF0000">
<app.organicmaps.widget.WheelProgressView
android:id="@+id/progress_vehicle"
style="@style/MwmWidget.ProgressWheel.RoutingPlan"
android:layout_marginStart="@dimen/routing_selector_wheel_margin"
android:layout_marginTop="@dimen/routing_selector_wheel_margin"
android:layout_marginBottom="@dimen/routing_selector_wheel_margin"
tools:visibility="visible"/>
<app.organicmaps.widget.WheelProgressView
android:id="@+id/progress_pedestrian"
style="@style/MwmWidget.ProgressWheel.RoutingPlan"
android:layout_marginTop="@dimen/routing_selector_wheel_margin"
android:layout_marginBottom="@dimen/routing_selector_wheel_margin"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"/>
<app.organicmaps.widget.WheelProgressView
android:id="@+id/progress_transit"
style="@style/MwmWidget.ProgressWheel.RoutingPlan"
android:layout_marginTop="@dimen/routing_selector_wheel_margin"
android:layout_marginBottom="@dimen/routing_selector_wheel_margin"
android:layout_marginEnd="12dp"/>
<app.organicmaps.widget.WheelProgressView
android:id="@+id/progress_bicycle"
style="@style/MwmWidget.ProgressWheel.RoutingPlan"
android:layout_marginTop="@dimen/routing_selector_wheel_margin"
android:layout_marginBottom="@dimen/routing_selector_wheel_margin"
android:layout_marginEnd="12dp"/>
<app.organicmaps.widget.WheelProgressView
android:id="@+id/progress_ruler"
style="@style/MwmWidget.ProgressWheel.RoutingPlan"
android:layout_marginTop="@dimen/routing_selector_wheel_margin"
android:layout_marginBottom="@dimen/routing_selector_wheel_margin"
android:layout_marginEnd="12dp"/>
</LinearLayout>
</RelativeLayout>
</com.google.android.material.appbar.MaterialToolbar>
</FrameLayout>
<FrameLayout
android:id="@+id/driving_options_btn_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?drivingOptionsViewBg"
android:foreground="@drawable/shadow_top"
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:id="@+id/driving_options_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackgroundBorderless"
android:gravity="center"
android:minHeight="@dimen/height_block_base">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/driving_options_btn_img"
android:layout_width="@dimen/margin_base_plus"
android:layout_height="@dimen/margin_base_plus"
android:layout_gravity="center"
android:layout_marginEnd="@dimen/margin_half_plus_eight"
app:srcCompat="@drawable/ic_error_white" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/driving_options_btn_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:fontFamily="@string/robotoMedium"
android:gravity="center"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/text_light"
tools:text="test" />
</LinearLayout>
</FrameLayout>
<FrameLayout
style="@style/MwmWidget.FrameLayout.Elevation"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>

View File

@@ -924,6 +924,6 @@
<string name="advanced">Avancé</string>
<string name="download_resources_custom_url_summary_none">Non défini</string>
<string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
<string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète commençant par http:// ou https://</string>
<string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète débutant par https:// et se terminant par /</string>
<string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
</resources>

View File

@@ -972,5 +972,5 @@
<string name="download_resources_custom_url_title">Custom Map Server</string>
<string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
<string name="download_resources_custom_url_summary_none">Not set</string>
<string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
<string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string>
</resources>

View File

@@ -2,6 +2,8 @@
<resources>
<style name="MwmTextAppearance" parent="android:TextAppearance.Material">
<item name="android:fontFamily">@string/robotoRegular</item>
<!-- Force normal textStyle. Some devices (eg Lenovo P70), uses non-normal textStyle by default. -->
<item name="android:textStyle">normal</item>
</style>
<style name="MwmTextAppearance.Title">