bugfix zvezdice za ocenjivanje

2 files changed, 67 insertions, 34 deletions

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..b7848df 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
@@ -185,22 +185,22 @@ 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)
-        }
+            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/Fragments/FragmentSinglePostDescription.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentSinglePostDescription.kt
index 877fbc4..1f17a11 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentSinglePostDescription.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentSinglePostDescription.kt
@@ -77,7 +77,7 @@ class FragmentSinglePostDescription : Fragment() {
             starNumber=1
             rate(starNumber)
         }
-        star1.setOnClickListener {
+        star2.setOnClickListener {
             //Toast.makeText(this,"kliknuta druga zvezdica",Toast.LENGTH_SHORT).show()
             star1.setImageResource(fullStar)
             star2.setImageResource(fullStar)
@@ -87,7 +87,7 @@ class FragmentSinglePostDescription : Fragment() {
             starNumber=2
             rate(starNumber)
         }
-        star1.setOnClickListener {
+        star3.setOnClickListener {
             //Toast.makeText(this,"kliknuta treca zvezdica",Toast.LENGTH_SHORT).show()
             star1.setImageResource(fullStar)
             star2.setImageResource(fullStar)
@@ -97,8 +97,8 @@ class FragmentSinglePostDescription : Fragment() {
             starNumber=3
             rate(starNumber)
         }
-        star1.setOnClickListener {
-            Toast.makeText(requireActivity(),"kliknuta cetvrta zvezdica",Toast.LENGTH_SHORT).show()
+        star4.setOnClickListener {
+            //Toast.makeText(requireActivity(),"kliknuta cetvrta zvezdica",Toast.LENGTH_SHORT).show()
             star1.setImageResource(fullStar)
             star2.setImageResource(fullStar)
             star3.setImageResource(fullStar)
@@ -107,7 +107,7 @@ class FragmentSinglePostDescription : Fragment() {
             starNumber=4
             rate(starNumber)
         }
-        star1.setOnClickListener {
+        star5.setOnClickListener {
             //Toast.makeText(this,"kliknuta peta zvezdica",Toast.LENGTH_SHORT).show()
             star1.setImageResource(fullStar)
             star2.setImageResource(fullStar)
@@ -140,19 +140,52 @@ class FragmentSinglePostDescription : Fragment() {
                         "--------------",
                         data.ratings.toString() + " " + data.ratingscount.toString()
                     )
-                    when (data.myrating) {
-                        1 -> star1.performClick()
-                        2 -> star1.performClick()
-                        3 -> star3.performClick()
-                        4 -> star4.performClick()
-                        5 -> star5.performClick()
-                        else -> {
-                            val emptyStar = R.drawable.empty_star
-                            star1.setImageResource(emptyStar)
-                            star2.setImageResource(emptyStar)
-                            star3.setImageResource(emptyStar)
-                            star4.setImageResource(emptyStar)
-                            star5.setImageResource(emptyStar)
+                    if(rating.rating==0) {
+                        val emptyStar = R.drawable.empty_star
+                        val fullStar = R.drawable.ic_baseline_star_rate_24
+                        when (data.myrating) {
+                            1 -> {
+                                star1.setImageResource(fullStar)
+                                star2.setImageResource(emptyStar)
+                                star3.setImageResource(emptyStar)
+                                star4.setImageResource(emptyStar)
+                                star5.setImageResource(emptyStar)
+                            }
+                            2 -> {
+                                star1.setImageResource(fullStar)
+                                star2.setImageResource(fullStar)
+                                star3.setImageResource(emptyStar)
+                                star4.setImageResource(emptyStar)
+                                star5.setImageResource(emptyStar)
+                            }
+                            3 -> {
+                                star1.setImageResource(fullStar)
+                                star2.setImageResource(fullStar)
+                                star3.setImageResource(fullStar)
+                                star4.setImageResource(emptyStar)
+                                star5.setImageResource(emptyStar)
+                            }
+                            4 -> {
+                                star1.setImageResource(fullStar)
+                                star2.setImageResource(fullStar)
+                                star3.setImageResource(fullStar)
+                                star4.setImageResource(fullStar)
+                                star5.setImageResource(emptyStar)
+                            }
+                            5 -> {
+                                star1.setImageResource(fullStar)
+                                star2.setImageResource(fullStar)
+                                star3.setImageResource(fullStar)
+                                star4.setImageResource(fullStar)
+                                star5.setImageResource(fullStar)
+                            }
+                            else -> {
+                                star1.setImageResource(emptyStar)
+                                star2.setImageResource(emptyStar)
+                                star3.setImageResource(emptyStar)
+                                star4.setImageResource(emptyStar)
+                                star5.setImageResource(emptyStar)
+                            }
                         }
                     }
                     /*Toast.makeText(