Develop - animate stroke width in island, improved balancing, battery icons, fix battery colors, fix freeze settigns button overflow, missing search, backdrop blur availability info

app/src/main/AndroidManifest.xml

@@ -392,6 +392,7 @@
             android:label="@string/freeze_shortcut_short_label"
             android:launchMode="singleTask"
             android:taskAffinity="com.sameerasw.essentials.freezing"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Essentials" />
 
         <activity-alias

app/src/main/java/com/sameerasw/essentials/island/plugins/timebattery/TimeBatteryPlugin.kt

@@ -255,6 +255,9 @@ class TimeBatteryPlugin : BaseIslandPlugin() {
         val timeText = time
         val dayText = day
         val batteryLevel = level
+        val isCharging = charging
+        val isSaving = powerSave
+        val isLimited = shielded
         val stateColor = stateColor()
         val displayColor = stateColor ?: idleColor()
         val iconStyle = settings.getIslandBatteryStyle() == SettingsRepository.ISLAND_BATTERY_STYLE_ICON
@@ -303,7 +306,7 @@ class TimeBatteryPlugin : BaseIslandPlugin() {
             compact = listOf(
                 CompactCell("battery") {
                     when {
-                        iconStyle -> BatteryGlyph(batteryLevel, displayColor ?: islandAccent(), showLevel = showLevel)
+                        iconStyle -> BatteryGlyph(batteryLevel, displayColor ?: islandAccent(), showLevel = showLevel, charging = isCharging, powerSave = isSaving, limited = isLimited)
                         else -> BatteryRing(batteryLevel, displayColor ?: islandAccent(), showLevel = showLevel)
                     }
                 },

app/src/main/java/com/sameerasw/essentials/island/state/CompactCellWidths.kt

@@ -11,11 +11,20 @@ object CompactCellWidths {
 
     fun record(cellKeys: List<String>, unitWidth: Int) {
         if (cellKeys.isEmpty() || unitWidth <= 0) return
-        val previous = widths[cellKeys[0]]
-        if (previous != null && kotlin.math.abs(previous - unitWidth) <= JITTER_PX) return
-        widths[cellKeys[0]] = unitWidth
-        cellKeys.drop(1).forEach { widths[it] = 0 }
-        onChange?.invoke()
+        val n = cellKeys.size
+        val share = unitWidth / n
+        val remainder = unitWidth - share * n
+        val sorted = cellKeys.sorted()
+        var changed = false
+        sorted.forEachIndexed { i, key ->
+            val value = share + if (i == 0) remainder else 0
+            val previous = widths[key]
+            if (previous == null || kotlin.math.abs(previous - value) > JITTER_PX / n) {
+                widths[key] = value
+                changed = true
+            }
+        }
+        if (changed) onChange?.invoke()
     }
 
     fun get(cellKey: String): Int? = widths[cellKey]

app/src/main/java/com/sameerasw/essentials/island/ui/CompactTemplate.kt

@@ -210,6 +210,7 @@ fun CompactTemplate(
                 .height(spec.cellSize),
         ) { k ->
             val unit = k?.let { known[it] }
+            val live = k != null && k == target
             if (unit != null) {
                 val tap = Modifier.pointerInput(unit.itemKey) {
                     detectTapGestures(
@@ -219,7 +220,7 @@ fun CompactTemplate(
                 }
                 val measured = tap.clipToBounds().layout { measurable, c ->
                     val p = measurable.measure(c.copy(maxWidth = Constraints.Infinity))
-                    com.sameerasw.essentials.island.state.CompactCellWidths.record(unit.cells.map { it.cell.key }, p.width)
+                    if (live) com.sameerasw.essentials.island.state.CompactCellWidths.record(unit.cells.map { it.cell.key }, p.width)
                     val w = p.width.coerceIn(c.minWidth, c.maxWidth)
                     layout(w, p.height) { p.place(0, 0) }
                 }

app/src/main/java/com/sameerasw/essentials/island/ui/IslandBackdropBlur.kt

@@ -5,6 +5,7 @@ import android.graphics.Canvas
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.view.View
+import android.view.WindowManager
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
@@ -15,7 +16,29 @@ import androidx.compose.ui.viewinterop.AndroidView
 import kotlin.math.roundToInt
 
 internal object IslandBackdropBlurSupport {
+    enum class Status { Available, UnsupportedOs, WindowBlurDisabled, ApiUnavailable }
+
     val available: Boolean get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+
+    private val apiPresent: Boolean by lazy {
+        try {
+            Class.forName("android.view.ViewRootImpl").getMethod("createBackgroundBlurDrawable")
+            true
+        } catch (_: Throwable) {
+            false
+        }
+    }
+
+    fun windowBlurEnabled(context: Context): Boolean =
+        Build.VERSION.SDK_INT < Build.VERSION_CODES.S ||
+            runCatching { context.getSystemService(WindowManager::class.java).isCrossWindowBlurEnabled }.getOrDefault(true)
+
+    fun status(context: Context, windowBlurEnabled: Boolean = windowBlurEnabled(context)): Status = when {
+        !available -> Status.UnsupportedOs
+        !apiPresent -> Status.ApiUnavailable
+        !windowBlurEnabled -> Status.WindowBlurDisabled
+        else -> Status.Available
+    }
 }
 
 private class BackdropBlurView(context: Context) : View(context) {

app/src/main/java/com/sameerasw/essentials/island/ui/IslandRoot.kt

@@ -264,14 +264,21 @@ private fun IslandRootContent(
     }
     val iconColor = if (justCollapsed) iconTarget else lerp(iconAnim.value, collapsedIconTarget, collapseMix)
 
-    val outlineAlphaTarget = if (spec.outlineHiddenWhenExpanded && stage == IslandStage.Expanded) 0f else 1f
+    val outlineHidden = spec.outlineHiddenWhenExpanded && stage == IslandStage.Expanded
+    val outlineAlphaTarget = if (outlineHidden) 0f else 1f
     val outlineAlphaAnim = remember { Animatable(outlineAlphaTarget) }
     LaunchedEffect(outlineAlphaTarget) {
-        if (justCollapsed) outlineAlphaAnim.snapTo(outlineAlphaTarget) else outlineAlphaAnim.animateTo(outlineAlphaTarget)
+        if (justCollapsed) {
+            outlineAlphaAnim.snapTo(outlineAlphaTarget)
+        } else {
+            outlineAlphaAnim.animateTo(outlineAlphaTarget, if (outlineHidden) IslandMotion.contentOut() else IslandMotion.contentIn())
+        }
     }
+    // While collapsing from expanded, the outline draws back in over the second half of the shrink.
+    val outlineReveal = ((collapseMix - 0.5f) / 0.5f).coerceIn(0f, 1f)
     val outlineAlpha = when {
         justCollapsed -> outlineAlphaTarget
-        stage == IslandStage.Expanded -> outlineAlphaAnim.value + (1f - outlineAlphaAnim.value) * collapseMix
+        stage == IslandStage.Expanded -> outlineAlphaAnim.value + (1f - outlineAlphaAnim.value) * outlineReveal
         else -> outlineAlphaAnim.value
     }
 
@@ -1255,7 +1262,8 @@ private fun IslandRootContent(
                 }
                 .then(
                     outlineFor(1f - bond)
-                        ?.let { Modifier.border(spec.outlineThickness, it, surfaceShape) }
+                        // The stroke draws in from hairline to full width as it fades in
+                        ?.let { Modifier.border(spec.outlineThickness * (0.35f + 0.65f * outlineAlpha), it, surfaceShape) }
                         ?: Modifier,
                 )
                 // Finger-driven shrink sits inside the clip/background so the pill itself follows the drag.