diff --git a/app/src/main/java/com/fastaccess/github/ui/adapter/viewholder/IssueContentViewHolder.kt b/app/src/main/java/com/fastaccess/github/ui/adapter/viewholder/IssueContentViewHolder.kt index a6bc27c6..52aea098 100644 --- a/app/src/main/java/com/fastaccess/github/ui/adapter/viewholder/IssueContentViewHolder.kt +++ b/app/src/main/java/com/fastaccess/github/ui/adapter/viewholder/IssueContentViewHolder.kt @@ -234,7 +234,7 @@ class IssueContentViewHolder(parent: ViewGroup) : BaseViewHolder( .clickable("(${model.commit?.abbreviatedOid})") .append(" that referenced this issue ${model.createdAt?.timeAgo()}") .newline() - .append(model.commit?.message) + .bold(model.commit?.message) } } } \ No newline at end of file diff --git a/app/src/main/java/com/fastaccess/github/usecase/issuesprs/GetPullRequestTimelineUseCase.kt b/app/src/main/java/com/fastaccess/github/usecase/issuesprs/GetPullRequestTimelineUseCase.kt index cf2519ea..6e8f9251 100644 --- a/app/src/main/java/com/fastaccess/github/usecase/issuesprs/GetPullRequestTimelineUseCase.kt +++ b/app/src/main/java/com/fastaccess/github/usecase/issuesprs/GetPullRequestTimelineUseCase.kt @@ -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) } } diff --git a/data/src/main/graphql/github/issues_prs.graphql b/data/src/main/graphql/github/issues_prs.graphql index 9386f6ce..dfb78f4a 100644 --- a/data/src/main/graphql/github/issues_prs.graphql +++ b/data/src/main/graphql/github/issues_prs.graphql @@ -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,