@craft-native/android 0.0.225 → 0.0.227

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/android",
-  "version": "0.0.225",
+  "version": "0.0.227",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/android#readme",
   "repository": {
     "type": "git",

package/templates/CraftNativeImageCache.kt.template

@@ -100,6 +100,7 @@ internal class CraftNativeImageCache(
             true
         }
         catch (error: Exception) { false }
+        catch (error: OutOfMemoryError) { false }
         finally { staging?.delete() }
     }
 

package/templates/CraftNativeServices.kt.template

@@ -120,6 +120,7 @@ internal class CraftNativeServices(
                         done(success(CraftNativeMedia.prune(context, (0 until keep.length()).map { keep.optString(it) })))
                     }
                     "usage" -> done(success(CraftNativeMedia.usage(context)))
+                    "clear" -> done(success(CraftNativeMedia.clear(context)))
                     else -> done(failure("UNKNOWN_ACTION", "Unsupported Media method"))
                 }
                 "Background" -> {

package/templates/CraftNativeShell.kt.template

@@ -643,6 +643,10 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private var accessorySpec: JSONObject? = null
     private val tabViews = mutableListOf<Pair<TextView, TextView>>()
     private val tabIconText = mutableMapOf<String, String>()
+    private val tabTitles = mutableMapOf<String, String>()
+    private val tabAccessibilityLabels = mutableMapOf<String, String>()
+    private val tabIconTints = mutableMapOf<String, Int>()
+    private val tabIconPulses = mutableSetOf<String>()
     private val tabImageURLs = mutableMapOf<String, String>()
     private val tabImages = mutableMapOf<String, android.graphics.drawable.Drawable>()
     private val navButtonSpecs = mutableMapOf<TextView, JSONObject>()
@@ -706,6 +710,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             cell.gravity = Gravity.CENTER
             cell.background = rippleBackground()
             cell.contentDescription = tab.title
+            cell.tag = "craft-tab-${tab.id}"
             val icon = TextView(context)
             icon.text = CraftNativeSymbols.glyph(tab.symbol)
             icon.textSize = 22f
@@ -716,6 +721,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             val label = TextView(context)
             label.text = tab.title
             label.textSize = 12f
+            label.fontFeatureSettings = "tnum"
             label.gravity = Gravity.CENTER
             label.isSingleLine = true
             cell.addView(icon, LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT))
@@ -844,12 +850,25 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         val id = item.optString("id")
         val index = tabs.indexOfFirst { it.id == id }
         if (index < 0) return
-        val cell = tabBar.getChildAt(index)
-        if (item.has("accessibilityLabel")) cell.contentDescription = item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() } ?: tabs[index].title
+        if (item.has("accessibilityLabel")) {
+            tabAccessibilityLabels.remove(id)
+            item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() }?.let { tabAccessibilityLabels[id] = it.take(160) }
+        }
         if (item.has("iconText")) {
             tabIconText.remove(id)
             item.optString("iconText").takeUnless { item.isNull("iconText") || it.isBlank() }?.let { tabIconText[id] = it.take(8) }
         }
+        if (item.has("title")) {
+            tabTitles.remove(id)
+            item.optString("title").takeUnless { item.isNull("title") || it.isBlank() }?.let { tabTitles[id] = it.take(40) }
+        }
+        if (item.has("iconTint")) {
+            tabIconTints.remove(id)
+            if (!item.isNull("iconTint")) runCatching { Color.parseColor(item.optString("iconTint")) }.getOrNull()?.let { tabIconTints[id] = it }
+        }
+        if (item.has("iconPulse")) {
+            if (item.optBoolean("iconPulse", false)) tabIconPulses.add(id) else tabIconPulses.remove(id)
+        }
         if (item.has("image")) {
             val address = item.optString("image").takeIf { !item.isNull("image") && it.startsWith("https://") }
             if (address != tabImageURLs[id]) {
@@ -896,16 +915,41 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         tabViews.forEachIndexed { index, (icon, label) ->
             tabBar.getChildAt(index).isSelected = index == selectedTab
             val color = if (index == selectedTab) accent else muted
-            val number = tabIconText[tabs[index].id]
-            icon.setTextColor(if (number != null) Color.parseColor("#FF2D55") else color)
+            val id = tabs[index].id
+            val number = tabIconText[id]
+            val iconColor = tabIconTints[id] ?: if (number != null) Color.parseColor("#FF2D55") else color
+            icon.setTextColor(iconColor)
+            label.text = tabTitles[id] ?: tabs[index].title
+            tabBar.getChildAt(index).contentDescription = tabAccessibilityLabels[id] ?: label.text
             label.setTextColor(color)
-            val vector = tabImages[tabs[index].id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, color) else null
+            val vector = tabImages[id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, iconColor) else null
+            val pulse = tabIconPulses.contains(id) && number == null && tabImages[id] == null && hasWindowFocus() && android.animation.ValueAnimator.areAnimatorsEnabled()
+            if (pulse && icon.animation == null) {
+                icon.startAnimation(android.view.animation.AlphaAnimation(1f, 0.55f).apply {
+                    duration = 700
+                    repeatCount = android.view.animation.Animation.INFINITE
+                    repeatMode = android.view.animation.Animation.REVERSE
+                })
+            } else if (!pulse) {
+                icon.clearAnimation()
+                icon.alpha = 1f
+            }
             icon.foreground = vector
             icon.text = if (vector != null) "" else number ?: CraftNativeSymbols.glyph(tabs[index].symbol)
         }
         navButtonSpecs.forEach { (view, spec) -> applyNavButtonTint(view, spec, dark) }
     }
 
+    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+        super.onWindowFocusChanged(hasWindowFocus)
+        if (hasWindowFocus) refreshColors() else tabViews.forEach { (icon, _) -> icon.clearAnimation() }
+    }
+
+    override fun onDetachedFromWindow() {
+        tabViews.forEach { (icon, _) -> icon.clearAnimation() }
+        super.onDetachedFromWindow()
+    }
+
     private fun navButton(button: JSONObject): View {
         val id = button.optString("id")
         val title = button.optString("title")
@@ -1021,7 +1065,8 @@ internal object CraftNativeSymbols {
  * A native Video given an address with a copy here plays the copy.
  */
 internal object CraftNativeMedia {
-    private val inFlight = HashMap<String, MutableList<(CraftNativeCapabilityResult) -> Unit>>()
+    private data class Flight(val id: String, val waiting: MutableList<(CraftNativeCapabilityResult) -> Unit>)
+    private val inFlight = HashMap<String, Flight>()
     private val executor = Executors.newFixedThreadPool(2)
     private val main = Handler(Looper.getMainLooper())
 
@@ -1054,12 +1099,12 @@ internal object CraftNativeMedia {
         if (!cellular && metered(context)) {
             return done(CraftNativeCapabilityResult(data = JSONObject().put("ok", false).put("url", address).put("reason", "cellular")))
         }
-        synchronized(inFlight) {
+        val flight = synchronized(inFlight) {
             inFlight[address]?.let { waiting ->
-                waiting.add(done)
+                waiting.waiting.add(done)
                 return
             }
-            inFlight[address] = mutableListOf(done)
+            Flight(java.util.UUID.randomUUID().toString(), mutableListOf(done)).also { inFlight[address] = it }
         }
         executor.execute {
             val result = runCatching {
@@ -1073,7 +1118,7 @@ internal object CraftNativeMedia {
                     val target = file(context, address)
                     target.parentFile?.mkdirs()
                     // Written aside and moved into place, so a half-written file is never played.
-                    val staging = File(target.parentFile, "${target.name}.part")
+                    val staging = File(target.parentFile, "${target.name}.${flight.id}.part")
                     try {
                         val size = connection.inputStream.use { input -> staging.outputStream().use { input.copyTo(it) } }
                         val expected = connection.contentLengthLong
@@ -1081,6 +1126,9 @@ internal object CraftNativeMedia {
                             return@runCatching CraftNativeCapabilityResult(code = "NETWORK_ERROR", message = "media.keep received an incomplete file")
                         }
                         synchronized(inFlight) {
+                            if (inFlight[address]?.id != flight.id) {
+                                return@runCatching CraftNativeCapabilityResult(code = "CANCELLED", message = "The video cache was cleared")
+                            }
                             if (!staging.renameTo(target)) {
                                 return@runCatching CraftNativeCapabilityResult(code = "IO_ERROR", message = "media.keep could not store the file")
                             }
@@ -1098,7 +1146,7 @@ internal object CraftNativeMedia {
                 }
                 CraftNativeCapabilityResult(code = if (full) "NO_SPACE" else if (error is java.net.SocketTimeoutException) "TIMEOUT" else "NETWORK_ERROR", message = error.message ?: "media.keep failed")
             }
-            val waiting = synchronized(inFlight) { inFlight.remove(address) ?: mutableListOf() }
+            val waiting = synchronized(inFlight) { if (inFlight[address]?.id == flight.id) inFlight.remove(address)?.waiting.orEmpty() else emptyList() }
             main.post { waiting.forEach { it(result) } }
         }
     }
@@ -1115,12 +1163,31 @@ internal object CraftNativeMedia {
         var removed = 0
         synchronized(inFlight) {
             // A concurrent keep owns its target and staging file until it finishes.
-            val active = inFlight.keys.map { file(context, it).name }.toSet()
+            val active = inFlight.flatMap { (address, flight) ->
+                val name = file(context, address).name
+                listOf(name, "$name.${flight.id}.part")
+            }.toSet()
+            root(context).listFiles()?.forEach { file ->
+                if (file.name !in active && file.name !in wanted && file.delete()) removed++
+            }
+        }
+        return removed
+    }
+
+    /** Invalidates old transfers before deleting files; a later keep starts afresh. */
+    fun clear(context: Context): Int {
+        var removed = 0
+        var failure: java.io.IOException? = null
+        val waiting = synchronized(inFlight) {
+            val callbacks = inFlight.values.flatMap { it.waiting }
+            inFlight.clear()
             root(context).listFiles()?.forEach { file ->
-                val target = file.name.removeSuffix(".part")
-                if (target !in active && file.name !in wanted && file.delete()) removed++
+                if (file.delete()) removed++ else failure = java.io.IOException("The video cache could not be cleared")
             }
+            callbacks
         }
+        main.post { waiting.forEach { it(CraftNativeCapabilityResult(code = "CANCELLED", message = "The video cache was cleared")) } }
+        failure?.let { throw it }
         return removed
     }
 

package/templates/MainActivityNative.kt.template

@@ -4091,6 +4091,7 @@ class MainActivity : AppCompatActivity() {
                 show(target)
             } else {
                 host.removeView(target.view)
+                target.view.translationX = 0f
                 current.view.translationX = 0f
                 chrome?.selectTab(currentTab)
                 tabSwipeTarget = null
@@ -4504,6 +4505,11 @@ class MainActivity : AppCompatActivity() {
      * screen shown before hears true (its `navigation.onAppear`).
      */
     private fun show(screen: Screen) {
+        // A retained tab may have been the offscreen preview of a cancelled
+        // swipe, or the outgoing view of a completed swipe. Its animator can
+        // finish after the peer animator, so clear that ownership on display.
+        screen.view.animate().withEndAction(null).setListener(null).cancel()
+        screen.view.translationX = 0f
         // A navigation breadcrumb: the trail a crash report carries.
         if (visibleScreen !== screen) CraftCrashReporter.screenAppeared(screen.route ?: "home")
         val bars = chrome