From f4515514c10d2f653a638bcdef6bc7ba1ac494b0 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 10 Sep 2019 09:23:49 +0800
Subject: Fixed clicking username in comments in user's comment section opening
 current accout profile. Fixed downvote state would not retain after
 orientation change. Reverse the color of upvote and downvote buttons.

---
 .../infinityforreddit/CommentAndPostRecyclerViewAdapter.java        | 4 ++--
 .../infinityforreddit/CommentsListingRecyclerViewAdapter.java       | 6 +++---
 app/src/main/res/values/colors.xml                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java
index d0893b14..c20177b9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java
@@ -544,12 +544,12 @@ class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie
             }
 
             switch (comment.getVoteType()) {
-                case 1:
+                case CommentData.VOTE_TYPE_UPVOTE:
                     ((CommentViewHolder) holder).upVoteButton
                             .setColorFilter(ContextCompat.getColor(mActivity, R.color.upvoted), android.graphics.PorterDuff.Mode.SRC_IN);
                     ((CommentViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.upvoted));
                     break;
-                case 2:
+                case CommentData.VOTE_TYPE_DOWNVOTE:
                     ((CommentViewHolder) holder).downVoteButton
                             .setColorFilter(ContextCompat.getColor(mActivity, R.color.downvoted), android.graphics.PorterDuff.Mode.SRC_IN);
                     ((CommentViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.downvoted));
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java
index 668a66b0..d148f026 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java
@@ -117,7 +117,7 @@ class CommentsListingRecyclerViewAdapter extends PagedListAdapter<CommentData, R
                     ((DataViewHolder) holder).authorTextView.setTextColor(mTextColorPrimaryDark);
                     ((DataViewHolder) holder).authorTextView.setOnClickListener(view -> {
                         Intent intent = new Intent(mContext, ViewUserDetailActivity.class);
-                        intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, comment.getAuthor());
+                        intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, comment.getLinkAuthor());
                         mContext.startActivity(intent);
                     });
                 } else {
@@ -137,12 +137,12 @@ class CommentsListingRecyclerViewAdapter extends PagedListAdapter<CommentData, R
                 ((DataViewHolder) holder).scoreTextView.setText(Integer.toString(comment.getScore() + comment.getVoteType()));
 
                 switch (comment.getVoteType()) {
-                    case 1:
+                    case CommentData.VOTE_TYPE_UPVOTE:
                         ((DataViewHolder) holder).upvoteButton
                                 .setColorFilter(ContextCompat.getColor(mContext, R.color.upvoted), android.graphics.PorterDuff.Mode.SRC_IN);
                         ((DataViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mContext, R.color.upvoted));
                         break;
-                    case 2:
+                    case CommentData.VOTE_TYPE_DOWNVOTE:
                         ((DataViewHolder) holder).downvoteButton
                                 .setColorFilter(ContextCompat.getColor(mContext, R.color.downvoted), android.graphics.PorterDuff.Mode.SRC_IN);
                         ((DataViewHolder) holder).scoreTextView.setTextColor(ContextCompat.getColor(mContext, R.color.downvoted));
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 03c19020..42b7bc1c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,9 +28,9 @@
 
     <color name="roundedBottomSheetPrimaryNavigationBarColor">@color/roundedBottomSheetPrimaryBackground</color>
 
-    <color name="upvoted">#007DDE</color>
+    <color name="upvoted">#E91E63</color>
 
-    <color name="downvoted">#E91E63</color>
+    <color name="downvoted">#007DDE</color>
 
     <color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color>
 
-- 
cgit v1.2.3