Skip to content

Commit 23bdb9e

Browse files
fix(mobile): Android composer renders DM Sans (#30230)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 0bba368 commit 23bdb9e

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

‎apps/mobile/modules/t3-composer-editor/android/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ android {
2020

2121
dependencies {
2222
implementation project(':expo-modules-core')
23+
implementation 'com.facebook.react:react-android'
2324
testImplementation 'junit:junit:4.13.2'
2425
testImplementation 'org.robolectric:robolectric:4.16.1'
2526
}

‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import android.view.inputmethod.InputConnection
3030
import android.view.inputmethod.InputConnectionWrapper
3131
import android.view.inputmethod.InputMethodManager
3232
import android.widget.EditText
33+
import com.facebook.react.common.assets.ReactFontManager
3334
import expo.modules.kotlin.AppContext
3435
import expo.modules.kotlin.viewevent.EventDispatcher
3536
import expo.modules.kotlin.views.ExpoView
@@ -276,8 +277,9 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
276277
editor.typeface = if (fontFamily.contains("Mono", ignoreCase = true)) {
277278
Typeface.MONOSPACE
278279
} else {
279-
Typeface.DEFAULT
280+
ReactFontManager.getInstance().getTypeface(fontFamily, Typeface.NORMAL, context.assets)
280281
}
282+
applyLineHeight()
281283
editor.applyPlaceholder()
282284
}
283285

‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ContextChip.kt‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.graphics.RectF
99
import android.graphics.Typeface
1010
import android.text.TextPaint
1111
import android.text.TextUtils
12+
import com.facebook.react.common.assets.ReactFontManager
1213
import kotlin.math.ceil
1314
import kotlin.math.min
1415

@@ -29,14 +30,14 @@ class T3ContextChip(
2930

3031
private val paint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
3132
textSize = fontSize
32-
typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
33+
typeface = chipTypeface()
3334
color = this@T3ContextChip.color
3435
}
3536
private val em = fontSize
3637

3738
private val detailPaint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
3839
textSize = fontSize * 0.84f
39-
typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL)
40+
typeface = chipTypeface()
4041
color = this@T3ContextChip.color
4142
}
4243
private val detailText = if (content.detail.isEmpty()) "" else " ${content.detail}"
@@ -86,6 +87,18 @@ class T3ContextChip(
8687
}
8788

8889
companion object {
90+
private const val CHIP_FONT_FAMILY = "DMSans-Medium"
91+
92+
// Matches the iOS chips; builds without the bundled font keep the platform medium.
93+
private fun chipTypeface(): Typeface {
94+
val fonts = ReactFontManager.getInstance()
95+
return if (CHIP_FONT_FAMILY in fonts.customFontFamilies) {
96+
fonts.getTypeface(CHIP_FONT_FAMILY, Typeface.NORMAL, null)
97+
} else {
98+
Typeface.create("sans-serif-medium", Typeface.NORMAL)
99+
}
100+
}
101+
89102
fun color(
90103
value: String,
91104
fallback: Int

0 commit comments

Comments
 (0)