From 2df132f08082dc284d80e5a04a2a5f0608daee6f Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 23 Dec 2020 14:00:48 +0100
Subject: [PATCH] Adjust layout margins to have a cleaner look (whitespace
wise) and prevent cut off text on row items. (#1991)
---
.../src/main/res/layout/tracing_card_info_row_layout.xml | 9 ++++++---
.../main/res/layout/tracing_content_disabled_view.xml | 5 ++---
.../src/main/res/layout/tracing_content_failed_view.xml | 5 ++---
.../main/res/layout/tracing_content_increased_view.xml | 7 ++-----
.../src/main/res/layout/tracing_content_low_view.xml | 8 ++++----
.../main/res/layout/tracing_content_progress_view.xml | 2 +-
6 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml b/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
index 76e12886a..9b121ddcd 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
@@ -11,8 +11,9 @@
android:layout_width="@dimen/icon_size_risk_card"
android:layout_height="@dimen/icon_size_risk_card"
android:importantForAccessibility="no"
+ app:layout_constraintBottom_toBottomOf="@+id/body"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/body"
tools:src="@drawable/ic_risk_details_home"
tools:tint="@color/colorTextPrimary1" />
@@ -22,10 +23,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
- app:layout_constraintBottom_toBottomOf="@id/icon"
+ android:layout_marginTop="@dimen/spacing_tiny"
+ android:layout_marginBottom="@dimen/spacing_tiny"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon"
- app:layout_constraintTop_toTopOf="@id/icon"
+ app:layout_constraintTop_toTopOf="parent"
tools:text="@string/lorem_ipsum"
tools:textColor="@color/colorTextPrimary1" />
</merge>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
index 87b941475..4c9a1b726 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
@@ -44,7 +44,7 @@
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_small"
android:text="@string/risk_card_body_tracing_off"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +68,6 @@
android:id="@+id/row_time_fetched"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
android:icon="@drawable/ic_risk_card_time_fetched"
android:text="@{state.getTimeFetched(context)}"
android:textColor="@color/colorTextPrimary1"
@@ -84,7 +83,7 @@
gone="@{!state.showEnableTracingButton}"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_small"
android:text="@string/risk_details_button_enable_tracing"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
index e543f3410..de68265db 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
@@ -42,7 +42,7 @@
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="16dp"
android:text="@string/risk_card_check_failed_no_internet_body"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -66,7 +66,6 @@
android:id="@+id/risk_card_row_time_fetched"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
android:icon="@drawable/ic_risk_card_time_fetched"
android:text="@{state.getTimeFetched(context)}"
android:textColor="@color/colorTextPrimary1Stable"
@@ -82,7 +81,7 @@
gone="@{state.showRestartButton}"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_small"
android:text="@string/risk_card_check_failed_no_internet_restart_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
index f8fb38b7d..331d117d1 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
@@ -44,7 +44,7 @@
android:id="@+id/row_contact"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_small"
android:icon="@drawable/ic_risk_card_contact_increased"
android:text="@{state.getRiskContactBody(context)}"
android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -59,7 +59,6 @@
gone="@{state.getRiskContactLast(context) == null}"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
android:icon="@drawable/ic_risk_card_calendar"
android:text="@{state.getRiskContactLast(context)}"
android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -74,7 +73,6 @@
gone="@{!state.inDetailsMode}"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
android:icon="@drawable/ic_risk_card_calendar"
android:text="@{state.getRiskActiveTracingDaysInRetentionPeriod(context)}"
android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -88,7 +86,6 @@
android:id="@+id/row_time_fetched"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
android:icon="@drawable/ic_risk_card_time_fetched"
android:text="@{state.getTimeFetched(context)}"
android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -104,7 +101,7 @@
gone="@{!state.showUpdateButton}"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_small"
android:text="@string/risk_card_button_update"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
index c298e19c3..2ede6f41d 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
@@ -47,7 +47,7 @@
android:id="@+id/row_contact"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="16dp"
android:icon="@drawable/ic_risk_card_contact"
android:text="@{state.getRiskContactBody(context)}"
android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -61,7 +61,6 @@
android:id="@+id/row_saved_days"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/row_contact">
@@ -85,6 +84,8 @@
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_tiny"
+ android:layout_marginBottom="@dimen/spacing_tiny"
android:layout_marginStart="24dp"
android:text="@{state.getRiskActiveTracingDaysInRetentionPeriod(context)}"
android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -100,7 +101,6 @@
android:id="@+id/row_time_fetched"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
android:icon="@drawable/ic_risk_card_time_fetched"
android:text="@{state.getTimeFetched(context)}"
android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -116,7 +116,7 @@
gone="@{!state.showUpdateButton}"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_small"
android:text="@string/risk_card_button_update"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
index 9c3e62b4d..0d46ba20f 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
@@ -57,7 +57,7 @@
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
- android:layout_marginTop="24dp"
+ android:layout_marginTop="@dimen/spacing_small"
android:text="@{state.getProgressCardBody(context)}"
android:textColor="@{state.getStableTextColor(context)}"
app:layout_constraintBottom_toBottomOf="parent"
--
GitLab