From 9d182b8299fd281a7fa1780c6e0c2203427a33de Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 8 Feb 2021 18:12:25 +0100
Subject: [PATCH] Change preview layout

---
 app/src/main/res/layout/item_attachment.xml | 14 ++++++++------
 app/src/main/res/values/attrs.xml           |  3 +--
 app/src/main/res/values/colors.xml          |  4 ++++
 app/src/main/res/values/style_black.xml     |  1 +
 app/src/main/res/values/style_dark.xml      |  1 +
 app/src/main/res/values/style_purple.xml    |  1 +
 app/src/main/res/values/styles.xml          |  2 ++
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 25e65351d..7f19fbf26 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -30,17 +30,19 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/item_attachment_thumbnail"
-        android:layout_width="wrap_content"
-        android:layout_height="96dp"
-        android:layout_marginBottom="12dp"
+        android:layout_width="match_parent"
+        android:layout_height="144dp"
+        android:layout_marginTop="12dp"
         android:layout_centerHorizontal="true"
-        android:layout_below="@+id/item_attachment_info"
-        android:scaleType="centerInside" />
+        android:background="?android:attr/windowBackground"
+        android:scaleType="fitStart" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/item_attachment_info"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/item_attachment_thumbnail"
+        android:background="?attr/cardBackgroundTransparentColor">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/item_attachment_broken"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8414e6d24..b770f9ccf 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -25,9 +25,8 @@
     <attr name="toolbarPopupAppearance" format="reference" />
 
     <attr name="colorAccentLight" format="reference|color" />
-
+    <attr name="cardBackgroundTransparentColor" format="reference|color" />
     <attr name="iconPreferenceColor" format="reference|color" />
-
     <attr name="textColorInverse" format="reference|color" />
 
     <declare-styleable name="explanationDialog">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8860d6fdf..7140589c1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,11 +20,14 @@
 <resources>
 	<color name="transparent">#00ffffff</color>
 	<color name="white">#ffffff</color>
+	<color name="white_transparent">#E0FFFFFF</color>
 	<color name="black">#000000</color>
     <color name="darker">#0A0A0A</color>
     <color name="dark">#0e0e0e</color>
+    <color name="dark_transparent">#E00E0E0E</color>
     <color name="grey">#bdbdbd</color>
     <color name="grey_dark">#9e9e9e</color>
+    <color name="grey_dark_transparent">#E0424242</color>
 
     <color name="orange_light">#ffa726</color>
     <color name="orange">#fb8c00</color>
@@ -61,6 +64,7 @@
     <color name="background_dark">#000000</color>
     <color name="background_purple">#F2EDFA</color>
     <color name="background_purple_light">#F7F3FD</color>
+    <color name="background_purple_light_transparent">#E0F7F3FD</color>
 
     <color name="icon_background">#555555</color>
     <color name="icon_text">#000000</color>
diff --git a/app/src/main/res/values/style_black.xml b/app/src/main/res/values/style_black.xml
index af1813020..dc0a3cd0b 100644
--- a/app/src/main/res/values/style_black.xml
+++ b/app/src/main/res/values/style_black.xml
@@ -36,6 +36,7 @@
         <item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Black</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Black</item>
+        <item name="cardBackgroundTransparentColor">@color/dark_transparent</item>
     </style>
     <!-- Toolbar Style Black -->
     <style name="KeepassDXStyle.Toolbar.Black" parent="KeepassDXStyle.Black">
diff --git a/app/src/main/res/values/style_dark.xml b/app/src/main/res/values/style_dark.xml
index 55c1b1f2c..c2d92624d 100644
--- a/app/src/main/res/values/style_dark.xml
+++ b/app/src/main/res/values/style_dark.xml
@@ -35,6 +35,7 @@
         <item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Dark</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Dark</item>
+        <item name="cardBackgroundTransparentColor">@color/dark_transparent</item>
     </style>
     <!-- Toolbar Style Dark -->
     <style name="KeepassDXStyle.Toolbar.Dark" parent="KeepassDXStyle.Dark">
diff --git a/app/src/main/res/values/style_purple.xml b/app/src/main/res/values/style_purple.xml
index 288c548da..f2a08cba3 100644
--- a/app/src/main/res/values/style_purple.xml
+++ b/app/src/main/res/values/style_purple.xml
@@ -36,6 +36,7 @@
         <item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
         <item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Purple</item>
         <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Purple</item>
+        <item name="cardBackgroundTransparentColor">@color/background_purple_light_transparent</item>
     </style>
     <!-- Toolbar Style Purple -->
     <style name="KeepassDXStyle.Toolbar.Purple" parent="KeepassDXStyle.Purple">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ca871ad06..68ab45dd7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -55,6 +55,7 @@
         <item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
 
         <item name="android:windowBackground">@color/background_light</item>
+        <item name="cardBackgroundTransparentColor">#DDFFFFFF</item>
 
         <item name="android:textColor">@color/text_color_light</item>
         <item name="android:editTextColor">@color/colorText</item>
@@ -112,6 +113,7 @@
         <item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
 
         <item name="android:windowBackground">@color/background_night</item>
+        <item name="cardBackgroundTransparentColor">@color/grey_dark_transparent</item>
 
         <item name="android:textColor">@color/text_color_night</item>
         <item name="android:editTextColor">@color/colorTextInverse</item>