Follow/Unfollow ispravljen.

3 files changed, 36 insertions, 30 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt
index fbe3f4d..08f3e1c 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt
@@ -2,6 +2,7 @@ package com.example.brzodolokacije.Activities
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import com.example.brzodolokacije.R
 
 class ActivityChangePassword : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
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 2f5b2d2..139d569 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
@@ -184,22 +184,23 @@ class ActivitySinglePost : AppCompatActivity() {
 
     }
     fun loadTags(){
-        if(post.tags!=null)
-        for( item in post.tags!!){
-            var newbtn = Button(this)
-            newbtn.text = item
-            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.isClickable=false
-            tagLayout.addView(newbtn)
+        if(post.tags!=null) {
+            for (item in post.tags!!) {
+                var newbtn = Button(this)
+                newbtn.text = item
+                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.isClickable = false
+                tagLayout.addView(newbtn)
+            }
         }
 
     }
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
index 4962006..b568d73 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
@@ -92,14 +92,16 @@ class ActivityUserProfile : AppCompatActivity() {
                         call: Call<Boolean>,
                         response: Response<Boolean>
                     ) {
-                        unfollowUser.isVisible=true
-                        unfollowUser.isClickable=true
-                        unfollowUser.isEnabled=true
-                        followUser.isVisible=false
-                        followUser.isClickable=false
-                        followUser.isEnabled=false
+                        if(response.body()==true) {
+                            unfollowUser.isVisible = true
+                            unfollowUser.isClickable = true
+                            unfollowUser.isEnabled = true
+                            followUser.isVisible = false
+                            followUser.isClickable = false
+                            followUser.isEnabled = false
 
-                        updateUserData()
+                            updateUserData()
+                        }
 
                         Toast.makeText(
                             this@ActivityUserProfile, "PRATITE KORISNIKA", Toast.LENGTH_LONG
@@ -123,13 +125,15 @@ class ActivityUserProfile : AppCompatActivity() {
                     call: Call<Boolean>,
                     response: Response<Boolean>
                 ) {
-                    unfollowUser.isVisible = false
-                    unfollowUser.isClickable = false
-                    unfollowUser.isEnabled = false
-                    followUser.isVisible = true
-                    followUser.isClickable = true
-                    followUser.isEnabled = true
-                    updateUserData()
+                    if(response.body()==true) {
+                        unfollowUser.isVisible = false
+                        unfollowUser.isClickable = false
+                        unfollowUser.isEnabled = false
+                        followUser.isVisible = true
+                        followUser.isClickable = true
+                        followUser.isEnabled = true
+                        updateUserData()
+                    }
                     Toast.makeText(
                         this@ActivityUserProfile, "VIŠE NE PRATITE KORISNIKA", Toast.LENGTH_LONG
                     ).show();