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

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
   }
 }

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

@@ -12,6 +12,10 @@ class MaterialSymbolView @JvmOverloads constructor(
   private var variant: String? = null
   private var weight: Int? = null
 
+  init {
+    updateTypeface()
+  }
+
   override fun onDraw(canvas: Canvas) {
     val text = text?.toString() ?: return
 
@@ -27,6 +31,8 @@ class MaterialSymbolView @JvmOverloads constructor(
 
   fun setName(name: String) {
     text = name
+
+    invalidate()
   }
 
   fun setVariant(variant: String) {
@@ -35,6 +41,7 @@ class MaterialSymbolView @JvmOverloads constructor(
     }
 
     this.variant = variant
+
     updateTypeface()
   }
 
@@ -44,11 +51,18 @@ class MaterialSymbolView @JvmOverloads constructor(
     }
 
     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()
   }