From 74173317dec36b9381436737eaf6a160bf7fd5fc Mon Sep 17 00:00:00 2001
From: Kalle Struik <kalle@kallestruik.nl>
Date: Fri, 23 Jul 2021 19:43:25 +0200
Subject: [PATCH] Change heart color to be red, add else clause for non hearted
 comments, and apply some code style suggestions.

---
 .../info_list/holder/CommentsMiniInfoItemHolder.java      | 4 +++-
 app/src/main/res/drawable-night/ic_heart.xml              | 2 +-
 app/src/main/res/drawable/ic_heart.xml                    | 1 +
 app/src/main/res/layout/list_comments_item.xml            | 8 ++++----
 app/src/main/res/values/dimens.xml                        | 3 +--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
index de6159ba0..7c4f67267 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
@@ -82,7 +82,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
         itemDislikesCountView = itemView.findViewById(R.id.detail_thumbs_down_count_view);
         itemPublishedTime = itemView.findViewById(R.id.itemPublishedTime);
         itemContentView = itemView.findViewById(R.id.itemCommentContentView);
-        itemHeartView = itemView.findViewById(R.id.detail_heart_img_view);
+        itemHeartView = itemView.findViewById(R.id.detail_heart_image_view);
 
         downloadThumbnailKey = infoItemBuilder.getContext().
                 getString(R.string.download_thumbnail_key);
@@ -157,6 +157,8 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
 
         if (item.isHeartedByUploader()) {
             itemHeartView.setVisibility(View.VISIBLE);
+        } else {
+            itemHeartView.setVisibility(View.GONE);
         }
 
         itemView.setOnClickListener(view -> {
diff --git a/app/src/main/res/drawable-night/ic_heart.xml b/app/src/main/res/drawable-night/ic_heart.xml
index 49bf17297..6128a3d0d 100644
--- a/app/src/main/res/drawable-night/ic_heart.xml
+++ b/app/src/main/res/drawable-night/ic_heart.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="#FF5252"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml
index dbff29441..86d1f0527 100644
--- a/app/src/main/res/drawable/ic_heart.xml
+++ b/app/src/main/res/drawable/ic_heart.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#E53935"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/layout/list_comments_item.xml b/app/src/main/res/layout/list_comments_item.xml
index ae468eec2..af81cbd98 100644
--- a/app/src/main/res/layout/list_comments_item.xml
+++ b/app/src/main/res/layout/list_comments_item.xml
@@ -72,9 +72,9 @@
         tools:text="12M" />
 
     <ImageView
-        android:id="@+id/detail_heart_img_view"
-        android:layout_width="@dimen/video_item_detail_heart_image_width"
-        android:layout_height="@dimen/video_item_detail_heart_image_height"
+        android:id="@+id/detail_heart_image_view"
+        android:layout_width="@dimen/video_item_detail_heart_image_size"
+        android:layout_height="@dimen/video_item_detail_heart_image_size"
         android:layout_below="@id/itemCommentContentView"
         android:layout_marginLeft="@dimen/video_item_detail_heart_margin"
         android:layout_toRightOf="@+id/detail_thumbs_up_count_view"
@@ -116,7 +116,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/itemCommentContentView"
         android:layout_marginLeft="12dp"
-        android:layout_toRightOf="@id/detail_heart_img_view"
+        android:layout_toRightOf="@id/detail_heart_image_view"
         android:lines="1"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_upload_date_text_size"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index dd3533035..0ff077a3b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -81,8 +81,7 @@
     <dimen name="video_item_detail_sub_channel_image_size">16dp</dimen>
     <dimen name="video_item_detail_like_image_height">18sp</dimen>
     <dimen name="video_item_detail_like_image_width">18sp</dimen>
-    <dimen name="video_item_detail_heart_image_width">18sp</dimen>
-    <dimen name="video_item_detail_heart_image_height">18sp</dimen>
+    <dimen name="video_item_detail_heart_image_size">18sp</dimen>
     <dimen name="channel_avatar_size">70dp</dimen>
     <dimen name="sub_channel_avatar_size">35dp</dimen>
     <dimen name="mini_player_height">60dp</dimen>