From 385198e69a50419d30750e0500ac2672909bbd54 Mon Sep 17 00:00:00 2001 From: rebelonion <87634197+rebelonion@users.noreply.github.com> Date: Sun, 17 Mar 2024 21:07:54 -0500 Subject: [PATCH] fix: text | reply bar not hiding --- .../main/java/ani/dantotsu/media/comments/CommentItem.kt | 8 ++++---- .../java/ani/dantotsu/media/comments/CommentsFragment.kt | 8 +++++--- .../notifications/comment/CommentNotificationWorker.kt | 2 +- .../kanade/tachiyomi/data/notification/Notifications.kt | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt b/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt index d158fcd9..4bd541f7 100644 --- a/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt +++ b/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt @@ -130,12 +130,12 @@ class CommentItem(val comment: Comment, viewBinding.modBadge.visibility = if (comment.isMod == true) View.VISIBLE else View.GONE viewBinding.adminBadge.visibility = if (comment.isAdmin == true) View.VISIBLE else View.GONE viewBinding.commentDelete.setOnClickListener { - dialogBuilder("Delete CommentNotificationWorker", "Are you sure you want to delete this comment?") { + dialogBuilder("Delete Comment", "Are you sure you want to delete this comment?") { val scope = CoroutineScope(Dispatchers.Main + SupervisorJob()) scope.launch { val success = CommentsAPI.deleteComment(comment.commentId) if (success) { - snackString("CommentNotificationWorker Deleted") + snackString("Comment Deleted") parentSection.remove(this@CommentItem) } } @@ -153,12 +153,12 @@ class CommentItem(val comment: Comment, } } viewBinding.commentReport.setOnClickListener { - dialogBuilder("Report CommentNotificationWorker", "Only report comments that violate the rules. Are you sure you want to report this comment?") { + dialogBuilder("Report Comment", "Only report comments that violate the rules. Are you sure you want to report this comment?") { val scope = CoroutineScope(Dispatchers.Main + SupervisorJob()) scope.launch { val success = CommentsAPI.reportComment(comment.commentId, comment.username, commentsFragment.mediaName, comment.userId) if (success) { - snackString("CommentNotificationWorker Reported") + snackString("Comment Reported") } } } diff --git a/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt b/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt index 8a41e095..e0fe6203 100644 --- a/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/comments/CommentsFragment.kt @@ -264,7 +264,7 @@ class CommentsFragment : Fragment() { 300, activity.binding.commentInput.text.length ) - snackString("CommentNotificationWorker cannot be longer than 300 characters") + snackString("Comment cannot be longer than 300 characters") } } }) @@ -475,6 +475,7 @@ class CommentsFragment : Fragment() { } InteractionState.REPLY -> { + activity.binding.commentReplyToContainer.visibility = View.GONE activity.binding.commentInput.setText("") val imm = activity.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager imm.hideSoftInputFromWindow(activity.binding.commentInput.windowToken, 0) @@ -602,7 +603,7 @@ class CommentsFragment : Fragment() { private fun processComment() { val commentText = activity.binding.commentInput.text.toString() if (commentText.isEmpty()) { - snackString("CommentNotificationWorker cannot be empty") + snackString("Comment cannot be empty") return } @@ -619,6 +620,7 @@ class CommentsFragment : Fragment() { null ) } + resetOldState() } } @@ -638,7 +640,7 @@ class CommentsFragment : Fragment() { groups.forEach { item -> if (item is CommentItem && item.comment.commentId == commentWithInteraction?.comment?.commentId) { updateCommentItem(item, commentText) - snackString("CommentNotificationWorker edited") + snackString("Comment edited") } } } diff --git a/app/src/main/java/ani/dantotsu/notifications/comment/CommentNotificationWorker.kt b/app/src/main/java/ani/dantotsu/notifications/comment/CommentNotificationWorker.kt index c3276d67..5ecc65db 100644 --- a/app/src/main/java/ani/dantotsu/notifications/comment/CommentNotificationWorker.kt +++ b/app/src/main/java/ani/dantotsu/notifications/comment/CommentNotificationWorker.kt @@ -97,7 +97,7 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet } NotificationType.COMMENT_REPLY -> { - val title = "New CommentNotificationWorker Reply" + val title = "New Comment Reply" val mediaName = names[it.mediaId]?.title ?: "Unknown" val message = "${it.username} replied to your comment in $mediaName" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt index 5db7ff8f..2e4ff107 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt @@ -147,7 +147,7 @@ object Notifications { setGroup(GROUP_COMMENTS) }, buildNotificationChannel(CHANNEL_COMMENT_WARING, IMPORTANCE_HIGH) { - setName("CommentNotificationWorker Warnings") + setName("Comment Warnings") setGroup(GROUP_COMMENTS) }, buildNotificationChannel(CHANNEL_ANILIST, IMPORTANCE_DEFAULT) {