From 5d9040be525a7c53c7eb37802cb40d7f9e75d20c Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Wed, 7 Dec 2022 21:45:09 +0100
Subject: Dobar prikaz teksta koji zauzima vise linija pri kucanju poruka,
 izmenjen izgled polja za unos poruke #80

---
 .../.idea/deploymentTargetDropDown.xml             |  4 +-
 .../res/drawable/ic_baseline_send_white_24.xml     |  5 +++
 .../main/res/layout/activity_chat_conversation.xml | 48 ++++++++++++++--------
 .../app/src/main/res/layout/chat_message_other.xml |  4 +-
 4 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_send_white_24.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
index af6c93b..59f1e26 100644
--- a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
+++ b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\PC\.android\avd\Pixel_6_API_33.avd" />
+            <value value="C:\Users\PC\.android\avd\Pixel_4a_API_33.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-12-07T14:05:59.558531400Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-12-07T19:39:34.164319600Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_send_white_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_send_white_24.xml
new file mode 100644
index 0000000..4cf0a52
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_send_white_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+     android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
index 4dcab31..ca8a043 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
@@ -92,16 +92,19 @@
 
         </androidx.recyclerview.widget.RecyclerView>
     </androidx.constraintlayout.widget.ConstraintLayout>
+<androidx.appcompat.widget.LinearLayoutCompat
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/cvParentMessageEdit"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:minHeight="40dp"
         android:layout_marginBottom="5dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="16dp"
-        android:elevation="0dp"
+        android:layout_marginHorizontal="10dp"
+        android:elevation="16dp"
         app:cardCornerRadius="20dp">
 
 
@@ -109,24 +112,37 @@
             android:id="@+id/etNewMessage"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/rounded_white_button_login"
-            android:hint="  poruka"
-            android:inputType="textPersonName"
-            android:paddingLeft="15dp"
+            android:backgroundTint="@color/white"
+            android:hint="Ukucajte poruku..."
+            android:paddingLeft="10dp"
             tools:ignore="TouchTargetSizeCheck"
-            android:autofillHints="emailAddress"/>
+            android:inputType="textCapSentences|textMultiLine"/>
+
+    </androidx.cardview.widget.CardView>
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cvParentSendButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:minHeight="40dp"
+        android:backgroundTint="@color/purple_500"
+        android:layout_marginBottom="5dp"
+        android:layout_marginEnd="5dp"
+        android:elevation="16dp"
+        app:cardCornerRadius="20dp">
+
 
         <ImageButton
             android:id="@+id/btnSendMessage"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:layout_gravity="right|center_vertical"
-            android:scaleType="centerCrop"
-            android:layout_marginEnd="10dp"
+            android:layout_gravity="center"
+            android:layout_margin="10dp"
             android:background="@null"
-            android:src="@drawable/post_comment"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_baseline_send_white_24"
             app:cornerRadius="16dp"
             tools:ignore="SpeakableTextPresentCheck" />
-
     </androidx.cardview.widget.CardView>
+</androidx.appcompat.widget.LinearLayoutCompat>
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml
index 68a796d..a396f07 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
         android:layout_marginLeft="10dp"
-        android:backgroundTint="#eef1f6"
+        android:backgroundTint="@color/purple_500"
         android:background="@drawable/view_corner_radius"
         app:cardCornerRadius="15dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:maxLines="50"
             android:maxWidth="300dp"
-            android:backgroundTint="#eef1f6"
+            android:textColor="@color/white"
             android:padding="5dp"
             android:paddingHorizontal="15dp"
             app:layout_constraintStart_toStartOf="parent"
-- 
cgit v1.2.3