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

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

@@ -19,6 +19,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public abstract class NativeMaterialSymbolModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
   public static final String NAME = "ReactNavigationMaterialSymbolModule";
@@ -34,5 +35,5 @@ public abstract class NativeMaterialSymbolModuleSpec extends ReactContextBaseJav
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   @DoNotStrip
-  public abstract String getImageSource(String name, String variant, double size, double weight, ReadableMap color, String hash);
+  public abstract String getImageSource(String name, @Nullable String variant, @Nullable Double weight, double size, ReadableMap color);
 }

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

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

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;DDLcom/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;Ljava/lang/Double;DLcom/facebook/react/bridge/ReadableMap;)Ljava/lang/String;", args, count, cachedMethodId);
 }
 
 NativeMaterialSymbolModuleSpecJSI::NativeMaterialSymbolModuleSpecJSI(const JavaTurboModule::InitParams &params)
   : JavaTurboModule(params) {
-  methodMap_["getImageSource"] = MethodMetadata {6, __hostFunction_NativeMaterialSymbolModuleSpecJSI_getImageSource};
+  methodMap_["getImageSource"] = MethodMetadata {5, __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,7 +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})),
+    weight(convertRawProp(context, rawProps, "weight", sourceProps.weight, {ReactNavigationMaterialSymbolViewWeight::Weight0})),
     size(convertRawProp(context, rawProps, "size", sourceProps.size, {0.0})),
     color(convertRawProp(context, rawProps, "color", sourceProps.color, {})) {}
     

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

@@ -15,12 +15,15 @@
 
 namespace facebook::react {
 
-enum class ReactNavigationMaterialSymbolViewWeight { Weight100 = 100, Weight200 = 200, Weight300 = 300, Weight400 = 400, Weight500 = 500, Weight600 = 600, Weight700 = 700 };
+enum class ReactNavigationMaterialSymbolViewWeight { Weight0 = 0, 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 0:
+      result = ReactNavigationMaterialSymbolViewWeight::Weight0;
+      return;
     case 100:
       result = ReactNavigationMaterialSymbolViewWeight::Weight100;
       return;
@@ -48,6 +51,7 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
 
 static inline std::string toString(const ReactNavigationMaterialSymbolViewWeight &value) {
   switch (value) {
+    case ReactNavigationMaterialSymbolViewWeight::Weight0: return "0";
     case ReactNavigationMaterialSymbolViewWeight::Weight100: return "100";
     case ReactNavigationMaterialSymbolViewWeight::Weight200: return "200";
     case ReactNavigationMaterialSymbolViewWeight::Weight300: return "300";
@@ -61,6 +65,7 @@ static inline std::string toString(const ReactNavigationMaterialSymbolViewWeight
 #ifdef RN_SERIALIZABLE_STATE
 static inline folly::dynamic toDynamic(const ReactNavigationMaterialSymbolViewWeight &value) {
   switch (value) {
+    case ReactNavigationMaterialSymbolViewWeight::Weight0: return 0;
     case ReactNavigationMaterialSymbolViewWeight::Weight100: return 100;
     case ReactNavigationMaterialSymbolViewWeight::Weight200: return 200;
     case ReactNavigationMaterialSymbolViewWeight::Weight300: return 300;
@@ -81,7 +86,7 @@ class ReactNavigationMaterialSymbolViewProps final : public ViewProps {
 
   std::string name{};
   std::string variant{};
-  ReactNavigationMaterialSymbolViewWeight weight{ReactNavigationMaterialSymbolViewWeight::Weight400};
+  ReactNavigationMaterialSymbolViewWeight weight{ReactNavigationMaterialSymbolViewWeight::Weight0};
   Float size{0.0};
   SharedColor color{};
 

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

@@ -15,17 +15,16 @@ static jsi::Value __hostFunction_NativeMaterialSymbolModuleCxxSpecJSI_getImageSo
   return static_cast<NativeMaterialSymbolModuleCxxSpecJSI *>(&turboModule)->getImageSource(
     rt,
     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 <= 1 || args[1].isNull() || args[1].isUndefined() ? std::nullopt : std::make_optional(args[1].asString(rt)),
+    count <= 2 || args[2].isNull() || args[2].isUndefined() ? std::nullopt : std::make_optional(args[2].asNumber()),
     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)
+    count <= 4 ? throw jsi::JSError(rt, "Expected argument in position 4 to be passed") : args[4].asObject(rt)
   );
 }
 
 NativeMaterialSymbolModuleCxxSpecJSI::NativeMaterialSymbolModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule("ReactNavigationMaterialSymbolModule", jsInvoker) {
-  methodMap_["getImageSource"] = MethodMetadata {6, __hostFunction_NativeMaterialSymbolModuleCxxSpecJSI_getImageSource};
+  methodMap_["getImageSource"] = MethodMetadata {5, __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, double weight, jsi::Object color, jsi::String hash) = 0;
+  virtual jsi::String getImageSource(jsi::Runtime &rt, jsi::String name, std::optional<jsi::String> variant, std::optional<double> weight, double size, jsi::Object color) = 0;
 
 };
 
@@ -51,13 +51,13 @@ private:
 
     }
 
-    jsi::String getImageSource(jsi::Runtime &rt, jsi::String name, jsi::String variant, double size, double weight, jsi::Object color, jsi::String hash) override {
+    jsi::String getImageSource(jsi::Runtime &rt, jsi::String name, std::optional<jsi::String> variant, std::optional<double> weight, double size, jsi::Object color) override {
       static_assert(
-          bridging::getParameterCount(&T::getImageSource) == 7,
-          "Expected getImageSource(...) to have 7 parameters");
+          bridging::getParameterCount(&T::getImageSource) == 6,
+          "Expected getImageSource(...) to have 6 parameters");
 
       return bridging::callFromJs<jsi::String>(
-          rt, &T::getImageSource, jsInvoker_, instance_, std::move(name), std::move(variant), std::move(size), std::move(weight), std::move(color), std::move(hash));
+          rt, &T::getImageSource, jsInvoker_, instance_, std::move(name), std::move(variant), std::move(weight), std::move(size), std::move(color));
     }
 
   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":"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":[]}}}}}
+{"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":true,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"weight","optional":true,"typeAnnotation":{"type":"Int32EnumTypeAnnotation","default":0,"options":[0,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":"NullableTypeAnnotation","typeAnnotation":{"type":"StringTypeAnnotation"}}},{"name":"weight","optional":false,"typeAnnotation":{"type":"NullableTypeAnnotation","typeAnnotation":{"type":"UnionTypeAnnotation","memberType":"NumberTypeAnnotation"}}},{"name":"size","optional":false,"typeAnnotation":{"type":"NumberTypeAnnotation"}},{"name":"color","optional":false,"typeAnnotation":{"type":"GenericObjectTypeAnnotation"}}]}}]},"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/assets/debug/mergeDebugAssets/fonts/MaterialSymbols.hash

@@ -0,0 +1 @@
+ec67dff9

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/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>
+<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/MaterialSymbols.hash" path="/Users/satya/Developer/Projects/react-navigation/packages/native/android/build/intermediates/react-navigation/fonts/MaterialSymbols.hash"/><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/intermediates/react-navigation/fonts/MaterialSymbols.hash

@@ -0,0 +1 @@
+ec67dff9

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

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

package/android/build.gradle

@@ -1,3 +1,5 @@
+import groovy.json.JsonSlurper
+
 buildscript {
   ext.ReactNavigation = [
     kotlinVersion: "2.0.21",
@@ -58,15 +60,87 @@ android {
   }
 }
 
-task copyAssets(type: Copy) {
-  from "../assets/fonts"
-  include "*.ttf"
-  into "${buildDir}/intermediates/react-navigation/fonts"
+tasks.register('copyMaterialFonts', Copy) {
+  def packageJsonFile = file(rootDir.path + "/../package.json")
+  def fontsConfig = null
+
+  if (packageJsonFile.exists()) {
+    def packageJson = new JsonSlurper().parse(packageJsonFile)
+
+    fontsConfig = packageJson["react-navigation"]?.get("material-symbols")?.get("fonts")
+  }
+
+  fontsConfig = fontsConfig != null ? fontsConfig : [[variant: "outlined", weights: [400]]]
+
+  def assetsFontsDir = file("../assets/fonts")
+  def availableFonts = assetsFontsDir.listFiles()
+    ?.findAll { it.name.startsWith("MaterialSymbols") && it.name.endsWith(".ttf") }
+    ?.collect { it.name.replaceFirst(/^MaterialSymbols/, '').replaceFirst(/\.ttf$/, '') } ?: []
+
+  def validVariants = availableFonts.collect { it.split('_')[0].toLowerCase() }.unique().sort()
+  def validWeights = availableFonts.collect { it.split('_')[1] as int }.unique().sort()
+
+  def errors = [] as Set
+
+  fontsConfig.each { font ->
+    if (font.variant && !validVariants.contains(font.variant.toLowerCase())) {
+      errors << "Invalid font variant: ${font.variant}"
+    }
+
+    font.weights.each { weight ->
+      if (!validWeights.contains(weight)) {
+        errors << "Invalid font weight: ${weight}"
+      }
+    }
+  }
+
+  if (errors) {
+    throw new GradleException(
+      errors.join("\n") + "\n\nAvailable variants: ${validVariants.join(", ")}.\nAvailable weights: ${validWeights.join(", ")}."
+    )
+  }
+
+  def fontFiles = fontsConfig.collectMany { font ->
+    def variant = font.variant?.capitalize() ?: ""
+
+    font.weights.collect { weight -> "MaterialSymbols${variant}_${weight}.ttf" }
+  }
+
+  if (fontFiles) {
+    from(assetsFontsDir) { include fontFiles }
+  }
+
+  into layout.buildDirectory.dir("intermediates/react-navigation/fonts")
+
+  doFirst {
+    if (destinationDir.exists()) {
+      def extraFiles = destinationDir.listFiles()?.findAll { file -> !fontFiles.contains(file.name) }
+
+      extraFiles?.each { file -> file.delete() }
+    }
+  }
+
+  doLast {
+    def digest = java.security.MessageDigest.getInstance("MD5")
+
+    fontFiles.sort().each { name ->
+      def fontFile = new File(assetsFontsDir, name)
+
+      if (fontFile.exists()) {
+        digest.update(fontFile.bytes)
+      }
+    }
+
+    def hash = digest.digest().encodeHex().toString().take(8)
+    def hashFile = new File(destinationDir, "MaterialSymbols.hash")
+
+    hashFile.text = hash
+  }
 }
 
-android.sourceSets.main.assets.srcDirs += file("${buildDir}/intermediates/react-navigation")
+android.sourceSets.main.assets.srcDirs += layout.buildDirectory.dir("intermediates/react-navigation")
 
-preBuild.dependsOn(copyAssets)
+preBuild.dependsOn(copyMaterialFonts)
 
 dependencies {
   implementation "com.facebook.react:react-android"

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

@@ -26,8 +26,13 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
   }
 
+  private val fontHash: String by lazy {
+    reactApplicationContext.assets.open("fonts/MaterialSymbols.hash").bufferedReader().readText()
+      .trim()
+  }
+
   override fun getImageSource(
-    name: String, variant: String, size: Double, weight: Double, color: ReadableMap, hash: String
+    name: String, variant: String?, weight: Double?, size: Double, color: ReadableMap
   ): String {
     val colorValue = color.getDynamic("value").let {
       when (it.type) {
@@ -43,8 +48,13 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
     val density = reactApplicationContext.resources.displayMetrics.density
     val scaledSize = (size * density).roundToInt().coerceAtLeast(1)
 
+    val (resolvedTypeface, typefaceSuffix) = MaterialSymbolTypeface.get(
+      reactApplicationContext, variant, weight?.toInt()
+    )
+
     val cacheDir = File(
-      reactApplicationContext.cacheDir, "react_navigation/material_symbols/$variant-$weight/$hash"
+      reactApplicationContext.cacheDir,
+      "react_navigation/material_symbols/$typefaceSuffix/$fontHash"
     )
 
     val cacheKey = "${name.hashCode()}_${scaledSize}_$resolvedColor"
@@ -55,14 +65,14 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
     }
 
     scope.launch {
-      cacheDir.parentFile?.listFiles { it.isDirectory && it.name != hash }
+      cacheDir.parentFile?.listFiles { it.isDirectory && it.name != fontHash }
         ?.forEach { it.deleteRecursively() }
     }
 
     cacheDir.mkdirs()
 
     val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-      typeface = MaterialSymbolTypeface.get(reactApplicationContext, variant, weight.toInt())
+      typeface = resolvedTypeface
       textSize = scaledSize.toFloat()
       textAlign = Paint.Align.CENTER
 

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

@@ -3,21 +3,26 @@ package org.reactnavigation
 import android.content.Context
 import android.graphics.Typeface
 
+data class MaterialSymbolTypefaceResult(val typeface: Typeface, val suffix: String)
+
 object MaterialSymbolTypeface {
   private val typefaces = mutableMapOf<String, Typeface>()
+  private var defaultSuffix: String? = null
 
-  fun get(context: Context, variant: String?, weight: Int?): Typeface {
-    val resolvedVariant = when (variant) {
-      "rounded" -> "Rounded"
-      "sharp" -> "Sharp"
-      else -> "Outlined"
-    }
-
-    val resolvedWeight = weight ?: 400
+  fun get(context: Context, variant: String?, weight: Int?): MaterialSymbolTypefaceResult {
+    val suffix = if (variant != null && weight != null) {
+      val resolvedVariant = when (variant) {
+        "rounded" -> "Rounded"
+        "sharp" -> "Sharp"
+        else -> "Outlined"
+      }
 
-    val suffix = "${resolvedVariant}_$resolvedWeight"
+      "${resolvedVariant}_$weight"
+    } else {
+      getDefaultSuffix(context)
+    }
 
-    return typefaces.getOrPut(suffix) {
+    val typeface = typefaces.getOrPut(suffix) {
       val path = "fonts/MaterialSymbols${suffix}.ttf"
 
       try {
@@ -26,5 +31,30 @@ object MaterialSymbolTypeface {
         throw RuntimeException("$path not found.", e)
       }
     }
+
+    return MaterialSymbolTypefaceResult(typeface, suffix)
+  }
+
+  private fun getDefaultSuffix(context: Context): String {
+    defaultSuffix?.let { return it }
+
+    val fonts = context.assets.list("fonts")
+      ?.filter { it.startsWith("MaterialSymbols") && it.endsWith(".ttf") } ?: emptyList()
+
+    if (fonts.isEmpty()) {
+      throw RuntimeException("No MaterialSymbols font found in assets.")
+    }
+
+    if (fonts.size > 1) {
+      throw RuntimeException(
+        "Multiple MaterialSymbols fonts found in assets: ${fonts.joinToString()}. " + "Please specify a variant and weight explicitly."
+      )
+    }
+
+    val suffix = fonts[0].removePrefix("MaterialSymbols").removeSuffix(".ttf")
+
+    defaultSuffix = suffix
+
+    return suffix
   }
 }