Show the 'reviewed' and 'review_dismissed' events

Closes #277
jonan · Mar 21, 2017 · 1f68fdf · 1f68fdf
1 parent 1b1589c
commit 1f68fdf
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/app/src/main/java/com/github/mobile/api/model/TimelineEvent.java b/app/src/main/java/com/github/mobile/api/model/TimelineEvent.java
@@ -42,9 +42,10 @@ public class TimelineEvent {
     public static final String EVENT_RENAMED = "renamed";
     public static final String EVENT_REMOVED_FROM_PROJECT = "removed_from_project";
     public static final String EVENT_REOPENED = "reopened";
-    public static final String EVENT_REVIEWED = "reviewed";
+    public static final String EVENT_REVIEW_DISMISSED = "review_dismissed";
     public static final String EVENT_REVIEW_REQUESTED = "review_requested";
     public static final String EVENT_REVIEW_REQUEST_REMOVED = "review_request_removed";
+    public static final String EVENT_REVIEWED = "reviewed";
     public static final String EVENT_SUBSCRIBED = "subscribed";
     public static final String EVENT_UNASSIGNED = "unassigned";
     public static final String EVENT_UNLABELED = "unlabeled";
@@ -53,6 +54,8 @@ public class TimelineEvent {
 
     public long id;
 
+    public User user;
+
     public User actor;
 
     public CommitAuthor author;
@@ -79,6 +82,8 @@ public class TimelineEvent {
 
     public Date updated_at;
 
+    public Date submitted_at;
+
     public String body;
 
     public String body_html;

diff --git a/app/src/main/java/com/github/mobile/ui/issue/EventListAdapter.java b/app/src/main/java/com/github/mobile/ui/issue/EventListAdapter.java
@@ -35,6 +35,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -104,10 +105,17 @@ private void updateEvent(final TimelineEvent event) {
         String eventString = event.event;
 
         User actor;
-        if (eventString.equals(TimelineEvent.EVENT_ASSIGNED) || eventString.equals(TimelineEvent.EVENT_UNASSIGNED)) {
+        switch (eventString) {
+        case TimelineEvent.EVENT_ASSIGNED:
+        case TimelineEvent.EVENT_UNASSIGNED:
             actor = event.assignee;
-        } else {
+            break;
+        case TimelineEvent.EVENT_REVIEWED:
+            actor = event.user;
+            break;
+        default:
             actor = event.actor;
+            break;
         }
 
         String message = String.format("<b>%s</b> ", actor == null ? "ghost" : actor.login);
@@ -169,6 +177,16 @@ private void updateEvent(final TimelineEvent event) {
             setText(0, TypefaceUtils.ICON_X);
             textView(0).setTextColor(resources.getColor(R.color.issue_event_normal));
             break;
+        case TimelineEvent.EVENT_REVIEWED:
+            message += resources.getString(R.string.issue_event_reviewed);
+            setText(0, TypefaceUtils.ICON_EYE);
+            textView(0).setTextColor(resources.getColor(R.color.issue_event_normal));
+            break;
+        case TimelineEvent.EVENT_REVIEW_DISMISSED:
+            message += resources.getString(R.string.issue_event_review_dismissed);
+            setText(0, TypefaceUtils.ICON_X);
+            textView(0).setTextColor(resources.getColor(R.color.issue_event_normal));
+            break;
         case TimelineEvent.EVENT_MILESTONED:
             message += String.format(resources.getString(R.string.issue_event_milestone_added), "<b>" + event.milestone.title + "</b>");
             setText(0, TypefaceUtils.ICON_MILESTONE);
@@ -239,8 +257,18 @@ private void updateEvent(final TimelineEvent event) {
             break;
         }
 
-        if (event.created_at != null) {
-            message += " " + TimeUtils.getRelativeTime(event.created_at);
+        Date date;
+        switch (eventString) {
+        case TimelineEvent.EVENT_REVIEWED:
+            date = event.submitted_at;
+            break;
+        default:
+            date = event.created_at;
+            break;
+        }
+
+        if (date != null) {
+            message += " " + TimeUtils.getRelativeTime(date);
         }
         setText(1, Html.fromHtml(message));
     }

diff --git a/app/src/main/java/com/github/mobile/ui/issue/IssueFragment.java b/app/src/main/java/com/github/mobile/ui/issue/IssueFragment.java
@@ -115,8 +115,7 @@ public class IssueFragment extends DialogFragment implements OnItemClickListener
             TimelineEvent.EVENT_REMOVED_FROM_PROJECT,
             TimelineEvent.EVENT_MENTIONED,
             TimelineEvent.EVENT_SUBSCRIBED,
-            TimelineEvent.EVENT_UNSUBSCRIBED,
-            TimelineEvent.EVENT_REVIEWED);
+            TimelineEvent.EVENT_UNSUBSCRIBED);
 
     private int issueNumber;
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -121,6 +121,8 @@
     <string name="issue_event_cross_referenced">referenced this issue in %1$s</string>
     <string name="issue_event_review_requested">requested review from %1$s</string>
     <string name="issue_event_review_request_removed">removed their request for review from %1$s</string>
+    <string name="issue_event_reviewed">reviewed</string>
+    <string name="issue_event_review_dismissed">dismissed their review</string>
     <string name="issue_event_closed">closed this</string>
     <string name="issue_event_closed_from_commit">closed this from commit %1$s</string>
     <string name="issue_event_reopened">reopened this</string>