fix: review rework

app/src/main/java/ani/dantotsu/home/status/CircleView.kt

@@ -12,13 +12,14 @@ import ani.dantotsu.getThemeColor
 
 class CircleView(context: Context, attrs: AttributeSet?) : View(context, attrs) {
     private var parts: Int = 3
-    private var gapAngle: Float = 9f
+    private var gapAngle: Float = 12f
     private val path = Path()
     private var isUser = false
     private var booleanList = listOf<Boolean>()
     private val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Paint.Style.STROKE
         strokeWidth = 6f
+        strokeCap = Paint.Cap.ROUND
     }
 
     @SuppressLint("DrawAllocation")

app/src/main/java/ani/dantotsu/home/status/Stories.kt

@@ -462,7 +462,7 @@ class Stories @JvmOverloads constructor(
         binding.activityLike.setColorFilter(if (story.isLiked == true) likeColor else notLikeColor)
         binding.replyCount.text = story.replyCount.toString()
         binding.activityLikeCount.text = story.likeCount.toString()
-        binding.activityLike.setColorFilter(ContextCompat.getColor(context, R.color.bg_opp))
+        binding.activityReplies.setColorFilter(ContextCompat.getColor(context, R.color.bg_opp))
         binding.activityLikeContainer.setOnClickListener {
             like()
         }

app/src/main/java/ani/dantotsu/media/ReviewActivity.kt

@@ -77,7 +77,7 @@ class ReviewActivity : AppCompatActivity() {
         binding.listBack.setOnClickListener { onBackPressedDispatcher.onBackPressed() }
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val response = Anilist.query.getReviews(mediaId)
+            val response = Anilist.query.getReviews(mediaId)?.data?.page
             withContext(Dispatchers.Main) {
                 binding.listProgressBar.visibility = View.GONE
                 binding.listRecyclerView.setOnTouchListener { _, event ->
@@ -94,9 +94,9 @@ class ReviewActivity : AppCompatActivity() {
                     }
                     false
                 }
-                currentPage = response?.data?.page?.pageInfo?.currentPage ?: 1
+                currentPage = response?.pageInfo?.currentPage ?: 1
-                hasNextPage = response?.data?.page?.pageInfo?.hasNextPage ?: false
+                hasNextPage = response?.pageInfo?.hasNextPage ?: false
-                response?.data?.page?.reviews?.let {
+                response?.reviews?.let {
                     reviews.addAll(it)
                     fillList()
                 }
@@ -122,29 +122,10 @@ class ReviewActivity : AppCompatActivity() {
     private fun fillList() {
         adapter.clear()
         reviews.forEach {
-            val username = it.user?.name ?: "Unknown"
-            val name = SpannableString(username + " - " + it.score)
-            //change the size of the score
-            name.setSpan(
-                android.text.style.RelativeSizeSpan(0.9f),
-                0,
-                name.length,
-                android.text.Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
-            //give the text an underline
-            name.setSpan(
-                android.text.style.UnderlineSpan(),
-                username.length + 3,
-                name.length,
-                android.text.Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
             adapter.add(
-                FollowerItem(
+                ReviewAdapter(
-                    it.id,
+                    it,
-                    name,
+                    this,
-                    it.user?.avatar?.medium,
-                    it.user?.bannerImage,
-                    it.summary,
                     this::onUserClick
                 )
             )

app/src/main/java/ani/dantotsu/media/ReviewAdapter.kt

@@ -0,0 +1,129 @@
+package ani.dantotsu.media
+
+
+import android.content.Context
+import android.text.SpannableString
+import android.view.View
+import androidx.lifecycle.lifecycleScope
+import ani.dantotsu.R
+import ani.dantotsu.blurImage
+import ani.dantotsu.connections.anilist.Anilist
+import ani.dantotsu.connections.anilist.api.Query
+import ani.dantotsu.databinding.ItemFollowerBinding
+import ani.dantotsu.databinding.ItemReviewsBinding
+import ani.dantotsu.getThemeColor
+import ani.dantotsu.loadImage
+import ani.dantotsu.profile.activity.ActivityItemBuilder
+import ani.dantotsu.toast
+import com.xwray.groupie.viewbinding.BindableItem
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class ReviewAdapter(
+    private var review: Query.Review,
+    val context: ReviewActivity,
+    val clickCallback: (Int) -> Unit
+
+) : BindableItem<ItemReviewsBinding>() {
+    private lateinit var binding: ItemReviewsBinding
+
+    override fun bind(viewBinding: ItemReviewsBinding, position: Int) {
+        binding = viewBinding
+        binding.reviewUserName.text = review.user?.name
+        binding.reviewUserAvatar.loadImage(review.user?.avatar?.medium)
+        binding.reviewText.text = review.summary
+        binding.reviewPostTime.text = ActivityItemBuilder.getDateTime(review.createdAt)
+        binding.reviewTag.text = "[${review.score}]"
+        binding.root.setOnClickListener { clickCallback(review.id) }
+        userVote(review.userRating)
+        enableVote()
+        binding.reviewTotalVotes.text = review.rating.toString()
+    }
+
+    override fun getLayout(): Int {
+        return R.layout.item_reviews
+    }
+
+    override fun initializeViewBinding(view: View): ItemReviewsBinding {
+        return ItemReviewsBinding.bind(view)
+    }
+    private fun userVote(type: String) {
+        when (type) {
+            "NO_VOTE" -> {
+                binding.reviewUpVote.setImageResource(R.drawable.ic_round_upvote_inactive_24)
+                binding.reviewDownVote.setImageResource(R.drawable.ic_round_upvote_inactive_24)
+                binding.reviewUpVote.alpha = 0.6f
+                binding.reviewDownVote.alpha = 0.6f
+            }
+
+            "UP_VOTE" -> {
+                binding.reviewUpVote.setImageResource(R.drawable.ic_round_upvote_active_24)
+                binding.reviewDownVote.setImageResource(R.drawable.ic_round_upvote_inactive_24)
+                binding.reviewUpVote.alpha = 1f
+                binding.reviewDownVote.alpha = 0.6f
+            }
+
+            "DOWN_VOTE" -> {
+                binding.reviewUpVote.setImageResource(R.drawable.ic_round_upvote_inactive_24)
+                binding.reviewDownVote.setImageResource(R.drawable.ic_round_upvote_active_24)
+                binding.reviewDownVote.alpha = 1f
+                binding.reviewUpVote.alpha = 0.6f
+            }
+        }
+    }
+
+    private fun rateReview(rating: String) {
+        disableVote()
+        context.lifecycleScope.launch {
+            val result = Anilist.mutation.rateReview(review.id, rating)
+            if (result != null) {
+                withContext(Dispatchers.Main) {
+                    val res = result.data.rateReview
+                    review.rating = res.rating
+                    review.ratingAmount = res.ratingAmount
+                    review.userRating = res.userRating
+                    userVote(review.userRating)
+                    binding.reviewTotalVotes.text = review.rating.toString()
+                    userVote(review.userRating)
+                    enableVote()
+                }
+            } else {
+                withContext(Dispatchers.Main) {
+                    toast(
+                        context.getString(R.string.error_message, "response is null")
+                    )
+                    enableVote()
+                }
+            }
+        }
+    }
+
+    private fun disableVote() {
+        binding.reviewUpVote.setOnClickListener(null)
+        binding.reviewDownVote.setOnClickListener(null)
+        binding.reviewUpVote.isEnabled = false
+        binding.reviewDownVote.isEnabled = false
+    }
+
+    private fun enableVote() {
+        binding.reviewUpVote.setOnClickListener {
+            if (review.userRating == "UP_VOTE") {
+                rateReview("NO_VOTE")
+            } else {
+                rateReview("UP_VOTE")
+            }
+            disableVote()
+        }
+        binding.reviewDownVote.setOnClickListener {
+            if (review.userRating == "DOWN_VOTE") {
+                rateReview("NO_VOTE")
+            } else {
+                rateReview("DOWN_VOTE")
+            }
+            disableVote()
+        }
+        binding.reviewUpVote.isEnabled = true
+        binding.reviewDownVote.isEnabled = true
+    }
+}

app/src/main/res/layout/activity_review_view.xml

@@ -2,6 +2,7 @@
 <androidx.core.widget.NestedScrollView 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:scrollbars="none"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

app/src/main/res/layout/item_developer.xml

@@ -28,7 +28,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="0dp"
             android:gravity="center_vertical"
@@ -45,7 +45,9 @@
                 android:id="@+id/devRole"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/poppins_bold" />
+                android:text="@string/lorem_ipsum"
+                android:maxLines="2"
+                android:fontFamily="@font/poppins_semi_bold" />
         </LinearLayout>
     </LinearLayout>
 

app/src/main/res/layout/item_reviews.xml

@@ -0,0 +1,182 @@
+<?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/commentsCardView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="8dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="4dp">
+
+    <LinearLayout
+        android:id="@+id/linearLayout5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="0dp"
+        android:paddingEnd="8dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/reviewUserAvatarContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="12dp"
+            android:backgroundTint="@color/transparent"
+            app:cardCornerRadius="64dp"
+            app:strokeColor="@color/transparent">
+
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/reviewUserAvatar"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_gravity="center"
+                app:srcCompat="@drawable/ic_round_add_circle_24"
+                tools:ignore="ContentDescription,ImageContrastCheck"
+                tools:tint="@color/bg_black_50" />
+        </com.google.android.material.card.MaterialCardView>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/reviewUserDetailsLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintStart_toStartOf="@+id/reviewText"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/reviewUserName"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="4dp"
+            android:ellipsize="end"
+            android:fontFamily="@font/poppins_bold"
+            android:paddingTop="1dp"
+            android:paddingBottom="0dp"
+            android:singleLine="true"
+            android:text="Username"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="15sp"
+            tools:ignore="HardcodedText,RtlSymmetry" />
+
+        <TextView
+            android:id="@+id/reviewTag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
+            android:alpha="0.8"
+            android:fontFamily="@font/poppins_bold"
+            android:text="[1]"
+            android:textSize="12sp"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:alpha="0.6"
+            android:fontFamily="@font/poppins_semi_bold"
+            android:text="•"
+            android:textSize="16sp"
+            tools:ignore="HardcodedText,RtlSymmetry" />
+
+        <TextView
+            android:id="@+id/reviewPostTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
+            android:alpha="0.6"
+            android:fontFamily="@font/poppins_semi_bold"
+            android:text="Time"
+            android:textSize="12sp"
+            tools:ignore="HardcodedText,RtlSymmetry" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/reviewText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:fontFamily="@font/poppins_semi_bold"
+        android:maxLines="2"
+        android:scrollHorizontally="false"
+        android:text="@string/slogan"
+        android:textSize="12sp"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toStartOf="@+id/linearLayout7"
+        app:layout_constraintHeight_max="200dp"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/linearLayout5"
+        app:layout_constraintTop_toBottomOf="@+id/reviewUserDetailsLayout" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="52dp"
+        android:orientation="horizontal"
+        app:layout_constraintStart_toEndOf="@+id/linearLayout5"
+        app:layout_constraintTop_toBottomOf="@+id/reviewText">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+        <ImageView
+            android:id="@+id/reviewUpVote"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="12dp"
+            android:alpha="0.6"
+            android:padding="2dp"
+            app:srcCompat="@drawable/ic_round_upvote_inactive_24"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/reviewTotalVotes"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginStart="4dp"
+            android:alpha="0.6"
+            android:fontFamily="@font/poppins_semi_bold"
+            android:gravity="center"
+            android:text="100"
+            android:textSize="12sp"
+            app:layout_constraintStart_toEndOf="@+id/commentUpVote"
+            app:layout_constraintTop_toBottomOf="@+id/reviewText"
+            tools:ignore="HardcodedText" />
+
+        <ImageView
+            android:id="@+id/reviewDownVote"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="4dp"
+            android:alpha="0.6"
+            android:padding="2dp"
+            android:rotation="180"
+            app:layout_constraintStart_toEndOf="@+id/commentTotalVotes"
+            app:layout_constraintTop_toBottomOf="@+id/reviewText"
+            app:srcCompat="@drawable/ic_round_upvote_inactive_24"
+            tools:ignore="ContentDescription" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayout7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="4dp"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>