Bimba.git

commit 674f1f87d4539f9dc8f9d08d6f3648ff1758ed65

Author: Adam Evyčędo <git@apiote.xyz>

improve leg layout

 app/src/main/res/layout/journey_leg.xml | 144 ++++++++++++++++----------


diff --git a/app/src/main/res/layout/journey_leg.xml b/app/src/main/res/layout/journey_leg.xml
index 72d8f2d222507dbde33fb613c7c7f37e9e888818..f7079cff9258751dd2d8b3d04b631293c8d39dc6 100644
--- a/app/src/main/res/layout/journey_leg.xml
+++ b/app/src/main/res/layout/journey_leg.xml
@@ -1,65 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 SPDX-FileCopyrightText: Adam Evyčędo
 
 SPDX-License-Identifier: GPL-3.0-or-later
 -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="wrap_content"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tool="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:paddingStart="8dp"
+	android:paddingTop="8dp"
 	android:paddingEnd="8dp"
-	android:paddingTop="16dp"
-	android:paddingBottom="16dp"
-	xmlns:tool="http://schemas.android.com/tools">
-	<ImageView
-		android:id="@+id/leg_origin_image"
-		android:layout_width="wrap_content"
+	android:paddingBottom="8dp">
+
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:id="@+id/leg_origin_box"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:src="@drawable/origin"
-		android:contentDescription="@string/beginning_of_journey_s_leg"
+		android:paddingBottom="8dp"
+		android:paddingTop="8dp"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toTopOf="parent">
 
-	<com.google.android.material.textview.MaterialTextView
-		android:id="@+id/leg_origin"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-		app:layout_constraintBottom_toBottomOf="@+id/leg_origin_image"
-		app:layout_constraintStart_toEndOf="@+id/leg_origin_image"
-		app:layout_constraintTop_toTopOf="@+id/leg_origin_image"
-		tool:text="Polna" />
+		<ImageView
+			android:id="@+id/leg_origin_image"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/beginning_of_journey_s_leg"
+			android:src="@drawable/origin"
+			app:layout_constraintBottom_toBottomOf="@+id/leg_origin"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="@+id/leg_origin" />
 
-	<com.google.android.material.textview.MaterialTextView
-		android:id="@+id/leg_origin_time"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-		app:layout_constraintBottom_toBottomOf="@+id/leg_origin"
-		app:layout_constraintStart_toEndOf="@+id/leg_origin"
-		app:layout_constraintTop_toTopOf="@+id/leg_origin"
-		tool:text="11:25" />
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/leg_origin"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="8dp"
+			android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@+id/leg_origin_time"
+			app:layout_constraintStart_toEndOf="@+id/leg_origin_image"
+			app:layout_constraintTop_toTopOf="parent"
+			tool:text="Polna" />
 
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/leg_origin_time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+			app:layout_constraintBottom_toBottomOf="@+id/leg_origin"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="@+id/leg_origin"
+			tool:text="11:25" />
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:id="@+id/leg_mode_box"
+		android:paddingBottom="8dp"
+		android:paddingTop="8dp"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/leg_origin_box">
 	<ImageView
 		android:id="@+id/leg_mode_image"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
 		android:src="@drawable/bike"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/leg_origin_image"
-        tool:ignore="ContentDescription" />
+		app:layout_constraintTop_toTopOf="parent"
+		tool:ignore="ContentDescription" />
 
 	<com.google.android.material.textview.MaterialTextView
 		android:id="@+id/leg_line"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:paddingEnd="8dp"
 		android:paddingStart="8dp"
+		android:paddingEnd="8dp"
 		android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
 		app:layout_constraintBottom_toBottomOf="@+id/leg_mode_image"
 		app:layout_constraintStart_toEndOf="@+id/leg_mode_image"
@@ -68,45 +86,57 @@ 		tool:text="610" />
 
 	<com.google.android.material.textview.MaterialTextView
 		android:id="@+id/leg_distance"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="8dp"
 		android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
 		app:layout_constraintBottom_toBottomOf="@+id/leg_line"
+		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/leg_line"
 		app:layout_constraintTop_toTopOf="@+id/leg_line"
 		tool:text="12 stops" />
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
-	<ImageView
-		android:id="@+id/leg_destination_image"
-		android:layout_width="wrap_content"
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:paddingBottom="8dp"
+		android:paddingTop="8dp"
+		android:id="@+id/leg_destination_box"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
-		android:src="@drawable/destination"
-		android:contentDescription="@string/end_of_journey_s_leg"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/leg_mode_image" />
+		app:layout_constraintTop_toBottomOf="@id/leg_mode_box">
 
-	<com.google.android.material.textview.MaterialTextView
-		android:id="@+id/leg_destination"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-		app:layout_constraintBottom_toBottomOf="@+id/leg_destination_image"
-		app:layout_constraintStart_toEndOf="@+id/leg_destination_image"
-		app:layout_constraintTop_toTopOf="@+id/leg_destination_image"
-		tool:text="Dębiec" />
+		<ImageView
+			android:id="@+id/leg_destination_image"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/end_of_journey_s_leg"
+			android:src="@drawable/destination"
+			app:layout_constraintBottom_toBottomOf="@+id/leg_destination"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="@+id/leg_destination" />
+
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/leg_destination"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="8dp"
+			android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@+id/leg_destination_time"
+			app:layout_constraintStart_toEndOf="@+id/leg_destination_image"
+			app:layout_constraintTop_toTopOf="parent"
+			tool:text="Bardzo dluga nazwa przystanku na którym należy wysiąść" />
 
 	<com.google.android.material.textview.MaterialTextView
 		android:id="@+id/leg_destination_time"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
 		android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
 		app:layout_constraintBottom_toBottomOf="@+id/leg_destination"
-		app:layout_constraintStart_toEndOf="@+id/leg_destination"
+		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="@+id/leg_destination"
 		tool:text="11:30" />
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file