From 4695dd26293f56f4863b21cf3acc3ec591c669a9 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Wed, 7 Dec 2022 16:30:36 +0100
Subject: Prikaz duze poruke u listi cetova je ulepsan, dodate vodece nule na
 sate i minute #80

---
 .../example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt | 10 +++++++---
 .../app/src/main/res/layout/chat_preview.xml               | 14 +++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt
index 747ccd4..478a8ea 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt
@@ -90,10 +90,14 @@ class ChatPreviewsAdapter (val items : MutableList<ChatPreview>,val activity:Cha
                 var lastMessage=db.getLastMessage(item.userId)
                 tvUsername.text=item.username
                 if(lastMessage!=null){
-                    tvLastMessage.text=lastMessage.messagge
+                    //var msg=lastMessage.messagge.dropLast(if(lastMessage.messagge.length>20) lastMessage.messagge.length-20 else 0)
+                    tvLastMessage.text=lastMessage.messagge//msg+if(lastMessage.messagge.length>20) "..." else ""
                     if(!isDifferentDays(lastMessage.usableTimeStamp,Calendar.getInstance())){
-                        tvLastMessageDate.text=lastMessage.usableTimeStamp.get(Calendar.HOUR_OF_DAY).toString() + ":" + lastMessage.usableTimeStamp.get(
-                            Calendar.MINUTE).toString()
+                        var hour=lastMessage.usableTimeStamp.get(Calendar.HOUR_OF_DAY)
+                        var hourStr=if(hour<10) "0"+hour.toString() else hour.toString()
+                        var minute=lastMessage.usableTimeStamp.get(Calendar.MINUTE)
+                        var minuteStr=if(minute<10) "0"+minute.toString() else minute.toString()
+                        tvLastMessageDate.text= hourStr + ":" + minuteStr
                     }
                     else{
                         tvLastMessageDate.text=lastMessage.usableTimeStamp.get(Calendar.DAY_OF_MONTH).toString()+"/"+
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml
index c995b4b..91a8605 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml
@@ -40,15 +40,23 @@
                 android:textSize="@dimen/header2_size"
                 android:textColor="@color/unfollow"/>
         </androidx.appcompat.widget.LinearLayoutCompat>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="10dp">
             <TextView
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/tvLastMessage"
-                android:text="hej, sta ima novo?"
+                android:maxLines="1"
+                android:ellipsize="end"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:textAlignment="gravity"
                 android:textSize="@dimen/header2_size"
-                android:textColor="@color/unfollow"/>
+                android:textColor="@color/unfollow"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.appcompat.widget.LinearLayoutCompat>
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
-- 
cgit v1.2.3