From 80c32b5cd43346a2ba862201c3fe16387fbcc570 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Sun, 11 Dec 2022 14:13:20 +0100
Subject: Iz ceta se moze otici na profil korisnika #83

---
 .../example/brzodolokacije/Activities/ActivityUserProfile.kt   |  6 +-----
 .../brzodolokacije/Activities/ChatActivityConversation.kt      | 10 ++++++++++
 .../app/src/main/res/layout/activity_chat_conversation.xml     |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
index 4b62965..bc923a4 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
@@ -10,17 +10,13 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentTransaction
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
 import com.auth0.android.jwt.JWT
 import com.bumptech.glide.Glide
 import com.exam.DBHelper
-import com.example.brzodolokacije.Adapters.MyPostsAdapter
 import com.example.brzodolokacije.FragmentProfileStatistics
-import com.example.brzodolokacije.Fragments.FragmentProfile
 import com.example.brzodolokacije.Fragments.FragmentUserPostsProfileActivity
-import com.example.brzodolokacije.Models.PostPreview
 import com.example.brzodolokacije.Models.UserReceive
 import com.example.brzodolokacije.R
 import com.example.brzodolokacije.R.id
@@ -333,7 +329,7 @@ class ActivityUserProfile : AppCompatActivity(),OnRefreshListener {
                 swipeRefreshLayout.isRefreshing=false
                 if(userData.pfp!=null) {
                     Glide.with(this@ActivityUserProfile)
-                        .load(RetrofitHelper.baseUrl + "/api/post/image/" + userObject.pfp!!._id)
+                        .load(RetrofitHelper.baseUrl + "/api/post/image/" + userData.pfp!!._id)
                         .circleCrop()//Round image
                         .into(profilePicture)
                 }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt
index 83dd403..3a52cc4 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt
@@ -1,5 +1,6 @@
 package com.example.brzodolokacije.Activities
 
+import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.util.Log
@@ -22,6 +23,7 @@ import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import com.example.brzodolokacije.chat.SignalRListener
 import com.example.brzodolokacije.databinding.ActivityChatConversationBinding
+import com.google.gson.Gson
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import retrofit2.Call
@@ -157,6 +159,14 @@ class ChatActivityConversation : AppCompatActivity() {
 
             }
         }
+        binding.llHeader.setOnClickListener {
+            val intent: Intent = Intent(this@ChatActivityConversation,ActivityUserProfile::class.java)
+            var b= Bundle()
+            intent.putExtra("user", Gson().toJson(
+                UserReceive(userId!!,"",receiverUsername!!,"",Date(),null,0, listOf(),0,listOf(),0,listOf(),0,null)
+            ))
+            this.startActivity(intent)
+        }
 
     }
 
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 ca8a043..d68d4b6 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
@@ -30,6 +30,7 @@
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:id="@+id/llHeader"
+                android:clickable="true"
                 android:layout_height="50dp">
                 <ImageView
                     android:id="@+id/ivUserImage"
-- 
cgit v1.2.3