Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Showing only changes of commit 76832f5a54 - Show all commits

View File

@@ -12,6 +12,7 @@
android:id="@+id/location_image"
android:layout_width="50dp"
android:layout_height="50dp"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/location_name"
app:layout_constraintTop_toTopOf="parent"
@@ -21,6 +22,7 @@
android:id="@+id/location_name"
android:layout_width="321dp"
android:layout_height="47dp"
android:layout_marginStart="8dp"
android:gravity="left"
android:text=""
android:textSize="20sp"