archive-gh-me/FastHub
1
0
Fork 0
mirror of https://github.com/k0shk0sh/FastHub.git synced 2025-12-08 19:05:54 +00:00
Code Issues Projects Releases Wiki Activity

display pr state

Browse Source
This commit is contained in:
k0shk0sh 2019-09-01 15:00:04 +02:00
parent 2c0c4cafd6
commit 0359487f5b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/fastaccess/github/ui/adapter/viewholder/IssueContentViewHolder.kt
View File

@ -234,7 +234,7 @@ class IssueContentViewHolder(parent: ViewGroup) : BaseViewHolder<TimelineModel>(
.clickable("(${model.commit?.abbreviatedOid})")
.append(" that referenced this issue ${model.createdAt?.timeAgo()}")
.newline()
.append(model.commit?.message)
.bold(model.commit?.message)
}
}
}

16
app/src/main/java/com/fastaccess/github/usecase/issuesprs/GetPullRequestTimelineUseCase.kt
View File

@ -5,12 +5,13 @@ import com.apollographql.apollo.api.Input
import com.apollographql.apollo.rx2.Rx2Apollo
import com.fastaccess.data.model.PageInfoModel
import com.fastaccess.data.model.TimelineModel
import com.fastaccess.data.persistence.models.MyIssuesPullsModel
import com.fastaccess.data.repository.SchedulerProvider
import com.fastaccess.github.extensions.addIfNotNull
import github.GetPullRequestTimelineQuery
import github.GetPullRequestTimelineQuery.*
import github.type.PullRequestState
import io.reactivex.Observable
import timber.log.Timber
import javax.inject.Inject
/**
@ -50,7 +51,17 @@ class GetPullRequestTimelineUseCase @Inject constructor(
when (node) {
is AsIssueComment -> node.fragments.comment?.let { list.add(getComment(it)) }
is AsCrossReferencedEvent -> node.fragments.crossReferenced?.let { list.add(getCrossReference(it)) }
is AsClosedEvent -> node.fragments.closed?.let { list.add(getClosed(it)) }
is AsClosedEvent -> node.fragments.closed?.let {
list.add(
if (PullRequestState.MERGED == pullRequest.state) {
getClosed(it).apply {
closeOpenEventModel?.pullRequest = MyIssuesPullsModel(state = pullRequest.state.rawValue(), isPr = true)
}
} else {
getClosed(it)
}
)
}
is AsReopenedEvent -> node.fragments.reopened?.let { list.add(getReopened(it)) }
is AsSubscribedEvent -> node.fragments.subscribed?.let { list.add(getSubscribed(it)) }
is AsUnsubscribedEvent -> node.fragments.unsubscribed?.let { list.add(getUnsubscribed(it)) }
@ -67,7 +78,6 @@ class GetPullRequestTimelineUseCase @Inject constructor(
is AsTransferredEvent -> node.fragments.transferred?.let { list.add(getTransferred(it)) }
}
}
Timber.e("${list.size}")
return@map Pair(pageInfo, list)
}
}

1
data/src/main/graphql/github/issues_prs.graphql
View File

@ -158,6 +158,7 @@ query getPullRequestTimeline($login: String!, $repo: String!, $number: Int!, $pa
pullRequest(number: $number) {
headRefName
baseRefName
state
timelineItems(first: 30, after: $page, itemTypes: [ISSUE_COMMENT, CLOSED_EVENT, REOPENED_EVENT, REFERENCED_EVENT, ASSIGNED_EVENT,
UNASSIGNED_EVENT, LABELED_EVENT, UNLABELED_EVENT, MILESTONED_EVENT, DEMILESTONED_EVENT, RENAMED_TITLE_EVENT,
LOCKED_EVENT, UNLOCKED_EVENT, TRANSFERRED_EVENT, PULL_REQUEST_COMMIT, PULL_REQUEST_COMMIT_COMMENT_THREAD,