drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-24 06:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Migrate last components in altitude chart panel to Material components

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-09-01 17:49:37 +02:00
committed by x7z4w
parent 7eb17f612b
commit a5e55491fc
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
View File

@@ -20,9 +20,7 @@ import android.text.style.StyleSpan;
import android.text.style.TypefaceSpan;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.TextView;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -70,13 +68,13 @@ final class RoutingBottomMenuController implements View.OnClickListener
@NonNull
private final MaterialButton mStart;
@NonNull
private final ImageView mAltitudeChart;
private final ShapeableImageView mAltitudeChart;
@NonNull
private final MaterialTextView mTime;
@NonNull
private final MaterialTextView mAltitudeDifference;
@NonNull
private final TextView mTimeVehicle;
private final MaterialTextView mTimeVehicle;
@Nullable
private final MaterialTextView mArrival;
@NonNull
@@ -102,9 +100,9 @@ final class RoutingBottomMenuController implements View.OnClickListener
View transitFrame = getViewById(activity, frame, R.id.transit_panel);
MaterialTextView error = (MaterialTextView) getViewById(activity, frame, R.id.error);
MaterialButton start = (MaterialButton) getViewById(activity, frame, R.id.start);
ImageView altitudeChart = (ImageView) getViewById(activity, frame, R.id.altitude_chart);
ShapeableImageView altitudeChart = (ShapeableImageView) getViewById(activity, frame, R.id.altitude_chart);
MaterialTextView time = (MaterialTextView) getViewById(activity, frame, R.id.time);
TextView timeVehicle = (TextView) getViewById(activity, frame, R.id.time_vehicle);
MaterialTextView timeVehicle = (MaterialTextView) getViewById(activity, frame, R.id.time_vehicle);
MaterialTextView altitudeDifference = (MaterialTextView) getViewById(activity, frame, R.id.altitude_difference);
MaterialTextView arrival = (MaterialTextView) getViewById(activity, frame, R.id.arrival);
View actionFrame = getViewById(activity, frame, R.id.routing_action_frame);
@@ -124,8 +122,8 @@ final class RoutingBottomMenuController implements View.OnClickListener
private RoutingBottomMenuController(@NonNull Activity context, @NonNull View altitudeChartFrame,
@NonNull View timeElevationLine, @NonNull View transitFrame,
@NonNull MaterialTextView error, @NonNull MaterialButton start,
@NonNull ImageView altitudeChart, @NonNull MaterialTextView time,
@NonNull MaterialTextView altitudeDifference, @NonNull TextView timeVehicle,
@NonNull ShapeableImageView altitudeChart, @NonNull MaterialTextView time,
@NonNull MaterialTextView altitudeDifference, @NonNull MaterialTextView timeVehicle,
@Nullable MaterialTextView arrival, @NonNull View actionFrame,
@Nullable RoutingBottomMenuListener listener)
{

4
android/app/src/main/res/layout-land/altitude_chart_panel.xml
View File

@@ -47,14 +47,14 @@
tools:visibility="visible" />
</LinearLayout>
<ImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/altitude_chart"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_gravity="center_vertical" />
<TextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/time_vehicle"
android:layout_height="wrap_content"
android:layout_width="match_parent"

4
android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
View File

@@ -56,7 +56,7 @@
android:layout_marginEnd="@dimen/margin_base"
android:layout_gravity="top" >
<TextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/time_vehicle"
android:layout_height="wrap_content"
android:layout_width="match_parent"
@@ -76,7 +76,7 @@
android:textSize="@dimen/text_size_routing_plan_detail_arrival"/>
</LinearLayout>
<ImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/altitude_chart"
android:layout_width="0dp"
android:layout_height="wrap_content"

4
android/app/src/main/res/layout/altitude_chart_panel.xml
View File

@@ -57,11 +57,11 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="1">
<ImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/altitude_chart"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
<TextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/time_vehicle"
android:layout_height="wrap_content"
android:layout_width="match_parent"