From b9733e69e9fe58a972401d58cfdb344c7abf8328 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 29 Oct 2019 13:52:30 +0800
Subject: Placing vote buttons on the right for comments is now available.

---
 .../main/res/drawable/ic_expand_more_grey_24dp.xml |   4 +-
 app/src/main/res/layout/item_comment.xml           | 162 ++++++++++++++++++---
 2 files changed, 147 insertions(+), 19 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/ic_expand_more_grey_24dp.xml b/app/src/main/res/drawable/ic_expand_more_grey_24dp.xml
index 71b8f17a..d0231df5 100644
--- a/app/src/main/res/drawable/ic_expand_more_grey_24dp.xml
+++ b/app/src/main/res/drawable/ic_expand_more_grey_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="20dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF808080" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
 </vector>
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 1e594578..242841b2 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -71,20 +71,144 @@
             android:textColor="@color/primaryTextColor"
             android:textSize="?attr/content_font_default" />
 
+        <!--<androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/bottom_constraint_layout_item_post_comment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp">
+
+            <ImageView
+                android:id="@+id/up_vote_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/ic_arrow_upward_grey_24dp"
+                app:layout_constraintEnd_toStartOf="@id/score_text_view_item_post_comment"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_comment"
+                android:layout_width="64dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textSize="?attr/font_12"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toStartOf="@+id/down_vote_button_item_post_comment"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <ImageView
+                android:id="@+id/down_vote_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/ic_arrow_downward_grey_24dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <ImageView
+                android:id="@+id/more_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/ic_more_vert_grey_24dp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/expand_button_item_post_comment"
+                app:layout_constraintEnd_toStartOf="@id/up_vote_button_item_post_comment"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintHorizontal_bias="0" />
+
+            <ImageView
+                android:id="@+id/expand_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/ic_expand_less_grey_24dp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/save_button_item_post_comment"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <ImageView
+                android:id="@+id/save_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                app:layout_constraintStart_toEndOf="@+id/reply_button_item_post_comment"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <ImageView
+                android:id="@+id/reply_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/ic_reply_grey_24dp"
+                app:layout_constraintStart_toEndOf="@id/share_button_item_post_comment"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <ImageView
+                android:id="@+id/share_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/ic_share_grey_24dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>-->
+
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/bottom_constraint_layout_item_post_comment"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp">
 
             <ImageView
                 android:id="@+id/up_vote_button_item_post_comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:src="@drawable/ic_arrow_upward_grey_24dp"
-                android:tint="@android:color/tab_indicator_text"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent" />
@@ -93,7 +217,6 @@
                 android:id="@+id/score_text_view_item_post_comment"
                 android:layout_width="64dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
                 android:gravity="center"
                 android:textSize="?attr/font_12"
                 android:textStyle="bold"
@@ -105,8 +228,8 @@
                 android:id="@+id/down_vote_button_item_post_comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="16dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -122,7 +245,8 @@
                 android:id="@+id/more_button_item_post_comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -136,7 +260,8 @@
                 android:id="@+id/expand_button_item_post_comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -151,36 +276,39 @@
                 android:id="@+id/save_button_item_post_comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                app:layout_constraintEnd_toStartOf="@+id/share_button_item_post_comment"
+                app:layout_constraintEnd_toStartOf="@+id/reply_button_item_post_comment"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
             <ImageView
-                android:id="@+id/share_button_item_post_comment"
+                android:id="@+id/reply_button_item_post_comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_share_grey_24dp"
-                app:layout_constraintEnd_toStartOf="@+id/reply_button_item_post_comment"
+                android:src="@drawable/ic_reply_grey_24dp"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_comment"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
             <ImageView
-                android:id="@+id/reply_button_item_post_comment"
+                android:id="@+id/share_button_item_post_comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_reply_grey_24dp"
+                android:src="@drawable/ic_share_grey_24dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"/>
-- 
cgit v1.2.3