Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Overlaying text in risk detection view (EXPOSUREAPP-3068) #1314

Merged
merged 3 commits into from
Oct 5, 2020
Merged

Overlaying text in risk detection view (EXPOSUREAPP-3068) #1314

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5caebc5
fixed overlapping layout in risk interop view
BMItr Oct 5, 2020
5e84a1c
try to satisfy sonar
BMItr Oct 5, 2020
3dcbd4e
Merge branch 'release/1.5.x' into fix/3068-overlaying-text-in-risk-de…
BMItr Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 51 additions & 50 deletions Corona-Warn-App/src/main/res/layout/include_interoperability.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/interoperability_header" />

<androidx.constraintlayout.widget.Barrier
android:id="@+id/country_list_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierAllowsGoneWidgets="false"
app:barrierDirection="bottom"
app:constraint_referenced_ids="country_list_overview, no_countries_default_infoview, no_countries_riskdetails_infoview"
tools:layout_editor_absoluteY="411dp" />

<TextView
android:id="@+id/label_interoperability_subtitle4"
style="@style/body1"
Expand All @@ -207,16 +216,8 @@
android:visibility="@{FormatterHelper.formatVisibilityText(fourthSection)}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/country_list_overview" />
app:layout_constraintTop_toBottomOf="@id/country_list_barrier" />

<androidx.constraintlayout.widget.Barrier
android:id="@+id/country_list_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierAllowsGoneWidgets="false"
app:barrierDirection="bottom"
app:constraint_referenced_ids="country_list_overview, no_countries_default_infoview"
tools:layout_editor_absoluteY="411dp" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/interoperability_footer"
Expand All @@ -228,7 +229,7 @@
android:visibility="@{FormatterHelper.formatVisibility(showFooter)}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/country_list_barrier">
app:layout_constraintTop_toBottomOf="@+id/label_interoperability_subtitle4">

<TextView
android:id="@+id/interoperability_footer_title"
Expand All @@ -254,52 +255,52 @@
app:layout_constraintTop_toBottomOf="@+id/interoperability_footer_title" />
</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/expanded_terms_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:visibility="@{FormatterHelper.formatVisibility(showFooter)}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/interoperability_footer">

<TextView
android:id="@+id/onboarding_delta_expanded_terms_text_part_1"
style="@style/subtitle"
android:layout_width="0dp"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/expanded_terms_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/button_icon_margin"
android:text="@string/interoperability_onboarding_delta_expanded_terms_text_part_1"
android:layout_marginTop="@dimen/spacing_normal"
android:visibility="@{FormatterHelper.formatVisibility(showFooter)}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/interoperability_footer">

<TextView
android:id="@+id/onboarding_delta_expanded_terms_text_link"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/button_icon_margin"
android:text="@string/interoperability_onboarding_delta_terms_link"
android:linksClickable="true"
android:clickable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/onboarding_delta_expanded_terms_text_part_1"/>
<TextView
android:id="@+id/onboarding_delta_expanded_terms_text_part_1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/button_icon_margin"
android:text="@string/interoperability_onboarding_delta_expanded_terms_text_part_1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/onboarding_delta_expanded_terms_text_part_2"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/button_icon_margin"
android:text="@string/interoperability_onboarding_delta_expanded_terms_text_part_2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/onboarding_delta_expanded_terms_text_link"/>
<TextView
android:id="@+id/onboarding_delta_expanded_terms_text_link"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:clickable="true"
android:linksClickable="true"
android:paddingVertical="@dimen/button_icon_margin"
android:text="@string/interoperability_onboarding_delta_terms_link"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/onboarding_delta_expanded_terms_text_part_1" />

</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/onboarding_delta_expanded_terms_text_part_2"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/button_icon_margin"
android:text="@string/interoperability_onboarding_delta_expanded_terms_text_part_2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/onboarding_delta_expanded_terms_text_link" />

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
Expand Down