Certificate cards will always have a 14dp padding in the person detai…

…ls fragment. (#5254)
corona-warn-app · Jun 3, 2022 · 4de49fb · 4de49fb
1 parent e3b5f9a
commit 4de49fb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Corona-Warn-App/src/main/res/layout/recovery_certificate_card.xml b/Corona-Warn-App/src/main/res/layout/recovery_certificate_card.xml
@@ -2,11 +2,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/vaccination_card"
-    style="@style/Card.Vaccination.Ripple.NoPadding"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="24dp"
-    android:layout_marginTop="8dp">
+    android:layout_marginTop="8dp"
+    android:background="@drawable/grey_card_ripple"
+    android:paddingBottom="14dp">
 
     <ImageView
         android:id="@+id/certificate_bg"
@@ -141,7 +142,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="14dp"
-        android:layout_marginVertical="6dp"
+        android:layout_marginTop="6dp"
         android:padding="0dp"
         app:buttonText="@string/start_validation_rule_check_button"
         app:isLoading="false"

diff --git a/Corona-Warn-App/src/main/res/layout/test_certificate_card.xml b/Corona-Warn-App/src/main/res/layout/test_certificate_card.xml
@@ -2,10 +2,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/vaccination_card"
-    style="@style/Card.Vaccination.Ripple.NoPadding"
+    android:background="@drawable/grey_card_ripple"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="24dp"
+    android:paddingBottom="14dp"
     android:layout_marginTop="8dp">
 
     <ImageView
@@ -118,7 +119,6 @@
         app:layout_constraintVertical_bias="0.0"
         app:srcCompat="@drawable/ic_bookmark" />
 
-
     <TextView
         android:id="@+id/bookmark_info"
         style="@style/body2Medium"
@@ -151,7 +151,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="14dp"
-        android:layout_marginVertical="6dp"
+        android:layout_marginTop="6dp"
         android:padding="0dp"
         app:buttonText="@string/start_validation_rule_check_button"
         app:isLoading="false"

diff --git a/Corona-Warn-App/src/main/res/layout/vaccination_certificate_card.xml b/Corona-Warn-App/src/main/res/layout/vaccination_certificate_card.xml
@@ -2,11 +2,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/vaccination_card"
-    style="@style/Card.Vaccination.Ripple.NoPadding"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="24dp"
-    android:layout_marginTop="8dp">
+    android:layout_marginTop="8dp"
+    android:background="@drawable/grey_card_ripple"
+    android:paddingBottom="14dp">
 
     <ImageView
         android:id="@+id/certificate_bg"
@@ -151,7 +152,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="14dp"
-        android:layout_marginVertical="6dp"
+        android:layout_marginTop="6dp"
         android:padding="0dp"
         app:buttonText="@string/start_validation_rule_check_button"
         app:isLoading="false"