From 245c9c2e64f3d5324e7b0c3a850b5b43af1757a0 Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Tue, 3 Nov 2020 10:13:43 +0100
Subject: [PATCH] Hide comments by default. Fixes #141

---
 .../java/com/h/pixeldroid/objects/Status.kt   |  5 +++++
 .../java/com/h/pixeldroid/utils/PostUtils.kt  |  3 +++
 app/src/main/res/layout/post_fragment.xml     | 20 +++++++++----------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/h/pixeldroid/objects/Status.kt b/app/src/main/java/com/h/pixeldroid/objects/Status.kt
index 2eb2606f..27896da5 100644
--- a/app/src/main/java/com/h/pixeldroid/objects/Status.kt
+++ b/app/src/main/java/com/h/pixeldroid/objects/Status.kt
@@ -259,11 +259,16 @@ data class Status(
         //Setup post pic only if there are media attachments
         if(!media_attachments.isNullOrEmpty()) {
             setupPostPics(rootView, request, homeFragment)
+        } else {
+            rootView.postPicture.visibility = GONE
+            rootView.postPager.visibility = GONE
+            rootView.postTabs.visibility = GONE
         }
 
 
         //Set comment initial visibility
         rootView.findViewById<LinearLayout>(R.id.commentIn).visibility = GONE
+        rootView.findViewById<LinearLayout>(R.id.commentContainer).visibility = GONE
     }
 
     fun setDescription(rootView: View, api: PixelfedAPI, credential: String) {
diff --git a/app/src/main/java/com/h/pixeldroid/utils/PostUtils.kt b/app/src/main/java/com/h/pixeldroid/utils/PostUtils.kt
index dae8e792..6be4c22c 100644
--- a/app/src/main/java/com/h/pixeldroid/utils/PostUtils.kt
+++ b/app/src/main/java/com/h/pixeldroid/utils/PostUtils.kt
@@ -220,12 +220,15 @@ abstract class PostUtils {
                     if(response.code() == 200) {
                         val statuses = response.body()!!.descendants
 
+                        holder.commentCont.removeAllViews()
+
                         //Create the new views for each comment
                         for (status in statuses) {
                             addComment(holder.context, holder.commentCont, status.account!!.username!!,
                                 status.content!!
                             )
                         }
+                        holder.commentCont.visibility = View.VISIBLE
                     } else {
                         Log.e("COMMENT ERROR", "${response.code()} with body ${response.errorBody()}")
                     }
diff --git a/app/src/main/res/layout/post_fragment.xml b/app/src/main/res/layout/post_fragment.xml
index ad5011cc..64259437 100644
--- a/app/src/main/res/layout/post_fragment.xml
+++ b/app/src/main/res/layout/post_fragment.xml
@@ -221,6 +221,15 @@
                 app:layout_constraintTop_toBottomOf="@+id/description"
                 tools:text="Yesterday" />
 
+            <TextView
+                android:id="@+id/ViewComments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/commentIn"
+                tools:text="3 comments" />
+
             <LinearLayout
                 android:id="@+id/commentIn"
                 android:layout_width="match_parent"
@@ -257,16 +266,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                tools:layout_editor_absoluteY="315dp"
-                app:layout_constraintTop_toBottomOf="@+id/commentIn">
-
-                <TextView
-                    android:id="@+id/ViewComments"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginBottom="10dp"
-                    tools:text="3 comments"/>
+                app:layout_constraintTop_toBottomOf="@+id/ViewComments">
 
             </LinearLayout>