From bf1a426e5b25b9b5e6eed8fe36e972ad77710c82 Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Fri, 11 Oct 2024 12:57:32 +0200
Subject: [PATCH] use correct deck card icon

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../main/res/drawable/baseline_assignment_24.xml | 13 -------------
 app/src/main/res/drawable/deck_card_icon.xml     | 16 ++++++++++++++++
 .../item_custom_incoming_deck_card_message.xml   |  9 +++++----
 .../item_custom_outcoming_deck_card_message.xml  |  6 +++---
 4 files changed, 24 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/res/drawable/baseline_assignment_24.xml
 create mode 100644 app/src/main/res/drawable/deck_card_icon.xml

diff --git a/app/src/main/res/drawable/baseline_assignment_24.xml b/app/src/main/res/drawable/baseline_assignment_24.xml
deleted file mode 100644
index ef1092aae..000000000
--- a/app/src/main/res/drawable/baseline_assignment_24.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<!--
-  ~ Nextcloud Talk - Android Client
-  ~
-  ~ SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
-  ~ SPDX-License-Identifier: GPL-3.0-or-later
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
-    
-</vector>
diff --git a/app/src/main/res/drawable/deck_card_icon.xml b/app/src/main/res/drawable/deck_card_icon.xml
new file mode 100644
index 000000000..3794a4c3c
--- /dev/null
+++ b/app/src/main/res/drawable/deck_card_icon.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="56"
+    android:viewportWidth="56"
+    android:width="24dp">
+      
+    <path android:fillColor="#000000"
+        android:pathData="M12.695,4.656L43.328,4.656C43.187,2.688 42.062,1.633 39.906,1.633L16.117,1.633C13.961,1.633 12.836,2.688 12.695,4.656ZM8.101,11.148L47.945,11.148C47.594,9.016 46.563,7.844 44.219,7.844L11.805,7.844C9.461,7.844 8.453,9.016 8.101,11.148ZM10.234,54.367L45.789,54.367C50.664,54.367 53.125,51.93 53.125,47.102L53.125,22.211C53.125,17.383 50.664,14.945 45.789,14.945L10.234,14.945C5.336,14.945 2.875,17.359 2.875,22.211L2.875,47.102C2.875,51.93 5.336,54.367 10.234,54.367ZM10.305,50.594C7.961,50.594 6.648,49.328 6.648,46.891L6.648,22.398C6.648,19.961 7.961,18.719 10.305,18.719L45.719,18.719C48.039,18.719 49.351,19.961 49.351,22.398L49.351,46.891C49.351,49.328 48.039,50.594 45.719,50.594Z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_custom_incoming_deck_card_message.xml b/app/src/main/res/layout/item_custom_incoming_deck_card_message.xml
index fd2bb6b55..3810d813c 100644
--- a/app/src/main/res/layout/item_custom_incoming_deck_card_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_deck_card_message.xml
@@ -22,6 +22,7 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_alignParentTop="true"
+        android:layout_marginTop ="2dp"
         android:layout_marginEnd="8dp"
         android:contentDescription="@string/avatar" />
 
@@ -61,14 +62,15 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
             android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/deckCardImage"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
                 android:contentDescription="@null"
-                android:src="@drawable/baseline_assignment_24" />
+                android:src="@drawable/deck_card_icon" />
 
             <androidx.emoji2.widget.EmojiTextView
                 android:id="@+id/cardName"
@@ -78,7 +80,6 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textIsSelectable="false"
-                android:layout_marginBottom="4dp"
                 android:textStyle="bold"
                 android:visibility="gone"
                 tools:text="Card Name"
diff --git a/app/src/main/res/layout/item_custom_outcoming_deck_card_message.xml b/app/src/main/res/layout/item_custom_outcoming_deck_card_message.xml
index 679e751f4..cb5ccf235 100644
--- a/app/src/main/res/layout/item_custom_outcoming_deck_card_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_deck_card_message.xml
@@ -46,10 +46,10 @@
 
                 <ImageView
                     android:id="@+id/deckCardImage"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
                     android:contentDescription="@null"
-                    android:src="@drawable/baseline_assignment_24" />
+                    android:src="@drawable/deck_card_icon" />
 
                 <androidx.emoji2.widget.EmojiTextView
                     android:id="@+id/cardName"