Commit cd2055a8 authored by Harri Kirik's avatar Harri Kirik
Browse files

COVAPP-487: unify the card to header overlap

parent dae7949c
......@@ -149,7 +149,7 @@
android:id="@+id/view"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="24dp"
android:layout_marginBottom="@dimen/content_card_to_header_overlap"
app:layout_constraintBottom_toBottomOf="@id/colorView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
......@@ -160,23 +160,33 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginBottom="@dimen/size_8"
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_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"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
app:layout_constraintEnd_toStartOf="@id/endGuideline"
app:layout_constraintStart_toStartOf="@id/startGuideline"
app:layout_constraintTop_toBottomOf="@+id/gaenNotWorkingCard"
app:layout_constraintTop_toTopOf="@id/cardOverLapBarrier"
app:layout_constraintWidth_max="@dimen/max_content_width"
app:titleText="@string/home_infection_title" />
......@@ -233,4 +243,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
......@@ -63,7 +63,7 @@
android:id="@+id/view"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="24dp"
android:layout_marginBottom="@dimen/content_card_to_header_overlap"
app:layout_constraintBottom_toBottomOf="@id/colorView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
......
......@@ -64,7 +64,7 @@
android:id="@+id/view"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="24dp"
android:layout_marginBottom="@dimen/content_card_to_header_overlap"
app:layout_constraintBottom_toBottomOf="@id/colorView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
......
......@@ -45,5 +45,6 @@
<dimen name="toolbar_content_inset_half">4dp</dimen>
<dimen name="divider_height_1">1dp</dimen>
<dimen name="content_card_to_header_overlap">24dp</dimen>
</resources>
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