From 2c33f7a7f84256b1bd3cc742d7a1fbddde0b814d Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 14 Oct 2020 19:11:53 +0200
Subject: [PATCH] Prepare the new layout.

---
 app/src/acad/res/values/strings.xml           |   7 +
 app/src/full/res/values/strings.xml           |   5 +
 .../fedilab/fedilabtube/PeertubeActivity.java |   3 +-
 .../drawer/CommentListAdapter.java            |  10 +-
 app/src/main/res/layout/activity_peertube.xml | 557 ++++++++++++------
 app/src/main/res/layout/drawer_comment.xml    |   7 +
 6 files changed, 392 insertions(+), 197 deletions(-)

diff --git a/app/src/acad/res/values/strings.xml b/app/src/acad/res/values/strings.xml
index 4e38387..071a79e 100644
--- a/app/src/acad/res/values/strings.xml
+++ b/app/src/acad/res/values/strings.xml
@@ -16,6 +16,13 @@
         <item>Automatique</item>
     </string-array>
 
+
+    <plurals name="number_of_replies">
+        <item quantity="zero">%d réponse</item>
+        <item quantity="one">%d réponse</item>
+        <item quantity="other">%d réponses</item>
+    </plurals>
+
     <string name="set_theme">Thème</string>
     <string name="set_theme_description">Permet de changer le thème de l\'application</string>
     <string name="federation_issue">La vidéo ne peut pas être fédérée !</string>
diff --git a/app/src/full/res/values/strings.xml b/app/src/full/res/values/strings.xml
index e518607..c1a2b54 100644
--- a/app/src/full/res/values/strings.xml
+++ b/app/src/full/res/values/strings.xml
@@ -8,6 +8,11 @@
     <string name="set_theme_choice" translatable="false">set_theme_choice</string>
 
 
+    <plurals name="number_of_replies">
+        <item quantity="one">%d reply</item>
+        <item quantity="other">%d replies</item>
+    </plurals>
+
     <string name="set_theme">Theme</string>
     <string name="set_theme_description">Allow to change app theme</string>
     <string name="federation_issue">The video cannot be federated!</string>
diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java b/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
index 8c57fae..e2576cb 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
@@ -55,6 +55,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.PopupMenu;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
@@ -146,7 +147,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private AppCompatImageView fullScreenIcon;
     private TextView resolution;
     private int mode;
-    private LinearLayout write_comment_container;
+    private ConstraintLayout write_comment_container;
     private ImageView send;
     private TextView add_comment_read;
     private EditText add_comment_write;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java
index 65567ab..95af31e 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java
@@ -215,6 +215,13 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
         holder.comment_account_displayname.setText(comment.getAccount().getDisplayName());
 
+        if( comment.getTotalReplies() > 0) {
+            holder.number_of_replies.setVisibility(View.VISIBLE);
+            holder.number_of_replies.setText(context.getResources().getQuantityString(R.plurals.number_of_replies, comment.getTotalReplies(), comment.getTotalReplies()));
+        } else {
+            holder.number_of_replies.setVisibility(View.GONE);
+        }
+
         if (comment.getAccount() != null) {
             Spannable wordtoSpan;
             Pattern hashAcct;
@@ -298,7 +305,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         ImageView comment_account_profile;
         TextView comment_date;
         LinearLayout main_container;
-        TextView more_actions;
+        TextView more_actions, number_of_replies;
 
         @SuppressLint("SetJavaScriptEnabled")
         ViewHolder(View itemView) {
@@ -310,6 +317,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             comment_date = itemView.findViewById(R.id.comment_date);
             main_container = itemView.findViewById(R.id.main_container);
             more_actions = itemView.findViewById(R.id.more_actions);
+            number_of_replies = itemView.findViewById(R.id.number_of_replies);
 
         }
 
diff --git a/app/src/main/res/layout/activity_peertube.xml b/app/src/main/res/layout/activity_peertube.xml
index f7a41a1..e762662 100644
--- a/app/src/main/res/layout/activity_peertube.xml
+++ b/app/src/main/res/layout/activity_peertube.xml
@@ -76,228 +76,395 @@
             </RelativeLayout>
         </RelativeLayout>
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/peertube_information_container"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:layout_weight="2"
             android:layout_marginStart="@dimen/video_comment_margin"
             android:layout_marginEnd="@dimen/video_comment_margin"
-            android:layout_weight="2">
-
-            <LinearLayout
+            >
+            <androidx.core.widget.NestedScrollView
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:id="@+id/peertube_information_container"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginRight="20dp"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/peertube_title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp" />
-
+                android:layout_height="match_parent">
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:orientation="horizontal">
+                    android:layout_marginStart="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginRight="20dp"
+                    android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/peertube_view_count"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/peertube_title"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginRight="10dp"
-                        android:drawablePadding="5dp"
-                        android:gravity="center_horizontal"
-                        android:text="0"
-                        app:drawableTopCompat="@drawable/ic_baseline_visibility_24"
-                        tools:ignore="HardcodedText" />
-
-                    <TextView
-                        android:id="@+id/peertube_like_count"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginStart="20dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginRight="10dp"
-                        android:drawablePadding="5dp"
-                        android:gravity="center_horizontal"
-                        android:text="0"
-                        app:drawableTopCompat="@drawable/ic_baseline_thumb_up_alt_24"
-                        tools:ignore="HardcodedText" />
-
-                    <TextView
-                        android:id="@+id/peertube_dislike_count"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginRight="10dp"
-                        android:drawablePadding="5dp"
-                        android:gravity="center_horizontal"
-                        android:text="0"
-                        app:drawableTopCompat="@drawable/ic_baseline_thumb_down_alt_24"
-                        tools:ignore="HardcodedText" />
-
-                    <TextView
-                        android:id="@+id/peertube_bookmark"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginRight="10dp"
-                        android:drawablePadding="5dp"
-                        android:gravity="center_horizontal"
-                        android:text=""
-                        app:drawableTopCompat="@drawable/ic_baseline_bookmark_border_24" />
-
-                    <TextView
-                        android:id="@+id/peertube_playlist"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginRight="10dp"
-                        android:drawablePadding="5dp"
-                        android:gravity="center_horizontal"
-                        android:text=""
-                        android:visibility="gone"
-                        app:drawableTopCompat="@drawable/ic_baseline_list_24" />
+                        android:layout_marginTop="5dp" />
 
                     <LinearLayout
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        tools:ignore="UselessLeaf" />
-
-
-                    <TextView
-                        android:id="@+id/more_actions"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginRight="10dp"
-                        android:drawablePadding="5dp"
-                        android:gravity="center_horizontal"
-                        android:text=""
-                        app:drawableTopCompat="@drawable/ic_baseline_more_vert_24" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/peertube_description"
-                    android:textIsSelectable="true"
-                    android:autoLink="web"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp" />
-
-                <LinearLayout
-                    android:id="@+id/write_comment_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginTop="10dp"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal"
-                    android:visibility="gone">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <ImageView
-                            android:id="@+id/my_pp"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:contentDescription="@string/profile_picture" />
-
-                        <ImageView
-                            android:id="@+id/send"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_marginTop="5dp"
-                            android:contentDescription="@string/send_comment"
-                            android:src="@drawable/ic_baseline_send_24"
-                            android:visibility="gone" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="10dp"
                         android:layout_marginTop="5dp"
-                        android:layout_marginBottom="5dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
+                        android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/add_comment_read"
-                            android:layout_width="match_parent"
+                            android:id="@+id/peertube_view_count"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/add_public_comment" />
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginEnd="10dp"
+                            android:layout_marginRight="10dp"
+                            android:drawablePadding="5dp"
+                            android:gravity="center_horizontal"
+                            android:text="0"
+                            app:drawableTopCompat="@drawable/ic_baseline_visibility_24"
+                            tools:ignore="HardcodedText" />
 
-                        <EditText
-                            android:id="@+id/add_comment_write"
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:id="@+id/peertube_like_count"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:hint="@string/add_public_comment"
-                            android:importantForAutofill="no"
-                            android:inputType="textMultiLine"
-                            android:maxLines="4"
-                            android:overScrollMode="always"
-                            android:scrollbarStyle="insideInset"
-                            android:scrollbars="vertical"
-                            android:visibility="gone" />
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginStart="20dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginEnd="10dp"
+                            android:layout_marginRight="10dp"
+                            android:drawablePadding="5dp"
+                            android:gravity="center_horizontal"
+                            android:text="0"
+                            app:drawableTopCompat="@drawable/ic_baseline_thumb_up_alt_24"
+                            tools:ignore="HardcodedText" />
+
+                        <TextView
+                            android:id="@+id/peertube_dislike_count"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginEnd="10dp"
+                            android:layout_marginRight="10dp"
+                            android:drawablePadding="5dp"
+                            android:gravity="center_horizontal"
+                            android:text="0"
+                            app:drawableTopCompat="@drawable/ic_baseline_thumb_down_alt_24"
+                            tools:ignore="HardcodedText" />
+
+                        <TextView
+                            android:id="@+id/peertube_bookmark"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginEnd="10dp"
+                            android:layout_marginRight="10dp"
+                            android:drawablePadding="5dp"
+                            android:gravity="center_horizontal"
+                            android:text=""
+                            app:drawableTopCompat="@drawable/ic_baseline_bookmark_border_24" />
+
+                        <TextView
+                            android:id="@+id/peertube_playlist"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginEnd="10dp"
+                            android:layout_marginRight="10dp"
+                            android:drawablePadding="5dp"
+                            android:gravity="center_horizontal"
+                            android:text=""
+                            android:visibility="gone"
+                            app:drawableTopCompat="@drawable/ic_baseline_list_24" />
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            tools:ignore="UselessLeaf" />
+
+
+                        <TextView
+                            android:id="@+id/more_actions"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginEnd="10dp"
+                            android:layout_marginRight="10dp"
+                            android:drawablePadding="5dp"
+                            android:gravity="center_horizontal"
+                            android:text=""
+                            app:drawableTopCompat="@drawable/ic_baseline_more_vert_24" />
+
                     </LinearLayout>
 
+                    <TextView
+                        android:id="@+id/peertube_description"
+                        android:textIsSelectable="true"
+                        android:autoLink="web"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp" />
+
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/write_comment_container"
+                        android:layout_margin="10dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintBottom_toTopOf="@+id/separator"
+                            android:id="@+id/write_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <ImageView
+                                android:id="@+id/my_pp"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
+                                android:contentDescription="@string/profile_picture" />
+                            <TextView
+                                android:id="@+id/add_comment_read"
+                                android:gravity="center"
+                                android:text="@string/add_public_comment"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintStart_toEndOf="@+id/my_pp"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"/>
+                            <EditText
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintStart_toEndOf="@+id/my_pp"
+                                app:layout_constraintEnd_toStartOf="@+id/send"
+                                android:id="@+id/add_comment_write"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:focusable="true"
+                                android:focusableInTouchMode="true"
+                                android:hint="@string/add_public_comment"
+                                android:importantForAutofill="no"
+                                android:inputType="textMultiLine"
+                                android:maxLines="4"
+                                android:overScrollMode="always"
+                                android:scrollbarStyle="insideInset"
+                                android:scrollbars="vertical"
+                                android:visibility="gone"
+                                />
+                            <ImageView
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                android:id="@+id/send"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:contentDescription="@string/send_comment"
+                                android:src="@drawable/ic_baseline_send_24"
+                                android:visibility="gone" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <View
+                            android:id="@+id/separator"
+                            android:layout_margin="5dp"
+                            app:layout_constraintTop_toBottomOf="@+id/write_container"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            android:layout_width="match_parent"
+                            android:layout_height="1px"
+                            android:background="@android:color/darker_gray"/>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/peertube_comments"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <RelativeLayout
+                        android:id="@+id/no_action"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:id="@+id/no_action_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:padding="10dp"
+                            android:text="@string/no_comments"
+                            android:textSize="25sp" />
+                    </RelativeLayout>
                 </LinearLayout>
+            </androidx.core.widget.NestedScrollView>
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/peertube_comments"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <RelativeLayout
-                    android:id="@+id/no_action"
+            <androidx.core.widget.NestedScrollView
+                android:visibility="gone"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:id="@+id/reply_thread"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <LinearLayout
+                    android:id="@+id/main_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/no_action_text"
+                    android:divider="?android:dividerHorizontal"
+                    android:orientation="vertical"
+                    android:showDividers="end">
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:text="@string/no_comments"
-                        android:textSize="25sp" />
-                </RelativeLayout>
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
+                        android:layout_height="wrap_content">
+
+                        <ImageView
+                            android:id="@+id/comment_account_profile"
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_marginTop="5dp"
+                            android:contentDescription="@string/profile_picture"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/comment_account_displayname"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="5dp"
+                            android:singleLine="true"
+                            android:textStyle="bold"
+                            app:layout_constraintEnd_toStartOf="@+id/comment_date"
+                            app:layout_constraintStart_toEndOf="@+id/comment_account_profile"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/comment_account_username"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:layout_marginStart="5dp"
+                            android:ellipsize="end"
+                            android:singleLine="true"
+                            android:textSize="12sp"
+                            app:layout_constraintStart_toEndOf="@+id/comment_account_profile"
+                            app:layout_constraintTop_toBottomOf="@+id/comment_account_displayname" />
+
+                        <TextView
+                            android:id="@+id/comment_date"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="end"
+                            android:layout_marginStart="2dp"
+                            android:layout_weight="0"
+                            android:gravity="end"
+                            android:maxLines="1"
+                            android:textSize="12sp"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/comment_content"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:textIsSelectable="true"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/comment_account_profile" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/write_comment_container_reply"
+                        android:layout_margin="10dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintBottom_toTopOf="@+id/separator_reply"
+                            android:id="@+id/write_container_reply"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <ImageView
+                                android:id="@+id/my_pp_reply"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
+                                android:contentDescription="@string/profile_picture" />
+                            <TextView
+                                android:id="@+id/add_comment_read_reply"
+                                android:gravity="center"
+                                android:text="@string/add_public_comment"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintStart_toEndOf="@+id/my_pp_reply"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"/>
+                            <EditText
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintStart_toEndOf="@+id/my_pp_reply"
+                                app:layout_constraintEnd_toStartOf="@+id/send_reply"
+                                android:id="@+id/add_comment_write_reply"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:focusable="true"
+                                android:focusableInTouchMode="true"
+                                android:hint="@string/add_public_comment"
+                                android:importantForAutofill="no"
+                                android:inputType="textMultiLine"
+                                android:maxLines="4"
+                                android:overScrollMode="always"
+                                android:scrollbarStyle="insideInset"
+                                android:scrollbars="vertical"
+                                android:visibility="gone"
+                                />
+                            <ImageView
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                android:id="@+id/send_reply"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:contentDescription="@string/send_comment"
+                                android:src="@drawable/ic_baseline_send_24"
+                                android:visibility="gone" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <View
+                            android:id="@+id/separator_reply"
+                            android:layout_margin="5dp"
+                            app:layout_constraintTop_toBottomOf="@+id/write_container_reply"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            android:layout_width="match_parent"
+                            android:layout_height="1px"
+                            android:background="@android:color/darker_gray"/>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                    <androidx.recyclerview.widget.RecyclerView
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        android:id="@+id/peertube_reply"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
+            </androidx.core.widget.NestedScrollView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
         <!-- View where the video will be shown when video goes fullscreen -->
         <RelativeLayout
             android:id="@+id/videoLayout"
diff --git a/app/src/main/res/layout/drawer_comment.xml b/app/src/main/res/layout/drawer_comment.xml
index 25e5a72..c7e8354 100644
--- a/app/src/main/res/layout/drawer_comment.xml
+++ b/app/src/main/res/layout/drawer_comment.xml
@@ -93,6 +93,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/comment_account_profile" />
 
+        <TextView
+            android:id="@+id/number_of_replies"
+            app:layout_constraintTop_toBottomOf="@+id/comment_content"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/colorAccent"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>