Merge pull request #774 from werman/fix/track-history-with-icons-disa…

…bled Fix track history UI when station icons are disabled
segler-alex · Mar 30, 2020 · e01eed0 · e01eed0
2 parents 847c9d6 + 1036fa2
commit e01eed0
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/app/src/main/res/layout/list_item_history_track_item.xml b/app/src/main/res/layout/list_item_history_track_item.xml
@@ -14,9 +14,9 @@
         android:layout_marginLeft="5dp"
         android:layout_marginEnd="20dp"
         android:layout_marginRight="20dp"
+        android:contentDescription="@null"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:contentDescription="@null" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/textViewTrackName"
@@ -25,32 +25,29 @@
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="4dp"
         android:ellipsize="marquee"
         android:singleLine="true"
+        app:layout_constraintBottom_toTopOf="@+id/textViewTrackArtist"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/imageViewStationIcon"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/barrier1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids=",textViewTrackName,imageViewStationIcon" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread" />
 
     <TextView
         android:id="@+id/textViewTrackArtist"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
         android:ellipsize="marquee"
         android:singleLine="true"
-        app:layout_constraintBottom_toBottomOf="@id/barrier1"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@id/imageViewStationIcon" />
+        app:layout_constraintStart_toEndOf="@id/imageViewStationIcon"
+        app:layout_constraintTop_toBottomOf="@id/textViewTrackName" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>