From e1cca9c6cbfffb8b86e6189e2b14da2d859f0c51 Mon Sep 17 00:00:00 2001 From: Chilja Gossow <49635654+chiljamgossow@users.noreply.github.com> Date: Fri, 18 Dec 2020 12:11:29 +0100 Subject: [PATCH] add disabled state (#1941) Co-authored-by: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com> Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com> --- Corona-Warn-App/src/main/res/color/button_red.xml | 3 ++- .../main/res/layout/contact_diary_edit_locations_fragment.xml | 2 +- .../main/res/layout/contact_diary_edit_persons_fragment.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Corona-Warn-App/src/main/res/color/button_red.xml b/Corona-Warn-App/src/main/res/color/button_red.xml index 4d42fdd5d..e51bf598b 100644 --- a/Corona-Warn-App/src/main/res/color/button_red.xml +++ b/Corona-Warn-App/src/main/res/color/button_red.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:color="@color/colorSemanticHighRiskPressed" android:state_pressed="true" /> <!-- pressed --> + <item android:color="@color/colorSurface2" android:state_enabled="false" /> <!-- disabled --> <item android:color="@color/colorSemanticHighRisk" /> <!-- default --> -</selector> \ No newline at end of file +</selector> diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml index 745b56b84..231206caa 100644 --- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml +++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml @@ -75,7 +75,7 @@ app:layout_constraintTop_toBottomOf="@id/toolbar" app:layout_constraintBottom_toTopOf="@id/delete_button"/> - <Button + <android.widget.Button android:id="@+id/delete_button" style="@style/buttonReset" android:layout_width="@dimen/match_constraint" diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml index 3b284bff7..a1b93237e 100644 --- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml +++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml @@ -75,7 +75,7 @@ app:layout_constraintTop_toBottomOf="@id/toolbar" app:layout_constraintBottom_toTopOf="@id/delete_button"/> - <Button + <android.widget.Button android:id="@+id/delete_button" style="@style/buttonReset" android:layout_width="@dimen/match_constraint" -- GitLab