voltra 1.4.1 → 2.0.0-rc.3

package/android/src/main/java/voltra/glance/renderers/ChartRenderers.kt

@@ -1,185 +0,0 @@
-package voltra.glance.renderers
-
-import android.graphics.drawable.Icon
-import android.util.Log
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.unit.dp
-import androidx.glance.GlanceModifier
-import androidx.glance.Image
-import androidx.glance.ImageProvider
-import androidx.glance.LocalContext
-import androidx.glance.layout.ContentScale
-import androidx.glance.layout.fillMaxHeight
-import androidx.glance.layout.fillMaxWidth
-import androidx.glance.layout.height
-import androidx.glance.layout.width
-import voltra.glance.LocalVoltraRenderContext
-import voltra.glance.applyClickableIfNeeded
-import voltra.glance.resolveAndApplyStyle
-import voltra.models.VoltraElement
-import voltra.styling.JSColorParser
-import voltra.styling.SizeValue
-import voltra.styling.resolveColor
-import java.util.Locale
-
-private const val TAG = "ChartRenderers"
-
-private const val DEFAULT_CHART_WIDTH_DP = 300
-private const val DEFAULT_CHART_HEIGHT_DP = 200
-
-@Composable
-fun RenderChart(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val renderContext = LocalVoltraRenderContext.current
-    val (baseModifier, _) = resolveAndApplyStyle(element.p, renderContext.sharedStyles)
-    val finalModifier =
-        applyClickableIfNeeded(
-            modifier ?: baseModifier,
-            element.p,
-            element.i,
-            renderContext.widgetId,
-            element.t,
-            element.hashCode(),
-        )
-
-    val marksJson = element.p?.get("marks") as? String
-    if (marksJson.isNullOrEmpty()) {
-        Log.w(TAG, "Chart element has no marks data")
-        return
-    }
-
-    val marks = resolveChartMarksColors(parseMarksJson(marksJson))
-    if (marks.isEmpty()) {
-        Log.w(TAG, "Chart element has no valid marks after parsing")
-        return
-    }
-
-    val foregroundStyleScale = parseForegroundStyleScale(element.p?.get("foregroundStyleScale") as? String)
-
-    val xAxisVisible = (element.p?.get("xAxisVisibility") as? String) != "hidden"
-    val yAxisVisible = (element.p?.get("yAxisVisibility") as? String) != "hidden"
-    val xAxisGridVisible = (element.p?.get("xAxisGridVisible") as? Boolean) ?: true
-    val yAxisGridVisible = (element.p?.get("yAxisGridVisible") as? Boolean) ?: true
-
-    val (_, compositeStyle) = resolveAndApplyStyle(element.p, renderContext.sharedStyles)
-    val styleWidth = compositeStyle?.layout?.width
-    val styleHeight = compositeStyle?.layout?.height
-    val hasWeight = compositeStyle?.layout?.weight != null && compositeStyle.layout.weight!! > 0
-
-    val widthIsFill = styleWidth is SizeValue.Fill
-    val heightIsFill = styleHeight is SizeValue.Fill
-    val hasSectors = marks.any { it.type == "sector" }
-
-    // Use actual widget size for Fill dimensions when available, otherwise fall back to defaults
-    val widgetSize = renderContext.widgetSize
-    val defaultWidth =
-        if (hasSectors && heightIsFill &&
-            widthIsFill
-        ) {
-            widgetSize?.height?.value?.toInt() ?: DEFAULT_CHART_HEIGHT_DP
-        } else {
-            widgetSize?.width?.value?.toInt() ?: DEFAULT_CHART_WIDTH_DP
-        }
-    val chartWidthDp =
-        when (styleWidth) {
-            is SizeValue.Fixed -> styleWidth.value.value.toInt()
-            else -> defaultWidth
-        }
-    val chartHeightDp =
-        when (styleHeight) {
-            is SizeValue.Fixed -> styleHeight.value.value.toInt()
-            else -> widgetSize?.height?.value?.toInt() ?: DEFAULT_CHART_HEIGHT_DP
-        }
-
-    val density = LocalContext.current.resources.displayMetrics.density
-    val scale = density.coerceIn(1f, 3.5f)
-
-    // For sector/pie charts, use a square bitmap so the arcs don't get
-    // stretched into an ellipse by FillBounds. Use the smaller dimension
-    // to guarantee the circle fits.
-    val effectiveWidthDp = if (hasSectors) minOf(chartWidthDp, chartHeightDp) else chartWidthDp
-    val effectiveHeightDp = if (hasSectors) minOf(chartWidthDp, chartHeightDp) else chartHeightDp
-
-    val bitmapWidth = (effectiveWidthDp * scale).toInt().coerceAtLeast(1)
-    val bitmapHeight = (effectiveHeightDp * scale).toInt().coerceAtLeast(1)
-
-    val bitmap =
-        renderChartBitmap(
-            marks = marks,
-            width = bitmapWidth,
-            height = bitmapHeight,
-            foregroundStyleScale = foregroundStyleScale,
-            xAxisVisible = xAxisVisible,
-            yAxisVisible = yAxisVisible,
-            xAxisGridVisible = xAxisGridVisible,
-            yAxisGridVisible = yAxisGridVisible,
-            dpScale = scale,
-        )
-
-    var sizeModifier = finalModifier
-    sizeModifier =
-        sizeModifier.then(
-            when {
-                widthIsFill -> GlanceModifier.fillMaxWidth()
-                else -> GlanceModifier.width(chartWidthDp.dp)
-            },
-        )
-    if (!hasWeight) {
-        sizeModifier =
-            sizeModifier.then(
-                when {
-                    heightIsFill -> GlanceModifier.fillMaxHeight()
-                    else -> GlanceModifier.height(chartHeightDp.dp)
-                },
-            )
-    }
-
-    val icon = Icon.createWithBitmap(bitmap)
-
-    // Sector charts use a square bitmap so Fit preserves the circle.
-    // Other charts use FillBounds so the bitmap stretches to fill the
-    // allocated space (important when flex/weight controls the height).
-    Image(
-        provider = ImageProvider(icon),
-        contentDescription = "Chart",
-        contentScale = if (hasSectors) ContentScale.Fit else ContentScale.FillBounds,
-        modifier = sizeModifier,
-    )
-}
-
-@Composable
-private fun parseForegroundStyleScale(json: String?): Map<String, Int>? {
-    val pairs = parseForegroundStyleScaleEntries(json) ?: return null
-
-    val map = mutableMapOf<String, Int>()
-    for (pair in pairs) {
-        if (pair.size >= 2) {
-            val color = JSColorParser.parse(pair[1])?.resolveColor()
-            if (color != null) {
-                map[pair[0]] = color.toArgb()
-            }
-        }
-    }
-
-    return if (map.isEmpty()) null else map
-}
-
-@Composable
-private fun resolveChartMarksColors(marks: List<WireMark>): List<WireMark> =
-    marks.map { mark ->
-        val colorString = mark.props["c"] as? String ?: return@map mark
-        val color = JSColorParser.parse(colorString)?.resolveColor() ?: return@map mark
-        mark.copy(props = mark.props + ("c" to toRgbaHexString(color.toArgb())))
-    }
-
-private fun toRgbaHexString(argb: Int): String {
-    val red = (argb shr 16) and 0xFF
-    val green = (argb shr 8) and 0xFF
-    val blue = argb and 0xFF
-    val alpha = (argb ushr 24) and 0xFF
-
-    return String.format(Locale.US, "#%02x%02x%02x%02x", red, green, blue, alpha)
-}

package/android/src/main/java/voltra/glance/renderers/ComplexRenderers.kt

@@ -1,180 +0,0 @@
-package voltra.glance.renderers
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.unit.dp
-import androidx.glance.GlanceModifier
-import androidx.glance.GlanceTheme
-import androidx.glance.ImageProvider
-import androidx.glance.LocalContext
-import androidx.glance.appwidget.components.Scaffold
-import androidx.glance.appwidget.components.TitleBar
-import androidx.glance.text.FontFamily
-import voltra.glance.LocalVoltraRenderContext
-import voltra.glance.applyClickableIfNeeded
-import voltra.glance.resolveAndApplyStyle
-import voltra.models.VoltraElement
-import voltra.models.VoltraNode
-import voltra.payload.ComponentTypeID
-import voltra.styling.JSColorParser
-import voltra.styling.toColorProvider
-
-@Composable
-fun RenderTitleBar(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = LocalContext.current
-    val renderContext = LocalVoltraRenderContext.current
-    val (computedModifier, _) = resolveAndApplyStyle(element.p, renderContext.sharedStyles)
-    val modifierWithClickable =
-        applyClickableIfNeeded(
-            computedModifier,
-            element.p,
-            element.i,
-            renderContext.widgetId,
-            element.t,
-            element.hashCode(),
-        )
-    val finalModifier = modifier ?: modifierWithClickable
-
-    val title = (element.p?.get("title") as? String) ?: ""
-    val startIcon = extractImageProvider(element.p?.get("startIcon")) ?: ImageProvider(android.R.drawable.ic_menu_add)
-
-    val textColor =
-        element.p?.get("textColor")?.let {
-            JSColorParser.parse(it as String)?.toColorProvider()
-        } ?: GlanceTheme.colors.onSurface
-
-    val iconColor =
-        element.p?.get("iconColor")?.let {
-            JSColorParser.parse(it as String)?.toColorProvider()
-        } ?: GlanceTheme.colors.onSurface
-
-    val fontFamilyString = element.p?.get("fontFamily") as? String
-    val fontFamily =
-        if (fontFamilyString != null) {
-            when (fontFamilyString) {
-                "monospace" -> FontFamily.Monospace
-                "serif" -> FontFamily.Serif
-                "sans-serif" -> FontFamily.SansSerif
-                "cursive" -> FontFamily.Cursive
-                else -> null
-            }
-        } else {
-            null
-        }
-
-    TitleBar(
-        startIcon = startIcon,
-        title = title,
-        textColor = textColor,
-        iconColor = iconColor,
-        modifier = finalModifier,
-        fontFamily = fontFamily,
-    ) {
-        RenderNode(element.c)
-    }
-}
-
-@Composable
-fun RenderScaffold(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val renderContext = LocalVoltraRenderContext.current
-    val (computedModifier, _) = resolveAndApplyStyle(element.p, renderContext.sharedStyles)
-    val modifierWithClickable =
-        applyClickableIfNeeded(
-            computedModifier,
-            element.p,
-            element.i,
-            renderContext.widgetId,
-            element.t,
-            element.hashCode(),
-        )
-    val finalModifier = modifier ?: modifierWithClickable
-
-    val backgroundColor =
-        element.p?.get("backgroundColor")?.let {
-            JSColorParser.parse(it as String)?.toColorProvider()
-        } ?: GlanceTheme.colors.widgetBackground
-
-    val horizontalPadding = (element.p?.get("horizontalPadding") as? Number)?.toFloat()?.dp ?: 12.dp
-
-    // Find titleBar element and body content separately
-    val (titleBarNode, bodyNode) = extractScaffoldChildren(element.c, renderContext)
-
-    Scaffold(
-        modifier = finalModifier,
-        backgroundColor = backgroundColor,
-        horizontalPadding = horizontalPadding,
-        titleBar = {
-            if (titleBarNode != null) {
-                RenderNode(titleBarNode)
-            }
-        },
-    ) {
-        if (bodyNode != null) {
-            RenderNode(bodyNode)
-        }
-    }
-}
-
-private fun extractScaffoldChildren(
-    children: VoltraNode?,
-    context: voltra.glance.VoltraRenderContext,
-): Pair<VoltraNode?, VoltraNode?> =
-    when (children) {
-        is VoltraNode.Array -> {
-            val titleBar =
-                children.elements.find { child ->
-                    when (child) {
-                        is VoltraNode.Element -> {
-                            child.element.t == ComponentTypeID.TITLE_BAR
-                        }
-
-                        is VoltraNode.Ref -> {
-                            val resolved = context.sharedElements?.getOrNull(child.ref)
-                            resolved is VoltraNode.Element && resolved.element.t == ComponentTypeID.TITLE_BAR
-                        }
-
-                        else -> {
-                            false
-                        }
-                    }
-                }
-
-            val bodyElements =
-                children.elements.filter { child ->
-                    when (child) {
-                        is VoltraNode.Element -> {
-                            child.element.t != ComponentTypeID.TITLE_BAR
-                        }
-
-                        is VoltraNode.Ref -> {
-                            val resolved = context.sharedElements?.getOrNull(child.ref)
-                            !(resolved is VoltraNode.Element && resolved.element.t == ComponentTypeID.TITLE_BAR)
-                        }
-
-                        else -> {
-                            true
-                        }
-                    }
-                }
-            val body = if (bodyElements.isNotEmpty()) VoltraNode.Array(bodyElements) else null
-
-            titleBar to body
-        }
-
-        is VoltraNode.Element -> {
-            if (children.element.t == ComponentTypeID.TITLE_BAR) {
-                children to null
-            } else {
-                null to children
-            }
-        }
-
-        else -> {
-            null to children
-        }
-    }

package/android/src/main/java/voltra/glance/renderers/InputRenderers.kt

@@ -1,181 +0,0 @@
-package voltra.glance.renderers
-
-import androidx.compose.runtime.Composable
-import androidx.glance.GlanceModifier
-import androidx.glance.LocalContext
-import androidx.glance.appwidget.CheckBox
-import androidx.glance.appwidget.CheckboxDefaults
-import androidx.glance.appwidget.RadioButton
-import androidx.glance.appwidget.RadioButtonDefaults
-import androidx.glance.appwidget.Switch
-import androidx.glance.appwidget.SwitchDefaults
-import androidx.glance.unit.ColorProvider
-import voltra.glance.LocalVoltraRenderContext
-import voltra.glance.resolveAndApplyStyle
-import voltra.models.VoltraElement
-import voltra.styling.JSColorParser
-import voltra.styling.StyleConverter
-import voltra.styling.toColorProvider
-import voltra.styling.toGlanceTextStyle
-
-@Composable
-fun RenderSwitch(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = androidx.glance.LocalContext.current
-    val renderContext = LocalVoltraRenderContext.current
-    val computedModifier = modifier ?: resolveAndApplyStyle(element.p, renderContext.sharedStyles).modifier
-
-    val componentId = element.i ?: "switch_${element.hashCode()}"
-    val checked = (element.p?.get("checked") as? Boolean) ?: false
-
-    val text = (element.p?.get("text") as? String) ?: ""
-    val maxLines = (element.p?.get("maxLines") as? Number)?.toInt() ?: Int.MAX_VALUE
-
-    val styleMap = element.p?.get("style") as? Map<String, Any?>
-    val textStyle =
-        if (styleMap != null) {
-            StyleConverter.convert(styleMap).text.toGlanceTextStyle()
-        } else {
-            null
-        }
-
-    val thumbChecked = element.p?.get("thumbCheckedColor") as? String
-    val thumbUnchecked = element.p?.get("thumbUncheckedColor") as? String
-    val trackChecked = element.p?.get("trackCheckedColor") as? String
-    val trackUnchecked = element.p?.get("trackUncheckedColor") as? String
-
-    val colors =
-        if (thumbChecked != null && thumbUnchecked != null && trackChecked != null && trackUnchecked != null) {
-            val tc = JSColorParser.parse(thumbChecked)
-            val tuc = JSColorParser.parse(thumbUnchecked)
-            val trc = JSColorParser.parse(trackChecked)
-            val truc = JSColorParser.parse(trackUnchecked)
-
-            if (tc != null && tuc != null && trc != null && truc != null) {
-                SwitchDefaults.colors(
-                    checkedThumbColor = tc.toColorProvider(),
-                    uncheckedThumbColor = tuc.toColorProvider(),
-                    checkedTrackColor = trc.toColorProvider(),
-                    uncheckedTrackColor = truc.toColorProvider(),
-                )
-            } else {
-                SwitchDefaults.colors()
-            }
-        } else {
-            SwitchDefaults.colors()
-        }
-
-    Switch(
-        checked = checked,
-        onCheckedChange = getOnClickAction(LocalContext.current, element.p, renderContext.widgetId, componentId),
-        modifier = computedModifier,
-        text = text,
-        style = textStyle,
-        maxLines = maxLines,
-        colors = colors,
-    )
-}
-
-@Composable
-fun RenderRadioButton(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = androidx.glance.LocalContext.current
-    val renderContext = LocalVoltraRenderContext.current
-    val computedModifier = modifier ?: resolveAndApplyStyle(element.p, renderContext.sharedStyles).modifier
-
-    val componentId = element.i ?: "radio_${element.hashCode()}"
-    val checked = (element.p?.get("checked") as? Boolean) ?: false
-
-    val text = (element.p?.get("text") as? String) ?: ""
-    val maxLines = (element.p?.get("maxLines") as? Number)?.toInt() ?: Int.MAX_VALUE
-    val enabled = (element.p?.get("enabled") as? Boolean) ?: true
-
-    val styleMap = element.p?.get("style") as? Map<String, Any?>
-    val textStyle =
-        if (styleMap != null) {
-            StyleConverter.convert(styleMap).text.toGlanceTextStyle()
-        } else {
-            null
-        }
-
-    val checkedColor = element.p?.get("checkedColor") as? String
-    val uncheckedColor = element.p?.get("uncheckedColor") as? String
-
-    val colors =
-        if (checkedColor != null && uncheckedColor != null) {
-            val c = JSColorParser.parse(checkedColor)
-            val uc = JSColorParser.parse(uncheckedColor)
-            if (c != null && uc != null) {
-                RadioButtonDefaults.colors(c.toColorProvider(), uc.toColorProvider())
-            } else {
-                RadioButtonDefaults.colors()
-            }
-        } else {
-            RadioButtonDefaults.colors()
-        }
-
-    RadioButton(
-        checked = checked,
-        onClick = getOnClickAction(LocalContext.current, element.p, renderContext.widgetId, componentId),
-        modifier = computedModifier,
-        enabled = enabled,
-        text = text,
-        style = textStyle,
-        maxLines = maxLines,
-        colors = colors,
-    )
-}
-
-@Composable
-fun RenderCheckBox(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = androidx.glance.LocalContext.current
-    val renderContext = LocalVoltraRenderContext.current
-    val computedModifier = modifier ?: resolveAndApplyStyle(element.p, renderContext.sharedStyles).modifier
-
-    val componentId = element.i ?: "checkbox_${element.hashCode()}"
-    val checked = (element.p?.get("checked") as? Boolean) ?: false
-
-    val text = (element.p?.get("text") as? String) ?: ""
-    val maxLines = (element.p?.get("maxLines") as? Number)?.toInt() ?: Int.MAX_VALUE
-
-    val styleMap = element.p?.get("style") as? Map<String, Any?>
-    val textStyle =
-        if (styleMap != null) {
-            StyleConverter.convert(styleMap).text.toGlanceTextStyle()
-        } else {
-            null
-        }
-
-    val checkedColor = element.p?.get("checkedColor") as? String
-    val uncheckedColor = element.p?.get("uncheckedColor") as? String
-
-    val colors =
-        if (checkedColor != null && uncheckedColor != null) {
-            val c = JSColorParser.parse(checkedColor)
-            val uc = JSColorParser.parse(uncheckedColor)
-            if (c != null && uc != null) {
-                CheckboxDefaults.colors(c.toColorProvider(), uc.toColorProvider())
-            } else {
-                CheckboxDefaults.colors()
-            }
-        } else {
-            CheckboxDefaults.colors()
-        }
-
-    CheckBox(
-        checked = checked,
-        onCheckedChange = getOnClickAction(LocalContext.current, element.p, renderContext.widgetId, componentId),
-        modifier = computedModifier,
-        text = text,
-        style = textStyle,
-        maxLines = maxLines,
-        colors = colors,
-    )
-}