From 4f96a300c2561697d9538a338784544916e36f83 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 19 Jun 2023 19:03:31 +0200
Subject: [PATCH] fix: CardView Radius

---
 .../res/layout/activity_main_credential.xml   | 19 +++++++++++--------
 .../layout/fragment_generate_passphrase.xml   |  3 +--
 .../res/layout/fragment_generate_password.xml |  3 +--
 app/src/main/res/values/styles.xml            |  1 +
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/activity_main_credential.xml b/app/src/main/res/layout/activity_main_credential.xml
index 19d35b169..c0244c4ee 100644
--- a/app/src/main/res/layout/activity_main_credential.xml
+++ b/app/src/main/res/layout/activity_main_credential.xml
@@ -96,11 +96,6 @@
                         android:id="@+id/fragment_advanced_unlock_container_view"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_gravity="bottom"
-                        android:background="?attr/colorPrimaryDark"/>
                 </FrameLayout>
 
                 <androidx.appcompat.widget.Toolbar
@@ -146,11 +141,19 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent">
-                    <com.kunzisoft.keepass.view.MainCredentialView
-                        android:id="@+id/activity_password_credentials"
+                    <View
                         android:layout_width="match_parent"
+                        android:layout_height="116dp"
+                        android:background="?attr/colorPrimary" />
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="?android:attr/windowBackground" />
+                        android:layout_margin="12dp">
+                        <com.kunzisoft.keepass.view.MainCredentialView
+                            android:id="@+id/activity_password_credentials"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </androidx.cardview.widget.CardView>
                 </FrameLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_generate_passphrase.xml b/app/src/main/res/layout/fragment_generate_passphrase.xml
index 41dc10434..e0a39c682 100644
--- a/app/src/main/res/layout/fragment_generate_passphrase.xml
+++ b/app/src/main/res/layout/fragment_generate_passphrase.xml
@@ -44,8 +44,7 @@
             android:layout_marginRight="@dimen/card_view_margin_horizontal"
             android:layout_marginTop="@dimen/default_margin"
             android:layout_marginBottom="@dimen/card_view_margin_vertical"
-            android:layout_gravity="bottom"
-            app:cardCornerRadius="4dp">
+            android:layout_gravity="bottom">
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_generate_password.xml b/app/src/main/res/layout/fragment_generate_password.xml
index 28b249096..2d9a5bfed 100644
--- a/app/src/main/res/layout/fragment_generate_password.xml
+++ b/app/src/main/res/layout/fragment_generate_password.xml
@@ -44,8 +44,7 @@
             android:layout_marginRight="@dimen/card_view_margin_horizontal"
             android:layout_marginTop="@dimen/default_margin"
             android:layout_marginBottom="@dimen/card_view_margin_vertical"
-            android:layout_gravity="bottom"
-            app:cardCornerRadius="4dp">
+            android:layout_gravity="bottom">
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 718882d5f..70ff06bfb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -370,6 +370,7 @@
         <item name="android:layout_marginLeft">@dimen/card_view_margin_horizontal</item>
         <item name="android:layout_marginRight">@dimen/card_view_margin_horizontal</item>
         <item name="android:padding">@dimen/card_view_padding</item>
+        <item name="cardCornerRadius">18dp</item>
     </style>
 
     <!-- CheckBox -->