voltra 1.4.1 → 2.0.0-rc.3

package/android/src/main/java/voltra/styling/StyleStructures.kt

@@ -1,206 +0,0 @@
-package voltra.styling
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.glance.Visibility
-import androidx.glance.text.FontWeight
-
-/**
- * Size value that can be a fixed dimension, percentage, or wrap content.
- */
-sealed class SizeValue {
-    data class Fixed(
-        val value: Dp,
-    ) : SizeValue()
-
-    object Fill : SizeValue() // "100%"
-
-    object Wrap : SizeValue() // "auto" or undefined
-}
-
-/**
- * Layout-related styles (dimensions, spacing, flex).
- * Mirrors iOS LayoutStyle.swift
- */
-data class LayoutStyle(
-    // Dimensions - can be fixed dp, "100%" (fill), or wrap
-    val width: SizeValue? = null,
-    val height: SizeValue? = null,
-    val minWidth: Dp? = null,
-    val maxWidth: Dp? = null,
-    val minHeight: Dp? = null,
-    val maxHeight: Dp? = null,
-    // Flexibility - weight is the proper way to handle flex in Glance
-    val weight: Float? = null,
-    // Aspect Ratio (not supported in Glance, but kept for API compatibility)
-    val aspectRatio: Float? = null,
-    // Spacing
-    val padding: EdgeInsets? = null,
-    // Positioning (not supported in Glance, but kept for API compatibility)
-    val position: Offset? = null,
-    val zIndex: Float? = null,
-    // Visibility
-    val visibility: Visibility? = null,
-) {
-    companion object {
-        val Default = LayoutStyle()
-    }
-}
-
-/**
- * Decoration styles (background, border, shadow, effects).
- * Mirrors iOS DecorationStyle.swift
- */
-data class DecorationStyle(
-    val backgroundColor: VoltraColorValue? = null,
-    val cornerRadius: Dp? = null,
-    val clipToOutline: Boolean = false,
-    val border: BorderStyle? = null,
-    val shadow: ShadowStyle? = null, // Not supported in Glance
-    val overflow: Overflow? = null, // Not supported in Glance
-    val glassEffect: GlassEffect? = null, // Not supported in Glance
-) {
-    companion object {
-        val Default = DecorationStyle()
-    }
-}
-
-/**
- * Border configuration.
- */
-data class BorderStyle(
-    val width: Dp,
-    val color: VoltraColorValue,
-)
-
-/**
- * Shadow configuration (not supported in Glance, but kept for API compatibility).
- */
-data class ShadowStyle(
-    val radius: Dp,
-    val color: VoltraColorValue,
-    val opacity: Float,
-    val offset: Offset,
-)
-
-/**
- * Rendering styles (opacity, transform).
- * Mirrors iOS RenderingStyle.swift
- */
-data class RenderingStyle(
-    val opacity: Float = 1.0f,
-    val transform: TransformStyle? = null, // Not supported in Glance
-) {
-    companion object {
-        val Default = RenderingStyle()
-    }
-}
-
-/**
- * Transform configuration (not supported in Glance, but kept for API compatibility).
- */
-data class TransformStyle(
-    val rotate: Float? = null, // in degrees
-    val scale: Float? = null,
-    val scaleX: Float? = null,
-    val scaleY: Float? = null,
-)
-
-/**
- * Text-related styles.
- * Mirrors iOS TextStyle.swift
- */
-data class TextStyle(
-    val color: VoltraColorValue? = null,
-    val fontSize: TextUnit = 17.sp,
-    val fontWeight: FontWeight? = null,
-    val fontFamily: String? = null,
-    val alignment: TextAlignment = TextAlignment.START,
-    val lineLimit: Int? = null,
-    val lineSpacing: Dp = 0.dp, // Not fully supported in Glance
-    val decoration: TextDecoration = TextDecoration.NONE,
-    val letterSpacing: Dp = 0.dp, // Not supported in Glance
-    val fontVariant: Set<FontVariant> = emptySet(), // Not supported in Glance
-) {
-    companion object {
-        val Default = TextStyle()
-    }
-}
-
-/**
- * Edge insets for padding.
- * Mirrors SwiftUI EdgeInsets.
- */
-data class EdgeInsets(
-    val top: Dp = 0.dp,
-    val leading: Dp = 0.dp,
-    val bottom: Dp = 0.dp,
-    val trailing: Dp = 0.dp,
-)
-
-/**
- * 2D offset for positioning.
- */
-data class Offset(
-    val x: Dp = 0.dp,
-    val y: Dp = 0.dp,
-)
-
-/**
- * Text alignment options.
- */
-enum class TextAlignment {
-    START,
-    CENTER,
-    END,
-}
-
-/**
- * Text decoration options.
- */
-enum class TextDecoration {
-    NONE,
-    UNDERLINE,
-    LINE_THROUGH,
-    UNDERLINE_LINE_THROUGH,
-}
-
-/**
- * Overflow behavior (not supported in Glance).
- */
-enum class Overflow {
-    VISIBLE,
-    HIDDEN,
-}
-
-/**
- * Glass effect options (not supported in Glance).
- */
-enum class GlassEffect {
-    CLEAR,
-    IDENTITY,
-    REGULAR,
-    NONE,
-}
-
-/**
- * Font variant options (not supported in Glance).
- */
-enum class FontVariant(
-    val value: String,
-) {
-    SMALL_CAPS("small-caps"),
-    TABULAR_NUMS("tabular-nums"),
-}
-
-/**
- * Composite style containing all style categories.
- * Mirrors iOS approach of returning a tuple.
- */
-data class CompositeStyle(
-    val layout: LayoutStyle = LayoutStyle.Default,
-    val decoration: DecorationStyle = DecorationStyle.Default,
-    val rendering: RenderingStyle = RenderingStyle.Default,
-    val text: TextStyle = TextStyle.Default,
-)

package/android/src/main/java/voltra/styling/VoltraColorValue.kt

@@ -1,101 +0,0 @@
-package voltra.styling
-
-import android.content.Context
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.glance.GlanceTheme
-import androidx.glance.LocalContext
-import androidx.glance.unit.ColorProvider
-
-enum class VoltraThemeColorRole(
-    val token: String,
-) {
-    PRIMARY("~p"),
-    ON_PRIMARY("~op"),
-    PRIMARY_CONTAINER("~pc"),
-    ON_PRIMARY_CONTAINER("~opc"),
-    SECONDARY("~s"),
-    ON_SECONDARY("~os"),
-    SECONDARY_CONTAINER("~sc"),
-    ON_SECONDARY_CONTAINER("~osc"),
-    TERTIARY("~t"),
-    ON_TERTIARY("~ot"),
-    TERTIARY_CONTAINER("~tc"),
-    ON_TERTIARY_CONTAINER("~otc"),
-    ERROR("~e"),
-    ERROR_CONTAINER("~ec"),
-    ON_ERROR("~oe"),
-    ON_ERROR_CONTAINER("~oec"),
-    BACKGROUND("~b"),
-    ON_BACKGROUND("~ob"),
-    SURFACE("~sf"),
-    ON_SURFACE("~osf"),
-    SURFACE_VARIANT("~sv"),
-    ON_SURFACE_VARIANT("~osv"),
-    OUTLINE("~ol"),
-    INVERSE_ON_SURFACE("~ios"),
-    INVERSE_SURFACE("~is"),
-    INVERSE_PRIMARY("~ip"),
-    WIDGET_BACKGROUND("~wb"),
-    ;
-
-    companion object {
-        fun fromToken(token: String): VoltraThemeColorRole? = entries.firstOrNull { it.token == token }
-    }
-}
-
-sealed interface VoltraColorValue {
-    data class Static(
-        val color: Color,
-    ) : VoltraColorValue
-
-    data class Dynamic(
-        val role: VoltraThemeColorRole,
-    ) : VoltraColorValue
-}
-
-@Composable
-fun VoltraThemeColorRole.toColorProvider(): ColorProvider =
-    when (this) {
-        VoltraThemeColorRole.PRIMARY -> GlanceTheme.colors.primary
-        VoltraThemeColorRole.ON_PRIMARY -> GlanceTheme.colors.onPrimary
-        VoltraThemeColorRole.PRIMARY_CONTAINER -> GlanceTheme.colors.primaryContainer
-        VoltraThemeColorRole.ON_PRIMARY_CONTAINER -> GlanceTheme.colors.onPrimaryContainer
-        VoltraThemeColorRole.SECONDARY -> GlanceTheme.colors.secondary
-        VoltraThemeColorRole.ON_SECONDARY -> GlanceTheme.colors.onSecondary
-        VoltraThemeColorRole.SECONDARY_CONTAINER -> GlanceTheme.colors.secondaryContainer
-        VoltraThemeColorRole.ON_SECONDARY_CONTAINER -> GlanceTheme.colors.onSecondaryContainer
-        VoltraThemeColorRole.TERTIARY -> GlanceTheme.colors.tertiary
-        VoltraThemeColorRole.ON_TERTIARY -> GlanceTheme.colors.onTertiary
-        VoltraThemeColorRole.TERTIARY_CONTAINER -> GlanceTheme.colors.tertiaryContainer
-        VoltraThemeColorRole.ON_TERTIARY_CONTAINER -> GlanceTheme.colors.onTertiaryContainer
-        VoltraThemeColorRole.ERROR -> GlanceTheme.colors.error
-        VoltraThemeColorRole.ERROR_CONTAINER -> GlanceTheme.colors.errorContainer
-        VoltraThemeColorRole.ON_ERROR -> GlanceTheme.colors.onError
-        VoltraThemeColorRole.ON_ERROR_CONTAINER -> GlanceTheme.colors.onErrorContainer
-        VoltraThemeColorRole.BACKGROUND -> GlanceTheme.colors.background
-        VoltraThemeColorRole.ON_BACKGROUND -> GlanceTheme.colors.onBackground
-        VoltraThemeColorRole.SURFACE -> GlanceTheme.colors.surface
-        VoltraThemeColorRole.ON_SURFACE -> GlanceTheme.colors.onSurface
-        VoltraThemeColorRole.SURFACE_VARIANT -> GlanceTheme.colors.surfaceVariant
-        VoltraThemeColorRole.ON_SURFACE_VARIANT -> GlanceTheme.colors.onSurfaceVariant
-        VoltraThemeColorRole.OUTLINE -> GlanceTheme.colors.outline
-        VoltraThemeColorRole.INVERSE_ON_SURFACE -> GlanceTheme.colors.inverseOnSurface
-        VoltraThemeColorRole.INVERSE_SURFACE -> GlanceTheme.colors.inverseSurface
-        VoltraThemeColorRole.INVERSE_PRIMARY -> GlanceTheme.colors.inversePrimary
-        VoltraThemeColorRole.WIDGET_BACKGROUND -> GlanceTheme.colors.widgetBackground
-    }
-
-@Composable
-fun VoltraColorValue.toColorProvider(): ColorProvider =
-    when (this) {
-        is VoltraColorValue.Dynamic -> role.toColorProvider()
-        is VoltraColorValue.Static -> ColorProvider(color)
-    }
-
-@Composable
-fun VoltraColorValue.resolveColor(context: Context = LocalContext.current): Color =
-    when (this) {
-        is VoltraColorValue.Dynamic -> role.toColorProvider().getColor(context)
-        is VoltraColorValue.Static -> color
-    }

package/android/src/main/java/voltra/widget/VoltraCryptoManager.kt

@@ -1,99 +0,0 @@
-package voltra.widget
-
-import android.content.Context
-import android.util.Base64
-import android.util.Log
-import com.google.crypto.tink.Aead
-import com.google.crypto.tink.KeyTemplates
-import com.google.crypto.tink.KeysetHandle
-import com.google.crypto.tink.aead.AeadConfig
-import com.google.crypto.tink.integration.android.AndroidKeysetManager
-
-/**
- * Encryption helper using Google Tink's AEAD primitive.
- *
- * Uses AES-256-GCM backed by the Android Keystore for key management.
- * The keyset is stored encrypted in SharedPreferences and the master key
- * never leaves the hardware-backed Keystore.
- *
- * This replaces the deprecated EncryptedSharedPreferences approach with
- * the modern DataStore + Tink architecture.
- */
-object VoltraCryptoManager {
-    private const val TAG = "VoltraCryptoManager"
-    private const val KEYSET_NAME = "voltra_widget_keyset"
-    private const val PREF_FILE_NAME = "voltra_widget_keyset_prefs"
-    private const val MASTER_KEY_URI = "android-keystore://voltra_widget_master_key"
-
-    @Volatile
-    private var aead: Aead? = null
-
-    /**
-     * Get or initialize the AEAD primitive.
-     * Thread-safe via double-checked locking.
-     */
-    private fun getAead(context: Context): Aead =
-        aead ?: synchronized(this) {
-            aead ?: initAead(context).also { aead = it }
-        }
-
-    private fun initAead(context: Context): Aead {
-        AeadConfig.register()
-
-        val keysetHandle: KeysetHandle =
-            AndroidKeysetManager
-                .Builder()
-                .withSharedPref(context, KEYSET_NAME, PREF_FILE_NAME)
-                .withKeyTemplate(KeyTemplates.get("AES256_GCM"))
-                .withMasterKeyUri(MASTER_KEY_URI)
-                .build()
-                .keysetHandle
-
-        return keysetHandle.getPrimitive(Aead::class.java)
-    }
-
-    /**
-     * Encrypt a plaintext string.
-     * Returns a Base64-encoded ciphertext, or null on failure.
-     *
-     * @param context Application context
-     * @param plaintext The string to encrypt
-     * @param associatedData Optional associated data for AEAD authentication
-     */
-    fun encrypt(
-        context: Context,
-        plaintext: String,
-        associatedData: ByteArray = ByteArray(0),
-    ): String? =
-        try {
-            val aead = getAead(context)
-            val ciphertext = aead.encrypt(plaintext.toByteArray(Charsets.UTF_8), associatedData)
-            Base64.encodeToString(ciphertext, Base64.NO_WRAP)
-        } catch (e: Exception) {
-            Log.e(TAG, "Encryption failed: ${e.message}", e)
-            null
-        }
-
-    /**
-     * Decrypt a Base64-encoded ciphertext string.
-     * Returns the plaintext string, or null on failure.
-     *
-     * @param context Application context
-     * @param encryptedBase64 The Base64-encoded ciphertext to decrypt
-     * @param associatedData Optional associated data for AEAD authentication (must match encryption)
-     */
-    fun decrypt(
-        context: Context,
-        encryptedBase64: String,
-        associatedData: ByteArray = ByteArray(0),
-    ): String? =
-        try {
-            val aead = getAead(context)
-            val ciphertext = Base64.decode(encryptedBase64, Base64.NO_WRAP)
-            val plaintext = aead.decrypt(ciphertext, associatedData)
-            String(plaintext, Charsets.UTF_8)
-        } catch (e: Exception) {
-            Log.e(TAG, "Decryption failed: ${e.message}", e)
-            null
-        }
-}

package/android/src/main/java/voltra/widget/VoltraGlanceWidget.kt

@@ -1,249 +0,0 @@
-package voltra.widget
-
-import android.content.Context
-import android.util.Log
-import androidx.compose.runtime.Composable
-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.GlanceId
-import androidx.glance.GlanceModifier
-import androidx.glance.LocalSize
-import androidx.glance.action.actionParametersOf
-import androidx.glance.action.clickable
-import androidx.glance.appwidget.GlanceAppWidget
-import androidx.glance.appwidget.SizeMode
-import androidx.glance.appwidget.action.actionRunCallback
-import androidx.glance.appwidget.cornerRadius
-import androidx.glance.appwidget.provideContent
-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.glance.GlanceFactory
-import voltra.models.VoltraPayload
-import voltra.parsing.VoltraPayloadParser
-
-class VoltraGlanceWidget(
-    private val widgetId: String = "default",
-) : GlanceAppWidget() {
-    companion object {
-        private const val TAG = "VoltraGlanceWidget"
-
-        // Define size breakpoints for responsive widget rendering
-        private val SMALL = DpSize(150.dp, 100.dp)
-        private val MEDIUM_SQUARE = DpSize(200.dp, 200.dp)
-        private val MEDIUM_WIDE = DpSize(250.dp, 150.dp)
-        private val MEDIUM_TALL = DpSize(150.dp, 250.dp)
-        private val LARGE = DpSize(300.dp, 200.dp)
-        private val EXTRA_LARGE = DpSize(350.dp, 300.dp)
-
-        /**
-         * Trigger a Glance update using the receiver's registered widget instance.
-         * Falls back to a no-op if the widget hasn't been registered yet.
-         */
-        suspend fun triggerUpdate(
-            context: Context,
-            widgetId: String,
-        ) {
-            VoltraWidgetReceiver.triggerGlanceUpdate(context, widgetId)
-        }
-    }
-
-    // Use responsive sizing to support multiple widget dimensions
-    override val sizeMode =
-        SizeMode.Responsive(
-            setOf(SMALL, MEDIUM_SQUARE, MEDIUM_WIDE, MEDIUM_TALL, LARGE, EXTRA_LARGE),
-        )
-
-    override suspend fun provideGlance(
-        context: Context,
-        id: GlanceId,
-    ) {
-        // Parse data outside of composition to avoid try/catch in composable
-        val widgetManager = VoltraWidgetManager(context)
-        val jsonString = widgetManager.readWidgetJson(widgetId)
-
-        val payload: VoltraPayload? =
-            if (jsonString != null) {
-                try {
-                    VoltraPayloadParser.parse(jsonString)
-                } catch (e: Exception) {
-                    Log.e(TAG, "Error parsing widget payload for widgetId=$widgetId: ${e.message}", e)
-                    null
-                }
-            } else {
-                Log.d(TAG, "No JSON data found for widgetId=$widgetId")
-                null
-            }
-
-        val refreshEnabled = VoltraWidgetUpdateScheduler.isRefreshEnabled(context, widgetId)
-
-        provideContent {
-            Content(payload, refreshEnabled)
-        }
-    }
-
-    @Composable
-    private fun Content(
-        payload: VoltraPayload?,
-        refreshEnabled: Boolean,
-    ) {
-        val currentSize = LocalSize.current
-
-        Log.d(TAG, "Content: widgetId=$widgetId, currentSize=${currentSize.width}x${currentSize.height}")
-
-        if (payload == null) {
-            Log.d(TAG, "Content: payload is null, showing placeholder")
-            PlaceholderView()
-            return
-        }
-
-        Log.d(
-            TAG,
-            "Content: variants keys=${payload.variants?.keys}, styles=${payload.s?.size ?: 0}, elements=${payload.e?.size ?: 0}",
-        )
-
-        // Select the best variant for current size
-        val variantKey = selectVariantForSize(currentSize, payload.variants?.keys)
-        val node =
-            if (variantKey != null && payload.variants != null) {
-                payload.variants[variantKey]
-            } else {
-                null
-            }
-
-        if (node != null) {
-            Log.d(TAG, "Rendering widget widgetId=$widgetId with size variant: $variantKey")
-            if (refreshEnabled) {
-                Box(modifier = GlanceModifier.fillMaxSize()) {
-                    GlanceFactory(widgetId, payload.e, payload.s, currentSize).Render(node)
-                    RefreshButton()
-                }
-            } else {
-                GlanceFactory(widgetId, payload.e, payload.s, currentSize).Render(node)
-            }
-        } else {
-            Log.d(TAG, "Content: no matching variant found, showing placeholder")
-            PlaceholderView()
-        }
-    }
-
-    @Composable
-    private fun PlaceholderView() {
-        Box(
-            modifier = GlanceModifier.fillMaxSize().padding(16.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Text("Widget not configured")
-        }
-    }
-
-    @Composable
-    private fun 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),
-                                ),
-                        ),
-                )
-            }
-        }
-    }
-
-    /**
-     * Select the best variant key based on current widget size.
-     * Matches against size keys in format "WIDTHxHEIGHT" (e.g., "150x100").
-     */
-    private fun selectVariantForSize(
-        currentSize: DpSize,
-        availableKeys: Set<String>?,
-    ): String? {
-        if (availableKeys == null || availableKeys.isEmpty()) {
-            return null
-        }
-
-        val currentWidthDp = currentSize.width.value
-        val currentHeightDp = currentSize.height.value
-
-        // Parse available size keys into dimensions
-        data class SizeVariant(
-            val key: String,
-            val width: Float,
-            val height: Float,
-        )
-
-        val variants =
-            availableKeys.mapNotNull { key: String ->
-                val parts = key.split("x")
-                if (parts.size == 2) {
-                    val width = parts[0].toFloatOrNull()
-                    val height = parts[1].toFloatOrNull()
-                    if (width != null && height != null) {
-                        SizeVariant(key, width, height)
-                    } else {
-                        null
-                    }
-                } else {
-                    null
-                }
-            }
-
-        if (variants.isEmpty()) {
-            return null
-        }
-
-        // Find the closest match using Euclidean distance
-        val bestMatch =
-            variants.minByOrNull { variant: SizeVariant ->
-                val widthDiff = variant.width - currentWidthDp
-                val heightDiff = variant.height - currentHeightDp
-                kotlin.math.sqrt(widthDiff * widthDiff + heightDiff * heightDiff)
-            }
-
-        Log.d(
-            TAG,
-            "Selected variant '${bestMatch?.key}' for size ${currentWidthDp}x$currentHeightDp (widgetId=$widgetId)",
-        )
-        return bestMatch?.key
-    }
-}