voltra 1.4.0 → 2.0.0-rc.3

package/android/src/main/java/voltra/glance/RemoteViewsGenerator.kt

@@ -1,245 +0,0 @@
-package voltra.glance
-
-import android.content.Context
-import android.util.Log
-import android.util.SizeF
-import android.widget.RemoteViews
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.DpSize
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.glance.GlanceModifier
-import androidx.glance.action.actionParametersOf
-import androidx.glance.action.clickable
-import androidx.glance.appwidget.ExperimentalGlanceRemoteViewsApi
-import androidx.glance.appwidget.GlanceRemoteViews
-import androidx.glance.appwidget.action.actionRunCallback
-import androidx.glance.appwidget.cornerRadius
-import androidx.glance.background
-import androidx.glance.color.ColorProvider
-import androidx.glance.layout.Alignment
-import androidx.glance.layout.Box
-import androidx.glance.layout.fillMaxSize
-import androidx.glance.layout.padding
-import androidx.glance.layout.size
-import androidx.glance.text.FontWeight
-import androidx.glance.text.Text
-import androidx.glance.text.TextAlign
-import androidx.glance.text.TextStyle
-import voltra.models.VoltraNode
-import voltra.models.VoltraPayload
-import voltra.widget.VoltraRefreshActionCallback
-
-@OptIn(ExperimentalGlanceRemoteViewsApi::class)
-object RemoteViewsGenerator {
-    private const val TAG = "RemoteViewsGenerator"
-
-    /**
-     * Generate RemoteViews for collapsed notification content
-     */
-    suspend fun generateCollapsed(
-        context: Context,
-        payload: VoltraPayload,
-    ): RemoteViews? {
-        val node = payload.collapsed ?: return null
-        Log.d(TAG, "Generating collapsed view")
-        return generate(context, node, payload.e, payload.s, DpSize(360.dp, 64.dp))
-    }
-
-    /**
-     * Generate RemoteViews for expanded notification content
-     */
-    suspend fun generateExpanded(
-        context: Context,
-        payload: VoltraPayload,
-    ): RemoteViews? {
-        val node = payload.expanded ?: return null
-        Log.d(TAG, "Generating expanded view")
-        return generate(context, node, payload.e, payload.s, DpSize(360.dp, 256.dp))
-    }
-
-    private suspend fun generate(
-        context: Context,
-        node: VoltraNode,
-        sharedElements: List<VoltraNode>?,
-        sharedStyles: List<Map<String, Any?>>?,
-        size: DpSize,
-    ): RemoteViews {
-        // Create a new GlanceRemoteViews instance each time to avoid caching issues
-        val glanceRemoteViews = GlanceRemoteViews()
-        // Use empty widgetId for notification RemoteViews (not widget-specific)
-        val factory = GlanceFactory("notification", sharedElements, sharedStyles, size)
-
-        Log.d(TAG, "Composing Glance content with size: $size, sharedStyles count: ${sharedStyles?.size ?: 0}")
-
-        val result =
-            glanceRemoteViews.compose(context, size) {
-                factory.Render(node)
-            }
-
-        Log.d(TAG, "RemoteViews generated successfully")
-        return result.remoteViews
-    }
-
-    /**
-     * Generate RemoteViews for all widget size variants.
-     * Returns a mapping of SizeF to RemoteViews for Android 12+ responsive widgets.
-     * This bypasses Glance's session lock mechanism.
-     */
-    suspend fun generateWidgetRemoteViews(
-        context: Context,
-        payload: VoltraPayload,
-    ): Map<SizeF, RemoteViews> {
-        val variants = payload.variants ?: return emptyMap()
-        val sharedElements = payload.e
-        val sharedStyles = payload.s
-
-        Log.d(TAG, "Generating widget RemoteViews for ${variants.size} variants")
-
-        // Parse variant keys to get available sizes
-        val parsedVariants =
-            variants.keys.mapNotNull { key ->
-                val parts = key.split("x")
-                if (parts.size == 2) {
-                    val width = parts[0].toFloatOrNull()
-                    val height = parts[1].toFloatOrNull()
-                    if (width != null && height != null) {
-                        Triple(key, width, height)
-                    } else {
-                        null
-                    }
-                } else {
-                    null
-                }
-            }
-
-        if (parsedVariants.isEmpty()) {
-            Log.w(TAG, "No valid size variants found in payload")
-            return emptyMap()
-        }
-
-        val result = mutableMapOf<SizeF, RemoteViews>()
-
-        // Generate RemoteViews for each variant
-        for ((variantKey, width, height) in parsedVariants) {
-            val node = variants[variantKey] ?: continue
-            val size = DpSize(width.dp, height.dp)
-
-            try {
-                val remoteViews = generate(context, node, sharedElements, sharedStyles, size)
-                result[SizeF(width, height)] = remoteViews
-                Log.d(TAG, "Generated RemoteViews for variant $variantKey (${width}x$height)")
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to generate RemoteViews for variant $variantKey: ${e.message}", e)
-            }
-        }
-
-        Log.d(TAG, "Successfully generated ${result.size} widget RemoteViews")
-        return result
-    }
-
-    /**
-     * Generate RemoteViews for all widget size variants with a refresh button overlay.
-     * Uses GlanceRemoteViews.compose() to render both the widget content and a clickable
-     * refresh button, then returns RemoteViews that can be pushed directly via AppWidgetManager.
-     */
-    suspend fun generateWidgetRemoteViewsWithRefresh(
-        context: Context,
-        payload: VoltraPayload,
-        widgetId: String,
-    ): Map<SizeF, RemoteViews> {
-        val variants = payload.variants ?: return emptyMap()
-        val sharedElements = payload.e
-        val sharedStyles = payload.s
-
-        Log.d(TAG, "Generating widget RemoteViews with refresh button for ${variants.size} variants")
-
-        val parsedVariants =
-            variants.keys.mapNotNull { key ->
-                val parts = key.split("x")
-                if (parts.size == 2) {
-                    val width = parts[0].toFloatOrNull()
-                    val height = parts[1].toFloatOrNull()
-                    if (width != null && height != null) {
-                        Triple(key, width, height)
-                    } else {
-                        null
-                    }
-                } else {
-                    null
-                }
-            }
-
-        if (parsedVariants.isEmpty()) {
-            Log.w(TAG, "No valid size variants found in payload")
-            return emptyMap()
-        }
-
-        val result = mutableMapOf<SizeF, RemoteViews>()
-
-        for ((variantKey, width, height) in parsedVariants) {
-            val node = variants[variantKey] ?: continue
-            val size = DpSize(width.dp, height.dp)
-
-            try {
-                val glanceRemoteViews = GlanceRemoteViews()
-                val factory = GlanceFactory(widgetId, sharedElements, sharedStyles, size)
-
-                val composed =
-                    glanceRemoteViews.compose(context, size) {
-                        Box(modifier = GlanceModifier.fillMaxSize()) {
-                            factory.Render(node)
-                            // Refresh button overlay (same as VoltraGlanceWidget.RefreshButton)
-                            Box(
-                                modifier = GlanceModifier.fillMaxSize().padding(12.dp),
-                                contentAlignment = Alignment.TopEnd,
-                            ) {
-                                Box(
-                                    modifier =
-                                        GlanceModifier
-                                            .size(28.dp)
-                                            .cornerRadius(14.dp)
-                                            .background(
-                                                ColorProvider(
-                                                    day = Color(0x32787880),
-                                                    night = Color(0x32787880),
-                                                ),
-                                            ).clickable(
-                                                actionRunCallback<VoltraRefreshActionCallback>(
-                                                    actionParametersOf(
-                                                        VoltraRefreshActionCallback.KEY_WIDGET_ID to widgetId,
-                                                    ),
-                                                ),
-                                            ),
-                                    contentAlignment = Alignment.Center,
-                                ) {
-                                    Text(
-                                        text = "↻",
-                                        style =
-                                            TextStyle(
-                                                fontSize = 18.sp,
-                                                fontWeight = FontWeight.Bold,
-                                                textAlign = TextAlign.Center,
-                                                color =
-                                                    ColorProvider(
-                                                        day = Color(0x993C3C43),
-                                                        night = Color(0x99EBEBF5),
-                                                    ),
-                                            ),
-                                    )
-                                }
-                            }
-                        }
-                    }
-
-                result[SizeF(width, height)] = composed.remoteViews
-                Log.d(TAG, "Generated RemoteViews with refresh for variant $variantKey (${width}x$height)")
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to generate RemoteViews with refresh for variant $variantKey: ${e.message}", e)
-            }
-        }
-
-        Log.d(TAG, "Successfully generated ${result.size} widget RemoteViews with refresh")
-        return result
-    }
-}

package/android/src/main/java/voltra/glance/StyleUtils.kt

@@ -1,127 +0,0 @@
-package voltra.glance
-
-import androidx.compose.runtime.Composable
-import androidx.glance.GlanceModifier
-import androidx.glance.LocalContext
-import androidx.glance.action.clickable
-import voltra.glance.renderers.getOnClickAction
-import voltra.payload.ComponentTypeID
-import voltra.styling.CompositeStyle
-import voltra.styling.StyleConverter
-import voltra.styling.applyStyle
-
-data class ResolvedStyle(
-    val modifier: GlanceModifier,
-    val compositeStyle: CompositeStyle?,
-)
-
-@Composable
-fun resolveAndApplyStyle(
-    props: Map<String, Any?>?,
-    sharedStyles: List<Map<String, Any?>>?,
-): ResolvedStyle {
-    val resolvedStyle = resolveStyle(props, sharedStyles)
-    val compositeStyle =
-        if (resolvedStyle != null) {
-            StyleConverter.convert(resolvedStyle)
-        } else {
-            null
-        }
-    val modifier =
-        if (compositeStyle != null) {
-            GlanceModifier.applyStyle(compositeStyle)
-        } else {
-            GlanceModifier
-        }
-    return ResolvedStyle(modifier, compositeStyle)
-}
-
-/**
- * Resolve style reference to actual style map.
- * Props may contain {"s": <index>} where index references sharedStyles array,
- * or {"s": {...}} for inline styles.
- */
-private fun resolveStyle(
-    props: Map<String, Any?>?,
-    sharedStyles: List<Map<String, Any?>>?,
-): Map<String, Any?>? {
-    if (props == null) return null
-
-    val styleRef = props["style"]
-    return when (styleRef) {
-        is Number -> {
-            // It's an index into sharedStyles
-            val index = styleRef.toInt()
-            sharedStyles?.getOrNull(index)
-        }
-
-        is Map<*, *> -> {
-            // It's already an inline style
-            @Suppress("UNCHECKED_CAST")
-            styleRef as? Map<String, Any?>
-        }
-
-        else -> {
-            null
-        }
-    }
-}
-
-/**
- * Apply clickable modifier if pressable prop is true.
- * Skips components that already have built-in click handlers.
- *
- * @param modifier The GlanceModifier to enhance
- * @param props The component props
- * @param elementId The element's ID (from element.i)
- * @param widgetId The widget ID for the action callback
- * @param componentType The component type (from ComponentTypeID)
- * @param elementHashCode The hash code of the element for generating fallback IDs
- * @return The modifier with clickable applied if needed, otherwise unchanged
- */
-@Composable
-fun applyClickableIfNeeded(
-    modifier: GlanceModifier,
-    props: Map<String, Any?>?,
-    elementId: String?,
-    widgetId: String,
-    componentType: Int,
-    elementHashCode: Int,
-): GlanceModifier {
-    // Check if deepLinkUrl prop is set and not empty
-    val deepLinkUrl = (props?.get("dlu") as? String) ?: (props?.get("deepLinkUrl") as? String)
-    val isClickable = deepLinkUrl != null && deepLinkUrl.isNotEmpty()
-
-    if (!isClickable) {
-        return modifier
-    }
-
-    // Skip components that already have built-in click handlers
-    val exclusionList =
-        setOf(
-            ComponentTypeID.FILLED_BUTTON,
-            ComponentTypeID.OUTLINE_BUTTON,
-            ComponentTypeID.CIRCLE_ICON_BUTTON,
-            ComponentTypeID.SQUARE_ICON_BUTTON,
-            ComponentTypeID.SWITCH,
-            ComponentTypeID.RADIO_BUTTON,
-            ComponentTypeID.CHECK_BOX,
-        )
-
-    if (componentType in exclusionList) {
-        return modifier
-    }
-
-    // Extract or generate component ID (prefer user-provided ID, fallback to generated)
-    val componentId = elementId ?: "pressable_$elementHashCode"
-
-    // Apply clickable modifier
-    return modifier.clickable(
-        getOnClickAction(
-            LocalContext.current,
-            props,
-            widgetId,
-            componentId,
-        ),
-    )
-}

package/android/src/main/java/voltra/glance/VoltraRenderContext.kt

@@ -1,17 +0,0 @@
-package voltra.glance
-
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.ui.unit.DpSize
-import voltra.models.VoltraNode
-
-data class VoltraRenderContext(
-    val widgetId: String,
-    val sharedElements: List<VoltraNode>? = null,
-    val sharedStyles: List<Map<String, Any?>>? = null,
-    val widgetSize: DpSize? = null,
-)
-
-val LocalVoltraRenderContext =
-    compositionLocalOf<VoltraRenderContext> {
-        error("VoltraRenderContext not provided")
-    }

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

@@ -1,217 +0,0 @@
-package voltra.glance.renderers
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.glance.ButtonDefaults
-import androidx.glance.GlanceModifier
-import androidx.glance.GlanceTheme
-import androidx.glance.ImageProvider
-import androidx.glance.LocalContext
-import androidx.glance.appwidget.components.CircleIconButton
-import androidx.glance.appwidget.components.FilledButton
-import androidx.glance.appwidget.components.OutlineButton
-import androidx.glance.appwidget.components.SquareIconButton
-import androidx.glance.layout.Box
-import androidx.glance.unit.ColorProvider
-import voltra.glance.LocalVoltraRenderContext
-import voltra.glance.applyClickableIfNeeded
-import voltra.glance.resolveAndApplyStyle
-import voltra.models.VoltraElement
-import voltra.styling.JSColorParser
-import voltra.styling.toColorProvider
-
-@Composable
-fun RenderButton(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = LocalVoltraRenderContext.current
-    val (baseModifier, _) = resolveAndApplyStyle(element.p, context.sharedStyles)
-    val finalModifier =
-        applyClickableIfNeeded(
-            modifier ?: baseModifier,
-            element.p,
-            element.i,
-            context.widgetId,
-            element.t,
-            element.hashCode(),
-        )
-
-    Box(modifier = finalModifier) {
-        RenderNode(element.c)
-    }
-}
-
-@Composable
-fun RenderFilledButton(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = LocalVoltraRenderContext.current
-    val computedModifier = modifier ?: resolveAndApplyStyle(element.p, context.sharedStyles).modifier
-
-    val componentId = element.i ?: "button_${element.hashCode()}"
-    val text = (element.p?.get("text") as? String) ?: ""
-    val enabled = (element.p?.get("enabled") as? Boolean) ?: true
-    val maxLines = (element.p?.get("maxLines") as? Number)?.toInt() ?: Int.MAX_VALUE
-    val icon = extractImageProvider(element.p?.get("icon"))
-
-    val backgroundColor = element.p?.get("backgroundColor") as? String
-    val contentColor = element.p?.get("contentColor") as? String
-
-    val colors =
-        if (backgroundColor != null && contentColor != null) {
-            val bg = JSColorParser.parse(backgroundColor)
-            val fg = JSColorParser.parse(contentColor)
-            if (bg != null && fg != null) {
-                ButtonDefaults.buttonColors(
-                    backgroundColor = bg.toColorProvider(),
-                    contentColor = fg.toColorProvider(),
-                )
-            } else {
-                ButtonDefaults.buttonColors()
-            }
-        } else {
-            ButtonDefaults.buttonColors()
-        }
-
-    FilledButton(
-        text = text,
-        onClick = getOnClickAction(LocalContext.current, element.p, context.widgetId, componentId),
-        modifier = computedModifier,
-        enabled = enabled,
-        icon = icon.takeIf { element.p?.containsKey("icon") == true }, // Only pass icon if present
-        colors = colors,
-        maxLines = maxLines,
-    )
-}
-
-@Composable
-fun RenderOutlineButton(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = LocalVoltraRenderContext.current
-    val computedModifier = modifier ?: resolveAndApplyStyle(element.p, context.sharedStyles).modifier
-
-    val componentId = element.i ?: "button_${element.hashCode()}"
-    val text = (element.p?.get("text") as? String) ?: extractTextFromNode(element.c)
-    val enabled = (element.p?.get("enabled") as? Boolean) ?: true
-    val maxLines = (element.p?.get("maxLines") as? Number)?.toInt() ?: Int.MAX_VALUE
-    val icon = extractImageProvider(element.p?.get("icon"))
-
-    val contentColorProp = element.p?.get("contentColor") as? String
-    val contentColor =
-        if (contentColorProp != null) {
-            JSColorParser.parse(contentColorProp)?.toColorProvider() ?: ColorProvider(Color.Black)
-        } else {
-            ColorProvider(Color.Black)
-        }
-
-    OutlineButton(
-        text = text,
-        contentColor = contentColor,
-        onClick = getOnClickAction(LocalContext.current, element.p, context.widgetId, componentId),
-        modifier = computedModifier,
-        enabled = enabled,
-        icon = icon.takeIf { element.p?.containsKey("icon") == true },
-        maxLines = maxLines,
-    )
-}
-
-@Composable
-fun RenderCircleIconButton(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = LocalVoltraRenderContext.current
-    val computedModifier = modifier ?: resolveAndApplyStyle(element.p, context.sharedStyles).modifier
-
-    val componentId = element.i ?: "button_${element.hashCode()}"
-    val contentDescription = (element.p?.get("contentDescription") as? String) ?: ""
-    val imageProvider = extractImageProvider(element.p?.get("icon")) ?: ImageProvider(android.R.drawable.ic_menu_add)
-    val enabled = (element.p?.get("enabled") as? Boolean) ?: true
-
-    val backgroundColorProp = element.p?.get("backgroundColor") as? String
-    val contentColorProp = element.p?.get("contentColor") as? String
-
-    val backgroundColor =
-        if (backgroundColorProp != null) {
-            JSColorParser.parse(backgroundColorProp)?.toColorProvider()
-        } else {
-            GlanceTheme.colors.background
-        }
-
-    val contentColor =
-        if (contentColorProp != null) {
-            JSColorParser.parse(contentColorProp)?.toColorProvider()
-        } else {
-            GlanceTheme.colors.onSurface
-        }
-
-    CircleIconButton(
-        imageProvider = imageProvider,
-        contentDescription = contentDescription,
-        onClick = getOnClickAction(LocalContext.current, element.p, context.widgetId, componentId),
-        modifier = computedModifier,
-        enabled = enabled,
-        backgroundColor = backgroundColor,
-        contentColor = contentColor ?: GlanceTheme.colors.onSurface,
-    )
-}
-
-@Composable
-fun RenderSquareIconButton(
-    element: VoltraElement,
-    modifier: GlanceModifier? = null,
-) {
-    val context = LocalVoltraRenderContext.current
-    val computedModifier = modifier ?: resolveAndApplyStyle(element.p, context.sharedStyles).modifier
-
-    val componentId = element.i ?: "button_${element.hashCode()}"
-    val contentDescription = (element.p?.get("contentDescription") as? String) ?: ""
-    val imageProvider = extractImageProvider(element.p?.get("icon")) ?: ImageProvider(android.R.drawable.ic_menu_add)
-    val enabled = (element.p?.get("enabled") as? Boolean) ?: true
-
-    val backgroundColorProp = element.p?.get("backgroundColor") as? String
-    val contentColorProp = element.p?.get("contentColor") as? String
-
-    val backgroundColor =
-        if (backgroundColorProp != null) {
-            JSColorParser.parse(backgroundColorProp)?.toColorProvider()
-        } else {
-            GlanceTheme.colors.primary
-        }
-
-    val contentColor =
-        if (contentColorProp != null) {
-            JSColorParser.parse(contentColorProp)?.toColorProvider()
-        } else {
-            GlanceTheme.colors.onPrimary
-        }
-
-    SquareIconButton(
-        imageProvider = imageProvider,
-        contentDescription = contentDescription,
-        onClick = getOnClickAction(LocalContext.current, element.p, context.widgetId, componentId),
-        modifier = computedModifier,
-        enabled = enabled,
-        backgroundColor = backgroundColor ?: GlanceTheme.colors.primary,
-        contentColor = contentColor ?: GlanceTheme.colors.onPrimary,
-    )
-}
-
-private fun extractTextFromNode(node: voltra.models.VoltraNode?): String =
-    when (node) {
-        is voltra.models.VoltraNode.Text -> {
-            node.text
-        }
-
-        is voltra.models.VoltraNode.Array -> {
-            node.elements.filterIsInstance<voltra.models.VoltraNode.Text>().joinToString("") { it.text }
-        }
-
-        else -> {
-            ""
-        }
-    }