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

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

@@ -1,5 +1,6 @@
 package org.reactnavigation
 
+import android.net.Uri
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
@@ -15,6 +16,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import java.io.File
 import java.io.FileOutputStream
+import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.roundToInt
 
 class MaterialSymbolModule(reactContext: ReactApplicationContext) :
@@ -24,10 +26,16 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
     const val NAME = NativeMaterialSymbolModuleSpec.NAME
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val cleanedCacheDirs = ConcurrentHashMap.newKeySet<String>()
+  }
+
+  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) {
@@ -37,32 +45,45 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       }
     }
 
-    val resolvedColor = ColorPropConverter.getColor(colorValue, reactApplicationContext)
-      ?: throw IllegalArgumentException("Could not resolve color")
+    val resolvedColor = ColorPropConverter.getColor(
+      colorValue, currentActivity ?: reactApplicationContext
+    ) ?: throw IllegalArgumentException("Could not resolve color")
 
     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"
-    val cacheFile = File(cacheDir, "$cacheKey.png")
+    val cacheFile = File(
+      cacheDir, "${Uri.encode(name)}_${scaledSize}_$resolvedColor.png"
+    )
+
+    val cacheUri = cacheFile.toUri().toString()
 
     if (cacheFile.exists()) {
-      return cacheFile.toUri().toString()
+      return cacheUri
     }
 
-    scope.launch {
-      cacheDir.parentFile?.listFiles { it.isDirectory && it.name != hash }
-        ?.forEach { it.deleteRecursively() }
+    val cacheParent = cacheDir.parentFile
+
+    if (cacheParent != null && cleanedCacheDirs.add(cacheParent.absolutePath)) {
+      scope.launch {
+        cacheParent.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
 
@@ -85,6 +106,6 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       bitmap.recycle()
     }
 
-    return cacheFile.toUri().toString()
+    return cacheUri
   }
 }

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

@@ -2,22 +2,32 @@ package org.reactnavigation
 
 import android.content.Context
 import android.graphics.Typeface
+import java.util.concurrent.ConcurrentHashMap
+
+data class MaterialSymbolTypefaceResult(val typeface: Typeface, val suffix: String)
 
 object MaterialSymbolTypeface {
-  private val typefaces = mutableMapOf<String, Typeface>()
+  private val typefaces = ConcurrentHashMap<String, Typeface>()
+  private var availableFonts: Map<String, Set<Int>>? = null
+
+  fun get(context: Context, variant: String?, weight: Int?): MaterialSymbolTypefaceResult {
+    val fonts = getAvailableFonts(context)
 
-  fun get(context: Context, variant: String?, weight: Int?): Typeface {
-    val resolvedVariant = when (variant) {
-      "rounded" -> "Rounded"
-      "sharp" -> "Sharp"
-      else -> "Outlined"
+    val resolvedVariant = if (variant != null) {
+      when (variant) {
+        "rounded" -> "Rounded"
+        "sharp" -> "Sharp"
+        else -> "Outlined"
+      }
+    } else {
+      resolveDefaultVariant(fonts)
     }
 
-    val resolvedWeight = weight ?: 400
+    val resolvedWeight = weight ?: resolveDefaultWeight(fonts, resolvedVariant)
 
     val suffix = "${resolvedVariant}_$resolvedWeight"
 
-    return typefaces.getOrPut(suffix) {
+    val typeface = typefaces.getOrPut(suffix) {
       val path = "fonts/MaterialSymbols${suffix}.ttf"
 
       try {
@@ -26,5 +36,68 @@ object MaterialSymbolTypeface {
         throw RuntimeException("$path not found.", e)
       }
     }
+
+    return MaterialSymbolTypefaceResult(typeface, suffix)
+  }
+
+  private fun getAvailableFonts(context: Context): Map<String, Set<Int>> {
+    availableFonts?.let { return it }
+
+    val files = context.assets.list("fonts")
+      ?.filter { it.startsWith("MaterialSymbols") && it.endsWith(".ttf") } ?: emptyList()
+
+    if (files.isEmpty()) {
+      throw RuntimeException("No MaterialSymbols font found in assets.")
+    }
+
+    val fonts = mutableMapOf<String, MutableSet<Int>>()
+
+    for (file in files) {
+      val suffix = file.removePrefix("MaterialSymbols").removeSuffix(".ttf")
+      val variant = suffix.substringBefore("_")
+      val weight = suffix.substringAfter("_").toIntOrNull() ?: continue
+
+      fonts.getOrPut(variant) { mutableSetOf() }.add(weight)
+    }
+
+    availableFonts = fonts
+
+    return fonts
+  }
+
+  private fun resolveDefaultVariant(fonts: Map<String, Set<Int>>): String {
+    val variants = fonts.keys
+
+    if (variants.size == 1) {
+      return variants.first()
+    }
+
+    if (variants.contains("Outlined")) {
+      return "Outlined"
+    }
+
+    throw RuntimeException(
+      "Multiple MaterialSymbols variants found: ${variants.joinToString()}. " + "Please specify a variant explicitly."
+    )
+  }
+
+  private fun resolveDefaultWeight(fonts: Map<String, Set<Int>>, variant: String): Int {
+    val weights = fonts[variant]
+
+    if (weights.isNullOrEmpty()) {
+      throw RuntimeException("No MaterialSymbols font found for variant: $variant")
+    }
+
+    if (weights.size == 1) {
+      return weights.first()
+    }
+
+    if (weights.contains(400)) {
+      return 400
+    }
+
+    throw RuntimeException(
+      "Multiple MaterialSymbols weights found for variant $variant: ${weights.joinToString()}. " + "Please specify a weight explicitly."
+    )
   }
 }

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

@@ -12,6 +12,11 @@ class MaterialSymbolView @JvmOverloads constructor(
   private var variant: String? = null
   private var weight: Int? = null
 
+  init {
+    setColor(null)
+    updateTypeface()
+  }
+
   override fun onDraw(canvas: Canvas) {
     val text = text?.toString() ?: return
 
@@ -25,35 +30,63 @@ class MaterialSymbolView @JvmOverloads constructor(
     canvas.drawText(text, x, y, paint)
   }
 
-  fun setName(name: String) {
+  fun setName(name: String?) {
     text = name
+
+    invalidate()
   }
 
-  fun setVariant(variant: String) {
+  fun setVariant(variant: String?) {
     if (this.variant == variant) {
       return
     }
 
     this.variant = variant
+
     updateTypeface()
   }
 
-  fun setWeight(weight: Int) {
+  fun setWeight(weight: Int?) {
     if (this.weight == weight) {
       return
     }
 
     this.weight = weight
+
     updateTypeface()
   }
 
   private fun updateTypeface() {
-    setTypeface(MaterialSymbolTypeface.get(context, variant, weight))
+    setTypeface(
+      MaterialSymbolTypeface.get(
+        context,
+        variant?.ifEmpty { null },
+        weight.takeIf { it != 0 }).typeface
+    )
+
     invalidate()
   }
 
-  fun setColor(color: Int) {
-    setTextColor(color)
+  fun setColor(color: Int?) {
+    if (color == null) {
+      val typedValue = android.util.TypedValue()
+
+      context.theme.resolveAttribute(
+        android.R.attr.colorForeground, typedValue, true
+      )
+
+      val resolvedColor = if (typedValue.resourceId != 0) {
+        context.getColor(typedValue.resourceId)
+      } else {
+        typedValue.data
+      }
+
+      setTextColor(resolvedColor)
+    } else {
+      setTextColor(color)
+    }
+
+    invalidate()
   }
 
   fun setSize(size: Float) {

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

@@ -4,9 +4,11 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.ReactNavigationMaterialSymbolViewManagerInterface
 
 @ReactModule(name = MaterialSymbolViewManager.NAME)
-class MaterialSymbolViewManager : SimpleViewManager<MaterialSymbolView>() {
+class MaterialSymbolViewManager : SimpleViewManager<MaterialSymbolView>(),
+  ReactNavigationMaterialSymbolViewManagerInterface<MaterialSymbolView> {
 
   override fun getName(): String {
     return NAME
@@ -17,25 +19,30 @@ class MaterialSymbolViewManager : SimpleViewManager<MaterialSymbolView>() {
   }
 
   @ReactProp(name = "name")
-  fun setName(view: MaterialSymbolView, name: String) {
+  override fun setName(view: MaterialSymbolView, name: String?) {
     view.setName(name)
   }
 
   @ReactProp(name = "variant")
-  fun setVariant(view: MaterialSymbolView, variant: String) {
+  override fun setVariant(view: MaterialSymbolView, variant: String?) {
     view.setVariant(variant)
   }
 
-  @ReactProp(name = "color", customType = "Color", defaultInt = android.graphics.Color.BLACK)
-  fun setColor(view: MaterialSymbolView, color: Int) {
-    view.setColor(color)
+  @ReactProp(name = "weight")
+  override fun setWeight(view: MaterialSymbolView, weight: Int?) {
+    view.setWeight(weight)
   }
 
   @ReactProp(name = "size")
-  fun setSize(view: MaterialSymbolView, size: Float) {
+  override fun setSize(view: MaterialSymbolView, size: Float) {
     view.setSize(size)
   }
 
+  @ReactProp(name = "color", customType = "Color")
+  override fun setColor(view: MaterialSymbolView, color: Int?) {
+    view.setColor(color)
+  }
+
   companion object {
     const val NAME = "ReactNavigationMaterialSymbolView"
   }

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

@@ -9,7 +9,9 @@ import com.facebook.react.uimanager.ViewManager
 
 class ReactNavigationPackage : BaseReactPackage() {
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return listOf(MaterialSymbolViewManager())
+    return listOf(
+      MaterialSymbolViewManager()
+    )
   }
 
   override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {