diff --git a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java index c4c4dd40..5130aa42 100644 --- a/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java +++ b/app/src/main/java/com/fastaccess/provider/timeline/TimelineProvider.java @@ -32,6 +32,7 @@ public class TimelineProvider { String from = context.getString(R.string.from); String thisString = context.getString(R.string.this_value); String in = context.getString(R.string.in_value); + String commit = context.getString(R.string.commit); if (event == IssueEventType.labeled || event == IssueEventType.unlabeled) { if (issueEventModel.getAssignee() != null && issueEventModel.getAssigner() != null) { spannableBuilder.bold(issueEventModel.getAssigner().getLogin()); @@ -53,11 +54,15 @@ public class TimelineProvider { if (user != null) { spannableBuilder.bold(user.getLogin()); } - if (event == IssueEventType.closed) { + if (event == IssueEventType.closed || event == IssueEventType.reopened) { if (isMerged) { spannableBuilder.append(" ").append(IssueEventType.merged.name()); } else { - spannableBuilder.append(" ").append(event.name().replaceAll("_", " ")); + spannableBuilder + .append(" ") + .append(event.name().replaceAll("_", " ")) + .append(" ") + .append(thisString); } } else if (event == IssueEventType.assigned || event == IssueEventType.unassigned) { spannableBuilder @@ -88,9 +93,7 @@ public class TimelineProvider { } else if (event == IssueEventType.referenced || event == IssueEventType.merged) { spannableBuilder .append(" ") - .append(thisString) - .append(" ") - .append(in) + .append(commit) .append(" ") .url(substring(issueEventModel.getCommitId())); } else if (event == IssueEventType.review_requested) { @@ -99,11 +102,9 @@ public class TimelineProvider { .append(from) .append(" ") .bold(issueEventModel.getRequestedReviewer().getLogin()); - } else if (event == IssueEventType.closed || event == IssueEventType.reopened) { + } else if (event == IssueEventType.closed) { if (issueEventModel.getCommitId() != null) { spannableBuilder - .append(" ") - .append(thisString) .append(" ") .append(in) .append(" ") diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java index 63c0b7e3..73260ac5 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerActivity.java @@ -544,6 +544,9 @@ public class RepoPagerActivity extends BaseActivity + Unauthorized user Two factors OTP is required No issue - Copy + Copy URL Copied Commit message Error occurred while communicating to the server @@ -394,7 +394,7 @@ Assignee Some checks have failed All checks are pending - All checks are passed + All checks have passed Sort Newest Oldest