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

Merge branch 'feature/COVAPP-487-card-overlap' into 'develop'

COVAPP-487: unify the card to header overlap

See merge request hoia/dp3t-app-android!140
parents dae7949c 41ca015c
Pipeline #3338 skipped with stage
......@@ -146,10 +146,10 @@
tools:ignore="ContentDescription" />
<View
android:id="@+id/view"
android:id="@+id/headerOverlapAnchor"
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,10 +160,13 @@
android:layout_width="0dp"
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" />
......@@ -173,10 +176,10 @@
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_toBottomOf="@id/gaenNotWorkingCard"
app:layout_constraintBottom_toTopOf="@id/infectionAbroadCard"
app:layout_constraintWidth_max="@dimen/max_content_width"
app:titleText="@string/home_infection_title" />
......@@ -233,4 +236,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
......@@ -60,10 +60,10 @@
tools:ignore="ContentDescription" />
<View
android:id="@+id/view"
android:id="@+id/headerOverlapAnchor"
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" />
......@@ -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,10 +61,10 @@
tools:ignore="ContentDescription" />
<View
android:id="@+id/view"
android:id="@+id/headerOverlapAnchor"
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" />
......@@ -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
......
......@@ -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