From 21f0b47131b67dea3ef63b48f257a766c332b793 Mon Sep 17 00:00:00 2001 From: marcmuschko Date: Thu, 11 Jun 2020 16:29:49 +0200 Subject: [PATCH 1/7] Fix/ui tweaks (#387) * spacing adjustments * style adjustments * letter spacing buttons --- .../src/main/res/drawable/ic_settings_tracing_inactive.xml | 4 ++-- .../main/res/drawable/ic_settings_tracing_inactive_small.xml | 4 ++-- .../src/main/res/layout/fragment_information_legal.xml | 4 ++-- .../src/main/res/layout/fragment_settings_notifications.xml | 2 +- Corona-Warn-App/src/main/res/values/styles.xml | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive.xml index 05c269e85b3..62c09555d8c 100644 --- a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive.xml +++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive.xml @@ -4,7 +4,7 @@ android:viewportWidth="40" android:viewportHeight="40"> @@ -102,7 +102,7 @@ layout="@layout/include_divider" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacing_small" + android:layout_marginTop="@dimen/spacing_medium" app:layout_constraintEnd_toEndOf="@+id/guideline_end" app:layout_constraintStart_toStartOf="@+id/guideline_start" app:layout_constraintTop_toBottomOf="@+id/information_legal_subtitle_contact" /> diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml index a85d1f4a1e2..0a62638a9e4 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml @@ -59,7 +59,7 @@ layout="@layout/include_settings_switch_row" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/spacing_tiny" + android:layout_marginTop="@dimen/spacing_small" android:visibility="@{FormatterHelper.formatVisibility(settingsViewModel.isNotificationsEnabled())}" app:enabled="@{true}" app:layout_constraintEnd_toEndOf="parent" diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml index 8dd30ddfe59..4003d8094e5 100644 --- a/Corona-Warn-App/src/main/res/values/styles.xml +++ b/Corona-Warn-App/src/main/res/values/styles.xml @@ -47,13 +47,12 @@ ###################################### -->