React/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2024-11-21 21:27:46 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Unbreak legacy ReactFontManager (#47585)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/47585

We have two classes named ReactFontManager and during the Kotlin migration this got mixed up.

Changelog: [Android][Fixed] Fixed crash in legacy ReactFontManager

Reviewed By: fabriziocucci

Differential Revision: D65877606

fbshipit-source-id: d9dc4f29045ad377adb216216334af5501c5546e
This commit is contained in:
Pieter De Baets 2024-11-13 09:29:35 -08:00 committed by Facebook GitHub Bot
parent 32931466ed
commit 3da23f7093
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/react-native/ReactAndroid/api/ReactAndroid.api
View File

@ -7242,7 +7242,7 @@ public abstract class com/facebook/react/views/text/ReactBaseTextShadowNode : co
public final class com/facebook/react/views/text/ReactFontManager {
public static final field Companion Lcom/facebook/react/views/text/ReactFontManager$Companion;
public synthetic fun <init> (Lcom/facebook/react/views/text/ReactFontManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Lcom/facebook/react/common/assets/ReactFontManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun addCustomFont (Landroid/content/Context;Ljava/lang/String;I)V
public final fun addCustomFont (Ljava/lang/String;Landroid/graphics/Typeface;)V
public static final fun getInstance ()Lcom/facebook/react/views/text/ReactFontManager;

6
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.kt
View File

@ -10,13 +10,14 @@ package com.facebook.react.views.text
import android.content.Context
import android.content.res.AssetManager
import android.graphics.Typeface
import com.facebook.react.common.assets.ReactFontManager as ReactFontAssetManager
/** Responsible for loading and caching Typeface objects. */
@Deprecated(
message =
"This class is deprecated and will be deleted in the near future. Please use [com.facebook.react.common.assets.ReactFontManager] instead.")
@Suppress("DEPRECATION")
public class ReactFontManager private constructor(private val delegate: ReactFontManager) {
public class ReactFontManager private constructor(private val delegate: ReactFontAssetManager) {
public fun getTypeface(fontFamilyName: String, style: Int, assetManager: AssetManager): Typeface =
delegate.getTypeface(fontFamilyName, style, assetManager)
@ -52,7 +53,8 @@ public class ReactFontManager private constructor(private val delegate: ReactFon
@JvmStatic
public fun getInstance(): ReactFontManager {
return instance ?: ReactFontManager(ReactFontManager.getInstance()).also { instance = it }
return instance
?: ReactFontManager(ReactFontAssetManager.getInstance()).also { instance = it }
}
}
}