Fix cards background colors. (#5705)

corona-warn-app · Nov 14, 2022 · 42fc52e · 42fc52e
1 parent 6fa50df
commit 42fc52e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/Corona-Warn-App/src/main/res/drawable/dispatcher_card_background.xml b/Corona-Warn-App/src/main/res/drawable/dispatcher_card_background.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/colorSurface2Pressed" />
+            <corners android:radius="@dimen/radius_card" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/radius_card" />
+            <solid android:color="@color/colorSurface2" />
+        </shape>
+    </item>
+</ripple>
diff --git a/Corona-Warn-App/src/main/res/drawable/grey_card_ripple.xml b/Corona-Warn-App/src/main/res/drawable/grey_card_ripple.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/colorSurface2Pressed" />
-            <corners android:radius="@dimen/radius_card" />
+            <solid android:color="@color/colorSurface2Pressed"/>
+            <corners android:radius="@dimen/radius_card"/>
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="@dimen/radius_card" />
-            <solid android:color="@color/colorSurface2" />
+            <corners android:radius="@dimen/radius_card"/>
+            <solid android:color="@color/colorCertificateCards"/>
+            <stroke android:width="1dp" android:color="@color/colorPersonOverviewQrCardBorder"/>
         </shape>
     </item>
-</ripple>
+</ripple>
diff --git a/Corona-Warn-App/src/main/res/layout/dispatcher_card_layout.xml b/Corona-Warn-App/src/main/res/layout/dispatcher_card_layout.xml
@@ -7,7 +7,7 @@
         android:id="@+id/dispatcher_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/grey_card_ripple"
+        android:background="@drawable/dispatcher_card_background"
         android:focusable="true"
         app:layout_constraintTop_toTopOf="parent">