From 88ac02150ca49a20b33f54e0f2cc1c8e2385a8a8 Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Wed, 3 Aug 2022 13:32:13 +0200
Subject: [PATCH] Add domain to comments

---
 .../org/pixeldroid/app/posts/PostActivity.kt   |  2 ++
 app/src/main/res/layout/activity_post.xml      | 18 ++++++++----------
 app/src/main/res/layout/comment.xml            | 11 +++++++++++
 app/src/main/res/values/colors.xml             |  2 ++
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt b/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt
index 761bed14..34480166 100644
--- a/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt
@@ -173,6 +173,8 @@ class PostActivity : BaseThemedWithBarActivity() {
                 lifecycleScope
             )
 
+            binding.postDomain.text = comment.getStatusDomain(domain, binding.postDomain.context)
+
             if(comment.replies_count == 0 || comment.replies_count == null){
                 binding.replies.visibility = View.GONE
             } else {
diff --git a/app/src/main/res/layout/activity_post.xml b/app/src/main/res/layout/activity_post.xml
index 410ef8bb..5f1b49d2 100644
--- a/app/src/main/res/layout/activity_post.xml
+++ b/app/src/main/res/layout/activity_post.xml
@@ -99,15 +99,13 @@
             tools:listitem="@layout/comment" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        <ProgressBar
-            android:id="@+id/postCommentsProgressBar"
-            style="?android:attr/progressBarStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/errorLayout" />
-
     </androidx.constraintlayout.motion.widget.MotionLayout>
+
+    <ProgressBar
+        android:id="@+id/postCommentsProgressBar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        app:layout_anchor="@id/motionLayout" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/comment.xml b/app/src/main/res/layout/comment.xml
index d66a0613..ceecefa7 100644
--- a/app/src/main/res/layout/comment.xml
+++ b/app/src/main/res/layout/comment.xml
@@ -34,6 +34,17 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="username" />
 
+            <TextView
+                android:id="@+id/postDomain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:textColor="@color/domainGray"
+                app:layout_constraintBottom_toBottomOf="@+id/user"
+                app:layout_constraintStart_toEndOf="@+id/user"
+                app:layout_constraintTop_toTopOf="@+id/user"
+                tools:text="from domain.tld" />
+
             <TextView
                 android:id="@+id/commentText"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ee3ca81a..34455d44 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,8 @@
 
     <color name="white">#FFFFFF</color>
 
+    <color name="domainGray">#b3b3b3</color>
+
     <!-- > Following are theme color values </-->
     <color name="seed">#f4a261</color>
     <color name="md_theme_light_primary">#924C00</color>