From 8c99f56f43f0eeb15b95a99b55ef616a1ede5caf Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sun, 8 May 2022 14:14:06 +0200
Subject: [PATCH] Added Hearted and Pinned

---
 .../libretube/adapters/CommentsAdapter.kt     | 12 ++++-
 app/src/main/res/drawable/ic_hearted.xml      |  9 ++++
 app/src/main/res/drawable/ic_pinned.xml       | 11 ++++
 app/src/main/res/drawable/ic_verified.xml     | 10 ++++
 app/src/main/res/layout/comments_row.xml      | 52 +++++++++++++++----
 5 files changed, 83 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_hearted.xml
 create mode 100644 app/src/main/res/drawable/ic_pinned.xml
 create mode 100644 app/src/main/res/drawable/ic_verified.xml

diff --git a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
index aebd66a93..0dbb3ca28 100644
--- a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.obj.Comment
@@ -19,11 +20,20 @@ class CommentsAdapter(private val comments: List<Comment>):  RecyclerView.Adapte
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.v.findViewById<TextView>(R.id.comment_author).text = comments[position].author.toString() + " • " + comments[position].commentedTime.toString()
+        holder.v.findViewById<TextView>(R.id.comment_infos).text = comments[position].author.toString() + " • " + comments[position].commentedTime.toString()
         holder.v.findViewById<TextView>(R.id.comment_text).text = comments[position].commentText.toString()
         val thumbnailImage = holder.v.findViewById<ImageView>(R.id.commentor_image)
         Picasso.get().load(comments[position].thumbnail).into(thumbnailImage)
         holder.v.findViewById<TextView>(R.id.likes_textView).text = comments[position].likeCount.toString()
+        if (comments[position].verified == true) {
+            holder.v.findViewById<ImageView>(R.id.verified_imageView).visibility = View.VISIBLE
+        }
+        if (comments[position].pinned == true) {
+            holder.v.findViewById<ImageView>(R.id.pinned_imageView).visibility = View.VISIBLE
+        }
+        if (comments[position].hearted == true) {
+            holder.v.findViewById<ImageView>(R.id.hearted_imageView).visibility = View.VISIBLE
+        }
     }
 
     override fun getItemCount(): Int {
diff --git a/app/src/main/res/drawable/ic_hearted.xml b/app/src/main/res/drawable/ic_hearted.xml
new file mode 100644
index 000000000..f690e38fd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hearted.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="66.911dp"
+    android:height="66.911dp"
+    android:viewportWidth="66.911"
+    android:viewportHeight="66.911">
+  <path
+      android:pathData="M66.911,22.831c0,-10.563 -8.558,-19.122 -19.118,-19.122c-5.658,0 -10.721,2.473 -14.223,6.377c-0.037,0.043 -0.076,0.085 -0.113,0.128c-3.5,-3.98 -8.618,-6.505 -14.334,-6.505C8.561,3.709 0.005,12.268 0,22.831c0,5.834 2.629,11.059 6.758,14.565H6.751l27.104,25.806l26.308,-25.806h-0.012C64.279,33.89 66.911,28.669 66.911,22.831z"
+      android:fillColor="#E34326"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pinned.xml b/app/src/main/res/drawable/ic_pinned.xml
new file mode 100644
index 000000000..f1e14a868
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pinned.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
new file mode 100644
index 000000000..bbb482627
--- /dev/null
+++ b/app/src/main/res/drawable/ic_verified.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M23,12l-2.44,-2.79l0.34,-3.69l-3.61,-0.82L15.4,1.5L12,2.96L8.6,1.5L6.71,4.69L3.1,5.5L3.44,9.2L1,12l2.44,2.79l-0.34,3.7l3.61,0.82L8.6,22.5l3.4,-1.47l3.4,1.46l1.89,-3.19l3.61,-0.82l-0.34,-3.69L23,12zM10.09,16.72l-3.8,-3.81l1.48,-1.48l2.32,2.33l5.85,-5.87l1.48,1.48L10.09,16.72z"/>
+</vector>
diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index 4d4e7dbe1..878a2841e 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -26,15 +26,39 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/comment_author"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:text="Author"
-                android:textSize="15sp"
-                android:textStyle="bold" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/comment_infos"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:text="Author and Time"
+                    android:textSize="15sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:id="@+id/verified_imageView"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="4dp"
+                    app:srcCompat="@drawable/ic_verified"
+                    android:visibility="gone" />
+
+                <ImageView
+                    android:id="@+id/pinned_imageView"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="4dp"
+                    app:srcCompat="@drawable/ic_pinned"
+                    android:visibility="gone" />
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/comment_text"
@@ -60,8 +84,16 @@
                     android:id="@+id/likes_textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="TextView" />
+                    android:text="LikeCount" />
 
+                <ImageView
+                    android:id="@+id/hearted_imageView"
+                    android:layout_width="14dp"
+                    android:layout_height="14dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginTop="3dp"
+                    app:srcCompat="@drawable/ic_hearted"
+                    android:visibility="gone" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>