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

Merge branch 'feature/COVAPP-439-my-data-2.0' into 'develop'

COVAPP-439: Update data screen UI to 2.0

Closes COVAPP-439

See merge request hoia/dp3t-app-android!138
parents e2c7ae6e 41834c15
......@@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:src="@drawable/illustration_settings"
android:src="@drawable/illustration_header_generic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
......@@ -84,7 +84,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/guidelines_all_16" />
<include layout="@layout/guidelines_topbottom_32_left_right_16" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrierIconsEnd"
......@@ -385,10 +385,12 @@
android:layout_width="0dp"
android:layout_height="@dimen/divider_height_1"
android:layout_marginTop="@dimen/size_16"
android:layout_marginBottom="@dimen/size_32"
android:background="@color/background"
app:layout_constraintEnd_toEndOf="@id/endGuideline"
app:layout_constraintStart_toStartOf="@id/startGuideline"
app:layout_constraintTop_toBottomOf="@id/crossCountryDescription" />
app:layout_constraintTop_toBottomOf="@id/crossCountryDescription"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -406,8 +408,9 @@
app:layout_constraintEnd_toEndOf="@id/endGuideline"
app:layout_constraintStart_toStartOf="@id/startGuideline"
app:layout_constraintTop_toBottomOf="@id/settingsCard"
app:layout_constraintBottom_toTopOf="@id/bottomGuideline"/>
app:layout_constraintBottom_toTopOf="@id/bottomGuideline"
app:layout_constraintVertical_bias="1"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/topGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_begin="@dimen/size_32" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/startGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_begin="@dimen/size_16" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/endGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_end="@dimen/size_16" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/bottomGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/size_32" />
</merge>
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