Skip to content

Commit

Permalink
- renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
Arkariang committed May 14, 2021
1 parent d43005c commit 3889ac9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,10 @@ class ProjectActivity :
.observeOn(AndroidSchedulers.mainThread())
.subscribe { this.startCommentsActivity(it) }

this.viewModel.outputs.startCommentsThreadedActivity()
this.viewModel.outputs.startRootCommentsActivity()
.compose(bindToLifecycle())
.observeOn(AndroidSchedulers.mainThread())
.subscribe { this.startCommentsThreadedActivity(it) }
.subscribe { this.startRootCommentsActivity(it) }

this.viewModel.outputs.startCreatorBioWebViewActivity()
.compose(bindToLifecycle())
Expand Down Expand Up @@ -670,7 +670,7 @@ class ProjectActivity :
startActivityWithTransition(intent, R.anim.slide_in_right, R.anim.fade_out_slide_out_left)
}

private fun startCommentsThreadedActivity(projectAndData: Pair<Project, ProjectData>) {
private fun startRootCommentsActivity(projectAndData: Pair<Project, ProjectData>) {
// TODO: Start the new activity defined in https://kickstarter.atlassian.net/browse/NT-1920
}

Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/kickstarter/viewmodels/ProjectViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ interface ProjectViewModel {
/** Emits when we should start [com.kickstarter.ui.activities.CommentsActivity]. */
fun startCommentsActivity(): Observable<Pair<Project, ProjectData>>

/** Emits when we should start [com.kickstarter.ui.activities. TODO: DEFINE NAME https://kickstarter.atlassian.net/browse/NT-1920]. */
fun startCommentsThreadedActivity(): Observable<Pair<Project, ProjectData>>
/** Emits when we should start [com.kickstarter.ui.activities.RootCommentsActivity]. */
fun startRootCommentsActivity(): Observable<Pair<Project, ProjectData>>

/** Emits when we should start the creator bio [com.kickstarter.ui.activities.CreatorBioActivity]. */
fun startCreatorBioWebViewActivity(): Observable<Project>
Expand Down Expand Up @@ -312,7 +312,7 @@ interface ProjectViewModel {
private val showUpdatePledgeSuccess = PublishSubject.create<Void>()
private val startCampaignWebViewActivity = PublishSubject.create<ProjectData>()
private val startCommentsActivity = PublishSubject.create<Pair<Project, ProjectData>>()
private val startCommentsThreadedActivity = PublishSubject.create<Pair<Project, ProjectData>>()
private val startRootCommentsActivity = PublishSubject.create<Pair<Project, ProjectData>>()
private val startCreatorBioWebViewActivity = PublishSubject.create<Project>()
private val startCreatorDashboardActivity = PublishSubject.create<Project>()
private val startLoginToutActivity = PublishSubject.create<Void>()
Expand Down Expand Up @@ -498,7 +498,7 @@ interface ProjectViewModel {
.compose<Project>(takeWhen(this.commentsTextViewClicked))
.compose<Pair<Project, ProjectData>>(combineLatestPair(projectData))
.compose(bindToLifecycle())
.subscribe(this.startCommentsThreadedActivity)
.subscribe(this.startRootCommentsActivity)

currentProject
.compose<Project>(takeWhen(this.creatorDashboardButtonClicked))
Expand Down Expand Up @@ -1083,7 +1083,7 @@ interface ProjectViewModel {
override fun startCommentsActivity(): Observable<Pair<Project, ProjectData>> = this.startCommentsActivity

@NonNull
override fun startCommentsThreadedActivity(): Observable<Pair<Project, ProjectData>> = this.startCommentsThreadedActivity
override fun startRootCommentsActivity(): Observable<Pair<Project, ProjectData>> = this.startRootCommentsActivity

@NonNull
override fun startCreatorBioWebViewActivity(): Observable<Project> = this.startCreatorBioWebViewActivity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class ProjectViewModelTest : KSRobolectricTestCase() {
private val showUpdatePledgeSuccess = TestSubscriber<Void>()
private val startCampaignWebViewActivity = TestSubscriber<ProjectData>()
private val startCommentsActivity = TestSubscriber<Pair<Project, ProjectData>>()
private val startCommentsThreadedActivity = TestSubscriber<Pair<Project, ProjectData>>()
private val startRootCommentsActivityivity = TestSubscriber<Pair<Project, ProjectData>>()
private val startCreatorBioWebViewActivity = TestSubscriber<Project>()
private val startCreatorDashboardActivity = TestSubscriber<Project>()
private val startLoginToutActivity = TestSubscriber<Void>()
Expand Down Expand Up @@ -108,7 +108,7 @@ class ProjectViewModelTest : KSRobolectricTestCase() {
this.vm.outputs.projectData().map { pD -> pD.project().isStarred }.subscribe(this.savedTest)
this.vm.outputs.startCampaignWebViewActivity().subscribe(this.startCampaignWebViewActivity)
this.vm.outputs.startCommentsActivity().subscribe(this.startCommentsActivity)
this.vm.outputs.startCommentsThreadedActivity().subscribe(this.startCommentsThreadedActivity)
this.vm.outputs.startRootCommentsActivity().subscribe(this.startRootCommentsActivityivity)
this.vm.outputs.startCreatorBioWebViewActivity().subscribe(this.startCreatorBioWebViewActivity)
this.vm.outputs.startCreatorDashboardActivity().subscribe(this.startCreatorDashboardActivity)
this.vm.outputs.startMessagesActivity().subscribe(this.startMessagesActivity)
Expand Down Expand Up @@ -594,7 +594,7 @@ class ProjectViewModelTest : KSRobolectricTestCase() {

this.vm.inputs.commentsTextViewClicked()
this.startCommentsActivity.assertValues(projectAndData)
this.startCommentsThreadedActivity.assertNoValues()
this.startRootCommentsActivityivity.assertNoValues()
}

@Test
Expand All @@ -614,7 +614,7 @@ class ProjectViewModelTest : KSRobolectricTestCase() {

this.vm.inputs.commentsTextViewClicked()
this.startCommentsActivity.assertNoValues()
this.startCommentsThreadedActivity.assertValues(projectAndData)
this.startRootCommentsActivityivity.assertValues(projectAndData)
}

@Test
Expand All @@ -633,7 +633,7 @@ class ProjectViewModelTest : KSRobolectricTestCase() {
this.vm.intent(Intent().putExtra(IntentKey.PROJECT, project))

this.vm.inputs.commentsTextViewClicked()
this.startCommentsThreadedActivity.assertValues(projectAndData)
this.startRootCommentsActivityivity.assertValues(projectAndData)
this.startCommentsActivity.assertNoValues()
}

Expand All @@ -653,7 +653,7 @@ class ProjectViewModelTest : KSRobolectricTestCase() {
this.vm.intent(Intent().putExtra(IntentKey.PROJECT, project))

this.vm.inputs.commentsTextViewClicked()
this.startCommentsThreadedActivity.assertNoValues()
this.startRootCommentsActivityivity.assertNoValues()
this.startCommentsActivity.assertValues(projectAndData)
}

Expand Down

0 comments on commit 3889ac9

Please sign in to comment.