From 9b7990489a7245b62c2147783b945a6e2e91e461 Mon Sep 17 00:00:00 2001
From: Fabian-K <fabian.kajzar@sap.com>
Date: Fri, 5 Jun 2020 14:39:35 +0200
Subject: [PATCH] - remove stable and grey buttons (#190)
- enable disabled state for primary button
- simplify submission tan
---
.../formatter/FormatterSubmissionHelper.kt | 12 -----------
.../src/main/res/color/button_primary.xml | 4 ++--
.../src/main/res/color/button_stable.xml | 6 ------
.../src/main/res/color/button_stable_grey.xml | 5 -----
.../src/main/res/color/button_text_color.xml | 5 +++++
.../color/button_text_color_emphasized.xml | 5 +++++
.../src/main/res/drawable/button.xml | 14 ++++++-------
.../main/res/layout/fragment_risk_details.xml | 2 +-
.../res/layout/fragment_submission_tan.xml | 2 --
.../src/main/res/layout/include_risk_card.xml | 4 ++--
.../src/main/res/values-night/colors.xml | 2 --
.../src/main/res/values/colors.xml | 2 --
.../src/main/res/values/styles.xml | 20 +++++--------------
13 files changed, 26 insertions(+), 57 deletions(-)
delete mode 100644 Corona-Warn-App/src/main/res/color/button_stable.xml
delete mode 100644 Corona-Warn-App/src/main/res/color/button_stable_grey.xml
create mode 100644 Corona-Warn-App/src/main/res/color/button_text_color.xml
create mode 100644 Corona-Warn-App/src/main/res/color/button_text_color_emphasized.xml
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
index 8ab733ade..55b9a454c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
@@ -162,18 +162,6 @@ fun formatSubmissionStatusCardContentVisible(
uiStateState: ApiRequestState?
): Int = formatVisibility(deviceRegistered == true && uiStateState == ApiRequestState.SUCCESS)
-fun formatSubmissionTanButtonTint(isValidTanFormat: Boolean) = formatColor(
- isValidTanFormat,
- R.color.button_primary,
- R.color.colorGreyLight
-)
-
-fun formatSubmissionTanButtonTextColor(isValidTanFormat: Boolean) = formatColor(
- isValidTanFormat,
- R.color.textColorLight,
- R.color.colorGreyDisabled
-)
-
fun formatShowSubmissionStatusCard(deviceUiState: DeviceUIState?): Int =
formatVisibility(
deviceUiState != DeviceUIState.PAIRED_POSITIVE &&
diff --git a/Corona-Warn-App/src/main/res/color/button_primary.xml b/Corona-Warn-App/src/main/res/color/button_primary.xml
index 11ce9cb59..2555dd3e1 100644
--- a/Corona-Warn-App/src/main/res/color/button_primary.xml
+++ b/Corona-Warn-App/src/main/res/color/button_primary.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/colorPrimaryDark" android:state_pressed="true" /> <!-- pressed -->
- <item android:color="@color/stableHighlightColor" android:state_enabled="false" /> <!-- disabled -->
- <item android:color="@color/colorPrimary" /> <!-- default -->
+ <item android:color="@color/colorSurface2" android:state_enabled="false" /> <!-- disabled -->
+ <item android:color="@color/colorAccentTintButton" /> <!-- default -->
</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/color/button_stable.xml b/Corona-Warn-App/src/main/res/color/button_stable.xml
deleted file mode 100644
index bc4cd6288..000000000
--- a/Corona-Warn-App/src/main/res/color/button_stable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/stableHighlightColor" android:state_pressed="true" /> <!-- pressed -->
- <item android:color="@color/stableHighlightColor" android:state_enabled="false" /> <!-- disabled -->
- <item android:color="@color/stableBackgroundColor" /> <!-- default -->
-</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/color/button_stable_grey.xml b/Corona-Warn-App/src/main/res/color/button_stable_grey.xml
deleted file mode 100644
index 68979507a..000000000
--- a/Corona-Warn-App/src/main/res/color/button_stable_grey.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/stableButtonColorGreyHighlight" android:state_pressed="true" /> <!-- pressed -->
- <item android:color="@color/stableButtonColorGrey" /> <!-- default -->
-</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/color/button_text_color.xml b/Corona-Warn-App/src/main/res/color/button_text_color.xml
new file mode 100644
index 000000000..d99d75969
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/color/button_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/colorTextPrimary2" android:state_enabled="false" /> <!-- disabled -->
+ <item android:color="@color/colorTextPrimary1" /> <!-- default -->
+</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/color/button_text_color_emphasized.xml b/Corona-Warn-App/src/main/res/color/button_text_color_emphasized.xml
new file mode 100644
index 000000000..b50e718df
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/color/button_text_color_emphasized.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/colorTextPrimary2" android:state_enabled="false" /> <!-- disabled -->
+ <item android:color="@color/colorTextEmphasizedButton" /> <!-- default -->
+</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/drawable/button.xml b/Corona-Warn-App/src/main/res/drawable/button.xml
index bb8aff8f5..d10247237 100644
--- a/Corona-Warn-App/src/main/res/drawable/button.xml
+++ b/Corona-Warn-App/src/main/res/drawable/button.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <shape android:shape="rectangle">
- <corners android:radius="@dimen/radius_button" />
- <solid android:color="@color/colorLight" />
- </shape>
- </item>
-</selector>
\ No newline at end of file
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle"
+ android:tint="?attr/backgroundTint">
+ <corners android:radius="@dimen/radius_button" />
+ <solid android:color="@color/colorSurface1" />
+</shape>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
index aa31ef4b5..c49ac7f35 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
@@ -184,7 +184,7 @@
<Button
android:id="@+id/risk_details_button_enable_tracing"
- style="@style/buttonGrey"
+ style="@style/buttonPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/risk_card_button_enable_tracing"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml
index 623eebcf6..4e3707630 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml
@@ -59,11 +59,9 @@
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:backgroundTint="@{FormatterSubmissionHelper.formatSubmissionTanButtonTint(viewmodel.isValidTanFormat())}"
android:enabled="@{viewmodel.isValidTanFormat}"
android:text="@string/submission_tan_button_text"
android:textAllCaps="true"
- android:textColor="@{FormatterSubmissionHelper.formatSubmissionTanButtonTextColor(viewmodel.isValidTanFormat())}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_card.xml b/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
index 39332776c..31f9e683f 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
@@ -237,7 +237,7 @@
<Button
android:id="@+id/risk_card_button_enable_tracing"
- style="@style/buttonGrey"
+ style="@style/buttonPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -249,7 +249,7 @@
<Button
android:id="@+id/risk_card_button_update"
- style="@style/buttonStable"
+ style="@style/buttonLight"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/values-night/colors.xml b/Corona-Warn-App/src/main/res/values-night/colors.xml
index 30f965566..6a95e8dcc 100644
--- a/Corona-Warn-App/src/main/res/values-night/colors.xml
+++ b/Corona-Warn-App/src/main/res/values-night/colors.xml
@@ -73,8 +73,6 @@
<color name="stableHighlightColor">#C3C3C3</color>
<color name="stableTextColor">#000000</color>
<color name="stableIconColor">#ffffff</color>
- <color name="stableButtonColorGrey">#C3C3C3</color>
- <color name="stableButtonColorGreyHighlight">#AEAEAE</color>
<!-- Tracing Icon -->
<color name="tracingIconActive">#80CDEC</color>
diff --git a/Corona-Warn-App/src/main/res/values/colors.xml b/Corona-Warn-App/src/main/res/values/colors.xml
index f5af0a8af..15257d9f4 100644
--- a/Corona-Warn-App/src/main/res/values/colors.xml
+++ b/Corona-Warn-App/src/main/res/values/colors.xml
@@ -76,8 +76,6 @@
<color name="stableHighlightColor">#C3C3C3</color>
<color name="stableTextColor">#000000</color>
<color name="stableIconColor">#ffffff</color>
- <color name="stableButtonColorGrey">#C3C3C3</color>
- <color name="stableButtonColorGreyHighlight">#AEAEAE</color>
<color name="stableLightTransparent">#33FFFFFF</color>
<!-- Tracing Icon -->
diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml
index 9140f7997..accd3c509 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -36,35 +36,25 @@
<item name="android:paddingEnd">@dimen/button_padding_start_end</item>
<item name="android:paddingBottom">@dimen/button_padding_top_bottom</item>
<item name="android:background">@drawable/button</item>
+ <item name="android:textColor">@color/button_text_color</item>
<item name="android:textSize">@dimen/font_button</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
- <style name="buttonPrimary" parent="@style/button">
- <item name="android:textColor">@color/colorTextEmphasizedButton</item>
- <item name="android:backgroundTint">@color/colorAccentTintButton</item>
+ <style name="buttonPrimary" parent="button">
+ <item name="android:backgroundTint">@color/button_primary</item>
+ <item name="android:textColor">@color/button_text_color_emphasized</item>
</style>
<style name="buttonReset" parent="@style/button">
- <item name="android:textColor">@color/textColorLight</item>
<item name="android:backgroundTint">@color/button_red</item>
+ <item name="android:textColor">@color/button_text_color_emphasized</item>
</style>
<style name="buttonLight" parent="@style/button">
- <item name="android:textColor">@color/textColorPrimary</item>
<item name="android:backgroundTint">@color/button_light</item>
</style>
- <style name="buttonGrey" parent="@style/button">
- <item name="android:textColor">@color/textColorBlue</item>
- <item name="android:backgroundTint">@color/button_stable_grey</item>
- </style>
-
- <style name="buttonStable" parent="@style/button">
- <item name="android:textColor">@color/stableTextColor</item>
- <item name="android:backgroundTint">@color/button_stable</item>
- </style>
-
<style name="buttonIcon">
<item name="android:background">@drawable/circle</item>
<item name="android:backgroundTint">@color/button_back</item>
--
GitLab