From 859f5b3951e0ae9034e873cfe0a5ea375aa26e48 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Tue, 15 Nov 2022 23:52:53 +0100
Subject: prepravljena defaultna vrednost broja komentara #31

---
 Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
index 7c1f8bc..a8a03aa 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
@@ -277,7 +277,7 @@
                 android:layout_height="wrap_content"
                 android:padding="@dimen/text_padding"
                 app:layout_constraintTop_toBottomOf="@id/postCommentLayout"
-                android:text="3"
+                android:text="0"
                 app:layout_constraintStart_toEndOf="@id/tvCommentLabel" />
 
             <androidx.recyclerview.widget.RecyclerView
-- 
cgit v1.2.3


From a48ceb85226fc2d1347e5d227a28095fcdf11852 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Wed, 16 Nov 2022 00:04:27 +0100
Subject: Sada se menja ocena objave odmah nakon ocenjivanja, bez refresha #30

---
 .../java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt  | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
index ea82cda..c030eda 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
@@ -19,6 +19,7 @@ import okhttp3.ResponseBody
 import okhttp3.internal.notifyAll
 import retrofit2.Call
 import retrofit2.Response
+import kotlin.math.roundToInt
 
 
 class ActivitySinglePost : AppCompatActivity() {
@@ -192,6 +193,9 @@ class ActivitySinglePost : AppCompatActivity() {
         request.enqueue(object : retrofit2.Callback<ResponseBody?> {
             override fun onResponse(call: Call<ResponseBody?>, response: Response<ResponseBody?>) {
                 if(response.isSuccessful){
+                    //zasad hardkodovano, zameniti te vrednosti sa brojem ocena kada se doda
+                    post.ratings=((post.ratings)*10+rating.rating)/11
+                    binding.tvRating.text=String.format("%.2f",post.ratings)
                     Toast.makeText(
                         this@ActivitySinglePost, "prosao zahtev", Toast.LENGTH_LONG
                     ).show()
-- 
cgit v1.2.3


From c6c49607b0c04f3acad0273b83a9fc449b9c5d29 Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Fri, 18 Nov 2022 00:45:51 +0100
Subject: Dodat fragment za profil korisnika.

---
 .../Fragments/FragmentUserProfile.kt               |  60 +++++
 .../src/main/res/layout/fragment_user_profile.xml  | 285 +++++++++++++++++++++
 2 files changed, 345 insertions(+)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
new file mode 100644
index 0000000..8ab5276
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
@@ -0,0 +1,60 @@
+package com.example.brzodolokacije.Fragments
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.example.brzodolokacije.R
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [FragmentUserProfile.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class FragmentUserProfile : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_user_profile, container, false)
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment FragmentUserProfile.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            FragmentUserProfile().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
new file mode 100644
index 0000000..95516f0
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.FragmentUserProfile">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+
+            android:id="@+id/imageView3"
+            android:layout_width="match_parent"
+            android:layout_height="290dp"
+            android:foreground="@drawable/b3"
+            android:foregroundGravity="center_vertical|center|center_horizontal|fill"
+            android:src="@drawable/b3"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+
+            android:id="@+id/imageView4"
+            android:layout_width="411dp"
+            android:layout_height="287dp"
+            app:layout_constraintBottom_toBottomOf="@+id/imageView3"
+            app:layout_constraintEnd_toEndOf="@id/imageView3"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="@+id/imageView3"
+            app:layout_constraintTop_toTopOf="@+id/imageView3"
+            app:layout_constraintVertical_bias="0.0" />
+
+        <com.google.android.material.imageview.ShapeableImageView
+
+            android:id="@+id/tvFragmentProfileInfoContainer"
+            android:layout_width="0dp"
+            android:layout_height="220dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="156dp"
+            android:layout_marginEnd="20dp"
+            android:adjustViewBounds="true"
+            android:background="#E8FFFFFF"
+            android:elevation="1dp"
+            android:scaleType="fitEnd"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/imageView3"
+            app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" />
+
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cvFragmentHomePageProfile"
+            android:layout_width="140dp"
+            android:layout_height="140dp"
+            android:layout_gravity="center"
+            android:elevation="10dp"
+            app:cardCornerRadius="250dp"
+            app:layout_constraintBottom_toTopOf="@+id/tableLayout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.77">
+
+            <ImageView
+
+                android:id="@+id/tvFragmentProfileProfilePicture"
+                android:layout_width="140dp"
+                android:layout_height="140dp"
+                android:elevation="10dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_baseline_person_24"
+                tools:ignore="ContentDescription" />
+        </androidx.cardview.widget.CardView>
+
+        <TableLayout
+            android:id="@+id/tableLayout"
+            android:layout_width="323dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-10dp"
+
+            android:elevation="20dp"
+            android:gravity="center"
+            android:stretchColumns="1"
+            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintEnd_toEndOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintHorizontal_bias="0.488"
+            app:layout_constraintStart_toStartOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer">
+
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+
+                android:gravity="center">
+
+                <TextView
+                    android:id="@+id/tvFragmentProfileName"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="Petar Petrović"
+
+                    android:textSize="25sp" />
+            </TableRow>
+
+            <TableRow
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+
+                android:gravity="center">
+
+                <com.google.android.material.button.MaterialButton
+                    android:layout_height="35dp"
+                    android:layout_gravity="start"
+                    android:width="150dp"
+                    android:height="10dp"
+                    android:background="@drawable/rounded_cyan_button"
+                    android:text="Prati" />
+
+                <com.google.android.material.button.MaterialButton android:layout_gravity="end"
+                    android:layout_height="35dp"
+                    android:width="150dp"
+                    android:height="10dp"
+                    android:background="@drawable/rounded_cyan_button"
+                    android:text="Poruka"
+                    />
+
+            </TableRow>
+        </TableLayout>
+
+        <LinearLayout
+            android:layout_marginTop="20dp"
+            android:elevation="30dp"
+            android:id="@+id/linearLayout3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            app:layout_constraintTop_toBottomOf="@+id/tableLayout">
+<LinearLayout
+    android:orientation="horizontal"
+
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/tvFragmentProfilePosts"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="20dp"
+                android:text="OBJAVE" />
+
+            <TextView
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="40dp"
+                android:id="@+id/tvFragmentProfileFollowers"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="PRATIOCI" />
+
+    <TextView
+        android:id="@+id/tvFragmentProfileFollow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="40dp"
+        android:layout_gravity="right"
+        android:text="PRAĆENJA" />
+</LinearLayout>
+            <LinearLayout
+                android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:gravity="center"
+            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tableLayout">
+
+            <TextView
+                android:id="@+id/tvFragmentProfilePostsNo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_gravity="left"
+                android:layout_marginStart="60dp"
+                android:layout_marginEnd="35dp"
+
+                android:text="156" />
+
+            <TextView
+                android:id="@+id/tvFragmentProfileFollowersNo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="50"
+                android:layout_gravity="left"
+                android:layout_marginStart="60dp"
+                android:layout_marginEnd="20dp"/>
+
+            <TextView
+                android:id="@+id/tvFragmentProfileFollowNo"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:layout_gravity="left"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="20dp"
+                android:text="40" />
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="409dp"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btnFragmentProfileShowMyPosts" />
+
+        <Button
+            android:id="@+id/btnFragmentProfileShowMyPosts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="4dp"
+            android:backgroundTint="#FFFFFF"
+            android:stateListAnimator="@null"
+            android:text="Objave"
+
+            android:textColor="@color/cardview_dark_background"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
+        <Button
+            android:id="@+id/btnFragmentProfileShowMyData"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="20dp"
+            android:backgroundTint="#FFFFFF"
+            android:stateListAnimator="@null"
+            android:text="Podaci"
+
+            android:textColor="@color/cardview_dark_background"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyRecensions"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
+        <Button
+            android:id="@+id/btnFragmentProfileShowMyRecensions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="36dp"
+            android:layout_marginTop="4dp"
+            android:backgroundTint="#FFFFFF"
+            android:stateListAnimator="@null"
+            android:text="Recenzije"
+            android:textColor="@color/cardview_dark_background"
+            app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
+        <FrameLayout
+            android:id="@+id/flFragmentProfileFragmentContainer"
+            android:layout_width="409dp"
+            android:layout_height="319dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/divider">
+        </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 7b3b8988f5abb87c17d1459ab80d129b4985fe4f Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Fri, 18 Nov 2022 02:40:29 +0100
Subject: delimicno odradjeno stranicenje #36

---
 Client/BrzoDoLokacije/app/build.gradle             |  3 +
 .../brzodolokacije/Adapters/ShowPostsAdapter.kt    | 33 ++++++---
 .../brzodolokacije/Fragments/FragmentShowPosts.kt  | 81 ++++++++++++++--------
 .../brzodolokacije/Interfaces/IBackendApi.kt       |  7 ++
 .../java/com/example/brzodolokacije/Models/Post.kt | 10 ++-
 .../paging/SearchPostsPagingSource.kt              | 36 ++++++++++
 .../brzodolokacije/paging/SearchPostsRepository.kt | 30 ++++++++
 .../brzodolokacije/paging/SearchPostsViewModel.kt  | 25 +++++++
 .../paging/SearchPostsViewModelFactory.kt          | 15 ++++
 9 files changed, 201 insertions(+), 39 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsRepository.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModel.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModelFactory.kt

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/build.gradle b/Client/BrzoDoLokacije/app/build.gradle
index db4ed1b..e1ad943 100644
--- a/Client/BrzoDoLokacije/app/build.gradle
+++ b/Client/BrzoDoLokacije/app/build.gradle
@@ -52,6 +52,9 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:21.0.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation "androidx.paging:paging-runtime:3.0.0-alpha03"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
index bbcf9e4..a827dcb 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
@@ -8,6 +8,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.paging.PagingDataAdapter
+import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.brzodolokacije.Activities.ActivitySinglePost
@@ -25,10 +27,23 @@ import retrofit2.Response
 
 
 class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPreview>)
-    : RecyclerView.Adapter<ShowPostsAdapter.ViewHolder>() {
+    : PagingDataAdapter<PostPreview, ShowPostsAdapter.ViewHolder>(REPO_COMPARATOR) {
     private lateinit var token: String
     private lateinit var imageApi: IBackendApi
 
+    companion object{
+        private val REPO_COMPARATOR=object:DiffUtil.ItemCallback<PostPreview>(){
+            override fun areContentsTheSame(oldItem: PostPreview, newItem: PostPreview): Boolean {
+                return oldItem._id==newItem._id
+            }
+
+            override fun areItemsTheSame(oldItem: PostPreview, newItem: PostPreview): Boolean {
+                return oldItem._id==newItem._id
+            }
+        }
+    }
+
+
     //constructer has one argument - list of objects that need to be displayed
     //it is bound to xml of single item
     private lateinit var binding: PostPreviewBinding
@@ -42,20 +57,18 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPrevie
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         //sets components of particular item
-        holder.bind(items[position])
+        holder.bind(getItem(position)!!)
         holder.itemView.setOnClickListener {
             //Toast.makeText(activity,item._id,Toast.LENGTH_LONG).show()
-            val intent:Intent = Intent(activity,ActivitySinglePost::class.java)
-            var b=Bundle()
-            items[position].location.type=LocationType.ADA
-            b.putParcelable("selectedPost", items[position])
-            intent.putExtras(b)
-            activity.startActivity(intent)
+//            val intent:Intent = Intent(activity,ActivitySinglePost::class.java)
+//            var b=Bundle()
+//            items[position].location.type=LocationType.ADA
+//            b.putParcelable("selectedPost", items[position])
+//            intent.putExtras(b)
+//            activity.startActivity(intent)
         }
     }
 
-
-    override fun getItemCount() = items.size
     inner class ViewHolder(itemView: PostPreviewBinding) : RecyclerView.ViewHolder(itemView.root) {
         fun bind(item: PostPreview) {
             binding.apply {
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
index 83f6429..84df389 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
@@ -10,6 +10,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.Toast
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.paging.PagingDataAdapter
+import androidx.paging.cachedIn
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -23,8 +27,14 @@ import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import com.example.brzodolokacije.databinding.FragmentHomeBinding
 import com.example.brzodolokacije.databinding.FragmentShowPostsBinding
+import com.example.brzodolokacije.paging.SearchPostsRepository
+import com.example.brzodolokacije.paging.SearchPostsViewModel
+import com.example.brzodolokacije.paging.SearchPostsViewModelFactory
 import kotlinx.android.synthetic.main.fragment_show_posts.*
 import kotlinx.android.synthetic.main.fragment_show_posts.view.*
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
 import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.Response
@@ -35,13 +45,15 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
     private lateinit var binding: FragmentShowPostsBinding
     private var posts : MutableList<PostPreview> = mutableListOf()
     private var linearManagerVar: RecyclerView.LayoutManager? = null
-    private var adapterVar: RecyclerView.Adapter<ShowPostsAdapter.ViewHolder>? = null
+    private var adapterVar: ShowPostsAdapter? = null
     private var recyclerView: RecyclerView?=null
     private var gridManagerVar: RecyclerView.LayoutManager?=null
     private var swipeRefreshLayout:SwipeRefreshLayout?=null
+    private lateinit var searchPostsViewModel:SearchPostsViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setUpViewModel()
         binding=FragmentShowPostsBinding.inflate(layoutInflater)
         //instantiate adapter and linearLayout
         adapterVar=ShowPostsAdapter(requireActivity(),posts)
@@ -49,6 +61,11 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
         gridManagerVar=GridLayoutManager(activity,2)
     }
 
+    private fun setUpViewModel() {
+        val factory=SearchPostsViewModelFactory(RetrofitHelper.getInstance(),requireActivity())
+        searchPostsViewModel=ViewModelProvider(this@FragmentShowPosts,factory).get(SearchPostsViewModel::class.java)
+    }
+
     fun setUpListeners(rootView: View?){
         rootView?.findViewById<ImageButton>(R.id.btnGridLayout)?.setOnClickListener() {
             if(recyclerView?.layoutManager!=gridManagerVar){
@@ -66,32 +83,38 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
     }
 
     fun requestToBack(){
-        val postApi= RetrofitHelper.getInstance()
-        val token=SharedPreferencesHelper.getValue("jwt", requireActivity())
-        val request=postApi.getPosts("Bearer "+token)
-        request.enqueue(object : retrofit2.Callback<MutableList<PostPreview>?> {
-            override fun onResponse(call: Call<MutableList<PostPreview>?>, response: Response<MutableList<PostPreview>?>) {
-                if(response.isSuccessful){
-                    posts=response.body()!!
-                    recyclerView?.adapter=ShowPostsAdapter(requireActivity(),posts)
-                    Toast.makeText(
-                        activity, "prosao zahtev", Toast.LENGTH_LONG
-                    ).show()
-                    swipeRefreshLayout?.isRefreshing=false
-                }else{
-                    if(response.errorBody()!=null)
-                        Toast.makeText(activity, response.errorBody()!!.string(), Toast.LENGTH_LONG).show();
-                }
-
-
+        lifecycleScope.launch{
+            searchPostsViewModel.fetchPosts().distinctUntilChanged().collectLatest {
+                adapterVar?.submitData(it)
+                swipeRefreshLayout?.isRefreshing=false
             }
-
-            override fun onFailure(call: Call<MutableList<PostPreview>?>, t: Throwable) {
-                Toast.makeText(
-                    activity, t.toString(), Toast.LENGTH_LONG
-                ).show();
-            }
-        })
+        }
+//        val postApi= RetrofitHelper.getInstance()
+//        val token=SharedPreferencesHelper.getValue("jwt", requireActivity())
+//        val request=postApi.getPosts("Bearer "+token)
+//        request.enqueue(object : retrofit2.Callback<MutableList<PostPreview>?> {
+//            override fun onResponse(call: Call<MutableList<PostPreview>?>, response: Response<MutableList<PostPreview>?>) {
+//                if(response.isSuccessful){
+//                    posts=response.body()!!
+//                    recyclerView?.adapter=ShowPostsAdapter(requireActivity(),posts)
+//                    Toast.makeText(
+//                        activity, "prosao zahtev", Toast.LENGTH_LONG
+//                    ).show()
+//                    swipeRefreshLayout?.isRefreshing=false
+//                }else{
+//                    if(response.errorBody()!=null)
+//                        Toast.makeText(activity, response.errorBody()!!.string(), Toast.LENGTH_LONG).show();
+//                }
+//
+//
+//            }
+//
+//            override fun onFailure(call: Call<MutableList<PostPreview>?>, t: Throwable) {
+//                Toast.makeText(
+//                    activity, t.toString(), Toast.LENGTH_LONG
+//                ).show();
+//            }
+//        })
     }
 
     override fun onCreateView(
@@ -115,14 +138,16 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
             R.color.purple_700
         )
         swipeRefreshLayout?.post(kotlinx.coroutines.Runnable {
-            swipeRefreshLayout?.isRefreshing=true
+            //swipeRefreshLayout?.isRefreshing=true
             requestToBack()
         })
         return rootView
     }
 
     override fun onRefresh() {
-        requestToBack()
+        //requestToBack()
+        adapterVar!!.notifyDataSetChanged()
+        Log.d("main",adapterVar!!.itemCount.toString())
     }
 
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
index 2f5cff1..6d09251 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
@@ -54,6 +54,13 @@ interface IBackendApi {
     @GET("/api/user/posts")
     fun getMyPosts(@Header("Authorization") authHeader:String):Call<MutableList<PostPreview>>
 
+    @GET("/api/post/locations/{id}/posts")
+    suspend fun getPagedPosts(@Header("Authorization") authHeader: String,
+                        @Path("id") locationId:String,
+                        @Query("page") page:Int,
+                        @Query("sorttype") sorttype:Int,
+                        @Query("filterdate") filterdate:Int
+                        ):PagedPosts
 //@POST("putanja")
     //fun add(@Body obj:Post,@Header("Authorization") authHeader:String):Call<Post>
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
index 3bbcc0c..f990133 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
@@ -71,4 +71,12 @@ data class Rating(
 data class RatingReceive(
     var rating:Int,
     var postId:String
-)
\ No newline at end of file
+)
+
+data class PagedPosts(
+    var page:Int,
+    var index:Int,
+    var totalpages:Int,
+    var totalposts:Int,
+    var posts:MutableList<PostPreview>
+)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt
new file mode 100644
index 0000000..2f69a7a
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt
@@ -0,0 +1,36 @@
+package com.example.brzodolokacije.paging
+
+import android.app.Activity
+import android.util.Log
+import androidx.paging.PagingSource
+import com.example.brzodolokacije.Interfaces.IBackendApi
+import com.example.brzodolokacije.Models.PagedPosts
+import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
+import retrofit2.HttpException
+import java.io.IOException
+
+class SearchPostsPagingSource(
+    val backend: IBackendApi,
+    val activity: Activity
+):PagingSource<Int,PostPreview>() {
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, PostPreview> {
+        val page=params.key?:0
+        val token=SharedPreferencesHelper.getValue("jwt", activity)
+        return try{
+            val response=backend.getPagedPosts("Bearer "+token,"6375784fe84e2d53df32bf03",
+                page,1,1
+            )
+            Log.d("main",page.toString())
+            LoadResult.Page(
+                response.posts,prevKey=if(page==0) null else page-1,
+                nextKey=if(response.posts.isEmpty()) null else page+1
+            )
+        }catch(exception:IOException){
+            return LoadResult.Error(exception)
+        }catch(exception:HttpException){
+            return LoadResult.Error(exception)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsRepository.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsRepository.kt
new file mode 100644
index 0000000..ae3a684
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsRepository.kt
@@ -0,0 +1,30 @@
+package com.example.brzodolokacije.paging
+
+import android.app.Activity
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.cachedIn
+import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Services.RetrofitHelper
+import kotlinx.coroutines.flow.Flow
+
+class SearchPostsRepository(val activity: Activity) {
+    companion object{
+        const val DEFAULT_PAGE_SIZE=20
+        const val DEFAULT_PAGE_INDEX=1
+
+        fun getInstance(activity: Activity)=SearchPostsRepository(activity)
+    }
+
+    fun letSearchedPostsFlow(pagingConfig: PagingConfig=getDefaultPageConfig()): Flow<PagingData<PostPreview>> {
+        return Pager(
+            config=pagingConfig,
+            pagingSourceFactory = {SearchPostsPagingSource(RetrofitHelper.getInstance(),activity)}
+        ).flow
+    }
+
+    private fun getDefaultPageConfig(): PagingConfig {
+        return PagingConfig(pageSize= DEFAULT_PAGE_SIZE, enablePlaceholders = false)
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModel.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModel.kt
new file mode 100644
index 0000000..d0bf3ef
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModel.kt
@@ -0,0 +1,25 @@
+package com.example.brzodolokacije.paging
+
+import android.app.Activity
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.cachedIn
+import com.example.brzodolokacije.Interfaces.IBackendApi
+import com.example.brzodolokacije.Models.PostPreview
+import kotlinx.coroutines.flow.Flow
+
+class SearchPostsViewModel(
+    private val api:IBackendApi,
+    val activity:Activity
+): ViewModel() {
+    val posts =
+        Pager(config = PagingConfig(pageSize = 10), pagingSourceFactory = {
+            SearchPostsPagingSource(api,activity)
+        }).flow.cachedIn(viewModelScope)
+    fun fetchPosts(): Flow<PagingData<PostPreview>>{
+        return SearchPostsRepository.getInstance(activity).letSearchedPostsFlow().cachedIn(viewModelScope)
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModelFactory.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModelFactory.kt
new file mode 100644
index 0000000..cddea54
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModelFactory.kt
@@ -0,0 +1,15 @@
+package com.example.brzodolokacije.paging
+
+import android.app.Activity
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.example.brzodolokacije.Interfaces.IBackendApi
+
+class SearchPostsViewModelFactory(
+    val api:IBackendApi,
+    val activity: Activity
+):ViewModelProvider.NewInstanceFactory() {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return SearchPostsViewModel(api,activity) as T
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 9862992f8601f6f8bc4150a04e72af2e781aea64 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Fri, 18 Nov 2022 20:17:37 +0100
Subject: Omogucenom klikom na dugme dodaj novu lokaciju da se otvara mapa.
 Omogucenja pretraga , gps lociranje, klikom bilo gde na mapi se postavlja
 marker.

---
 .../app/src/main/AndroidManifest.xml               |  55 +++-
 .../brzodolokacije/Activities/MapsActivity.kt      | 358 ++++++++++++++++++---
 .../res/drawable/ic_baseline_add_location_24.xml   |   5 +
 .../app/src/main/res/layout/activity_maps.xml      |  73 ++++-
 4 files changed, 431 insertions(+), 60 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_location_24.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index 56bdb58..1f19b5c 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
+    xmlns:tools="http://schemas.android.com/tools" >
     <!-- DOZVOLE -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -15,9 +14,7 @@
         android:name="android.permission.CAMERA"
         android:required="true"
         android:requiredFeature="true" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"  />
-
-    <!-- SVOJSTVA -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- SVOJSTVA -->
     <uses-feature
         android:name="android.hardware.camera"
         android:required="true" />
@@ -38,16 +35,31 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.BrzoDoLokacije"
         android:usesCleartextTraffic="true"
-        tools:targetApi="31">
+        tools:targetApi="31" >
+        <activity
+            android:name=".MapsActivity"
+            android:exported="false" >
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="YOUR_API_KEY" />
 
-        <activity android:name=".Activities.MapsActivity"   android:screenOrientation="portrait" />
-        <activity android:name=".Activities.ActivityCapturePost" android:screenOrientation="portrait" />
-        <activity android:name=".Activities.ActivitySinglePost" android:screenOrientation="portrait" />
-        <activity android:name=".Activities.ActivityAddPost" android:screenOrientation="portrait" />
+        <activity
+            android:name=".Activities.MapsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".Activities.ActivityCapturePost"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".Activities.ActivitySinglePost"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".Activities.ActivityAddPost"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".Activities.SplashPage"
             android:exported="true"
@@ -62,18 +74,27 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity android:name=".Activities.ActivityForgottenPasswordVerify"   android:screenOrientation="portrait" />
-        <activity android:name=".Activities.ActivityForgottenPassword"   android:screenOrientation="portrait" />
-        <activity android:name=".Activities.ActivityLoginRegister"   android:screenOrientation="portrait" />
-        <activity android:name=".Activities.NavigationActivity"   android:screenOrientation="portrait" />
-        <activity android:name=".MainActivity" android:screenOrientation="portrait" />
-
+        <activity
+            android:name=".Activities.ActivityForgottenPasswordVerify"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".Activities.ActivityForgottenPassword"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".Activities.ActivityLoginRegister"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".Activities.NavigationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".MainActivity"
+            android:screenOrientation="portrait" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.example.android.fileprovider"
             android:exported="false"
-            android:grantUriPermissions="true">
+            android:grantUriPermissions="true" >
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
index b9205f6..8762d4e 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
@@ -1,49 +1,331 @@
 package com.example.brzodolokacije.Activities
 
-import androidx.appcompat.app.AppCompatActivity
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.Canvas
+import android.location.Location
+import android.location.LocationManager
+import android.os.Build
 import android.os.Bundle
-
-import com.google.android.gms.maps.CameraUpdateFactory
-import com.google.android.gms.maps.GoogleMap
-import com.google.android.gms.maps.OnMapReadyCallback
-import com.google.android.gms.maps.SupportMapFragment
-import com.google.android.gms.maps.model.LatLng
-import com.google.android.gms.maps.model.MarkerOptions
+import android.os.Looper
+import android.os.StrictMode
+import android.preference.PreferenceManager
+import android.util.DisplayMetrics
+import android.view.KeyEvent
+import android.view.MotionEvent
+import android.view.View
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import com.example.brzodolokacije.R
-import com.example.brzodolokacije.databinding.ActivityMapsBinding
+import com.example.brzodolokacije.Services.GeocoderHelper
+import com.google.android.gms.location.*
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.textfield.TextInputEditText
+import org.osmdroid.config.Configuration
+import org.osmdroid.tileprovider.tilesource.TileSourceFactory
+import org.osmdroid.util.GeoPoint
+import org.osmdroid.views.MapView
+import org.osmdroid.views.Projection
+import org.osmdroid.views.overlay.*
+import org.osmdroid.views.overlay.compass.CompassOverlay
+import org.osmdroid.views.overlay.compass.InternalCompassOrientationProvider
+import org.osmdroid.views.overlay.gestures.RotationGestureOverlay
+import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider
+import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay
 
-class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
-
-    private lateinit var mMap: GoogleMap
-    private lateinit var binding: ActivityMapsBinding
 
+class MapsActivity : AppCompatActivity() {
+    var map: MapView? = null
+    var mLocationOverlay: MyLocationNewOverlay?=null
+    var mRotationGestureOverlay: RotationGestureOverlay?=null
+    var mScaleBarOverlay: ScaleBarOverlay?=null
+    var mCompassOverlay: CompassOverlay?=null
+    private lateinit var locationManager: LocationManager
+    private lateinit var searchButton: MaterialButton
+    private lateinit var gpsButton: FloatingActionButton
+    private lateinit var searchBar: TextInputEditText
+    var client: FusedLocationProviderClient? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_maps)
+
+        val ctx: Context = this
+        Configuration.getInstance().load(ctx, PreferenceManager.getDefaultSharedPreferences(ctx));
+        map= findViewById<MapView>(R.id.ActivityMapsMapView)
+        map!!.setTileSource(TileSourceFactory.MAPNIK);
+        setUpMap()
+        searchButton=findViewById<View>(R.id.ActivityMapsSearchButton) as MaterialButton
+        gpsButton=findViewById<View>(R.id.ActivityMapsMyLocation) as FloatingActionButton
+        searchBar=findViewById<View>(R.id.ActivityMapsSearchBar) as TextInputEditText
+        client= LocationServices.getFusedLocationProviderClient(this)
+        searchButton.setOnClickListener{
+            searchMap()
+
+        }
+        gpsButton.setOnClickListener{
+            getLocation()
+        }
+        searchBar.setOnKeyListener(View.OnKeyListener { v1, keyCode, event -> // If the event is a key-down event on the "enter" button
+            if (event.action === KeyEvent.ACTION_DOWN &&
+                keyCode == KeyEvent.KEYCODE_ENTER
+            ) {
+                // Perform action on key press
+                searchMap()
+                return@OnKeyListener true
+            }
+            false
+        })
+
+
+
+    }
+
+
+    override fun onResume() {
+        super.onResume()
+        map!!.onResume()
+    }
+    override fun onPause() {
+        super.onPause()
+        map!!.onPause()
+    }
+    fun setUpMap(){
+        //Set up controlls and startPoint
+        map!!.setBuiltInZoomControls(true);
+        map!!.setMultiTouchControls(true);
+        val mapController = map!!.controller
+        mapController.setZoom(15)
+        fixNetworkPolicy()
+
+        //my location
+        //checkLocPerm()
+        mLocationOverlay = MyLocationNewOverlay(GpsMyLocationProvider(this), map)
+        mLocationOverlay!!.enableMyLocation()
+        map!!.getOverlays().add(this.mLocationOverlay)
+
+        //start point
+        val startPoint = GeoPoint(44.0107,20.9181)//dodati nasu lokaciju TODO
+        mapController.setCenter(startPoint)
+
+        //rotation gestures
+        mRotationGestureOverlay = RotationGestureOverlay(this, map)
+        mRotationGestureOverlay!!.setEnabled(true)
+        map!!.setMultiTouchControls(true)
+        map!!.getOverlays().add(this.mRotationGestureOverlay)
+        //Map scale bar
+        val dm: DisplayMetrics =this.resources.displayMetrics
+        mScaleBarOverlay = ScaleBarOverlay(map);
+        mScaleBarOverlay!!.setCentred(true);
+        mScaleBarOverlay!!.setScaleBarOffset(dm.widthPixels / 2, 10);
+        map!!.getOverlays().add(this.mScaleBarOverlay);
+
+        //Compass
+        this.mCompassOverlay =
+            CompassOverlay(this, InternalCompassOrientationProvider(this), map)
+        mCompassOverlay!!.enableCompass()
+        map!!.getOverlays().add(this.mCompassOverlay)
+
+
+        val touchOverlay: Overlay = object : Overlay(this) {
+            var anotherItemizedIconOverlay: ItemizedIconOverlay<OverlayItem>? = null
+            override fun onSingleTapConfirmed(e: MotionEvent, mapView: MapView): Boolean {
+                val marker = ContextCompat.getDrawable(this@MapsActivity, R.drawable.ic_baseline_add_location_24);
+                val proj: Projection = mapView.projection
+                val loc = proj.fromPixels(e.x.toInt(), e.y.toInt())
+                val longitude = java.lang.Double.toString(loc.longitudeE6.toDouble() / 1000000)
+                val latitude = java.lang.Double.toString(loc.latitudeE6.toDouble() / 1000000)
+                val overlayArray = ArrayList<OverlayItem>()
+                val mapItem = OverlayItem(
+                    "", "", GeoPoint(
+                        loc.latitudeE6.toDouble() / 1000000,
+                        loc.longitudeE6.toDouble() / 1000000
+                    )
+                )
+                mapItem.setMarker(marker)
+                overlayArray.add(mapItem)
+                if (anotherItemizedIconOverlay == null) {
+                    anotherItemizedIconOverlay =
+                        ItemizedIconOverlay(applicationContext, overlayArray, null)
+                    mapView.overlays.add(anotherItemizedIconOverlay)
+                    mapView.invalidate()
+                } else {
+                    mapView.overlays.remove(anotherItemizedIconOverlay)
+                    mapView.invalidate()
+                    anotherItemizedIconOverlay =
+                        ItemizedIconOverlay(applicationContext, overlayArray, null)
+                    mapView.overlays.add(anotherItemizedIconOverlay)
+                }
+                //      dlgThread();
+                return true
+            }
+        }
+        map!!.getOverlays().add(touchOverlay)
+    }
+    fun checkLocPerm(){
+        if (ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.ACCESS_FINE_LOCATION
+            )
+            != PackageManager.PERMISSION_GRANTED
+        ) {
+            ActivityCompat.requestPermissions(
+                this,
+                arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
+                101
+            )
+        }
+    }
+
+    fun fixNetworkPolicy(){
+        val SDK_INT = Build.VERSION.SDK_INT
+        if (SDK_INT > 8) {
+            val policy = StrictMode.ThreadPolicy.Builder()
+                .permitAll().build()
+            StrictMode.setThreadPolicy(policy)
+            //your codes here
+        }
+    }
+    fun searchMap(){
+        var geocoder= GeocoderHelper.getInstance()
+        //Log.d("Main",geocoder!!.getFromLocationName("Paris",1)[0].countryName)
+        var locString=searchBar.text.toString().trim()
+        if(locString==null || locString=="")
+            Toast.makeText(this,"Unesite naziv lokacije", Toast.LENGTH_SHORT)
+        else{
+            var result=geocoder!!.getFromLocationName(locString,1)[0]
+            if(result==null)
+                Toast.makeText(this,"Nepostojeca lokacija", Toast.LENGTH_SHORT)
+            else{
+                //move to spot
+                val searchPoint = GeoPoint(result.latitude,result.longitude)
+                val startMarker = Marker(map)
+                startMarker.setPosition(searchPoint)
+                startMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
+                map!!.getOverlays().add(startMarker)
+                map!!.controller.animateTo(searchPoint)
+
+
+            }
+        }
+    }
+    private fun getLocation() {
+        if (ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission
+                    .ACCESS_FINE_LOCATION)
+            == PackageManager
+                .PERMISSION_GRANTED
+            && ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission
+                    .ACCESS_COARSE_LOCATION)
+            == PackageManager
+                .PERMISSION_GRANTED) {
+            // When permission is granted
+            // Call method
+            getCurrentLocation()
+        }
+        else {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                requestPermissions(
+                    arrayOf(
+                        Manifest.permission.ACCESS_FINE_LOCATION,
+                        Manifest.permission.ACCESS_COARSE_LOCATION
+                    ),
+                    111
+                )
+            }
+
+        }
+    }
+    override fun onRequestPermissionsResult(
+        requestCode: Int, permissions: Array<String?>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(
+            requestCode, permissions, grantResults
+        )
+        // Check condition
+        if (requestCode == 111 && grantResults.size > 0
+            && (grantResults[0] + grantResults[1]
+                    == PackageManager.PERMISSION_GRANTED)
+        ) {
+            // When permission are granted
+            // Call  method
+            getCurrentLocation()
+        } else {
+            // When permission are denied
+            // Display toast
+            Toast
+                .makeText(
+                    this,
+                    "Permission denied",
+                    Toast.LENGTH_SHORT
+                )
+                .show()
+        }
+    }
+    @Suppress("MissingPermission")
+    private fun getCurrentLocation() {
+        val locationManager = this
+            .getSystemService(
+                Context.LOCATION_SERVICE
+            ) as LocationManager
+        checkLocPerm()
+        if (locationManager.isProviderEnabled(
+                LocationManager.GPS_PROVIDER
+            )
+            || locationManager.isProviderEnabled(
+                LocationManager.NETWORK_PROVIDER
+            )
+        ) {
+
+            client!!.getLastLocation().addOnCompleteListener { task ->
+                var location = task.result
+                if (location == null) {
+                    val locationRequest: LocationRequest = LocationRequest()
+                        .setPriority(
+                            LocationRequest.PRIORITY_HIGH_ACCURACY
+                        )
+                        .setInterval(10000)
+                        .setFastestInterval(
+                            1000
+                        )
+                        .setNumUpdates(1)
+
+                    val locationCallback: LocationCallback = object : LocationCallback() {
+                        override fun onLocationResult(
+                            locationResult: LocationResult
+                        ) {
+                            // Initialize
+                            // location
+                            val location1: Location? = locationResult
+                                .lastLocation
+                            // Set latitude
+                            map!!.controller.animateTo(
+                                GeoPoint(
+                                    location1!!.latitude,
+                                    location1!!.longitude
+                                )
+                            )
+
+                        }
+                    }
+                    client!!.requestLocationUpdates(
+                        locationRequest,
+                        locationCallback,
+                        Looper.myLooper()
+                    );
+                } else {
+                    map!!.controller.animateTo(GeoPoint(location!!.latitude, location!!.longitude))
+                }
+
 
-        binding = ActivityMapsBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
-        val mapFragment = supportFragmentManager
-            .findFragmentById(R.id.map) as SupportMapFragment
-        mapFragment.getMapAsync(this)
-    }
-
-    /**
-     * Manipulates the map once available.
-     * This callback is triggered when the map is ready to be used.
-     * This is where we can add markers or lines, add listeners or move the camera. In this case,
-     * we just add a marker near Sydney, Australia.
-     * If Google Play services is not installed on the device, the user will be prompted to install
-     * it inside the SupportMapFragment. This method will only be triggered once the user has
-     * installed Google Play services and returned to the app.
-     */
-    override fun onMapReady(googleMap: GoogleMap) {
-        mMap = googleMap
-
-        // Add a marker in Sydney and move the camera
-        val sydney = LatLng(-34.0, 151.0)
-        mMap.addMarker(MarkerOptions().position(sydney).title("Marker in Sydney"))
-        mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney))
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_location_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_location_24.xml
new file mode 100644
index 0000000..8f88131
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_add_location_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF3535"
+    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="M12,2C8.14,2 5,5.14 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.86 -3.14,-7 -7,-7zM16,10h-3v3h-2v-3L8,10L8,8h3L11,5h2v3h3v2z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
index 01c8abd..b45e1f0 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
@@ -1,9 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:map="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/map"
-    android:name="com.google.android.gms.maps.SupportMapFragment"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activities.MapsActivity" />
\ No newline at end of file
+    tools:context=".Activities.MapsActivity">
+    <org.osmdroid.views.MapView
+        android:id="@+id/ActivityMapsMapView"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        />
+
+
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/ActivityMapsMyLocation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:backgroundTint="#FFFFFF"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="80dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:tint="#FFFFFF"
+        app:layout_constraintBottom_toBottomOf="@+id/ActivityMapsMapView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:rippleColor="#FFFFFF"
+        app:srcCompat="@android:drawable/ic_menu_mylocation" />
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/ActivityMapsCardViewSearch"
+        android:layout_width="0dp"
+        android:layout_marginTop="60dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:elevation="0dp"
+        app:cardCornerRadius="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/ActivityMapsSearchBar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/rounded_white_button_login"
+            android:hint="  Pretraga"
+            android:inputType="textPersonName"
+            android:paddingLeft="15dp" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/ActivityMapsSearchButton"
+            android:layout_width="49dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:background="#00FFFFFF"
+            app:backgroundTint="#00FFFFFF"
+            app:cornerRadius="16dp"
+            app:icon="@drawable/ic_baseline_search_24"
+            app:iconTint="#333D70" />
+
+    </androidx.cardview.widget.CardView>
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 9431b8ca432714be7a99113a049a8a12106205ae Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Fri, 18 Nov 2022 21:11:28 +0100
Subject: Dodato dugme da korisnik moze da potvrdi koordinate lokacije koju
 zeli da doda. Povratna vrednost longitude i latitude.

---
 .../brzodolokacije/Activities/MapsActivity.kt      | 40 +++++++++++++++++-----
 .../src/main/res/drawable/ic_baseline_check_24.xml |  5 +++
 .../app/src/main/res/layout/activity_maps.xml      | 17 +++++++++
 3 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_check_24.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
index 8762d4e..e8b9ceb 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
@@ -3,7 +3,6 @@ package com.example.brzodolokacije.Activities
 import android.Manifest
 import android.content.Context
 import android.content.pm.PackageManager
-import android.graphics.Canvas
 import android.location.Location
 import android.location.LocationManager
 import android.os.Build
@@ -12,6 +11,7 @@ import android.os.Looper
 import android.os.StrictMode
 import android.preference.PreferenceManager
 import android.util.DisplayMetrics
+import android.util.Log
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
@@ -30,7 +30,10 @@ import org.osmdroid.tileprovider.tilesource.TileSourceFactory
 import org.osmdroid.util.GeoPoint
 import org.osmdroid.views.MapView
 import org.osmdroid.views.Projection
-import org.osmdroid.views.overlay.*
+import org.osmdroid.views.overlay.ItemizedIconOverlay
+import org.osmdroid.views.overlay.Overlay
+import org.osmdroid.views.overlay.OverlayItem
+import org.osmdroid.views.overlay.ScaleBarOverlay
 import org.osmdroid.views.overlay.compass.CompassOverlay
 import org.osmdroid.views.overlay.compass.InternalCompassOrientationProvider
 import org.osmdroid.views.overlay.gestures.RotationGestureOverlay
@@ -47,8 +50,11 @@ class MapsActivity : AppCompatActivity() {
     private lateinit var locationManager: LocationManager
     private lateinit var searchButton: MaterialButton
     private lateinit var gpsButton: FloatingActionButton
+    private lateinit var confirmButton: FloatingActionButton
     private lateinit var searchBar: TextInputEditText
     var client: FusedLocationProviderClient? = null
+    var locLongitude:Double?=null
+    var locLatitude:Double?=null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_maps)
@@ -60,6 +66,7 @@ class MapsActivity : AppCompatActivity() {
         setUpMap()
         searchButton=findViewById<View>(R.id.ActivityMapsSearchButton) as MaterialButton
         gpsButton=findViewById<View>(R.id.ActivityMapsMyLocation) as FloatingActionButton
+        confirmButton=findViewById<View>(R.id.ActivityMapsConfirmLocation) as FloatingActionButton
         searchBar=findViewById<View>(R.id.ActivityMapsSearchBar) as TextInputEditText
         client= LocationServices.getFusedLocationProviderClient(this)
         searchButton.setOnClickListener{
@@ -69,6 +76,10 @@ class MapsActivity : AppCompatActivity() {
         gpsButton.setOnClickListener{
             getLocation()
         }
+        confirmButton.setOnClickListener{
+            if(locLatitude!=null && locLatitude!=null)
+            returnValue()
+        }
         searchBar.setOnKeyListener(View.OnKeyListener { v1, keyCode, event -> // If the event is a key-down event on the "enter" button
             if (event.action === KeyEvent.ACTION_DOWN &&
                 keyCode == KeyEvent.KEYCODE_ENTER
@@ -83,7 +94,15 @@ class MapsActivity : AppCompatActivity() {
 
 
     }
-
+    fun returnValue(){
+        val intent = intent
+        val bundle = Bundle()
+        bundle.putDouble("longitude", locLongitude!!)
+        bundle.putDouble("latitude", locLatitude!!)
+        intent.putExtras(bundle)
+        setResult(RESULT_OK, intent)
+        finish()
+    }
 
     override fun onResume() {
         super.onResume()
@@ -138,6 +157,10 @@ class MapsActivity : AppCompatActivity() {
                 val loc = proj.fromPixels(e.x.toInt(), e.y.toInt())
                 val longitude = java.lang.Double.toString(loc.longitudeE6.toDouble() / 1000000)
                 val latitude = java.lang.Double.toString(loc.latitudeE6.toDouble() / 1000000)
+                locLongitude=loc.longitude
+                locLatitude=loc.latitude
+                Log.d("main"," "+locLongitude)
+                Log.d("main"," "+locLatitude)
                 val overlayArray = ArrayList<OverlayItem>()
                 val mapItem = OverlayItem(
                     "", "", GeoPoint(
@@ -160,6 +183,7 @@ class MapsActivity : AppCompatActivity() {
                     mapView.overlays.add(anotherItemizedIconOverlay)
                 }
                 //      dlgThread();
+                confirmButton.visibility=View.VISIBLE
                 return true
             }
         }
@@ -200,12 +224,8 @@ class MapsActivity : AppCompatActivity() {
             if(result==null)
                 Toast.makeText(this,"Nepostojeca lokacija", Toast.LENGTH_SHORT)
             else{
-                //move to spot
+                //Move to spot
                 val searchPoint = GeoPoint(result.latitude,result.longitude)
-                val startMarker = Marker(map)
-                startMarker.setPosition(searchPoint)
-                startMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
-                map!!.getOverlays().add(startMarker)
                 map!!.controller.animateTo(searchPoint)
 
 
@@ -328,4 +348,8 @@ class MapsActivity : AppCompatActivity() {
             }
         }
     }
+    override fun onBackPressed() {
+        super.onBackPressed()
+        finish()
+    }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_check_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_check_24.xml
new file mode 100644
index 0000000..257e641
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_check_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#666666"
+    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="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
index b45e1f0..8d37c29 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
@@ -33,6 +33,23 @@
         app:rippleColor="#FFFFFF"
         app:srcCompat="@android:drawable/ic_menu_mylocation" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/ActivityMapsConfirmLocation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="80dp"
+        android:layout_marginLeft="10dp"
+        android:backgroundTint="#FFFFFF"
+        android:clickable="true"
+        android:focusable="true"
+        android:tint="#FFFFFF"
+        app:layout_constraintBottom_toBottomOf="@+id/ActivityMapsMapView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:rippleColor="#FFFFFF"
+        app:srcCompat="@drawable/ic_baseline_check_24"
+        android:visibility="invisible"/>
+
     <androidx.cardview.widget.CardView
         android:id="@+id/ActivityMapsCardViewSearch"
         android:layout_width="0dp"
-- 
cgit v1.2.3


From 91a2519d714fadecfcc14a8fb88b511f23fc21ed Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Fri, 18 Nov 2022 21:56:36 +0100
Subject: Dodato dugme za izbor lokacije na stranici za dodavanje objave.
 Omoguceno dodavanje lokacije sa koordinata i osnovnim informacijama o
 lokaciji.

---
 Backend/Api/Api/Services/LocationService.cs        | 10 +++---
 .../brzodolokacije/Activities/ActivityAddPost.kt   | 37 ++++++++++++++++------
 .../brzodolokacije/Activities/MapsActivity.kt      |  2 +-
 .../app/src/main/res/layout/activity_add_post.xml  | 16 ++++++++--
 4 files changed, 49 insertions(+), 16 deletions(-)

(limited to 'Client')

diff --git a/Backend/Api/Api/Services/LocationService.cs b/Backend/Api/Api/Services/LocationService.cs
index c91a1b5..afb3b5b 100644
--- a/Backend/Api/Api/Services/LocationService.cs
+++ b/Backend/Api/Api/Services/LocationService.cs
@@ -31,10 +31,12 @@ namespace Api.Services
         }
         public async Task<Location> add(Location loc)
         {
-            IEnumerable<Address> adresses = await _geocoder.GeocodeAsync(loc.name+" "+loc.address+" "+loc.city+" "+loc.country);
-            loc.country = loc.name;
-            loc.latitude = adresses.First().Coordinates.Latitude;
-            loc.longitude=adresses.First().Coordinates.Longitude;
+
+            //On Client side
+            //IEnumerable<Address> adresses = await _geocoder.GeocodeAsync(loc.name+" "+loc.address+" "+loc.city+" "+loc.country);
+            //loc.country = loc.name;
+            //loc.latitude = adresses.First().Coordinates.Latitude;
+            //loc.longitude=adresses.First().Coordinates.Longitude;
             await _locations.InsertOneAsync(loc);
 
             return loc;
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index b9e4fd7..d5712cc 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -17,16 +17,15 @@ import com.example.brzodolokacije.Models.Location
 import com.example.brzodolokacije.Models.LocationType
 import com.example.brzodolokacije.Models.PostPreview
 import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.GeocoderHelper
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
-import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.Call
 import retrofit2.Response
 import java.io.File
-import java.io.IOException
 
 
 class ActivityAddPost : AppCompatActivity() {
@@ -42,6 +41,11 @@ class ActivityAddPost : AppCompatActivity() {
     private lateinit var locationString:String
     private lateinit var descriptionString:String
     private lateinit var post:Button
+    private lateinit var addLocation:Button
+    val incorectCoord:Double=1000.0
+    val LOCATIONREQCODE=123
+    var longitude:Double=incorectCoord
+    var latitude:Double=incorectCoord
     //private var paths :ArrayList<String?>?=null
     private var place=0;
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -61,6 +65,7 @@ class ActivityAddPost : AppCompatActivity() {
         location=findViewById<View>(R.id.etActivityAddPostLocation) as EditText
         description=findViewById<View>(R.id.etActivityAddPostDescription) as EditText
         post=findViewById<View>(R.id.btnActivityAddPostPost) as Button
+        addLocation=findViewById<View>(R.id.btnActivityAddPostAddLocation) as Button
 
 
         switcher?.setFactory{
@@ -68,6 +73,10 @@ class ActivityAddPost : AppCompatActivity() {
             imgView.scaleType = ImageView.ScaleType.CENTER_CROP
             imgView.setPadding(8, 8, 8, 8)
             imgView}
+        addLocation.setOnClickListener {
+            val myIntent = Intent(this, MapsActivity::class.java)
+            startActivityForResult(myIntent,LOCATIONREQCODE)
+        }
 
         //dodavanje iz galerije
         uploadFromGallery.setOnClickListener{
@@ -116,7 +125,7 @@ class ActivityAddPost : AppCompatActivity() {
             descriptionString=description.text.toString().trim()
             //prazan unos?
             if(locationString.isEmpty()) {
-                location.hint="Unesite lokaciju"
+                location.hint="Unesite naziv lokaciju"
                 location.setHintTextColor(Color.RED)
             }
             if(descriptionString.isEmpty()) {
@@ -124,7 +133,7 @@ class ActivityAddPost : AppCompatActivity() {
                 description.setHintTextColor(Color.RED)
             }
 
-            if(!locationString.isEmpty() && !descriptionString.isEmpty()){
+            if(!locationString.isEmpty() && !descriptionString.isEmpty() && longitude!=incorectCoord && latitude!=incorectCoord){
                 sendPost()
             }
         }
@@ -162,14 +171,26 @@ class ActivityAddPost : AppCompatActivity() {
                 uploadFromGallery.isVisible=false
             }
         }
+        if(requestCode==LOCATIONREQCODE && resultCode== RESULT_OK){
+            var bundle=data!!.extras
+            longitude=bundle!!.getDouble("longitude",incorectCoord)
+            latitude=bundle!!.getDouble("latitude",incorectCoord)
+        }
     }
     private fun sendPost(){
         uploadLocation()
 
     }
     fun uploadLocation() {
+        //TO DO SEARCH EXISTING LOCATION FROM DB
+        //IF NOT EXISTS ADD NEW LOCATION
         val api =RetrofitHelper.getInstance()
-        var loc:Location=Location("",locationString,"","","",0.0,0.0,LocationType.GRAD)
+        var geocoder=GeocoderHelper.getInstance()
+        var loc1=geocoder!!.getFromLocation(latitude,longitude,1)
+        var countryName=loc1[0].countryName
+        var address="todo not possible in query"
+        var city=loc1[0].adminArea//not possible
+        var loc:Location=Location("",locationString,city,countryName,address,latitude,longitude,LocationType.GRAD)
         var jwtString= SharedPreferencesHelper.getValue("jwt",this)
         var data=api.addLocation("Bearer "+jwtString,loc)
 
@@ -177,12 +198,11 @@ class ActivityAddPost : AppCompatActivity() {
         data.enqueue(object : retrofit2.Callback<Location?> {
             override fun onResponse(call: Call<Location?>, response: Response<Location?>) {
                 if(response.isSuccessful()){
+
+                    uploadPost(response.body()!!._id)
                     Toast.makeText(
                         applicationContext, "USPEH", Toast.LENGTH_LONG
                     ).show();
-                    uploadPost(response.body()!!._id)
-                    Log.d("MAIN","RADI")
-                    Log.d("MAIN","RADI")
 
                 }else {
 
@@ -190,7 +210,6 @@ class ActivityAddPost : AppCompatActivity() {
                         Log.d("Main",response.errorBody()!!.string())
                         Log.d("Main",response.message())
                     }
-                    Log.d("Main","sadadsa")
                     Log.d("Main",response.errorBody()!!.string())
                     Log.d("Main",response.message())
                 }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
index e8b9ceb..b9e3b08 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
@@ -78,7 +78,7 @@ class MapsActivity : AppCompatActivity() {
         }
         confirmButton.setOnClickListener{
             if(locLatitude!=null && locLatitude!=null)
-            returnValue()
+                returnValue()
         }
         searchBar.setOnKeyListener(View.OnKeyListener { v1, keyCode, event -> // If the event is a key-down event on the "enter" button
             if (event.action === KeyEvent.ACTION_DOWN &&
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
index a7a6e06..6c9b40f 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
@@ -73,7 +73,7 @@
 
     <EditText
         android:id="@+id/etActivityAddPostLocation"
-        android:layout_width="match_parent"
+        android:layout_width="200dp"
         android:layout_height="50dp"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
@@ -81,9 +81,21 @@
         android:hint="Reykjavik, Iceland"
         android:inputType="textEmailAddress"
         app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <Button
+        android:id="@+id/btnActivityAddPostAddLocation"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/rounded_cyan_button"
+        android:backgroundTint="#1C789A"
+        android:text="Dodaj lokaciju"
+        app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/etActivityAddPostLocation" />
+
     <TextView
         android:id="@+id/tvActivityAddPostDescriptiontext"
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From 9577d160a06a9832a154a88eb99326f6cd687e12 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Fri, 18 Nov 2022 22:19:02 +0100
Subject: Dodat progressDialog dok se dodaju lokacija/objava.

---
 .../example/brzodolokacije/Activities/ActivityAddPost.kt  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index d5712cc..18195d0 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -1,6 +1,7 @@
 package com.example.brzodolokacije.Activities
 
 import android.Manifest
+import android.app.ProgressDialog
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
@@ -46,6 +47,7 @@ class ActivityAddPost : AppCompatActivity() {
     val LOCATIONREQCODE=123
     var longitude:Double=incorectCoord
     var latitude:Double=incorectCoord
+    var progressDialog:ProgressDialog?=null
     //private var paths :ArrayList<String?>?=null
     private var place=0;
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -67,6 +69,11 @@ class ActivityAddPost : AppCompatActivity() {
         post=findViewById<View>(R.id.btnActivityAddPostPost) as Button
         addLocation=findViewById<View>(R.id.btnActivityAddPostAddLocation) as Button
 
+        progressDialog= ProgressDialog(this)
+        progressDialog!!.setMessage("Molimo sacekajte!!!")
+        progressDialog!!.setCancelable(false)
+        progressDialog!!.setCanceledOnTouchOutside(false)
+
 
         switcher?.setFactory{
             val imgView = ImageView(applicationContext)
@@ -184,6 +191,7 @@ class ActivityAddPost : AppCompatActivity() {
     fun uploadLocation() {
         //TO DO SEARCH EXISTING LOCATION FROM DB
         //IF NOT EXISTS ADD NEW LOCATION
+        progressDialog!!.show()
         val api =RetrofitHelper.getInstance()
         var geocoder=GeocoderHelper.getInstance()
         var loc1=geocoder!!.getFromLocation(latitude,longitude,1)
@@ -194,7 +202,6 @@ class ActivityAddPost : AppCompatActivity() {
         var jwtString= SharedPreferencesHelper.getValue("jwt",this)
         var data=api.addLocation("Bearer "+jwtString,loc)
 
-
         data.enqueue(object : retrofit2.Callback<Location?> {
             override fun onResponse(call: Call<Location?>, response: Response<Location?>) {
                 if(response.isSuccessful()){
@@ -205,6 +212,7 @@ class ActivityAddPost : AppCompatActivity() {
                     ).show();
 
                 }else {
+                    progressDialog!!.dismiss()
 
                     if (response.errorBody() != null) {
                         Log.d("Main",response.errorBody()!!.string())
@@ -222,6 +230,7 @@ class ActivityAddPost : AppCompatActivity() {
                     applicationContext, t.toString(), Toast.LENGTH_LONG
                 ).show();
                 Log.d("Main",t.toString())
+                progressDialog!!.dismiss()
             }
         })
     }
@@ -257,6 +266,7 @@ class ActivityAddPost : AppCompatActivity() {
 
         data.enqueue(object : retrofit2.Callback<PostPreview?> {
             override fun onResponse(call: Call<PostPreview?>, response: Response<PostPreview?>) {
+                progressDialog!!.dismiss()
                 if(response.isSuccessful()){
                     Toast.makeText(
                         applicationContext, "USPEH", Toast.LENGTH_LONG
@@ -279,7 +289,8 @@ class ActivityAddPost : AppCompatActivity() {
             override fun onFailure(call: Call<PostPreview?>, t: Throwable) {
                 Toast.makeText(
                     applicationContext, t.toString(), Toast.LENGTH_LONG
-                ).show();
+                ).show()
+                progressDialog!!.dismiss()
                 Log.d("Main",t.toString())
             }
         })
-- 
cgit v1.2.3


From 665f88ab3bcc5520d33276d2787cf986f6ce1d9b Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Sat, 19 Nov 2022 14:24:04 +0100
Subject: Izmenjen profil korisnika, dodati resursi.

---
 .../app/src/main/res/drawable/button_chat.xml      |  22 ++
 .../app/src/main/res/drawable/button_follow.xml    |  18 ++
 .../app/src/main/res/drawable/button_unfollow.xml  |  22 ++
 .../main/res/drawable/profile_view_background.xml  |  15 ++
 .../src/main/res/layout/fragment_user_profile.xml  | 297 +++++++++------------
 5 files changed, 207 insertions(+), 167 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_chat.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_follow.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_unfollow.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/profile_view_background.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_chat.xml
new file mode 100644
index 0000000..86bfbd5
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_chat.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="119dp"
+    android:height="45dp"
+    android:viewportWidth="119"
+    android:viewportHeight="45">
+    <group>
+        <path
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M4 18.5c0-10.22 8.28-18.5 18.5-18.5h74c10.22 0 18.5 8.28 18.5 18.5v0c0 10.22-8.28 18.5-18.5 18.5h-74c-10.22 0-18.5-8.28-18.5-18.5z"/>
+        <path
+            android:strokeColor="#FF093A4C"
+            android:strokeWidth="1"
+            android:pathData="M4.5 18.5c0-9.94 8.06-18 18-18h74c9.94 0 18 8.06 18 18v0c0 9.94-8.06 18-18 18h-74c-9.94 0-18-8.06-18-18z"/>
+    </group>
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M53.32 24V13.1h3.69c0.85 0 1.55 0.15 2.1 0.45 0.54 0.31 0.95 0.72 1.21 1.25 0.26 0.52 0.4 1.1 0.4 1.74 0 0.65-0.14 1.23-0.4 1.76-0.26 0.52-0.66 0.94-1.2 1.25-0.55 0.31-1.24 0.47-2.1 0.47H54.4v-1.18h2.6c0.58 0 1.05-0.1 1.4-0.3 0.36-0.2 0.62-0.48 0.78-0.82 0.16-0.35 0.24-0.74 0.24-1.18 0-0.43-0.08-0.82-0.24-1.17-0.16-0.34-0.42-0.61-0.78-0.8-0.36-0.2-0.83-0.3-1.43-0.3h-2.32V24h-1.32Zm12.59 0.17c-0.74 0-1.39-0.18-1.95-0.53-0.55-0.35-0.98-0.84-1.3-1.47-0.3-0.63-0.46-1.37-0.46-2.22 0-0.85 0.16-1.6 0.46-2.23 0.32-0.64 0.75-1.13 1.3-1.48 0.56-0.35 1.2-0.53 1.95-0.53 0.74 0 1.38 0.18 1.94 0.53 0.55 0.35 0.99 0.84 1.3 1.48 0.3 0.64 0.47 1.38 0.47 2.23 0 0.85-0.16 1.59-0.47 2.22-0.31 0.63-0.75 1.12-1.3 1.47-0.56 0.35-1.2 0.53-1.94 0.53Zm0-1.13c0.56 0 1.02-0.14 1.38-0.43 0.37-0.29 0.63-0.67 0.8-1.13 0.18-0.47 0.27-0.98 0.27-1.53s-0.09-1.05-0.26-1.53c-0.18-0.47-0.44-0.85-0.8-1.14-0.37-0.3-0.83-0.44-1.4-0.44-0.55 0-1.01 0.15-1.38 0.44-0.36 0.29-0.63 0.67-0.8 1.14-0.18 0.48-0.26 0.98-0.26 1.53s0.08 1.06 0.26 1.53c0.17 0.46 0.44 0.84 0.8 1.13 0.37 0.29 0.83 0.43 1.39 0.43ZM71.53 24v-8.18h1.22v1.23h0.08c0.15-0.4 0.42-0.73 0.81-0.98 0.4-0.25 0.83-0.38 1.32-0.38h0.35l0.32 0.02V17l-0.3-0.05c-0.15-0.02-0.3-0.04-0.47-0.04-0.4 0-0.75 0.09-1.07 0.26-0.3 0.16-0.55 0.39-0.73 0.68-0.18 0.28-0.27 0.61-0.27 0.98V24h-1.26Zm10.74-3.35v-4.83h1.26V24h-1.26v-1.38H82.2c-0.2 0.41-0.5 0.76-0.9 1.06-0.4 0.28-0.91 0.43-1.53 0.43-0.51 0-0.97-0.12-1.37-0.34-0.4-0.23-0.7-0.57-0.93-1.02-0.23-0.46-0.34-1.04-0.34-1.73v-5.2h1.25v5.11c0 0.6 0.17 1.07 0.5 1.43 0.34 0.35 0.77 0.53 1.3 0.53 0.3 0 0.62-0.08 0.95-0.24 0.32-0.16 0.6-0.4 0.82-0.73 0.22-0.33 0.33-0.75 0.33-1.27ZM87 21.02l-0.02-1.56h0.26l3.58-3.64h1.55l-3.81 3.85h-0.1L87 21.02ZM85.83 24V13.1h1.26V24h-1.26Zm5.2 0l-3.2-4.05 0.9-0.87 3.9 4.92h-1.6Zm5.37 0.2c-0.52 0-1-0.1-1.41-0.3-0.43-0.2-0.76-0.49-1.01-0.86-0.25-0.38-0.37-0.83-0.37-1.36 0-0.47 0.09-0.85 0.27-1.14 0.19-0.3 0.44-0.53 0.74-0.7 0.31-0.16 0.65-0.29 1.03-0.37 0.37-0.08 0.75-0.15 1.13-0.2L98 19.13c0.31-0.04 0.54-0.1 0.68-0.18 0.15-0.08 0.22-0.22 0.22-0.43v-0.04c0-0.52-0.14-0.93-0.43-1.22-0.28-0.3-0.72-0.44-1.3-0.44-0.6 0-1.07 0.13-1.4 0.4-0.35 0.26-0.59 0.54-0.73 0.84l-1.19-0.43c0.21-0.5 0.5-0.88 0.85-1.16 0.36-0.28 0.75-0.48 1.18-0.59 0.42-0.11 0.84-0.17 1.25-0.17 0.27 0 0.57 0.03 0.9 0.1 0.35 0.06 0.68 0.18 1 0.38 0.33 0.19 0.6 0.48 0.8 0.86 0.22 0.4 0.33 0.9 0.33 1.56V24h-1.26v-1.1h-0.06c-0.09 0.17-0.23 0.36-0.43 0.56-0.2 0.2-0.46 0.38-0.8 0.52-0.32 0.14-0.73 0.21-1.2 0.21Zm0.19-1.14c0.5 0 0.92-0.1 1.26-0.29 0.34-0.2 0.6-0.45 0.77-0.76 0.18-0.3 0.27-0.63 0.27-0.97v-1.15c-0.05 0.06-0.17 0.12-0.35 0.17-0.18 0.05-0.38 0.1-0.62 0.14l-0.67 0.1-0.53 0.06c-0.33 0.04-0.63 0.1-0.92 0.2-0.28 0.1-0.5 0.24-0.68 0.43-0.17 0.18-0.26 0.43-0.26 0.75 0 0.44 0.17 0.77 0.49 1 0.33 0.21 0.74 0.32 1.24 0.32Z"/>
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M39 11H23c-1.1 0-1.99 0.9-1.99 2L21 31l4-4h14c1.1 0 2-0.9 2-2V13c0-1.1-0.9-2-2-2Zm-3 12H26c-0.55 0-1-0.45-1-1s0.45-1 1-1h10c0.55 0 1 0.45 1 1s-0.45 1-1 1Zm0-3H26c-0.55 0-1-0.45-1-1s0.45-1 1-1h10c0.55 0 1 0.45 1 1s-0.45 1-1 1Zm0-3H26c-0.55 0-1-0.45-1-1s0.45-1 1-1h10c0.55 0 1 0.45 1 1s-0.45 1-1 1Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_follow.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_follow.xml
new file mode 100644
index 0000000..80553a5
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_follow.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="119dp"
+    android:height="45dp"
+    android:viewportWidth="119"
+    android:viewportHeight="45">
+    <group>
+        <path
+            android:fillColor="#FF093A4D"
+            android:pathData="M4 18.5c0-10.22 8.28-18.5 18.5-18.5h74c10.22 0 18.5 8.28 18.5 18.5v0c0 10.22-8.28 18.5-18.5 18.5h-74c-10.22 0-18.5-8.28-18.5-18.5z"/>
+    </group>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M64.32 23V12.1h3.69c0.85 0 1.55 0.15 2.1 0.45 0.54 0.31 0.95 0.72 1.21 1.25 0.26 0.52 0.4 1.1 0.4 1.74 0 0.65-0.14 1.23-0.4 1.76-0.26 0.52-0.66 0.94-1.2 1.25-0.55 0.31-1.24 0.47-2.1 0.47H65.4v-1.18h2.6c0.58 0 1.05-0.1 1.4-0.3 0.36-0.2 0.62-0.48 0.78-0.82 0.16-0.35 0.24-0.74 0.24-1.18 0-0.43-0.08-0.82-0.24-1.17-0.16-0.34-0.42-0.61-0.78-0.8-0.36-0.2-0.83-0.3-1.43-0.3h-2.32V23h-1.32Zm9.35 0v-8.18h1.22v1.23h0.08c0.15-0.4 0.42-0.73 0.81-0.98 0.4-0.25 0.83-0.38 1.32-0.38h0.35l0.31 0.02V16l-0.29-0.05c-0.15-0.02-0.3-0.04-0.47-0.04-0.4 0-0.76 0.09-1.07 0.26-0.3 0.16-0.55 0.39-0.73 0.68-0.18 0.28-0.27 0.61-0.27 0.98V23h-1.26Zm8 0.2c-0.53 0-1-0.1-1.42-0.3-0.42-0.2-0.76-0.49-1-0.86-0.26-0.38-0.38-0.83-0.38-1.36 0-0.47 0.1-0.85 0.28-1.14 0.18-0.3 0.43-0.53 0.74-0.7 0.3-0.16 0.65-0.29 1.02-0.37 0.38-0.08 0.75-0.15 1.13-0.2l1.21-0.14c0.32-0.04 0.54-0.1 0.69-0.18 0.14-0.08 0.21-0.22 0.21-0.43v-0.04c0-0.52-0.14-0.93-0.43-1.22-0.28-0.3-0.71-0.44-1.3-0.44-0.6 0-1.06 0.13-1.4 0.4-0.34 0.26-0.58 0.54-0.72 0.84l-1.2-0.43c0.22-0.5 0.5-0.88 0.86-1.16 0.35-0.28 0.75-0.48 1.17-0.59 0.42-0.11 0.84-0.17 1.26-0.17 0.26 0 0.56 0.03 0.9 0.1 0.35 0.06 0.68 0.18 1 0.38 0.32 0.19 0.59 0.48 0.8 0.86 0.21 0.4 0.32 0.9 0.32 1.56V23h-1.26v-1.1H84.1c-0.09 0.17-0.23 0.36-0.43 0.56-0.2 0.2-0.46 0.38-0.79 0.52s-0.73 0.21-1.2 0.21Zm0.18-1.14c0.5 0 0.92-0.1 1.26-0.29 0.34-0.2 0.6-0.45 0.78-0.76 0.17-0.3 0.26-0.63 0.26-0.97v-1.15c-0.05 0.06-0.17 0.12-0.35 0.17-0.18 0.05-0.38 0.1-0.62 0.14l-0.67 0.1-0.53 0.06c-0.33 0.04-0.63 0.1-0.92 0.2-0.28 0.1-0.5 0.24-0.68 0.43-0.17 0.18-0.25 0.43-0.25 0.75 0 0.44 0.16 0.77 0.48 1 0.33 0.21 0.74 0.32 1.24 0.32Zm9.41-7.24v1.06h-4.24v-1.06h4.24Zm-3-1.96h1.26v7.8c0 0.35 0.05 0.62 0.15 0.8 0.1 0.17 0.24 0.29 0.4 0.35 0.17 0.05 0.35 0.08 0.53 0.08 0.14 0 0.26 0 0.34-0.02l0.22-0.04 0.25 1.13-0.35 0.1c-0.16 0.03-0.35 0.05-0.58 0.05-0.36 0-0.7-0.08-1.05-0.23-0.34-0.16-0.62-0.39-0.84-0.7-0.22-0.31-0.33-0.7-0.33-1.18v-8.14ZM93.16 23v-8.18h1.25V23h-1.26Zm0.63-9.55c-0.24 0-0.45-0.08-0.63-0.25-0.17-0.16-0.26-0.36-0.26-0.6 0-0.23 0.09-0.43 0.26-0.6 0.18-0.17 0.39-0.25 0.63-0.25 0.25 0 0.46 0.08 0.63 0.25 0.18 0.17 0.27 0.37 0.27 0.6 0 0.24-0.09 0.44-0.27 0.6-0.17 0.17-0.38 0.25-0.63 0.25Z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M34 21.25v2.1c-0.9-0.33-1.87-0.43-2.82-0.3-0.96 0.14-1.86 0.5-2.64 1.05-0.79 0.55-1.43 1.29-1.87 2.14C26.23 27.1 26 28.04 26 29h-2c0-1.22 0.28-2.43 0.82-3.52 0.53-1.1 1.31-2.06 2.28-2.8 0.97-0.75 2.09-1.27 3.29-1.52 1.2-0.24 2.43-0.21 3.61 0.1ZM32 20c-3.32 0-6-2.68-6-6 0-3.31 2.68-6 6-6 3.31 0 6 2.69 6 6 0 3.32-2.69 6-6 6Zm0-2c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4Zm6 6v-3h2v3h3v2h-3v3h-2v-3h-3v-2h3Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_unfollow.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_unfollow.xml
new file mode 100644
index 0000000..d3e3bbb
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_unfollow.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="178dp"
+    android:height="45dp"
+    android:viewportWidth="178"
+    android:viewportHeight="45">
+    <group>
+        <path
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M4 18.5c0-10.22 8.28-18.5 18.5-18.5h133c10.22 0 18.5 8.28 18.5 18.5v0c0 10.22-8.28 18.5-18.5 18.5h-133c-10.22 0-18.5-8.28-18.5-18.5z"/>
+        <path
+            android:strokeColor="#FF093A4C"
+            android:strokeWidth="1"
+            android:pathData="M4.5 18.5c0-9.94 8.06-18 18-18h133c9.94 0 18 8.06 18 18v0c0 9.94-8.06 18-18 18h-133c-9.94 0-18-8.06-18-18z"/>
+    </group>
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M47.82 23V12.1h3.69c0.85 0 1.55 0.15 2.1 0.45 0.54 0.31 0.95 0.72 1.21 1.25 0.26 0.52 0.4 1.1 0.4 1.74 0 0.65-0.14 1.23-0.4 1.76-0.26 0.52-0.66 0.94-1.2 1.25-0.55 0.31-1.24 0.47-2.1 0.47H48.9v-1.18h2.6c0.58 0 1.05-0.1 1.4-0.3 0.36-0.2 0.62-0.48 0.78-0.82 0.16-0.35 0.24-0.74 0.24-1.18 0-0.43-0.08-0.82-0.24-1.17-0.16-0.34-0.42-0.61-0.78-0.8-0.36-0.2-0.83-0.3-1.43-0.3h-2.32V23h-1.32Zm9.35 0v-8.18h1.22v1.23h0.08c0.15-0.4 0.42-0.73 0.81-0.98 0.4-0.25 0.83-0.38 1.32-0.38h0.35l0.31 0.02V16l-0.29-0.05c-0.15-0.02-0.3-0.04-0.47-0.04-0.4 0-0.76 0.09-1.07 0.26-0.3 0.16-0.55 0.39-0.73 0.68-0.18 0.28-0.27 0.61-0.27 0.98V23h-1.26Zm8.76 0.17c-0.78 0-1.46-0.17-2.04-0.52-0.56-0.35-1-0.84-1.31-1.47-0.3-0.63-0.46-1.37-0.46-2.2 0-0.85 0.15-1.58 0.46-2.22 0.3-0.65 0.74-1.15 1.29-1.5 0.55-0.37 1.2-0.55 1.94-0.55 0.42 0 0.84 0.07 1.26 0.21 0.41 0.15 0.8 0.38 1.13 0.7 0.34 0.31 0.62 0.73 0.82 1.25 0.2 0.53 0.3 1.17 0.3 1.93v0.54h-6.3v-1.1h5.02c0-0.45-0.09-0.86-0.27-1.23-0.18-0.36-0.44-0.65-0.78-0.85-0.33-0.21-0.73-0.32-1.18-0.32-0.5 0-0.94 0.13-1.3 0.37-0.37 0.25-0.64 0.57-0.84 0.96-0.2 0.4-0.3 0.82-0.3 1.27v0.72c0 0.62 0.11 1.15 0.33 1.58 0.21 0.42 0.51 0.75 0.9 0.97 0.38 0.22 0.83 0.33 1.33 0.33 0.33 0 0.63-0.04 0.9-0.14s0.5-0.24 0.7-0.42c0.2-0.2 0.34-0.43 0.45-0.72l1.21 0.34c-0.12 0.42-0.34 0.78-0.64 1.09-0.3 0.3-0.67 0.55-1.12 0.72-0.44 0.18-0.94 0.26-1.5 0.26Zm6.48-3.15l-0.02-1.56h0.25l3.58-3.64h1.56l-3.82 3.85h-0.1l-1.45 1.35ZM71.23 23V12.1h1.26V23h-1.26Zm5.2 0l-3.2-4.05 0.9-0.87 3.9 4.92h-1.6Zm2.96 0v-8.18h1.26V23H79.4Zm0.64-9.55c-0.24 0-0.45-0.08-0.63-0.25-0.17-0.16-0.26-0.36-0.26-0.6 0-0.23 0.09-0.43 0.26-0.6 0.18-0.17 0.39-0.25 0.63-0.25 0.25 0 0.46 0.08 0.63 0.25 0.18 0.17 0.27 0.37 0.27 0.6 0 0.24-0.1 0.44-0.27 0.6-0.17 0.17-0.38 0.25-0.63 0.25Zm4.18 4.63V23h-1.26v-8.18h1.22v1.28h0.1c0.2-0.42 0.49-0.75 0.88-1 0.39-0.26 0.9-0.39 1.51-0.39 0.55 0 1.04 0.12 1.45 0.34 0.42 0.23 0.74 0.57 0.97 1.03 0.24 0.45 0.35 1.03 0.35 1.72V23h-1.26v-5.11c0-0.65-0.16-1.15-0.5-1.5-0.33-0.37-0.79-0.55-1.37-0.55-0.4 0-0.76 0.09-1.08 0.26-0.31 0.18-0.56 0.43-0.74 0.76-0.18 0.34-0.27 0.74-0.27 1.22ZM91.73 23v-8.18h1.25V23h-1.25Zm0.64-9.55c-0.25 0-0.46-0.08-0.64-0.25-0.17-0.16-0.26-0.36-0.26-0.6 0-0.23 0.09-0.43 0.26-0.6 0.18-0.17 0.4-0.25 0.64-0.25S92.82 11.83 93 12c0.17 0.17 0.26 0.37 0.26 0.6 0 0.24-0.09 0.44-0.26 0.6-0.18 0.17-0.39 0.25-0.63 0.25Zm7.14 12.62V14.82h1.21v1.3h0.15l0.38-0.55c0.17-0.22 0.4-0.42 0.72-0.6 0.3-0.17 0.73-0.26 1.27-0.26 0.68 0 1.3 0.17 1.82 0.52 0.52 0.34 0.93 0.83 1.23 1.46 0.3 0.64 0.44 1.38 0.44 2.24 0 0.87-0.15 1.62-0.44 2.25-0.3 0.64-0.7 1.13-1.23 1.47-0.52 0.35-1.12 0.52-1.8 0.52-0.53 0-0.95-0.09-1.27-0.26-0.31-0.18-0.56-0.38-0.73-0.6-0.17-0.23-0.3-0.42-0.39-0.57h-0.1v4.33H99.5Zm1.23-7.16c0 0.62 0.1 1.16 0.27 1.63 0.18 0.47 0.45 0.84 0.8 1.1 0.34 0.27 0.77 0.4 1.28 0.4 0.52 0 0.96-0.14 1.31-0.41 0.36-0.28 0.62-0.66 0.8-1.13 0.18-0.48 0.27-1 0.27-1.6 0-0.57-0.09-1.08-0.26-1.55-0.18-0.46-0.44-0.83-0.8-1.1-0.35-0.27-0.8-0.4-1.32-0.4s-0.95 0.12-1.3 0.38c-0.34 0.26-0.6 0.61-0.78 1.08-0.18 0.45-0.27 0.99-0.27 1.6Zm7.9 4.09v-8.18h1.22v1.23h0.09c0.15-0.4 0.41-0.73 0.8-0.98 0.4-0.25 0.84-0.38 1.33-0.38h0.34l0.32 0.02V16l-0.3-0.05c-0.14-0.02-0.3-0.04-0.47-0.04-0.4 0-0.75 0.09-1.06 0.26-0.31 0.16-0.56 0.39-0.74 0.68-0.18 0.28-0.27 0.61-0.27 0.98V23h-1.25Zm8 0.2c-0.52 0-1-0.1-1.42-0.3-0.42-0.2-0.75-0.49-1-0.86-0.25-0.38-0.38-0.83-0.38-1.36 0-0.47 0.1-0.85 0.28-1.14 0.19-0.3 0.43-0.53 0.74-0.7 0.31-0.16 0.65-0.29 1.02-0.37 0.38-0.08 0.76-0.15 1.14-0.2l1.2-0.14c0.32-0.04 0.55-0.1 0.69-0.18 0.15-0.08 0.22-0.22 0.22-0.43v-0.04c0-0.52-0.15-0.93-0.43-1.22-0.29-0.3-0.72-0.44-1.3-0.44-0.6 0-1.07 0.13-1.4 0.4-0.35 0.26-0.59 0.54-0.73 0.84l-1.2-0.43c0.22-0.5 0.5-0.88 0.86-1.16 0.36-0.28 0.75-0.48 1.17-0.59 0.43-0.11 0.85-0.17 1.26-0.17 0.26 0 0.56 0.03 0.9 0.1 0.35 0.06 0.68 0.18 1 0.38 0.32 0.19 0.6 0.48 0.8 0.86 0.22 0.4 0.33 0.9 0.33 1.56V23h-1.26v-1.1h-0.07c-0.08 0.17-0.22 0.36-0.42 0.56-0.2 0.2-0.47 0.38-0.8 0.52-0.33 0.14-0.73 0.21-1.2 0.21Zm0.19-1.14c0.5 0 0.91-0.1 1.25-0.29 0.35-0.2 0.6-0.45 0.78-0.76 0.18-0.3 0.27-0.63 0.27-0.97v-1.15c-0.05 0.06-0.17 0.12-0.35 0.17-0.18 0.05-0.39 0.1-0.62 0.14l-0.68 0.1-0.53 0.06c-0.32 0.04-0.63 0.1-0.91 0.2s-0.5 0.24-0.68 0.43c-0.17 0.18-0.26 0.43-0.26 0.75 0 0.44 0.16 0.77 0.49 1 0.32 0.21 0.74 0.32 1.24 0.32Zm9.17 1.11c-0.76 0-1.42-0.18-1.98-0.54-0.55-0.37-0.98-0.86-1.28-1.5-0.3-0.64-0.44-1.36-0.44-2.18 0-0.83 0.15-1.56 0.45-2.2 0.31-0.64 0.74-1.14 1.3-1.5 0.55-0.36 1.2-0.54 1.93-0.54 0.58 0 1.1 0.1 1.56 0.32 0.46 0.21 0.84 0.51 1.13 0.9 0.3 0.38 0.48 0.83 0.55 1.34h-1.26c-0.1-0.37-0.3-0.7-0.63-1-0.33-0.28-0.77-0.43-1.33-0.43-0.49 0-0.92 0.13-1.28 0.38-0.37 0.26-0.66 0.61-0.86 1.08-0.2 0.45-0.3 1-0.3 1.6 0 0.64 0.1 1.2 0.3 1.66 0.2 0.47 0.48 0.83 0.84 1.1 0.37 0.25 0.8 0.38 1.3 0.38 0.33 0 0.63-0.06 0.9-0.17 0.26-0.11 0.48-0.28 0.67-0.49 0.18-0.21 0.32-0.47 0.4-0.77h1.25c-0.07 0.49-0.25 0.92-0.53 1.3-0.27 0.4-0.64 0.7-1.1 0.92-0.45 0.23-0.98 0.34-1.59 0.34Zm-0.61-9.46l1.3-2.47h1.47l-1.67 2.47h-1.1Zm9.1 9.46c-0.79 0-1.47-0.17-2.04-0.52-0.57-0.35-1-0.84-1.32-1.47-0.3-0.63-0.45-1.37-0.45-2.2 0-0.85 0.15-1.58 0.45-2.22 0.31-0.65 0.74-1.15 1.3-1.5 0.55-0.37 1.2-0.55 1.93-0.55 0.43 0 0.85 0.07 1.26 0.21 0.42 0.15 0.8 0.38 1.14 0.7 0.34 0.31 0.61 0.73 0.81 1.25 0.2 0.53 0.3 1.17 0.3 1.93v0.54h-6.3v-1.1h5.03c0-0.45-0.1-0.86-0.28-1.23-0.18-0.36-0.44-0.65-0.78-0.85-0.33-0.21-0.72-0.32-1.18-0.32-0.5 0-0.93 0.13-1.3 0.37-0.36 0.25-0.64 0.57-0.84 0.96-0.19 0.4-0.29 0.82-0.29 1.27v0.72c0 0.62 0.1 1.15 0.32 1.58 0.22 0.42 0.52 0.75 0.9 0.97 0.39 0.22 0.83 0.33 1.34 0.33 0.33 0 0.63-0.04 0.9-0.14 0.26-0.1 0.5-0.24 0.7-0.42 0.19-0.2 0.34-0.43 0.44-0.72l1.22 0.34c-0.13 0.42-0.34 0.78-0.65 1.09-0.3 0.3-0.67 0.55-1.11 0.72-0.45 0.18-0.95 0.26-1.5 0.26Zm6.56-5.1V23h-1.26v-8.18H141v1.28h0.11c0.2-0.42 0.48-0.75 0.87-1 0.4-0.26 0.9-0.39 1.52-0.39 0.55 0 1.03 0.12 1.45 0.34 0.42 0.23 0.74 0.57 0.97 1.03 0.23 0.45 0.35 1.03 0.35 1.72V23H145v-5.11c0-0.65-0.17-1.15-0.5-1.5-0.33-0.37-0.8-0.55-1.38-0.55-0.4 0-0.76 0.09-1.07 0.26-0.31 0.18-0.56 0.43-0.74 0.76-0.18 0.34-0.27 0.74-0.27 1.22Zm7.51-3.25h1.26v8.78c0 0.5-0.09 0.94-0.26 1.3-0.17 0.38-0.43 0.66-0.78 0.86-0.34 0.2-0.78 0.3-1.3 0.3h-0.13-0.13V24.9h0.12 0.12c0.38 0 0.66-0.12 0.84-0.34 0.17-0.23 0.26-0.55 0.26-0.96v-8.78Zm0.62-1.37c-0.24 0-0.46-0.08-0.63-0.25-0.18-0.16-0.26-0.36-0.26-0.6 0-0.23 0.08-0.43 0.26-0.6 0.17-0.17 0.39-0.25 0.63-0.25 0.25 0 0.46 0.08 0.63 0.25 0.18 0.17 0.27 0.37 0.27 0.6 0 0.24-0.1 0.44-0.27 0.6-0.17 0.17-0.38 0.25-0.63 0.25Zm6.37 9.72c-0.79 0-1.47-0.17-2.04-0.52-0.56-0.35-1-0.84-1.31-1.47-0.3-0.63-0.46-1.37-0.46-2.2 0-0.85 0.15-1.58 0.46-2.22 0.3-0.65 0.74-1.15 1.29-1.5 0.55-0.37 1.2-0.55 1.94-0.55 0.42 0 0.84 0.07 1.26 0.21 0.41 0.15 0.8 0.38 1.13 0.7 0.34 0.31 0.62 0.73 0.82 1.25 0.2 0.53 0.3 1.17 0.3 1.93v0.54h-6.3v-1.1h5.02c0-0.45-0.09-0.86-0.27-1.23-0.18-0.36-0.44-0.65-0.78-0.85-0.34-0.21-0.73-0.32-1.18-0.32-0.5 0-0.94 0.13-1.3 0.37-0.37 0.25-0.64 0.57-0.84 0.96-0.2 0.4-0.3 0.82-0.3 1.27v0.72c0 0.62 0.11 1.15 0.33 1.58 0.21 0.42 0.51 0.75 0.9 0.97 0.38 0.22 0.83 0.33 1.33 0.33 0.33 0 0.63-0.04 0.9-0.14s0.5-0.24 0.7-0.42c0.2-0.2 0.34-0.43 0.45-0.72l1.21 0.34c-0.12 0.42-0.34 0.78-0.64 1.09-0.3 0.3-0.68 0.55-1.12 0.72-0.44 0.18-0.94 0.26-1.5 0.26Z"/>
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M32 20.25v2.1c-0.9-0.33-1.87-0.43-2.82-0.3-0.96 0.14-1.86 0.5-2.64 1.05-0.79 0.55-1.43 1.29-1.87 2.14C24.23 26.1 24 27.04 24 28h-2c0-1.22 0.28-2.43 0.82-3.52 0.53-1.1 1.31-2.06 2.28-2.8 0.97-0.75 2.09-1.27 3.29-1.52 1.2-0.24 2.43-0.21 3.61 0.1ZM30 19c-3.32 0-6-2.68-6-6 0-3.31 2.68-6 6-6 3.31 0 6 2.69 6 6 0 3.32-2.69 6-6 6Zm0-2c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4Zm7 6.59l2.12-2.13 1.42 1.42L38.4 25l2.13 2.12-1.42 1.42L37 26.4l-2.12 2.13-1.42-1.42L35.6 25l-2.13-2.12 1.42-1.42L37 23.6Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/profile_view_background.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/profile_view_background.xml
new file mode 100644
index 0000000..2af9f24
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/profile_view_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#E6FFFFFF"/>
+    <padding android:left="2dp"
+        android:top="2dp"
+        android:right="2dp"
+        android:bottom="2dp"/>
+
+    <corners
+        android:topLeftRadius="30dp"
+        android:topRightRadius="30dp"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        />
+</shape>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
index 95516f0..15031e3 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
@@ -15,7 +15,7 @@
 
             android:id="@+id/imageView3"
             android:layout_width="match_parent"
-            android:layout_height="290dp"
+            android:layout_height="300dp"
             android:foreground="@drawable/b3"
             android:foregroundGravity="center_vertical|center|center_horizontal|fill"
             android:src="@drawable/b3"
@@ -23,32 +23,22 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-
-            android:id="@+id/imageView4"
-            android:layout_width="411dp"
-            android:layout_height="287dp"
-            app:layout_constraintBottom_toBottomOf="@+id/imageView3"
-            app:layout_constraintEnd_toEndOf="@id/imageView3"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="@+id/imageView3"
-            app:layout_constraintTop_toTopOf="@+id/imageView3"
-            app:layout_constraintVertical_bias="0.0" />
 
         <com.google.android.material.imageview.ShapeableImageView
 
             android:id="@+id/tvFragmentProfileInfoContainer"
             android:layout_width="0dp"
-            android:layout_height="220dp"
+            android:layout_height="199dp"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="156dp"
+            android:layout_marginTop="150dp"
             android:layout_marginEnd="20dp"
             android:adjustViewBounds="true"
-            android:background="#E8FFFFFF"
+            android:background="@drawable/profile_view_background"
+
             android:elevation="1dp"
             android:scaleType="fitEnd"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/imageView3"
             app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" />
@@ -59,165 +49,24 @@
             android:layout_width="140dp"
             android:layout_height="140dp"
             android:layout_gravity="center"
+            android:layout_marginTop="80dp"
             android:elevation="10dp"
             app:cardCornerRadius="250dp"
-            app:layout_constraintBottom_toTopOf="@+id/tableLayout"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.498"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.77">
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
 
                 android:id="@+id/tvFragmentProfileProfilePicture"
-                android:layout_width="140dp"
-                android:layout_height="140dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:elevation="10dp"
                 android:scaleType="centerCrop"
                 android:src="@drawable/ic_baseline_person_24"
                 tools:ignore="ContentDescription" />
         </androidx.cardview.widget.CardView>
 
-        <TableLayout
-            android:id="@+id/tableLayout"
-            android:layout_width="323dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-10dp"
-
-            android:elevation="20dp"
-            android:gravity="center"
-            android:stretchColumns="1"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintEnd_toEndOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintHorizontal_bias="0.488"
-            app:layout_constraintStart_toStartOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer">
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-
-                android:gravity="center">
-
-                <TextView
-                    android:id="@+id/tvFragmentProfileName"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="Petar Petrović"
-
-                    android:textSize="25sp" />
-            </TableRow>
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-
-                android:gravity="center">
-
-                <com.google.android.material.button.MaterialButton
-                    android:layout_height="35dp"
-                    android:layout_gravity="start"
-                    android:width="150dp"
-                    android:height="10dp"
-                    android:background="@drawable/rounded_cyan_button"
-                    android:text="Prati" />
-
-                <com.google.android.material.button.MaterialButton android:layout_gravity="end"
-                    android:layout_height="35dp"
-                    android:width="150dp"
-                    android:height="10dp"
-                    android:background="@drawable/rounded_cyan_button"
-                    android:text="Poruka"
-                    />
-
-            </TableRow>
-        </TableLayout>
-
-        <LinearLayout
-            android:layout_marginTop="20dp"
-            android:elevation="30dp"
-            android:id="@+id/linearLayout3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            app:layout_constraintTop_toBottomOf="@+id/tableLayout">
-<LinearLayout
-    android:orientation="horizontal"
-
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-            <TextView
-                android:id="@+id/tvFragmentProfilePosts"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginStart="40dp"
-                android:layout_marginEnd="20dp"
-                android:text="OBJAVE" />
-
-            <TextView
-                android:layout_marginStart="40dp"
-                android:layout_marginEnd="40dp"
-                android:id="@+id/tvFragmentProfileFollowers"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="PRATIOCI" />
-
-    <TextView
-        android:id="@+id/tvFragmentProfileFollow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="40dp"
-        android:layout_gravity="right"
-        android:text="PRAĆENJA" />
-</LinearLayout>
-            <LinearLayout
-                android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:gravity="center"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tableLayout">
-
-            <TextView
-                android:id="@+id/tvFragmentProfilePostsNo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_gravity="left"
-                android:layout_marginStart="60dp"
-                android:layout_marginEnd="35dp"
-
-                android:text="156" />
-
-            <TextView
-                android:id="@+id/tvFragmentProfileFollowersNo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="50"
-                android:layout_gravity="left"
-                android:layout_marginStart="60dp"
-                android:layout_marginEnd="20dp"/>
-
-            <TextView
-                android:id="@+id/tvFragmentProfileFollowNo"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:layout_gravity="left"
-                android:layout_marginStart="40dp"
-                android:layout_marginEnd="20dp"
-                android:text="40" />
-            </LinearLayout>
-        </LinearLayout>
-
-
         <View
             android:id="@+id/divider"
             android:layout_width="409dp"
@@ -225,10 +74,10 @@
             android:background="?android:attr/listDivider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnFragmentProfileShowMyPosts" />
+            app:layout_constraintTop_toBottomOf="@+id/btnFragmentUserProfileShowPosts" />
 
         <Button
-            android:id="@+id/btnFragmentProfileShowMyPosts"
+            android:id="@+id/btnFragmentUserProfileShowPosts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -242,7 +91,7 @@
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
         <Button
-            android:id="@+id/btnFragmentProfileShowMyData"
+            android:id="@+id/btnFragmentUserProfileShowData"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
@@ -254,11 +103,11 @@
             android:textColor="@color/cardview_dark_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyRecensions"
+            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowRecensions"
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
         <Button
-            android:id="@+id/btnFragmentProfileShowMyRecensions"
+            android:id="@+id/btnFragmentUserProfileShowRecensions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="36dp"
@@ -267,7 +116,7 @@
             android:stateListAnimator="@null"
             android:text="Recenzije"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
+            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowPosts"
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
         <FrameLayout
@@ -279,6 +128,120 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/divider">
         </FrameLayout>
+
+        <TableLayout
+            android:elevation="1dp"
+
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="8dp"
+            android:numColumns="3"
+
+            android:stretchColumns="1"
+            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile">
+
+            <TableRow android:layout_column="1">
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_column="1"
+                    android:layout_gravity="center"
+                    android:text="Petar Petrović"
+                    android:textSize="20sp"
+                    android:layout_marginBottom="5dp"/>
+            </TableRow>
+
+            <TableRow>
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_span="3">
+
+                    <ImageButton
+
+                        android:id="@+id/materialButton"
+                        android:layout_width="115dp"
+                        android:layout_height="40dp"
+                        android:layout_marginStart="16dp"
+                        android:background="@drawable/rounded_transparent_button"
+                        android:foreground="@drawable/button_follow"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.0"
+                        tools:ignore="TouchTargetSizeCheck" />
+
+                    <ImageButton
+                        android:layout_width="115dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center"
+                        android:layout_marginEnd="16dp"
+                        android:height="40dp"
+                        android:background="@drawable/rounded_transparent_button"
+                        android:foreground="@drawable/button_chat"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.0"
+                        tools:ignore="SpeakableTextPresentCheck" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </TableRow>
+
+
+            <TableRow
+                android:layout_marginTop="5dp">
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfilePosts"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="OBJAVE" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollowers"
+                    android:layout_width="10dp"
+                    android:gravity="center"
+                    android:text="PRATIOCI" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollow"
+
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="PRAĆENJA" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfilePostsNo"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:textFontWeight="700"
+                    android:text="156" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollowersNo"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="50" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollowNo"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="40" />
+
+            </TableRow>
+
+        </TableLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-- 
cgit v1.2.3


From aeb0e6e1dd22e31f45aafaab60c22a5317f73adb Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Sat, 19 Nov 2022 19:50:05 +0100
Subject: Dodat izbor lokacije kada korisnik dodaje post slikom sa kamere.
 Dodate provere da li je query za lokaciju uspesan. Promenjen bottom sheet
 dialog.

---
 .../brzodolokacije/Activities/ActivityAddPost.kt   | 12 +++-
 .../Activities/ActivityCapturePost.kt              | 67 +++++++++++++++++++---
 .../brzodolokacije/Activities/MapsActivity.kt      | 11 +++-
 .../Activities/NavigationActivity.kt               |  2 +-
 .../brzodolokacije/Fragments/FragmentBrowse.kt     | 11 +++-
 .../src/main/res/drawable/ic_baseline_close_24.xml |  5 ++
 .../app/src/main/res/layout/activity_add_post.xml  |  1 +
 .../src/main/res/layout/activity_capture_post.xml  | 15 ++++-
 8 files changed, 107 insertions(+), 17 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_close_24.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index 18195d0..f79769d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -11,6 +11,7 @@ import android.util.Log
 import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
@@ -139,8 +140,11 @@ class ActivityAddPost : AppCompatActivity() {
                 description.hint="Unesite lokaciju"
                 description.setHintTextColor(Color.RED)
             }
+            if(longitude!=incorectCoord && latitude!=incorectCoord){
+                Toast.makeText(this,"Unesite lokaciju klikom na dugme",Toast.LENGTH_LONG)
+            }
 
-            if(!locationString.isEmpty() && !descriptionString.isEmpty() && longitude!=incorectCoord && latitude!=incorectCoord){
+            if(!locationString.isEmpty() && !descriptionString.isEmpty() && longitude!=incorectCoord && latitude!=incorectCoord && uploadedImages!!.size>0){
                 sendPost()
             }
         }
@@ -195,6 +199,12 @@ class ActivityAddPost : AppCompatActivity() {
         val api =RetrofitHelper.getInstance()
         var geocoder=GeocoderHelper.getInstance()
         var loc1=geocoder!!.getFromLocation(latitude,longitude,1)
+        if(loc1==null ||loc1.size<=0)
+        {
+            progressDialog!!.dismiss()
+            Toast.makeText(this,"Lokacija ne postoji",Toast.LENGTH_LONG);
+            return
+        }
         var countryName=loc1[0].countryName
         var address="todo not possible in query"
         var city=loc1[0].adminArea//not possible
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
index e2dbb7c..9a36c2f 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
@@ -1,6 +1,7 @@
 package com.example.brzodolokacije.Activities
 
 import android.Manifest
+import android.app.ProgressDialog
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
@@ -23,6 +24,7 @@ import com.example.brzodolokacije.Models.Location
 import com.example.brzodolokacije.Models.LocationType
 import com.example.brzodolokacije.Models.PostPreview
 import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.GeocoderHelper
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -46,6 +48,13 @@ class ActivityCapturePost : AppCompatActivity() {
     private lateinit var post: Button
     private lateinit var showImage: ImageView
     private var uploadedImages: Uri? = null
+    private lateinit var addLocation:Button
+
+    val incorectCoord:Double=1000.0
+    val LOCATIONREQCODE=123
+    var longitude:Double=incorectCoord
+    var latitude:Double=incorectCoord
+    var progressDialog: ProgressDialog?=null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -55,6 +64,13 @@ class ActivityCapturePost : AppCompatActivity() {
         post = findViewById<View>(R.id.btnActivityCapturePostPost) as Button
         showImage = findViewById<View>(R.id.ivActivityCapturePostImage) as ImageView
         takePhoto = findViewById<View>(R.id.btnActivityCapturePostCaptureVisible) as Button
+        addLocation=findViewById<View>(R.id.btnActivityCapturePostAddLocation) as Button
+
+        progressDialog= ProgressDialog(this)
+        progressDialog!!.setMessage("Molimo sacekajte!!!")
+        progressDialog!!.setCancelable(false)
+        progressDialog!!.setCanceledOnTouchOutside(false)
+
 
         //dodavanje sa kamere
 
@@ -101,6 +117,12 @@ class ActivityCapturePost : AppCompatActivity() {
         }
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+
+        addLocation.setOnClickListener {
+            val myIntent = Intent(this, MapsActivity::class.java)
+            startActivityForResult(myIntent,LOCATIONREQCODE)
+        }
+
         takePhoto.setOnClickListener {
 
             val APP_TAG = "BrzoDoLokacije"
@@ -136,7 +158,7 @@ class ActivityCapturePost : AppCompatActivity() {
             if (descriptionString.isEmpty()) {
                 description.hint = "Unesite opis"
                 description.setHintTextColor(Color.RED)
-            }else if(f!=null){
+            }else if(f!=null && longitude!=incorectCoord && latitude!=incorectCoord){
                     uploadLocation()
             }
 
@@ -145,7 +167,14 @@ class ActivityCapturePost : AppCompatActivity() {
 
         }
     }
-
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if(requestCode==LOCATIONREQCODE && resultCode== RESULT_OK){
+            var bundle=data!!.extras
+            longitude=bundle!!.getDouble("longitude",incorectCoord)
+            latitude=bundle!!.getDouble("latitude",incorectCoord)
+        }
+    }
     var f:File?=null
         private val cameraActivityResultLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
@@ -168,27 +197,42 @@ class ActivityCapturePost : AppCompatActivity() {
 
         }
     fun uploadLocation() {
-        val api = RetrofitHelper.getInstance()
-        var loc: Location = Location("",locationString,"","","",0.0,0.0, LocationType.GRAD)
+        //TO DO SEARCH EXISTING LOCATION FROM DB
+        //IF NOT EXISTS ADD NEW LOCATION
+        progressDialog!!.show()
+        val api =RetrofitHelper.getInstance()
+        var geocoder= GeocoderHelper.getInstance()
+        var loc1=geocoder!!.getFromLocation(latitude,longitude,1)
+        if(loc1==null ||loc1.size<=0)
+        {
+            progressDialog!!.dismiss()
+            Toast.makeText(this,"Lokacija ne postoji",Toast.LENGTH_LONG);
+            return
+        }
+        var countryName=loc1[0].countryName
+        var address="todo not possible in query"
+        var city=loc1[0].adminArea//not possible
+        var loc:Location=Location("",locationString,city,countryName,address,latitude,longitude,LocationType.GRAD)
         var jwtString= SharedPreferencesHelper.getValue("jwt",this)
         var data=api.addLocation("Bearer "+jwtString,loc)
 
-
         data.enqueue(object : retrofit2.Callback<Location?> {
             override fun onResponse(call: Call<Location?>, response: Response<Location?>) {
                 if(response.isSuccessful()){
+
+                    uploadPost(response.body()!!._id)
                     Toast.makeText(
                         applicationContext, "USPEH", Toast.LENGTH_LONG
                     ).show();
-                    uploadPost(response.body()!!._id)
-                    Log.d("MAIN","RADI")
-                    Log.d("MAIN","RADI")
 
                 }else {
+                    progressDialog!!.dismiss()
 
                     if (response.errorBody() != null) {
                         Log.d("Main",response.errorBody()!!.string())
+                        Log.d("Main",response.message())
                     }
+                    Log.d("Main",response.errorBody()!!.string())
                     Log.d("Main",response.message())
                 }
 
@@ -196,7 +240,11 @@ class ActivityCapturePost : AppCompatActivity() {
             }
 
             override fun onFailure(call: Call<Location?>, t: Throwable) {
+                Toast.makeText(
+                    applicationContext, t.toString(), Toast.LENGTH_LONG
+                ).show();
                 Log.d("Main",t.toString())
+                progressDialog!!.dismiss()
             }
         })
     }
@@ -223,10 +271,12 @@ class ActivityCapturePost : AppCompatActivity() {
         data.enqueue(object : retrofit2.Callback<PostPreview?> {
             override fun onResponse(call: Call<PostPreview?>, response: Response<PostPreview?>) {
                 if(response.isSuccessful()){
+                    progressDialog!!.dismiss()
                     Toast.makeText(
                         applicationContext, "USPEH", Toast.LENGTH_LONG
                     ).show();
                 }else {
+                    progressDialog!!.dismiss()
 
                     if (response.errorBody() != null) {
                         Toast.makeText(
@@ -242,6 +292,7 @@ class ActivityCapturePost : AppCompatActivity() {
             }
 
             override fun onFailure(call: Call<PostPreview?>, t: Throwable) {
+                progressDialog!!.dismiss()
                 Toast.makeText(
                     applicationContext, t.toString(), Toast.LENGTH_LONG
                 ).show();
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
index b9e3b08..1ac8bd2 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
@@ -218,11 +218,16 @@ class MapsActivity : AppCompatActivity() {
         //Log.d("Main",geocoder!!.getFromLocationName("Paris",1)[0].countryName)
         var locString=searchBar.text.toString().trim()
         if(locString==null || locString=="")
-            Toast.makeText(this,"Unesite naziv lokacije", Toast.LENGTH_SHORT)
+            Toast.makeText(this,"Unesite naziv lokacije", Toast.LENGTH_LONG)
         else{
-            var result=geocoder!!.getFromLocationName(locString,1)[0]
+            var temp=geocoder!!.getFromLocationName(locString,1)
+            if(temp.size<=0) {
+                Toast.makeText(this,"Nepostojeca lokacija",Toast.LENGTH_LONG)
+                return
+            }
+            var result=temp[0]
             if(result==null)
-                Toast.makeText(this,"Nepostojeca lokacija", Toast.LENGTH_SHORT)
+                Toast.makeText(this,"Nepostojeca lokacija", Toast.LENGTH_LONG)
             else{
                 //Move to spot
                 val searchPoint = GeoPoint(result.latitude,result.longitude)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
index 604b373..180b59d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
@@ -37,7 +37,7 @@ class NavigationActivity : AppCompatActivity() {
                 R.id.navHomePage->setCurrentFragment(fragmentHomePage)
                 R.id.navAllPosts->setCurrentFragment(fragmentShowPosts)
                 //R.id.navAddPost->setCurrentFragment(addPostFragment)
-                R.id.navAddPost->showBottomSheetAddNew()
+                R.id.navAddPost->showBottomSheetAddPost()
                 R.id.navBrowse->setCurrentFragment(browseFragment)
                 R.id.navProfile->setCurrentFragment(profileFragment)
 
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt
index 5ba3785..a21ffe0 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt
@@ -166,11 +166,16 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) {
         //Log.d("Main",geocoder!!.getFromLocationName("Paris",1)[0].countryName)
         var locString=searchBar.text.toString().trim()
         if(locString==null || locString=="")
-            Toast.makeText(requireContext(),"Unesite naziv lokacije",Toast.LENGTH_SHORT)
+            Toast.makeText(requireContext(),"Unesite naziv lokacije",Toast.LENGTH_LONG)
         else{
-            var result=geocoder!!.getFromLocationName(locString,1)[0]
+            var temp=geocoder!!.getFromLocationName(locString,1)
+            if(temp.size<=0) {
+                Toast.makeText(requireContext(),"Nepostojeca lokacija",Toast.LENGTH_LONG)
+                return
+            }
+            var result=temp[0]
             if(result==null)
-                Toast.makeText(requireContext(),"Nepostojeca lokacija",Toast.LENGTH_SHORT)
+                Toast.makeText(requireContext(),"Nepostojeca lokacija",Toast.LENGTH_LONG)
             else{
                 //move to spot
                 val searchPoint = GeoPoint(result.latitude,result.longitude)
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_close_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_close_24.xml
new file mode 100644
index 0000000..42a6279
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_close_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#666666"
+    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="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
index 6c9b40f..21dce5e 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
@@ -96,6 +96,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/etActivityAddPostLocation" />
 
+
     <TextView
         android:id="@+id/tvActivityAddPostDescriptiontext"
         android:layout_width="match_parent"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
index 23d34ee..c3d42a5 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
@@ -49,7 +49,7 @@
 
         <EditText
             android:id="@+id/etActivityCapturePostLocation"
-            android:layout_width="match_parent"
+            android:layout_width="200dp"
             android:layout_height="50dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="4dp"
@@ -63,6 +63,19 @@
             app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostLocationtext"
             tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck"
             android:importantForAutofill="no" />
+        <Button
+            android:id="@+id/btnActivityCapturePostAddLocation"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/rounded_cyan_button"
+            android:backgroundTint="#1C789A"
+            android:text="Dodaj lokaciju"
+            app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostDescriptiontext"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/etActivityCapturePostLocation" />
+
 
         <TextView
             android:id="@+id/tvActivityCapturePostDescriptiontext"
-- 
cgit v1.2.3


From e6bb1a00d7010a04ecbbdaf3592d4cba4a05e2e1 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Sun, 20 Nov 2022 00:00:22 +0100
Subject: Omoguceno slanje pretrage, filtriranja itd putem modela, sad se salju
 samo hardkodovane vrednosti #36

---
 .../brzodolokacije/Adapters/ShowPostsAdapter.kt    | 16 ++++----
 .../brzodolokacije/Fragments/FragmentShowPosts.kt  | 44 ++++------------------
 .../java/com/example/brzodolokacije/Models/Post.kt |  6 +++
 .../paging/SearchPostsPagingSource.kt              |  8 ++--
 .../brzodolokacije/paging/SearchPostsRepository.kt |  7 ++--
 .../brzodolokacije/paging/SearchPostsViewModel.kt  |  9 ++---
 6 files changed, 34 insertions(+), 56 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
index a827dcb..cf16689 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
@@ -26,7 +26,7 @@ import retrofit2.Call
 import retrofit2.Response
 
 
-class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPreview>)
+class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPreview>?=null)
     : PagingDataAdapter<PostPreview, ShowPostsAdapter.ViewHolder>(REPO_COMPARATOR) {
     private lateinit var token: String
     private lateinit var imageApi: IBackendApi
@@ -59,13 +59,13 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPrevie
         //sets components of particular item
         holder.bind(getItem(position)!!)
         holder.itemView.setOnClickListener {
-            //Toast.makeText(activity,item._id,Toast.LENGTH_LONG).show()
-//            val intent:Intent = Intent(activity,ActivitySinglePost::class.java)
-//            var b=Bundle()
-//            items[position].location.type=LocationType.ADA
-//            b.putParcelable("selectedPost", items[position])
-//            intent.putExtras(b)
-//            activity.startActivity(intent)
+            Toast.makeText(activity,getItem(position)!!._id,Toast.LENGTH_LONG).show()
+            val intent:Intent = Intent(activity,ActivitySinglePost::class.java)
+            var b=Bundle()
+            //getItem(position)!!.location.type=LocationType.ADA
+            b.putParcelable("selectedPost",getItem(position)!!)
+            intent.putExtras(b)
+            activity.startActivity(intent)
         }
     }
 
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
index 84df389..e78e1d6 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
@@ -43,20 +43,20 @@ import retrofit2.Response
 class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
 
     private lateinit var binding: FragmentShowPostsBinding
-    private var posts : MutableList<PostPreview> = mutableListOf()
     private var linearManagerVar: RecyclerView.LayoutManager? = null
     private var adapterVar: ShowPostsAdapter? = null
     private var recyclerView: RecyclerView?=null
     private var gridManagerVar: RecyclerView.LayoutManager?=null
     private var swipeRefreshLayout:SwipeRefreshLayout?=null
     private lateinit var searchPostsViewModel:SearchPostsViewModel
+    private var searchParams:SearchParams?= SearchParams("6375784fe84e2d53df32bf03",1,1)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setUpViewModel()
         binding=FragmentShowPostsBinding.inflate(layoutInflater)
         //instantiate adapter and linearLayout
-        adapterVar=ShowPostsAdapter(requireActivity(),posts)
+        adapterVar=ShowPostsAdapter(requireActivity())
         linearManagerVar= LinearLayoutManager(activity)
         gridManagerVar=GridLayoutManager(activity,2)
     }
@@ -82,39 +82,13 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
         }
     }
 
-    fun requestToBack(){
+    fun requestToBack(searchParams: SearchParams){
         lifecycleScope.launch{
-            searchPostsViewModel.fetchPosts().distinctUntilChanged().collectLatest {
-                adapterVar?.submitData(it)
+            searchPostsViewModel.fetchPosts(searchParams).distinctUntilChanged().collectLatest {
+                adapterVar?.submitData(lifecycle,it)
                 swipeRefreshLayout?.isRefreshing=false
             }
         }
-//        val postApi= RetrofitHelper.getInstance()
-//        val token=SharedPreferencesHelper.getValue("jwt", requireActivity())
-//        val request=postApi.getPosts("Bearer "+token)
-//        request.enqueue(object : retrofit2.Callback<MutableList<PostPreview>?> {
-//            override fun onResponse(call: Call<MutableList<PostPreview>?>, response: Response<MutableList<PostPreview>?>) {
-//                if(response.isSuccessful){
-//                    posts=response.body()!!
-//                    recyclerView?.adapter=ShowPostsAdapter(requireActivity(),posts)
-//                    Toast.makeText(
-//                        activity, "prosao zahtev", Toast.LENGTH_LONG
-//                    ).show()
-//                    swipeRefreshLayout?.isRefreshing=false
-//                }else{
-//                    if(response.errorBody()!=null)
-//                        Toast.makeText(activity, response.errorBody()!!.string(), Toast.LENGTH_LONG).show();
-//                }
-//
-//
-//            }
-//
-//            override fun onFailure(call: Call<MutableList<PostPreview>?>, t: Throwable) {
-//                Toast.makeText(
-//                    activity, t.toString(), Toast.LENGTH_LONG
-//                ).show();
-//            }
-//        })
     }
 
     override fun onCreateView(
@@ -138,16 +112,14 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
             R.color.purple_700
         )
         swipeRefreshLayout?.post(kotlinx.coroutines.Runnable {
-            //swipeRefreshLayout?.isRefreshing=true
-            requestToBack()
+            swipeRefreshLayout?.isRefreshing=true
+            requestToBack(searchParams!!)
         })
         return rootView
     }
 
     override fun onRefresh() {
-        //requestToBack()
-        adapterVar!!.notifyDataSetChanged()
-        Log.d("main",adapterVar!!.itemCount.toString())
+        requestToBack(searchParams!!)
     }
 
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
index f990133..a292160 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
@@ -80,3 +80,9 @@ data class PagedPosts(
     var totalposts:Int,
     var posts:MutableList<PostPreview>
 )
+
+data class SearchParams(
+    var locationId: String,
+    var sorttype:Int,
+    var filterdate:Int
+)
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt
index 2f69a7a..b1c89db 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt
@@ -6,20 +6,22 @@ import androidx.paging.PagingSource
 import com.example.brzodolokacije.Interfaces.IBackendApi
 import com.example.brzodolokacije.Models.PagedPosts
 import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Models.SearchParams
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import retrofit2.HttpException
 import java.io.IOException
 
 class SearchPostsPagingSource(
     val backend: IBackendApi,
-    val activity: Activity
+    val activity: Activity,
+    val searchParams:SearchParams
 ):PagingSource<Int,PostPreview>() {
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, PostPreview> {
         val page=params.key?:0
         val token=SharedPreferencesHelper.getValue("jwt", activity)
         return try{
-            val response=backend.getPagedPosts("Bearer "+token,"6375784fe84e2d53df32bf03",
-                page,1,1
+            val response=backend.getPagedPosts("Bearer "+token,searchParams.locationId,
+                page,searchParams.sorttype,searchParams.filterdate
             )
             Log.d("main",page.toString())
             LoadResult.Page(
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsRepository.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsRepository.kt
index ae3a684..4eeb85b 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsRepository.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsRepository.kt
@@ -6,21 +6,22 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Models.SearchParams
 import com.example.brzodolokacije.Services.RetrofitHelper
 import kotlinx.coroutines.flow.Flow
 
-class SearchPostsRepository(val activity: Activity) {
+class SearchPostsRepository(val activity: Activity,val searchParams: SearchParams) {
     companion object{
         const val DEFAULT_PAGE_SIZE=20
         const val DEFAULT_PAGE_INDEX=1
 
-        fun getInstance(activity: Activity)=SearchPostsRepository(activity)
+        fun getInstance(activity: Activity,searchParams: SearchParams)=SearchPostsRepository(activity,searchParams)
     }
 
     fun letSearchedPostsFlow(pagingConfig: PagingConfig=getDefaultPageConfig()): Flow<PagingData<PostPreview>> {
         return Pager(
             config=pagingConfig,
-            pagingSourceFactory = {SearchPostsPagingSource(RetrofitHelper.getInstance(),activity)}
+            pagingSourceFactory = {SearchPostsPagingSource(RetrofitHelper.getInstance(),activity,searchParams)}
         ).flow
     }
 
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModel.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModel.kt
index d0bf3ef..cee1a34 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModel.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsViewModel.kt
@@ -9,17 +9,14 @@ import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.example.brzodolokacije.Interfaces.IBackendApi
 import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Models.SearchParams
 import kotlinx.coroutines.flow.Flow
 
 class SearchPostsViewModel(
     private val api:IBackendApi,
     val activity:Activity
 ): ViewModel() {
-    val posts =
-        Pager(config = PagingConfig(pageSize = 10), pagingSourceFactory = {
-            SearchPostsPagingSource(api,activity)
-        }).flow.cachedIn(viewModelScope)
-    fun fetchPosts(): Flow<PagingData<PostPreview>>{
-        return SearchPostsRepository.getInstance(activity).letSearchedPostsFlow().cachedIn(viewModelScope)
+    fun fetchPosts(searchParams: SearchParams): Flow<PagingData<PostPreview>>{
+        return SearchPostsRepository.getInstance(activity,searchParams).letSearchedPostsFlow().cachedIn(viewModelScope)
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 19150be02821c304cd40fbf4df10d64436648db3 Mon Sep 17 00:00:00 2001
From: "branislav.radivojevic" <wafflemynxyt@gmail.com>
Date: Sun, 20 Nov 2022 21:36:18 +0100
Subject: tags(samo izgled),user history,viewtick on post

---
 Backend/Api/Api/Controllers/UserController.cs      | 10 ++++++
 Backend/Api/Api/Interfaces/IPostService.cs         |  1 +
 Backend/Api/Api/Models/Location.cs                 |  5 +--
 Backend/Api/Api/Services/PostService.cs            | 16 +++++++++
 .../brzodolokacije/Activities/ActivityAddPost.kt   |  9 +++++
 .../brzodolokacije/Adapters/ShowPostsAdapter.kt    | 14 ++++++++
 .../brzodolokacije/Interfaces/IBackendApi.kt       |  2 ++
 .../app/src/main/res/layout/activity_add_post.xml  | 27 ++++++++++++--
 .../app/src/main/res/values/strings.xml            | 41 ++++++++++++++++++++++
 9 files changed, 120 insertions(+), 5 deletions(-)

(limited to 'Client')

diff --git a/Backend/Api/Api/Controllers/UserController.cs b/Backend/Api/Api/Controllers/UserController.cs
index 94e4b41..1bc395f 100644
--- a/Backend/Api/Api/Controllers/UserController.cs
+++ b/Backend/Api/Api/Controllers/UserController.cs
@@ -64,5 +64,15 @@ namespace Api.Controllers
                 return Ok(rez);
             return BadRequest();
         }
+        [HttpGet("history")]
+        [Authorize(Roles = "User")]
+        public async Task<ActionResult<List<PostSend>>> ViewHistory()
+        {
+            var id = await _userService.UserIdFromJwt();
+            var rez = await _postService.UserHistory(id);
+            if (rez != null)
+                return Ok(rez);
+            return BadRequest();
+        }
     }
 }
diff --git a/Backend/Api/Api/Interfaces/IPostService.cs b/Backend/Api/Api/Interfaces/IPostService.cs
index fc2ae03..12a5fe8 100644
--- a/Backend/Api/Api/Interfaces/IPostService.cs
+++ b/Backend/Api/Api/Interfaces/IPostService.cs
@@ -18,5 +18,6 @@ namespace Api.Interfaces
         Task<PostSendPage> SearchPosts(string locid, int page = 0, int sorttype = 1, int filterdate = 1);
         int DateEnumToDays(int filterdate);
         Task<List<PostSend>> GetUsersPosts(string id);
+        Task<List<PostSend>> UserHistory(string userid);
     }
 }
\ No newline at end of file
diff --git a/Backend/Api/Api/Models/Location.cs b/Backend/Api/Api/Models/Location.cs
index 3402f6c..b2f0aad 100644
--- a/Backend/Api/Api/Models/Location.cs
+++ b/Backend/Api/Api/Models/Location.cs
@@ -22,8 +22,9 @@ namespace Api.Models
     public enum LocationType
     {
         GRAD,ULICA,JEZERO,REKA,PLAZA,OKEAN, MORE, MOREUZ, MOST,BANJA,
-    PLANINA, VISORAVAN, PIRAMIDA, LIVADA, SELO, OSTRVO, POLUOSTRVO, KLISURA, ARHIPELAG,
-    ADA, DELTA, FJORD, GEJZIR, IZVOR, KOTLINA, MINERALNI_IZVOR, PECINA ,SUMA, VODOPAD,VULKAN
+        PLANINA, VISORAVAN, PIRAMIDA, LIVADA, SELO, OSTRVO, POLUOSTRVO, KLISURA, ARHIPELAG,
+        ADA, DELTA, FJORD, GEJZIR, IZVOR, KOTLINA, MINERALNI_IZVOR, PECINA ,SUMA, VODOPAD,VULKAN,
+        MUZEJ,ZAMAK,TRG,SPOMENIK,PARK,ZGRADA
     }
 
     public class Coords
diff --git a/Backend/Api/Api/Services/PostService.cs b/Backend/Api/Api/Services/PostService.cs
index 2d62f49..cc4d064 100644
--- a/Backend/Api/Api/Services/PostService.cs
+++ b/Backend/Api/Api/Services/PostService.cs
@@ -349,5 +349,21 @@ namespace Api.Services
             }
             return tosend;
         }
+        public async Task<List<PostSend>> UserHistory(string userid)
+        {
+            var posts = await _posts.Find(_ => true).ToListAsync();
+            if (posts == null)
+                return null;
+            var tosend = new List<PostSend>();
+            foreach (var post in posts)
+            {
+                if (post.views.Any(x => x.Equals(userid)))
+                {
+                    var x = await postToPostSend(post);
+                    tosend.Add(x);
+                }
+            }
+            return tosend;
+        }
     }
 }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index f79769d..ef026a5 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -44,6 +44,9 @@ class ActivityAddPost : AppCompatActivity() {
     private lateinit var descriptionString:String
     private lateinit var post:Button
     private lateinit var addLocation:Button
+    private lateinit var tagLayout:LinearLayout
+    private lateinit var tagButtons:List<Button>
+    private lateinit var tagAutoText: AutoCompleteTextView
     val incorectCoord:Double=1000.0
     val LOCATIONREQCODE=123
     var longitude:Double=incorectCoord
@@ -70,6 +73,12 @@ class ActivityAddPost : AppCompatActivity() {
         post=findViewById<View>(R.id.btnActivityAddPostPost) as Button
         addLocation=findViewById<View>(R.id.btnActivityAddPostAddLocation) as Button
 
+        val tags=resources.getStringArray(R.array.Tags)
+        //Log.d("Main",tags[0].toString())
+        val tagadapter = ArrayAdapter(this,android.R.layout.simple_list_item_1,tags)
+        tagAutoText= findViewById(R.id.acTags) as AutoCompleteTextView
+        tagAutoText.setAdapter(tagadapter)
+
         progressDialog= ProgressDialog(this)
         progressDialog!!.setMessage("Molimo sacekajte!!!")
         progressDialog!!.setCancelable(false)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
index cf16689..e09cd06 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.brzodolokacije.Activities.ActivitySinglePost
+import com.example.brzodolokacije.Activities.NavigationActivity
 import com.example.brzodolokacije.Interfaces.IBackendApi
 import com.example.brzodolokacije.Models.LocationType
 import com.example.brzodolokacije.Models.PostPreview
@@ -63,6 +64,19 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPrevie
             val intent:Intent = Intent(activity,ActivitySinglePost::class.java)
             var b=Bundle()
             //getItem(position)!!.location.type=LocationType.ADA
+            //---------------------------------------------------------------  call back to add view tick
+            val Api= RetrofitHelper.getInstance()
+            val request=Api.addView("Bearer "+token,getItem(position)!!._id)
+            request.enqueue(object : retrofit2.Callback<PostPreview?> {
+                override fun onResponse(call: Call<PostPreview?>, response: Response<PostPreview?>) {
+
+                }
+
+                override fun onFailure(call: Call<PostPreview?>, t: Throwable) {
+
+                }
+            })
+            //---------------------------------------------------------------
             b.putParcelable("selectedPost",getItem(position)!!)
             intent.putExtras(b)
             activity.startActivity(intent)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
index 6d09251..9d94013 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
@@ -26,6 +26,8 @@ interface IBackendApi {
     fun resetpass(@Body obj:ResetPass):Call<ResponseBody>
     @GET("/api/post")
     fun getPosts(@Header("Authorization") authHeader:String):Call<MutableList<PostPreview>>
+    @GET("/api/Post/posts/{id}")
+    fun addView(@Header("Authorization") authHeader:String,@Path("id") id:String):Call<PostPreview>
     @POST("/api/Location/add")
     fun addLocation(@Header("Authorization") authHeader:String,@Body obj: Location ):Call<Location>
     @Multipart
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
index 21dce5e..c0b1ab7 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
@@ -19,7 +19,7 @@
     <Button
         android:id="@+id/nextImage"
         android:layout_width="78dp"
-        android:layout_height="499dp"
+        android:layout_height="0dp"
         android:background="@drawable/rounded_transparent_button"
         android:gravity="right"
         android:padding="30dp"
@@ -33,7 +33,7 @@
     <Button
         android:id="@+id/previousImage"
         android:layout_width="70dp"
-        android:layout_height="497dp"
+        android:layout_height="0dp"
 
         android:background="@drawable/rounded_transparent_button"
         android:gravity="left"
@@ -117,7 +117,7 @@
         android:ems="10"
         android:hint="Reykjavik, Iceland"
         android:inputType="textEmailAddress"
-        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
+        app:layout_constraintBottom_toTopOf="@+id/llTags"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -149,5 +149,26 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/isActivityAddPostSwitcher" />
 
+    <LinearLayout
+        android:id="@+id/llTags"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toTopOf="@+id/acTags"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"></LinearLayout>
+
+    <AutoCompleteTextView
+        android:id="@+id/acTags"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:minHeight="48dp"
+        android:hint="Dodaj tag"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
+        app:layout_constraintStart_toStartOf="parent" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
index a969148..fef04ac 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
@@ -6,4 +6,45 @@
     <string name="title_activity_maps">MapsActivity</string>
     <string name="dodaj_objavu">Dodaj objavu</string>
     <string name="todo">TODO</string>
+
+
+    <!-- example lista tagova, make actual list for app -->
+    <string-array name="Tags">
+        <item>GRAD</item>
+        <item>ULICA</item>
+        <item>JEZERO</item>
+        <item>REKA</item>
+        <item>PLAZA</item>
+        <item>OKEAN</item>
+        <item>MORE</item>
+        <item>MOREUZ</item>
+        <item>MOST</item>
+        <item>BANJA</item>
+        <item>PLANINA</item>
+        <item>VISORAVAN</item>
+        <item>PIRAMIDA</item>
+        <item>LIVADA</item>
+        <item>SELO</item>
+        <item>OSTRVO</item>
+        <item>POLUOSTRVO</item>
+        <item>KLISURA</item>
+        <item>ARHIPELAG</item>
+        <item>ADA</item>
+        <item>DELTA</item>
+        <item>FJORD</item>
+        <item>GEJZIR</item>
+        <item>IZVOR</item>
+        <item>KOTLINA</item>
+        <item>MINERALNI_IZVOR</item>
+        <item>PECINA</item>
+        <item>SUMA</item>
+        <item>VODOPAD</item>
+        <item>VULKAN</item>
+        <item>MUZEJ</item>
+        <item>ZAMAK</item>
+        <item>TRG</item>
+        <item>SPOMENIK</item>
+        <item>PARK</item>
+        <item>ZGRADA</item>
+    </string-array>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 39ec491a634bc26db72e1edac2ed9dd26c8eb851 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Sun, 20 Nov 2022 21:41:09 +0100
Subject: Ukoliko je unet naziv lokacije pa klik na dugme za dodavanje lokacije
 vrsi se pretraga po tom nazivu. Ukoliko nije unet naziv po povratku se upise
 naziv pretranje prilikom biranja lokacije.

---
 .../com/example/brzodolokacije/Activities/ActivityAddPost.kt   |  5 +++++
 .../example/brzodolokacije/Activities/ActivityCapturePost.kt   | 10 ++++++----
 .../java/com/example/brzodolokacije/Activities/MapsActivity.kt | 10 ++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index f79769d..bd3ddb1 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -83,6 +83,8 @@ class ActivityAddPost : AppCompatActivity() {
             imgView}
         addLocation.setOnClickListener {
             val myIntent = Intent(this, MapsActivity::class.java)
+            if(location.text!=null && !location.text.trim().equals(""))
+                myIntent.putExtra("search",location.text.toString())
             startActivityForResult(myIntent,LOCATIONREQCODE)
         }
 
@@ -186,6 +188,9 @@ class ActivityAddPost : AppCompatActivity() {
             var bundle=data!!.extras
             longitude=bundle!!.getDouble("longitude",incorectCoord)
             latitude=bundle!!.getDouble("latitude",incorectCoord)
+            var locName=bundle!!.getString("name")
+            if(location.text.toString().trim().equals("") && locName!=null && !locName.toString().trim().equals(""))
+                location.setText(locName,TextView.BufferType.EDITABLE)
         }
     }
     private fun sendPost(){
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
index 9a36c2f..7f2c264 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
@@ -11,10 +11,7 @@ import android.os.Bundle
 import android.provider.MediaStore
 import android.util.Log
 import android.view.View
-import android.widget.Button
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.Toast
+import android.widget.*
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -120,6 +117,8 @@ class ActivityCapturePost : AppCompatActivity() {
 
         addLocation.setOnClickListener {
             val myIntent = Intent(this, MapsActivity::class.java)
+            if(location.text!=null && !location.text.trim().equals(""))
+                myIntent.putExtra("search",location.text.toString())
             startActivityForResult(myIntent,LOCATIONREQCODE)
         }
 
@@ -173,6 +172,9 @@ class ActivityCapturePost : AppCompatActivity() {
             var bundle=data!!.extras
             longitude=bundle!!.getDouble("longitude",incorectCoord)
             latitude=bundle!!.getDouble("latitude",incorectCoord)
+            var locName=bundle!!.getString("name")
+            if(location.text.toString().trim().equals("") && locName!=null && !locName.toString().trim().equals(""))
+                location.setText(locName, TextView.BufferType.EDITABLE)
         }
     }
     var f:File?=null
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
index 1ac8bd2..1ff07f6 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
@@ -15,6 +15,7 @@ import android.util.Log
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
+import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
@@ -90,6 +91,13 @@ class MapsActivity : AppCompatActivity() {
             }
             false
         })
+        val extras = intent.extras
+        if (extras != null) {
+            val value = extras.getString("search")
+            Log.d("Main",value!!)
+            searchBar.setText(value,TextView.BufferType.EDITABLE)
+            searchMap()
+        }
 
 
 
@@ -99,6 +107,8 @@ class MapsActivity : AppCompatActivity() {
         val bundle = Bundle()
         bundle.putDouble("longitude", locLongitude!!)
         bundle.putDouble("latitude", locLatitude!!)
+        if(searchBar.text!=null && !searchBar.text.toString().equals(""))
+            bundle.putString("name", searchBar.text.toString())
         intent.putExtras(bundle)
         setResult(RESULT_OK, intent)
         finish()
-- 
cgit v1.2.3


From 688987e855a1a5adbf319759b9d0eea813104cbf Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Sun, 20 Nov 2022 23:45:18 +0100
Subject: Dodata sqllite baza za poruke i konekcija sa soketom na back-u #37

---
 .../.idea/deploymentTargetDropDown.xml             |  17 ++++++
 Client/BrzoDoLokacije/app/build.gradle             |   1 +
 .../app/libs/signalr-client-sdk-android.jar        | Bin 0 -> 57824 bytes
 .../BrzoDoLokacije/app/libs/signalr-client-sdk.jar | Bin 0 -> 497821 bytes
 .../app/src/main/AndroidManifest.xml               |  17 ++++--
 .../brzodolokacije/Activities/ChatActivity.kt      |  17 ++++++
 .../com/example/brzodolokacije/MainActivity.kt     |   7 +--
 .../com/example/brzodolokacije/chat/DBHelper.kt    |  63 +++++++++++++++++++++
 .../example/brzodolokacije/chat/SignalRListener.kt |  32 +++++++++++
 .../app/src/main/res/layout/activity_chat.xml      |   9 +++
 10 files changed, 154 insertions(+), 9 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
 create mode 100644 Client/BrzoDoLokacije/app/libs/signalr-client-sdk-android.jar
 create mode 100644 Client/BrzoDoLokacije/app/libs/signalr-client-sdk.jar
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..d34d986
--- /dev/null
+++ b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\PC\.android\avd\Copy_of_Pixel_2_API_32.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-11-20T22:15:01.646388600Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/build.gradle b/Client/BrzoDoLokacije/app/build.gradle
index e1ad943..8437053 100644
--- a/Client/BrzoDoLokacije/app/build.gradle
+++ b/Client/BrzoDoLokacije/app/build.gradle
@@ -54,6 +54,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.paging:paging-runtime:3.0.0-alpha03"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+    implementation 'com.microsoft.signalr:signalr:6.0.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/Client/BrzoDoLokacije/app/libs/signalr-client-sdk-android.jar b/Client/BrzoDoLokacije/app/libs/signalr-client-sdk-android.jar
new file mode 100644
index 0000000..967d741
Binary files /dev/null and b/Client/BrzoDoLokacije/app/libs/signalr-client-sdk-android.jar differ
diff --git a/Client/BrzoDoLokacije/app/libs/signalr-client-sdk.jar b/Client/BrzoDoLokacije/app/libs/signalr-client-sdk.jar
new file mode 100644
index 0000000..f736f64
Binary files /dev/null and b/Client/BrzoDoLokacije/app/libs/signalr-client-sdk.jar differ
diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index 1f19b5c..8469bd3 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- DOZVOLE -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -35,10 +35,17 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.BrzoDoLokacije"
         android:usesCleartextTraffic="true"
-        tools:targetApi="31" >
+        tools:targetApi="31">
+        <activity
+            android:name=".Activities.ChatActivity"
+            android:exported="false">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
         <activity
             android:name=".MapsActivity"
-            android:exported="false" >
+            android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -63,7 +70,7 @@
         <activity
             android:name=".Activities.SplashPage"
             android:exported="true"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -94,7 +101,7 @@
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.example.android.fileprovider"
             android:exported="false"
-            android:grantUriPermissions="true" >
+            android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
new file mode 100644
index 0000000..96c8ea7
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
@@ -0,0 +1,17 @@
+package com.example.brzodolokacije.Activities
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.example.brzodolokacije.R
+import com.example.brzodolokacije.chat.DBHelper
+
+class ChatActivity : AppCompatActivity() {
+
+    private var dbConnection:DBHelper?=null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_chat)
+        dbConnection= DBHelper(this@ChatActivity,null)
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
index 0c43088..515a41b 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
@@ -1,16 +1,15 @@
 package com.example.brzodolokacije
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.util.Log
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.auth0.android.jwt.JWT
 import com.example.brzodolokacije.Activities.ActivityLoginRegister
 import com.example.brzodolokacije.Activities.NavigationActivity
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
-import com.example.brzodolokacije.Services.authCheck
+import com.example.brzodolokacije.chat.SignalRListener
 import retrofit2.Call
 import retrofit2.Response
 
@@ -22,7 +21,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         val intent:Intent
-
+        SignalRListener.getInstance(this@MainActivity)
         if(checkLoggedIn()) {
             intent = Intent(this, NavigationActivity::class.java)
         }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
new file mode 100644
index 0000000..60e870e
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
@@ -0,0 +1,63 @@
+package com.example.brzodolokacije.chat
+
+import android.content.Context
+import android.database.Cursor
+import android.database.sqlite.SQLiteDatabase
+import android.database.sqlite.SQLiteOpenHelper
+
+class DBHelper :
+    SQLiteOpenHelper {
+
+    var db:SQLiteDatabase?=null
+
+    constructor(context: Context, factory: SQLiteDatabase.CursorFactory?):super(context, DATABASE_NAME, factory,2){
+        db=readableDatabase
+    }
+
+    companion object{
+        //database name
+        private val DATABASE_NAME = "chatHistory"
+        //database tables
+        val CONTACTS_TABLE_NAME = "contacts"
+        val MESSAGES_TABLE_NAME = "messages"
+        }
+
+    override fun onCreate(db: SQLiteDatabase?) {
+        if(!doesTableExist(CONTACTS_TABLE_NAME,db)){
+            var sql:String="CREATE TABLE "+ CONTACTS_TABLE_NAME+"(" +
+                    "userId" +"TEXT PRIMARY KEY,"+
+                    "read" +"INT"+
+                    ")"
+            db?.execSQL(sql)
+        }
+        if(!doesTableExist(MESSAGES_TABLE_NAME,db)){
+            var sql:String="CREATE TABLE "+ MESSAGES_TABLE_NAME+"(" +
+                    "senderId" +"TEXT,"+
+                    "receiverId"+"TEXT,"+
+                    "message" +"TEXT,"+
+                    "dateTime"+"TEXT"+
+                    ")"
+            db?.execSQL(sql)
+        }
+    }
+
+    fun doesTableExist(tableName:String,db: SQLiteDatabase?):Boolean{
+        if(db!=null){
+            var sqlString:String="select DISTINCT tbl_name from sqlite_master where tbl_name = '\"+tableName+\"'"
+            var cursor: Cursor=db.rawQuery(sqlString,null)
+            if(cursor!=null){
+                if(cursor.count>0){
+                    return true
+                }
+                return false
+            }
+        }
+        return false
+    }
+
+    override fun onUpgrade(db: SQLiteDatabase?, p1: Int, p2: Int) {
+        db?.execSQL("DROP TABLE IF EXISTS " + CONTACTS_TABLE_NAME)
+        db?.execSQL("DROP TABLE IF EXISTS " + MESSAGES_TABLE_NAME)
+        onCreate(db)
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
new file mode 100644
index 0000000..ee0c86d
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
@@ -0,0 +1,32 @@
+package com.example.brzodolokacije.chat
+
+import android.app.Activity
+import android.util.Log
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
+import com.microsoft.signalr.HubConnection
+import com.microsoft.signalr.HubConnectionBuilder
+import io.reactivex.rxjava3.core.Single
+
+class SignalRListener private constructor(val activity: Activity){
+    private var hubConnection:HubConnection
+    init{
+        hubConnection=HubConnectionBuilder.create(RetrofitHelper.baseUrl+"/chathub")
+            .withAccessTokenProvider(Single.defer{ Single.just(SharedPreferencesHelper.getValue("jwt", activity).toString())})
+            .build()
+        hubConnection.start().blockingAwait()
+        Log.d("main", hubConnection.connectionState.toString())
+    }
+
+
+    companion object{
+        private var instance:SignalRListener?=null
+        fun getInstance(activity: Activity):SignalRListener{
+            if(instance==null){
+                instance= SignalRListener(activity)
+            }
+            return instance as SignalRListener
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
new file mode 100644
index 0000000..093a95a
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Activities.ChatActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 045d19f46a9a79971ab9b72cad62a6b0e27bac89 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Mon, 21 Nov 2022 06:58:25 +0100
Subject: omogucena komunikacija preko soketa (slanje i primanje poruka),
 pisanje poruka u sqllite bazu na telefonu, dodate minimalno odradjene
 komponente neophodne za pregled i slanje poruka #37

---
 Backend/Api/Api/Controllers/UserController.cs      |   2 +-
 Backend/Api/Api/Services/ChatHub.cs                |   2 +-
 Client/BrzoDoLokacije/app/build.gradle             |   2 +-
 .../app/src/main/AndroidManifest.xml               |   6 +-
 .../brzodolokacije/Activities/ChatActivity.kt      |  17 +++
 .../Activities/ChatActivityConversation.kt         | 128 +++++++++++++++++++++
 .../brzodolokacije/Fragments/FragmentShowPosts.kt  |  24 ++--
 .../brzodolokacije/Interfaces/IBackendApi.kt       |   3 +-
 .../com/example/brzodolokacije/MainActivity.kt     |   3 +-
 .../java/com/example/brzodolokacije/Models/Chat.kt |  22 ++++
 .../com/example/brzodolokacije/chat/DBHelper.kt    |  46 ++++++--
 .../example/brzodolokacije/chat/SignalRListener.kt |  27 ++++-
 .../app/src/main/res/layout/activity_chat.xml      |  42 +++++++
 .../main/res/layout/activity_chat_conversation.xml |  82 +++++++++++++
 .../app/src/main/res/layout/chat_preview.xml       |  18 +++
 .../src/main/res/layout/fragment_show_posts.xml    |  13 +++
 16 files changed, 402 insertions(+), 35 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Chat.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml

(limited to 'Client')

diff --git a/Backend/Api/Api/Controllers/UserController.cs b/Backend/Api/Api/Controllers/UserController.cs
index 1bc395f..dd081cb 100644
--- a/Backend/Api/Api/Controllers/UserController.cs
+++ b/Backend/Api/Api/Controllers/UserController.cs
@@ -55,7 +55,7 @@ namespace Api.Controllers
                 return Ok(rez);
             return BadRequest();
         }
-        [HttpGet("{id}/profile")]
+        [HttpGet("{id}/id/profile")]
         [Authorize(Roles = "User")]
         public async Task<ActionResult<UserSend>> GetUserById(string id)
         {
diff --git a/Backend/Api/Api/Services/ChatHub.cs b/Backend/Api/Api/Services/ChatHub.cs
index e0bf5df..639a585 100644
--- a/Backend/Api/Api/Services/ChatHub.cs
+++ b/Backend/Api/Api/Services/ChatHub.cs
@@ -13,7 +13,7 @@ namespace Api.Services
         }
         public override async Task OnConnectedAsync()
         {
-            string token = Context.GetHttpContext().Request.Query["access_token"];
+            string token = Context.GetHttpContext().Request.Headers["access_token"];
             if (token == null)
                 return;
             string id = _jwtService.TokenToId(token);
diff --git a/Client/BrzoDoLokacije/app/build.gradle b/Client/BrzoDoLokacije/app/build.gradle
index 8437053..f81ba4b 100644
--- a/Client/BrzoDoLokacije/app/build.gradle
+++ b/Client/BrzoDoLokacije/app/build.gradle
@@ -54,7 +54,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.paging:paging-runtime:3.0.0-alpha03"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
-    implementation 'com.microsoft.signalr:signalr:6.0.0'
+    implementation 'com.microsoft.signalr:signalr:6.0.8'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index 8469bd3..745f813 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -37,15 +37,15 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".Activities.ChatActivity"
+            android:name=".Activities.ChatActivityConversation"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".MapsActivity"
-            android:exported="false">
+            android:name=".Activities.ChatActivity"
+            android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
index 96c8ea7..4cc7cc1 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
@@ -1,17 +1,34 @@
 package com.example.brzodolokacije.Activities
 
+import android.content.Intent
 import android.os.Bundle
+import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
 import com.example.brzodolokacije.R
 import com.example.brzodolokacije.chat.DBHelper
+import com.example.brzodolokacije.chat.SignalRListener
+import com.example.brzodolokacije.databinding.ActivityChatBinding
 
 class ChatActivity : AppCompatActivity() {
 
     private var dbConnection:DBHelper?=null
+    lateinit var binding: ActivityChatBinding
+    var ws:SignalRListener?=null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_chat)
+        binding=ActivityChatBinding.inflate(layoutInflater)
         dbConnection= DBHelper(this@ChatActivity,null)
+        ws=SignalRListener.getInstance(this@ChatActivity)
+        setListeners()
+
+    }
+    fun setListeners(){
+        findViewById<ImageButton>(R.id.addNewMessage).setOnClickListener {
+            val intent: Intent = Intent(this@ChatActivity,ChatActivityConversation::class.java)
+            intent.putExtra("receiverId","")
+            startActivity(intent)
+        }
     }
 }
\ No newline at end of file
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
new file mode 100644
index 0000000..715f5f3
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt
@@ -0,0 +1,128 @@
+package com.example.brzodolokacije.Activities
+
+import android.os.Bundle
+import android.util.Log
+import android.widget.EditText
+import android.widget.ImageButton
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.cardview.widget.CardView
+import androidx.core.view.isVisible
+import com.example.brzodolokacije.Models.Message
+import com.example.brzodolokacije.Models.MessageSend
+import com.example.brzodolokacije.Models.UserReceive
+import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
+import com.example.brzodolokacije.chat.DBHelper
+import com.example.brzodolokacije.chat.SignalRListener
+import retrofit2.Call
+import retrofit2.Response
+
+class ChatActivityConversation : AppCompatActivity() {
+
+    var receiverId:String?=null
+    var receiverUsername:String?="jelena"
+    var dbConnection:DBHelper?=null
+    var webSocketConnection:SignalRListener?=null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_chat_conversation)
+        receiverId=intent.extras?.get("receiverId").toString()
+        if(receiverId.isNullOrEmpty()){
+            findViewById<CardView>(R.id.cvParentMessageEdit).isVisible=true
+            findViewById<CardView>(R.id.cvParentMessageEdit).invalidate()
+        }
+        else{
+            findViewById<CardView>(R.id.cvParentUsername).isVisible=true
+            findViewById<CardView>(R.id.cvParentUsername).invalidate()
+        }
+        dbConnection=DBHelper.getInstance(this@ChatActivityConversation)
+        webSocketConnection=SignalRListener.getInstance(this@ChatActivityConversation)
+        setListeners()
+    }
+
+    private fun setListeners() {
+        findViewById<ImageButton>(R.id.btnSendMessage).setOnClickListener {
+            var token=SharedPreferencesHelper.getValue("jwt",this@ChatActivityConversation)
+            var messageContent=findViewById<EditText>(R.id.etNewMessage).text.toString()
+            Log.d("main",token!!)
+            val Api= RetrofitHelper.getInstance()
+            if(receiverId.isNullOrEmpty()){
+                //zahtev sa username=om
+                receiverUsername=findViewById<EditText>(R.id.etReceiverUsername).text.toString()
+                val request=Api.getProfile("Bearer "+token,
+                    receiverUsername!!
+                )
+                request.enqueue(object : retrofit2.Callback<UserReceive?> {
+                    override fun onResponse(call: Call<UserReceive?>, response: Response<UserReceive?>) {
+                        if(response.isSuccessful()){
+                            //zahtev da se posalje poruka
+                            receiverId=response.body()?._id
+                            var message= MessageSend(receiverId!!,messageContent)
+                            val request2=Api.sendMessage("Bearer "+token,
+                                message
+                            )
+                            request2.enqueue(object : retrofit2.Callback<Message?> {
+                                override fun onResponse(call: Call<Message?>, response: Response<Message?>) {
+                                    if(response.isSuccessful()){
+                                        //zahtev da se posalje poruka
+                                        var responseMessage=response.body()
+                                        dbConnection?.addMessage(responseMessage!!)
+                                        dbConnection?.getMessages()
+                                        webSocketConnection?.getConnectionState()
+
+
+                                    }
+                                    else{
+                                        Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime1.",Toast.LENGTH_LONG).show()
+                                    }
+                                }
+
+                                override fun onFailure(call: Call<Message?>, t: Throwable) {
+                                    Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime2.",Toast.LENGTH_LONG).show()
+                                }
+                            })
+                        }
+                        else{
+                            Log.d("main",response.message())
+                            //Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime3.",Toast.LENGTH_LONG).show()
+                        }
+                    }
+
+                    override fun onFailure(call: Call<UserReceive?>, t: Throwable) {
+                        Toast.makeText(this@ChatActivityConversation,"fail.",Toast.LENGTH_LONG).show()
+                    }
+                })
+            }
+            else{
+                //zahtev da se posalje poruka
+                var message= MessageSend(receiverId!!,messageContent)
+                val request2=Api.sendMessage("Bearer "+token,
+                    message
+                )
+                request2.enqueue(object : retrofit2.Callback<Message?> {
+                    override fun onResponse(call: Call<Message?>, response: Response<Message?>) {
+                        if(response.isSuccessful()){
+                            //zahtev da se posalje poruka
+                            var responseMessage=response.body()
+                            dbConnection?.addMessage(responseMessage!!)
+                            dbConnection?.getMessages()
+
+
+                        }
+                        else{
+                            Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime.",Toast.LENGTH_LONG).show()
+                        }
+                    }
+
+                    override fun onFailure(call: Call<Message?>, t: Throwable) {
+                        Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime.",Toast.LENGTH_LONG).show()
+                    }
+                })
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
index e78e1d6..c8ffb90 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
@@ -1,43 +1,30 @@
 package com.example.brzodolokacije.Fragments
 
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
-import android.widget.Toast
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.paging.PagingDataAdapter
-import androidx.paging.cachedIn
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.example.brzodolokacije.Activities.NavigationActivity
-import com.example.brzodolokacije.Adapters.SampleAdapter
+import com.example.brzodolokacije.Activities.ChatActivity
 import com.example.brzodolokacije.Adapters.ShowPostsAdapter
-import com.example.brzodolokacije.Models.*
+import com.example.brzodolokacije.Models.SearchParams
 import com.example.brzodolokacije.R
 import com.example.brzodolokacije.Services.RetrofitHelper
-import com.example.brzodolokacije.Services.SharedPreferencesHelper
-import com.example.brzodolokacije.databinding.FragmentHomeBinding
 import com.example.brzodolokacije.databinding.FragmentShowPostsBinding
-import com.example.brzodolokacije.paging.SearchPostsRepository
 import com.example.brzodolokacije.paging.SearchPostsViewModel
 import com.example.brzodolokacije.paging.SearchPostsViewModelFactory
-import kotlinx.android.synthetic.main.fragment_show_posts.*
-import kotlinx.android.synthetic.main.fragment_show_posts.view.*
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
-import okhttp3.ResponseBody
-import retrofit2.Call
-import retrofit2.Response
 
 
 class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
@@ -80,6 +67,11 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
             }
             Log.d("main","klik")
         }
+
+        rootView?.findViewById<ImageButton>(R.id.btnChat)?.setOnClickListener() {
+            val intent: Intent = Intent(activity, ChatActivity::class.java)
+            requireActivity().startActivity(intent)
+        }
     }
 
     fun requestToBack(searchParams: SearchParams){
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
index 9d94013..9f53522 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
@@ -6,7 +6,6 @@ import com.example.brzodolokacije.Models.Auth.Login
 import com.example.brzodolokacije.Models.Auth.Register
 import com.example.brzodolokacije.Models.Auth.ResetPass
 import okhttp3.MultipartBody
-import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import retrofit2.Call
@@ -63,6 +62,8 @@ interface IBackendApi {
                         @Query("sorttype") sorttype:Int,
                         @Query("filterdate") filterdate:Int
                         ):PagedPosts
+    @POST("/api/message/add")
+    fun sendMessage(@Header("Authorization") authHeader:String,@Body message:MessageSend):Call<Message>
 //@POST("putanja")
     //fun add(@Body obj:Post,@Header("Authorization") authHeader:String):Call<Post>
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
index 515a41b..b3183b8 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt
@@ -9,7 +9,6 @@ import com.example.brzodolokacije.Activities.ActivityLoginRegister
 import com.example.brzodolokacije.Activities.NavigationActivity
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
-import com.example.brzodolokacije.chat.SignalRListener
 import retrofit2.Call
 import retrofit2.Response
 
@@ -21,7 +20,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         val intent:Intent
-        SignalRListener.getInstance(this@MainActivity)
+
         if(checkLoggedIn()) {
             intent = Intent(this, NavigationActivity::class.java)
         }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Chat.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Chat.kt
new file mode 100644
index 0000000..4b87d51
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Chat.kt
@@ -0,0 +1,22 @@
+package com.example.brzodolokacije.Models
+
+import java.util.*
+
+data class MessageReceive(
+    var senderId:String,
+    var messagge:String,
+    var timestamp:Date
+)
+
+data class MessageSend(
+    var receiverId:String,
+    var messagge:String
+)
+
+data class Message(
+    var _id:String,
+    var senderId: String,
+    var receiverId: String,
+    var messagge: String,
+    var timestamp: Date
+)
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
index 60e870e..d4ee046 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
@@ -1,41 +1,54 @@
 package com.example.brzodolokacije.chat
 
+import android.app.Activity
 import android.content.Context
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
+import android.util.Log
+import com.example.brzodolokacije.Models.Message
+
 
 class DBHelper :
-    SQLiteOpenHelper {
+    SQLiteOpenHelper{
 
     var db:SQLiteDatabase?=null
 
-    constructor(context: Context, factory: SQLiteDatabase.CursorFactory?):super(context, DATABASE_NAME, factory,2){
+    constructor(context: Context, factory: SQLiteDatabase.CursorFactory?):super(context, DATABASE_NAME, factory,3){
         db=readableDatabase
     }
 
+
     companion object{
         //database name
         private val DATABASE_NAME = "chatHistory"
         //database tables
         val CONTACTS_TABLE_NAME = "contacts"
         val MESSAGES_TABLE_NAME = "messages"
+        private var instance:DBHelper?=null
+        fun getInstance(activity: Activity):DBHelper{
+            if(instance==null){
+                instance= DBHelper(activity,null)
+            }
+            return instance as DBHelper
         }
+    }
 
     override fun onCreate(db: SQLiteDatabase?) {
         if(!doesTableExist(CONTACTS_TABLE_NAME,db)){
             var sql:String="CREATE TABLE "+ CONTACTS_TABLE_NAME+"(" +
-                    "userId" +"TEXT PRIMARY KEY,"+
-                    "read" +"INT"+
+                    "userId " +"TEXT PRIMARY KEY,"+
+                    "read " +"INT"+
                     ")"
             db?.execSQL(sql)
         }
         if(!doesTableExist(MESSAGES_TABLE_NAME,db)){
             var sql:String="CREATE TABLE "+ MESSAGES_TABLE_NAME+"(" +
-                    "senderId" +"TEXT,"+
-                    "receiverId"+"TEXT,"+
-                    "message" +"TEXT,"+
-                    "dateTime"+"TEXT"+
+                    "_id "+"TEXT PRIMARY KEY,"+
+                    "senderId " +"TEXT,"+
+                    "receiverId "+"TEXT,"+
+                    "messagge " +"TEXT,"+
+                    "timestamp "+"TEXT"+
                     ")"
             db?.execSQL(sql)
         }
@@ -60,4 +73,21 @@ class DBHelper :
         db?.execSQL("DROP TABLE IF EXISTS " + MESSAGES_TABLE_NAME)
         onCreate(db)
     }
+
+    fun addMessage(message: Message){
+        if(message._id.isNullOrEmpty()){
+            message._id=message.senderId+message.timestamp
+        }
+        var sql="INSERT INTO "+ MESSAGES_TABLE_NAME+"(_id,senderId,receiverid,messagge,timestamp) VALUES('"+message._id+"','"+
+                        message.senderId+"','"+
+                        message.receiverId+"','"+
+                        message.messagge+ "','"+
+                        message.timestamp+ "')"
+        db?.execSQL(sql)
+    }
+    fun getMessages(){
+        var sql="SELECT * FROM "+ MESSAGES_TABLE_NAME
+        var cursor=db?.rawQuery(sql,null)
+        Log.d("main",cursor?.count.toString())
+    }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
index ee0c86d..1aa6afa 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
@@ -2,19 +2,28 @@ package com.example.brzodolokacije.chat
 
 import android.app.Activity
 import android.util.Log
+import com.example.brzodolokacije.Models.MessageReceive
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
+import com.microsoft.signalr.Action1
 import com.microsoft.signalr.HubConnection
 import com.microsoft.signalr.HubConnectionBuilder
-import io.reactivex.rxjava3.core.Single
+import com.microsoft.signalr.HubConnectionState
+
 
 class SignalRListener private constructor(val activity: Activity){
     private var hubConnection:HubConnection
     init{
         hubConnection=HubConnectionBuilder.create(RetrofitHelper.baseUrl+"/chathub")
-            .withAccessTokenProvider(Single.defer{ Single.just(SharedPreferencesHelper.getValue("jwt", activity).toString())})
+            .withHeader("access_token",SharedPreferencesHelper.getValue("jwt",activity))
             .build()
+        hubConnection.keepAliveInterval=120
+        hubConnection.on("Message",
+            Action1 {message:MessageReceive->Log.d("main",message.messagge)},
+            MessageReceive::class.java
+                )
         hubConnection.start().blockingAwait()
+
         Log.d("main", hubConnection.connectionState.toString())
     }
 
@@ -27,6 +36,20 @@ class SignalRListener private constructor(val activity: Activity){
             }
             return instance as SignalRListener
         }
+
+    }
+    fun stopHubConnection(){
+        if(hubConnection.connectionState == HubConnectionState.CONNECTED){
+            hubConnection.stop()
+        }
+    }
+
+    fun getConnectionState(){
+        Log.d("main",hubConnection.connectionState.toString())
+    }
+
+    fun log(){
+        Log.d("Debug infor siganlR ", hubConnection.connectionId)
     }
 
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
index 093a95a..694e972 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
@@ -5,5 +5,47 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Activities.ChatActivity">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/topBanner"
+        android:layout_width="match_parent"
+        android:clickable="true"
+        android:layout_height="50dp"
+        android:background="@color/dark_blue_transparent"
+        app:layout_constraintStart_toStartOf="parent">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:textSize="40dp"
+            android:id="@+id/tvFragmentTitle"
+            android:text="Chat"
+            android:textColor="@color/white"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    <ImageButton
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/addNewMessage"
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintTop_toBottomOf="@id/topBanner"
+        android:src="@drawable/button_chat">
+
+
+    </ImageButton>
+<!--    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:id="@+id/swipeContainer"
+        app:layout_constraintTop_toBottomOf="@id/addNewMessage">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvMain"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" >
+
+        </androidx.recyclerview.widget.RecyclerView>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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
new file mode 100644
index 0000000..ea7d3e7
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Activities.ChatActivityConversation">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/topBanner"
+        android:layout_width="match_parent"
+        android:clickable="true"
+        android:layout_height="50dp"
+        android:background="@color/dark_blue_transparent"
+        app:layout_constraintStart_toStartOf="parent">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:textSize="40dp"
+            android:id="@+id/tvFragmentTitle"
+            android:text="Chat"
+            android:textColor="@color/white"/>
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cvParentUsername"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:elevation="0dp"
+            app:cardCornerRadius="20dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/etReceiverUsername"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/rounded_white_button_login"
+                android:hint="  kome slati poruku?"
+                android:paddingLeft="15dp"
+                android:inputType="textPersonName" />
+
+
+        </androidx.cardview.widget.CardView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cvParentMessageEdit"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:elevation="0dp"
+        app:cardCornerRadius="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+
+        <com.google.android.material.textfield.TextInputEditText
+            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:paddingLeft="15dp"
+            android:inputType="textPersonName" />
+
+        <ImageButton
+            android:id="@+id/btnSendMessage"
+            android:layout_width="49dp"
+            android:layout_height="50dp"
+            android:layout_gravity="right"
+            android:scaleType="centerCrop"
+            app:cornerRadius="16dp"
+            android:src="@drawable/post_comment" />
+
+    </androidx.cardview.widget.CardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml
new file mode 100644
index 0000000..95c036a
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:id="@+id/ivUserImage"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:id="@+id/tvUsername"
+        android:textSize="@dimen/header1_size"
+        android:textColor="@color/black"
+        app:layout_constraintStart_toEndOf="@id/ivUserImage"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
index 5dfbc98..6e22456 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
@@ -72,6 +72,19 @@
             app:layout_constraintStart_toEndOf="@+id/btnSortType"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <ImageButton
+            android:id="@+id/btnChat"
+            android:layout_width="84dp"
+            android:layout_height="50dp"
+            android:layout_marginStart="8dp"
+            android:layout_weight="1"
+            android:background="@color/white"
+            android:padding="@dimen/component_padding"
+            android:scaleType="centerCrop"
+            android:src="@android:drawable/sym_action_chat"
+            app:layout_constraintStart_toEndOf="@+id/btnSortDirection"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <ImageButton
             android:id="@+id/btnLinearLayout"
             android:layout_width="50dp"
-- 
cgit v1.2.3


From 66ad4ba5365eb6a07843c59f5c65f78999015385 Mon Sep 17 00:00:00 2001
From: "branislav.radivojevic" <wafflemynxyt@gmail.com>
Date: Mon, 21 Nov 2022 15:04:34 +0100
Subject: implementacija tagova na postu

---
 Backend/Api/Api/Models/Post.cs                     |  5 +-
 Backend/Api/Api/Services/PostService.cs            |  3 +
 .../brzodolokacije/Activities/ActivityAddPost.kt   | 68 ++++++++++++++++++----
 .../Activities/ActivityCapturePost.kt              | 60 ++++++++++++++++++-
 .../brzodolokacije/Interfaces/IBackendApi.kt       |  1 +
 .../app/src/main/res/layout/activity_add_post.xml  | 26 +++++++--
 .../src/main/res/layout/activity_capture_post.xml  | 63 +++++++++++++++-----
 7 files changed, 194 insertions(+), 32 deletions(-)

(limited to 'Client')

diff --git a/Backend/Api/Api/Models/Post.cs b/Backend/Api/Api/Models/Post.cs
index 8099d6c..baadc24 100644
--- a/Backend/Api/Api/Models/Post.cs
+++ b/Backend/Api/Api/Models/Post.cs
@@ -18,6 +18,7 @@ namespace Api.Models
         public List<Rating> ratings { get; set; }
         public List<Comment> comments { get; set; }
         public List<File> images { get; set; }
+        public List<string>? tags { get; set; }
     }
     public class PostReceive
     {
@@ -25,8 +26,7 @@ namespace Api.Models
         public string locationId { get; set; }
         public string description { get; set; }
         public List<IFormFile> images { get; set; }
-
-
+        public string? tags { get; set; }
     }
     public class PostSend
     {
@@ -39,6 +39,7 @@ namespace Api.Models
         public double ratings { get; set; }
         public List<CommentSend> comments { get; set; }
         public List<File> images { get; set; }
+        public List<string>? tags { get; set; }
     }
     public class Rating
     {
diff --git a/Backend/Api/Api/Services/PostService.cs b/Backend/Api/Api/Services/PostService.cs
index cc4d064..bdf150b 100644
--- a/Backend/Api/Api/Services/PostService.cs
+++ b/Backend/Api/Api/Services/PostService.cs
@@ -39,6 +39,8 @@ namespace Api.Services
             p.comments = new List<Comment>();
             p.images = new List<Models.File>();
             p.createdAt = DateTime.Now.ToUniversalTime();
+            var tags = post.tags.Split("|").ToList();
+            p.tags = tags;
             var folderPath = Path.Combine(Directory.GetCurrentDirectory(), "Files", p.ownerId);
             if (!Directory.Exists(folderPath))
             {
@@ -82,6 +84,7 @@ namespace Api.Services
             p.images = post.images;
             p.views = post.views.Count();
             p.createdAt = post.createdAt;
+            p.tags = post.tags;
             if (post.ratings.Count() > 0)
             {
                 List<int> ratings = new List<int>();
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index c4b5a60..c247743 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -8,6 +8,7 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.util.TypedValue
 import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
@@ -15,6 +16,7 @@ import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.core.view.setMargins
 import com.example.brzodolokacije.Models.Location
 import com.example.brzodolokacije.Models.LocationType
 import com.example.brzodolokacije.Models.PostPreview
@@ -45,8 +47,11 @@ class ActivityAddPost : AppCompatActivity() {
     private lateinit var post:Button
     private lateinit var addLocation:Button
     private lateinit var tagLayout:LinearLayout
-    private lateinit var tagButtons:List<Button>
-    private lateinit var tagAutoText: AutoCompleteTextView
+    private lateinit var tagButtons:MutableList<Button>
+    private lateinit var tagText: EditText
+    private lateinit var tagButtonAdd:Button
+    private lateinit var tagList: MutableList<String>
+    private var tagidcounter:Int = 0
     val incorectCoord:Double=1000.0
     val LOCATIONREQCODE=123
     var longitude:Double=incorectCoord
@@ -61,7 +66,9 @@ class ActivityAddPost : AppCompatActivity() {
 //            applicationContext, "Add new ", Toast.LENGTH_LONG
 //        ).show();
         uploadedImages= ArrayList()
-
+        tagList = mutableListOf()
+        tagButtons= mutableListOf()
+        tagidcounter = 0
         //paths= ArrayList()
 
         uploadFromGallery=findViewById<View>(R.id.btnActivityAddPostUploadFromGalleryVisible) as Button
@@ -72,12 +79,9 @@ class ActivityAddPost : AppCompatActivity() {
         description=findViewById<View>(R.id.etActivityAddPostDescription) as EditText
         post=findViewById<View>(R.id.btnActivityAddPostPost) as Button
         addLocation=findViewById<View>(R.id.btnActivityAddPostAddLocation) as Button
-
-        val tags=resources.getStringArray(R.array.Tags)
-        //Log.d("Main",tags[0].toString())
-        val tagadapter = ArrayAdapter(this,android.R.layout.simple_list_item_1,tags)
-        tagAutoText= findViewById(R.id.acTags) as AutoCompleteTextView
-        tagAutoText.setAdapter(tagadapter)
+        tagText =findViewById<View>(R.id.acTags) as EditText
+        tagButtonAdd = findViewById<View>(R.id.btnActivityAddPostAddTag) as Button
+        tagLayout =  findViewById<View>(R.id.llTags) as LinearLayout
 
         progressDialog= ProgressDialog(this)
         progressDialog!!.setMessage("Molimo sacekajte!!!")
@@ -97,6 +101,41 @@ class ActivityAddPost : AppCompatActivity() {
             startActivityForResult(myIntent,LOCATIONREQCODE)
         }
 
+        //dodavanje i brisanje tagova
+        tagButtonAdd.setOnClickListener {
+            if(tagList.count()<5) {
+                var tagstr = tagText.text.toString()
+                var newbtn = Button(this)
+                newbtn.setId(tagidcounter)
+                newbtn.text = tagstr
+                var layoutParams = LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.WRAP_CONTENT,
+                    50
+                )
+                layoutParams.setMargins(3)
+                newbtn.layoutParams=layoutParams
+                newbtn.setBackgroundColor(Color.parseColor("#1C789A"))
+                newbtn.setTextColor(Color.WHITE)
+                newbtn.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10F)
+                newbtn.setPadding(3,1,3,1)
+
+                newbtn.setOnClickListener {
+                    var btntext = newbtn.text.toString()
+                    tagList.remove(btntext)
+                    tagButtons.remove(newbtn)
+                    tagLayout.removeView(newbtn)
+                }
+
+                tagList.add(tagstr)
+                tagButtons.add(newbtn)
+                tagLayout.addView(newbtn)
+                tagText.text.clear()
+            }
+            else{
+                Toast.makeText(this,"Maksimalno 5 tagova",Toast.LENGTH_LONG)
+            }
+        }
+
         //dodavanje iz galerije
         uploadFromGallery.setOnClickListener{
 
@@ -267,6 +306,13 @@ class ActivityAddPost : AppCompatActivity() {
         var locReq=RequestBody.create("text/plain".toMediaTypeOrNull(),loc)
         var descReq=RequestBody.create("text/plain".toMediaTypeOrNull(),desc)
         var idReq=RequestBody.create("text/plain".toMediaTypeOrNull(),"dsa")
+
+        var tagliststring=""
+        for(tag in tagList){
+            tagliststring=tagliststring+tag+"|"
+        }
+        var tagReq=RequestBody.create("text/plain".toMediaTypeOrNull(),tagliststring)
+
         val imagesParts = arrayOfNulls<MultipartBody.Part>(
             uploadedImages!!.size
         )
@@ -285,8 +331,8 @@ class ActivityAddPost : AppCompatActivity() {
             imagesParts[i]=MultipartBody.Part.createFormData("images",file.name,imageBody)
         }
         var jwtString= SharedPreferencesHelper.getValue("jwt",this)
-        var data=api.addPost("Bearer "+jwtString,imagesParts,idReq,descReq,locReq)
-
+        var data=api.addPost("Bearer "+jwtString,imagesParts,idReq,descReq,locReq,tagReq)
+        //multipart formdata : images , _id , description , locationId , tags
 
         data.enqueue(object : retrofit2.Callback<PostPreview?> {
             override fun onResponse(call: Call<PostPreview?>, response: Response<PostPreview?>) {
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
index 7f2c264..3fab37a 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
@@ -10,6 +10,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import android.util.Log
+import android.util.TypedValue
 import android.view.View
 import android.widget.*
 import androidx.activity.result.contract.ActivityResultContracts
@@ -17,6 +18,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.core.view.setMargins
 import com.example.brzodolokacije.Models.Location
 import com.example.brzodolokacije.Models.LocationType
 import com.example.brzodolokacije.Models.PostPreview
@@ -46,6 +48,12 @@ class ActivityCapturePost : AppCompatActivity() {
     private lateinit var showImage: ImageView
     private var uploadedImages: Uri? = null
     private lateinit var addLocation:Button
+    private lateinit var tagLayout:LinearLayout
+    private lateinit var tagButtons:MutableList<Button>
+    private lateinit var tagText: EditText
+    private lateinit var tagButtonAdd:Button
+    private lateinit var tagList: MutableList<String>
+    private var tagidcounter:Int = 0
 
     val incorectCoord:Double=1000.0
     val LOCATIONREQCODE=123
@@ -56,12 +64,19 @@ class ActivityCapturePost : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_capture_post)
+        tagList = mutableListOf()
+        tagButtons= mutableListOf()
+        tagidcounter = 0
+
         location = findViewById<View>(R.id.etActivityCapturePostLocation) as EditText
         description = findViewById<View>(R.id.etActivityCapturePostDescription) as EditText
         post = findViewById<View>(R.id.btnActivityCapturePostPost) as Button
         showImage = findViewById<View>(R.id.ivActivityCapturePostImage) as ImageView
         takePhoto = findViewById<View>(R.id.btnActivityCapturePostCaptureVisible) as Button
         addLocation=findViewById<View>(R.id.btnActivityCapturePostAddLocation) as Button
+        tagText =findViewById<View>(R.id.acTagsCap) as EditText
+        tagButtonAdd = findViewById<View>(R.id.btnActivityAddPostAddTagCap) as Button
+        tagLayout =  findViewById<View>(R.id.llTagsCap) as LinearLayout
 
         progressDialog= ProgressDialog(this)
         progressDialog!!.setMessage("Molimo sacekajte!!!")
@@ -69,6 +84,42 @@ class ActivityCapturePost : AppCompatActivity() {
         progressDialog!!.setCanceledOnTouchOutside(false)
 
 
+        //dodavanje i brisanje tagova
+        tagButtonAdd.setOnClickListener {
+            if(tagList.count()<5) {
+                var tagstr = tagText.text.toString()
+                var newbtn = Button(this)
+                newbtn.setId(tagidcounter)
+                newbtn.text = tagstr
+                var layoutParams = LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.WRAP_CONTENT,
+                    50
+                )
+                layoutParams.setMargins(3)
+                newbtn.layoutParams=layoutParams
+                newbtn.setBackgroundColor(Color.parseColor("#1C789A"))
+                newbtn.setTextColor(Color.WHITE)
+                newbtn.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10F)
+                newbtn.setPadding(3,1,3,1)
+
+                newbtn.setOnClickListener {
+                    var btntext = newbtn.text.toString()
+                    tagList.remove(btntext)
+                    tagButtons.remove(newbtn)
+                    tagLayout.removeView(newbtn)
+                }
+
+                tagList.add(tagstr)
+                tagButtons.add(newbtn)
+                tagLayout.addView(newbtn)
+                tagText.text.clear()
+            }
+            else{
+                Toast.makeText(this,"Maksimalno 5 tagova",Toast.LENGTH_LONG)
+            }
+        }
+
+
         //dodavanje sa kamere
 
         //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -259,6 +310,13 @@ class ActivityCapturePost : AppCompatActivity() {
         var locReq= RequestBody.create("text/plain".toMediaTypeOrNull(),loc)
         var descReq= RequestBody.create("text/plain".toMediaTypeOrNull(),desc)
         var idReq= RequestBody.create("text/plain".toMediaTypeOrNull(),"dsa")
+
+        var tagliststring=""
+        for(tag in tagList){
+            tagliststring=tagliststring+tag+"|"
+        }
+        var tagReq=RequestBody.create("text/plain".toMediaTypeOrNull(),tagliststring)
+
         val imagesParts = arrayOfNulls<MultipartBody.Part>(
             1
         )
@@ -267,7 +325,7 @@ class ActivityCapturePost : AppCompatActivity() {
             imagesParts[0]= MultipartBody.Part.createFormData("images",f!!.name,imageBody)
 
         var jwtString= SharedPreferencesHelper.getValue("jwt",this)
-        var data=api.addPost("Bearer "+jwtString,imagesParts,idReq,descReq,locReq)
+        var data=api.addPost("Bearer "+jwtString,imagesParts,idReq,descReq,locReq,tagReq)
 
 
         data.enqueue(object : retrofit2.Callback<PostPreview?> {
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
index 9f53522..1ba6b53 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
@@ -35,6 +35,7 @@ interface IBackendApi {
                                                             ,@Part("_id") _id:RequestBody
                                                             ,@Part("description") description:RequestBody
                                                             ,@Part("locationId") locationId:RequestBody
+                                                            ,@Part("tags") tags:RequestBody
                                                             ):Call<PostPreview>
     @POST("api/Post/posts/{id}/addrating")
     fun addRating(@Header("Authorization") authHeader:String,@Path("id") id:String,@Body rating: RatingReceive):Call<ResponseBody>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
index c0b1ab7..fbe2230 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
@@ -152,7 +152,7 @@
     <LinearLayout
         android:id="@+id/llTags"
         android:layout_width="0dp"
-        android:layout_height="50dp"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:orientation="horizontal"
@@ -160,15 +160,33 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"></LinearLayout>
 
-    <AutoCompleteTextView
+    <EditText
         android:id="@+id/acTags"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:hint="Planina,Reka,Park..."
         android:minHeight="48dp"
-        android:hint="Dodaj tag"
+        android:maxLength= "12"
         app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
+        app:layout_constraintEnd_toStartOf="@+id/btnActivityAddPostAddTag"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <Button
+        android:id="@+id/btnActivityAddPostAddTag"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginBottom="5dp"
+        android:background="@drawable/rounded_cyan_button"
+        android:backgroundTint="#1C789A"
+        android:text="Dodaj tag"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/llTags" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
index c3d42a5..2b64a27 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
@@ -39,30 +39,28 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="516dp"
             android:layout_marginEnd="16dp"
             android:text="Lokacija"
+            app:layout_constraintBottom_toTopOf="@+id/etActivityCapturePostLocation"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintStart_toStartOf="parent" />
 
         <EditText
             android:id="@+id/etActivityCapturePostLocation"
             android:layout_width="200dp"
             android:layout_height="50dp"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="4dp"
             android:layout_marginEnd="16dp"
             android:ems="10"
             android:hint="Reykjavik, Iceland"
+            android:importantForAutofill="no"
             android:inputType="textEmailAddress"
+            app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostDescriptiontext"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostLocationtext"
-            tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck"
-            android:importantForAutofill="no" />
+            tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck" />
         <Button
             android:id="@+id/btnActivityCapturePostAddLocation"
             android:layout_width="wrap_content"
@@ -82,29 +80,27 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             android:text="Opis"
+            app:layout_constraintBottom_toTopOf="@+id/etActivityCapturePostDescription"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/etActivityCapturePostLocation" />
+            app:layout_constraintStart_toStartOf="parent" />
 
         <EditText
             android:id="@+id/etActivityCapturePostDescription"
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="4dp"
             android:layout_marginEnd="16dp"
             android:ems="10"
             android:hint="Reykjavik, Iceland"
+            android:importantForAutofill="no"
             android:inputType="textEmailAddress"
+            app:layout_constraintBottom_toTopOf="@+id/llTagsCap"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvActivityCapturePostDescriptiontext"
-            tools:ignore="TextContrastCheck"
-            android:importantForAutofill="no" />
+            tools:ignore="TextContrastCheck" />
 
 
         <Button
@@ -139,4 +135,43 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <LinearLayout
+            android:id="@+id/llTagsCap"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toTopOf="@+id/acTagsCap"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"></LinearLayout>
+
+        <EditText
+            android:id="@+id/acTagsCap"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:hint="Planina,Reka,Park..."
+            android:minHeight="48dp"
+            android:maxLength= "12"
+            app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostPost"
+            app:layout_constraintEnd_toStartOf="@+id/btnActivityAddPostAddTagCap"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <Button
+            android:id="@+id/btnActivityAddPostAddTagCap"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@drawable/rounded_cyan_button"
+            android:backgroundTint="#1C789A"
+            android:text="Dodaj tag"
+            app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostPost"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/llTagsCap" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 59c0fbcb4185b6aa1fd0652f6cbd7b88feb23bb8 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Mon, 21 Nov 2022 20:50:29 +0100
Subject: Ispravljen prikaz korisnickih postova na njegovom profilu. Dodat
 MyPostsAdapter.

---
 .../Activities/ActivityCapturePost.kt              |  1 +
 .../brzodolokacije/Adapters/MyPostsAdapter.kt      | 75 ++++++++++++++++++++++
 .../brzodolokacije/Fragments/FragmentUserPosts.kt  |  3 +-
 3 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
index 3fab37a..b02abad 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
@@ -265,6 +265,7 @@ class ActivityCapturePost : AppCompatActivity() {
         var countryName=loc1[0].countryName
         var address="todo not possible in query"
         var city=loc1[0].adminArea//not possible
+        //var address=loc1[0].subAdminArea
         var loc:Location=Location("",locationString,city,countryName,address,latitude,longitude,LocationType.GRAD)
         var jwtString= SharedPreferencesHelper.getValue("jwt",this)
         var data=api.addLocation("Bearer "+jwtString,loc)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt
new file mode 100644
index 0000000..1b57e5b
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/MyPostsAdapter.kt
@@ -0,0 +1,75 @@
+package com.example.brzodolokacije.Adapters
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.os.AsyncTask
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.example.brzodolokacije.Activities.ActivitySinglePost
+import com.example.brzodolokacije.Interfaces.IBackendApi
+import com.example.brzodolokacije.Models.LocationType
+import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
+import com.example.brzodolokacije.databinding.PostPreviewBinding
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import okhttp3.ResponseBody
+import retrofit2.Call
+import retrofit2.Response
+
+
+class MyPostsAdapter (val activity:Activity,val items : MutableList<PostPreview>)
+    : RecyclerView.Adapter<MyPostsAdapter.ViewHolder>() {
+    private lateinit var token: String
+    private lateinit var imageApi: IBackendApi
+
+    //constructer has one argument - list of objects that need to be displayed
+    //it is bound to xml of single item
+    private lateinit var binding: PostPreviewBinding
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        imageApi= RetrofitHelper.getInstance()
+        token= SharedPreferencesHelper.getValue("jwt", activity).toString()
+        binding = PostPreviewBinding.inflate(inflater, parent, false)
+        return ViewHolder(binding)
+    }
+
+
+
+
+    override fun getItemCount() = items.size
+    inner class ViewHolder(itemView: PostPreviewBinding) : RecyclerView.ViewHolder(itemView.root) {
+        fun bind(item: PostPreview) {
+            binding.apply {
+                tvTitle.text = item.location.name
+                tvLocationParent.text = item.location.country
+                tvLocationType.text = "TODO"
+                if(item.images.isNotEmpty()) {
+                    Glide.with(activity)
+                        .load(RetrofitHelper.baseUrl + "/api/post/image/" + item.images[0]._id)
+                        .into(locationImage)
+                }
+
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(items[position])
+        holder.itemView.setOnClickListener {
+            //Toast.makeText(activity,item._id,Toast.LENGTH_LONG).show()
+            val intent:Intent = Intent(activity,ActivitySinglePost::class.java)
+            var b=Bundle()
+            items[position].location.type=LocationType.ADA
+            b.putParcelable("selectedPost", items[position])
+            intent.putExtras(b)
+            activity.startActivity(intent)
+        }
+    }
+}
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
index f1f2257..d69a40c 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
@@ -34,6 +34,7 @@ import android.widget.TextView
 import com.example.brzodolokacije.Activities.ActivityAddPost
 import com.example.brzodolokacije.Activities.ActivityCapturePost
 import com.example.brzodolokacije.Activities.ActivityForgottenPassword
+import com.example.brzodolokacije.Adapters.MyPostsAdapter
 
 import com.google.android.material.bottomsheet.BottomSheetDialog
 
@@ -107,7 +108,7 @@ class FragmentUserPosts : Fragment() {
     private fun loadPosts(){//most viewed
         rvPosts.apply {
             layoutManager= GridLayoutManager(requireContext(),2,GridLayoutManager.VERTICAL,false)
-            adapter= ShowPostsAdapter(requireActivity(),posts)
+            adapter= MyPostsAdapter(requireActivity(),posts)
 
         }
     }
-- 
cgit v1.2.3


From 2404102a5d5a5575ba4e8000da0f90e627d9a1d5 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Mon, 21 Nov 2022 22:34:00 +0100
Subject: Dadat pregled kada se otvori objava. Napravljen  izgled za prikas
 istorije pregleda objava. Omogucen prikaz liste istorije pregleda objava na
 profilu korisnika.

---
 Backend/Api/Api/Models/Post.cs                     |  1 +
 .../brzodolokacije/Activities/ActivityAddPost.kt   |  4 +-
 .../Activities/ActivitySinglePost.kt               | 16 +++++
 .../brzodolokacije/Adapters/PostHistoryAdapter.kt  | 61 ++++++++++++++++
 .../brzodolokacije/Adapters/ShowPostsAdapter.kt    | 11 ---
 .../Fragments/FragmentMyRecensions.kt              | 81 +++++++++++++---------
 .../brzodolokacije/Interfaces/IBackendApi.kt       |  2 +
 .../java/com/example/brzodolokacije/Models/Post.kt |  3 +-
 .../src/main/res/layout/fragment_my_recensions.xml | 26 +++++--
 .../app/src/main/res/layout/fragment_profile.xml   |  2 +-
 .../src/main/res/layout/single_post_history.xml    | 75 ++++++++++++++++++++
 11 files changed, 228 insertions(+), 54 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/PostHistoryAdapter.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml

(limited to 'Client')

diff --git a/Backend/Api/Api/Models/Post.cs b/Backend/Api/Api/Models/Post.cs
index baadc24..1a4129f 100644
--- a/Backend/Api/Api/Models/Post.cs
+++ b/Backend/Api/Api/Models/Post.cs
@@ -19,6 +19,7 @@ namespace Api.Models
         public List<Comment> comments { get; set; }
         public List<File> images { get; set; }
         public List<string>? tags { get; set; }
+        
     }
     public class PostReceive
     {
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index c247743..2d305a6 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -260,7 +260,9 @@ class ActivityAddPost : AppCompatActivity() {
         }
         var countryName=loc1[0].countryName
         var address="todo not possible in query"
-        var city=loc1[0].adminArea//not possible
+        var city="its null"
+        if(loc1[0].adminArea!=null)
+            city=loc1[0].adminArea//not possible
         var loc:Location=Location("",locationString,city,countryName,address,latitude,longitude,LocationType.GRAD)
         var jwtString= SharedPreferencesHelper.getValue("jwt",this)
         var data=api.addLocation("Bearer "+jwtString,loc)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
index c030eda..f875949 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
@@ -132,6 +132,7 @@ class ActivitySinglePost : AppCompatActivity() {
                 Toast.makeText(this@ActivitySinglePost,"Unesite tekst komentara.",Toast.LENGTH_LONG).show()
             }
         }
+        addView()
 
     }
 
@@ -229,5 +230,20 @@ class ActivitySinglePost : AppCompatActivity() {
             tvDescription.invalidate()
         }
     }
+    fun addView() {
+        var token= SharedPreferencesHelper.getValue("jwt", this).toString()
+        val Api= RetrofitHelper.getInstance()
+        val request=Api.addView("Bearer "+token,post._id)
+        request.enqueue(object : retrofit2.Callback<PostPreview?> {
+            override fun onResponse(call: Call<PostPreview?>, response: Response<PostPreview?>) {
+
+            }
+
+            override fun onFailure(call: Call<PostPreview?>, t: Throwable) {
+
+            }
+        })
+    }
+
 
 }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/PostHistoryAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/PostHistoryAdapter.kt
new file mode 100644
index 0000000..db3fc2e
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/PostHistoryAdapter.kt
@@ -0,0 +1,61 @@
+package com.example.brzodolokacije.Adapters
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.example.brzodolokacije.Activities.ActivitySinglePost
+import com.example.brzodolokacije.Interfaces.IBackendApi
+import com.example.brzodolokacije.Models.LocationType
+import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
+import com.example.brzodolokacije.databinding.SinglePostHistoryBinding
+
+
+class PostHistoryAdapter (val activity:Activity,val items : MutableList<PostPreview>)
+    : RecyclerView.Adapter<PostHistoryAdapter.ViewHolder>() {
+    private lateinit var token: String
+    private lateinit var imageApi: IBackendApi
+
+    //constructer has one argument - list of objects that need to be displayed
+    //it is bound to xml of single item
+    private lateinit var binding: SinglePostHistoryBinding
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        imageApi= RetrofitHelper.getInstance()
+        token= SharedPreferencesHelper.getValue("jwt", activity).toString()
+        binding = SinglePostHistoryBinding.inflate(inflater, parent, false)
+        return ViewHolder(binding)
+    }
+
+
+
+
+    override fun getItemCount() = items.size
+    inner class ViewHolder(itemView: SinglePostHistoryBinding) : RecyclerView.ViewHolder(itemView.root) {
+        fun bind(item: PostPreview) {
+            binding.apply {
+                tvTitleSinglePostHistory.text = item.location.name
+                tvLocationParentSinglePostHistory.text = "22.11.2022"
+                tvLocationTypeSinglePostHistory.text = item.location.country
+
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(items[position])
+        holder.itemView.setOnClickListener {
+            //Toast.makeText(activity,item._id,Toast.LENGTH_LONG).show()
+            val intent:Intent = Intent(activity,ActivitySinglePost::class.java)
+            var b=Bundle()
+            items[position].location.type=LocationType.ADA
+            b.putParcelable("selectedPost", items[position])
+            intent.putExtras(b)
+            activity.startActivity(intent)
+        }
+    }
+}
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
index e09cd06..0bd625f 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt
@@ -65,17 +65,6 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPrevie
             var b=Bundle()
             //getItem(position)!!.location.type=LocationType.ADA
             //---------------------------------------------------------------  call back to add view tick
-            val Api= RetrofitHelper.getInstance()
-            val request=Api.addView("Bearer "+token,getItem(position)!!._id)
-            request.enqueue(object : retrofit2.Callback<PostPreview?> {
-                override fun onResponse(call: Call<PostPreview?>, response: Response<PostPreview?>) {
-
-                }
-
-                override fun onFailure(call: Call<PostPreview?>, t: Throwable) {
-
-                }
-            })
             //---------------------------------------------------------------
             b.putParcelable("selectedPost",getItem(position)!!)
             intent.putExtras(b)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyRecensions.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyRecensions.kt
index ce8679a..c5fa6ec 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyRecensions.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyRecensions.kt
@@ -5,56 +5,69 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.example.brzodolokacije.Adapters.MyPostsAdapter
+import com.example.brzodolokacije.Adapters.PostHistoryAdapter
+import com.example.brzodolokacije.Models.PostPreview
 import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
 
-/**
- * A simple [Fragment] subclass.
- * Use the [FragmentMyRecensions.newInstance] factory method to
- * create an instance of this fragment.
- */
 class FragmentMyRecensions : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
+
+    private lateinit var posts : MutableList<PostPreview>
+    private lateinit var rvPosts: RecyclerView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
+
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_my_recensions, container, false)
+
+        val view =inflater.inflate(R.layout.fragment_my_recensions, container, false)
+
+        rvPosts=view.findViewById(R.id.rvFragmentMyRecensionPostHistory) as RecyclerView
+        getPosts()
+
+        return view
+
     }
+    fun getPosts(){
+        val api = RetrofitHelper.getInstance()
+        val token= SharedPreferencesHelper.getValue("jwt", requireActivity())
+        val data=api.getMyHistory("Bearer "+token)
 
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment FragmentMyRecensions.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            FragmentMyRecensions().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
+        data.enqueue(object : Callback<MutableList<PostPreview>> {
+            override fun onResponse(
+                call: Call<MutableList<PostPreview>>,
+                response: Response<MutableList<PostPreview>>
+            ) {
+                if (response.body() == null) {
+                    return
                 }
+                posts = response.body()!!.toMutableList<PostPreview>()
+                loadPosts()
+            }
+            override fun onFailure(call: Call<MutableList<PostPreview>>, t: Throwable) {
+
             }
+        })
     }
+    private fun loadPosts(){//most viewed
+        rvPosts.apply {
+            layoutManager= GridLayoutManager(requireContext(),1, GridLayoutManager.VERTICAL,false)
+            adapter= PostHistoryAdapter(requireActivity(),posts)
+
+        }
+
+}
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
index 1ba6b53..d8daf14 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
@@ -65,6 +65,8 @@ interface IBackendApi {
                         ):PagedPosts
     @POST("/api/message/add")
     fun sendMessage(@Header("Authorization") authHeader:String,@Body message:MessageSend):Call<Message>
+    @GET("/api/user/history")
+    fun getMyHistory(@Header("Authorization") authHeader:String):Call<MutableList<PostPreview>>
 //@POST("putanja")
     //fun add(@Body obj:Post,@Header("Authorization") authHeader:String):Call<Post>
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
index a292160..e2e9209 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt
@@ -34,7 +34,8 @@ data class PostPreview (
     var views:Int,
     var ratings:Float,
     var comments:List<CommentSend>?,
-    var images:List<PostImage>
+    var images:List<PostImage>,
+    var tags:List<String>?
     //nedostaju datum i vreme kreiranja
 ):Parcelable
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml
index d5452b9..72706e0 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_recensions.xml
@@ -1,14 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Fragments.FragmentMyRecensions">
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+
+    <com.google.android.material.divider.MaterialDivider
+        android:id="@+id/materialDivider"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="invisible"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvFragmentMyRecensionPostHistory"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="Moje recenzije" />
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/materialDivider"
+        android:layout_marginHorizontal="16dp"/>
 
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
index c75e1e4..138d068 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
@@ -231,7 +231,7 @@
             android:layout_marginTop="4dp"
             android:backgroundTint="#FFFFFF"
             android:stateListAnimator="@null"
-            android:text="Recenzije"
+            android:text="Istorija"
             android:textColor="@color/cardview_dark_background"
             app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml
new file mode 100644
index 0000000..12c29ee
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="0dp"
+    android:background="@drawable/rounded_picture_background"
+    android:clipToOutline="true"
+    >
+
+
+
+
+    <View
+        android:id="@+id/vBannerSinglePostHistory"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:background="@color/dark_blue_transparent"
+        android:outlineProvider="background"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        tools:layout_editor_absoluteX="10dp"
+        android:layout_marginTop="5dp"
+        >
+
+
+    </View>
+
+    <TextView
+        android:id="@+id/tvTitleSinglePostHistory"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="top|left"
+        android:text="Naslov"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.076"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory"
+        app:layout_constraintVertical_bias="0.18" />
+
+    <TextView
+        android:id="@+id/tvLocationTypeSinglePostHistory"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Tip lokacije"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="@+id/vBannerSinglePostHistory"
+        app:layout_constraintEnd_toStartOf="@+id/tvLocationParentSinglePostHistory"
+        app:layout_constraintHorizontal_bias="0.112"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory"
+        app:layout_constraintVertical_bias="0.721" />
+
+    <TextView
+        android:id="@+id/tvLocationParentSinglePostHistory"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="22.11.2022"
+        android:textAlignment="viewEnd"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.952"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory"
+        app:layout_constraintVertical_bias="0.737" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 4c6172aa80d5b8a8d12f45d1d91ce4e778d9412a Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Mon, 21 Nov 2022 23:53:25 +0100
Subject: Dodato praćenje korisnika na back-u. Dodati fragmenti za praćenje
 korisnika na front-u.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Backend/Api/Api/Controllers/UserController.cs      | 24 +++++++
 Backend/Api/Api/Interfaces/IUserService.cs         |  4 ++
 Backend/Api/Api/Models/User.cs                     | 13 ++++
 Backend/Api/Api/Services/UserService.cs            | 82 ++++++++++++++++++++++
 .../.idea/deploymentTargetDropDown.xml             |  4 +-
 .../brzodolokacije/Adapters/FollowersAdapter.kt    |  4 ++
 .../brzodolokacije/Fragments/FragmentFollowers.kt  | 69 ++++++++++++++++++
 .../Fragments/FragmentHomePageMainScroll.kt        |  3 -
 .../brzodolokacije/Fragments/FragmentProfile.kt    | 56 ++++++++++-----
 .../Fragments/FragmentUserProfile.kt               | 40 +----------
 .../brzodolokacije/Interfaces/IBackendApi.kt       | 10 +++
 .../java/com/example/brzodolokacije/Models/User.kt | 12 +++-
 .../app/src/main/res/layout/fragment_followers.xml | 26 +++++++
 .../app/src/main/res/layout/fragment_profile.xml   |  1 +
 14 files changed, 285 insertions(+), 63 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/FollowersAdapter.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml

(limited to 'Client')

diff --git a/Backend/Api/Api/Controllers/UserController.cs b/Backend/Api/Api/Controllers/UserController.cs
index dd081cb..6cc41ea 100644
--- a/Backend/Api/Api/Controllers/UserController.cs
+++ b/Backend/Api/Api/Controllers/UserController.cs
@@ -74,5 +74,29 @@ namespace Api.Controllers
                 return Ok(rez);
             return BadRequest();
         }
+
+        [HttpGet("{id}/followers")]
+        [Authorize(Roles = "User")]
+        public async Task<ActionResult<List<UserSend>>> GetFollowers(string id)
+        {
+            return Ok(await _userService.GetFollowers(id));
+        }
+
+        [HttpGet("{id}/following")]
+        [Authorize(Roles = "User")]
+        public async Task<ActionResult<List<UserSend>>> GetFollowing(string id)
+        {
+            return Ok(await _userService.GetFollowing(id));
+        }
+
+        [HttpGet("{id}/addFollower")]
+        [Authorize(Roles = "User")]
+        public async Task<ActionResult<List<UserSend>>> AddFollower(string userId, string followerId)
+        {
+            return Ok(await _userService.AddFollower(userId, followerId));
+        }
+
+
+
     }
 }
diff --git a/Backend/Api/Api/Interfaces/IUserService.cs b/Backend/Api/Api/Interfaces/IUserService.cs
index 313e909..5770de1 100644
--- a/Backend/Api/Api/Interfaces/IUserService.cs
+++ b/Backend/Api/Api/Interfaces/IUserService.cs
@@ -26,5 +26,9 @@ namespace Api.Interfaces
         Task<Boolean> AddOrChangePfp(string userid, IFormFile image);
         Task<UserSend> GetUserData(string username);
         Task<UserSend> GetSelfUserData(string id);
+
+        Task<Boolean> AddFollower(string userId,string followerId);
+        Task<List<UserSend>> GetFollowers(string id);
+        Task<List<UserSend>> GetFollowing(string id);
     }
 }
diff --git a/Backend/Api/Api/Models/User.cs b/Backend/Api/Api/Models/User.cs
index 2e323a8..6c777e7 100644
--- a/Backend/Api/Api/Models/User.cs
+++ b/Backend/Api/Api/Models/User.cs
@@ -16,6 +16,11 @@ namespace Api.Models
         public String password { get; set; }
         public DateTime creationDate { get; set; }
         public File? pfp { get; set; }
+
+        public List<string> followers { get; set; }
+        public List<string> following { get; set; }
+        public int followersCount { get; set; }
+        public int followingCount { get; set; }
     }
 
     public class Login
@@ -58,5 +63,13 @@ namespace Api.Models
         public DateTime creationDate { get; set; }
         public File? pfp { get; set; }
         public int postcount { get; set; }
+
+        public List<String> followers{ get; set; }
+        public List<String> following { get; set; }
+
+        public int followersCount { get; set; }
+        public int followingCount { get; set; } 
+
+
     }
 }
diff --git a/Backend/Api/Api/Services/UserService.cs b/Backend/Api/Api/Services/UserService.cs
index 33e6d11..64a7f7a 100644
--- a/Backend/Api/Api/Services/UserService.cs
+++ b/Backend/Api/Api/Services/UserService.cs
@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Http;
 using System.Security.Claims;
 using MimeKit;
 using MailKit.Net.Smtp;
+using DnsClient;
 
 namespace Api.Services
 {
@@ -16,6 +17,8 @@ namespace Api.Services
         private readonly IJwtService _jwtService;
         private IConfiguration _configuration;
         private readonly IFileService _fileService;
+
+        private readonly IMongoCollection<UserSend> _usersSend; 
         public UserService(IDatabaseConnection settings, IMongoClient mongoClient, IJwtService jwtService, IHttpContextAccessor httpContextAccessor, IConfiguration configuration, IFileService fileService)
         {
             var database = mongoClient.GetDatabase(settings.DatabaseName);
@@ -35,6 +38,7 @@ namespace Api.Services
                 return -2; //username already
                            //
             user.password = hashPassword(user.password);
+  
             await _users.InsertOneAsync(user);
             return 1;
         }
@@ -375,5 +379,83 @@ namespace Api.Services
             tosend.postcount = userposts.Count();
             return tosend;
         }
+
+        public async Task<Boolean> AddFollower(string userId,string followerId)
+        {
+            UserSend u = await _usersSend.Find(user => user._id==userId).FirstOrDefaultAsync();
+            UserSend f = await _usersSend.Find(user => user._id == followerId).FirstOrDefaultAsync();
+
+            if (userId != null && followerId!=null)
+            {
+                u.followers.Add(followerId);
+                f.following.Add(userId);
+                return true;
+            }
+
+
+            return false;
+        }
+
+        public async Task<List<UserSend>> GetFollowers(string id)
+        {
+            User u = await _users.Find(user => user._id == id).FirstOrDefaultAsync();
+            List<UserSend> followers = new List<UserSend>();
+            if (u != null)
+            {
+                //List<UserSend> followers = u.followers;
+                if (u.followers.Count() > 0)
+                {
+                    foreach (string userid in u.followers)
+                    {
+                        User utemp = await _users.Find(user => user._id == userid).FirstOrDefaultAsync();
+                        if (utemp == null)
+                        {
+                            continue;
+                        }
+                        UserSend follower = new UserSend();
+                        follower.pfp = utemp.pfp;
+                        follower.username = utemp.username;
+                        follower.email = utemp.username;
+                        follower.followers = utemp.followers;
+                        follower._id = utemp._id;
+
+                        followers.Add((UserSend)follower);  
+                    }
+                }
+                return followers;
+            }
+            return null;
+        }
+
+        public async Task<List<UserSend>> GetFollowing(string id)
+        {
+            User u = await _users.Find(user => user._id == id).FirstOrDefaultAsync();
+            List<UserSend> following = new List<UserSend>();
+            if (u != null)
+            {
+                
+                if (u.following.Count() > 0)
+                {
+                    foreach (string userid in u.following)
+                    {
+                        User utemp = await _users.Find(user => user._id == userid).FirstOrDefaultAsync();
+                        if (utemp == null)
+                        {
+                            continue;
+                        }
+                        UserSend follower = new UserSend();
+                        follower.pfp = utemp.pfp;
+                        follower.username = utemp.username;
+                        follower.email = utemp.username;
+                        follower.followers = utemp.followers;
+                        follower._id = utemp._id;
+
+                        following.Add((UserSend)follower);
+                    }
+                }
+                return following;
+            }
+            return null;
+        }
     }
 }
diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
index d34d986..6fac072 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\Copy_of_Pixel_2_API_32.avd" />
+            <value value="C:\Users\TAMARA\.android\avd\Pixel_3a_XL_API_33.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-11-20T22:15:01.646388600Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-11-21T20:28:37.906817700Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/FollowersAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/FollowersAdapter.kt
new file mode 100644
index 0000000..117a2c2
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/FollowersAdapter.kt
@@ -0,0 +1,4 @@
+package com.example.brzodolokacije.Adapters
+
+class FollowersAdapter {
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
new file mode 100644
index 0000000..da480f1
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
@@ -0,0 +1,69 @@
+package com.example.brzodolokacije.Fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import com.example.brzodolokacije.Interfaces.IBackendApi
+import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Models.UserReceive
+import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+class FragmentFollowers : Fragment() {
+    private lateinit var userId:String
+    private lateinit var followers: MutableList<UserReceive>
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view= inflater.inflate(R.layout.fragment_followers, container, false)
+
+        val bundle = this.arguments
+
+        if (bundle != null) {
+            userId= bundle.getString("userId").toString()
+            Toast.makeText(
+                activity, bundle.getString("userId"), Toast.LENGTH_LONG
+            ).show();
+        }
+
+        getPosts()
+
+        return view
+    }
+
+    fun getPosts(){
+        val api = RetrofitHelper.getInstance()
+        val data=api.getFollowers(userId)
+
+
+        data.enqueue(object : Callback<MutableList<UserReceive>> {
+            override fun onResponse(
+                call: Call<MutableList<UserReceive>>,
+                response: Response<MutableList<UserReceive>>
+            ) {
+                if (response.body() == null) {
+                    return
+                }
+
+                followers = response.body()!!.toMutableList<UserReceive>()
+
+            }
+
+            override fun onFailure(call: Call<MutableList<UserReceive>>, t: Throwable) {
+                Toast.makeText(
+                    activity,"nema objava", Toast.LENGTH_LONG
+               ).show();
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt
index bde4dd2..cf811df 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt
@@ -77,9 +77,6 @@ class FragmentHomePageMainScroll : Fragment() {
         var fragment=FragmentShowPostsByLocation()
 
         location_spa.setOnClickListener {
-            Toast.makeText(
-                activity, "BANJAAAAAAAAAAAAAAA", Toast.LENGTH_LONG
-            ).show();
             filter=LocationType.BANJA
             filterString=filter.toString()
             bundle.putString("data",filterString)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
index a792598..03cb4fa 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
@@ -1,5 +1,6 @@
 package com.example.brzodolokacije.Fragments
 
+
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -19,7 +20,6 @@ import com.example.brzodolokacije.R
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import com.google.android.material.button.MaterialButton
-import com.google.android.material.imageview.ShapeableImageView
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -28,6 +28,7 @@ import retrofit2.Call
 import retrofit2.Response
 import java.io.File
 
+
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
 private const val ARG_PARAM1 = "param1"
@@ -38,7 +39,7 @@ private const val ARG_PARAM2 = "param2"
  * Use the [FragmentProfile.newInstance] factory method to
  * create an instance of this fragment.
  */
-class FragmentProfile : Fragment(R.layout.fragment_profile) {
+class FragmentProfile : Fragment(com.example.brzodolokacije.R.layout.fragment_profile) {
     // TODO: Rename and change types of parameters
     private lateinit var username: TextView
     private lateinit var name: TextView
@@ -55,22 +56,31 @@ class FragmentProfile : Fragment(R.layout.fragment_profile) {
     private lateinit var showMyRecensions: Button
     private lateinit var profilePicture: ImageView
     private lateinit var profilePicturePlus: MaterialButton
+    private lateinit var showFollowers: TextView
+
+    var userId:String = "1"
+
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
+        Toast.makeText(
+            activity, "MOJ PROFILLLLLLLLLLLLLLL", Toast.LENGTH_LONG
+        ).show();
         // Inflate the layout for this fragment
-        val view:View= inflater.inflate(R.layout.fragment_profile, container, false)
-        name = view.findViewById<View>(R.id.tvFragmentProfileName) as TextView
-        username = view.findViewById<View>(R.id.tvFragmentProfileUserName) as TextView
-        postsCount = view.findViewById<View>(R.id.tvFragmentProfilePostsNo) as TextView
-        followersCount = view.findViewById<View>(R.id.tvFragmentProfileFollowersNo) as TextView
-        followingCount = view.findViewById<View>(R.id.tvFragmentProfileFollowNo) as TextView
-        showMyPosts=view.findViewById<View>(R.id.btnFragmentProfileShowMyPosts) as Button
-        showMyData=view.findViewById<View>(R.id.btnFragmentProfileShowMyData) as Button
-        showMyRecensions=view.findViewById<View>(R.id.btnFragmentProfileShowMyRecensions) as Button
-        profilePicture=view.findViewById<View>(R.id.tvFragmentProfileProfilePicture) as ImageView
-        profilePicturePlus=view.findViewById<View>(R.id.btnFragmentProfileProfilePicturePlus) as MaterialButton
+        val view:View= inflater.inflate(com.example.brzodolokacije.R.layout.fragment_profile, container, false)
+        name = view.findViewById<View>(com.example.brzodolokacije.R.id.tvFragmentProfileName) as TextView
+        username = view.findViewById<View>(com.example.brzodolokacije.R.id.tvFragmentProfileUserName) as TextView
+        postsCount = view.findViewById<View>(com.example.brzodolokacije.R.id.tvFragmentProfilePostsNo) as TextView
+        followersCount = view.findViewById<View>(com.example.brzodolokacije.R.id.tvFragmentProfileFollowersNo) as TextView
+        followingCount = view.findViewById<View>(com.example.brzodolokacije.R.id.tvFragmentProfileFollowNo) as TextView
+        showMyPosts=view.findViewById<View>(com.example.brzodolokacije.R.id.btnFragmentProfileShowMyPosts) as Button
+        showMyData=view.findViewById<View>(com.example.brzodolokacije.R.id.btnFragmentProfileShowMyData) as Button
+        showMyRecensions=view.findViewById<View>(com.example.brzodolokacije.R.id.btnFragmentProfileShowMyRecensions) as Button
+        profilePicture=view.findViewById<View>(com.example.brzodolokacije.R.id.tvFragmentProfileProfilePicture) as ImageView
+        profilePicturePlus=view.findViewById<View>(com.example.brzodolokacije.R.id.btnFragmentProfileProfilePicturePlus) as MaterialButton
+        showFollowers=view.findViewById(com.example.brzodolokacije.R.id.tvFragmentProfileFollowers)
         //podaci iz baze
 
 
@@ -85,7 +95,7 @@ class FragmentProfile : Fragment(R.layout.fragment_profile) {
 
             var fm: FragmentTransaction =childFragmentManager.beginTransaction()
 
-            fm.replace(R.id.flFragmentProfileFragmentContainer, FragmentMyProfileInfo())
+            fm.replace(com.example.brzodolokacije.R.id.flFragmentProfileFragmentContainer, FragmentMyProfileInfo())
             fm.commit()
         }
 
@@ -93,12 +103,24 @@ class FragmentProfile : Fragment(R.layout.fragment_profile) {
             getProfileInfo()
             var fm: FragmentTransaction =childFragmentManager.beginTransaction()
 
-            fm.replace(R.id.flFragmentProfileFragmentContainer, FragmentMyRecensions())
+            fm.replace(com.example.brzodolokacije.R.id.flFragmentProfileFragmentContainer, FragmentMyRecensions())
             fm.commit()
         }
         profilePicturePlus.setOnClickListener{
             addProfilePicture()
         }
+
+        showFollowers.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString("userId",userId ) // Put anything what you want
+            val fragmentFollowers = FragmentFollowers()
+            fragmentFollowers.setArguments(bundle)
+
+            fragmentManager
+                ?.beginTransaction()
+                ?.replace(com.example.brzodolokacije.R.id.flNavigationFragment,fragmentFollowers)
+                ?.commit()
+        }
         getProfileInfo()
         openMyPosts()
         return view
@@ -106,7 +128,7 @@ class FragmentProfile : Fragment(R.layout.fragment_profile) {
     fun openMyPosts(){
         var fm: FragmentTransaction =childFragmentManager.beginTransaction()
 
-        fm.replace(R.id.flFragmentProfileFragmentContainer, FragmentUserPosts())
+        fm.replace(com.example.brzodolokacije.R.id.flFragmentProfileFragmentContainer, FragmentUserPosts())
         fm.commit()
     }
 
@@ -181,6 +203,8 @@ class FragmentProfile : Fragment(R.layout.fragment_profile) {
         followersCount.setText("to do")
         followingCount.setText("to do")
 
+        userId=user._id
+
         //Add Profile image
         if(user.pfp!=null) {
             Glide.with(requireActivity())
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
index 8ab5276..6b1bac9 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
@@ -7,28 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import com.example.brzodolokacije.R
 
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [FragmentUserProfile.newInstance] factory method to
- * create an instance of this fragment.
- */
 class FragmentUserProfile : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -38,23 +18,5 @@ class FragmentUserProfile : Fragment() {
         return inflater.inflate(R.layout.fragment_user_profile, container, false)
     }
 
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment FragmentUserProfile.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            FragmentUserProfile().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
-            }
-    }
+
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
index d8daf14..f7bb9b6 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
@@ -69,4 +69,14 @@ interface IBackendApi {
     fun getMyHistory(@Header("Authorization") authHeader:String):Call<MutableList<PostPreview>>
 //@POST("putanja")
     //fun add(@Body obj:Post,@Header("Authorization") authHeader:String):Call<Post>
+
+    @POST("/api/user/{id}/followers")
+    fun getFollowers(@Path("id") id:String):Call <MutableList<UserReceive>>
+
+    @POST("/api/user{id}/following")
+    fun getFollowing(@Path("id") id:String):Call <MutableList<UserReceive>>
+
+    @POST("/api/user{id}/addFollower")
+    fun addFollower(@Header("Authorization") authHeader:String,@Path("id") id:String):Call<UserReceive>
+
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/User.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/User.kt
index c726978..46338b3 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/User.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/User.kt
@@ -14,9 +14,9 @@ data class User (
 
     //profil
     var followers:List<User>,
-    var followersNumber:Int,
+    var followersCount:Int,
     var following:List<User>,
-    var followingNumber:Int,
+    var followingCount:Int,
     var postIds:List<Int>,
     var postNumber:Int
 
@@ -28,5 +28,11 @@ data class UserReceive(
     var email:String,
     var creationDate: Date,
     var pfp:PostImage?,
-    var postcount:Int
+    var postcount:Int,
+    var followers:List<User>,
+    var followersNumber:Int,
+    var following:List<User>,
+    var followingNumber:Int,
+    var postIds:List<Int>,
+    var postNumber:Int
 )
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml
new file mode 100644
index 0000000..deef1f8
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.FragmentFollowers">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:text="Pratioci"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvFragmentShowFollowers"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
index 138d068..ec78de6 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
@@ -151,6 +151,7 @@
                 <TextView
                     android:id="@+id/tvFragmentProfileFollowers"
                     android:gravity="center"
+                    android:clickable="true"
                     android:text="PRATIOCI" />
 
                 <TextView
-- 
cgit v1.2.3


From 9a00d5a73d1854ed496f25a721926be26fc6cc45 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Tue, 22 Nov 2022 00:00:44 +0100
Subject: prikaz liste cetova i poruka u cetu, slanje i prikaz dobijenih poruka
 #37

---
 .../.idea/deploymentTargetDropDown.xml             |  4 +-
 .../brzodolokacije/Activities/ChatActivity.kt      | 34 +++++++++-
 .../Activities/ChatActivityConversation.kt         | 77 +++++++++++++++-------
 .../brzodolokacije/Adapters/ChatMessagesAdapter.kt | 38 +++++++++++
 .../brzodolokacije/Adapters/ChatPreviewsAdapter.kt | 39 +++++++++++
 .../java/com/example/brzodolokacije/Models/Chat.kt |  5 ++
 .../com/example/brzodolokacije/chat/DBHelper.kt    | 66 +++++++++++++++++--
 .../example/brzodolokacije/chat/SignalRListener.kt |  8 ++-
 .../app/src/main/res/layout/activity_chat.xml      |  4 +-
 .../main/res/layout/activity_chat_conversation.xml | 49 ++++++++++----
 .../app/src/main/res/layout/chat_message.xml       | 17 +++++
 11 files changed, 291 insertions(+), 50 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
index d34d986..c73c499 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\Copy_of_Pixel_2_API_32.avd" />
+            <value value="C:\Users\PC\.android\avd\Copy_of_Copy_of_Pixel_2_API_32.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-11-20T22:15:01.646388600Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-11-21T17:55:50.810481Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
index 4cc7cc1..992f09f 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
@@ -4,8 +4,12 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.exam.DBHelper
+import com.example.brzodolokacije.Adapters.ChatPreviewsAdapter
+import com.example.brzodolokacije.Models.ChatPreview
 import com.example.brzodolokacije.R
-import com.example.brzodolokacije.chat.DBHelper
 import com.example.brzodolokacije.chat.SignalRListener
 import com.example.brzodolokacije.databinding.ActivityChatBinding
 
@@ -14,14 +18,20 @@ class ChatActivity : AppCompatActivity() {
     private var dbConnection:DBHelper?=null
     lateinit var binding: ActivityChatBinding
     var ws:SignalRListener?=null
+    var recyclerView:RecyclerView?=null
+    var adapterVar:ChatPreviewsAdapter?=null
+    var layoutVar:LinearLayoutManager?=null
+    var items:MutableList<ChatPreview>?= mutableListOf()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_chat)
-        binding=ActivityChatBinding.inflate(layoutInflater)
+        binding= ActivityChatBinding.inflate(layoutInflater)
+        setContentView(binding.root)
         dbConnection= DBHelper(this@ChatActivity,null)
         ws=SignalRListener.getInstance(this@ChatActivity)
         setListeners()
+        setRecyclerView()
+        requestForChats()
 
     }
     fun setListeners(){
@@ -31,4 +41,22 @@ class ChatActivity : AppCompatActivity() {
             startActivity(intent)
         }
     }
+
+    fun requestForChats(){
+        var dbHelper= DBHelper.getInstance(this@ChatActivity)
+        items=dbHelper.getContacts()
+        adapterVar= items?.let { ChatPreviewsAdapter(it,this@ChatActivity) }
+        setRecyclerView(setParams = false)
+    }
+
+    fun setRecyclerView(setParams:Boolean=true){
+        if(setParams){
+            adapterVar= items?.let { ChatPreviewsAdapter(it,this@ChatActivity) }
+            layoutVar=LinearLayoutManager(this@ChatActivity)
+        }
+        recyclerView=binding.rvMain
+        recyclerView?.setHasFixedSize(true)
+        recyclerView?.layoutManager=layoutVar
+        recyclerView?.adapter=adapterVar
+    }
 }
\ No newline at end of file
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 715f5f3..d523485 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
@@ -2,43 +2,47 @@ package com.example.brzodolokacije.Activities
 
 import android.os.Bundle
 import android.util.Log
+import android.view.View
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.cardview.widget.CardView
-import androidx.core.view.isVisible
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.exam.DBHelper
+import com.example.brzodolokacije.Adapters.ChatMessagesAdapter
 import com.example.brzodolokacije.Models.Message
 import com.example.brzodolokacije.Models.MessageSend
 import com.example.brzodolokacije.Models.UserReceive
 import com.example.brzodolokacije.R
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
-import com.example.brzodolokacije.chat.DBHelper
 import com.example.brzodolokacije.chat.SignalRListener
+import com.example.brzodolokacije.databinding.ActivityChatConversationBinding
 import retrofit2.Call
 import retrofit2.Response
 
 class ChatActivityConversation : AppCompatActivity() {
 
-    var receiverId:String?=null
+    var recyclerView:RecyclerView?=null
+    var adapterVar: ChatMessagesAdapter?=null
+    var layoutVar: RecyclerView.LayoutManager?=null
+    lateinit var binding:ActivityChatConversationBinding
+    var userId:String?=null
     var receiverUsername:String?="jelena"
-    var dbConnection:DBHelper?=null
+    var dbConnection: DBHelper?=null
     var webSocketConnection:SignalRListener?=null
+    var items:MutableList<Message>?=mutableListOf()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_chat_conversation)
-        receiverId=intent.extras?.get("receiverId").toString()
-        if(receiverId.isNullOrEmpty()){
-            findViewById<CardView>(R.id.cvParentMessageEdit).isVisible=true
-            findViewById<CardView>(R.id.cvParentMessageEdit).invalidate()
-        }
-        else{
-            findViewById<CardView>(R.id.cvParentUsername).isVisible=true
-            findViewById<CardView>(R.id.cvParentUsername).invalidate()
-        }
+        binding= ActivityChatConversationBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        userId=intent.extras?.get("userId").toString()
         dbConnection=DBHelper.getInstance(this@ChatActivityConversation)
+        setHeader()
+        setRecyclerView()
+        requestMessages()
         webSocketConnection=SignalRListener.getInstance(this@ChatActivityConversation)
         setListeners()
     }
@@ -49,7 +53,7 @@ class ChatActivityConversation : AppCompatActivity() {
             var messageContent=findViewById<EditText>(R.id.etNewMessage).text.toString()
             Log.d("main",token!!)
             val Api= RetrofitHelper.getInstance()
-            if(receiverId.isNullOrEmpty()){
+            if(userId.isNullOrEmpty() || userId.equals("null")){
                 //zahtev sa username=om
                 receiverUsername=findViewById<EditText>(R.id.etReceiverUsername).text.toString()
                 val request=Api.getProfile("Bearer "+token,
@@ -59,8 +63,8 @@ class ChatActivityConversation : AppCompatActivity() {
                     override fun onResponse(call: Call<UserReceive?>, response: Response<UserReceive?>) {
                         if(response.isSuccessful()){
                             //zahtev da se posalje poruka
-                            receiverId=response.body()?._id
-                            var message= MessageSend(receiverId!!,messageContent)
+                            userId=response.body()?._id
+                            var message= MessageSend(userId!!,messageContent)
                             val request2=Api.sendMessage("Bearer "+token,
                                 message
                             )
@@ -70,8 +74,7 @@ class ChatActivityConversation : AppCompatActivity() {
                                         //zahtev da se posalje poruka
                                         var responseMessage=response.body()
                                         dbConnection?.addMessage(responseMessage!!)
-                                        dbConnection?.getMessages()
-                                        webSocketConnection?.getConnectionState()
+
 
 
                                     }
@@ -98,7 +101,7 @@ class ChatActivityConversation : AppCompatActivity() {
             }
             else{
                 //zahtev da se posalje poruka
-                var message= MessageSend(receiverId!!,messageContent)
+                var message= MessageSend(userId!!,messageContent)
                 val request2=Api.sendMessage("Bearer "+token,
                     message
                 )
@@ -108,7 +111,7 @@ class ChatActivityConversation : AppCompatActivity() {
                             //zahtev da se posalje poruka
                             var responseMessage=response.body()
                             dbConnection?.addMessage(responseMessage!!)
-                            dbConnection?.getMessages()
+                            requestMessages()
 
 
                         }
@@ -125,4 +128,34 @@ class ChatActivityConversation : AppCompatActivity() {
         }
 
     }
+
+    private fun setHeader(){
+        if(userId.isNullOrEmpty() || userId.equals("null")){
+            binding.tvFragmentTitle.visibility= View.GONE
+            binding.tvFragmentTitle.invalidate()
+            binding.tvFragmentTitle.forceLayout()
+        }
+        else{
+            binding.tvFragmentTitle.text=userId
+            binding.tvFragmentTitle.invalidate()
+            binding.cvParentUsername.visibility= View.GONE
+            binding.cvParentUsername.forceLayout()
+        }
+    }
+    fun setRecyclerView(setParams:Boolean=true){
+        if(setParams){
+            adapterVar= items?.let { ChatMessagesAdapter(it,this@ChatActivityConversation) }
+            layoutVar= LinearLayoutManager(this@ChatActivityConversation)
+        }
+        recyclerView = binding.rvMain
+        recyclerView?.setHasFixedSize(true)
+        recyclerView?.layoutManager=layoutVar
+        recyclerView?.adapter=adapterVar
+    }
+
+    fun requestMessages(){
+        items=dbConnection?.getMessages(userId!!)
+        adapterVar= items?.let { ChatMessagesAdapter(it,this@ChatActivityConversation) }
+        setRecyclerView(setParams = false)
+    }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
new file mode 100644
index 0000000..4c917f3
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
@@ -0,0 +1,38 @@
+package com.example.brzodolokacije.Adapters
+
+import android.app.Activity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.example.brzodolokacije.Models.Message
+import com.example.brzodolokacije.databinding.ChatMessageBinding
+
+class ChatMessagesAdapter (val items : MutableList<Message>, val activity:Activity)
+    : RecyclerView.Adapter<ChatMessagesAdapter.ViewHolder>(){
+    //constructer has one argument - list of objects that need to be displayed
+    //it is bound to xml of single item
+    private lateinit var binding: ChatMessageBinding
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        binding= ChatMessageBinding.inflate(inflater,parent,false)
+        return ViewHolder(binding)
+    }
+    override fun onBindViewHolder(holder: ViewHolder, position: Int){
+        //sets components of particular item
+        holder.bind(items[position])
+//        holder.itemView.setOnClickListener {
+//            val intent: Intent = Intent(activity, ChatActivityConversation::class.java)
+//            intent.putExtra("userId",items[position].userId)
+//            activity.startActivity(intent)
+//        }
+    }
+    override fun getItemCount() = items.size
+    inner class ViewHolder(itemView : ChatMessageBinding) : RecyclerView.ViewHolder(itemView.root){
+        fun bind(item : Message){
+            binding.apply {
+                //clMessage.foregroundGravity=Gravity.END
+                tvMessage.text=item.messagge
+            }
+        }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..b63cb2f
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatPreviewsAdapter.kt
@@ -0,0 +1,39 @@
+package com.example.brzodolokacije.Adapters
+
+import android.app.Activity
+import android.content.Intent
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.example.brzodolokacije.Activities.ChatActivityConversation
+import com.example.brzodolokacije.Models.ChatPreview
+import com.example.brzodolokacije.databinding.ChatPreviewBinding
+
+class ChatPreviewsAdapter (val items : MutableList<ChatPreview>,val activity:Activity)
+    : RecyclerView.Adapter<ChatPreviewsAdapter.ViewHolder>(){
+    //constructer has one argument - list of objects that need to be displayed
+    //it is bound to xml of single item
+    private lateinit var binding: ChatPreviewBinding
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        binding=ChatPreviewBinding.inflate(inflater,parent,false)
+        return ViewHolder(binding)
+    }
+    override fun onBindViewHolder(holder: ViewHolder, position: Int){
+        //sets components of particular item
+        holder.bind(items[position])
+        holder.itemView.setOnClickListener {
+            val intent: Intent = Intent(activity, ChatActivityConversation::class.java)
+            intent.putExtra("userId",items[position].userId)
+            activity.startActivity(intent)
+        }
+    }
+    override fun getItemCount() = items.size
+    inner class ViewHolder(itemView : ChatPreviewBinding) : RecyclerView.ViewHolder(itemView.root){
+        fun bind(item : ChatPreview){
+            binding.apply {
+                tvUsername.text=item.userId
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Chat.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Chat.kt
index 4b87d51..3404541 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Chat.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Chat.kt
@@ -19,4 +19,9 @@ data class Message(
     var receiverId: String,
     var messagge: String,
     var timestamp: Date
+)
+
+data class ChatPreview(
+    var userId:String,
+    var read:Boolean
 )
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
index d4ee046..d3a95b4 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
@@ -1,4 +1,5 @@
-package com.example.brzodolokacije.chat
+package com.exam
+
 
 import android.app.Activity
 import android.content.Context
@@ -6,7 +7,9 @@ import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
 import android.util.Log
+import com.example.brzodolokacije.Models.ChatPreview
 import com.example.brzodolokacije.Models.Message
+import java.util.*
 
 
 class DBHelper :
@@ -36,7 +39,7 @@ class DBHelper :
 
     override fun onCreate(db: SQLiteDatabase?) {
         if(!doesTableExist(CONTACTS_TABLE_NAME,db)){
-            var sql:String="CREATE TABLE "+ CONTACTS_TABLE_NAME+"(" +
+            var sql:String="CREATE TABLE "+ CONTACTS_TABLE_NAME+" (" +
                     "userId " +"TEXT PRIMARY KEY,"+
                     "read " +"INT"+
                     ")"
@@ -74,7 +77,7 @@ class DBHelper :
         onCreate(db)
     }
 
-    fun addMessage(message: Message){
+    fun addMessage(message: Message, sent:Boolean=true){
         if(message._id.isNullOrEmpty()){
             message._id=message.senderId+message.timestamp
         }
@@ -84,10 +87,61 @@ class DBHelper :
                         message.messagge+ "','"+
                         message.timestamp+ "')"
         db?.execSQL(sql)
+        if(sent)
+            sql="SELECT * FROM "+ CONTACTS_TABLE_NAME+" WHERE userId='"+message.receiverId+"'"
+        else
+            sql="SELECT * FROM "+ CONTACTS_TABLE_NAME+" WHERE userId='"+message.senderId+"'"
+        var cursor=db?.rawQuery(sql,null)
+        if(cursor?.count==0){
+            //dodati u kontakte
+            var id:String
+            id = if(sent) message.receiverId else message.senderId
+            var read:Int=if(sent) 1 else 0
+            sql="INSERT INTO "+ CONTACTS_TABLE_NAME+"(userId,read) VALUES('"+id+"','"+
+                    read+"')"
+            db?.execSQL(sql)
+        }
     }
-    fun getMessages(){
-        var sql="SELECT * FROM "+ MESSAGES_TABLE_NAME
+    fun getMessages(userId:String): MutableList<Message>? {
+        var sql="SELECT * FROM "+ MESSAGES_TABLE_NAME+" WHERE senderId='"+userId+"' OR receiverId='"+userId+"'"
         var cursor=db?.rawQuery(sql,null)
-        Log.d("main",cursor?.count.toString())
+        if(cursor?.count!! >0){
+            var messagesList:MutableList<Message> =mutableListOf()
+            var idIndex=cursor.getColumnIndexOrThrow("_id")
+            var senderIdIndex=cursor.getColumnIndexOrThrow("senderId")
+            var receiverIdIndex=cursor.getColumnIndexOrThrow("receiverId")
+            var messageIndex=cursor.getColumnIndexOrThrow("messagge")
+            var timestampIndex=cursor.getColumnIndexOrThrow("timestamp")
+            while(cursor.moveToNext()){
+                messagesList.add(
+                    Message(
+                        cursor.getString(idIndex),
+                        cursor.getString(senderIdIndex),
+                        cursor.getString(receiverIdIndex),
+                        cursor.getString(messageIndex),
+                        Date()
+                        )
+                    )
+            }
+            Log.d("main",messagesList.size.toString())
+            return messagesList
+        }
+        return null
+    }
+
+    fun getContacts(): MutableList<ChatPreview>? {
+        var sql="SELECT * FROM "+ CONTACTS_TABLE_NAME
+        var cursor=db?.rawQuery(sql,null)
+        if(cursor?.count!! >0){
+            var contactList:MutableList<ChatPreview> =mutableListOf()
+            var userIdIndex=cursor.getColumnIndexOrThrow("userId")
+            var readIndex=cursor.getColumnIndexOrThrow("read")
+            while(cursor.moveToNext()){
+                contactList.add(ChatPreview(cursor.getString(userIdIndex),cursor.getInt(readIndex)==1))
+            }
+            Log.d("main",contactList.size.toString())
+            return contactList
+        }
+        return null
     }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
index 1aa6afa..07a9d3e 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
@@ -2,6 +2,8 @@ package com.example.brzodolokacije.chat
 
 import android.app.Activity
 import android.util.Log
+import com.exam.DBHelper
+import com.example.brzodolokacije.Models.Message
 import com.example.brzodolokacije.Models.MessageReceive
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
@@ -13,13 +15,17 @@ import com.microsoft.signalr.HubConnectionState
 
 class SignalRListener private constructor(val activity: Activity){
     private var hubConnection:HubConnection
+    private var dbHelper:DBHelper
     init{
+        dbHelper= DBHelper.getInstance(activity)
         hubConnection=HubConnectionBuilder.create(RetrofitHelper.baseUrl+"/chathub")
             .withHeader("access_token",SharedPreferencesHelper.getValue("jwt",activity))
             .build()
         hubConnection.keepAliveInterval=120
         hubConnection.on("Message",
-            Action1 {message:MessageReceive->Log.d("main",message.messagge)},
+            Action1 {
+                    message:MessageReceive->dbHelper.addMessage(Message(message.senderId+message.timestamp,message.senderId,message.senderId,message.messagge,message.timestamp),false)
+                    },
             MessageReceive::class.java
                 )
         hubConnection.start().blockingAwait()
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
index 694e972..9e28d6d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
@@ -32,7 +32,7 @@
 
 
     </ImageButton>
-<!--    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:id="@+id/swipeContainer"
@@ -46,6 +46,6 @@
             app:layout_constraintTop_toTopOf="parent" >
 
         </androidx.recyclerview.widget.RecyclerView>
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>-->
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 ea7d3e7..5afcd86 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
@@ -5,26 +5,30 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Activities.ChatActivityConversation">
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/topBanner"
         android:layout_width="match_parent"
-        android:clickable="true"
         android:layout_height="50dp"
+        android:elevation="5dp"
         android:background="@color/dark_blue_transparent"
+        android:clickable="true"
         app:layout_constraintStart_toStartOf="parent">
+
         <TextView
+            android:id="@+id/tvFragmentTitle"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:textSize="40dp"
-            android:id="@+id/tvFragmentTitle"
             android:text="Chat"
-            android:textColor="@color/white"/>
+            android:textColor="@color/white"
+            android:textSize="40dp" />
+
         <androidx.cardview.widget.CardView
             android:id="@+id/cvParentUsername"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:layout_marginTop="10dp"
             android:layout_marginStart="16dp"
+            android:layout_marginTop="10dp"
             android:layout_marginEnd="16dp"
             android:elevation="0dp"
             app:cardCornerRadius="20dp"
@@ -39,25 +43,42 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/rounded_white_button_login"
                 android:hint="  kome slati poruku?"
-                android:paddingLeft="15dp"
-                android:inputType="textPersonName" />
+                android:inputType="textPersonName"
+                android:paddingLeft="15dp" />
 
 
         </androidx.cardview.widget.CardView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/messagesContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/cvParentMessageEdit"
+        app:layout_constrainedHeight="true">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvMain"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+        </androidx.recyclerview.widget.RecyclerView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <androidx.cardview.widget.CardView
         android:id="@+id/cvParentMessageEdit"
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_marginTop="10dp"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="10dp"
         android:layout_marginEnd="16dp"
         android:elevation="0dp"
         app:cardCornerRadius="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintStart_toStartOf="parent">
 
 
         <com.google.android.material.textfield.TextInputEditText
@@ -66,8 +87,8 @@
             android:layout_height="match_parent"
             android:background="@drawable/rounded_white_button_login"
             android:hint="  poruka"
-            android:paddingLeft="15dp"
-            android:inputType="textPersonName" />
+            android:inputType="textPersonName"
+            android:paddingLeft="15dp" />
 
         <ImageButton
             android:id="@+id/btnSendMessage"
@@ -75,8 +96,8 @@
             android:layout_height="50dp"
             android:layout_gravity="right"
             android:scaleType="centerCrop"
-            app:cornerRadius="16dp"
-            android:src="@drawable/post_comment" />
+            android:src="@drawable/post_comment"
+            app:cornerRadius="16dp" />
 
     </androidx.cardview.widget.CardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
new file mode 100644
index 0000000..2210fa0
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rounded_cyan_button"
+    android:id="@+id/clMessage">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"
+        android:id="@+id/tvMessage"
+        android:text="blabla"
+        android:padding="@dimen/component_padding"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 9ae6cce32844d3262003cd68bdd10918bcad5601 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Tue, 22 Nov 2022 00:59:11 +0100
Subject: Sredjena aktivnost liste cetova, prikazuje se korisnicko ime islika
 svakog kontakta, omogucen refresh, prosledjuje se korisnicko ime i id
 korisnika pojedinacnom cetu na klik #37

---
 .../brzodolokacije/Activities/ChatActivity.kt      | 21 ++++++++++-
 .../Activities/ChatActivityConversation.kt         |  5 +--
 .../brzodolokacije/Adapters/ChatPreviewsAdapter.kt | 42 +++++++++++++++++++++-
 .../brzodolokacije/Interfaces/IBackendApi.kt       |  2 ++
 .../app/src/main/res/layout/chat_preview.xml       |  3 +-
 5 files changed, 68 insertions(+), 5 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
index 992f09f..c824cf3 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
@@ -6,6 +6,7 @@ import android.widget.ImageButton
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.exam.DBHelper
 import com.example.brzodolokacije.Adapters.ChatPreviewsAdapter
 import com.example.brzodolokacije.Models.ChatPreview
@@ -13,7 +14,7 @@ import com.example.brzodolokacije.R
 import com.example.brzodolokacije.chat.SignalRListener
 import com.example.brzodolokacije.databinding.ActivityChatBinding
 
-class ChatActivity : AppCompatActivity() {
+class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener {
 
     private var dbConnection:DBHelper?=null
     lateinit var binding: ActivityChatBinding
@@ -22,6 +23,7 @@ class ChatActivity : AppCompatActivity() {
     var adapterVar:ChatPreviewsAdapter?=null
     var layoutVar:LinearLayoutManager?=null
     var items:MutableList<ChatPreview>?= mutableListOf()
+    private var swipeRefreshLayout: SwipeRefreshLayout?=null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -32,6 +34,18 @@ class ChatActivity : AppCompatActivity() {
         setListeners()
         setRecyclerView()
         requestForChats()
+        swipeRefreshLayout = binding.swipeContainer
+        swipeRefreshLayout?.setOnRefreshListener(this@ChatActivity)
+        swipeRefreshLayout?.setColorSchemeResources(
+            R.color.purple_200,
+            R.color.teal_200,
+            R.color.dark_blue_transparent,
+            R.color.purple_700
+        )
+        swipeRefreshLayout?.post(kotlinx.coroutines.Runnable {
+            swipeRefreshLayout?.isRefreshing=true
+            requestForChats()
+        })
 
     }
     fun setListeners(){
@@ -58,5 +72,10 @@ class ChatActivity : AppCompatActivity() {
         recyclerView?.setHasFixedSize(true)
         recyclerView?.layoutManager=layoutVar
         recyclerView?.adapter=adapterVar
+        swipeRefreshLayout?.isRefreshing=false
+    }
+
+    override fun onRefresh() {
+        requestForChats()
     }
 }
\ No newline at end of file
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 d523485..84771a8 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
@@ -29,7 +29,7 @@ class ChatActivityConversation : AppCompatActivity() {
     var layoutVar: RecyclerView.LayoutManager?=null
     lateinit var binding:ActivityChatConversationBinding
     var userId:String?=null
-    var receiverUsername:String?="jelena"
+    var receiverUsername:String?=null
     var dbConnection: DBHelper?=null
     var webSocketConnection:SignalRListener?=null
     var items:MutableList<Message>?=mutableListOf()
@@ -39,6 +39,7 @@ class ChatActivityConversation : AppCompatActivity() {
         binding= ActivityChatConversationBinding.inflate(layoutInflater)
         setContentView(binding.root)
         userId=intent.extras?.get("userId").toString()
+        receiverUsername=intent.extras?.get("username").toString()
         dbConnection=DBHelper.getInstance(this@ChatActivityConversation)
         setHeader()
         setRecyclerView()
@@ -136,7 +137,7 @@ class ChatActivityConversation : AppCompatActivity() {
             binding.tvFragmentTitle.forceLayout()
         }
         else{
-            binding.tvFragmentTitle.text=userId
+            binding.tvFragmentTitle.text=receiverUsername
             binding.tvFragmentTitle.invalidate()
             binding.cvParentUsername.visibility= View.GONE
             binding.cvParentUsername.forceLayout()
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 b63cb2f..94a72f3 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
@@ -4,19 +4,32 @@ import android.app.Activity
 import android.content.Intent
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
 import com.example.brzodolokacije.Activities.ChatActivityConversation
+import com.example.brzodolokacije.Interfaces.IBackendApi
 import com.example.brzodolokacije.Models.ChatPreview
+import com.example.brzodolokacije.Models.UserReceive
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import com.example.brzodolokacije.databinding.ChatPreviewBinding
+import kotlinx.android.synthetic.main.chat_preview.view.*
+import retrofit2.Call
+import retrofit2.Response
 
 class ChatPreviewsAdapter (val items : MutableList<ChatPreview>,val activity:Activity)
     : RecyclerView.Adapter<ChatPreviewsAdapter.ViewHolder>(){
     //constructer has one argument - list of objects that need to be displayed
     //it is bound to xml of single item
+    private var api: IBackendApi?=null
+    private var token:String?=null
     private lateinit var binding: ChatPreviewBinding
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
         binding=ChatPreviewBinding.inflate(inflater,parent,false)
+        api=RetrofitHelper.getInstance()
+        token=SharedPreferencesHelper.getValue("jwt",activity)
         return ViewHolder(binding)
     }
     override fun onBindViewHolder(holder: ViewHolder, position: Int){
@@ -25,6 +38,7 @@ class ChatPreviewsAdapter (val items : MutableList<ChatPreview>,val activity:Act
         holder.itemView.setOnClickListener {
             val intent: Intent = Intent(activity, ChatActivityConversation::class.java)
             intent.putExtra("userId",items[position].userId)
+            intent.putExtra("username",holder.itemView.tvUsername.text)
             activity.startActivity(intent)
         }
     }
@@ -32,7 +46,33 @@ class ChatPreviewsAdapter (val items : MutableList<ChatPreview>,val activity:Act
     inner class ViewHolder(itemView : ChatPreviewBinding) : RecyclerView.ViewHolder(itemView.root){
         fun bind(item : ChatPreview){
             binding.apply {
-                tvUsername.text=item.userId
+                val request2=api?.getProfileFromId("Bearer "+token,
+                    item.userId
+                )
+                request2?.enqueue(object : retrofit2.Callback<UserReceive?> {
+                    override fun onResponse(call: Call<UserReceive?>, response: Response<UserReceive?>) {
+                        if(response.isSuccessful()){
+                            //zahtev da se posalje poruka
+                            var user=response.body()!!
+                            tvUsername.text=user.username
+                            if(user.pfp!=null) {
+                                Glide.with(activity)
+                                    .load(RetrofitHelper.baseUrl + "/api/post/image/" + user.pfp!!._id)
+                                    .into(ivUserImage)
+                            }
+                        }
+                        else{
+                            Toast.makeText(activity,"los id",
+                                Toast.LENGTH_LONG).show()
+                            tvUsername.text="nije nadjen korisnik"
+                        }
+                    }
+
+                    override fun onFailure(call: Call<UserReceive?>, t: Throwable) {
+                        Toast.makeText(activity,"neuspesan zahtev",
+                            Toast.LENGTH_LONG).show()
+                    }
+                })
             }
         }
     }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
index f7bb9b6..8fb7b4d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
@@ -78,5 +78,7 @@ interface IBackendApi {
 
     @POST("/api/user{id}/addFollower")
     fun addFollower(@Header("Authorization") authHeader:String,@Path("id") id:String):Call<UserReceive>
+    @GET("/api/user/{id}/id/profile")
+    fun getProfileFromId(@Header("Authorization") authHeader:String,@Path("id") username:String):Call<UserReceive>
 
 }
\ No newline at end of file
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 95c036a..35431ff 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_preview.xml
@@ -6,7 +6,8 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:id="@+id/ivUserImage"/>
+        android:id="@+id/ivUserImage"
+        android:src="@drawable/ic_nav_profile"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-- 
cgit v1.2.3


From 0a96c7acb76791f02dc47250b43b6600bf3adb0e Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Tue, 22 Nov 2022 01:32:02 +0100
Subject: resen problem duplog id-ja kada se poruka posalje samom sebi #37

---
 .../app/src/main/AndroidManifest.xml               |  3 +-
 .../Activities/ChatActivityConversation.kt         |  4 +-
 .../com/example/brzodolokacije/chat/DBHelper.kt    | 46 ++++++++++++----------
 3 files changed, 28 insertions(+), 25 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index 745f813..bb2d712 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -38,7 +38,8 @@
         tools:targetApi="31">
         <activity
             android:name=".Activities.ChatActivityConversation"
-            android:exported="false">
+            android:exported="false"
+            android:windowSoftInputMode="stateVisible|adjustPan">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
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 84771a8..ab91940 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
@@ -112,9 +112,7 @@ class ChatActivityConversation : AppCompatActivity() {
                             //zahtev da se posalje poruka
                             var responseMessage=response.body()
                             dbConnection?.addMessage(responseMessage!!)
-                            requestMessages()
-
-
+                            //requestMessages()
                         }
                         else{
                             Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime.",Toast.LENGTH_LONG).show()
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
index d3a95b4..be88ad3 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
@@ -78,28 +78,32 @@ class DBHelper :
     }
 
     fun addMessage(message: Message, sent:Boolean=true){
-        if(message._id.isNullOrEmpty()){
-            message._id=message.senderId+message.timestamp
-        }
-        var sql="INSERT INTO "+ MESSAGES_TABLE_NAME+"(_id,senderId,receiverid,messagge,timestamp) VALUES('"+message._id+"','"+
-                        message.senderId+"','"+
-                        message.receiverId+"','"+
-                        message.messagge+ "','"+
-                        message.timestamp+ "')"
-        db?.execSQL(sql)
-        if(sent)
-            sql="SELECT * FROM "+ CONTACTS_TABLE_NAME+" WHERE userId='"+message.receiverId+"'"
-        else
-            sql="SELECT * FROM "+ CONTACTS_TABLE_NAME+" WHERE userId='"+message.senderId+"'"
-        var cursor=db?.rawQuery(sql,null)
-        if(cursor?.count==0){
-            //dodati u kontakte
-            var id:String
-            id = if(sent) message.receiverId else message.senderId
-            var read:Int=if(sent) 1 else 0
-            sql="INSERT INTO "+ CONTACTS_TABLE_NAME+"(userId,read) VALUES('"+id+"','"+
-                    read+"')"
+        if(!message._id.isNullOrEmpty() && message.senderId==message.receiverId){
+            Log.d("main", "ne zapisuje se dupla poruka")
+        } else {
+            if(message._id.isNullOrEmpty()){
+                message._id=message.senderId+message.timestamp
+            }
+            var sql="INSERT INTO "+ MESSAGES_TABLE_NAME+"(_id,senderId,receiverid,messagge,timestamp) VALUES('"+message._id+"','"+
+                    message.senderId+"','"+
+                    message.receiverId+"','"+
+                    message.messagge+ "','"+
+                    message.timestamp+ "')"
             db?.execSQL(sql)
+            if(sent)
+                sql="SELECT * FROM "+ CONTACTS_TABLE_NAME+" WHERE userId='"+message.receiverId+"'"
+            else
+                sql="SELECT * FROM "+ CONTACTS_TABLE_NAME+" WHERE userId='"+message.senderId+"'"
+            var cursor=db?.rawQuery(sql,null)
+            if(cursor?.count==0){
+                //dodati u kontakte
+                var id:String
+                id = if(sent) message.receiverId else message.senderId
+                var read:Int=if(sent) 1 else 0
+                sql="INSERT INTO "+ CONTACTS_TABLE_NAME+"(userId,read) VALUES('"+id+"','"+
+                        read+"')"
+                db?.execSQL(sql)
+            }
         }
     }
     fun getMessages(userId:String): MutableList<Message>? {
-- 
cgit v1.2.3


From e3b16511aba89dd4905c3150e0bcaecd46664215 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Tue, 22 Nov 2022 03:13:17 +0100
Subject: poslate poruke se odmah vide u cetu, razlikuju se primljene od
 poslatih poruka  #37

---
 .../Activities/ChatActivityConversation.kt         | 18 ++++--
 .../brzodolokacije/Adapters/ChatMessagesAdapter.kt | 67 +++++++++++++++++-----
 .../main/res/layout/activity_chat_conversation.xml |  3 +-
 .../app/src/main/res/layout/chat_message.xml       | 23 +++++---
 .../app/src/main/res/layout/chat_message_other.xml | 23 ++++++++
 5 files changed, 107 insertions(+), 27 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml

(limited to 'Client')

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 ab91940..98e3208 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
@@ -65,6 +65,7 @@ class ChatActivityConversation : AppCompatActivity() {
                         if(response.isSuccessful()){
                             //zahtev da se posalje poruka
                             userId=response.body()?._id
+                            setHeader()
                             var message= MessageSend(userId!!,messageContent)
                             val request2=Api.sendMessage("Bearer "+token,
                                 message
@@ -75,8 +76,8 @@ class ChatActivityConversation : AppCompatActivity() {
                                         //zahtev da se posalje poruka
                                         var responseMessage=response.body()
                                         dbConnection?.addMessage(responseMessage!!)
-
-
+                                        requestMessages()
+                                        binding.etNewMessage.text?.clear()
 
                                     }
                                     else{
@@ -112,7 +113,8 @@ class ChatActivityConversation : AppCompatActivity() {
                             //zahtev da se posalje poruka
                             var responseMessage=response.body()
                             dbConnection?.addMessage(responseMessage!!)
-                            //requestMessages()
+                            requestMessages()
+                            binding.etNewMessage.text?.clear()
                         }
                         else{
                             Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime.",Toast.LENGTH_LONG).show()
@@ -130,11 +132,16 @@ class ChatActivityConversation : AppCompatActivity() {
 
     private fun setHeader(){
         if(userId.isNullOrEmpty() || userId.equals("null")){
+            binding.cvParentUsername.visibility= View.VISIBLE
+            binding.cvParentUsername.forceLayout()
             binding.tvFragmentTitle.visibility= View.GONE
             binding.tvFragmentTitle.invalidate()
             binding.tvFragmentTitle.forceLayout()
         }
         else{
+            binding.tvFragmentTitle.visibility= View.VISIBLE
+            binding.tvFragmentTitle.invalidate()
+            binding.tvFragmentTitle.forceLayout()
             binding.tvFragmentTitle.text=receiverUsername
             binding.tvFragmentTitle.invalidate()
             binding.cvParentUsername.visibility= View.GONE
@@ -150,11 +157,14 @@ class ChatActivityConversation : AppCompatActivity() {
         recyclerView?.setHasFixedSize(true)
         recyclerView?.layoutManager=layoutVar
         recyclerView?.adapter=adapterVar
+        recyclerView?.scrollToPosition(items?.size?.minus(1) ?: 0)
     }
 
     fun requestMessages(){
-        items=dbConnection?.getMessages(userId!!)
+        if(!userId.isNullOrEmpty() && !userId.equals("null"))
+            items=dbConnection?.getMessages(userId!!)
         adapterVar= items?.let { ChatMessagesAdapter(it,this@ChatActivityConversation) }
         setRecyclerView(setParams = false)
+
     }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
index 4c917f3..c3c8a8a 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
@@ -4,35 +4,72 @@ import android.app.Activity
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.auth0.android.jwt.JWT
 import com.example.brzodolokacije.Models.Message
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import com.example.brzodolokacije.databinding.ChatMessageBinding
+import com.example.brzodolokacije.databinding.ChatMessageOtherBinding
 
 class ChatMessagesAdapter (val items : MutableList<Message>, val activity:Activity)
-    : RecyclerView.Adapter<ChatMessagesAdapter.ViewHolder>(){
+    : RecyclerView.Adapter<RecyclerView.ViewHolder>(){
     //constructer has one argument - list of objects that need to be displayed
     //it is bound to xml of single item
-    private lateinit var binding: ChatMessageBinding
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+    private val VIEW_TYPE_MESSAGE_SENT: Int = 1
+    private val VIEW_TYPE_MESSAGE_RECEIVED:Int = 2
+    private var binding: ChatMessageBinding?=null
+    private var bindingOther: ChatMessageOtherBinding?=null
+
+    private var currentUser:String?=null
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        binding= ChatMessageBinding.inflate(inflater,parent,false)
-        return ViewHolder(binding)
+        var token=SharedPreferencesHelper.getValue("jwt",activity)
+        var jwt= JWT(token.toString())
+        currentUser= jwt.getClaim("id").toString()
+
+        if(viewType==VIEW_TYPE_MESSAGE_RECEIVED){
+            bindingOther= ChatMessageOtherBinding.inflate(inflater,parent,false)
+            return ReceivedViewHolder(bindingOther!!)
+        }
+        else{
+            binding= ChatMessageBinding.inflate(inflater,parent,false)
+            return SentViewHolder(binding!!)
+        }
+
     }
-    override fun onBindViewHolder(holder: ViewHolder, position: Int){
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int){
         //sets components of particular item
-        holder.bind(items[position])
-//        holder.itemView.setOnClickListener {
-//            val intent: Intent = Intent(activity, ChatActivityConversation::class.java)
-//            intent.putExtra("userId",items[position].userId)
-//            activity.startActivity(intent)
-//        }
+        if(holder is ReceivedViewHolder){
+            holder.bind(items[position])
+        }
+        else if(holder is SentViewHolder){
+            holder.bind(items[position])
+        }
     }
     override fun getItemCount() = items.size
-    inner class ViewHolder(itemView : ChatMessageBinding) : RecyclerView.ViewHolder(itemView.root){
+    inner class ReceivedViewHolder(itemView : ChatMessageOtherBinding) : RecyclerView.ViewHolder(itemView.root){
         fun bind(item : Message){
-            binding.apply {
-                //clMessage.foregroundGravity=Gravity.END
+            bindingOther?.apply {
+                tvMessage?.text=item.messagge
+            }
+        }
+    }
+    inner class SentViewHolder(itemView : ChatMessageBinding) : RecyclerView.ViewHolder(itemView.root){
+        fun bind(item : Message){
+            binding?.apply {
                 tvMessage.text=item.messagge
             }
         }
     }
+
+
+    override fun getItemViewType(position: Int): Int {
+        var sender=items.get(position).senderId
+        if(sender==currentUser){
+            return VIEW_TYPE_MESSAGE_SENT
+        }
+        else{
+            return VIEW_TYPE_MESSAGE_RECEIVED
+        }
+    }
 }
\ No newline at end of file
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 5afcd86..72060f7 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
@@ -62,7 +62,8 @@
             android:id="@+id/rvMain"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintBottom_toBottomOf="parent"
+            >
 
         </androidx.recyclerview.widget.RecyclerView>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
index 2210fa0..2342779 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
@@ -2,16 +2,25 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/rounded_cyan_button"
-    android:id="@+id/clMessage">
-
-    <TextView
+    android:clipToOutline="true"
+    android:id="@+id/clMessage"
+    android:layout_margin="@dimen/text_padding"
+    android:layout_gravity="end">
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        android:id="@+id/tvMessage"
-        android:text="blabla"
-        android:padding="@dimen/component_padding"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:cardBackgroundColor="@color/cardview_dark_background">
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:id="@+id/tvMessage"
+            android:text="blabla"
+            android:padding="@dimen/component_padding"/>
+    </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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
new file mode 100644
index 0000000..647127c
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/rounded_cyan_button"
+    android:id="@+id/clMessage"
+    android:layout_margin="@dimen/text_padding"
+    android:clipToOutline="true">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:cardBackgroundColor="@color/dark_blue_transparent">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"
+        android:id="@+id/tvMessage"
+        android:text="blabla"
+        android:padding="@dimen/component_padding"/>
+    </androidx.cardview.widget.CardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From f290638ea36f9fb23de3745b2508aefdcad6cf31 Mon Sep 17 00:00:00 2001
From: Jelena Petrovic <jelenapetrovic.7119@gmail.com>
Date: Tue, 22 Nov 2022 04:41:58 +0100
Subject: omoguceno slanje poruka sebi, traze se nove poruke od kontrolera na
 ucitavanju i refresh-u, ispravljen izgled poruka- sada se vidi ko je slao po
 boji #37

---
 .../brzodolokacije/Activities/ChatActivity.kt      | 48 ++++++++++++++++++++--
 .../Activities/ChatActivityConversation.kt         |  9 +++-
 .../brzodolokacije/Adapters/ChatMessagesAdapter.kt |  8 ++--
 .../brzodolokacije/Interfaces/IBackendApi.kt       |  2 +
 .../com/example/brzodolokacije/chat/DBHelper.kt    |  8 +++-
 .../example/brzodolokacije/chat/SignalRListener.kt |  4 +-
 6 files changed, 68 insertions(+), 11 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
index c824cf3..e99142a 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
@@ -3,16 +3,24 @@ package com.example.brzodolokacije.Activities
 import android.content.Intent
 import android.os.Bundle
 import android.widget.ImageButton
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.auth0.android.jwt.JWT
 import com.exam.DBHelper
 import com.example.brzodolokacije.Adapters.ChatPreviewsAdapter
 import com.example.brzodolokacije.Models.ChatPreview
+import com.example.brzodolokacije.Models.Message
+import com.example.brzodolokacije.Models.MessageReceive
 import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import com.example.brzodolokacije.chat.SignalRListener
 import com.example.brzodolokacije.databinding.ActivityChatBinding
+import retrofit2.Call
+import retrofit2.Response
 
 class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener {
 
@@ -33,7 +41,7 @@ class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener {
         ws=SignalRListener.getInstance(this@ChatActivity)
         setListeners()
         setRecyclerView()
-        requestForChats()
+        requestNewMessages()
         swipeRefreshLayout = binding.swipeContainer
         swipeRefreshLayout?.setOnRefreshListener(this@ChatActivity)
         swipeRefreshLayout?.setColorSchemeResources(
@@ -44,7 +52,7 @@ class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener {
         )
         swipeRefreshLayout?.post(kotlinx.coroutines.Runnable {
             swipeRefreshLayout?.isRefreshing=true
-            requestForChats()
+            requestNewMessages()
         })
 
     }
@@ -63,6 +71,40 @@ class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener {
         setRecyclerView(setParams = false)
     }
 
+    fun requestNewMessages(){
+        val api=RetrofitHelper.getInstance()
+        val token=SharedPreferencesHelper.getValue("jwt",this@ChatActivity)
+        val request2=api?.getNewMessages("Bearer "+token)
+        request2?.enqueue(object : retrofit2.Callback<MutableList<MessageReceive>?> {
+            override fun onResponse(call: Call<MutableList<MessageReceive>?>, response: Response<MutableList<MessageReceive>?>) {
+                if(response.isSuccessful()){
+                    var messages=response.body()
+                    if(!messages.isNullOrEmpty()){
+                        var dbHelper= DBHelper.getInstance(this@ChatActivity)
+                        for( message in messages){
+                            dbHelper.addMessage(
+                                Message(message.senderId+message.timestamp,message.senderId,
+                                JWT(SharedPreferencesHelper.getValue("jwt",this@ChatActivity)!!).claims["id"]?.asString()!!,message.messagge,message.timestamp),false)
+                        }
+                    }
+                    requestForChats()
+                }
+                else{
+                    Toast.makeText(this@ChatActivity,"los id",
+                        Toast.LENGTH_LONG).show()
+                    requestForChats()
+                }
+            }
+
+            override fun onFailure(call: Call<MutableList<MessageReceive>?>, t: Throwable) {
+                Toast.makeText(this@ChatActivity,"neuspesan zahtev",
+                    Toast.LENGTH_LONG).show()
+                requestForChats()
+            }
+        })
+
+    }
+
     fun setRecyclerView(setParams:Boolean=true){
         if(setParams){
             adapterVar= items?.let { ChatPreviewsAdapter(it,this@ChatActivity) }
@@ -76,6 +118,6 @@ class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener {
     }
 
     override fun onRefresh() {
-        requestForChats()
+        requestNewMessages()
     }
 }
\ No newline at end of file
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 98e3208..4bd72bc 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
@@ -9,6 +9,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.auth0.android.jwt.JWT
 import com.exam.DBHelper
 import com.example.brzodolokacije.Adapters.ChatMessagesAdapter
 import com.example.brzodolokacije.Models.Message
@@ -161,8 +162,12 @@ class ChatActivityConversation : AppCompatActivity() {
     }
 
     fun requestMessages(){
-        if(!userId.isNullOrEmpty() && !userId.equals("null"))
-            items=dbConnection?.getMessages(userId!!)
+        if(!userId.isNullOrEmpty() && !userId.equals("null")){
+            if(userId!= JWT(SharedPreferencesHelper.getValue("jwt",this@ChatActivityConversation)!!).claims["id"]?.asString())
+                items=dbConnection?.getMessages(userId!!)
+            else
+                items=dbConnection?.getMessages(userId!!,self = true)
+        }
         adapterVar= items?.let { ChatMessagesAdapter(it,this@ChatActivityConversation) }
         setRecyclerView(setParams = false)
 
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
index c3c8a8a..45ffbf0 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ChatMessagesAdapter.kt
@@ -23,9 +23,7 @@ class ChatMessagesAdapter (val items : MutableList<Message>, val activity:Activi
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        var token=SharedPreferencesHelper.getValue("jwt",activity)
-        var jwt= JWT(token.toString())
-        currentUser= jwt.getClaim("id").toString()
+
 
         if(viewType==VIEW_TYPE_MESSAGE_RECEIVED){
             bindingOther= ChatMessageOtherBinding.inflate(inflater,parent,false)
@@ -65,6 +63,10 @@ class ChatMessagesAdapter (val items : MutableList<Message>, val activity:Activi
 
     override fun getItemViewType(position: Int): Int {
         var sender=items.get(position).senderId
+        var token= SharedPreferencesHelper.getValue("jwt",activity)
+        var jwt= JWT(token.toString())
+        var claim=jwt.getClaim("id")
+        currentUser= claim.asString()!!
         if(sender==currentUser){
             return VIEW_TYPE_MESSAGE_SENT
         }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
index 8fb7b4d..cb51627 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt
@@ -65,6 +65,8 @@ interface IBackendApi {
                         ):PagedPosts
     @POST("/api/message/add")
     fun sendMessage(@Header("Authorization") authHeader:String,@Body message:MessageSend):Call<Message>
+    @GET("/api/message/myMessages")
+    fun getNewMessages(@Header("Authorization") authHeader:String):Call<MutableList<MessageReceive>?>
     @GET("/api/user/history")
     fun getMyHistory(@Header("Authorization") authHeader:String):Call<MutableList<PostPreview>>
 //@POST("putanja")
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
index be88ad3..479b9cb 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt
@@ -106,8 +106,12 @@ class DBHelper :
             }
         }
     }
-    fun getMessages(userId:String): MutableList<Message>? {
-        var sql="SELECT * FROM "+ MESSAGES_TABLE_NAME+" WHERE senderId='"+userId+"' OR receiverId='"+userId+"'"
+    fun getMessages(userId:String, self:Boolean=false): MutableList<Message>? {
+        var sql:String
+        if(!self)
+            sql="SELECT * FROM "+ MESSAGES_TABLE_NAME+" WHERE senderId='"+userId+"' OR receiverId='"+userId+"'"
+        else
+            sql="SELECT * FROM "+ MESSAGES_TABLE_NAME+" WHERE senderId='"+userId+"' AND receiverId='"+userId+"'"
         var cursor=db?.rawQuery(sql,null)
         if(cursor?.count!! >0){
             var messagesList:MutableList<Message> =mutableListOf()
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
index 07a9d3e..d091c5d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt
@@ -2,6 +2,7 @@ package com.example.brzodolokacije.chat
 
 import android.app.Activity
 import android.util.Log
+import com.auth0.android.jwt.JWT
 import com.exam.DBHelper
 import com.example.brzodolokacije.Models.Message
 import com.example.brzodolokacije.Models.MessageReceive
@@ -24,7 +25,8 @@ class SignalRListener private constructor(val activity: Activity){
         hubConnection.keepAliveInterval=120
         hubConnection.on("Message",
             Action1 {
-                    message:MessageReceive->dbHelper.addMessage(Message(message.senderId+message.timestamp,message.senderId,message.senderId,message.messagge,message.timestamp),false)
+                    message:MessageReceive->dbHelper.addMessage(Message(message.senderId+message.timestamp,message.senderId,
+                JWT(SharedPreferencesHelper.getValue("jwt",activity)!!).claims["id"]?.asString()!!,message.messagge,message.timestamp),false)
                     },
             MessageReceive::class.java
                 )
-- 
cgit v1.2.3


From 482485d93dbca6f556085cb43efc9a2cf55a583a Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Tue, 22 Nov 2022 09:01:51 +0100
Subject: Dodat adapter i fragmenti za prikaz pratilaca i pracenja.

---
 .../brzodolokacije/Adapters/FollowersAdapter.kt    | 40 +++++++++-
 .../brzodolokacije/Fragments/FragmentFollowers.kt  | 24 +++---
 .../brzodolokacije/Fragments/FragmentFollowing.kt  | 69 +++++++++++++++++
 .../Fragments/FragmentUserProfile.kt               |  8 +-
 .../app/src/main/res/layout/follower_item.xml      | 87 ++++++++++++++++++++++
 .../app/src/main/res/layout/fragment_following.xml | 27 +++++++
 6 files changed, 243 insertions(+), 12 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/FollowersAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/FollowersAdapter.kt
index 117a2c2..e439d0e 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/FollowersAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/FollowersAdapter.kt
@@ -1,4 +1,42 @@
 package com.example.brzodolokacije.Adapters
 
-class FollowersAdapter {
+import android.app.Activity
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.example.brzodolokacije.Models.PostPreview
+import com.example.brzodolokacije.Models.User
+import com.example.brzodolokacije.Models.UserReceive
+import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.RetrofitHelper
+
+class FollowersAdapter (var followers:MutableList<UserReceive>, val activity: Activity):
+    RecyclerView.Adapter<FollowersAdapter.FollowerViewHolder>() {
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FollowersAdapter.FollowerViewHolder {
+            val view= LayoutInflater.from(parent.context).inflate(R.layout.follower_item,parent,false)
+            return FollowerViewHolder(view)
+        }
+
+        override fun onBindViewHolder(holder: FollowersAdapter.FollowerViewHolder, position: Int) {
+            return holder.bindView(followers[position] )
+        }
+
+        override fun getItemCount(): Int {
+            return followers.size
+        }
+
+
+        inner class FollowerViewHolder(view: View): RecyclerView.ViewHolder(view){
+
+            private val name: TextView =view.findViewById(R.id.tvFollowerItemName)
+            private val username:TextView=view.findViewById(R.id.tvFolloewItemUsername)
+            fun bindView(follower: UserReceive){
+                name.text=follower.name
+                username.text=follower.username
+            }
+        }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
index da480f1..faa5748 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
@@ -6,6 +6,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.example.brzodolokacije.Adapters.FollowersAdapter
+import com.example.brzodolokacije.Adapters.ShowPostsHomePageAdapter
 import com.example.brzodolokacije.Interfaces.IBackendApi
 import com.example.brzodolokacije.Models.PostPreview
 import com.example.brzodolokacije.Models.UserReceive
@@ -21,14 +25,16 @@ import retrofit2.converter.gson.GsonConverterFactory
 class FragmentFollowers : Fragment() {
     private lateinit var userId:String
     private lateinit var followers: MutableList<UserReceive>
+    private lateinit var followersRv:RecyclerView
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         val view= inflater.inflate(R.layout.fragment_followers, container, false)
 
-        val bundle = this.arguments
+        followersRv=view.findViewById(R.id.rvFragmentShowFollowers)
 
+        val bundle = this.arguments
         if (bundle != null) {
             userId= bundle.getString("userId").toString()
             Toast.makeText(
@@ -36,17 +42,15 @@ class FragmentFollowers : Fragment() {
             ).show();
         }
 
-        getPosts()
+        getFollowers()
 
         return view
     }
 
-    fun getPosts(){
+    fun getFollowers(){
         val api = RetrofitHelper.getInstance()
         val data=api.getFollowers(userId)
-
-
-        data.enqueue(object : Callback<MutableList<UserReceive>> {
+    data.enqueue(object : Callback<MutableList<UserReceive>> {
             override fun onResponse(
                 call: Call<MutableList<UserReceive>>,
                 response: Response<MutableList<UserReceive>>
@@ -54,14 +58,16 @@ class FragmentFollowers : Fragment() {
                 if (response.body() == null) {
                     return
                 }
-
                 followers = response.body()!!.toMutableList<UserReceive>()
+                followersRv.apply {
+                    layoutManager= LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL,false)
+                    adapter= FollowersAdapter(followers,requireActivity())
 
+                }
             }
-
             override fun onFailure(call: Call<MutableList<UserReceive>>, t: Throwable) {
                 Toast.makeText(
-                    activity,"nema objava", Toast.LENGTH_LONG
+                    activity,"nema pratilaca", Toast.LENGTH_LONG
                ).show();
             }
         })
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt
new file mode 100644
index 0000000..7fc56db
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt
@@ -0,0 +1,69 @@
+package com.example.brzodolokacije.Fragments
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.example.brzodolokacije.Adapters.FollowersAdapter
+import com.example.brzodolokacije.Models.UserReceive
+import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.RetrofitHelper
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class FragmentFollowing : Fragment() {
+    private lateinit var userId:String
+    private lateinit var following: MutableList<UserReceive>
+    private lateinit var followingRv: RecyclerView
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view= inflater.inflate(R.layout.fragment_following, container, false)
+
+        followingRv=view.findViewById(R.id.rvFragmentShowFollowing)
+
+        val bundle = this.arguments
+        if (bundle != null) {
+            userId= bundle.getString("userId").toString()
+            Toast.makeText(
+                activity, bundle.getString("userId"), Toast.LENGTH_LONG
+            ).show();
+        }
+
+        getFollowing()
+
+        return view
+    }
+
+    fun getFollowing(){
+        val api = RetrofitHelper.getInstance()
+        val data=api.getFollowers(userId)
+        data.enqueue(object : Callback<MutableList<UserReceive>> {
+            override fun onResponse(
+                call: Call<MutableList<UserReceive>>,
+                response: Response<MutableList<UserReceive>>
+            ) {
+                if (response.body() == null) {
+                    return
+                }
+                following = response.body()!!.toMutableList<UserReceive>()
+                followingRv.apply {
+                    layoutManager= LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL,false)
+                    adapter= FollowersAdapter(following,requireActivity())
+
+                }
+            }
+            override fun onFailure(call: Call<MutableList<UserReceive>>, t: Throwable) {
+                Toast.makeText(
+                    activity,"nema pracenja", Toast.LENGTH_LONG
+                ).show();
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
index 6b1bac9..2635adb 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserProfile.kt
@@ -14,8 +14,12 @@ class FragmentUserProfile : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_user_profile, container, false)
+
+        val view= inflater.inflate(R.layout.fragment_user_profile, container, false)
+
+
+
+        return view
     }
 
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml
new file mode 100644
index 0000000..bc43f1b
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/follower_item.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tvFolloewItemUsername"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginBottom="10dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cvFragmentHomePageProfile"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+
+            android:elevation="10dp"
+            app:cardCornerRadius="250dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+
+                android:id="@+id/tvFragmentProfileProfilePicture"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:elevation="10dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_baseline_person_24"
+                tools:ignore="ContentDescription" />
+        </androidx.cardview.widget.CardView>
+
+
+        <TextView
+            android:id="@+id/tvFollowerItemName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="28dp"
+            android:text="Petar Petrovic"
+            android:textSize="17sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@+id/materialButton"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toEndOf="@+id/cvFragmentHomePageProfile"
+            app:layout_constraintTop_toTopOf="parent">
+
+        </TextView>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Petar Petrovic"
+            android:textSize="15sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/materialButton"
+            app:layout_constraintHorizontal_bias="0.656"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFollowerItemName"
+            app:layout_constraintVertical_bias="0.0" />
+
+        <ImageButton
+
+            android:id="@+id/materialButton"
+            android:layout_width="101dp"
+            android:layout_height="39dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/rounded_transparent_button"
+            android:foreground="@drawable/button_follow"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.508"
+            tools:ignore="TouchTargetSizeCheck" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml
new file mode 100644
index 0000000..81f93a8
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.FragmentFollowing">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:text="Prati"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvFragmentShowFollowing"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From c7b5a4b027d05d83c250312cc8ce113928995823 Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Tue, 22 Nov 2022 09:29:12 +0100
Subject: Dodata navigacija za fragmente followers i following.

---
 .../brzodolokacije/Fragments/FragmentFollowers.kt  | 11 ++++++++++-
 .../brzodolokacije/Fragments/FragmentFollowing.kt  | 11 ++++++++++-
 .../brzodolokacije/Fragments/FragmentProfile.kt    | 22 ++++++++++++++++++----
 .../app/src/main/res/layout/fragment_followers.xml | 19 +++++++++++++++----
 .../app/src/main/res/layout/fragment_following.xml | 16 +++++++++++++---
 5 files changed, 66 insertions(+), 13 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
index faa5748..f1d9321 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -26,12 +27,13 @@ class FragmentFollowers : Fragment() {
     private lateinit var userId:String
     private lateinit var followers: MutableList<UserReceive>
     private lateinit var followersRv:RecyclerView
+    private lateinit var btnBack:ImageView
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         val view= inflater.inflate(R.layout.fragment_followers, container, false)
-
+        btnBack=view.findViewById(R.id.btnFragmentFollowersBack)
         followersRv=view.findViewById(R.id.rvFragmentShowFollowers)
 
         val bundle = this.arguments
@@ -44,6 +46,13 @@ class FragmentFollowers : Fragment() {
 
         getFollowers()
 
+        btnBack.setOnClickListener {
+            val fragmentProfile = FragmentProfile()
+            fragmentManager?.beginTransaction()
+                ?.replace(com.example.brzodolokacije.R.id.flNavigationFragment,fragmentProfile)
+                ?.commit()
+        }
+
         return view
     }
 
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt
index 7fc56db..b7a40dc 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt
@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -20,6 +21,7 @@ class FragmentFollowing : Fragment() {
     private lateinit var userId:String
     private lateinit var following: MutableList<UserReceive>
     private lateinit var followingRv: RecyclerView
+    private lateinit var back:ImageView
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -27,7 +29,7 @@ class FragmentFollowing : Fragment() {
         val view= inflater.inflate(R.layout.fragment_following, container, false)
 
         followingRv=view.findViewById(R.id.rvFragmentShowFollowing)
-
+        back=view.findViewById(R.id.btnFragmentFollowingBack)
         val bundle = this.arguments
         if (bundle != null) {
             userId= bundle.getString("userId").toString()
@@ -38,6 +40,13 @@ class FragmentFollowing : Fragment() {
 
         getFollowing()
 
+        back.setOnClickListener {
+            val fragmentProfile = FragmentProfile()
+            fragmentManager
+                ?.beginTransaction()
+                ?.replace(com.example.brzodolokacije.R.id.flNavigationFragment,fragmentProfile)
+                ?.commit()
+        }
         return view
     }
 
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
index 03cb4fa..7c6d998 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentProfile.kt
@@ -57,6 +57,7 @@ class FragmentProfile : Fragment(com.example.brzodolokacije.R.layout.fragment_pr
     private lateinit var profilePicture: ImageView
     private lateinit var profilePicturePlus: MaterialButton
     private lateinit var showFollowers: TextView
+    private lateinit var showFollowing: TextView
 
     var userId:String = "1"
 
@@ -65,9 +66,9 @@ class FragmentProfile : Fragment(com.example.brzodolokacije.R.layout.fragment_pr
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        Toast.makeText(
-            activity, "MOJ PROFILLLLLLLLLLLLLLL", Toast.LENGTH_LONG
-        ).show();
+//        Toast.makeText(
+//            activity, "MOJ PROFILLLLLLLLLLLLLLL", Toast.LENGTH_LONG
+//        ).show();
         // Inflate the layout for this fragment
         val view:View= inflater.inflate(com.example.brzodolokacije.R.layout.fragment_profile, container, false)
         name = view.findViewById<View>(com.example.brzodolokacije.R.id.tvFragmentProfileName) as TextView
@@ -81,6 +82,7 @@ class FragmentProfile : Fragment(com.example.brzodolokacije.R.layout.fragment_pr
         profilePicture=view.findViewById<View>(com.example.brzodolokacije.R.id.tvFragmentProfileProfilePicture) as ImageView
         profilePicturePlus=view.findViewById<View>(com.example.brzodolokacije.R.id.btnFragmentProfileProfilePicturePlus) as MaterialButton
         showFollowers=view.findViewById(com.example.brzodolokacije.R.id.tvFragmentProfileFollowers)
+        showFollowing=view.findViewById(com.example.brzodolokacije.R.id.tvFragmentProfileFollow)
         //podaci iz baze
 
 
@@ -112,7 +114,7 @@ class FragmentProfile : Fragment(com.example.brzodolokacije.R.layout.fragment_pr
 
         showFollowers.setOnClickListener {
             val bundle = Bundle()
-            bundle.putString("userId",userId ) // Put anything what you want
+            bundle.putString("userId",userId )
             val fragmentFollowers = FragmentFollowers()
             fragmentFollowers.setArguments(bundle)
 
@@ -121,6 +123,18 @@ class FragmentProfile : Fragment(com.example.brzodolokacije.R.layout.fragment_pr
                 ?.replace(com.example.brzodolokacije.R.id.flNavigationFragment,fragmentFollowers)
                 ?.commit()
         }
+
+        showFollowing.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString("userId",userId)
+            val fragmentFollowing = FragmentFollowing()
+            fragmentFollowing.setArguments(bundle)
+
+            fragmentManager
+                ?.beginTransaction()
+                ?.replace(com.example.brzodolokacije.R.id.flNavigationFragment,fragmentFollowing)
+                ?.commit()
+        }
         getProfileInfo()
         openMyPosts()
         return view
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml
index deef1f8..6092e01 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_followers.xml
@@ -9,18 +9,29 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-
+    <LinearLayout
+        android:layout_width="110dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/btnFragmentFollowersBack"
+            android:clickable="true"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:src="@drawable/ic_baseline_arrow_back_24"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="left"
+            android:layout_gravity="right"
             android:text="Pratioci"
             android:textSize="20sp"
-            android:textStyle="bold" />
-
+            android:textStyle="bold"
+            />
+    </LinearLayout>
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvFragmentShowFollowers"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
+
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml
index 81f93a8..424094f 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_following.xml
@@ -9,15 +9,25 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
+<LinearLayout
+    android:layout_width="80dp"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:id="@+id/btnFragmentFollowingBack"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:clickable="true"
+        android:src="@drawable/ic_baseline_arrow_back_24"
 
-        <TextView
+       />
+    <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="left"
+            android:layout_gravity="right"
             android:text="Prati"
             android:textSize="20sp"
             android:textStyle="bold" />
-
+    </LinearLayout>
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvFragmentShowFollowing"
             android:layout_width="match_parent"
-- 
cgit v1.2.3


From 6684a156434f38fd89cefcf5a78acc7bc4d31170 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 22 Nov 2022 12:02:05 +0100
Subject: Smanjen splashPage duration. Dodat onclicklistener za prikazivanje
 postova na ShowPostsHomePageAdapter.

---
 .../com/example/brzodolokacije/Activities/SplashPage.kt     |  2 +-
 .../brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt     | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/SplashPage.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/SplashPage.kt
index 3d2f923..4faf067 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/SplashPage.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/SplashPage.kt
@@ -8,7 +8,7 @@ import com.example.brzodolokacije.MainActivity
 import com.example.brzodolokacije.R
 
 class SplashPage : AppCompatActivity() {
-    private val time:Long = 4000
+    private val time:Long = 2000
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt
index c382cf7..3391355 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsHomePageAdapter.kt
@@ -1,6 +1,8 @@
 package com.example.brzodolokacije.Adapters
 
 import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -9,6 +11,8 @@ import android.widget.TextView
 import androidx.core.net.toUri
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.example.brzodolokacije.Activities.ActivitySinglePost
+import com.example.brzodolokacije.Models.LocationType
 import com.example.brzodolokacije.Models.PostPreview
 import com.example.brzodolokacije.R
 import com.example.brzodolokacije.Services.RetrofitHelper
@@ -23,6 +27,15 @@ class ShowPostsHomePageAdapter(var postPreview:MutableList<PostPreview>,val acti
     }
 
     override fun onBindViewHolder(holder: PostViewHolder, position: Int) {
+        holder.itemView.setOnClickListener {
+            //Toast.makeText(activity,item._id,Toast.LENGTH_LONG).show()
+            val intent: Intent = Intent(activity, ActivitySinglePost::class.java)
+            var b= Bundle()
+            postPreview[position].location.type= LocationType.ADA
+            b.putParcelable("selectedPost", postPreview[position])
+            intent.putExtras(b)
+            activity.startActivity(intent)
+        }
         return holder.bindView(postPreview[position] )
     }
 
-- 
cgit v1.2.3


From f2350319553504189bf8b4ea9beba6443eefe2c8 Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Tue, 22 Nov 2022 13:10:21 +0100
Subject: Dodati dijalozi za filtriranje i sortiranje.

---
 .../brzodolokacije/Fragments/FragmentShowPosts.kt  |  45 +++++++
 .../app/src/main/res/drawable/button_filter.xml    |  10 ++
 .../src/main/res/drawable/button_find_on_map.xml   |  25 ++++
 .../app/src/main/res/drawable/button_sort.xml      |  13 ++
 .../src/main/res/layout/bottom_sheet_filter.xml    | 147 +++++++++++++++++++++
 .../app/src/main/res/layout/bottom_sheet_sort.xml  |  67 ++++++++++
 .../src/main/res/layout/fragment_show_posts.xml    |   6 +-
 .../app/src/main/res/values/strings.xml            |   3 +
 8 files changed, 313 insertions(+), 3 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_filter.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_find_on_map.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_sort.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
index c8ffb90..a840d6b 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt
@@ -6,7 +6,10 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
 import android.widget.ImageButton
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -14,6 +17,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.example.brzodolokacije.Activities.ActivityAddPost
 import com.example.brzodolokacije.Activities.ChatActivity
 import com.example.brzodolokacije.Adapters.ShowPostsAdapter
 import com.example.brzodolokacije.Models.SearchParams
@@ -22,6 +26,8 @@ import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.databinding.FragmentShowPostsBinding
 import com.example.brzodolokacije.paging.SearchPostsViewModel
 import com.example.brzodolokacije.paging.SearchPostsViewModelFactory
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import kotlinx.android.synthetic.main.fragment_show_posts.*
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
@@ -37,6 +43,8 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
     private var swipeRefreshLayout:SwipeRefreshLayout?=null
     private lateinit var searchPostsViewModel:SearchPostsViewModel
     private var searchParams:SearchParams?= SearchParams("6375784fe84e2d53df32bf03",1,1)
+    private lateinit var btnFilter:ImageButton
+    private lateinit var btnSort:ImageButton
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -107,6 +115,17 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
             swipeRefreshLayout?.isRefreshing=true
             requestToBack(searchParams!!)
         })
+
+        btnFilter=rootView.findViewById(R.id.btnSortType)
+        btnSort=rootView.findViewById(R.id.btnSortDirection)
+
+        btnFilter.setOnClickListener{
+            showBottomSheetFilter()
+        }
+
+        btnSort.setOnClickListener{
+            showBottomSheetSort()
+        }
         return rootView
     }
 
@@ -114,4 +133,30 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener {
         requestToBack(searchParams!!)
     }
 
+
+    private fun showBottomSheetFilter() {
+        var bottomSheetDialog: BottomSheetDialog
+        bottomSheetDialog = BottomSheetDialog(requireContext())
+        bottomSheetDialog.setContentView(R.layout.bottom_sheet_filter)
+        bottomSheetDialog.show()
+
+        var dateFrom=bottomSheetDialog.findViewById<View>(R.id.dateFromBSF)as EditText
+        var dateTo=bottomSheetDialog.findViewById<View>(R.id.dateToBSF) as EditText
+        var location=bottomSheetDialog.findViewById<View>(R.id.locationBSF) as EditText
+        var filter = bottomSheetDialog.findViewById<View>(R.id.btnBSFFilter) as Button
+
+
+        filter.setOnClickListener {
+            //povezati sa back-om
+
+
+        }
+    }
+    private fun showBottomSheetSort() {
+        var bottomSheetDialogSort: BottomSheetDialog
+        bottomSheetDialogSort = BottomSheetDialog(requireContext())
+        bottomSheetDialogSort.setContentView(R.layout.bottom_sheet_sort)
+        bottomSheetDialogSort.show()
+
+    }
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_filter.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_filter.xml
new file mode 100644
index 0000000..00b22aa
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_filter.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M11 18c-0.28 0-0.52-0.1-0.71-0.29C10.09 17.52 10 17.28 10 17c0-0.28 0.1-0.52 0.29-0.71C10.48 16.09 10.72 16 11 16h2c0.28 0 0.52 0.1 0.71 0.29C13.91 16.48 14 16.72 14 17c0 0.28-0.1 0.52-0.29 0.71C13.52 17.91 13.28 18 13 18h-2ZM4 8C3.72 8 3.48 7.9 3.29 7.71 3.09 7.52 3 7.28 3 7c0-0.28 0.1-0.52 0.29-0.71C3.48 6.09 3.72 6 4 6h16c0.28 0 0.52 0.1 0.71 0.29C20.91 6.48 21 6.72 21 7c0 0.28-0.1 0.52-0.29 0.71C20.52 7.91 20.28 8 20 8H4Zm3 5c-0.28 0-0.52-0.1-0.71-0.29C6.09 12.52 6 12.28 6 12c0-0.28 0.1-0.52 0.29-0.71C6.48 11.09 6.72 11 7 11h10c0.28 0 0.52 0.1 0.71 0.29C17.91 11.48 18 11.72 18 12c0 0.28-0.1 0.52-0.29 0.71C17.52 12.91 17.28 13 17 13H7Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_find_on_map.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_find_on_map.xml
new file mode 100644
index 0000000..4c0c8a5
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_find_on_map.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="#FF093A4C"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M11 18l-2-1-6 3V7l6-3 6 3 6-3v10M9 4v13m6-10v5"/>
+    <path
+        android:strokeColor="#FF093A4C"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M16.5 20c1.38 0 2.5-1.12 2.5-2.5S17.88 15 16.5 15 14 16.12 14 17.5s1.12 2.5 2.5 2.5Z"/>
+    <path
+        android:strokeColor="#FF093A4C"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M18.5 19.5L21 22"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_sort.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_sort.xml
new file mode 100644
index 0000000..fe93f22
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_sort.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="#FF093A4C"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:pathData="M10 14H2m6-4H2m4-4H2m10 12H2m17 2V4m0 16l3-3m-3 3l-3-3m3-13l3 3m-3-3l-3 3"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml
new file mode 100644
index 0000000..249c654
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/textView7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="Filteri"
+        android:textSize="25sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/datum"
+        android:textSize="17sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView7" />
+
+    <EditText
+        android:id="@+id/dateFromBSF"
+        android:layout_width="140dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:ems="10"
+        android:inputType="date"
+        app:layout_constraintStart_toEndOf="@+id/textView9"
+        app:layout_constraintTop_toBottomOf="@+id/textView8"
+        tools:ignore="SpeakableTextPresentCheck" />
+
+    <TextView
+        android:id="@+id/textView9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="20dp"
+        android:text="@string/od"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView8" />
+
+    <TextView
+        android:id="@+id/textView10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="8dp"
+        android:text="Do"
+        app:layout_constraintEnd_toStartOf="@+id/dateToBSF"
+        app:layout_constraintTop_toBottomOf="@+id/textView8" />
+
+    <EditText
+        android:id="@+id/dateToBSF"
+        android:layout_width="140dp"
+        android:layout_height="48dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:ems="10"
+        android:inputType="date"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView8"
+        tools:ignore="SpeakableTextPresentCheck" />
+
+    <TextView
+        android:id="@+id/textView11"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="Lokacija"
+        android:textSize="17sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/divider2" />
+
+    <View
+        android:id="@+id/divider2"
+        android:layout_width="409dp"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/dateFromBSF" />
+
+    <EditText
+        android:id="@+id/locationBSF"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
+        android:ems="10"
+        android:inputType="textPersonName"
+        app:layout_constraintEnd_toStartOf="@+id/imageView8"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView11"
+        tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" />
+
+    <ImageView
+        android:id="@+id/imageView8"
+        android:layout_width="50dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView11"
+        app:srcCompat="@drawable/button_find_on_map" />
+
+    <View
+        android:id="@+id/divider4"
+        android:layout_width="409dp"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/locationBSF" />
+
+    <Button
+        android:id="@+id/btnBSFFilter"
+        android:layout_width="169dp"
+        android:layout_height="39dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/rounded_cyan_button"
+        android:text="Primeni"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/divider4"
+        app:layout_constraintVertical_bias="1.0"
+        tools:ignore="TouchTargetSizeCheck" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml
new file mode 100644
index 0000000..fb06308
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <RadioGroup
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView12">
+
+        <RadioButton
+            android:id="@+id/radioButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="12dp"
+            android:text="Najnovije"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+ />
+
+        <RadioButton
+            android:id="@+id/radioButton2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:text="Najbolje ocenjeno"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/radioButton4" />
+
+        <RadioButton
+            android:id="@+id/radioButton3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:text="Najstarije"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/radioButton" />
+
+        <RadioButton
+            android:id="@+id/radioButton4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+
+            android:text="Najviše pregleda"
+            app:layout_constraintTop_toBottomOf="@+id/radioButton3"
+            tools:layout_editor_absoluteX="16dp" />
+    </RadioGroup>
+
+    <TextView
+        android:id="@+id/textView12"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="Sortiraj po"
+        android:textSize="25sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
index 6e22456..89a7fa1 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
@@ -52,10 +52,11 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_alignParentRight="true"
+            android:layout_marginStart="16dp"
             android:background="@color/white"
             android:padding="@dimen/component_padding"
             android:scaleType="centerCrop"
-            android:src="@drawable/filter"
+            android:src="@drawable/button_filter"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -63,12 +64,11 @@
             android:id="@+id/btnSortDirection"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            android:layout_marginStart="8dp"
             android:layout_weight="1"
             android:background="@color/white"
             android:padding="@dimen/component_padding"
             android:scaleType="centerCrop"
-            android:src="@drawable/sort"
+            android:src="@drawable/button_sort"
             app:layout_constraintStart_toEndOf="@+id/btnSortType"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
index fef04ac..b180869 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
@@ -6,6 +6,9 @@
     <string name="title_activity_maps">MapsActivity</string>
     <string name="dodaj_objavu">Dodaj objavu</string>
     <string name="todo">TODO</string>
+    <string name="datum">Datum</string>
+
+    <string name="od">Od</string>
 
 
     <!-- example lista tagova, make actual list for app -->
-- 
cgit v1.2.3


From 7da3e307a5186a13cfcbec3bfa77eb9d1af93850 Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Tue, 22 Nov 2022 13:12:02 +0100
Subject: Mala izmena.

---
 Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
index 89a7fa1..e1effc4 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_posts.xml
@@ -104,7 +104,7 @@
             android:id="@+id/btnGridLayout"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            android:layout_marginStart="248dp"
+            android:layout_marginStart="220dp"
             android:layout_weight="1"
             android:background="@color/white"
             android:clickable="true"
-- 
cgit v1.2.3


From f78e1b517442e51e091ae409b83f000ed37f275f Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Tue, 22 Nov 2022 14:32:55 +0100
Subject: Dodati podaci o korisniku u objavi. Omogućen prikaz profila korisnika
 iz objave.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/main/AndroidManifest.xml               |  15 +-
 .../Activities/ActivitySinglePost.kt               |  39 +++-
 .../Activities/ActivityUserProfile.kt              |  49 ++++
 .../src/main/res/layout/activity_single_post.xml   |  70 +++---
 .../src/main/res/layout/activity_user_profile.xml  | 252 +++++++++++++++++++++
 5 files changed, 391 insertions(+), 34 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index bb2d712..0c412d8 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -36,20 +36,31 @@
         android:theme="@style/Theme.BrzoDoLokacije"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".Activities.ActivityUserProfile"
+            android:exported="false"
+            android:screenOrientation="portrait" >
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
         <activity
             android:name=".Activities.ChatActivityConversation"
             android:exported="false"
-            android:windowSoftInputMode="stateVisible|adjustPan">
+            android:windowSoftInputMode="stateVisible|adjustPan"
+            android:screenOrientation="portrait" >
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
             android:name=".Activities.ChatActivity"
-            android:exported="true">
+            android:exported="true"
+            android:screenOrientation="portrait" >
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
+
         </activity>
 
         <meta-data
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
index f875949..f969669 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
@@ -1,11 +1,11 @@
 package com.example.brzodolokacije.Activities
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import android.widget.Adapter
+import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.brzodolokacije.Adapters.CommentsAdapter
@@ -15,11 +15,11 @@ import com.example.brzodolokacije.R
 import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
 import com.example.brzodolokacije.databinding.ActivitySinglePostBinding
+import com.google.gson.Gson
+import kotlinx.android.synthetic.main.activity_single_post.*
 import okhttp3.ResponseBody
-import okhttp3.internal.notifyAll
 import retrofit2.Call
 import retrofit2.Response
-import kotlin.math.roundToInt
 
 
 class ActivitySinglePost : AppCompatActivity() {
@@ -33,6 +33,8 @@ class ActivitySinglePost : AppCompatActivity() {
     private lateinit var post:PostPreview
     private var comments:MutableList<CommentSend>?=mutableListOf()
     private var starNumber:Number=0
+    private lateinit var userData:UserReceive
+    private lateinit var user:TextView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -53,6 +55,14 @@ class ActivitySinglePost : AppCompatActivity() {
         recyclerViewImages?.adapter = adapterImages
         loadTextComponents()
         setRatingListeners()
+        translateOwnerIdToName(post.ownerId)
+
+        binding.tvUser.setOnClickListener {
+            val intent: Intent = Intent(this@ActivitySinglePost,ActivityUserProfile::class.java)
+            var b= Bundle()
+            intent.putExtra("user", Gson().toJson(userData))
+            this.startActivity(intent)
+        }
     }
 
     fun buildRecyclerViewComments(){
@@ -228,7 +238,9 @@ class ActivitySinglePost : AppCompatActivity() {
             tvNumberOfRatings.invalidate()
             tvDescription.text=post.description
             tvDescription.invalidate()
+
         }
+
     }
     fun addView() {
         var token= SharedPreferencesHelper.getValue("jwt", this).toString()
@@ -245,5 +257,24 @@ class ActivitySinglePost : AppCompatActivity() {
         })
     }
 
+    fun translateOwnerIdToName(id:String) {
+        var token= SharedPreferencesHelper.getValue("jwt", this).toString()
+        val api= RetrofitHelper.getInstance()
+        val request= api.getProfileFromId("Bearer " + token, id)
+        request.enqueue(object : retrofit2.Callback<UserReceive>  {
+            override fun onResponse(call: Call<UserReceive>,
+                                    response: Response<UserReceive>) {
+                if (response.body() == null) {
+                    return
+                }
+                userData = response.body()!!
+                binding.tvUser.text= userData!!.username.toString()
+            }
+
+            override fun onFailure(call: Call<UserReceive>, t: Throwable) {
+
+            }
+        })
+    }
 
 }
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
new file mode 100644
index 0000000..50c2b0e
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
@@ -0,0 +1,49 @@
+package com.example.brzodolokacije.Activities
+
+import android.os.Bundle
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.bumptech.glide.Glide
+import com.example.brzodolokacije.Models.UserReceive
+import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.RetrofitHelper
+import com.google.gson.Gson
+
+class ActivityUserProfile : AppCompatActivity() {
+    private lateinit var name:TextView
+    private lateinit var postsNumber:TextView
+    private lateinit var followersNumber:TextView
+    private lateinit var followingNumber:TextView
+    private lateinit var profilePicture:ImageView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_user_profile)
+
+        name=findViewById(R.id.tvActivityUserProfileName)
+        postsNumber=findViewById(R.id.tvActivityUserProfilePostsNo)
+        followersNumber=findViewById(R.id.tvActivityUserProfileFollowersNo)
+        followingNumber=findViewById(R.id.tvActivityUserProfileFollowNo)
+        profilePicture=findViewById(R.id.tvActivityProfileProfilePicture)
+        val jsonMyObject: String
+        val extras = intent.extras
+        if (extras != null) {
+            jsonMyObject = extras.getString("user")!!
+            val myObject: UserReceive = Gson().fromJson(jsonMyObject, UserReceive::class.java)
+
+            name.text=myObject.name
+            postsNumber.text=myObject.postNumber.toString()
+            followersNumber.text="0"
+            followingNumber.text="0"
+
+            if(myObject.pfp!=null) {
+                Glide.with(this)
+                    .load(RetrofitHelper.baseUrl + "/api/post/image/" + myObject.pfp!!._id)
+                    .circleCrop()//Round image
+                    .into(profilePicture)
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
index a8a03aa..e3cabb5 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
@@ -41,8 +41,8 @@
         android:gravity="top|start"
         android:padding="@dimen/text_padding"
         android:text="Drzava, grad"
-        app:layout_constraintTop_toBottomOf="@+id/tvLocationType"
-        tools:layout_editor_absoluteX="0dp" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvLocationType" />
 
     <TextView
         android:id="@+id/tvTitle"
@@ -52,7 +52,8 @@
         android:padding="@dimen/text_padding"
         android:text="Naslov"
         android:textSize="@dimen/header1_size"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/tvLocationType"
@@ -61,15 +62,27 @@
         android:gravity="top|start"
         android:padding="@dimen/text_padding"
         android:text="Tip lokacije"
-        app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-        tools:layout_editor_absoluteX="0dp" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+
+    <TextView
+        android:id="@+id/tvUser"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:gravity="top|start"
+        android:padding="@dimen/text_padding"
+        android:text="User"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvLocationParent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="36dp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvLocationParent">
 
@@ -161,6 +174,7 @@
                 android:layout_height="wrap_content"
                 android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView"
                 app:layout_constraintTop_toBottomOf="@+id/tvDescriptionLabel" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
@@ -177,9 +191,9 @@
                 android:layout_width="30dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
+                android:scaleType="centerCrop"
                 android:src="@drawable/empty_star" />
 
             <ImageButton
@@ -187,9 +201,9 @@
                 android:layout_width="30dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
+                android:scaleType="centerCrop"
                 android:src="@drawable/empty_star" />
 
             <ImageButton
@@ -197,9 +211,9 @@
                 android:layout_width="30dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
+                android:scaleType="centerCrop"
                 android:src="@drawable/empty_star" />
 
             <ImageButton
@@ -207,9 +221,9 @@
                 android:layout_width="30dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
+                android:scaleType="centerCrop"
                 android:src="@drawable/empty_star" />
 
             <ImageButton
@@ -217,48 +231,48 @@
                 android:layout_width="30dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_vertical"
-                android:scaleType="centerCrop"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
+                android:scaleType="centerCrop"
                 android:src="@drawable/empty_star" />
 
             <Button
                 android:id="@+id/submitRating"
                 android:layout_width="30dp"
                 android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
                 android:layout_weight="1"
                 android:backgroundTint="@color/white"
                 android:text="ok"
-                android:layout_gravity="center_vertical"
-                android:textColor="@color/black"
-                />
+                android:textColor="@color/black" />
         </LinearLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintTop_toBottomOf="@id/linearLayout2">
+
             <LinearLayout
+                android:id="@+id/postCommentLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/postCommentLayout"
                 android:orientation="horizontal"
-                app:layout_constraintStart_toStartOf="parent" >
+                app:layout_constraintStart_toStartOf="parent">
+
                 <EditText
+                    android:id="@+id/NewComment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:hint="Unesite komentar ovde"
-                    android:id="@+id/NewComment"
-                    />
+                    android:hint="Unesite komentar ovde" />
 
                 <ImageButton
                     android:id="@+id/btnPostComment"
                     android:layout_width="50dp"
-                    android:scaleType="fitCenter"
                     android:layout_height="50dp"
-                    android:src="@drawable/post_comment"
-                    android:backgroundTint="@color/white"/>
+                    android:backgroundTint="@color/white"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/post_comment" />
             </LinearLayout>
 
 
@@ -266,26 +280,26 @@
                 android:id="@+id/tvCommentLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/postCommentLayout"
                 android:padding="@dimen/text_padding"
                 android:text="Komentari"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                app:layout_constraintTop_toBottomOf="@id/postCommentLayout" />
 
             <TextView
                 android:id="@+id/tvCommentCount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="@dimen/text_padding"
-                app:layout_constraintTop_toBottomOf="@id/postCommentLayout"
                 android:text="0"
-                app:layout_constraintStart_toEndOf="@id/tvCommentLabel" />
+                app:layout_constraintStart_toEndOf="@id/tvCommentLabel"
+                app:layout_constraintTop_toBottomOf="@id/postCommentLayout" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvComments"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/tvCommentLabel"
-                android:nestedScrollingEnabled="false">
+                android:nestedScrollingEnabled="false"
+                app:layout_constraintTop_toBottomOf="@id/tvCommentLabel">
 
             </androidx.recyclerview.widget.RecyclerView>
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
new file mode 100644
index 0000000..8762183
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Activities.ActivityUserProfile">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+
+            android:id="@+id/imageView3"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:foreground="@drawable/b3"
+            android:foregroundGravity="center_vertical|center|center_horizontal|fill"
+            android:src="@drawable/b3"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <com.google.android.material.imageview.ShapeableImageView
+
+            android:id="@+id/tvFragmentProfileInfoContainer"
+            android:layout_width="0dp"
+            android:layout_height="199dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="150dp"
+            android:layout_marginEnd="20dp"
+            android:adjustViewBounds="true"
+            android:background="@drawable/profile_view_background"
+
+            android:elevation="1dp"
+            android:scaleType="fitEnd"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/imageView3"
+            app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" />
+
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cvFragmentHomePageProfile"
+            android:layout_width="140dp"
+            android:layout_height="140dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="80dp"
+            android:elevation="10dp"
+            app:cardCornerRadius="250dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+
+                android:id="@+id/tvActivityProfileProfilePicture"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:elevation="10dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_baseline_person_24"
+                tools:ignore="ContentDescription" />
+        </androidx.cardview.widget.CardView>
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="409dp"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btnFragmentUserProfileShowPosts" />
+
+        <Button
+            android:id="@+id/btnFragmentUserProfileShowPosts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="4dp"
+            android:backgroundTint="#FFFFFF"
+            android:stateListAnimator="@null"
+            android:text="Objave"
+
+            android:textColor="@color/cardview_dark_background"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
+        <Button
+            android:id="@+id/btnFragmentUserProfileShowData"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="20dp"
+            android:backgroundTint="#FFFFFF"
+            android:stateListAnimator="@null"
+            android:text="Podaci"
+
+            android:textColor="@color/cardview_dark_background"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowRecensions"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
+        <Button
+            android:id="@+id/btnFragmentUserProfileShowRecensions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="36dp"
+            android:layout_marginTop="4dp"
+            android:backgroundTint="#FFFFFF"
+            android:stateListAnimator="@null"
+            android:text="Recenzije"
+            android:textColor="@color/cardview_dark_background"
+            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowPosts"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
+        <FrameLayout
+            android:id="@+id/flFragmentProfileFragmentContainer"
+            android:layout_width="409dp"
+            android:layout_height="319dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/divider">
+        </FrameLayout>
+
+        <TableLayout
+
+            android:layout_width="363dp"
+
+            android:layout_height="122dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="8dp"
+            android:elevation="1dp"
+            android:numColumns="3"
+
+            android:stretchColumns="1"
+            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_column="1">
+
+                <TextView
+                    android:id="@+id/tvActivityUserProfileName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_column="1"
+                    android:layout_gravity="center"
+                    android:layout_marginBottom="5dp"
+                    android:text="Petar Petrović"
+                    android:textSize="20sp" />
+            </TableRow>
+
+            <TableRow>
+
+                <androidx.constraintlayout.widget.ConstraintLayout android:layout_span="3">
+
+                    <ImageButton
+
+                        android:id="@+id/materialButton"
+                        android:layout_width="115dp"
+                        android:layout_height="40dp"
+                        android:layout_marginStart="16dp"
+                        android:background="@drawable/rounded_transparent_button"
+                        android:foreground="@drawable/button_follow"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.0"
+                        tools:ignore="TouchTargetSizeCheck" />
+
+                    <ImageButton
+                        android:layout_width="115dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center"
+                        android:layout_marginEnd="16dp"
+                        android:height="40dp"
+                        android:background="@drawable/rounded_transparent_button"
+                        android:foreground="@drawable/button_chat"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.0"
+                        tools:ignore="SpeakableTextPresentCheck" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </TableRow>
+
+
+            <TableRow android:layout_marginTop="5dp">
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfilePosts"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="OBJAVE" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollowers"
+                    android:layout_width="10dp"
+                    android:gravity="center"
+                    android:text="PRATIOCI" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollow"
+
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="PRAĆENJA" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/tvActivityUserProfilePostsNo"
+                    android:layout_width="110dp"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="156"
+                    android:textFontWeight="700" />
+
+                <TextView
+                    android:id="@+id/tvActivityUserProfileFollowersNo"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="50" />
+
+                <TextView
+                    android:id="@+id/tvActivityUserProfileFollowNo"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="40" />
+
+            </TableRow>
+
+        </TableLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3