Merge pull request #941 from StepicOrg/hotfix/1.207.1

Hotfix/1.207.1
StepicOrg · Jan 28, 2022 · 81f6f5b · 81f6f5b
2 parents 3915fa5 + 0fbd050
commit 81f6f5b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/app/src/main/java/org/stepik/android/domain/comment/mapper/CommentsDataMapper.kt b/app/src/main/java/org/stepik/android/domain/comment/mapper/CommentsDataMapper.kt
@@ -28,7 +28,6 @@ constructor(
                 val vote = commentsData
                     .votes
                     .find { it.id == comment.vote }
-                    ?: return@mapNotNull null
 
                 val solution = comment
                     .submission
@@ -57,7 +56,7 @@ constructor(
                     comment = comment,
                     textData = result,
                     user = user,
-                    voteStatus = CommentItem.Data.VoteStatus.Resolved(vote),
+                    voteStatus = if (vote == null) CommentItem.Data.VoteStatus.Unavailable else CommentItem.Data.VoteStatus.Resolved(vote),
                     isFocused = discussionId == comment.id,
                     solution = solution
                 )

diff --git a/app/src/main/java/org/stepik/android/presentation/comment/model/CommentItem.kt b/app/src/main/java/org/stepik/android/presentation/comment/model/CommentItem.kt
@@ -23,6 +23,7 @@ sealed class CommentItem {
         sealed class VoteStatus {
             data class Resolved(val vote: Vote) : VoteStatus()
             object Pending : VoteStatus()
+            object Unavailable : VoteStatus()
         }
 
         data class Solution(

diff --git a/...in/java/org/stepik/android/view/comment/ui/adapter/delegate/CommentDataAdapterDelegate.kt b/...in/java/org/stepik/android/view/comment/ui/adapter/delegate/CommentDataAdapterDelegate.kt
@@ -75,6 +75,7 @@ class CommentDataAdapterDelegate(
 
             voteStatusViewStateDelegate.addState<CommentItem.Data.VoteStatus.Resolved>(commentLike, commentDislike)
             voteStatusViewStateDelegate.addState<CommentItem.Data.VoteStatus.Pending>(root.commentVoteProgress)
+            voteStatusViewStateDelegate.addState<CommentItem.Data.VoteStatus.Unavailable>(commentLike, commentDislike)
 
             commentTagsAdapter += CommentTagsAdapterDelegate()
             with(commentTags) {
@@ -123,25 +124,32 @@ class CommentDataAdapterDelegate(
             commentLike.text = data.comment.epicCount.toString()
             commentDislike.text = data.comment.abuseCount.toString()
 
-            commentLike.isEnabled = data.comment.actions?.vote == true
-            commentDislike.isEnabled = data.comment.actions?.vote == true
-
-            if (data.voteStatus is CommentItem.Data.VoteStatus.Resolved) {
-                commentLike.alpha =
-                    when (data.voteStatus.vote.value) {
-                        Vote.Value.LIKE ->
-                            1f
-                        else ->
-                            0.5f
-                    }
+            commentLike.isEnabled = data.comment.actions?.vote == true && data.voteStatus is CommentItem.Data.VoteStatus.Resolved
+            commentDislike.isEnabled = data.comment.actions?.vote == true && data.voteStatus is CommentItem.Data.VoteStatus.Resolved
+
+            when (data.voteStatus) {
+                is CommentItem.Data.VoteStatus.Resolved -> {
+                    commentLike.alpha =
+                        when (data.voteStatus.vote.value) {
+                            Vote.Value.LIKE ->
+                                1f
+                            else ->
+                                0.5f
+                        }
 
-                commentDislike.alpha =
-                    when (data.voteStatus.vote.value) {
-                        Vote.Value.DISLIKE ->
-                            1f
-                        else ->
-                            0.5f
-                    }
+                    commentDislike.alpha =
+                        when (data.voteStatus.vote.value) {
+                            Vote.Value.DISLIKE ->
+                                1f
+                            else ->
+                                0.5f
+                        }
+                }
+                is CommentItem.Data.VoteStatus.Unavailable -> {
+                    commentLike.alpha = 0.5f
+                    commentDislike.alpha = 0.5f
+                }
+                else -> {}
             }
 
             // solution

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,6 +1,6 @@
 ext.versions = [
-        code                 : 2237,
-        name                 : '1.207',
+        code                 : 2238,
+        name                 : '1.207.1',
 
         minSdk               : 21,
         targetSdk            : 30,