From 084cf9b341b714145bad38916724fbbb43130989 Mon Sep 17 00:00:00 2001
From: Jedi Burrell <JediBurrell@gmail.com>
Date: Fri, 12 May 2017 23:51:18 -0400
Subject: [PATCH] Appeal To Issue #470.

Comments, gists, and such; now state whether they've been edited or not.
---
 .../ui/adapter/viewholder/CommentsViewHolder.java          | 7 ++++++-
 .../ui/adapter/viewholder/TimelineCommentsViewHolder.java  | 7 ++++++-
 .../com/fastaccess/ui/modules/gists/gist/GistActivity.java | 6 +++++-
 app/src/main/res/values/strings.xml                        | 1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java
index a911c90d..6b1c3748 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java
@@ -6,6 +6,7 @@ import android.support.v7.widget.AppCompatImageView;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.fastaccess.App;
 import com.fastaccess.R;
 import com.fastaccess.data.dao.model.Comment;
 import com.fastaccess.helper.InputHelper;
@@ -63,7 +64,11 @@ public class CommentsViewHolder extends BaseViewHolder<Comment> {
             comment.setText("");
         }
         name.setText(commentsModel.getUser() != null ? commentsModel.getUser().getLogin() : "Anonymous");
-        date.setText(ParseDateFormat.getTimeAgo(commentsModel.getCreatedAt()));
+        if (commentsModel.getCreatedAt().before(commentsModel.getUpdatedAt())) {
+            date.setText(ParseDateFormat.getTimeAgo(commentsModel.getCreatedAt()) + " " + App.getInstance().getResources().getString(R.string.edited));
+        } else {
+            date.setText(ParseDateFormat.getTimeAgo(commentsModel.getCreatedAt()));
+        }
     }
 
 }
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java
index a4e44795..5ebf03e4 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java
@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.fastaccess.App;
 import com.fastaccess.R;
 import com.fastaccess.data.dao.TimelineModel;
 import com.fastaccess.data.dao.model.Comment;
@@ -108,7 +109,11 @@ public class TimelineCommentsViewHolder extends BaseViewHolder<TimelineModel> {
             comment.setText("");
         }
         name.setText(commentsModel.getUser() != null ? commentsModel.getUser().getLogin() : "Anonymous");
-        date.setText(ParseDateFormat.getTimeAgo(commentsModel.getCreatedAt()));
+        if (commentsModel.getCreatedAt().before(commentsModel.getUpdatedAt())) {
+            date.setText(ParseDateFormat.getTimeAgo(commentsModel.getCreatedAt()) + " " + App.getInstance().getResources().getString(R.string.edited));
+        } else {
+            date.setText(ParseDateFormat.getTimeAgo(commentsModel.getCreatedAt()));
+        }
         if (showEmojies) {
             if (commentsModel.getReactions() != null) {
                 ReactionsModel reaction = commentsModel.getReactions();
diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistActivity.java b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistActivity.java
index c9186042..9441b7f6 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistActivity.java
@@ -206,7 +206,11 @@ public class GistActivity extends BaseActivity<GistMvp.View, GistPresenter>
         avatarLayout.setUrl(url, login);
         title.setText(gistsModel.getDisplayTitle(false, true));
         detailsIcon.setVisibility(InputHelper.isEmpty(gistsModel.getDescription()) || !ViewHelper.isEllipsed(title) ? View.GONE : View.VISIBLE);
-        date.setText(ParseDateFormat.getTimeAgo(gistsModel.getCreatedAt()));
+        if (gistsModel.getCreatedAt().before(gistsModel.getUpdatedAt())) {
+            date.setText(ParseDateFormat.getTimeAgo(gistsModel.getCreatedAt()) + " " + getString(R.string.edited));
+        } else {
+            date.setText(ParseDateFormat.getTimeAgo(gistsModel.getCreatedAt()));
+        }
         size.setText(Formatter.formatFileSize(this, gistsModel.getSize()));
         pager.setAdapter(new FragmentsPagerAdapter(getSupportFragmentManager(), FragmentPagerAdapterModel.buildForGist(this, gistsModel)));
         tabs.setupWithViewPager(pager);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22bd23c6..28f8269e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -221,6 +221,7 @@
     <string name="switch_branch">Switch branch</string>
     <string name="assignees">Assignees</string>
     <string name="edit">Edit</string>
+    <string name="edited">( edited )</string>
     <string name="update_issue">Update Issue</string>
     <string name="update_pull_request">Update Pull Request</string>
     <string name="no_milestones">No milestones</string>