Commit 41ca015c authored by Harri Kirik's avatar Harri Kirik
Browse files

COVAAP-487: Changes from the code review

parent cd2055a8
......@@ -146,7 +146,7 @@
tools:ignore="ContentDescription" />
<View
android:id="@+id/view"
android:id="@+id/headerOverlapAnchor"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/content_card_to_header_overlap"
......@@ -161,24 +161,16 @@
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginBottom="@dimen/size_8"
app:layout_goneMarginBottom="0dp"
app:descriptionText="@string/home_status_gaen_error_description"
app:layout_constraintEnd_toStartOf="@id/endGuideline"
app:layout_constraintStart_toStartOf="@id/startGuideline"
app:layout_constraintTop_toBottomOf="@+id/view"
app:layout_constraintTop_toBottomOf="@+id/headerOverlapAnchor"
app:layout_constraintBottom_toTopOf="@id/infectionAtHomeCard"
app:layout_constraintWidth_max="@dimen/max_content_width"
app:titleText="@string/home_status_gaen_error_title"
tools:visibility="visible" />
<!-- A barrier to make sure the top card always starts from the same place -->
<androidx.constraintlayout.widget.Barrier
android:id="@+id/cardOverLapBarrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:barrierAllowsGoneWidgets="false"
app:constraint_referenced_ids="gaenNotWorkingCard,view" />
<org.dpppt.android.app.home.CardView
android:id="@+id/infectionAtHomeCard"
style="@style/AppTheme.CardView"
......@@ -186,7 +178,8 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/endGuideline"
app:layout_constraintStart_toStartOf="@id/startGuideline"
app:layout_constraintTop_toTopOf="@id/cardOverLapBarrier"
app:layout_constraintTop_toBottomOf="@id/gaenNotWorkingCard"
app:layout_constraintBottom_toTopOf="@id/infectionAbroadCard"
app:layout_constraintWidth_max="@dimen/max_content_width"
app:titleText="@string/home_infection_title" />
......
......@@ -60,7 +60,7 @@
tools:ignore="ContentDescription" />
<View
android:id="@+id/view"
android:id="@+id/headerOverlapAnchor"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/content_card_to_header_overlap"
......@@ -74,7 +74,7 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/endGuideline"
app:layout_constraintStart_toStartOf="@id/startGuideline"
app:layout_constraintTop_toBottomOf="@+id/view"
app:layout_constraintTop_toBottomOf="@+id/headerOverlapAnchor"
app:layout_constraintBottom_toTopOf="@+id/bottomGuideline"
app:layout_constraintVertical_bias="0"
app:layout_constraintWidth_max="@dimen/max_content_width">
......
......@@ -61,7 +61,7 @@
tools:ignore="ContentDescription" />
<View
android:id="@+id/view"
android:id="@+id/headerOverlapAnchor"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/content_card_to_header_overlap"
......@@ -76,7 +76,7 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/endGuideline"
app:layout_constraintStart_toStartOf="@id/startGuideline"
app:layout_constraintTop_toBottomOf="@+id/view"
app:layout_constraintTop_toBottomOf="@+id/headerOverlapAnchor"
app:layout_constraintWidth_max="@dimen/max_content_width">
<androidx.constraintlayout.widget.ConstraintLayout
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment