@react-navigation/native 8.0.0-alpha.2 → 8.0.0-alpha.3

package/android/build/generated/source/codegen/java/com/facebook/fbreact/specs/NativeMaterialSymbolModuleSpec.java

@@ -34,5 +34,5 @@ public abstract class NativeMaterialSymbolModuleSpec extends ReactContextBaseJav
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   @DoNotStrip
-  public abstract String getImageSource(String name, String variant, double size, ReadableMap color, String hash);
+  public abstract String getImageSource(String name, String variant, double size, double weight, ReadableMap color, String hash);
 }

package/android/build/generated/source/codegen/java/com/facebook/react/viewmanagers/ReactNavigationMaterialSymbolViewManagerDelegate.java

@@ -29,6 +29,9 @@ public class ReactNavigationMaterialSymbolViewManagerDelegate<T extends View, U
       case "variant":
         mViewManager.setVariant(view, value == null ? null : (String) value);
         break;
+      case "weight":
+        mViewManager.setWeight(view, value == null ? 400 : ((Double) value).intValue());
+        break;
       case "size":
         mViewManager.setSize(view, value == null ? Float.NaN : ((Double) value).floatValue());
         break;

package/android/build/generated/source/codegen/java/com/facebook/react/viewmanagers/ReactNavigationMaterialSymbolViewManagerInterface.java

@@ -16,6 +16,7 @@ import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 public interface ReactNavigationMaterialSymbolViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setName(T view, @Nullable String value);
   void setVariant(T view, @Nullable String value);
+  void setWeight(T view, @Nullable Integer value);
   void setSize(T view, float value);
   void setColor(T view, @Nullable Integer value);
 }

package/android/build/generated/source/codegen/jni/ReactNavigationSpec-generated.cpp

@@ -14,12 +14,12 @@ namespace facebook::react {
 
 static facebook::jsi::Value __hostFunction_NativeMaterialSymbolModuleSpecJSI_getImageSource(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, StringKind, "getImageSource", "(Ljava/lang/String;Ljava/lang/String;DLcom/facebook/react/bridge/ReadableMap;Ljava/lang/String;)Ljava/lang/String;", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, StringKind, "getImageSource", "(Ljava/lang/String;Ljava/lang/String;DDLcom/facebook/react/bridge/ReadableMap;Ljava/lang/String;)Ljava/lang/String;", args, count, cachedMethodId);
 }
 
 NativeMaterialSymbolModuleSpecJSI::NativeMaterialSymbolModuleSpecJSI(const JavaTurboModule::InitParams &params)
   : JavaTurboModule(params) {
-  methodMap_["getImageSource"] = MethodMetadata {5, __hostFunction_NativeMaterialSymbolModuleSpecJSI_getImageSource};
+  methodMap_["getImageSource"] = MethodMetadata {6, __hostFunction_NativeMaterialSymbolModuleSpecJSI_getImageSource};
 }
 
 std::shared_ptr<TurboModule> ReactNavigationSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {

package/android/build/generated/source/codegen/jni/react/renderer/components/ReactNavigationSpec/Props.cpp

@@ -21,6 +21,7 @@ ReactNavigationMaterialSymbolViewProps::ReactNavigationMaterialSymbolViewProps(
 
     name(convertRawProp(context, rawProps, "name", sourceProps.name, {})),
     variant(convertRawProp(context, rawProps, "variant", sourceProps.variant, {})),
+    weight(convertRawProp(context, rawProps, "weight", sourceProps.weight, {ReactNavigationMaterialSymbolViewWeight::Weight400})),
     size(convertRawProp(context, rawProps, "size", sourceProps.size, {0.0})),
     color(convertRawProp(context, rawProps, "color", sourceProps.color, {})) {}
     
@@ -48,6 +49,10 @@ folly::dynamic ReactNavigationMaterialSymbolViewProps::getDiffProps(
     result["variant"] = variant;
   }
     
+  if (weight != oldProps->weight) {
+    result["weight"] = toDynamic(weight);
+  }
+    
   if ((size != oldProps->size) && !(std::isnan(size) && std::isnan(oldProps->size))) {
     result["size"] = size;
   }

package/android/build/generated/source/codegen/jni/react/renderer/components/ReactNavigationSpec/Props.h

@@ -15,6 +15,63 @@
 
 namespace facebook::react {
 
+enum class ReactNavigationMaterialSymbolViewWeight { Weight100 = 100, Weight200 = 200, Weight300 = 300, Weight400 = 400, Weight500 = 500, Weight600 = 600, Weight700 = 700 };
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ReactNavigationMaterialSymbolViewWeight &result) {
+  assert(value.hasType<int>());
+  auto integerValue = (int)value;
+  switch (integerValue) {
+    case 100:
+      result = ReactNavigationMaterialSymbolViewWeight::Weight100;
+      return;
+    case 200:
+      result = ReactNavigationMaterialSymbolViewWeight::Weight200;
+      return;
+    case 300:
+      result = ReactNavigationMaterialSymbolViewWeight::Weight300;
+      return;
+    case 400:
+      result = ReactNavigationMaterialSymbolViewWeight::Weight400;
+      return;
+    case 500:
+      result = ReactNavigationMaterialSymbolViewWeight::Weight500;
+      return;
+    case 600:
+      result = ReactNavigationMaterialSymbolViewWeight::Weight600;
+      return;
+    case 700:
+      result = ReactNavigationMaterialSymbolViewWeight::Weight700;
+      return;
+  }
+  abort();
+}
+
+static inline std::string toString(const ReactNavigationMaterialSymbolViewWeight &value) {
+  switch (value) {
+    case ReactNavigationMaterialSymbolViewWeight::Weight100: return "100";
+    case ReactNavigationMaterialSymbolViewWeight::Weight200: return "200";
+    case ReactNavigationMaterialSymbolViewWeight::Weight300: return "300";
+    case ReactNavigationMaterialSymbolViewWeight::Weight400: return "400";
+    case ReactNavigationMaterialSymbolViewWeight::Weight500: return "500";
+    case ReactNavigationMaterialSymbolViewWeight::Weight600: return "600";
+    case ReactNavigationMaterialSymbolViewWeight::Weight700: return "700";
+  }
+}
+
+#ifdef RN_SERIALIZABLE_STATE
+static inline folly::dynamic toDynamic(const ReactNavigationMaterialSymbolViewWeight &value) {
+  switch (value) {
+    case ReactNavigationMaterialSymbolViewWeight::Weight100: return 100;
+    case ReactNavigationMaterialSymbolViewWeight::Weight200: return 200;
+    case ReactNavigationMaterialSymbolViewWeight::Weight300: return 300;
+    case ReactNavigationMaterialSymbolViewWeight::Weight400: return 400;
+    case ReactNavigationMaterialSymbolViewWeight::Weight500: return 500;
+    case ReactNavigationMaterialSymbolViewWeight::Weight600: return 600;
+    case ReactNavigationMaterialSymbolViewWeight::Weight700: return 700;
+  }
+}
+#endif
+
 class ReactNavigationMaterialSymbolViewProps final : public ViewProps {
  public:
   ReactNavigationMaterialSymbolViewProps() = default;
@@ -24,6 +81,7 @@ class ReactNavigationMaterialSymbolViewProps final : public ViewProps {
 
   std::string name{};
   std::string variant{};
+  ReactNavigationMaterialSymbolViewWeight weight{ReactNavigationMaterialSymbolViewWeight::Weight400};
   Float size{0.0};
   SharedColor color{};
 

package/android/build/generated/source/codegen/jni/react/renderer/components/ReactNavigationSpec/ReactNavigationSpecJSI-generated.cpp

@@ -17,14 +17,15 @@ static jsi::Value __hostFunction_NativeMaterialSymbolModuleCxxSpecJSI_getImageSo
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
     count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt),
     count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asNumber(),
-    count <= 3 ? throw jsi::JSError(rt, "Expected argument in position 3 to be passed") : args[3].asObject(rt),
-    count <= 4 ? throw jsi::JSError(rt, "Expected argument in position 4 to be passed") : args[4].asString(rt)
+    count <= 3 ? throw jsi::JSError(rt, "Expected argument in position 3 to be passed") : args[3].asNumber(),
+    count <= 4 ? throw jsi::JSError(rt, "Expected argument in position 4 to be passed") : args[4].asObject(rt),
+    count <= 5 ? throw jsi::JSError(rt, "Expected argument in position 5 to be passed") : args[5].asString(rt)
   );
 }
 
 NativeMaterialSymbolModuleCxxSpecJSI::NativeMaterialSymbolModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule("ReactNavigationMaterialSymbolModule", jsInvoker) {
-  methodMap_["getImageSource"] = MethodMetadata {5, __hostFunction_NativeMaterialSymbolModuleCxxSpecJSI_getImageSource};
+  methodMap_["getImageSource"] = MethodMetadata {6, __hostFunction_NativeMaterialSymbolModuleCxxSpecJSI_getImageSource};
 }
 
 

package/android/build/generated/source/codegen/jni/react/renderer/components/ReactNavigationSpec/ReactNavigationSpecJSI.h

@@ -20,7 +20,7 @@ protected:
   NativeMaterialSymbolModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
 
 public:
-  virtual jsi::String getImageSource(jsi::Runtime &rt, jsi::String name, jsi::String variant, double size, jsi::Object color, jsi::String hash) = 0;
+  virtual jsi::String getImageSource(jsi::Runtime &rt, jsi::String name, jsi::String variant, double size, double weight, jsi::Object color, jsi::String hash) = 0;
 
 };
 
@@ -51,13 +51,13 @@ private:
 
     }
 
-    jsi::String getImageSource(jsi::Runtime &rt, jsi::String name, jsi::String variant, double size, jsi::Object color, jsi::String hash) override {
+    jsi::String getImageSource(jsi::Runtime &rt, jsi::String name, jsi::String variant, double size, double weight, jsi::Object color, jsi::String hash) override {
       static_assert(
-          bridging::getParameterCount(&T::getImageSource) == 6,
-          "Expected getImageSource(...) to have 6 parameters");
+          bridging::getParameterCount(&T::getImageSource) == 7,
+          "Expected getImageSource(...) to have 7 parameters");
 
       return bridging::callFromJs<jsi::String>(
-          rt, &T::getImageSource, jsInvoker_, instance_, std::move(name), std::move(variant), std::move(size), std::move(color), std::move(hash));
+          rt, &T::getImageSource, jsInvoker_, instance_, std::move(name), std::move(variant), std::move(size), std::move(weight), std::move(color), std::move(hash));
     }
 
   private:

package/android/build/generated/source/codegen/schema.json

@@ -1 +1 @@
-{"libraryName":"","modules":{"ReactNavigationMaterialSymbolView":{"type":"Component","components":{"ReactNavigationMaterialSymbolView":{"extendsProps":[{"type":"ReactNativeBuiltInType","knownTypeName":"ReactNativeCoreViewProps"}],"events":[],"props":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"variant","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"size","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"color","optional":false,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}}],"commands":[]}}},"NativeMaterialSymbolModule":{"type":"NativeModule","aliasMap":{},"enumMap":{},"spec":{"eventEmitters":[],"methods":[{"name":"getImageSource","optional":false,"typeAnnotation":{"type":"FunctionTypeAnnotation","returnTypeAnnotation":{"type":"StringTypeAnnotation"},"params":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation"}},{"name":"variant","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation"}},{"name":"size","optional":false,"typeAnnotation":{"type":"NumberTypeAnnotation"}},{"name":"color","optional":false,"typeAnnotation":{"type":"GenericObjectTypeAnnotation"}},{"name":"hash","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation"}}]}}]},"moduleName":"ReactNavigationMaterialSymbolModule"},"ReactNavigationSFSymbolView":{"type":"Component","components":{"ReactNavigationSFSymbolView":{"extendsProps":[{"type":"ReactNativeBuiltInType","knownTypeName":"ReactNativeCoreViewProps"}],"events":[],"props":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"size","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"color","optional":false,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}}],"commands":[]}}}}}
+{"libraryName":"","modules":{"ReactNavigationMaterialSymbolView":{"type":"Component","components":{"ReactNavigationMaterialSymbolView":{"extendsProps":[{"type":"ReactNativeBuiltInType","knownTypeName":"ReactNativeCoreViewProps"}],"events":[],"props":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"variant","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"weight","optional":true,"typeAnnotation":{"type":"Int32EnumTypeAnnotation","default":400,"options":[100,200,300,400,500,600,700]}},{"name":"size","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"color","optional":false,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}}],"commands":[]}}},"NativeMaterialSymbolModule":{"type":"NativeModule","aliasMap":{},"enumMap":{},"spec":{"eventEmitters":[],"methods":[{"name":"getImageSource","optional":false,"typeAnnotation":{"type":"FunctionTypeAnnotation","returnTypeAnnotation":{"type":"StringTypeAnnotation"},"params":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation"}},{"name":"variant","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation"}},{"name":"size","optional":false,"typeAnnotation":{"type":"NumberTypeAnnotation"}},{"name":"weight","optional":false,"typeAnnotation":{"type":"UnionTypeAnnotation","memberType":"NumberTypeAnnotation"}},{"name":"color","optional":false,"typeAnnotation":{"type":"GenericObjectTypeAnnotation"}},{"name":"hash","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation"}}]}}]},"moduleName":"ReactNavigationMaterialSymbolModule"},"ReactNavigationSFSymbolView":{"type":"Component","components":{"ReactNavigationSFSymbolView":{"extendsProps":[{"type":"ReactNativeBuiltInType","knownTypeName":"ReactNativeCoreViewProps"}],"events":[],"props":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"size","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"color","optional":false,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}}],"commands":[]}}}}}

package/android/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/src/main/assets"/><source path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/react-navigation"><file name="fonts/MaterialSymbolsRounded.ttf" path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/react-navigation/fonts/MaterialSymbolsRounded.ttf"/><file name="fonts/MaterialSymbolsOutlined.ttf" path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/react-navigation/fonts/MaterialSymbolsOutlined.ttf"/><file name="fonts/MaterialSymbolsSharp.ttf" path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/react-navigation/fonts/MaterialSymbolsSharp.ttf"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/src/main/assets"/><source path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/react-navigation"><file name="fonts/MaterialSymbolsOutlined_400.ttf" path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/react-navigation/fonts/MaterialSymbolsOutlined_400.ttf"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/src/debug/assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet></merger>

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-5
+6
 0

package/android/build.gradle

@@ -1,6 +1,17 @@
 buildscript {
-  ext.getExtOrDefault = {name ->
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['ReactNavigation_' + name]
+  ext.ReactNavigation = [
+    kotlinVersion: "2.0.21",
+    minSdkVersion: 24,
+    compileSdkVersion: 36,
+    targetSdkVersion: 36
+  ]
+
+  ext.getExtOrDefault = { prop ->
+    if (rootProject.ext.has(prop)) {
+      return rootProject.ext.get(prop)
+    }
+
+    return ReactNavigation[prop]
   }
 
   repositories {
@@ -21,18 +32,14 @@ apply plugin: "kotlin-android"
 
 apply plugin: "com.facebook.react"
 
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["ReactNavigation_" + name]).toInteger()
-}
-
 android {
   namespace "org.reactnavigation"
 
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  compileSdkVersion getExtOrDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    minSdkVersion getExtOrDefault("minSdkVersion")
+    targetSdkVersion getExtOrDefault("targetSdkVersion")
   }
 
   buildTypes {

package/android/src/main/java/org/reactnavigation/MaterialSymbolModule.kt

@@ -3,6 +3,7 @@ package org.reactnavigation
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
+import androidx.core.graphics.createBitmap
 import androidx.core.net.toUri
 import com.facebook.fbreact.specs.NativeMaterialSymbolModuleSpec
 import com.facebook.react.bridge.ColorPropConverter
@@ -14,23 +15,19 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import java.io.File
 import java.io.FileOutputStream
-import java.util.concurrent.Callable
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Executors
-import java.util.concurrent.Future
 import kotlin.math.roundToInt
 
 class MaterialSymbolModule(reactContext: ReactApplicationContext) :
   NativeMaterialSymbolModuleSpec(reactContext) {
 
   companion object {
-    private val executor = Executors.newCachedThreadPool()
-    private val futures = ConcurrentHashMap<String, Future<String>>()
+    const val NAME = NativeMaterialSymbolModuleSpec.NAME
+
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
   }
 
   override fun getImageSource(
-    name: String, variant: String, size: Double, color: ReadableMap, hash: String
+    name: String, variant: String, size: Double, weight: Double, color: ReadableMap, hash: String
   ): String {
     val colorValue = color.getDynamic("value").let {
       when (it.type) {
@@ -47,7 +44,7 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
     val scaledSize = (size * density).roundToInt().coerceAtLeast(1)
 
     val cacheDir = File(
-      reactApplicationContext.cacheDir, "react_navigation/material_symbols/$variant/$hash"
+      reactApplicationContext.cacheDir, "react_navigation/material_symbols/$variant-$weight/$hash"
     )
 
     val cacheKey = "${name.hashCode()}_${scaledSize}_$resolvedColor"
@@ -57,55 +54,37 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       return cacheFile.toUri().toString()
     }
 
-    val future = futures.computeIfAbsent(cacheKey) {
-      executor.submit(
-        Callable {
-          try {
-            scope.launch {
-              cacheDir.parentFile?.listFiles { it.isDirectory && it.name != hash }
-                ?.forEach { it.deleteRecursively() }
-            }
-
-            cacheDir.mkdirs()
-
-            val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-              typeface = MaterialSymbolTypeface.get(reactApplicationContext, variant)
-              textSize = scaledSize.toFloat()
-              textAlign = Paint.Align.CENTER
-
-              this.color = resolvedColor
-            }
-
-            val fontMetrics = paint.fontMetrics
-            val bitmap = Bitmap.createBitmap(scaledSize, scaledSize, Bitmap.Config.ARGB_8888)
-
-            try {
-              val canvas = Canvas(bitmap)
-              val y =
-                (scaledSize - (fontMetrics.descent - fontMetrics.ascent)) / 2f - fontMetrics.ascent
-
-              canvas.drawText(name, scaledSize / 2f, y, paint)
-
-              FileOutputStream(cacheFile).use {
-                bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
-              }
-            } finally {
-              bitmap.recycle()
-            }
-
-            return@Callable cacheFile.toUri().toString()
-          } catch (e: Exception) {
-            futures.remove(cacheKey)
-
-            throw e
-          }
-        })
+    scope.launch {
+      cacheDir.parentFile?.listFiles { it.isDirectory && it.name != hash }
+        ?.forEach { it.deleteRecursively() }
+    }
+
+    cacheDir.mkdirs()
+
+    val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+      typeface = MaterialSymbolTypeface.get(reactApplicationContext, variant, weight.toInt())
+      textSize = scaledSize.toFloat()
+      textAlign = Paint.Align.CENTER
+
+      this.color = resolvedColor
     }
 
+    val fontMetrics = paint.fontMetrics
+    val bitmap = createBitmap(scaledSize, scaledSize)
+
     try {
-      return future.get()
-    } catch (e: Exception) {
-      throw (e.cause as? Exception) ?: e
+      val canvas = Canvas(bitmap)
+      val y = (scaledSize - (fontMetrics.descent - fontMetrics.ascent)) / 2f - fontMetrics.ascent
+
+      canvas.drawText(name, scaledSize / 2f, y, paint)
+
+      FileOutputStream(cacheFile).use {
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
+      }
+    } finally {
+      bitmap.recycle()
     }
+
+    return cacheFile.toUri().toString()
   }
 }