From 4ce05d4c0dca532d88dcd54898302e5aa3bd8300 Mon Sep 17 00:00:00 2001
From: Hafizzle <hafizbhamidi@gmail.com>
Date: Fri, 29 Sep 2023 13:07:01 -0400
Subject: [PATCH] Report UI tweaks

---
 .../res/layout/fragment_report_message.xml    | 16 +++++++++++-----
 Habitica/res/values-night/colors.xml          |  1 +
 Habitica/res/values/colors.xml                |  1 +
 Habitica/res/values/strings.xml               |  4 ++--
 .../ui/fragments/ReportBottomSheetFragment.kt | 19 ++++++++++++++++++-
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/layout/fragment_report_message.xml b/Habitica/res/layout/fragment_report_message.xml
index d3644fd7e..2b446c2d3 100644
--- a/Habitica/res/layout/fragment_report_message.xml
+++ b/Habitica/res/layout/fragment_report_message.xml
@@ -46,10 +46,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="36dp"
+                    android:fontFamily="sans-serif-medium"
                     android:text="@string/report_violation"
                     android:textColor="@color/text_primary"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
+                    android:textSize="20sp" />
 
                 <Button
                     android:id="@+id/report_button"
@@ -87,7 +87,7 @@
                     android:layout_height="wrap_content"
                     app:cardBackgroundColor="@color/material_card_background_color"
                     app:cardCornerRadius="8dp"
-                    app:strokeColor="@color/text_quad"
+                    app:strokeColor="@color/gray200_gray400"
                     app:strokeWidth="1dp">
 
                     <TextView
@@ -111,6 +111,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_large"
+                    android:layout_marginBottom="@dimen/spacing_small"
+                    android:fontFamily="sans-serif-medium"
                     android:textColor="@color/text_primary"
                     android:textSize="16sp" />
 
@@ -136,7 +138,7 @@
                         android:padding="16dp"
                         android:paddingTop="12dp"
                         android:textColor="@color/text_primary"
-                        android:textColorHint="@color/text_quad" />
+                        android:textColorHint="@color/gray200_gray400" />
 
                 </com.google.android.material.card.MaterialCardView>
 
@@ -147,9 +149,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/spacing_medium"
+                    android:fontFamily="sans-serif-medium"
                     android:gravity="start"
                     android:textColor="@color/text_ternary"
                     android:textColorLink="?colorAccent"
+                    android:textSize="14sp"
                     android:textStyle="bold"
                     android:visibility="gone"
                     tools:text="@string/report_user_description" />
@@ -159,9 +163,11 @@
                     style="@style/Caption3"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif"
                     android:gravity="start"
                     android:textColor="@color/text_ternary"
-                    android:textColorLink="?colorAccent"
+                    android:textColorLink="@color/purple400_purple500"
+                    android:textSize="14sp"
                     tools:text="@string/report_message_explanation" />
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
index 8754c16b7..812638a21 100644
--- a/Habitica/res/values-night/colors.xml
+++ b/Habitica/res/values-night/colors.xml
@@ -60,6 +60,7 @@
     <color name="widget_background">#2B203A</color>
     <color name="text_gold">@color/yellow_100</color>
 
+    <color name="purple400_purple500">@color/brand_500</color>
     <color name="text_green10_green500">@color/green_500</color>
     <color name="gray100_gray400">@color/gray_400</color>
     <color name="gray200_gray400">@color/gray_400</color>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index ce6054fce..d2f019997 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -127,6 +127,7 @@
     <color name="text_green1_green500">@color/green_1</color>
     <color name="text_gold">@color/yellow_1</color>
 
+    <color name="purple400_purple500">@color/brand_400</color>
     <color name="text_green10_green500">@color/green_10</color>
     <color name="gray100_gray400">@color/gray_10</color>
     <color name="gray200_gray400">@color/gray_200</color>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 721ab1db1..f4d00d3e6 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -814,8 +814,8 @@
     <string name="report_hint">Reason for report</string>
     <string name="report_reason_title_message">Why are you reporting this message?</string>
     <string name="report_reason_title_player">Why are you reporting this player?</string>
-    <string name="report_formatted_name"><b>%1$s</b>\n@%2$s</string>
-    <string name="report_user_description">This will also block %s</string>
+    <string name="report_formatted_name">%1$s\n@%2$s</string>
+    <string name="report_user_description">This will also block @%s</string>
     <string name="report_message_hint">Reason for report</string>
     <string name="report_message">Report Message</string>
     <string name="report_successful">%s Reported</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt
index 618ec8185..010d4ca3a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt
@@ -3,6 +3,9 @@ package com.habitrpg.android.habitica.ui.fragments
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.TypefaceSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -90,7 +93,21 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
                 )
             )
             binding.reportExplanationTextview.setMarkdown(getString(R.string.report_user_explanation))
-            binding.messageTextView.text = getString(R.string.report_formatted_name, displayName, profileName)
+            val formattedString = getString(R.string.report_formatted_name, displayName, profileName)
+            val spannable = SpannableStringBuilder(formattedString)
+            spannable.setSpan(
+                TypefaceSpan("sans-serif-medium"),
+                0,
+                displayName?.length ?: 0,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            spannable.setSpan(
+                TypefaceSpan("sans-serif"),
+                displayName?.length ?: 0,
+                formattedString.length,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            binding.messageTextView.text = spannable
             binding.reportReasonTitle.text = getString(R.string.report_reason_title_player)
         } else if (reportType == REPORT_TYPE_MESSAGE) {
             binding.toolbarTitle.text = getString(R.string.report_message)