Bimba.git

diff --git a/app/src/main/java/ml/adamsprogs/bimba/departures/Departures.kt b/app/src/main/java/ml/adamsprogs/bimba/departures/Departures.kt
index b83f22452740c0609385f489d0f6da6d7a3e5a4e..596b5f1baf1f850d332b2fb4ed6e16f617959895 100644
--- a/app/src/main/java/ml/adamsprogs/bimba/departures/Departures.kt
+++ b/app/src/main/java/ml/adamsprogs/bimba/departures/Departures.kt
@@ -16,7 +16,6 @@
 class BimbaDepartureViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 	val root: View = itemView.findViewById(R.id.departure)
 	val lineIcon: ImageView = itemView.findViewById(R.id.line_icon)
-	val lineName: TextView = itemView.findViewById(R.id.line_name)
 	val departureTime: TextView = itemView.findViewById(R.id.departure_time)
 	val headsign: TextView = itemView.findViewById(R.id.departure_headsign)
 
@@ -32,8 +31,7 @@ 			holder?.root?.setOnClickListener {
 				onClickListener(departure)
 			}
 			holder?.lineIcon?.setImageBitmap(departure.line.icon(context!!))
-			holder?.lineName?.text = departure.line.name
-			holder?.headsign?.text = "» ${departure.headsign}"
+			holder?.headsign?.text = "${departure.line.name} » ${departure.headsign}"
 			val now = Calendar.getInstance()
 			val departureTime = Calendar.getInstance().apply {
 				set(Calendar.HOUR_OF_DAY, departure.time.Hour.toInt())




diff --git a/app/src/main/res/layout/departure.xml b/app/src/main/res/layout/departure.xml
index 1cff5f1dd2a69000e7717ef7b9b104dec7872e66..d9ce2b6980d6ace911615353fb90b9b8b85f72ff 100644
--- a/app/src/main/res/layout/departure.xml
+++ b/app/src/main/res/layout/departure.xml
@@ -1,54 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:id="@+id/departure"
 	android:layout_height="wrap_content">
 
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:id="@+id/line"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		app:layout_constraintBottom_toBottomOf="@+id/departure_headsign"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="@+id/departure_time">
-
-		<ImageView
-			android:id="@+id/line_icon"
-			android:layout_width="16dp"
-			android:layout_height="16dp"
-			app:layout_constraintEnd_toEndOf="@+id/line_name"
-			app:layout_constraintStart_toStartOf="@+id/line_name"
-			app:layout_constraintTop_toTopOf="parent"/>
+	<ImageView
+		android:id="@+id/line_icon"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
 
-		<TextView
-			android:id="@+id/line_name"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:text=""
-			android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/line_icon" />
-	</androidx.constraintlayout.widget.ConstraintLayout>
+		android:layout_marginStart="8dp"
+		app:layout_constraintBottom_toTopOf="@+id/departure_headsign"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="@+id/departure_time" />
 
 	<TextView
 		android:id="@+id/departure_time"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
 		android:layout_marginStart="16dp"
-		android:layout_marginTop="16dp"
 		android:text=""
 		android:textAppearance="@style/TextAppearance.Material3.DisplaySmall"
-		app:layout_constraintStart_toEndOf="@+id/line"
+		app:layout_constraintStart_toEndOf="@+id/line_icon"
 		app:layout_constraintTop_toTopOf="parent" />
 
 	<TextView
 		android:id="@+id/departure_headsign"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
 		android:text=""
 		android:textAppearance="@style/TextAppearance.Material3.BodySmall"
 		app:layout_constraintStart_toStartOf="@+id/departure_time"