Add chevron to pending participants view.

alex-signal · cody-signal · commit d1475228f710 · 2024-09-13T10:51:30.000-04:00
diff --git a/app/src/main/assets/fonts/SignalSymbols-Regular.otf b/app/src/main/assets/fonts/SignalSymbols-Regular.otf
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsView.kt
@@ -6,6 +6,7 @@
 package org.thoughtcrime.securesms.components.webrtc
 
 import android.content.Context
+import android.text.SpannableStringBuilder
 import android.util.AttributeSet
 import android.view.View
 import android.widget.TextView
@@ -14,8 +15,10 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
+import org.thoughtcrime.securesms.fonts.SignalSymbols
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.service.webrtc.PendingParticipantCollection
+import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.visible
 
 /**
@@ -55,8 +58,14 @@ class PendingParticipantsView @JvmOverloads constructor(
     avatar.setAvatar(firstRecipient)
     avatar.setOnClickListener { listener?.onLaunchRecipientSheet(firstRecipient) }
 
-    name.text = firstRecipient.getShortDisplayName(context)
-
+    name.text = SpannableStringBuilder(firstRecipient.getShortDisplayName(context))
+      .append(" ")
+      .append(SpanUtil.ofSize(
+        SignalSymbols.getSpannedString(context, SignalSymbols.Weight.REGULAR, SignalSymbols.Glyph.CHEVRON_RIGHT),
+        16
+      ))
+    name.setOnClickListener { listener?.onLaunchRecipientSheet(firstRecipient) }
+     
     allow.setOnClickListener { listener?.onAllowPendingRecipient(firstRecipient) }
     reject.setOnClickListener { listener?.onRejectPendingRecipient(firstRecipient) }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/SignalSymbols.kt
@@ -22,7 +22,8 @@ object SignalSymbols {
   }
 
   enum class Weight {
-    BOLD
+    BOLD,
+    REGULAR
   }
 
   private val cache = mutableMapOf<Weight, Typeface>()
@@ -45,6 +46,7 @@ object SignalSymbols {
   private fun getTypeface(context: Context, weight: Weight): Typeface {
     return when (weight) {
       Weight.BOLD -> getBoldWeightedFont(context)
+      Weight.REGULAR -> getRegularWeightedFont(context)
       else -> error("Unsupported weight: $weight")
     }
   }
@@ -60,6 +62,17 @@ object SignalSymbols {
     }
   }
 
+  private fun getRegularWeightedFont(context: Context): Typeface {
+    return cache.getOrPut(
+      Weight.REGULAR
+    ) {
+      Typeface.createFromAsset(
+        context.assets,
+        "fonts/SignalSymbols-Regular.otf"
+      )
+    }
+  }
+
   /**
    * Custom TypefaceSpan to support TypefaceSpan in API<28
    *

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ object SignalSymbols {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`enum class Weight {`
`25`		`- BOLD`
	`25`	`+ BOLD,`
	`26`	`+ REGULAR`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`private val cache = mutableMapOf<Weight, Typeface>()`
`@@ -45,6 +46,7 @@ object SignalSymbols {`
`45`	`46`	`private fun getTypeface(context: Context, weight: Weight): Typeface {`
`46`	`47`	`return when (weight) {`
`47`	`48`	`Weight.BOLD -> getBoldWeightedFont(context)`
	`49`	`+ Weight.REGULAR -> getRegularWeightedFont(context)`
`48`	`50`	`else -> error("Unsupported weight: $weight")`
`49`	`51`	`}`
`50`	`52`	`}`
`@@ -60,6 +62,17 @@ object SignalSymbols {`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`
	`65`	`+ private fun getRegularWeightedFont(context: Context): Typeface {`
	`66`	`+ return cache.getOrPut(`
	`67`	`+ Weight.REGULAR`
	`68`	`+ ) {`
	`69`	`+ Typeface.createFromAsset(`
	`70`	`+ context.assets,`
	`71`	`+ "fonts/SignalSymbols-Regular.otf"`
	`72`	`+ )`
	`73`	`+ }`
	`74`	`+ }`
	`75`	`+`
`63`	`76`	`/**`
`64`	`77`	`* Custom TypefaceSpan to support TypefaceSpan in API<28`
`65`	`78`	`*`