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

package/android/build.gradle

@@ -2,10 +2,9 @@ import groovy.json.JsonSlurper
 
 buildscript {
   ext.ReactNavigation = [
-    kotlinVersion: "2.0.21",
+    kotlinVersion: "2.1.20",
     minSdkVersion: 24,
-    compileSdkVersion: 36,
-    targetSdkVersion: 36
+    compileSdkVersion: 36
   ]
 
   ext.getExtOrDefault = { prop ->
@@ -30,7 +29,10 @@ buildscript {
 
 
 apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
+
+if (project.extensions.findByName("kotlin") == null) {
+  apply plugin: "kotlin-android"
+}
 
 apply plugin: "com.facebook.react"
 
@@ -41,7 +43,6 @@ android {
 
   defaultConfig {
     minSdkVersion getExtOrDefault("minSdkVersion")
-    targetSdkVersion getExtOrDefault("targetSdkVersion")
   }
 
   buildTypes {
@@ -55,8 +56,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 }
 

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,6 +26,7 @@ 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 {
@@ -42,13 +45,14 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       }
     }
 
-    val resolvedColor = ColorPropConverter.getColor(colorValue, reactApplicationContext)
-      ?: throw IllegalArgumentException("Could not resolve color")
+    val resolvedColor = ColorPropConverter.getColor(
+      colorValue, reactApplicationContext.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(
+    val typefaceSuffix = MaterialSymbolTypeface.getSuffix(
       reactApplicationContext, variant, weight?.toInt()
     )
 
@@ -57,20 +61,31 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       "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 != fontHash }
-        ?.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 resolvedTypeface = MaterialSymbolTypeface.get(
+      reactApplicationContext, variant, weight?.toInt()
+    ).typeface
+
     val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
       typeface = resolvedTypeface
       textSize = scaledSize.toFloat()
@@ -95,6 +110,6 @@ class MaterialSymbolModule(reactContext: ReactApplicationContext) :
       bitmap.recycle()
     }
 
-    return cacheFile.toUri().toString()
+    return cacheUri
   }
 }

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

@@ -2,25 +2,16 @@ 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 var defaultSuffix: String? = null
+  private val typefaces = ConcurrentHashMap<String, Typeface>()
+  private var availableFonts: Map<String, Set<Int>>? = null
 
   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"
-      }
-
-      "${resolvedVariant}_$weight"
-    } else {
-      getDefaultSuffix(context)
-    }
+    val suffix = getSuffix(context, variant, weight)
 
     val typeface = typefaces.getOrPut(suffix) {
       val path = "fonts/MaterialSymbols${suffix}.ttf"
@@ -35,26 +26,82 @@ object MaterialSymbolTypeface {
     return MaterialSymbolTypefaceResult(typeface, suffix)
   }
 
-  private fun getDefaultSuffix(context: Context): String {
-    defaultSuffix?.let { return it }
+  fun getSuffix(context: Context, variant: String?, weight: Int?): String {
+    val fonts = getAvailableFonts(context)
+
+    val resolvedVariant = if (variant != null) {
+      when (variant) {
+        "rounded" -> "Rounded"
+        "sharp" -> "Sharp"
+        else -> "Outlined"
+      }
+    } else {
+      resolveDefaultVariant(fonts)
+    }
+
+    val resolvedWeight = weight ?: resolveDefaultWeight(fonts, resolvedVariant)
+
+    return "${resolvedVariant}_$resolvedWeight"
+  }
+
+  private fun getAvailableFonts(context: Context): Map<String, Set<Int>> {
+    availableFonts?.let { return it }
 
-    val fonts = context.assets.list("fonts")
+    val files = context.assets.list("fonts")
       ?.filter { it.startsWith("MaterialSymbols") && it.endsWith(".ttf") } ?: emptyList()
 
-    if (fonts.isEmpty()) {
+    if (files.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 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)
     }
 
-    val suffix = fonts[0].removePrefix("MaterialSymbols").removeSuffix(".ttf")
+    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"
+    }
 
-    defaultSuffix = suffix
+    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
+    }
 
-    return suffix
+    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

@@ -13,6 +13,7 @@ class MaterialSymbolView @JvmOverloads constructor(
   private var weight: Int? = null
 
   init {
+    setColor(null)
     updateTypeface()
   }
 
@@ -29,13 +30,13 @@ 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
     }
@@ -45,7 +46,7 @@ class MaterialSymbolView @JvmOverloads constructor(
     updateTypeface()
   }
 
-  fun setWeight(weight: Int) {
+  fun setWeight(weight: Int?) {
     if (this.weight == weight) {
       return
     }
@@ -66,8 +67,26 @@ class MaterialSymbolView @JvmOverloads constructor(
     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? {