From 5c5d55d2655fab6686e7c6ee8f08c8f3e0587a22 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 11 Mar 2024 11:14:05 -0300
Subject: [PATCH] Introduce glyph fonts to correct spacing.

---
 .../main/assets/fonts/SignalSymbols-Bold.otf  | Bin 0 -> 18060 bytes
 .../preferences/BioTextPreference.kt          |  29 +++++--
 .../securesms/fonts/SignalSymbols.kt          |  80 ++++++++++++++++++
 .../RecipientBottomSheetDialogFragment.java   |  22 +++--
 4 files changed, 114 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/assets/fonts/SignalSymbols-Bold.otf
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt

diff --git a/app/src/main/assets/fonts/SignalSymbols-Bold.otf b/app/src/main/assets/fonts/SignalSymbols-Bold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..8aed1da3c73a6c5dc729dd71da18efd670ac5412
GIT binary patch
literal 18060
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
NV+0zKf&Wdw{{bp-y4C;y

literal 0
HcmV?d00001

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
index 79f282c0fa..936cf6e725 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
@@ -7,9 +7,9 @@ import android.view.View
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
-import org.signal.core.util.dp
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.fonts.SignalSymbols
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.ContextUtil
 import org.thoughtcrime.securesms.util.ServiceUtil
@@ -57,20 +57,31 @@ object BioTextPreference {
           SpanUtil.appendSpacer(this, 8)
           SpanUtil.appendCenteredImageSpanWithoutSpace(this, ContextUtil.requireDrawable(context, R.drawable.ic_official_28), 28, 28)
         } else if (recipient.isSystemContact) {
-          val drawable = ContextUtil.requireDrawable(context, R.drawable.symbol_person_circle_24).apply {
-            setTint(ContextCompat.getColor(context, R.color.signal_colorOnSurface))
+          val systemContactGlyph = SignalSymbols.getSpannedString(
+            context,
+            SignalSymbols.Weight.BOLD,
+            SignalSymbols.Glyph.PERSON_CIRCLE
+          ).let {
+            SpanUtil.ofSize(it, 20)
           }
-          SpanUtil.appendSpacer(this, 8)
-          SpanUtil.appendCenteredImageSpanWithoutSpace(this, drawable, 24, 24)
+
+          append(" ")
+          append(systemContactGlyph)
         }
 
         if (recipient.isIndividual && !recipient.isSelf) {
-          val drawable = ContextUtil.requireDrawable(context, R.drawable.symbol_chevron_right_24).apply {
-            setBounds(0, 0, 24.dp, 24.dp)
-            setTint(ContextCompat.getColor(context, R.color.signal_colorOutline))
+          val chevronGlyph = SignalSymbols.getSpannedString(
+            context,
+            SignalSymbols.Weight.BOLD,
+            SignalSymbols.Glyph.CHEVRON_RIGHT
+          ).let {
+            SpanUtil.ofSize(it, 24)
+          }.let {
+            SpanUtil.color(ContextCompat.getColor(context, R.color.signal_colorOutline), it)
           }
 
-          append(SpanUtil.buildCenteredImageSpan(drawable))
+          append(" ")
+          append(chevronGlyph)
         }
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt
new file mode 100644
index 0000000000..52fc3cf5aa
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.fonts
+
+import android.content.Context
+import android.graphics.Typeface
+import android.text.SpannableStringBuilder
+import android.text.TextPaint
+import android.text.style.MetricAffectingSpan
+
+/**
+ * Helper object for working with the SignalSymbols font
+ */
+object SignalSymbols {
+
+  enum class Glyph(val unicode: Char) {
+    CHEVRON_RIGHT('\uE025'),
+    PERSON_CIRCLE('\uE05E')
+  }
+
+  enum class Weight {
+    BOLD
+  }
+
+  private val cache = mutableMapOf<Weight, Typeface>()
+
+  fun getSpannedString(
+    context: Context,
+    weight: Weight,
+    glyph: Glyph
+  ): CharSequence {
+    val typeface = getTypeface(context, weight)
+    val span = CustomTypefaceSpan(typeface)
+
+    val text = SpannableStringBuilder(glyph.unicode.toString())
+    text.setSpan(span, 0, text.length, 0)
+
+    return text
+  }
+
+  private fun getTypeface(context: Context, weight: Weight): Typeface {
+    return when (weight) {
+      Weight.BOLD -> getBoldWeightedFont(context)
+      else -> error("Unsupported weight: $weight")
+    }
+  }
+
+  private fun getBoldWeightedFont(context: Context): Typeface {
+    return cache.getOrPut(
+      Weight.BOLD
+    ) {
+      Typeface.createFromAsset(
+        context.assets,
+        "fonts/SignalSymbols-Bold.otf"
+      )
+    }
+  }
+
+  /**
+   * Custom TypefaceSpan to support TypefaceSpan in API<28
+   *
+   * Source: https://www.youtube.com/watch?v=x-FcOX6ErdI&t=486s
+   */
+  private class CustomTypefaceSpan(val font: Typeface?) : MetricAffectingSpan() {
+    override fun updateMeasureState(textPaint: TextPaint) = update(textPaint)
+    override fun updateDrawState(textPaint: TextPaint?) = update(textPaint)
+
+    private fun update(tp: TextPaint?) {
+      tp.apply {
+        val old = this!!.typeface
+        val oldStyle = old?.style ?: 0
+        val font = Typeface.create(font, oldStyle)
+        typeface = font
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
index 2a3fc5f564..0d100ab2e4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon;
 import org.thoughtcrime.securesms.components.settings.conversation.preferences.ButtonStripPreference;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto80dp;
+import org.thoughtcrime.securesms.fonts.SignalSymbols;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -191,17 +192,22 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
         SpanUtil.appendSpacer(nameBuilder, 8);
         SpanUtil.appendCenteredImageSpanWithoutSpace(nameBuilder, ContextUtil.requireDrawable(requireContext(), R.drawable.ic_official_28), 28, 28);
       } else if (recipient.isSystemContact()) {
-        Drawable drawable = ContextUtil.requireDrawable(requireContext(), R.drawable.symbol_person_circle_24);
-        drawable.setTint(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurface));
-        SpanUtil.appendSpacer(nameBuilder, 8);
-        SpanUtil.appendCenteredImageSpanWithoutSpace(nameBuilder, drawable, 24, 24);
+        CharSequence systemContactGlyph = SignalSymbols.INSTANCE.getSpannedString(requireContext(),
+                                                                                  SignalSymbols.Weight.BOLD,
+                                                                                  SignalSymbols.Glyph.PERSON_CIRCLE);
+
+        nameBuilder.append(" ");
+        nameBuilder.append(SpanUtil.ofSize(systemContactGlyph, 20));
       }
 
       if (!recipient.isSelf() && recipient.isIndividual()) {
-        Drawable drawable = ContextUtil.requireDrawable(requireContext(), R.drawable.symbol_chevron_right_24);
-        drawable.setBounds(0, 0, (int) DimensionUnit.DP.toPixels(24), (int) DimensionUnit.DP.toPixels(24));
-        drawable.setTint(ContextCompat.getColor(requireContext(), R.color.signal_colorOutline));
-        nameBuilder.append(SpanUtil.buildCenteredImageSpan(drawable));
+        CharSequence chevronGlyph = SignalSymbols.INSTANCE.getSpannedString(requireContext(),
+                                                                            SignalSymbols.Weight.BOLD,
+                                                                            SignalSymbols.Glyph.CHEVRON_RIGHT);
+
+        nameBuilder.append(" ");
+        nameBuilder.append(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOutline),
+                                          SpanUtil.ofSize(chevronGlyph, 24)));
 
         fullName.setText(nameBuilder);
         fullName.setOnClickListener(v -> {