NT-1968:UX – Add comment composer to thread #1291

hadia · 2021-06-15T14:28:39Z

📲 What

Add comment composer to thread Activity

🤔 Why

🛠 How

1- pass project from comment activity to thread activity
2- add the same logic to check when to show comment composer

👀 See

device-2021-06-15-163912.mp4

device-2021-06-15-161330.mp4

📋 QA

Same As Comment Composer
Make sure you have a project that you are not backing, a project that you are backing, and a project that you created, and all projects must have comments. Test going to the comments directly from the project page, as well as from the updates page. Then test the different states listed below.

🔴 = no comment composer
🟡 = comment composer disabled
🟢 = comment composer enabled

These are the different states to test:
Logged out = 🔴
Logged in and not backing = 🟡
Logged in and backing = 🟢
Logged in and creator = 🟢

-QA
Showing keyboard at the start when pressing replay
and keyboard is hidden in case pressing view replies

Story 📖

https://kickstarter.atlassian.net/browse/NT-1968

…vity

Arkariang · 2021-06-15T15:17:53Z

app/src/main/java/com/kickstarter/ui/activities/CommentsActivity.kt

@@ -217,9 +225,10 @@ class CommentsActivity :
     * // TODO: Once the viewReplies UI is completed call this method with openKeyboard = false


you can remove now the TODO's :)

leighdouglas · 2021-06-15T15:21:33Z

app/src/main/java/com/kickstarter/ui/activities/CommentsActivity.kt

@@ -193,7 +201,7 @@ class CommentsActivity :
    }

    override fun onReplyButtonClicked(comment: Comment) {
-        startThreadActivity(comment, true)
+        viewModel.inputs.onReplayClicked(comment, true)


nit: "replay" should be "reply"

leighdouglas · 2021-06-15T15:21:47Z

app/src/main/java/com/kickstarter/ui/activities/CommentsActivity.kt

@@ -204,7 +212,7 @@ class CommentsActivity :
    }

    override fun onCommentRepliesClicked(comment: Comment) {
-        startThreadActivity(comment, false)
+        viewModel.inputs.onReplayClicked(comment, false)


nit: same as comment above.

app/src/main/java/com/kickstarter/viewmodels/ThreadViewModel.kt

leighdouglas · 2021-06-15T15:26:08Z

app/src/main/java/com/kickstarter/viewmodels/ThreadViewModel.kt

        }

+        private fun getCommentComposerStatus(projectAndUser: Pair<Project, User?>) =


I wonder if we can abstract this logic into something separate since this is being reused in a couple places? Just a thought.

leighdouglas

Looks great! Just a small thing, I made a comment about the spelling of replay that should be corrected to reply -> I noticed that most instances of this word are spelled incorrectly. Could you take a sec to look through and make sure they're all spelled correctly? Otherwise great job! 🎉 🚀

Arkariang

lgtm! as soon as the linter is fixed is good to go 👍

codecov · 2021-06-15T17:57:08Z

Codecov Report

Merging #1291 (e8d8f60) into master (4bb43e3) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #1291   +/-   ##
=========================================
  Coverage     74.34%   74.34%           
  Complexity      739      739           
=========================================
  Files           221      221           
  Lines          6646     6646           
  Branches        405      405           
=========================================
  Hits           4941     4941           
  Misses         1569     1569           
  Partials        136      136

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4bb43e3...e8d8f60. Read the comment docs.

leighdouglas · 2021-06-16T16:44:54Z

app/src/main/java/com/kickstarter/viewmodels/CommentsViewModel.kt

@@ -68,6 +70,7 @@ interface CommentsViewModel {
        private val refresh = PublishSubject.create<Void>()
        private val nextPage = PublishSubject.create<Void>()
        private val onShowGuideLinesLinkClicked = PublishSubject.create<Void>()
+        private val onReplayClicked = PublishSubject.create<Pair<Comment, Boolean>>()


This should be corrected to onReplyClicked

leighdouglas · 2021-06-16T16:45:23Z

app/src/main/java/com/kickstarter/viewmodels/CommentsViewModel.kt

@@ -342,6 +353,9 @@ interface CommentsViewModel {
        override fun isRefreshing(): Observable<Boolean> = isRefreshing
        override fun insertNewCommentToList(comment: String, createdAt: DateTime) = insertNewCommentToList.onNext(Pair(comment, createdAt))

+        override fun onReplyClicked(comment: Comment, openKeyboard: Boolean) = onReplayClicked.onNext(Pair(comment, openKeyboard))


likewise, this should be onReplyClicked

leighdouglas · 2021-06-16T16:45:49Z

app/src/main/java/com/kickstarter/viewmodels/ThreadViewModel.kt

@@ -22,6 +28,10 @@ interface ThreadViewModel {

        /** Will tell to the compose view if should open the keyboard */
        fun shouldFocusOnCompose(): Observable<Boolean>
+
+        fun currentUserAvatar(): Observable<String?>
+        fun replayComposerStatus(): Observable<CommentComposerStatus>


nit: replyComposerStatus()

leighdouglas · 2021-06-16T16:46:13Z

app/src/main/java/com/kickstarter/viewmodels/ThreadViewModel.kt

@@ -30,6 +40,9 @@ interface ThreadViewModel {

        private val rootComment = BehaviorSubject.create<Comment>()
        private val focusOnCompose = BehaviorSubject.create<Boolean>()
+        private val currentUserAvatar = BehaviorSubject.create<String?>()
+        private val replayComposerStatus = BehaviorSubject.create<CommentComposerStatus>()
+        private val showReplayComposer = BehaviorSubject.create<Boolean>()


nit: change to replyComposerStatus and showReplyComposer

leighdouglas · 2021-06-16T16:48:41Z

app/src/main/java/com/kickstarter/viewmodels/ThreadViewModel.kt

        private fun getCommentFromIntent() = intent()
            .map { it.getParcelableExtra(IntentKey.COMMENT) as Comment? }
            .ofType(Comment::class.java)

        override fun getRootComment(): Observable<Comment> = this.rootComment
        override fun shouldFocusOnCompose(): Observable<Boolean> = this.focusOnCompose
+        override fun currentUserAvatar(): Observable<String?> = currentUserAvatar
+        override fun replayComposerStatus(): Observable<CommentComposerStatus> = replayComposerStatus
+        override fun showReplayComposer(): Observable<Boolean> = showReplayComposer


nit: change to replyComposerStatus() and showReplyComposer()

leighdouglas · 2021-06-16T16:50:23Z

app/src/test/java/com/kickstarter/viewmodels/ThreadViewModelTest.kt

@@ -16,6 +20,9 @@ class ThreadViewModelTest : KSRobolectricTestCase() {
    private val getComment = TestSubscriber<Comment>()
    private val focusCompose = TestSubscriber<Boolean>()

+    private val replayComposerStatus = TestSubscriber<CommentComposerStatus>()
+    private val showReplayComposer = TestSubscriber<Boolean>()


nit: change to replyComposerStatus and showReplyComposer

# Conflicts: # app/src/main/java/com/kickstarter/viewmodels/CommentsViewModel.kt

# Conflicts: # app/src/test/java/com/kickstarter/viewmodels/CommentsViewModelTest.kt

…tin/NT-2059-update-stripe-sdk * 'master' of github.com:kickstarter/android-oss: - previous version build code NT-1968:UX – Add comment composer to thread (#1291) Remove underline (#1296)

hadia added 4 commits June 15, 2021 15:51

HAndle Add comment composer to thread Activity

f36766e

Add test

ae1037f

Add start thread activity to viewModel to pass project to thread acti…

af8fae8

…vity

Add test case

9c5fcd0

hadia added feature ✨ UI 🎨 labels Jun 15, 2021

hadia requested review from Arkariang, leighdouglas and sunday-okpoluaefe June 15, 2021 14:28

Show key board in case pressing replay

5178b23

Arkariang reviewed Jun 15, 2021

View reviewed changes

leighdouglas reviewed Jun 15, 2021

View reviewed changes

Arkariang reviewed Jun 15, 2021

View reviewed changes

app/src/main/java/com/kickstarter/viewmodels/ThreadViewModel.kt Show resolved Hide resolved

leighdouglas reviewed Jun 15, 2021

View reviewed changes

leighdouglas approved these changes Jun 15, 2021

View reviewed changes

Merge branch 'master' into hadia/Add_comment_composer_to_thread

da8b3e1

Arkariang approved these changes Jun 15, 2021

View reviewed changes

hadia added 2 commits June 15, 2021 19:37

Merge branch 'master' into hadia/Add_comment_composer_to_thread

41c41a3

Rename

57cfabc

leighdouglas reviewed Jun 16, 2021

View reviewed changes

hadia added 3 commits June 16, 2021 19:01

Rename to reply

a17ebb9

Rename to reply

6497e50

Merge branch 'master' into hadia/Add_comment_composer_to_thread

959fcd1

# Conflicts: # app/src/main/java/com/kickstarter/viewmodels/CommentsViewModel.kt

Merge branch 'master' into hadia/Add_comment_composer_to_thread

e8d8f60

# Conflicts: # app/src/test/java/com/kickstarter/viewmodels/CommentsViewModelTest.kt

hadia merged commit 1bf8878 into master Jun 17, 2021

hadia deleted the hadia/Add_comment_composer_to_thread branch June 17, 2021 19:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NT-1968:UX – Add comment composer to thread #1291

NT-1968:UX – Add comment composer to thread #1291

hadia commented Jun 15, 2021 •

edited

Loading

Arkariang Jun 15, 2021

leighdouglas Jun 15, 2021

leighdouglas Jun 15, 2021

leighdouglas Jun 15, 2021

leighdouglas left a comment

Arkariang left a comment

codecov bot commented Jun 15, 2021 •

edited

Loading

leighdouglas Jun 16, 2021

leighdouglas Jun 16, 2021

leighdouglas Jun 16, 2021

hadia Jun 16, 2021

leighdouglas Jun 16, 2021

hadia Jun 16, 2021

leighdouglas Jun 16, 2021

leighdouglas Jun 16, 2021

hadia Jun 16, 2021

		@@ -217,9 +225,10 @@ class CommentsActivity :
		* // TODO: Once the viewReplies UI is completed call this method with openKeyboard = false

		}

		private fun getCommentComposerStatus(projectAndUser: Pair<Project, User?>) =

NT-1968:UX – Add comment composer to thread #1291

NT-1968:UX – Add comment composer to thread #1291

Conversation

hadia commented Jun 15, 2021 • edited Loading

📲 What

🤔 Why

🛠 How

👀 See

📋 QA

Story 📖

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leighdouglas left a comment

Choose a reason for hiding this comment

Arkariang left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 15, 2021 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hadia commented Jun 15, 2021 •

edited

Loading

codecov bot commented Jun 15, 2021 •

edited

Loading