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 9854f5f6ab - Show all commits

View File

@@ -50,7 +50,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/topBar"
app:layout_constraintBottom_toBottomOf="@id/topBar"
android:tint="@color/white"
android:tint="@color/secondaryColour"
/>
<TextView
@@ -61,7 +61,21 @@
app:layout_constraintBottom_toBottomOf="@id/topBar"
android:text="@string/app_name"
android:textSize="25dp"
android:textColor="@color/white"
android:textColor="@color/secondaryColour"
/>
<view
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintTop_toBottomOf="@id/topBar"
android:background="@color/black"
/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintBottom_toTopOf="@id/navbar"
android:background="@color/black"
/>