Giving awards to comments. Fix some bugs.

3 files changed, 53 insertions, 14 deletions

diff --git a/app/src/main/res/drawable-night/ic_give_award_24dp.xml b/app/src/main/res/drawable-night/ic_give_award_24dp.xml
new file mode 100644
index 00000000..cb3c05a5
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_give_award_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M22,10L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2zM20,8.54c-1.19,0.69 -2,1.99 -2,3.46s0.81,2.77 2,3.46L20,18L4,18v-2.54c1.19,-0.69 2,-1.99 2,-3.46 0,-1.48 -0.8,-2.77 -1.99,-3.46L4,6h16v2.54zM9.07,16L12,14.12 14.93,16l-0.89,-3.36 2.69,-2.2 -3.47,-0.21L12,7l-1.27,3.22 -3.47,0.21 2.69,2.2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_give_award_24dp.xml b/app/src/main/res/drawable/ic_give_award_24dp.xml
new file mode 100644
index 00000000..538f5d71
--- /dev/null
+++ b/app/src/main/res/drawable/ic_give_award_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#000000"
+      android:pathData="M22,10L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2zM20,8.54c-1.19,0.69 -2,1.99 -2,3.46s0.81,2.77 2,3.46L20,18L4,18v-2.54c1.19,-0.69 2,-1.99 2,-3.46 0,-1.48 -0.8,-2.77 -1.99,-3.46L4,6h16v2.54zM9.07,16L12,14.12 14.93,16l-0.89,-3.36 2.69,-2.2 -3.47,-0.21L12,7l-1.27,3.22 -3.47,0.21 2.69,2.2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
index 6873171b..719935d5 100644
--- a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml
@@ -1,4 +1,5 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:overScrollMode="never"
@@ -15,7 +16,6 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:drawableStart="@drawable/ic_edit_24dp"
             android:drawablePadding="48dp"
             android:focusable="true"
             android:paddingStart="32dp"
@@ -26,7 +26,8 @@
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_edit_24dp" />
 
         <TextView
             android:id="@+id/delete_text_view_comment_more_bottom_sheet_fragment"
@@ -34,7 +35,6 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:drawableStart="@drawable/ic_delete_24dp"
             android:drawablePadding="48dp"
             android:focusable="true"
             android:paddingStart="32dp"
@@ -45,7 +45,8 @@
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_delete_24dp" />
 
         <TextView
             android:id="@+id/save_text_view_comment_more_bottom_sheet_fragment"
@@ -53,7 +54,6 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:drawableStart="@drawable/ic_share_24dp"
             android:drawablePadding="48dp"
             android:focusable="true"
             android:gravity="center_vertical"
@@ -64,7 +64,8 @@
             android:text="@string/share"
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family" />
+            android:fontFamily="?attr/font_family"
+            app:drawableStartCompat="@drawable/ic_share_24dp" />
 
         <TextView
             android:id="@+id/copy_text_view_comment_more_bottom_sheet_fragment"
@@ -72,7 +73,6 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:drawableStart="@drawable/ic_copy_24dp"
             android:drawablePadding="48dp"
             android:focusable="true"
             android:gravity="center_vertical"
@@ -83,7 +83,28 @@
             android:text="@string/copy_text"
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family" />
+            android:fontFamily="?attr/font_family"
+            app:drawableStartCompat="@drawable/ic_copy_24dp" />
+
+        <TextView
+            android:id="@+id/give_award_text_view_comment_more_bottom_sheet_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawablePadding="48dp"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:paddingStart="32dp"
+            android:paddingTop="16dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="16dp"
+            android:text="@string/action_give_award"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family"
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_give_award_24dp" />
 
         <TextView
             android:id="@+id/view_full_markdown_text_view_comment_more_bottom_sheet_fragment"
@@ -91,7 +112,6 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:drawableStart="@drawable/ic_full_markdown_24dp"
             android:drawablePadding="48dp"
             android:focusable="true"
             android:gravity="center_vertical"
@@ -102,7 +122,8 @@
             android:text="@string/view_full_comment_markdown"
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family" />
+            android:fontFamily="?attr/font_family"
+            app:drawableStartCompat="@drawable/ic_full_markdown_24dp" />
 
         <TextView
             android:id="@+id/report_view_comment_more_bottom_sheet_fragment"
@@ -110,7 +131,6 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:drawableStart="@drawable/ic_report_24dp"
             android:drawablePadding="48dp"
             android:focusable="true"
             android:gravity="center_vertical"
@@ -121,7 +141,8 @@
             android:text="@string/report"
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family" />
+            android:fontFamily="?attr/font_family"
+            app:drawableStartCompat="@drawable/ic_report_24dp" />
 
         <TextView
             android:id="@+id/see_removed_view_comment_more_bottom_sheet_fragment"
@@ -129,7 +150,6 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:drawableStart="@drawable/ic_preview_24dp"
             android:drawablePadding="48dp"
             android:focusable="true"
             android:gravity="center_vertical"
@@ -141,7 +161,8 @@
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
             android:fontFamily="?attr/font_family"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_preview_24dp" />
 
     </LinearLayout>