Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
2 changed files with 5 additions and 5 deletions
Showing only changes of commit bbab7b2bb1 - Show all commits

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View File

@@ -12,24 +12,24 @@
android:id="@+id/location_image"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="5dp"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/location_name"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0" />
<TextView
android:id="@+id/location_name"
android:layout_width="321dp"
android:layout_width="292dp"
android:layout_height="47dp"
android:layout_marginStart="8dp"
android:layout_marginStart="5dp"
android:gravity="left"
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@+id/location_image"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />