mirrors/GitNex
1
0
Fork 0
mirror of https://codeberg.org/gitnex/GitNex.git synced 2024-12-26 16:04:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix deleted milestone crash in timeline view (#1242)

Browse Source 
Closes #1241

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1242
Reviewed-by: qwerty287 <qwerty287@noreply.codeberg.org>
This commit is contained in:
M M Arif 2023-02-03 07:34:48 +00:00
parent 06a7eb5a0c
commit 77d84dfefe
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
View File

@ -462,9 +462,9 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
this.issueComment = timelineComment; this.issueComment = timelineComment;
if (timelineLastView) { // if (timelineLastView) {
// timelineLine2.setVisibility(View.GONE); // timelineLine2.setVisibility(View.GONE);
} // }
StringBuilder infoBuilder = null; StringBuilder infoBuilder = null;
if (issueComment.getCreatedAt() != null) { if (issueComment.getCreatedAt() != null) {
@ -485,6 +485,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
.append(context.getString(R.string.modifiedText)); .append(context.getString(R.string.modifiedText));
} }
} }
assert infoBuilder != null;
String info = infoBuilder.toString(); String info = infoBuilder.toString();
// label view in timeline // label view in timeline
@ -701,17 +702,24 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
issueComment.getMilestone().getTitle(), issueComment.getMilestone().getTitle(),
info)); info));
} else { } else {
start.setText( if (issueComment.getOldMilestone() != null) {
context.getString( start.setText(
R.string.timelineMilestoneRemoved, context.getString(
issueComment.getUser().getLogin(), R.string.timelineMilestoneRemoved,
issueComment.getOldMilestone().getTitle(), issueComment.getUser().getLogin(),
info)); issueComment.getOldMilestone().getTitle(),
info));
} else {
start.setText(
context.getString(
R.string.timelineMilestoneDeleted,
issueComment.getUser().getLogin(),
info));
}
timelineIcon.setColorFilter( timelineIcon.setColorFilter(
context.getResources().getColor(R.color.iconIssuePrClosedColor, null)); context.getResources().getColor(R.color.iconIssuePrClosedColor, null));
} }
start.setTextSize(fontSize); start.setTextSize(fontSize);
timelineIcon.setImageDrawable( timelineIcon.setImageDrawable(
ContextCompat.getDrawable(context, R.drawable.ic_milestone)); ContextCompat.getDrawable(context, R.drawable.ic_milestone));
timelineData.addView(start); timelineData.addView(start);

1
app/src/main/res/values/strings.xml
View File

@ -814,6 +814,7 @@
<string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string> <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
<string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string> <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
<string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string> <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
<string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
<string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string> <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
<string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string> <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
<string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string> <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>