From 1c08515b0dd8c5027f0161c6f4f21f3303533380 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 13 Dec 2022 11:52:59 +0100
Subject: Prikaz ... ukoliko duzina naslova prelazi sirinu elementa. Sredjen
 overfill. Dodat padding bottom na fragmentu za istoriju pregleda.

---
 .../app/src/main/res/layout/activity_single_post.xml           |  6 +++++-
 .../app/src/main/res/layout/fragment_my_recensions.xml         |  4 +++-
 .../app/src/main/res/layout/post_item_home_page.xml            |  5 ++++-
 .../app/src/main/res/layout/post_item_user_post.xml            |  5 ++++-
 Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml | 10 +++++++---
 .../app/src/main/res/layout/single_post_history.xml            |  7 +++++--
 6 files changed, 28 insertions(+), 9 deletions(-)

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 d2229e8..e435876 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
@@ -46,12 +46,16 @@
             <TextView
                 android:id="@+id/tvTitle"
                 style="@style/title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
+                android:ellipsize="end"
                 android:gravity="top|start"
+                android:maxLines="1"
                 android:padding="@dimen/text_padding"
+                android:paddingRight="20dp"
                 android:text="Naslov"
+                app:layout_constraintEnd_toStartOf="@+id/ivFavourite"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
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 72706e0..76690e9 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
@@ -23,6 +23,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/materialDivider"
-        android:layout_marginHorizontal="16dp"/>
+        android:layout_marginHorizontal="16dp"
+        android:paddingBottom="50dp"/>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
index 9622c34..6584d5c 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
@@ -53,15 +53,18 @@
 
     <TextView
         android:id="@+id/tvPIHPLocationName"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginBottom="2dp"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:elevation="3dp"
         android:text="TextView"
         android:textSize="13sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/tvPIHPLocationDetail"
+        app:layout_constraintEnd_toStartOf="@+id/imageView10"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml
index c72ace6..1b78ba9 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_user_post.xml
@@ -52,14 +52,17 @@
 
     <TextView
         android:id="@+id/piupLocation"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginTop="2dp"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:elevation="3dp"
         android:text="TextView"
         android:textSize="13sp"
         android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/imageView10"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/piupbackground" />
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
index 0ce4776..54b11b0 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
@@ -67,16 +67,20 @@
 
     <TextView
         android:id="@+id/tvTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
         android:layout_marginTop="4dp"
         android:elevation="10dp"
+        android:ellipsize="end"
         android:gravity="top|left"
+        android:paddingLeft="5dp"
+        android:maxLines="1"
+        android:paddingRight="20dp"
         android:text="Naslov"
         android:textSize="18sp"
         android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/tvPostPreviewRating"
+        app:layout_constraintStart_toStartOf="@+id/locationImage"
         app:layout_constraintTop_toBottomOf="@+id/locationImage" />
 
     <TextView
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
index 72ead29..16c5814 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/single_post_history.xml
@@ -30,16 +30,19 @@
 
     <TextView
         android:id="@+id/tvTitleSinglePostHistory"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:elevation="5dp"
+        android:ellipsize="end"
         android:gravity="top|left"
+        android:maxLines="1"
+        android:paddingRight="20dp"
         android:text="Naslov"
         android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/vBannerSinglePostHistory"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/vBannerSinglePostHistory"
-- 
cgit v1.2.3


From f63a76bfb807de3fb153fbc107a1b1d6bbdd7c37 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 13 Dec 2022 12:09:40 +0100
Subject: Popravljena navigacija na ActivityAddPost-u.

---
 .../example/brzodolokacije/Activities/ActivityAddPost.kt  |  9 ++-------
 .../app/src/main/res/layout/activity_add_post.xml         | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

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 23fc5c2..aaa2733 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
@@ -37,7 +37,7 @@ class ActivityAddPost : AppCompatActivity() {
     private lateinit var takePhoto: Button
     private lateinit var showNextImage:Button
     private lateinit var showPreviousImage:Button
-    private lateinit var switcher: ImageSwitcher
+    private lateinit var switcher: ImageView
     private var uploadedImages:ArrayList<Uri?>?=null
 
     private lateinit var location:EditText
@@ -73,7 +73,7 @@ class ActivityAddPost : AppCompatActivity() {
         uploadFromGallery=findViewById<View>(R.id.btnActivityAddPostUploadFromGalleryVisible) as Button
         showNextImage=findViewById<View>(R.id.nextImage) as Button
         showPreviousImage=findViewById<View>(R.id.previousImage) as Button
-        switcher=findViewById<View>(R.id.isActivityAddPostSwitcher) as ImageSwitcher
+        switcher=findViewById<View>(R.id.isActivityAddPostSwitcher) as ImageView
         description=findViewById<View>(R.id.etActivityAddPostDescription) as EditText
         post=findViewById<View>(R.id.btnActivityAddPostPost) as Button
         addLocation=findViewById<View>(R.id.btnActivityAddPostAddLocation) as Button
@@ -95,11 +95,6 @@ class ActivityAddPost : AppCompatActivity() {
         progressDialog!!.setCanceledOnTouchOutside(false)
 
 
-        switcher?.setFactory{
-            val imgView = ImageView(applicationContext)
-            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)
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 0d3eba5..dabb494 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
@@ -6,20 +6,25 @@
     android:layout_height="match_parent"
     tools:context=".Activities.ActivityAddPost">
 
-    <ImageSwitcher
+    <ImageView
         android:id="@+id/isActivityAddPostSwitcher"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:elevation="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadFromGallery"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0"
+        tools:ignore="ImageContrastCheck"
+        tools:srcCompat="@tools:sample/avatars"/>
 
     <Button
         android:id="@+id/nextImage"
         android:layout_width="78dp"
         android:layout_height="0dp"
+        android:elevation="15dp"
         android:background="@drawable/rounded_transparent_button"
         android:gravity="right"
         android:padding="30dp"
@@ -34,7 +39,7 @@
         android:id="@+id/previousImage"
         android:layout_width="70dp"
         android:layout_height="0dp"
-
+        android:elevation="15dp"
         android:background="@drawable/rounded_transparent_button"
         android:gravity="left"
         android:padding="30dp"
-- 
cgit v1.2.3


From 788d6ba9d1ce2888e40eff66940c2cc7d5468d05 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 13 Dec 2022 12:17:18 +0100
Subject: Promenjeno da dugmici za izmenu informacija na profilu menjaju ime i
 username na kliku bez potvrde.

---
 .../Activities/ActivityChangeUserData.kt           | 32 ++--------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangeUserData.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangeUserData.kt
index 2c31e8d..ab5d676 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangeUserData.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangeUserData.kt
@@ -79,23 +79,10 @@ class ActivityChangeUserData : AppCompatActivity() {
         getUser()
 
         editUsername.setOnClickListener{
-            username.setText("")
-            editUsername.isClickable=false
-            editUsername.isVisible=false
-            editUsername.isEnabled=false
-            editUsername.isGone=true
-            confirmUsername.isClickable=true
-            confirmUsername.isVisible=true
-            confirmUsername.isEnabled=true
-            confirmUsername.isGone=false
+            changeUsername()
+            getUser()
 
-            //dodati on change  listener
 
-            confirmUsername.setOnClickListener {
-                changeUsername()
-                getUser()
-
-            }
         }
 
         changeProfilePicture.setOnClickListener {
@@ -103,20 +90,7 @@ class ActivityChangeUserData : AppCompatActivity() {
         }
 
         editName.setOnClickListener{
-            name.setText("")
-            editName.isClickable=false
-            editName.isVisible=false
-            editName.isEnabled=false
-            editName.isGone=true
-            confirmName.isClickable=true
-            confirmName.isVisible=true
-            confirmName.isEnabled=true
-            confirmName.isGone=false
-
-            confirmName.setOnClickListener {
-                changeName()
-
-            }
+            changeName()
 
         }
         back.setOnClickListener {
-- 
cgit v1.2.3


From 270cc5663f85131336b60b6016b89b2736ebc501 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 13 Dec 2022 12:27:04 +0100
Subject: Dodat scroller view na prikaz dugmica na nalog stranici. Klikom na
 dugme za pozovi prijatelje otvara se stranica za preuzimanje aplikacije.

---
 .../example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt | 11 +++++++++++
 .../app/src/main/res/layout/fragment_my_profile_info.xml      |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt
index c8917c4..4192f8d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt
@@ -2,6 +2,7 @@ package com.example.brzodolokacije.Fragments
 
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,6 +16,7 @@ import com.example.brzodolokacije.Activities.ActivityChangeUserData
 import com.example.brzodolokacije.Activities.ActivityLoginRegister
 import com.example.brzodolokacije.FragmentProfileStatistics
 import com.example.brzodolokacije.R
+import com.example.brzodolokacije.Services.RetrofitHelper
 import com.example.brzodolokacije.Services.SharedPreferencesHelper
 
 
@@ -24,6 +26,7 @@ class FragmentMyProfileInfo : Fragment() {
     private lateinit var statistics:Button
     private lateinit var changePassword:Button
     private lateinit var favouritePosts:Button
+    private lateinit var inviteFriends:Button
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -37,6 +40,7 @@ class FragmentMyProfileInfo : Fragment() {
         statistics=view.findViewById<View>(R.id.getAccoutStatistics) as Button
         changePassword=view.findViewById(R.id.ChangePassword)
         favouritePosts=view.findViewById(R.id.getMyFavorite)
+        inviteFriends=view.findViewById(R.id.inviteFriends)
         logout.setOnClickListener{
             logOut()
         }
@@ -46,6 +50,13 @@ class FragmentMyProfileInfo : Fragment() {
             getActivity()?.startActivity(intent)
         }
 
+        inviteFriends.setOnClickListener {
+            val uri: Uri =
+                Uri.parse(RetrofitHelper.baseUrl+"/api/app/download") // missing 'http://' will cause crashed
+
+            val intent = Intent(Intent.ACTION_VIEW, uri)
+            startActivity(intent)
+        }
         favouritePosts.setOnClickListener {
 
             val manager: androidx.fragment.app.FragmentManager? = fragmentManager
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
index 34da5ff..eee59aa 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
@@ -6,7 +6,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".Fragments.FragmentMyProfileInfo">
-
+<ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -46,6 +48,7 @@
             android:drawableLeft="@drawable/ic_outline_share_24"
             android:text="Pozovite prijatelje" />
     </LinearLayout>
+</ScrollView>
 
     <Button
         android:id="@+id/buttonLogOut"
-- 
cgit v1.2.3


From 262db91f26fd561662192b1af99f31fd4e028ba2 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 13 Dec 2022 13:25:31 +0100
Subject: fix.

---
 .../main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 f0de037..ed05191 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
@@ -3,6 +3,7 @@ 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
 import android.view.ViewGroup
@@ -17,6 +18,7 @@ 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.android.synthetic.main.post_preview.view.*
 import java.text.SimpleDateFormat
 
 
@@ -67,7 +69,7 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPrevie
 
     inner class ViewHolder(itemView: PostPreviewBinding) : RecyclerView.ViewHolder(itemView.root) {
         fun bind(item: PostPreview) {
-            binding.apply {
+            itemView.apply {
                 tvPostPreviewDate.text= SimpleDateFormat("dd/MM/yyyy").format(item.createdAt)
                 tvTitle.text = item.location.name
                 if(item.location.city!=null)
-- 
cgit v1.2.3


From d442f0020504a43e2fe92b5f1bb5321bb92bee84 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 13 Dec 2022 13:30:06 +0100
Subject: Dugme postavljeno na not visible.

---
 .../app/src/main/res/layout/activity_change_password.xml             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml
index dc8243e..1ef0be6 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml
@@ -85,7 +85,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="20dp"
         android:text="Nova lozinka"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btnActivityChangePasswordForgottenPass" />
@@ -127,6 +127,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="true"
+        android:visibility="invisible"
         android:text="Zaboravljena lozinka?"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -173,6 +174,6 @@
         android:layout_height="wrap_content"
         android:text="ErrorMessage"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnActivityChangePasswordForgottenPass" />
+        app:layout_constraintTop_toTopOf="@+id/btnActivityChangePasswordForgottenPass" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From f926aa8e562f05ce7175e7a3c04bebe6ae330a47 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 13 Dec 2022 14:37:15 +0100
Subject: komentar fix.

---
 .../brzodolokacije/Adapters/CommentsAdapter.kt      | 21 ++++++++++++---------
 .../Fragments/FragmentSinglePostComments.kt         |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/CommentsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/CommentsAdapter.kt
index 143b4a2..fc77d76 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/CommentsAdapter.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/CommentsAdapter.kt
@@ -116,23 +116,26 @@ class CommentsAdapter (val items : MutableList<CommentSend>,val activity: Activi
                 var rv: RecyclerView = rvReplies
                 rv.setHasFixedSize(true)
                 rv.layoutManager=LinearLayoutManager(activity,LinearLayoutManager.VERTICAL,false)
+                etReplyCount.setOnClickListener {
+                    if(llReplies.visibility==View.VISIBLE)
+                        llReplies.visibility=View.GONE
+                    else
+                        llReplies.visibility=View.VISIBLE
+                    llReplies.forceLayout()
+                }
                 if(item.replies!=null){
                     setReplyCount(layoutPosition)
-                    etReplyCount.setOnClickListener {
-                        if(llReplies.visibility==View.VISIBLE)
-                            llReplies.visibility=View.GONE
-                        else
-                            llReplies.visibility=View.VISIBLE
-                        llReplies.forceLayout()
-                    }
                     rv.adapter=CommentsAdapter(item.replies as MutableList<CommentSend>,activity,fragment)
                 }
-                else
-                    rv.adapter=CommentsAdapter(mutableListOf(),activity,fragment)
+                else {
+                    rv.adapter = CommentsAdapter(mutableListOf(), activity, fragment)
+                }
             }
         }
         fun setReplyCount(position: Int){
 
+            if(items[position].replies==null)
+                items[position].replies= mutableListOf()
             if(items[position].replies!!.count()==1)
                 itemView.etReplyCount.text=items[position].replies!!.count().toString() + " odgovor"
             else
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentSinglePostComments.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentSinglePostComments.kt
index bdca6cd..1032ee3 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentSinglePostComments.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentSinglePostComments.kt
@@ -132,6 +132,7 @@ class FragmentSinglePostComments : Fragment() {
             (adapterComments as CommentsAdapter).items.add(0,newComment)
             recyclerViewComments?.adapter=adapterComments
             addedComment()
+
         }
     }
 
-- 
cgit v1.2.3