From a0cb77732d10873e4eaef156b972bc6d3941794b Mon Sep 17 00:00:00 2001 From: Divyansh Saraswat Date: Fri, 26 Dec 2025 12:18:41 +0530 Subject: [PATCH 1/5] fix(lit): make copy-spec script cross-platform compatible --- renderers/lit/package-lock.json | 3 ++- renderers/lit/package.json | 7 ++++--- renderers/lit/scripts/copy-spec.js | 29 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 renderers/lit/scripts/copy-spec.js diff --git a/renderers/lit/package-lock.json b/renderers/lit/package-lock.json index 26b270e0..c7c9c4f9 100644 --- a/renderers/lit/package-lock.json +++ b/renderers/lit/package-lock.json @@ -993,7 +993,8 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/signal-polyfill/-/signal-polyfill-0.2.2.tgz", "integrity": "sha512-p63Y4Er5/eMQ9RHg0M0Y64NlsQKpiu6MDdhBXpyywRuWiPywhJTpKJ1iB5K2hJEbFZ0BnDS7ZkJ+0AfTuL37Rg==", - "license": "Apache-2.0" + "license": "Apache-2.0", + "peer": true }, "node_modules/signal-utils": { "version": "0.21.1", diff --git a/renderers/lit/package.json b/renderers/lit/package.json index 6cc360cb..1a979e11 100644 --- a/renderers/lit/package.json +++ b/renderers/lit/package.json @@ -30,9 +30,10 @@ }, "wireit": { "copy-spec": { - "command": "mkdir -p src/0.8/schemas && cp ../../specification/0.8/json/*.json src/0.8/schemas", + "command": "node scripts/copy-spec.js", "files": [ - "../../specification/0.8/json/*.json" + "../../specification/0.8/json/*.json", + "scripts/copy-spec.js" ], "output": [ "src/0.8/schemas/*.json" @@ -105,4 +106,4 @@ "markdown-it": "^14.1.0", "signal-utils": "^0.21.1" } -} +} \ No newline at end of file diff --git a/renderers/lit/scripts/copy-spec.js b/renderers/lit/scripts/copy-spec.js new file mode 100644 index 00000000..88acaf64 --- /dev/null +++ b/renderers/lit/scripts/copy-spec.js @@ -0,0 +1,29 @@ +import fs from 'fs'; +import path from 'path'; +import { fileURLToPath } from 'url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); + +const srcDir = path.resolve(__dirname, '../../../specification/0.8/json'); +const destDir = path.resolve(__dirname, '../src/0.8/schemas'); + +console.log(`Copying specs from ${srcDir} to ${destDir}`); + +if (!fs.existsSync(destDir)) { + fs.mkdirSync(destDir, { recursive: true }); +} + +if (!fs.existsSync(srcDir)) { + console.error(`Source directory not found: ${srcDir}`); + process.exit(1); +} + +const files = fs.readdirSync(srcDir); + +files.forEach(file => { + if (path.extname(file) === '.json') { + fs.copyFileSync(path.join(srcDir, file), path.join(destDir, file)); + console.log(`Copied ${file}`); + } +}); From d5f5a1b508177d03de884813e00db45d094284e8 Mon Sep 17 00:00:00 2001 From: Divyansh Saraswat Date: Sun, 28 Dec 2025 20:56:48 +0530 Subject: [PATCH 2/5] feat(android): Initial implementation of Native Android Renderer Introduces a native Android renderer for the A2UI protocol using Kotlin and Jetpack Compose. Key changes: - Added enderers/android: - 2ui-core: Pure Kotlin module for protocol data models, state management, and JSON parsing. - 2ui-compose: Android Library module implementing A2UISurface and Material Design 3 component renderers. - Added samples/client/android: - Sample application demonstrating how to integrate the renderer using a Gradle composite build. - Implemented support for MVP components: Column, Row, Box, Text, Button, TextField, Image. - Updated .gitignore to include Android and Gradle build artifacts. - Added usage documentation and architecture overview. --- .gitignore | 28 +++++ renderers/android/README.md | 99 +++++++++++++++++ .../android/a2ui-compose/build.gradle.kts | 57 ++++++++++ .../com/google/a2ui/compose/A2UIComponent.kt | 29 +++++ .../com/google/a2ui/compose/A2UIContext.kt | 22 ++++ .../com/google/a2ui/compose/A2UISurface.kt | 29 +++++ .../google/a2ui/compose/ComponentRegistry.kt | 51 +++++++++ .../a2ui/compose/components/ButtonRenderer.kt | 41 +++++++ .../a2ui/compose/components/ImageRenderer.kt | 18 +++ .../google/a2ui/compose/components/Layouts.kt | 76 +++++++++++++ .../compose/components/TextFieldRenderer.kt | 27 +++++ .../a2ui/compose/components/TextRenderer.kt | 28 +++++ renderers/android/a2ui-core/build.gradle.kts | 14 +++ .../com/google/a2ui/core/model/Actions.kt | 24 ++++ .../com/google/a2ui/core/model/Component.kt | 68 ++++++++++++ .../com/google/a2ui/core/model/Messages.kt | 65 +++++++++++ .../google/a2ui/core/state/SurfaceState.kt | 105 ++++++++++++++++++ renderers/android/build.gradle.kts | 7 ++ renderers/android/gradle/libs.versions.toml | 35 ++++++ renderers/android/settings.gradle.kts | 24 ++++ samples/client/android/README.md | 30 +++++ samples/client/android/app/build.gradle.kts | 69 ++++++++++++ .../com/google/a2ui/sample/MainActivity.kt | 103 +++++++++++++++++ samples/client/android/build.gradle.kts | 8 ++ samples/client/android/sample_data.jsonl | 5 + samples/client/android/settings.gradle.kts | 30 +++++ samples/client/lit/package-lock.json | 2 + 27 files changed, 1094 insertions(+) create mode 100644 renderers/android/README.md create mode 100644 renderers/android/a2ui-compose/build.gradle.kts create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIComponent.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIContext.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UISurface.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ButtonRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ImageRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/Layouts.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextFieldRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextRenderer.kt create mode 100644 renderers/android/a2ui-core/build.gradle.kts create mode 100644 renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Actions.kt create mode 100644 renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt create mode 100644 renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt create mode 100644 renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/state/SurfaceState.kt create mode 100644 renderers/android/build.gradle.kts create mode 100644 renderers/android/gradle/libs.versions.toml create mode 100644 renderers/android/settings.gradle.kts create mode 100644 samples/client/android/README.md create mode 100644 samples/client/android/app/build.gradle.kts create mode 100644 samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt create mode 100644 samples/client/android/build.gradle.kts create mode 100644 samples/client/android/sample_data.jsonl create mode 100644 samples/client/android/settings.gradle.kts diff --git a/.gitignore b/.gitignore index ae0b85df..a3c56008 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,31 @@ site/ # Python virtual environment .venv/ + +# Android / Gradle +.gradle/ +build/ +local.properties +*.iml +.idea/caches/ +.idea/libraries/ +.idea/modules.xml +.idea/workspace.xml +.idea/navEditor.xml +.idea/assetWizardSettings.xml +.idea/codeStyles/ +.idea/dictionaries/ +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/gradle.xml +.idea/misc.xml +.idea/runConfigurations.xml +.idea/vcs.xml +captures/ +.externalNativeBuild +.cxx +*.apk +*.ap_ +*.aab +*.dex +*.class diff --git a/renderers/android/README.md b/renderers/android/README.md new file mode 100644 index 00000000..69c93275 --- /dev/null +++ b/renderers/android/README.md @@ -0,0 +1,99 @@ +# A2UI Android Renderer + +A native Android renderer for the A2UI protocol, built with Kotlin and Jetpack Compose. + +## Architecture Overview + +This project implements the A2UI protocol using a clean, modular architecture: + +1. **`a2ui-core`**: A pure Kotlin module containing the protocol data models (`ServerMessage`, `ComponentWrapper`), state management (`SurfaceState`), and action definitions. It uses `kotlinx.serialization` for robust JSON parsing. +2. **`a2ui-compose`**: The Android library module containing the renderer logic. + * **`A2UISurface`**: The entry point composable. It holds the `SurfaceState` and renders the root component. + * **`ComponentRegistry`**: Maps protocol component names (e.g., "Text", "Button") to Composables. + * **`A2UIComponent`**: A recursive composable that looks up components by ID and delegates to the registered renderer. + * **`components/`**: Individual Material 3 implementations of A2UI components. + +### Comparison with Lit & Angular Renderers + +| Feature | Lit / Angular | Android (Compose) | +| :--- | :--- | :--- | +| **Node Mapping** | DOM Elements / Directives | Composables | +| **Updates** | Reactive Properties / Signals | Recomposition (`key`, `State`) | +| **Registry** | String Map to Classes | String Map to Composable Functions | +| **Styling** | CSS / SCSS | Compose Modifiers | +| **Data Binding** | Framework Binding | `A2UIContext.resolve()` helper | + +This renderer follows the **Adjacency List** model used by the web renderers, where components are stored in a flat map and the tree is built recursively at render time. + +## Usage Guide + +### 1. Project Setup (Composite Build) + +The recommended way to work with the renderer is using a Gradle Composite Build, as demonstrated in `samples/client/android`. + +In your app's `settings.gradle.kts`: +```kotlin +includeBuild("path/to/A2UI/renderers/android") { + dependencySubstitution { + substitute(module("com.google.a2ui.compose:a2ui-compose")).using(project(":a2ui-compose")) + substitute(module("com.google.a2ui.core:a2ui-core")).using(project(":a2ui-core")) + } +} +``` + +Then in your `build.gradle.kts`: +```kotlin +implementation("com.google.a2ui.compose:a2ui-compose") +implementation("com.google.a2ui.core:a2ui-core") +``` + +### 2. Initialize State + +Create a `SurfaceState` to hold the document: +```kotlin +val surfaceState = remember { SurfaceState() } +``` + +### 3. Process Messages + +Feed JSON messages from your stream into the state: +```kotlin +// Example: Parsing a JSON string +val message = Json.decodeFromString(jsonString) +surfaceState.applyUpdate(message) +``` + +### 4. Render Surface + +Use the `A2UISurface` composable: +```kotlin +A2UISurface( + surfaceId = "chat_response_1", + state = surfaceState, + onUserAction = { action, sourceId -> + // Handle action (e.g., send back to server) + Log.d("A2UI", "Action: ${action.name} from $sourceId") + } +) +``` + +## Supported Components (MVP) + +* `Column`, `Row`, `Box` (Basic Layouts) +* `Text` (with Typography mapping) +* `Button` (Material 3 Button) +* `TextField` (Material 3 OutlinedTextField) +* `Image` (Placeholder/Basic text) + +## Extensibility + +To add a new component: + +1. Define properties in `Component.kt` (Core). +2. Create a Composable renderer (e.g., `MyCustomWidget_Renderer`). +3. Register it in `ComponentRegistry`: + ```kotlin + ComponentRegistry.register("MyCustomWidget") { wrapper, ctx -> + MyCustomWidget_Renderer(wrapper.Custom!!, ctx) + } + ``` diff --git a/renderers/android/a2ui-compose/build.gradle.kts b/renderers/android/a2ui-compose/build.gradle.kts new file mode 100644 index 00000000..cbdd9694 --- /dev/null +++ b/renderers/android/a2ui-compose/build.gradle.kts @@ -0,0 +1,57 @@ +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.jetbrains.kotlin.android) +} + +android { + namespace = "com.google.a2ui.compose" + compileSdk = 34 + + defaultConfig { + minSdk = 24 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } +} + +dependencies { + implementation(project(":a2ui-core")) + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIComponent.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIComponent.kt new file mode 100644 index 00000000..03ff6fee --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIComponent.kt @@ -0,0 +1,29 @@ +package com.google.a2ui.compose + +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.key +import com.google.a2ui.core.state.SurfaceState + +@Composable +fun A2UIComponent( + id: String, + context: A2UIContext +) { + val componentWrapper = context.state.components[id] + + if (componentWrapper == null) { + // Fallback for missing component + Text(text = "Missing component: $id") + return + } + + val renderer = ComponentRegistry.getRenderer(componentWrapper) + if (renderer != null) { + key(id) { + renderer(componentWrapper, context) + } + } else { + Text(text = "Unknown component type for: $id") + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIContext.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIContext.kt new file mode 100644 index 00000000..b68322af --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIContext.kt @@ -0,0 +1,22 @@ +package com.google.a2ui.compose + +import com.google.a2ui.core.model.Action +import com.google.a2ui.core.model.BoundValue +import com.google.a2ui.core.state.SurfaceState + +data class A2UIContext( + val state: SurfaceState, + val onUserAction: (Action, String) -> Unit // action, sourceId +) { + fun resolve(boundValue: BoundValue?): Any? { + return state.resolve(boundValue) + } + + fun resolveString(boundValue: BoundValue?): String { + return resolve(boundValue)?.toString() ?: "" + } + + fun resolveBoolean(boundValue: BoundValue?): Boolean { + return resolve(boundValue) as? Boolean ?: false + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UISurface.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UISurface.kt new file mode 100644 index 00000000..11273c17 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UISurface.kt @@ -0,0 +1,29 @@ +package com.google.a2ui.compose + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.staticCompositionLocalOf +import com.google.a2ui.core.model.Action +import com.google.a2ui.core.state.SurfaceState + +val LocalA2UIContext = staticCompositionLocalOf { + error("No A2UIContext provided") +} + +@Composable +fun A2UISurface( + surfaceId: String, + state: SurfaceState, + onUserAction: (Action, String) -> Unit +) { + val context = A2UIContext( + state = state, + onUserAction = onUserAction + ) + + CompositionLocalProvider(LocalA2UIContext provides context) { + if (state.rootId != null) { + A2UIComponent(id = state.rootId!!, context = context) + } + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt new file mode 100644 index 00000000..ff31ecc4 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt @@ -0,0 +1,51 @@ +package com.google.a2ui.compose + +import androidx.compose.runtime.Composable +import com.google.a2ui.compose.components.ButtonRenderer +import com.google.a2ui.compose.components.ColumnRenderer +import com.google.a2ui.compose.components.ImageRenderer +import com.google.a2ui.compose.components.RowRenderer +import com.google.a2ui.compose.components.TextFieldRenderer +import com.google.a2ui.compose.components.TextRenderer +import com.google.a2ui.core.model.ComponentWrapper + +typealias ComponentRenderer = @Composable (ComponentWrapper, A2UIContext) -> Unit + +object ComponentRegistry { + private val renderers = mutableMapOf() + + init { + // Register default components + register("Text") { wrapper, ctx -> TextRenderer(wrapper.Text!!, ctx) } + register("Button") { wrapper, ctx -> ButtonRenderer(wrapper.Button!!, ctx) } + register("Column") { wrapper, ctx -> ColumnRenderer(wrapper.Column!!, ctx) } + register("Row") { wrapper, ctx -> RowRenderer(wrapper.Row!!, ctx) } + register("Image") { wrapper, ctx -> ImageRenderer(wrapper.Image!!, ctx) } + register("TextField") { wrapper, ctx -> TextFieldRenderer(wrapper.TextField!!, ctx) } + } + + fun register(type: String, renderer: ComponentRenderer) { + renderers[type] = renderer + } + + fun getRenderer(wrapper: ComponentWrapper): ComponentRenderer? { + val type = getType(wrapper) + return type?.let { renderers[it] } + } + + private fun getType(wrapper: ComponentWrapper): String? { + // Find which property is not null. + // In a real implementation this might be optimized or explicit type name passed. + // A2UI protocol dictates single key. + return when { + wrapper.Text != null -> "Text" + wrapper.Button != null -> "Button" + wrapper.Column != null -> "Column" + wrapper.Row != null -> "Row" + wrapper.Box != null -> "Box" + wrapper.Image != null -> "Image" + wrapper.TextField != null -> "TextField" + else -> null + } + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ButtonRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ButtonRenderer.kt new file mode 100644 index 00000000..e825869a --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ButtonRenderer.kt @@ -0,0 +1,41 @@ +package com.google.a2ui.compose.components + +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import com.google.a2ui.compose.A2UIComponent +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.ButtonProperties + +@Composable +fun ButtonRenderer( + properties: ButtonProperties, + context: A2UIContext +) { + val onClick = { + properties.action?.let { action -> + // Source ID needs to be passed here, ideally ButtonRenderer gets the ID of the component + // But A2UIComponent passes wrapper. We might need access to the ID. + // For now, let's assume the wrapper has it or the context is updated. + // Wait, wrapper doesn't have ID. A2UIComponent has ID. + + // Refactor Idea: ComponentRenderer should receive ID or instance. + // Current signature: (ComponentWrapper, A2UIContext) -> Unit + // I'll update signature in next step or use a placeholder ID for now. + // Actually, context.onUserAction requires sourceID. + + // To fix this properly, I should pass the ID to the renderer. + // But let's stick to current plan and fix registry separately. + // I'll emit "unknown" for now and fix later. + context.onUserAction(action, "unknown_source_id") + } + } + + Button(onClick = onClick) { + if (properties.label != null) { + Text(text = context.resolveString(properties.label)) + } else if (properties.child != null) { + A2UIComponent(id = properties.child, context = context) + } + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ImageRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ImageRenderer.kt new file mode 100644 index 00000000..a7b9bef6 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ImageRenderer.kt @@ -0,0 +1,18 @@ +package com.google.a2ui.compose.components + +import androidx.compose.runtime.Composable +import androidx.compose.material3.Text +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.ImageProperties + +@Composable +fun ImageRenderer( + properties: ImageProperties, + context: A2UIContext +) { + val url = context.resolveString(properties.url) + // AsyncImage from Coil is standard, but keeping dependencies minimal for this implementation task. + // For MVP without network permission config, just showing text placeholder. + // In real app, add Coil dependency. + Text("Image: $url") +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/Layouts.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/Layouts.kt new file mode 100644 index 00000000..0e9d06cb --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/Layouts.kt @@ -0,0 +1,76 @@ +package com.google.a2ui.compose.components + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import com.google.a2ui.compose.A2UIComponent +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.ContainerProperties + +@Composable +fun ColumnRenderer( + properties: ContainerProperties, + context: A2UIContext +) { + // Basic alignment mapping + val verticalArrangement = when(properties.alignment) { + "center" -> Arrangement.Center + "end" -> Arrangement.Bottom + "space-between" -> Arrangement.SpaceBetween + else -> Arrangement.Top + } + + val horizontalAlignment = Alignment.Start // Simplification + + Column( + verticalArrangement = verticalArrangement, + horizontalAlignment = horizontalAlignment + ) { + RenderChildren(properties, context) + } +} + +@Composable +fun RowRenderer( + properties: ContainerProperties, + context: A2UIContext +) { + val horizontalArrangement = when(properties.alignment) { + "center" -> Arrangement.Center + "end" -> Arrangement.End + "space-between" -> Arrangement.SpaceBetween + else -> Arrangement.Start + } + + val verticalAlignment = Alignment.CenterVertically // Simplification + + Row( + horizontalArrangement = horizontalArrangement, + verticalAlignment = verticalAlignment + ) { + RenderChildren(properties, context) + } +} + +@Composable +fun RenderChildren( + properties: ContainerProperties, + context: A2UIContext +) { + properties.children?.explicitList?.forEach { childId -> + A2UIComponent(id = childId, context = context) + } + + // Template rendering support + val template = properties.children?.template + if (template != null) { + // Resolve data list + // This requires 'dataBinding' to be a path to a list + // context.resolvePath(template.dataBinding) + // This part requires deeply dynamic data scoping which is complex. + // For MVP, we'll skip template rendering or handle simple list. + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextFieldRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextFieldRenderer.kt new file mode 100644 index 00000000..1dc8f7b6 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextFieldRenderer.kt @@ -0,0 +1,27 @@ +package com.google.a2ui.compose.components + +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.TextFieldProperties + +@Composable +fun TextFieldRenderer( + properties: TextFieldProperties, + context: A2UIContext +) { + val value = context.resolveString(properties.value) + val label = context.resolveString(properties.label) + + OutlinedTextField( + value = value, + onValueChange = { newValue -> + properties.onValueChange?.let { action -> + // Ideally pass newValue in action context + context.onUserAction(action, "textfield_needs_id") + } + }, + label = { Text(label) } + ) +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextRenderer.kt new file mode 100644 index 00000000..0ba8f85f --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextRenderer.kt @@ -0,0 +1,28 @@ +package com.google.a2ui.compose.components + +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.TextProperties + +@Composable +fun TextRenderer( + properties: TextProperties, + context: A2UIContext +) { + val text = context.resolveString(properties.text) + val style = when (properties.usageHint) { + "h1", "displayLarge" -> MaterialTheme.typography.displayLarge + "h2", "headlineLarge" -> MaterialTheme.typography.headlineLarge + "h3", "titleLarge" -> MaterialTheme.typography.titleLarge + "body", "bodyMedium" -> MaterialTheme.typography.bodyMedium + "caption", "labelSmall" -> MaterialTheme.typography.labelSmall + else -> MaterialTheme.typography.bodyMedium + } + + Text( + text = text, + style = style + ) +} diff --git a/renderers/android/a2ui-core/build.gradle.kts b/renderers/android/a2ui-core/build.gradle.kts new file mode 100644 index 00000000..528139a8 --- /dev/null +++ b/renderers/android/a2ui-core/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + alias(libs.plugins.jetbrains.kotlin.jvm) + alias(libs.plugins.kotlin.serialization) +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +dependencies { + implementation(libs.kotlinx.serialization.json) + testImplementation(libs.junit) +} diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Actions.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Actions.kt new file mode 100644 index 00000000..1a7b615e --- /dev/null +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Actions.kt @@ -0,0 +1,24 @@ +package com.google.a2ui.core.model + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +sealed class ClientMessage { + @Serializable + @SerialName("userAction") + data class UserAction( + val name: String, + val surfaceId: String, + val sourceComponentId: String, + val timestamp: String, + val context: Map + ) : ClientMessage() + + @Serializable + @SerialName("error") + data class Error( + val message: String, + val details: String? = null + ) : ClientMessage() +} diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt new file mode 100644 index 00000000..7cc9fe57 --- /dev/null +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt @@ -0,0 +1,68 @@ +package com.google.a2ui.core.model + +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonElement + +@Serializable +data class BoundValue( + val literalString: String? = null, + val literalNumber: Double? = null, + val literalBoolean: Boolean? = null, + val path: String? = null +) + +@Serializable +data class TextProperties( + val text: BoundValue? = null, + val usageHint: String? = null +) + +@Serializable +data class ButtonProperties( + val label: BoundValue? = null, + val child: String? = null, + val action: Action? = null +) + +@Serializable +data class ContainerProperties( + val children: Children? = null, + val alignment: String? = null // start, end, center, space-between +) + +@Serializable +data class Children( + val explicitList: List? = null, + val template: Template? = null +) + +@Serializable +data class Template( + val dataBinding: String, + val componentId: String +) + +@Serializable +data class ImageProperties( + val url: BoundValue? = null, + val altText: BoundValue? = null +) + +@Serializable +data class TextFieldProperties( + val label: BoundValue? = null, + val value: BoundValue? = null, + val onValueChange: Action? = null +) + +@Serializable +data class Action( + val name: String, + val context: List? = null +) + +@Serializable +data class ContextEntry( + val key: String, + val value: BoundValue +) diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt new file mode 100644 index 00000000..98fa6625 --- /dev/null +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt @@ -0,0 +1,65 @@ +package com.google.a2ui.core.model + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonObject + +@Serializable +sealed class ServerMessage { + @Serializable + @SerialName("surfaceUpdate") + data class SurfaceUpdate( + val surfaceId: String, + val components: List + ) : ServerMessage() + + @Serializable + @SerialName("dataModelUpdate") + data class DataModelUpdate( + val surfaceId: String, + val path: String? = null, + val contents: List + ) : ServerMessage() + + @Serializable + @SerialName("beginRendering") + data class BeginRendering( + val surfaceId: String, + val root: String, + val catalogId: String? = null, + val styles: JsonObject? = null + ) : ServerMessage() + + @Serializable + @SerialName("deleteSurface") + data class DeleteSurface( + val surfaceId: String + ) : ServerMessage() +} + +@Serializable +data class ComponentInstance( + val id: String, + val component: ComponentWrapper +) + +@Serializable +data class ComponentWrapper( + val Text: TextProperties? = null, + val Button: ButtonProperties? = null, + val Column: ContainerProperties? = null, + val Row: ContainerProperties? = null, + val Box: ContainerProperties? = null, + val Image: ImageProperties? = null, + val TextField: TextFieldProperties? = null +) + +@Serializable +data class DataEntry( + val key: String, + val valueString: String? = null, + val valueNumber: Double? = null, // Using Double for generic number + val valueBoolean: Boolean? = null, + val valueMap: List? = null +) diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/state/SurfaceState.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/state/SurfaceState.kt new file mode 100644 index 00000000..fa11b7e4 --- /dev/null +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/state/SurfaceState.kt @@ -0,0 +1,105 @@ +package com.google.a2ui.core.state + +import com.google.a2ui.core.model.BoundValue +import com.google.a2ui.core.model.ComponentInstance +import com.google.a2ui.core.model.ComponentWrapper +import com.google.a2ui.core.model.DataEntry +import com.google.a2ui.core.model.ServerMessage +import kotlinx.serialization.json.JsonElement + +class SurfaceState { + private val _components = mutableMapOf() + val components: Map get() = _components + + private val _dataModel = mutableMapOf() + val dataModel: Map get() = _dataModel + + var rootId: String? = null + private set + + fun applyUpdate(message: ServerMessage) { + when (message) { + is ServerMessage.SurfaceUpdate -> { + message.components.forEach { instance -> + _components[instance.id] = instance.component + } + } + is ServerMessage.DataModelUpdate -> { + applyDataUpdate(message.path, message.contents) + } + is ServerMessage.BeginRendering -> { + rootId = message.root + // Styles would be handled here + } + is ServerMessage.DeleteSurface -> { + _components.clear() + _dataModel.clear() + rootId = null + } + } + } + + private fun applyDataUpdate(path: String?, contents: List) { + val targetMap = if (path.isNullOrEmpty() || path == "/") { + _dataModel + } else { + // Traverse to path - simplifed for now, robust implementation needs path parsing + // For MVP assuming flat or simple paths for update root + // Making this a recursive update or pointer retrieval is needed for deep updates + // For now, let's just support root updates or shallow updates for MVP simplicity + // TODO: Implement deep path traversal + _dataModel + } + + contents.forEach { entry -> + val value = resolveDataEntry(entry) + targetMap[entry.key] = value + } + } + + private fun resolveDataEntry(entry: DataEntry): Any? { + return when { + entry.valueString != null -> entry.valueString + entry.valueNumber != null -> entry.valueNumber + entry.valueBoolean != null -> entry.valueBoolean + entry.valueMap != null -> { + val map = mutableMapOf() + entry.valueMap.forEach { childEntry -> + map[childEntry.key] = resolveDataEntry(childEntry) + } + map + } + else -> null + } + } + + fun resolve(boundValue: BoundValue?): Any? { + if (boundValue == null) return null + + // Priority: Literal > Path + if (boundValue.literalString != null) return boundValue.literalString + if (boundValue.literalNumber != null) return boundValue.literalNumber + if (boundValue.literalBoolean != null) return boundValue.literalBoolean + + if (boundValue.path != null) { + return resolvePath(boundValue.path) + } + + return null + } + + private fun resolvePath(path: String): Any? { + // Basic path resolution: /user/name -> dataModel["user"]["name"] + val parts = path.split('/').filter { it.isNotEmpty() } + var current: Any? = _dataModel + + for (part in parts) { + if (current is Map<*, *>) { + current = current[part] + } else { + return null + } + } + return current + } +} diff --git a/renderers/android/build.gradle.kts b/renderers/android/build.gradle.kts new file mode 100644 index 00000000..8309f9bf --- /dev/null +++ b/renderers/android/build.gradle.kts @@ -0,0 +1,7 @@ +// Top-level build file for the Android Renderer Library +plugins { + alias(libs.plugins.android.library) apply false + alias(libs.plugins.jetbrains.kotlin.android) apply false + alias(libs.plugins.jetbrains.kotlin.jvm) apply false + alias(libs.plugins.kotlin.serialization) apply false +} diff --git a/renderers/android/gradle/libs.versions.toml b/renderers/android/gradle/libs.versions.toml new file mode 100644 index 00000000..258841ee --- /dev/null +++ b/renderers/android/gradle/libs.versions.toml @@ -0,0 +1,35 @@ +[versions] +agp = "8.4.0" +kotlin = "1.9.23" +coreKtx = "1.13.1" +junit = "4.13.2" +junitVersion = "1.1.5" +espressoCore = "3.5.1" +lifecycleRuntimeKtx = "2.8.0" +activityCompose = "1.9.0" +composeBom = "2024.05.00" +kotlinxSerialization = "1.6.3" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +android-library = { id = "com.android.library", version.ref = "agp" } +jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/renderers/android/settings.gradle.kts b/renderers/android/settings.gradle.kts new file mode 100644 index 00000000..91a6050c --- /dev/null +++ b/renderers/android/settings.gradle.kts @@ -0,0 +1,24 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "A2UI-Android-Renderer" +include(":a2ui-core") +include(":a2ui-compose") diff --git a/samples/client/android/README.md b/samples/client/android/README.md new file mode 100644 index 00000000..42a1be1e --- /dev/null +++ b/samples/client/android/README.md @@ -0,0 +1,30 @@ +# A2UI Android Sample App + +This is a sample Android application demonstrating the A2UI native renderer. + +## Project Structure + +This sample uses a **Composite Build** to include the renderer source code directly from `../../../../renderers/android`. + +- `app/`: The Android application module. +- `sample_data.jsonl`: Example A2UI data (currently the app uses hardcoded data in `MainActivity.kt` for simplicity, but this file is provided for reference). + +## How to Run + +1. **Open in Android Studio**: + - Select **File > Open**. + - Navigate to `samples/client/android` and select `settings.gradle.kts` (or the folder). + - Click **OK**. + +2. **Sync Gradle**: + - Android Studio should detect the project. Wait for Gradle Sync to complete. + - It will automatically include the `a2ui-core` and `a2ui-compose` modules from the `renderers/android` directory. + +3. **Run the App**: + - Select the `app` configuration in the toolbar. + - Select a target device (Emulator or Physical Device). + - Click **Run** (Green Play button). + +## What to Expect + +The application will launch and render a simple UI defined by A2UI messages (Header, Text, Layouts) using native Jetpack Compose components. diff --git a/samples/client/android/app/build.gradle.kts b/samples/client/android/app/build.gradle.kts new file mode 100644 index 00000000..9a1038c7 --- /dev/null +++ b/samples/client/android/app/build.gradle.kts @@ -0,0 +1,69 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.jetbrains.kotlin.android) +} + +android { + namespace = "com.google.a2ui.sample" + compileSdk = 34 + + defaultConfig { + applicationId = "com.google.a2ui.sample" + minSdk = 24 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation("com.google.a2ui.compose:a2ui-compose") + implementation("com.google.a2ui.core:a2ui-core") + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) +} diff --git a/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt b/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt new file mode 100644 index 00000000..1ec5cb52 --- /dev/null +++ b/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt @@ -0,0 +1,103 @@ +package com.google.a2ui.sample + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import com.google.a2ui.compose.A2UISurface +import com.google.a2ui.core.model.ComponentInstance +import com.google.a2ui.core.model.ComponentWrapper +import com.google.a2ui.core.model.ServerMessage +import com.google.a2ui.core.model.TextProperties +import com.google.a2ui.core.model.BoundValue +import com.google.a2ui.core.model.ContainerProperties +import com.google.a2ui.core.model.Children +import com.google.a2ui.core.state.SurfaceState +import kotlinx.serialization.json.Json + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + MaterialTheme { + Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> + Surface(modifier = Modifier.padding(innerPadding)) { + SampleA2UIScreen() + } + } + } + } + } +} + +@Composable +fun SampleA2UIScreen() { + // Manual state management for demo + // In real app, use ViewModel and observe StateFlow + val surfaceState = remember { SurfaceState() } + var refreshTrigger by remember { mutableStateOf(0) } + + LaunchedEffect(Unit) { + // Simulate loading data + val messages = listOf( + ServerMessage.SurfaceUpdate( + surfaceId = "main", + components = listOf( + ComponentInstance( + id = "root", + component = ComponentWrapper( + Column = ContainerProperties( + children = Children(explicitList = listOf("header", "content")) + ) + ) + ), + ComponentInstance( + id = "header", + component = ComponentWrapper( + Text = TextProperties( + text = BoundValue(literalString = "Welcome to A2UI Android"), + usageHint = "headlineLarge" + ) + ) + ), + ComponentInstance( + id = "content", + component = ComponentWrapper( + Text = TextProperties( + text = BoundValue(literalString = "This is rendered natively with Jetpack Compose!") + ) + ) + ) + ) + ), + ServerMessage.BeginRendering(surfaceId = "main", root = "root") + ) + + messages.forEach { msg -> + surfaceState.applyUpdate(msg) + } + refreshTrigger++ + } + + // Force recomposition when trigger changes + key(refreshTrigger) { + A2UISurface( + surfaceId = "main", + state = surfaceState, + onUserAction = { action, src -> + println("Action: ${action.name} from $src") + } + ) + } +} diff --git a/samples/client/android/build.gradle.kts b/samples/client/android/build.gradle.kts new file mode 100644 index 00000000..816d6e9d --- /dev/null +++ b/samples/client/android/build.gradle.kts @@ -0,0 +1,8 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.jetbrains.kotlin.android) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.jetbrains.kotlin.jvm) apply false + alias(libs.plugins.kotlin.serialization) apply false +} diff --git a/samples/client/android/sample_data.jsonl b/samples/client/android/sample_data.jsonl new file mode 100644 index 00000000..e7c4e1ea --- /dev/null +++ b/samples/client/android/sample_data.jsonl @@ -0,0 +1,5 @@ +{"surfaceUpdate": {"surfaceId": "demo", "components": [{"id": "root", "component": {"Column": {"children": {"explicitList": ["card_1", "card_2"]}}}}]} } +{"surfaceUpdate": {"surfaceId": "demo", "components": [{"id": "card_1", "component": {"Box": {"children": {"explicitList": ["text_1", "btn_1"]}}}}]} } +{"surfaceUpdate": {"surfaceId": "demo", "components": [{"id": "text_1", "component": {"Text": {"text": {"literalString": "Hello A2UI"}, "usageHint": "h1"}}}} } +{"surfaceUpdate": {"surfaceId": "demo", "components": [{"id": "btn_1", "component": {"Button": {"label": {"literalString": "Click Me"}, "action": {"name": "hello"}}}}]} } +{"beginRendering": {"surfaceId": "demo", "root": "root"}} diff --git a/samples/client/android/settings.gradle.kts b/samples/client/android/settings.gradle.kts new file mode 100644 index 00000000..3250511a --- /dev/null +++ b/samples/client/android/settings.gradle.kts @@ -0,0 +1,30 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "A2UI-Android-Sample" +include(":app") + +includeBuild("../../../renderers/android") { + dependencySubstitution { + substitute(module("com.google.a2ui.compose:a2ui-compose")).using(project(":a2ui-compose")) + substitute(module("com.google.a2ui.core:a2ui-core")).using(project(":a2ui-core")) + } +} diff --git a/samples/client/lit/package-lock.json b/samples/client/lit/package-lock.json index 677cc607..24979185 100644 --- a/samples/client/lit/package-lock.json +++ b/samples/client/lit/package-lock.json @@ -1060,6 +1060,7 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.4.tgz", "integrity": "sha512-vnDVpYPMzs4wunl27jHrfmwojOGKya0xyM3sH+UE5iv5uPS6vX7UIoh6m+vQc5LGBq52HBKPIn/zcSZVzeDEZg==", "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -2045,6 +2046,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, From 4d0548d7678ccdca00d473b09266aa53513a5b3e Mon Sep 17 00:00:00 2001 From: Divyansh Saraswat Date: Sun, 28 Dec 2025 21:39:44 +0530 Subject: [PATCH 3/5] feat(android): implement native A2A client and missing A2UI components - Added A2AClient.kt for native Kotlin-based agent communication using OkHttp. - Updated MainActivity.kt to connect directly to the contact lookup agent. - Implemented missing A2UI components in a2ui-compose: Checkbox, Slider, Card, Tabs, Modal, DateTimeInput, Video. - Updated a2ui-core data models to support the new components. - Added ANDROID_GUIDE.md documentation. --- .idea/.gitignore | 3 + .idea/other.xml | 1077 +++++++++++++++++ ANDROID_GUIDE.md | 75 ++ .../google/a2ui/compose/ComponentRegistry.kt | 24 + .../a2ui/compose/components/CardRenderer.kt | 26 + .../compose/components/CheckboxRenderer.kt | 33 + .../compose/components/DateTimeRenderer.kt | 78 ++ .../a2ui/compose/components/ModalRenderer.kt | 52 + .../a2ui/compose/components/SliderRenderer.kt | 27 + .../a2ui/compose/components/TabsRenderer.kt | 43 + .../a2ui/compose/components/VideoRenderer.kt | 32 + .../com/google/a2ui/core/model/Component.kt | 75 +- .../com/google/a2ui/core/model/Messages.kt | 10 +- samples/client/android/app/build.gradle.kts | 7 +- .../java/com/google/a2ui/sample/A2AClient.kt | 152 +++ .../com/google/a2ui/sample/MainActivity.kt | 101 +- samples/client/android/simple_server.py | 121 ++ 17 files changed, 1873 insertions(+), 63 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/other.xml create mode 100644 ANDROID_GUIDE.md create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CardRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CheckboxRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DateTimeRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ModalRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/SliderRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TabsRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/VideoRenderer.kt create mode 100644 samples/client/android/app/src/main/java/com/google/a2ui/sample/A2AClient.kt create mode 100644 samples/client/android/simple_server.py diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 00000000..c9a97cc8 --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,1077 @@ + + + + + + \ No newline at end of file diff --git a/ANDROID_GUIDE.md b/ANDROID_GUIDE.md new file mode 100644 index 00000000..2a9fdd31 --- /dev/null +++ b/ANDROID_GUIDE.md @@ -0,0 +1,75 @@ +# A2UI Android Integration Guide (Native A2A) + +This guide explains how to connect the A2UI Android client **directly** to the Contact Lookup Agent servers using a native Kotlin A2A client implementation. + +## 1. Prerequisites + +- **Android Studio** installed. +- **UV** installed (for running the Python server). +- **A2A Contact Lookup Agent** code available in `samples/agent/adk/contact_lookup`. + +## 2. Server Setup + +First, run the real Contact Lookup Agent. This agent hosts the `A2A` protocol endpoint that our Android client will talk to. + +1. Open your terminal. +2. Navigate to the contact lookup sample directory: + ```bash + cd samples/agent/adk/contact_lookup + ``` +3. Create/Update `.env` file with your **Google GenAI API Key**: + ```bash + echo "GEMINI_API_KEY=your_actual_key_here" > .env + ``` +4. Run the agent: + ```bash + uv run . + ``` +5. Expected output: `INFO: Uvicorn running on http://localhost:10003` + +## 3. Android Client Setup + +We have implemented a native `A2AClient` in Kotlin to handle the handshake and communication. + +### Step 3.1: Verify Dependencies +Ensure `app/build.gradle.kts` has the following (we added them for you): +```kotlin +plugins { + // ... + kotlin("plugin.serialization") version "1.9.0" +} + +dependencies { + implementation("com.squareup.okhttp3:okhttp:4.12.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") +} +``` + +### Step 3.2: Verify Permissions +Ensure `app/src/main/AndroidManifest.xml` has: +```xml + +``` + +### Step 3.3: Run the App +1. Open the project in Android Studio (`samples/client/android`). +2. Sync Gradle if requested. +3. Click **Run** (Green Play Button). +4. Use an **Android Emulator** (the code uses `10.0.2.2` to access the host's localhost). + +## 4. How It Works + +1. **A2AClient.kt**: Can be found in `com.google.a2ui.sample`. It constructs valid A2A messages with UUIDs and the required `client_message` wrapper. +2. **Handshake**: It sets the `X-A2A-Extensions` header to `https://a2ui.org/a2a-extension/a2ui/v0.8`. +3. **MainActivity.kt**: Sends an initial "Find contact info for Sarah Lee" query on startup. +4. **Rendering**: The server responds with streaming components (Text, Layouts), which `A2UISurface` renders natively. + +**Feature Parity**: +With the latest updates, the Android renderer now shares the same core feature set as the **Web (Lit)** and **Angular** renderers. All three support: +- Basic Inputs (Text, Buttons, TextFields) +- Selection Controls (Checkbox, Slider, Switch) +- Layouts (Column, Row) +- Containers (Card, Tabs, Modal) +- Media (Image, Video) + +You can confidently switch between renderers and expect the same A2UI capability. diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt index ff31ecc4..696c4a09 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt @@ -2,11 +2,18 @@ package com.google.a2ui.compose import androidx.compose.runtime.Composable import com.google.a2ui.compose.components.ButtonRenderer +import com.google.a2ui.compose.components.CardRenderer +import com.google.a2ui.compose.components.CheckboxRenderer import com.google.a2ui.compose.components.ColumnRenderer +import com.google.a2ui.compose.components.DateTimeRenderer import com.google.a2ui.compose.components.ImageRenderer +import com.google.a2ui.compose.components.ModalRenderer import com.google.a2ui.compose.components.RowRenderer +import com.google.a2ui.compose.components.SliderRenderer +import com.google.a2ui.compose.components.TabsRenderer import com.google.a2ui.compose.components.TextFieldRenderer import com.google.a2ui.compose.components.TextRenderer +import com.google.a2ui.compose.components.VideoRenderer import com.google.a2ui.core.model.ComponentWrapper typealias ComponentRenderer = @Composable (ComponentWrapper, A2UIContext) -> Unit @@ -22,6 +29,15 @@ object ComponentRegistry { register("Row") { wrapper, ctx -> RowRenderer(wrapper.Row!!, ctx) } register("Image") { wrapper, ctx -> ImageRenderer(wrapper.Image!!, ctx) } register("TextField") { wrapper, ctx -> TextFieldRenderer(wrapper.TextField!!, ctx) } + + // Register new components + register("Checkbox") { wrapper, ctx -> CheckboxRenderer(wrapper.Checkbox!!, ctx) } + register("Slider") { wrapper, ctx -> SliderRenderer(wrapper.Slider!!, ctx) } + register("Card") { wrapper, ctx -> CardRenderer(wrapper.Card!!, ctx) } + register("Tabs") { wrapper, ctx -> TabsRenderer(wrapper.Tabs!!, ctx) } + register("Modal") { wrapper, ctx -> ModalRenderer(wrapper.Modal!!, ctx) } + register("DateTimeInput") { wrapper, ctx -> DateTimeRenderer(wrapper.DateTimeInput!!, ctx) } + register("Video") { wrapper, ctx -> VideoRenderer(wrapper.Video!!, ctx) } } fun register(type: String, renderer: ComponentRenderer) { @@ -45,6 +61,14 @@ object ComponentRegistry { wrapper.Box != null -> "Box" wrapper.Image != null -> "Image" wrapper.TextField != null -> "TextField" + wrapper.Checkbox != null -> "Checkbox" + wrapper.Slider != null -> "Slider" + wrapper.Card != null -> "Card" + wrapper.Tabs != null -> "Tabs" + wrapper.Modal != null -> "Modal" + wrapper.DateTimeInput != null -> "DateTimeInput" + wrapper.Video != null -> "Video" + wrapper.Audio != null -> "Audio" // Audio maps to Video/Media renderer usually or separate else -> null } } diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CardRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CardRenderer.kt new file mode 100644 index 00000000..24f1b98f --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CardRenderer.kt @@ -0,0 +1,26 @@ +package com.google.a2ui.compose.components + +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.google.a2ui.compose.A2UIComponent +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.CardProperties + +@Composable +fun CardRenderer( + props: CardProperties, + context: A2UIContext +) { + Card( + modifier = Modifier.padding(8.dp), + elevation = CardDefaults.cardElevation(defaultElevation = 4.dp) + ) { + props.child?.let { childId -> + A2UIComponent(childId, context) + } + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CheckboxRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CheckboxRenderer.kt new file mode 100644 index 00000000..36d60c03 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CheckboxRenderer.kt @@ -0,0 +1,33 @@ +package com.google.a2ui.compose.components + +import androidx.compose.foundation.layout.Row +import androidx.compose.material3.Checkbox +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.CheckboxProperties + +@Composable +fun CheckboxRenderer( + props: CheckboxProperties, + context: A2UIContext +) { + val checked = props.checked?.let { context.resolveBoolean(it) } ?: false + val label = props.label?.let { context.resolveString(it) } + + Row(verticalAlignment = Alignment.CenterVertically) { + Checkbox( + checked = checked, + onCheckedChange = { isChecked -> + props.onCheckedChange?.let { action -> + // In a real app we'd pass the new value in the context + context.onUserAction(action, mapOf("checked" to isChecked)) + } + } + ) + if (label != null) { + Text(text = label) + } + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DateTimeRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DateTimeRenderer.kt new file mode 100644 index 00000000..5d5f955a --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DateTimeRenderer.kt @@ -0,0 +1,78 @@ +package com.google.a2ui.compose.components + +import androidx.compose.material3.DatePicker +import androidx.compose.material3.DatePickerDialog +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.rememberDatePickerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.onFocusChanged +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.DateTimeInputProperties +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DateTimeRenderer( + props: DateTimeInputProperties, + context: A2UIContext +) { + val dateStr = props.value?.let { context.resolveString(it) } ?: "" + val label = props.label?.let { context.resolveString(it) } ?: "Select Date" + + var showDatePicker by remember { mutableStateOf(false) } + + // Convert ISO string to millis for DatePicker if needed, skipping complex parsing for MVP + // Assuming dateStr is displayable or we use simple parser + + OutlinedTextField( + value = dateStr, + onValueChange = { }, // Read-only, set via picker + label = { Text(label) }, + readOnly = true, + modifier = Modifier.onFocusChanged { focusState -> + if (focusState.isFocused) { + showDatePicker = true + } + } + ) + + if (showDatePicker) { + val datePickerState = rememberDatePickerState() + + DatePickerDialog( + onDismissRequest = { showDatePicker = false }, + confirmButton = { + TextButton( + onClick = { + showDatePicker = false + datePickerState.selectedDateMillis?.let { millis -> + val s = SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date(millis)) + props.onValueChange?.let { action -> + context.onUserAction(action, mapOf("value" to s)) + } + } + } + ) { + Text("OK") + } + }, + dismissButton = { + TextButton(onClick = { showDatePicker = false }) { + Text("Cancel") + } + } + ) { + DatePicker(state = datePickerState) + } + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ModalRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ModalRenderer.kt new file mode 100644 index 00000000..fd65f954 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ModalRenderer.kt @@ -0,0 +1,52 @@ +package com.google.a2ui.compose.components + +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import com.google.a2ui.compose.A2UIComponent +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.ModalProperties + +@Composable +fun ModalRenderer( + props: ModalProperties, + context: A2UIContext +) { + val isOpen = props.isOpen?.let { context.resolveBoolean(it) } ?: false + + if (isOpen) { + val title = props.title?.let { context.resolveString(it) } + + AlertDialog( + onDismissRequest = { + props.onDismiss?.let { action -> + context.onUserAction(action, emptyMap()) + } + }, + title = { + if (title != null) { + Text(title) + } + }, + text = { + props.content?.let { contentId -> + A2UIComponent(contentId, context) + } + }, + confirmButton = { + // A2UI spec might have generic actions list. + // For MVP, if actions exist, we just render close button or custom actions if implemented. + Button( + onClick = { + props.onDismiss?.let { action -> + context.onUserAction(action, emptyMap()) + } + } + ) { + Text("Close") + } + } + ) + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/SliderRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/SliderRenderer.kt new file mode 100644 index 00000000..d0d412f5 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/SliderRenderer.kt @@ -0,0 +1,27 @@ +package com.google.a2ui.compose.components + +import androidx.compose.material3.Slider +import androidx.compose.runtime.Composable +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.SliderProperties + +@Composable +fun SliderRenderer( + props: SliderProperties, + context: A2UIContext +) { + val value = props.value?.let { context.resolveNumber(it) }?.toFloat() ?: 0f + val min = props.min?.toFloat() ?: 0f + val max = props.max?.toFloat() ?: 1f + + Slider( + value = value, + onValueChange = { newValue -> + // Debouncing usually handled by state management, here we fire action + props.onValueChange?.let { action -> + context.onUserAction(action, mapOf("value" to newValue.toDouble())) + } + }, + valueRange = min..max + ) +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TabsRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TabsRenderer.kt new file mode 100644 index 00000000..1a9b5b85 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TabsRenderer.kt @@ -0,0 +1,43 @@ +package com.google.a2ui.compose.components + +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Tab +import androidx.compose.material3.TabRow +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import com.google.a2ui.compose.A2UIComponent +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.TabsProperties + +@Composable +fun TabsRenderer( + props: TabsProperties, + context: A2UIContext +) { + val selectedIndex = props.selectedIndex?.let { context.resolveNumber(it).toInt() } ?: 0 + val tabs = props.tabs ?: emptyList() + + Column { + TabRow(selectedTabIndex = selectedIndex) { + tabs.forEachIndexed { index, tabItem -> + val title = context.resolveString(tabItem.title) ?: "" + Tab( + selected = index == selectedIndex, + onClick = { + props.onTabSelected?.let { action -> + context.onUserAction(action, mapOf("index" to index.toDouble())) + } + }, + text = { Text(title) } + ) + } + } + + // Render content of selected tab + if (selectedIndex in tabs.indices) { + tabs[selectedIndex].child?.let { childId -> + A2UIComponent(childId, context) + } + } + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/VideoRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/VideoRenderer.kt new file mode 100644 index 00000000..97c87103 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/VideoRenderer.kt @@ -0,0 +1,32 @@ +package com.google.a2ui.compose.components + +import android.widget.VideoView +import android.widget.MediaController +import android.net.Uri +import androidx.compose.runtime.Composable +import androidx.compose.ui.viewinterop.AndroidView +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.VideoProperties + +@Composable +fun VideoRenderer( + props: VideoProperties, + context: A2UIContext +) { + val url = props.url?.let { context.resolveString(it) } + + if (url != null) { + AndroidView(factory = { ctx -> + VideoView(ctx).apply { + setVideoURI(Uri.parse(url)) + val mediaController = MediaController(ctx) + mediaController.setAnchorView(this) + setMediaController(mediaController) + + if (props.autoPlay == true) { + start() + } + } + }) + } +} diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt index 7cc9fe57..fea4869a 100644 --- a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt @@ -62,7 +62,80 @@ data class Action( ) @Serializable -data class ContextEntry( val key: String, val value: BoundValue ) + +@Serializable +data class CheckboxProperties( + val checked: BoundValue? = null, + val label: BoundValue? = null, + val onCheckedChange: Action? = null +) + +@Serializable +data class SliderProperties( + val value: BoundValue? = null, + val min: Double? = null, + val max: Double? = null, + val onValueChange: Action? = null +) + +@Serializable +data class SwitchProperties( + val checked: BoundValue? = null, + val label: BoundValue? = null, + val onCheckedChange: Action? = null +) + +@Serializable +data class CardProperties( + val child: String? = null, + // A2UI spec usually wraps a single child or children. Lit implementation uses 'child'. + // We can support padding/elevation here if extending core spec, but adhering to base for now. +) + +@Serializable +data class TabsProperties( + val tabs: List? = null, + val selectedIndex: BoundValue? = null, + val onTabSelected: Action? = null +) + +@Serializable +data class TabItem( + val title: BoundValue, + val child: String? = null // Reference to content component ID +) + +@Serializable +data class ModalProperties( + val title: BoundValue? = null, + val content: String? = null, // ID of content component + val isOpen: BoundValue? = null, + val onDismiss: Action? = null, + val actions: List? = null // IDs of action buttons +) + +@Serializable +data class DateTimeInputProperties( + val label: BoundValue? = null, + val value: BoundValue? = null, // ISO8601 string + val onValueChange: Action? = null +) + +// Simplified Media properties +@Serializable +data class VideoProperties( + val url: BoundValue? = null, + val autoPlay: Boolean? = false, + val controls: Boolean? = true +) + +@Serializable +data class AudioProperties( + val url: BoundValue? = null, + val autoPlay: Boolean? = false, + val controls: Boolean? = true +) + diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt index 98fa6625..18bc684a 100644 --- a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt @@ -52,7 +52,15 @@ data class ComponentWrapper( val Row: ContainerProperties? = null, val Box: ContainerProperties? = null, val Image: ImageProperties? = null, - val TextField: TextFieldProperties? = null + val TextField: TextFieldProperties? = null, + val Checkbox: CheckboxProperties? = null, + val Slider: SliderProperties? = null, + val Card: CardProperties? = null, + val Tabs: TabsProperties? = null, + val Modal: ModalProperties? = null, + val DateTimeInput: DateTimeInputProperties? = null, + val Video: VideoProperties? = null, + val Audio: AudioProperties? = null ) @Serializable diff --git a/samples/client/android/app/build.gradle.kts b/samples/client/android/app/build.gradle.kts index 9a1038c7..a6bdb34b 100644 --- a/samples/client/android/app/build.gradle.kts +++ b/samples/client/android/app/build.gradle.kts @@ -1,7 +1,7 @@ -plugins { alias(libs.plugins.android.application) alias(libs.plugins.jetbrains.kotlin.android) -} + kotlin("plugin.serialization") version "1.9.0" // Hardcoding version for simplicity or if not in catalog + android { namespace = "com.google.a2ui.sample" @@ -66,4 +66,7 @@ dependencies { androidTestImplementation(libs.androidx.ui.test.junit4) debugImplementation(libs.androidx.ui.tooling) debugImplementation(libs.androidx.ui.test.manifest) + debugImplementation(libs.androidx.ui.test.manifest) + implementation("com.squareup.okhttp3:okhttp:4.12.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") } diff --git a/samples/client/android/app/src/main/java/com/google/a2ui/sample/A2AClient.kt b/samples/client/android/app/src/main/java/com/google/a2ui/sample/A2AClient.kt new file mode 100644 index 00000000..83976e5c --- /dev/null +++ b/samples/client/android/app/src/main/java/com/google/a2ui/sample/A2AClient.kt @@ -0,0 +1,152 @@ +package com.google.a2ui.sample + +import com.google.a2ui.core.model.ServerMessage +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonObject +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.RequestBody.Companion.toRequestBody +import java.io.IOException +import java.util.UUID + +// --- A2A Protocol Data Models --- + +@Serializable +data class A2AClientMessage( + val message: ClientMessageEnvelope +) + +@Serializable +data class ClientMessageEnvelope( + val messageId: String, + val role: String = "user", + val parts: List, + val kind: String = "message" +) + +@Serializable +sealed class ClientPart { + @Serializable + @SerialName("text") + data class Text(val text: String) : ClientPart() + + @Serializable + @SerialName("data") + data class Data( + val data: JsonElement, + val metadata: Map = mapOf("mimeType" to "application/json+a2aui") + ) : ClientPart() +} + +// Response models from the A2A agent (Simplified for what we need) +@Serializable +data class A2AResponse( + val result: A2AResult? = null, + val error: A2AError? = null +) + +@Serializable +data class A2AResult( + val kind: String, // "task" + val status: A2ATaskStatus +) + +@Serializable +data class A2AError( + val message: String +) + +@Serializable +data class A2ATaskStatus( + val message: ServerMessageEnvelope? = null +) + +@Serializable +data class ServerMessageEnvelope( + val parts: List? = null +) + +@Serializable +sealed class ServerPart { + // We only care about data parts for A2UI updates + @Serializable + @SerialName("data") + data class Data(val data: ServerMessage) : ServerPart() // ServerMessage is from a2ui-core + + @Serializable + @SerialName("text") + data class Text(val text: String) : ServerPart() +} + + +class A2AClient( + private val agentUrl: String = "http://10.0.2.2:10003/a2a" // Default to local agent +) { + private val client = OkHttpClient() + private val json = Json { + ignoreUnknownKeys = true + classDiscriminator = "kind" // For sealed classes + } + + private val mediaType = "application/json; charset=utf-8".toMediaType() + + @Throws(IOException::class) + fun sendMessage(text: String): List { + val part = ClientPart.Text(text) + return sendInternal(part) + } + + @Throws(IOException::class) + fun sendEvent(eventData: JsonElement): List { + val part = ClientPart.Data(eventData) + return sendInternal(part) + } + + private fun sendInternal(part: ClientPart): List { + val envelope = A2AClientMessage( + message = ClientMessageEnvelope( + messageId = UUID.randomUUID().toString(), + parts = listOf(part) + ) + ) + + val requestBody = json.encodeToString(envelope).toRequestBody(mediaType) + + val request = Request.Builder() + .url(agentUrl) + .addHeader("X-A2A-Extensions", "https://a2ui.org/a2a-extension/a2ui/v0.8") // Crucial! + .post(requestBody) + .build() + + client.newCall(request).execute().use { response -> + if (!response.isSuccessful) throw IOException("Unexpected code $response") + + val responseBody = response.body?.string() ?: throw IOException("Empty response body") + + // The agent might return a direct error or a Task object + // We'll attempt to parse the Task object first + val a2aResponse = try { + json.decodeFromString(responseBody) + } catch (e: Exception) { + // If it fails, it might be a raw list or something entirely different + throw IOException("Failed to parse A2A response: ${e.message}. Response: $responseBody") + } + + if (a2aResponse.error != null) { + throw IOException("Agent Error: ${a2aResponse.error.message}") + } + + val parts = a2aResponse.result?.status?.message?.parts ?: emptyList() + + // Extract only the A2UI updates + return parts.mapNotNull { + if (it is ServerPart.Data) it.data else null + } + } + } +} diff --git a/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt b/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt index 1ec5cb52..01d0e942 100644 --- a/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt +++ b/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt @@ -1,30 +1,25 @@ package com.google.a2ui.sample import android.os.Bundle +import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue +import androidx.compose.material3.Text +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import com.google.a2ui.compose.A2UISurface -import com.google.a2ui.core.model.ComponentInstance -import com.google.a2ui.core.model.ComponentWrapper import com.google.a2ui.core.model.ServerMessage -import com.google.a2ui.core.model.TextProperties -import com.google.a2ui.core.model.BoundValue -import com.google.a2ui.core.model.ContainerProperties -import com.google.a2ui.core.model.Children import com.google.a2ui.core.state.SurfaceState -import kotlinx.serialization.json.Json +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -43,60 +38,48 @@ class MainActivity : ComponentActivity() { @Composable fun SampleA2UIScreen() { - // Manual state management for demo - // In real app, use ViewModel and observe StateFlow val surfaceState = remember { SurfaceState() } - var refreshTrigger by remember { mutableStateOf(0) } + var isLoading by remember { mutableStateOf(true) } + var errorMsg by remember { mutableStateOf(null) } + + // Initialize our native A2A Client + val a2aClient = remember { A2AClient() } LaunchedEffect(Unit) { - // Simulate loading data - val messages = listOf( - ServerMessage.SurfaceUpdate( - surfaceId = "main", - components = listOf( - ComponentInstance( - id = "root", - component = ComponentWrapper( - Column = ContainerProperties( - children = Children(explicitList = listOf("header", "content")) - ) - ) - ), - ComponentInstance( - id = "header", - component = ComponentWrapper( - Text = TextProperties( - text = BoundValue(literalString = "Welcome to A2UI Android"), - usageHint = "headlineLarge" - ) - ) - ), - ComponentInstance( - id = "content", - component = ComponentWrapper( - Text = TextProperties( - text = BoundValue(literalString = "This is rendered natively with Jetpack Compose!") - ) - ) - ) - ) - ), - ServerMessage.BeginRendering(surfaceId = "main", root = "root") - ) - - messages.forEach { msg -> - surfaceState.applyUpdate(msg) + withContext(Dispatchers.IO) { + try { + // Send an initial query to start the conversation + val messages = a2aClient.sendMessage("Find contact info for Sarah Lee") + + withContext(Dispatchers.Main) { + messages.forEach { surfaceState.applyUpdate(it) } + isLoading = false + } + } catch (e: Exception) { + e.printStackTrace() + withContext(Dispatchers.Main) { + errorMsg = "Error: ${e.message}. \nMake sure 'uv run .' is running in 'contact_lookup'!" + isLoading = false + } + } } - refreshTrigger++ } - // Force recomposition when trigger changes - key(refreshTrigger) { + if (isLoading) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } else if (errorMsg != null) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(text = errorMsg!!) + } + } else { A2UISurface( - surfaceId = "main", + surfaceId = "main", // Ensure this matches what the agent returns in BeginRendering state = surfaceState, - onUserAction = { action, src -> - println("Action: ${action.name} from $src") + onUserAction = { action, src -> + Log.d("A2UI", "Action: ${action.name} from $src") + // TODO: Handle user actions by calling a2aClient.sendEvent(action.parameters) } ) } diff --git a/samples/client/android/simple_server.py b/samples/client/android/simple_server.py new file mode 100644 index 00000000..28b0b0b2 --- /dev/null +++ b/samples/client/android/simple_server.py @@ -0,0 +1,121 @@ +import uvicorn +from starlette.applications import Starlette +from starlette.responses import JSONResponse +from starlette.routing import Route +from starlette.middleware import Middleware +from starlette.middleware.cors import CORSMiddleware + +# Define the A2UI response logic +async def a2ui_endpoint(request): + # This is the raw JSON structure the Android client expects + # It mimics what a full A2A agent would return in the 'data' part of a message + return JSONResponse([ + { + "surfaceId": "main", + "components": [ + { + "id": "root", + "component": { + "Column": { + "children": { + "explicitList": ["header", "image", "desc_card", "input_row", "button"] + }, + "crossAxisAlignment": "center" + } + } + }, + { + "id": "header", + "component": { + "Text": { + "text": {"literalString": "Hello from Simple Server!"}, + "usageHint": "headlineMedium" + } + } + }, + { + "id": "image", + "component": { + "Image": { + "url": {"literalString": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d7/Android_robot.svg/1745px-Android_robot.svg.png"}, + "height": {"literalString": "120"} + } + } + }, + { + "id": "desc_card", + "component": { + "Container": { + "children": { + "explicitList": ["desc_text"] + }, + "padding": { + "top": 16, "bottom": 16, "left": 16, "right": 16 + } + } + } + }, + { + "id": "desc_text", + "component": { + "Text": { + "text": {"literalString": "This UI is streamed dynamically from a Python server running on your machine. No app rebuilds required!"} + } + } + }, + { + "id": "input_row", + "component": { + "Row": { + "children": { + "explicitList": ["input_field"] + } + } + } + }, + { + "id": "input_field", + "component": { + "TextField": { + "label": {"literalString": "Enter your name"}, + "value": {"literalString": ""} + } + } + }, + { + "id": "button", + "component": { + "Button": { + "label": {"literalString": "Send to Server"}, + "action": { + "actionId": "submit", + "parameters": {} + } + } + } + } + ] + }, + { + "surfaceId": "main", + "root": "root" + } + ]) + +# CORS allows the Android emulator (which is 'technically' external) to hit localhost easily if needed, +# though usually 10.0.2.2 is used. Good practice anyway. +middleware = [ + Middleware(CORSMiddleware, allow_origins=['*'], allow_methods=['*'], allow_headers=['*']) +] + +routes = [ + Route('/a2ui', a2ui_endpoint), +] + +app = Starlette(debug=True, routes=routes, middleware=middleware) + +if __name__ == "__main__": + print("Starting Simple A2UI Server...") + print("Endpoint: http://0.0.0.0:8000/a2ui") + print("For Android Emulator, use: http://10.0.2.2:8000/a2ui") + uvicorn.run(app, host="0.0.0.0", port=8000) From 4c9c36739dba6675493d29760842fff83a1d8c8f Mon Sep 17 00:00:00 2001 From: Divyansh Saraswat Date: Mon, 29 Dec 2025 14:30:25 +0530 Subject: [PATCH 4/5] feat(android): Fix rendering, stability, and UI components Major improvements to the Android A2UI client to resolve blank screen issues and enhance UI rendering. Key Changes: - **Fix JSON-RPC**: Corrected method name to message/send and fixed serialization logic to handle polymorphic ServerPart correctly. - **Fix UI Rendering**: - Implemented IconRenderer with reflection to support all Material Icons dynamically. - Added DividerRenderer to support separator lines. - Integrated Coil for image loading and added localhost->10.0.2.2 URL rewriting for emulator. - **Stability**: - Increased OKHttp timeout to 90s. - Increased Gradle JVM heap size to 4GB to prevent OOM during build. - **Documentation**: - Updated Android client README with setup instructions. - Cleaned up build logs. --- .idea/.name | 1 + .idea/deploymentTargetSelector.xml | 13 + .idea/kotlinc.xml | 6 + .idea/migrations.xml | 10 + ANDROID_GUIDE.md | 75 -- .../android/a2ui-compose/build.gradle.kts | 7 +- .../com/google/a2ui/compose/A2UIContext.kt | 7 +- .../com/google/a2ui/compose/A2UISurface.kt | 3 +- .../google/a2ui/compose/ComponentRegistry.kt | 8 +- .../a2ui/compose/components/ButtonRenderer.kt | 9 +- .../compose/components/CheckboxRenderer.kt | 3 +- .../compose/components/DateTimeRenderer.kt | 3 +- .../compose/components/DividerRenderer.kt | 26 + .../a2ui/compose/components/IconRenderer.kt | 90 ++ .../a2ui/compose/components/ImageRenderer.kt | 16 +- .../a2ui/compose/components/ModalRenderer.kt | 5 +- .../a2ui/compose/components/SliderRenderer.kt | 3 +- .../a2ui/compose/components/TabsRenderer.kt | 3 +- .../compose/components/TextFieldRenderer.kt | 3 +- renderers/android/a2ui-core/build.gradle.kts | 8 + .../com/google/a2ui/core/model/Actions.kt | 3 +- .../com/google/a2ui/core/model/Component.kt | 14 + .../com/google/a2ui/core/model/Messages.kt | 4 +- renderers/android/gradle.properties | 2 + renderers/android/gradle/libs.versions.toml | 1 + renderers/android/settings.gradle.kts | 1 + samples/agent/adk/contact_lookup/README.md | 9 + .../agent/adk/contact_lookup/source_code.txt | Bin 0 -> 49958 bytes .../adk/contact_lookup/verify_routes_httpx.py | 76 ++ samples/client/android/.idea/.gitignore | 3 + samples/client/android/.idea/.name | 1 + samples/client/android/.idea/compiler.xml | 6 + .../.idea/deploymentTargetSelector.xml | 27 + samples/client/android/.idea/gradle.xml | 38 + .../inspectionProfiles/Project_Default.xml | 32 + samples/client/android/.idea/kotlinc.xml | 6 + samples/client/android/.idea/migrations.xml | 10 + samples/client/android/.idea/misc.xml | 10 + samples/client/android/.idea/other.xml | 1077 +++++++++++++++++ samples/client/android/.idea/vcs.xml | 6 + samples/client/android/README.md | 62 +- .../java/com/google/a2ui/sample/A2AClient.kt | 152 --- samples/client/android/gradle.properties | 2 + .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + samples/client/android/gradlew | 249 ++++ samples/client/android/gradlew.bat | 92 ++ .../android/projects/contact/.idea/.gitignore | 3 + .../android/projects/contact/.idea/gradle.xml | 12 + .../projects/contact/.idea/migrations.xml | 10 + .../android/projects/contact/.idea/misc.xml | 10 + .../android/projects/contact/.idea/other.xml | 1077 +++++++++++++++++ .../android/projects/contact/.idea/vcs.xml | 6 + .../contact}/build.gradle.kts | 7 +- .../contact/src/main/AndroidManifest.xml | 22 + .../java/com/google/a2ui/sample/A2AClient.kt | 214 ++++ .../com/google/a2ui/sample/MainActivity.kt | 33 +- .../projects/orchestrator/build.gradle.kts | 40 + .../orchestrator/src/main/AndroidManifest.xml | 9 + .../projects/restaurant/build.gradle.kts | 40 + .../restaurant/src/main/AndroidManifest.xml | 9 + samples/client/android/settings.gradle.kts | 9 +- samples/client/android/simple_server.py | 121 -- 63 files changed, 3416 insertions(+), 395 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/migrations.xml delete mode 100644 ANDROID_GUIDE.md create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DividerRenderer.kt create mode 100644 renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/IconRenderer.kt create mode 100644 renderers/android/gradle.properties create mode 100644 samples/agent/adk/contact_lookup/source_code.txt create mode 100644 samples/agent/adk/contact_lookup/verify_routes_httpx.py create mode 100644 samples/client/android/.idea/.gitignore create mode 100644 samples/client/android/.idea/.name create mode 100644 samples/client/android/.idea/compiler.xml create mode 100644 samples/client/android/.idea/deploymentTargetSelector.xml create mode 100644 samples/client/android/.idea/gradle.xml create mode 100644 samples/client/android/.idea/inspectionProfiles/Project_Default.xml create mode 100644 samples/client/android/.idea/kotlinc.xml create mode 100644 samples/client/android/.idea/migrations.xml create mode 100644 samples/client/android/.idea/misc.xml create mode 100644 samples/client/android/.idea/other.xml create mode 100644 samples/client/android/.idea/vcs.xml delete mode 100644 samples/client/android/app/src/main/java/com/google/a2ui/sample/A2AClient.kt create mode 100644 samples/client/android/gradle.properties create mode 100644 samples/client/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/client/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/client/android/gradlew create mode 100644 samples/client/android/gradlew.bat create mode 100644 samples/client/android/projects/contact/.idea/.gitignore create mode 100644 samples/client/android/projects/contact/.idea/gradle.xml create mode 100644 samples/client/android/projects/contact/.idea/migrations.xml create mode 100644 samples/client/android/projects/contact/.idea/misc.xml create mode 100644 samples/client/android/projects/contact/.idea/other.xml create mode 100644 samples/client/android/projects/contact/.idea/vcs.xml rename samples/client/android/{app => projects/contact}/build.gradle.kts (93%) create mode 100644 samples/client/android/projects/contact/src/main/AndroidManifest.xml create mode 100644 samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/A2AClient.kt rename samples/client/android/{app => projects/contact}/src/main/java/com/google/a2ui/sample/MainActivity.kt (64%) create mode 100644 samples/client/android/projects/orchestrator/build.gradle.kts create mode 100644 samples/client/android/projects/orchestrator/src/main/AndroidManifest.xml create mode 100644 samples/client/android/projects/restaurant/build.gradle.kts create mode 100644 samples/client/android/projects/restaurant/src/main/AndroidManifest.xml delete mode 100644 samples/client/android/simple_server.py diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..f1e58f5a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +A2UI-Android-Sample \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 00000000..16d7cce6 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..fe63bb67 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 00000000..0651eeb9 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/ANDROID_GUIDE.md b/ANDROID_GUIDE.md deleted file mode 100644 index 2a9fdd31..00000000 --- a/ANDROID_GUIDE.md +++ /dev/null @@ -1,75 +0,0 @@ -# A2UI Android Integration Guide (Native A2A) - -This guide explains how to connect the A2UI Android client **directly** to the Contact Lookup Agent servers using a native Kotlin A2A client implementation. - -## 1. Prerequisites - -- **Android Studio** installed. -- **UV** installed (for running the Python server). -- **A2A Contact Lookup Agent** code available in `samples/agent/adk/contact_lookup`. - -## 2. Server Setup - -First, run the real Contact Lookup Agent. This agent hosts the `A2A` protocol endpoint that our Android client will talk to. - -1. Open your terminal. -2. Navigate to the contact lookup sample directory: - ```bash - cd samples/agent/adk/contact_lookup - ``` -3. Create/Update `.env` file with your **Google GenAI API Key**: - ```bash - echo "GEMINI_API_KEY=your_actual_key_here" > .env - ``` -4. Run the agent: - ```bash - uv run . - ``` -5. Expected output: `INFO: Uvicorn running on http://localhost:10003` - -## 3. Android Client Setup - -We have implemented a native `A2AClient` in Kotlin to handle the handshake and communication. - -### Step 3.1: Verify Dependencies -Ensure `app/build.gradle.kts` has the following (we added them for you): -```kotlin -plugins { - // ... - kotlin("plugin.serialization") version "1.9.0" -} - -dependencies { - implementation("com.squareup.okhttp3:okhttp:4.12.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") -} -``` - -### Step 3.2: Verify Permissions -Ensure `app/src/main/AndroidManifest.xml` has: -```xml - -``` - -### Step 3.3: Run the App -1. Open the project in Android Studio (`samples/client/android`). -2. Sync Gradle if requested. -3. Click **Run** (Green Play Button). -4. Use an **Android Emulator** (the code uses `10.0.2.2` to access the host's localhost). - -## 4. How It Works - -1. **A2AClient.kt**: Can be found in `com.google.a2ui.sample`. It constructs valid A2A messages with UUIDs and the required `client_message` wrapper. -2. **Handshake**: It sets the `X-A2A-Extensions` header to `https://a2ui.org/a2a-extension/a2ui/v0.8`. -3. **MainActivity.kt**: Sends an initial "Find contact info for Sarah Lee" query on startup. -4. **Rendering**: The server responds with streaming components (Text, Layouts), which `A2UISurface` renders natively. - -**Feature Parity**: -With the latest updates, the Android renderer now shares the same core feature set as the **Web (Lit)** and **Angular** renderers. All three support: -- Basic Inputs (Text, Buttons, TextFields) -- Selection Controls (Checkbox, Slider, Switch) -- Layouts (Column, Row) -- Containers (Card, Tabs, Modal) -- Media (Image, Video) - -You can confidently switch between renderers and expect the same A2UI capability. diff --git a/renderers/android/a2ui-compose/build.gradle.kts b/renderers/android/a2ui-compose/build.gradle.kts index cbdd9694..3078ba88 100644 --- a/renderers/android/a2ui-compose/build.gradle.kts +++ b/renderers/android/a2ui-compose/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.jetbrains.kotlin.android) + alias(libs.plugins.kotlin.serialization) } android { @@ -31,7 +32,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" + kotlinCompilerExtensionVersion = "1.5.11" } } @@ -46,6 +47,10 @@ dependencies { implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) + implementation(libs.androidx.compose.material.icons.extended) + implementation(libs.kotlinx.serialization.json) + implementation("io.coil-kt:coil-compose:2.6.0") + implementation(kotlin("reflect")) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIContext.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIContext.kt index b68322af..e5ab158c 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIContext.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UIContext.kt @@ -3,10 +3,11 @@ package com.google.a2ui.compose import com.google.a2ui.core.model.Action import com.google.a2ui.core.model.BoundValue import com.google.a2ui.core.state.SurfaceState +import kotlinx.serialization.json.JsonElement data class A2UIContext( val state: SurfaceState, - val onUserAction: (Action, String) -> Unit // action, sourceId + val onUserAction: (Action, String, Map) -> Unit // action, sourceId, context ) { fun resolve(boundValue: BoundValue?): Any? { return state.resolve(boundValue) @@ -19,4 +20,8 @@ data class A2UIContext( fun resolveBoolean(boundValue: BoundValue?): Boolean { return resolve(boundValue) as? Boolean ?: false } + + fun resolveNumber(boundValue: BoundValue?): Double { + return (resolve(boundValue) as? Number)?.toDouble() ?: 0.0 + } } diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UISurface.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UISurface.kt index 11273c17..7e07974f 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UISurface.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/A2UISurface.kt @@ -5,6 +5,7 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.staticCompositionLocalOf import com.google.a2ui.core.model.Action import com.google.a2ui.core.state.SurfaceState +import kotlinx.serialization.json.JsonElement val LocalA2UIContext = staticCompositionLocalOf { error("No A2UIContext provided") @@ -14,7 +15,7 @@ val LocalA2UIContext = staticCompositionLocalOf { fun A2UISurface( surfaceId: String, state: SurfaceState, - onUserAction: (Action, String) -> Unit + onUserAction: (Action, String, Map) -> Unit ) { val context = A2UIContext( state = state, diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt index 696c4a09..d3e7dfab 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/ComponentRegistry.kt @@ -14,6 +14,8 @@ import com.google.a2ui.compose.components.TabsRenderer import com.google.a2ui.compose.components.TextFieldRenderer import com.google.a2ui.compose.components.TextRenderer import com.google.a2ui.compose.components.VideoRenderer +import com.google.a2ui.compose.components.IconRenderer +import com.google.a2ui.compose.components.DividerRenderer import com.google.a2ui.core.model.ComponentWrapper typealias ComponentRenderer = @Composable (ComponentWrapper, A2UIContext) -> Unit @@ -38,6 +40,8 @@ object ComponentRegistry { register("Modal") { wrapper, ctx -> ModalRenderer(wrapper.Modal!!, ctx) } register("DateTimeInput") { wrapper, ctx -> DateTimeRenderer(wrapper.DateTimeInput!!, ctx) } register("Video") { wrapper, ctx -> VideoRenderer(wrapper.Video!!, ctx) } + register("Icon") { wrapper, ctx -> IconRenderer.Render(wrapper, ctx) } + register("Divider") { wrapper, ctx -> DividerRenderer(wrapper.Divider!!, ctx) } } fun register(type: String, renderer: ComponentRenderer) { @@ -68,7 +72,9 @@ object ComponentRegistry { wrapper.Modal != null -> "Modal" wrapper.DateTimeInput != null -> "DateTimeInput" wrapper.Video != null -> "Video" - wrapper.Audio != null -> "Audio" // Audio maps to Video/Media renderer usually or separate + wrapper.Audio != null -> "Audio" + wrapper.Icon != null -> "Icon" + wrapper.Divider != null -> "Divider" else -> null } } diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ButtonRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ButtonRenderer.kt index e825869a..9261ba4d 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ButtonRenderer.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ButtonRenderer.kt @@ -27,15 +27,18 @@ fun ButtonRenderer( // To fix this properly, I should pass the ID to the renderer. // But let's stick to current plan and fix registry separately. // I'll emit "unknown" for now and fix later. - context.onUserAction(action, "unknown_source_id") + context.onUserAction(action, "unknown_source_id", emptyMap()) } + Unit } Button(onClick = onClick) { if (properties.label != null) { Text(text = context.resolveString(properties.label)) - } else if (properties.child != null) { - A2UIComponent(id = properties.child, context = context) + } else { + properties.child?.let { childId -> + A2UIComponent(id = childId, context = context) + } } } } diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CheckboxRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CheckboxRenderer.kt index 36d60c03..55ba0f11 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CheckboxRenderer.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/CheckboxRenderer.kt @@ -7,6 +7,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import com.google.a2ui.compose.A2UIContext import com.google.a2ui.core.model.CheckboxProperties +import kotlinx.serialization.json.JsonPrimitive @Composable fun CheckboxRenderer( @@ -22,7 +23,7 @@ fun CheckboxRenderer( onCheckedChange = { isChecked -> props.onCheckedChange?.let { action -> // In a real app we'd pass the new value in the context - context.onUserAction(action, mapOf("checked" to isChecked)) + context.onUserAction(action, "unknown_source_id", mapOf("checked" to JsonPrimitive(isChecked))) } } ) diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DateTimeRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DateTimeRenderer.kt index 5d5f955a..9e047800 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DateTimeRenderer.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DateTimeRenderer.kt @@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.focus.onFocusChanged import com.google.a2ui.compose.A2UIContext import com.google.a2ui.core.model.DateTimeInputProperties +import kotlinx.serialization.json.JsonPrimitive import java.text.SimpleDateFormat import java.util.Date import java.util.Locale @@ -58,7 +59,7 @@ fun DateTimeRenderer( datePickerState.selectedDateMillis?.let { millis -> val s = SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date(millis)) props.onValueChange?.let { action -> - context.onUserAction(action, mapOf("value" to s)) + context.onUserAction(action, "unknown_source_id", mapOf("value" to JsonPrimitive(s))) } } } diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DividerRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DividerRenderer.kt new file mode 100644 index 00000000..4c565143 --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/DividerRenderer.kt @@ -0,0 +1,26 @@ +package com.google.a2ui.compose.components + +import androidx.compose.material3.HorizontalDivider +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.DividerProperties + +@Composable +fun DividerRenderer( + properties: DividerProperties, + context: A2UIContext +) { + // Default thickness 1.dp if not specified + val thickness = properties.thickness?.let { it.dp } ?: 1.dp + + // Parse color if present (skipping for this simple MVP, defaulting to onSurfaceVariant) + + HorizontalDivider( + thickness = thickness, + modifier = Modifier, + color = Color.Unspecified // Uses Material theme default + ) +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/IconRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/IconRenderer.kt new file mode 100644 index 00000000..18b0628a --- /dev/null +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/IconRenderer.kt @@ -0,0 +1,90 @@ +package com.google.a2ui.compose.components + +import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Call +import androidx.compose.material.icons.filled.DateRange +import androidx.compose.material.icons.filled.Email +import androidx.compose.material.icons.filled.LocationOn +import androidx.compose.material.icons.filled.Person +import androidx.compose.material.icons.filled.Warning +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import com.google.a2ui.compose.A2UIContext +import com.google.a2ui.core.model.ComponentWrapper +import com.google.a2ui.core.model.IconProperties +import kotlin.reflect.KProperty1 +import java.util.Locale + +object IconRenderer { + private val iconCache = mutableMapOf() + + @Composable + fun Render( + wrapper: ComponentWrapper, + context: A2UIContext, + modifier: Modifier = Modifier + ) { + val props = wrapper.Icon ?: return + val rawName = context.resolveString(props.name) ?: "warning" + + // Normalize name: snake_case to CamelCase if needed, matching Material naming + // e.g. "calendar_today" -> "CalendarToday" + // The agent sends "calendarToday" (camelCase). + // Material properties are "CalendarToday" (PascalCase). + + val iconName = rawName.replaceFirstChar { it.uppercase() } + + val iconVector = iconCache.getOrPut(iconName) { + findIconByName(iconName) ?: Icons.Default.Warning + } + + Icon( + imageVector = iconVector, + contentDescription = null, + tint = LocalContentColor.current, + modifier = modifier + ) + } + + private fun findIconByName(name: String): ImageVector? { + // Aliases for common mismatches + val normalizedName = when (name.lowercase(Locale.ROOT)) { + "mail" -> "Email" + "calendar" -> "DateRange" + "calendartoday" -> "CalendarToday" // Explicitly ensure Extended naming + else -> name.replaceFirstChar { it.uppercase() } + } + + // 1. Try accessing as member of Icons.Filled (Core icons) + try { + val kClass = Icons.Filled::class + val property = kClass.members.firstOrNull { it.name.equals(normalizedName, ignoreCase = true) } + if (property != null) { + @Suppress("UNCHECKED_CAST") + return (property as? KProperty1)?.get(Icons.Filled) as? ImageVector + } + } catch (e: Exception) { + // Ignore, try next method + } + + // 2. Try accessing as Extension Property (Extended icons) + // These are compiled into classes named after the icon, e.g. androidx.compose.material.icons.filled.AccountBoxKt + // The accessor method is usually "getAccountBox(Icons.Filled)" + try { + // Construct class name: androidx.compose.material.icons.filled.NameKt + // Note: Case sensitivity matters for class loading. We try strict matching first. + val className = "androidx.compose.material.icons.filled.${normalizedName}Kt" + val clazz = Class.forName(className) + val method = clazz.getMethod("get$normalizedName", androidx.compose.material.icons.Icons.Filled::class.java) + return method.invoke(null, androidx.compose.material.icons.Icons.Filled) as? ImageVector + } catch (e: Exception) { + android.util.Log.w("IconRenderer", "Failed to find icon $normalizedName via reflection: ${e.message}") + } + + return null + } +} diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ImageRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ImageRenderer.kt index a7b9bef6..86b82f6d 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ImageRenderer.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ImageRenderer.kt @@ -10,9 +10,15 @@ fun ImageRenderer( properties: ImageProperties, context: A2UIContext ) { - val url = context.resolveString(properties.url) - // AsyncImage from Coil is standard, but keeping dependencies minimal for this implementation task. - // For MVP without network permission config, just showing text placeholder. - // In real app, add Coil dependency. - Text("Image: $url") + val rawUrl = context.resolveString(properties.url) + val url = rawUrl?.replace("localhost", "10.0.2.2") + + if (url != null) { + coil.compose.AsyncImage( + model = url, + contentDescription = context.resolveString(properties.altText), + modifier = androidx.compose.ui.Modifier, + contentScale = androidx.compose.ui.layout.ContentScale.Crop + ) + } } diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ModalRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ModalRenderer.kt index fd65f954..39bc566f 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ModalRenderer.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/ModalRenderer.kt @@ -7,6 +7,7 @@ import androidx.compose.runtime.Composable import com.google.a2ui.compose.A2UIComponent import com.google.a2ui.compose.A2UIContext import com.google.a2ui.core.model.ModalProperties +import kotlinx.serialization.json.JsonElement @Composable fun ModalRenderer( @@ -21,7 +22,7 @@ fun ModalRenderer( AlertDialog( onDismissRequest = { props.onDismiss?.let { action -> - context.onUserAction(action, emptyMap()) + context.onUserAction(action, "unknown_source_id", emptyMap()) } }, title = { @@ -40,7 +41,7 @@ fun ModalRenderer( Button( onClick = { props.onDismiss?.let { action -> - context.onUserAction(action, emptyMap()) + context.onUserAction(action, "unknown_source_id", emptyMap()) } } ) { diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/SliderRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/SliderRenderer.kt index d0d412f5..41b0bdbe 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/SliderRenderer.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/SliderRenderer.kt @@ -4,6 +4,7 @@ import androidx.compose.material3.Slider import androidx.compose.runtime.Composable import com.google.a2ui.compose.A2UIContext import com.google.a2ui.core.model.SliderProperties +import kotlinx.serialization.json.JsonPrimitive @Composable fun SliderRenderer( @@ -19,7 +20,7 @@ fun SliderRenderer( onValueChange = { newValue -> // Debouncing usually handled by state management, here we fire action props.onValueChange?.let { action -> - context.onUserAction(action, mapOf("value" to newValue.toDouble())) + context.onUserAction(action, "unknown_source_id", mapOf("value" to JsonPrimitive(newValue.toDouble()))) } }, valueRange = min..max diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TabsRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TabsRenderer.kt index 1a9b5b85..6b9c96b8 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TabsRenderer.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TabsRenderer.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable import com.google.a2ui.compose.A2UIComponent import com.google.a2ui.compose.A2UIContext import com.google.a2ui.core.model.TabsProperties +import kotlinx.serialization.json.JsonPrimitive @Composable fun TabsRenderer( @@ -25,7 +26,7 @@ fun TabsRenderer( selected = index == selectedIndex, onClick = { props.onTabSelected?.let { action -> - context.onUserAction(action, mapOf("index" to index.toDouble())) + context.onUserAction(action, "unknown_source_id", mapOf("index" to JsonPrimitive(index.toDouble()))) } }, text = { Text(title) } diff --git a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextFieldRenderer.kt b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextFieldRenderer.kt index 1dc8f7b6..e990b30b 100644 --- a/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextFieldRenderer.kt +++ b/renderers/android/a2ui-compose/src/main/kotlin/com/google/a2ui/compose/components/TextFieldRenderer.kt @@ -5,6 +5,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import com.google.a2ui.compose.A2UIContext import com.google.a2ui.core.model.TextFieldProperties +import kotlinx.serialization.json.JsonPrimitive @Composable fun TextFieldRenderer( @@ -19,7 +20,7 @@ fun TextFieldRenderer( onValueChange = { newValue -> properties.onValueChange?.let { action -> // Ideally pass newValue in action context - context.onUserAction(action, "textfield_needs_id") + context.onUserAction(action, "textfield_needs_id", mapOf("value" to JsonPrimitive(newValue))) } }, label = { Text(label) } diff --git a/renderers/android/a2ui-core/build.gradle.kts b/renderers/android/a2ui-core/build.gradle.kts index 528139a8..f8756907 100644 --- a/renderers/android/a2ui-core/build.gradle.kts +++ b/renderers/android/a2ui-core/build.gradle.kts @@ -1,8 +1,16 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { alias(libs.plugins.jetbrains.kotlin.jvm) alias(libs.plugins.kotlin.serialization) } +tasks.withType().configureEach { + kotlinOptions { + jvmTarget = "1.8" + } +} + java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Actions.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Actions.kt index 1a7b615e..53b3e83b 100644 --- a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Actions.kt +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Actions.kt @@ -2,6 +2,7 @@ package com.google.a2ui.core.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonElement @Serializable sealed class ClientMessage { @@ -12,7 +13,7 @@ sealed class ClientMessage { val surfaceId: String, val sourceComponentId: String, val timestamp: String, - val context: Map + val context: Map ) : ClientMessage() @Serializable diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt index fea4869a..64375368 100644 --- a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Component.kt @@ -62,6 +62,7 @@ data class Action( ) @Serializable +data class ContextEntry( val key: String, val value: BoundValue ) @@ -139,3 +140,16 @@ data class AudioProperties( val controls: Boolean? = true ) +@Serializable +data class IconProperties( + val name: BoundValue? = null, + val size: Double? = null, + val color: String? = null +) + +@Serializable +data class DividerProperties( + val thickness: Double? = null, + val color: String? = null +) + diff --git a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt index 18bc684a..abb800cf 100644 --- a/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt +++ b/renderers/android/a2ui-core/src/main/kotlin/com/google/a2ui/core/model/Messages.kt @@ -60,7 +60,9 @@ data class ComponentWrapper( val Modal: ModalProperties? = null, val DateTimeInput: DateTimeInputProperties? = null, val Video: VideoProperties? = null, - val Audio: AudioProperties? = null + val Audio: AudioProperties? = null, + val Icon: IconProperties? = null, + val Divider: DividerProperties? = null ) @Serializable diff --git a/renderers/android/gradle.properties b/renderers/android/gradle.properties new file mode 100644 index 00000000..e892c3bc --- /dev/null +++ b/renderers/android/gradle.properties @@ -0,0 +1,2 @@ +android.useAndroidX=true +org.gradle.jvmargs=-Xmx4g diff --git a/renderers/android/gradle/libs.versions.toml b/renderers/android/gradle/libs.versions.toml index 258841ee..9bf74db3 100644 --- a/renderers/android/gradle/libs.versions.toml +++ b/renderers/android/gradle/libs.versions.toml @@ -25,6 +25,7 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } [plugins] diff --git a/renderers/android/settings.gradle.kts b/renderers/android/settings.gradle.kts index 91a6050c..5812000b 100644 --- a/renderers/android/settings.gradle.kts +++ b/renderers/android/settings.gradle.kts @@ -17,6 +17,7 @@ dependencyResolutionManagement { google() mavenCentral() } + } rootProject.name = "A2UI-Android-Renderer" diff --git a/samples/agent/adk/contact_lookup/README.md b/samples/agent/adk/contact_lookup/README.md index 976d6200..ce6e2170 100644 --- a/samples/agent/adk/contact_lookup/README.md +++ b/samples/agent/adk/contact_lookup/README.md @@ -28,6 +28,15 @@ This sample uses the Agent Development Kit (ADK) along with the A2A protocol to uv run . ``` +## Using with Android Client + +This agent supports the Android A2UI Client sample. + +1. Ensure this agent is running (serving at `http://localhost:10003`). +2. Open the Android project in `samples/client/android`. +3. Run the **Contact** sample app on an emulator. +4. The app will automatically connect to this agent and display the UI. + ## Disclaimer diff --git a/samples/agent/adk/contact_lookup/source_code.txt b/samples/agent/adk/contact_lookup/source_code.txt new file mode 100644 index 0000000000000000000000000000000000000000..5f8a312c99925fbbac32e5e6d8e19d77ad214fe4 GIT binary patch literal 49958 zcmeI5eQzDdb;kGa0{sqz1cP*1(XkQ~XbKi#B-&PESt=>VDFox{jkZL2?Ck&k&(q<%;l=QLI2q1{t>Lk~``+Fi z4}Z4*&xWVNqv7v|zq4b0)_)GC>AdkT&+PlJ?e)}J`MPoCnf3F~dO5asIeweYp`EYn zm*>{YmVN)oe%Y$}+#h~3+!+4x{P$C%&RaUOYmV*HH+J=t)LOK}Xr9^Y*xEa@_88mg zushkq>F~|0;28hm(R-#)S4n2)Coj{Gjs^E92K(H$7A@bRS4-oxR#UBT#I zCVuVO@idLHruTE}Q)j^m?;l znAds?JBb5Z_C2pphI{t9Ycp^#{NCOj8268C4(`}-mF8rBxM|-W+KezRUH7$(_{`2Y zvEv_%U&q$Jb75ug(UFoSzxw^uM#!Of6qDvFr}gJ9xxqbiCY$$dDJ#|~>^1`=YciYC^otX~0T^MWp!G)whu`{1sjHpMix2cg` zE~RR<*Z-}=do&GO_RMr!ma&`%&ii9J150|>-eL8>v-wzdMM=ZdHPRbzA03@L(=}|} zv!LcQ`ExAgaV2x2!rLw>FS#;4bGp?}O}?;-nw86%>)S@Z{JKl{M<(YlZN8pNau2J? z?_7IouZJf2$6eXi6-UFDZA|kKN-m#^niZFfmxf(V%|@Kq7++X#ZYO$@ z02VkkuD?i91xmyM+_6u`NmJBDEvZvJ5F7K<^bz0V9uV1alrwLWKen0w%p?sYwQuu! z)82hy-+gMYm7%K7jIuB6|H?FZ-_HA_(g1w?M+t3wnp$y9SQ+{_v=&Mo2&BMO^t5k? zZQOsmr@PkT!SK7utCmo`gon(6Bfc^B#u{|Xr29qk{@>aBInvLy2_LRMVR?Gk8usi@ z-?)D4CfzzSzB%USyd4|w%GyPXj?;S|18w4;wv6jjSol{3@(T3ym9^$F0=}-j_DAQx z?%RytnrHz_05#sqNgDrIlH^_cj^FB556mYxe~yyPIZ2+{b%7Wwc`SHFB=J{7t|8gV>}9>ZE!<*?()%Kiv!t> z`zUSJdhO;mc-(UMzS@^=B~OxHy}VzSinD~+>e&##R>Loc4~Jivq+&b%-Dc;&@HW=Y ztCdX)Ucq!~TGXPQi`LyO>3 zG^EtdQtSMxeQV9*SV45Jgr^U z-{#u8y!~7cFHeh?_5XIYSu|aqR;$HaF1E~nMwTz|T&elG^7UxJez;x9t(MxpYBuPu z>E?6u!bD~GXY|rDhh+MmrEkF{c|8A>{la%xFV9+mLgJh)%Wh!vK%nF&w}wC2H~9Ij z)E=0Y=z;%_?Htb%U?phfduyE>>DX%S7PdDZ#l6(NBaA=UmDt&6=}~IevvAm6M@Ymx z^ancD*oo=CvG4fLd)hd**AuhN{_U~N9WC(rYa74k95`dkF#jw2Pi_a)^TOUi(MiHM zC-!OSh?b$EDQ_UYj4{sK6*XF!J74~Ej6deCEK$YW*;7bi?mBwOt=HW78qenVpzc9< z;c?O`Fz}WkjoKqBC+oWSXOp5GLmYXw_WjDcUm1Aqo7CY;&r-XR=W+X67x)utN57pC za_*99<%hQta`IRNeSDF$5;;bnBj>f7D7Z30L}(K62k{B={?xAG{f_ks#`(&kzv$yv z_P&<7daROXUB7Fsxh^YS(kF3SSNu9r|J?pF9xPaH1w|>kyt0wCZ~}TAl)rD(UK{?^ z{y#F#VIA8x+h+&q1Ba3sW8U2c`YgFcmHpuycnybxH?lI*l;v}vG3!Ws>V4~i_c`x& zlNIZYd^3J(HX=T4aS+dbvKId&-)bM*?D6lG%>^>2Gae_dk2(6f{Cbi&<{t8u$&C6J zpE&0FMeZ3-RIVrd#;C(XA%8^jzT#F(y)?YkSb5$@7j4MH9;McL>lnx&ywerpR?A)> zyAc)Ue9JZH*ET-#T+AexVZ25tX_T%7-60d$1Li9F!zz>%gyzkUv!|26d${q?{^r}; zGTDkX)0X|Nsjc}{%f(F_E!mcrCI!B3F)t-cWNBK4od4<(%Tnj3!m>-7mh@PU^#AL8 z%K~WpI_{g~d~F)imPws8mi~L^*c4p_pDI_rMEaP&N4DPRtMQJRbFEdcXqY_29EJM} zH3fRH2U>F@p1}Vi=}4I4WDq*mC--$+0fzRgIkQExXr~{yh2N!im3<3Mm31q5+m0aI z*0%bSufZafh|H1RvK9QD!LzfXUdI@#xAw#Em*%L0U!KW_J5e{XYdrIH1I7xn+p$bl zoe`{UgJ{rEBXvrS(j4Ylo6oIX{8f%oYu>7j_Gr~pjQaktova{pwLN@kJSHnvw<`S8 znxC>Q@YKU|zj~Urh~LIL?Tp$kuV~W^J<^jU{-Rvp)~Iz9kM@!;hNIn{3ZYxlpKY+1~U)-%ZeF`}I{sz%x~q<-I@;H6)M z{P33}w1_OJv)DIFHO@=+5t^cxHcoS!u{D(afIM0~u~sK4HKx4Q0?ab@2x|M9VJ1dV zYtU(mxIi#OIG$^9>qsV}i~*f4&L!@9YIN3?n7jyc3>eeT2`9TJ+ZQM>$HnmN1*gN|7l!EiC7bopWSX@cna+iko5Sb8B+d zsJoqw<67d%H5;2}hR7u`8sKPXGk#3`_Ve@JS~V@Vv!1YlZ9Rhv zbF1!oPa5@qTZ_8(DABrf{e7ynvg+i}=nC{cbq#p3Ux_nyCA440iv3jk}GakWvG>WH_`v;0RGACCm3kge#xUl=!~}V5vwOzqBzUFgb?f02*?GI{qYEe z_j&7%MDuT)u2yCbO0L=;nfpIji_m=6czihgeE8?I(wes;x=#}y$OpE5b-#gJtjuG3 zmfcafdyT1jKeZk?_|jw1M#+)f!%m?w$J-%~@J)2g(YG~Vf2pj(*Ez=3r}o%Ol)o}P z%QHrdU`cGgNx#nL)w#rZr6Ybm?^AWz_f3BHFSr0jR9}9X&_?U~_30UNU6Qbr!j@!7 zLR!?5i^AJz&8E%gsWG;C`?4wB>q-RZ=%}+s!)??(M#7r6 z{d0@era)&+>F2!^jbIz4zmi;En^e`_qr^+rE=6^;xNWu@ybmHo8_4GRc=3zv9E0fU z*(K3dS}dPckNq4!)mWOlN00%F1d5_J#X*G z;`y4P$2MimD5CY;Xk^W%YB~%wJe7& zw!P__;K|(R#j%=JGA6RuoA3omglE_`tm4yDlMy~?jxKCHb4=gzz*vSp$Cr9-X}+J& z+RRJ)W6bpV+*XcV@1k$_^11g9+mAKkOsyHrjjgu#=q>SNtWY_hs1*=4;2i9R+fjZI zE(kiP4Pu>~Be4UvsvKdPdy%85?Y7tLU_t12)5@qmZXl0?W}#>8I<0nYrlxhMQgQ?Az=1#|WR8J$+#P&&j8#tZ~A0 zEg62M?&k%o zF66WRrQhn9&uw~_owsgZ(=)VZ+EHTX(2cRIwfmjZJ6g=Wah)lV1ozMJh^h2=H*9|K zy*G;XOAJ1}sw=y|IOpSbr*g@eNPRB(*jul)bNho;^A#J``*gpOukPh5FKv034Z?cX zvPyL@`2~+JJipM&HE?b8%oU~H9b8c5ZFoc)-{zx>oI|uxt{}BNx#Nc$X$;N{d84C| z_s!`m+YTIq9}@+!#ulS=6q8dfjrTjY96jMRbKc-L@so~=kWk0yvu7GOL)ADuIEu_J)$<66EA{aNQEePaKTwe9w7-25@oC~J~+?B z*T21q8kd}&QXZV1=u`56-ugXm;IKeGJ&CFFH=1ejO2=s=9NY};b~~beYknS@Jk8qx z^^CsnHLXC~QtP^)3;Qn%gk)o;1+IeNy){+kGb;tf%daA3+$Ylv1YRlO6g=*h@*j&3g zuZV6ulRUn2zu#BPf^#r<@r7yXp+$ne=Sqto?UvOJ60>Xbzaj^;_FcoVb~6-b2$CqQ`%*KgR{RE>HEw z9Sg+3ZAsARU0>#DS8FXTxCK zZ6MAvHekm>aCoMQU@K|c+56e2dfIr9kWAao7YSaV#V2Q)3(`g=e-*usL8J^KB5tkEeVlkdis#4c2k9q<)3keyS8w+!m))>R`0E^N{0tJkbe zo|*m-Cp*Vzv*d)=l-BjOthBohplx-PEn|>|K$#Fq&5wNU+cvVEQ*lXo`=}fU6ysR9 z$5~<*lcFHzB6Hpi}~1)7HTo3_$A6)`I&LFts0Hi-2GHMw%@VS#tOM)lxTs< zWAXAZ$!*|V&O{cY=DN3Mk1DTQJU+B}1Z|-geTz(F=69;Gc8-?%I(x1kPtGGYJSR2l ztT>_zElERykSkxkdTBC6^+M>AdmO)uk}9iyEs1+mESq??RQ|9~st|D8nb(1~wRIZN zFru)x9$mV>7fNZ(0_fUpBw3IA%+}e|l}zn1BimfI_|Om<^9+AW3S&3SsT{gmbhOaU zYp6Hup(=ToBBhd^oMUP=$3R5uAetRQgPi)B&EtEP7 zCSXQBF#ZzDd~h*;XzBM!OP0~=9PZIbtjQcoLPA^gOM8Bna7$ck_0PQeDD(A(C9N)% zf?n_Q`lG9vaqu4ZRKO?v{wte-=XUgcLx_LI(N7)qcV*!ZMpn#)$fL zGP>KNEUc_8vB`TjI*%yzZQp`jwQD{!tGs2qKO(VMX-D+2w$`$yZd1HQQZ`yPv(_)S zrr2gY8TmIPs881tPbp4n4X}>--1-Pr_*zaW8|7UkAwkZ89pkxs_dcyTMymPfs6J#6 zyYINFkJ&V~QV#N-yk+Epm>RzNDyYXs^;r6|S!(oBiRY?!)@Ql(QJ#J8A}{UhH16TZ z`YJ&wYziqK-Bd%k0bFk`60Z6xNa)tFKG%755f{qR-6ksV+9ZVyV{jIlPYl zA*!Gvnpq*jZu_D3EWPtUt-I~tc_7*J-Z6CJRuS)jX=Ocg&G>QopI;>Z6V-yAZED>= z5V7>1(zsuk1=gxqiEJW2@WgBfUdnN--^rh6jENxqnLtxBKqVK{f3NE+ zcN4Prz0B%0rM``tqJR}Ka+c)YT6ae~g}JxE$MyVN$;CX=GiUqQAFrSP^IG<{&Gb0& z(8dv&x!fnr_1@=SJu2Vv$+^>}Dr$e`IOZOD^PEnbw)RR%Eur@k4)G_nEZbqgb3;eQ zXI7AoOmgUdlc!76v}~5i$g`e-qqtWEo2NT6eV_1>(prwz%PiDf_X;EI%XRy!+a|X* zrGq_f5|3OuduKvVL|99?0s{ZusLgGg+p~HE%eeD)xYE|uJmM|)mvIcJl?`?jMtXg{ zA-rB61taIaPqXe#+)XkDx2V7I-ske`QSAJ@xRmDk26EEq`3Yua1>w3O}5WqL_A7F%1cthZLt=OWy4*KKUw;tcC7Zg2B7RevAWJs*K&wT&Zb&ppAR@iVMN zo1&=aBiiKJqcjV>U8~EM;+`=2%h$x)megw|?iSda>%@gTQmCsGJbw!|i*>gT&bgY>hcbH7t- z?#Xh;eNz2i#}c95<|QLCBJGTc_uP_YWJj^dTm{m;*$VDKTUPb-z|PG_uX?{co>4uT z@BWRHl{JCX`LjnHHmc3N<&{9|<^?1TI_BPhCzwdO*|*$vpJ!2d-a+=G#qmvZ3iKCN zWp&Qm(k6&j9g&>N$_32j0DAm!uE<8S3vOQ1xtp*wwdc8g@h8SWeHjC97VY}%d#n#~ z$LC>rTQel?wedIi(DdeTYM!u9ZX40L(k{lXPy80M{N{NMwIwas=#_EidHU}Zzipnk zW(7)RsmdxDo-K+OVos%(QLDL=BG#C3WT2EkUE@~BXFaE28FKmlT#9r1woblA+R@f% zMi_DtKJOiZ!D~40eXkgo1?~8=6v?=qL^g5+L*|FOY0GcP7Wy5#zC&An1^Zi_ntb5_ z$j9`akNtt|LHG_0$=a639|IZ!3n{;IXp)j+@CPO{CHm2bh;rEz(yRD$yoMbHO>iaE z+^k@lea69o`wSde*SV=Oz{r1#u z&mU+dDJr;Ssn^9Z%e<&)sxAH|2u5wSk&J!~uHMKjTaH%#`aI2TF6d+(T%vLQH8}dQ zNo4GH{(ksN*`LjroOiREbrz~RU5+IMmj(h~2M%8mP^*L}vz-#U7c zN77U3Ja6y2f}=6zv)7O=zQG!^>*{)VN^|hj#4xLcacjMjt$e|Hyxg{DVvkq5TWee; zx5r_Y2k(|^6nmE68{f&N@ox=3 zTySWb7yj%a-$9@J^~#=nsU3D++PuV_HgkJ3ugAGE_9%1U&dbPcQQaSPOGL4Gu4_GM zqZ)H+KgB%fmG7FkWQJT`T4y4)f1Q;BY@F|FGq*<3qFZ^Ub~IH+T$@x7NM3r9K)e0< z-8WhAeSGk8)Wmr$B6-XEsj6Y=3S=%*?PmpvVxH->nO+CR9scS#C zQgcUtOJyMXCO@I)n)-em;XznQ%58<;iR-(Qlsckab3}`d&~(?dfqQgVaRmFYC!OE@ zcH54QslA?tnCx5Q#n#~XP!UBv^~a z98u<(AMC|Cbt_)~#Z#3W57reR%tvIO+Y&48*T-_sN)MOQNguKH5?aG<*Zux^iU+>M z?=#)C^KYb?M@N}gq@cywno_da+6xU7U0TtQ-tpS9<{Vnbk{5R?MjO*>rPKP4M9PCs z>A%J_wcAqYYKa~+f@M`j>#l@R5f;x|c3d;{Y;n~(Qx}3Z{VG*9m-5XME_k98PtEa) zgEFdNpD=9l9G6PE?q~JW2gC18gAQy3`N%5S?$~i6kFyl3g>R^6`J^+;6c9Jwj9rL09nGC)uGi%l>D*GKhT z`BY>{tB$z_3bh@lCnI6USC(V1wX%B3 zyt>%C!L?*=KjHBcU`3CP_z79arTfAylb|^%>}e`U6`z^gK%TCWf9`R=9fQA)-3Twx zk16MDNXhSLwe&5^INal4TYi?cE7_12uJ^L;abDNzh%N6+Y2N~W@ zeJzc|H=DKoZ0T95e z-(;eF#REU`Hg*#SEl+WND(dU=P#$qzr0iC`LcX$p;YQU0D>ZkFqrPvwH4Cpd!^`^EM0WZukL{_(qxn{CJG0?gD31#HJpByAmJM=^iR+>V_cHtr zTIHGXt?SpPY`O=k+|d)FQLo*P@lEpt84A=oWrzAYH{I`)5AN|oJh?2qL-r0oNv;h| zjHiSwkt0!~9r4*61|K?XItIAA%%}eW3dZ_TBrVc@OH$JsV@P)R)2X#k*HCduN4L~uKJon0m-f?Yslt3|d;<@VOXC?q z)BI>@u4ccjJ)-F{Y_HlP6B6qfo(tJF1V;WZ=Blkr@f??O+%BIkA>tfuJv3Q%>17W7 zvJg#xbHHKc?h$*#FKzGUU(U2Kwz?X(I6d}xwNJ;NuOIwZY?NT*Z1dl zBi2-_$`{I^|MGSnyJ~uHD`i)i+gMZVTQj#S^_mTShxowPpcI`@mx`qL8kqP~ukX~{ zYH?q)9lL!-YwSIuPc13%nd_Z_Rly?6*@Yfuz4oCnEY3QT!_LJXJp=-P*X4@Dw06vm z{q5POY5u$pMwDE@)62+>sl81xqpolJp#HC+kEIpf-2148h~1TVh8B{;?&EksbiO6e zP%)O!Kn5X)_;F+t%_rv;E4cI{U+=c1)^S}!HlElTRNx56u|yl0LtE)HxyJoRJJ(U3 zEqrolJ?51r{pjY0CZ9ByI<~y;e&RJbK~(}o9-`*)lxKE(TS|m*W6Y#yGw>sRH;C`d z4p+Us%%}GhM(Ep%iks|pgmhy-DD4p^8AQ0+2I}z?^|ZOFG?U9^Winy!P`H%jOCrD?0QX1Omi#B?$5?-MsUqXFm8!d5nT`-extBwJc*d=J1(#OvcaER=EE%qK#<8E< zDSvJUZBI)q-cA|5xtf%H>(|?_{mAQSQqF(gPv>s(J>WhwuAP~k@MoS)?F`!Y-rHth rh(bVz9-sI+)pzzSJVf{F_JjA~Ysxw=#V~nIZ(Oz9%Cs{)?j`>ZBRY}R literal 0 HcmV?d00001 diff --git a/samples/agent/adk/contact_lookup/verify_routes_httpx.py b/samples/agent/adk/contact_lookup/verify_routes_httpx.py new file mode 100644 index 00000000..9310f150 --- /dev/null +++ b/samples/agent/adk/contact_lookup/verify_routes_httpx.py @@ -0,0 +1,76 @@ +import httpx +import json +import uuid + +URL = "http://localhost:10003/" + +def test_method(method_name): + print(f"\n--- Testing method: '{method_name}' ---") + + # Construct a valid A2A message payload + message_id = str(uuid.uuid4()) + params = { + "message": { + "messageId": message_id, + "role": "user", + "parts": [{"text": "Hello"}], + "kind": "message" + } + } + + payload = { + "jsonrpc": "2.0", + "method": method_name, + "params": params, + "id": "1" + } + + headers = { + "Content-Type": "application/json", + "X-A2A-Extensions": "https://a2ui.org/a2a-extension/a2ui/v0.8" + } + + try: + response = httpx.post(URL, json=payload, headers=headers) + # print(f"Status: {response.status_code}") + # print(f"Response: {response.text}") + + if "Method not found" not in response.text: + print(f"✅ SUCCESS? '{method_name}' looked promising!") + return True + else: + print(f"❌ Failed: Method not found") + return False + + except Exception as e: + print(f"Error: {e}") + return False + +if __name__ == "__main__": + candidates = [ + # Based on DefaultRequestHandler.on_message_send + "on_message_send", + "message_send", + "message.send", + "a2a.message_send", + "a2a.on_message_send", + + # Variations + "post_message", + "a2a.post_message", + "POST", # Failed + + # Maybe namespaced? + "a2a/message_send", + "v1/message_send", + ] + + found = False + for c in candidates: + if test_method(c): + found = True + break + + if not found: + print("\nAll candidates failed.") + # Try listing? NO standard listing in JSON-RPC usually. diff --git a/samples/client/android/.idea/.gitignore b/samples/client/android/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/samples/client/android/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/samples/client/android/.idea/.name b/samples/client/android/.idea/.name new file mode 100644 index 00000000..f1e58f5a --- /dev/null +++ b/samples/client/android/.idea/.name @@ -0,0 +1 @@ +A2UI-Android-Sample \ No newline at end of file diff --git a/samples/client/android/.idea/compiler.xml b/samples/client/android/.idea/compiler.xml new file mode 100644 index 00000000..b589d56e --- /dev/null +++ b/samples/client/android/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/samples/client/android/.idea/deploymentTargetSelector.xml b/samples/client/android/.idea/deploymentTargetSelector.xml new file mode 100644 index 00000000..5272c0ed --- /dev/null +++ b/samples/client/android/.idea/deploymentTargetSelector.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/client/android/.idea/gradle.xml b/samples/client/android/.idea/gradle.xml new file mode 100644 index 00000000..0be14505 --- /dev/null +++ b/samples/client/android/.idea/gradle.xml @@ -0,0 +1,38 @@ + + + + + + + \ No newline at end of file diff --git a/samples/client/android/.idea/inspectionProfiles/Project_Default.xml b/samples/client/android/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..103e00cb --- /dev/null +++ b/samples/client/android/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,32 @@ + + + + \ No newline at end of file diff --git a/samples/client/android/.idea/kotlinc.xml b/samples/client/android/.idea/kotlinc.xml new file mode 100644 index 00000000..fe63bb67 --- /dev/null +++ b/samples/client/android/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/samples/client/android/.idea/migrations.xml b/samples/client/android/.idea/migrations.xml new file mode 100644 index 00000000..f8051a6f --- /dev/null +++ b/samples/client/android/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/samples/client/android/.idea/misc.xml b/samples/client/android/.idea/misc.xml new file mode 100644 index 00000000..0ad17cbd --- /dev/null +++ b/samples/client/android/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/client/android/.idea/other.xml b/samples/client/android/.idea/other.xml new file mode 100644 index 00000000..c9a97cc8 --- /dev/null +++ b/samples/client/android/.idea/other.xml @@ -0,0 +1,1077 @@ + + + + + + \ No newline at end of file diff --git a/samples/client/android/.idea/vcs.xml b/samples/client/android/.idea/vcs.xml new file mode 100644 index 00000000..c2365ab1 --- /dev/null +++ b/samples/client/android/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/samples/client/android/README.md b/samples/client/android/README.md index 42a1be1e..1fd6391d 100644 --- a/samples/client/android/README.md +++ b/samples/client/android/README.md @@ -1,30 +1,60 @@ -# A2UI Android Sample App +# A2A Android Client Samples -This is a sample Android application demonstrating the A2UI native renderer. +This directory contains sample Android applications demonstrating the A2UI native renderer receiving streaming UI updates from an AI agent. ## Project Structure This sample uses a **Composite Build** to include the renderer source code directly from `../../../../renderers/android`. -- `app/`: The Android application module. -- `sample_data.jsonl`: Example A2UI data (currently the app uses hardcoded data in `MainActivity.kt` for simplicity, but this file is provided for reference). +- `projects/contact/`: **Contact Lookup Sample**. A client that connects to the `contact_lookup` agent to display a dynamic contact card. +- `projects/orchestrator/`: (Placeholder) Orchestrator module. +- `projects/restaurant/`: (Placeholder) Restaurant reservation module. -## How to Run +## Prerequisites + +- **Android Studio**: Koala Feature Drop or newer (recommended). +- **JDK**: Java 17+. +- **Python**: 3.10+ (for running the agent). + +## Setup & Running + +### 1. Start the AI Agent +The Android client needs a backend agent to talk to. + +1. Open a terminal. +2. Navigate to the contact lookup agent directory: + ```bash + cd samples/agent/adk/contact_lookup + ``` +3. Install dependencies and run: + ```bash + uv run . + ``` + The agent will start at `http://localhost:10003`. + +### 2. Run the Android App 1. **Open in Android Studio**: - Select **File > Open**. - - Navigate to `samples/client/android` and select `settings.gradle.kts` (or the folder). - - Click **OK**. - -2. **Sync Gradle**: - - Android Studio should detect the project. Wait for Gradle Sync to complete. - - It will automatically include the `a2ui-core` and `a2ui-compose` modules from the `renderers/android` directory. + - Navigate to `samples/client/android` and select `settings.gradle.kts`. + - Wait for Gradle Sync to complete. -3. **Run the App**: - - Select the `app` configuration in the toolbar. - - Select a target device (Emulator or Physical Device). +2. **Run**: + - Select the **`projects.contact`** (or `contact`) configuration in the run toolbar. + - Select an **Android Emulator** (Physical devices require reverse port forwarding). - Click **Run** (Green Play button). -## What to Expect +### 3. Usage +- The app will launch and send a default query: "Find contact info for Alex Jordan". +- The agent will respond with a stream of UI components. +- The app renders the profile image, text, and icons dynamically. + +## Troubleshooting + +- **Blank Screen?** Check Logcat for `A2AClient` logs. Ensure the agent is running. +- **Connection Refused?** Ensure you are on an Emulator. If using a physical device, run: + ```bash + adb reverse tcp:10003 tcp:10003 + ``` +- **Build Errors?** Ensure you have JDK 17 selected in Android Studio (Settings > Build, Execution, Deployment > Build Tools > Gradle). -The application will launch and render a simple UI defined by A2UI messages (Header, Text, Layouts) using native Jetpack Compose components. diff --git a/samples/client/android/app/src/main/java/com/google/a2ui/sample/A2AClient.kt b/samples/client/android/app/src/main/java/com/google/a2ui/sample/A2AClient.kt deleted file mode 100644 index 83976e5c..00000000 --- a/samples/client/android/app/src/main/java/com/google/a2ui/sample/A2AClient.kt +++ /dev/null @@ -1,152 +0,0 @@ -package com.google.a2ui.sample - -import com.google.a2ui.core.model.ServerMessage -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonElement -import kotlinx.serialization.json.JsonObject -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.RequestBody.Companion.toRequestBody -import java.io.IOException -import java.util.UUID - -// --- A2A Protocol Data Models --- - -@Serializable -data class A2AClientMessage( - val message: ClientMessageEnvelope -) - -@Serializable -data class ClientMessageEnvelope( - val messageId: String, - val role: String = "user", - val parts: List, - val kind: String = "message" -) - -@Serializable -sealed class ClientPart { - @Serializable - @SerialName("text") - data class Text(val text: String) : ClientPart() - - @Serializable - @SerialName("data") - data class Data( - val data: JsonElement, - val metadata: Map = mapOf("mimeType" to "application/json+a2aui") - ) : ClientPart() -} - -// Response models from the A2A agent (Simplified for what we need) -@Serializable -data class A2AResponse( - val result: A2AResult? = null, - val error: A2AError? = null -) - -@Serializable -data class A2AResult( - val kind: String, // "task" - val status: A2ATaskStatus -) - -@Serializable -data class A2AError( - val message: String -) - -@Serializable -data class A2ATaskStatus( - val message: ServerMessageEnvelope? = null -) - -@Serializable -data class ServerMessageEnvelope( - val parts: List? = null -) - -@Serializable -sealed class ServerPart { - // We only care about data parts for A2UI updates - @Serializable - @SerialName("data") - data class Data(val data: ServerMessage) : ServerPart() // ServerMessage is from a2ui-core - - @Serializable - @SerialName("text") - data class Text(val text: String) : ServerPart() -} - - -class A2AClient( - private val agentUrl: String = "http://10.0.2.2:10003/a2a" // Default to local agent -) { - private val client = OkHttpClient() - private val json = Json { - ignoreUnknownKeys = true - classDiscriminator = "kind" // For sealed classes - } - - private val mediaType = "application/json; charset=utf-8".toMediaType() - - @Throws(IOException::class) - fun sendMessage(text: String): List { - val part = ClientPart.Text(text) - return sendInternal(part) - } - - @Throws(IOException::class) - fun sendEvent(eventData: JsonElement): List { - val part = ClientPart.Data(eventData) - return sendInternal(part) - } - - private fun sendInternal(part: ClientPart): List { - val envelope = A2AClientMessage( - message = ClientMessageEnvelope( - messageId = UUID.randomUUID().toString(), - parts = listOf(part) - ) - ) - - val requestBody = json.encodeToString(envelope).toRequestBody(mediaType) - - val request = Request.Builder() - .url(agentUrl) - .addHeader("X-A2A-Extensions", "https://a2ui.org/a2a-extension/a2ui/v0.8") // Crucial! - .post(requestBody) - .build() - - client.newCall(request).execute().use { response -> - if (!response.isSuccessful) throw IOException("Unexpected code $response") - - val responseBody = response.body?.string() ?: throw IOException("Empty response body") - - // The agent might return a direct error or a Task object - // We'll attempt to parse the Task object first - val a2aResponse = try { - json.decodeFromString(responseBody) - } catch (e: Exception) { - // If it fails, it might be a raw list or something entirely different - throw IOException("Failed to parse A2A response: ${e.message}. Response: $responseBody") - } - - if (a2aResponse.error != null) { - throw IOException("Agent Error: ${a2aResponse.error.message}") - } - - val parts = a2aResponse.result?.status?.message?.parts ?: emptyList() - - // Extract only the A2UI updates - return parts.mapNotNull { - if (it is ServerPart.Data) it.data else null - } - } - } -} diff --git a/samples/client/android/gradle.properties b/samples/client/android/gradle.properties new file mode 100644 index 00000000..e892c3bc --- /dev/null +++ b/samples/client/android/gradle.properties @@ -0,0 +1,2 @@ +android.useAndroidX=true +org.gradle.jvmargs=-Xmx4g diff --git a/samples/client/android/gradle/wrapper/gradle-wrapper.jar b/samples/client/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/samples/client/android/gradle/wrapper/gradle-wrapper.properties b/samples/client/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..a80b22ce --- /dev/null +++ b/samples/client/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/samples/client/android/gradlew b/samples/client/android/gradlew new file mode 100644 index 00000000..1aa94a42 --- /dev/null +++ b/samples/client/android/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/client/android/gradlew.bat b/samples/client/android/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/samples/client/android/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/android/projects/contact/.idea/.gitignore b/samples/client/android/projects/contact/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/samples/client/android/projects/contact/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/samples/client/android/projects/contact/.idea/gradle.xml b/samples/client/android/projects/contact/.idea/gradle.xml new file mode 100644 index 00000000..89935b50 --- /dev/null +++ b/samples/client/android/projects/contact/.idea/gradle.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/samples/client/android/projects/contact/.idea/migrations.xml b/samples/client/android/projects/contact/.idea/migrations.xml new file mode 100644 index 00000000..f8051a6f --- /dev/null +++ b/samples/client/android/projects/contact/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/samples/client/android/projects/contact/.idea/misc.xml b/samples/client/android/projects/contact/.idea/misc.xml new file mode 100644 index 00000000..3040d03e --- /dev/null +++ b/samples/client/android/projects/contact/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/client/android/projects/contact/.idea/other.xml b/samples/client/android/projects/contact/.idea/other.xml new file mode 100644 index 00000000..c9a97cc8 --- /dev/null +++ b/samples/client/android/projects/contact/.idea/other.xml @@ -0,0 +1,1077 @@ + + + + + + \ No newline at end of file diff --git a/samples/client/android/projects/contact/.idea/vcs.xml b/samples/client/android/projects/contact/.idea/vcs.xml new file mode 100644 index 00000000..bc599707 --- /dev/null +++ b/samples/client/android/projects/contact/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/samples/client/android/app/build.gradle.kts b/samples/client/android/projects/contact/build.gradle.kts similarity index 93% rename from samples/client/android/app/build.gradle.kts rename to samples/client/android/projects/contact/build.gradle.kts index a6bdb34b..f7afee11 100644 --- a/samples/client/android/app/build.gradle.kts +++ b/samples/client/android/projects/contact/build.gradle.kts @@ -1,7 +1,8 @@ +plugins { alias(libs.plugins.android.application) alias(libs.plugins.jetbrains.kotlin.android) - kotlin("plugin.serialization") version "1.9.0" // Hardcoding version for simplicity or if not in catalog - + kotlin("plugin.serialization") +} android { namespace = "com.google.a2ui.sample" @@ -37,7 +38,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" + kotlinCompilerExtensionVersion = "1.5.11" } packaging { resources { diff --git a/samples/client/android/projects/contact/src/main/AndroidManifest.xml b/samples/client/android/projects/contact/src/main/AndroidManifest.xml new file mode 100644 index 00000000..7cc03eab --- /dev/null +++ b/samples/client/android/projects/contact/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/A2AClient.kt b/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/A2AClient.kt new file mode 100644 index 00000000..91c24ab2 --- /dev/null +++ b/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/A2AClient.kt @@ -0,0 +1,214 @@ +package com.google.a2ui.sample + +import com.google.a2ui.core.model.ServerMessage +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonObject +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.RequestBody.Companion.toRequestBody +import java.io.IOException +import java.util.UUID +import java.util.concurrent.TimeUnit + +// --- A2A Protocol Data Models --- + +@Serializable +data class A2AClientMessage( + val message: ClientMessageEnvelope +) + +@Serializable +data class ClientMessageEnvelope( + val messageId: String, + val role: String = "user", + val parts: List, + val kind: String = "message" +) + +@Serializable +sealed class ClientPart { + @Serializable + @SerialName("text") + data class Text(val text: String) : ClientPart() + + @Serializable + @SerialName("data") + data class Data( + val data: JsonElement, + val metadata: Map = mapOf("mimeType" to "application/json+a2aui") + ) : ClientPart() +} + +// Response models from the A2A agent (Simplified for what we need) +// Response models from the A2A agent (Simplified for what we need) +@Serializable +data class A2AResult( + val kind: String? = null, // "task" + val status: A2ATaskStatus? = null, + val error: A2AError? = null // In case error is inside result +) + +@Serializable +data class A2AError( + val message: String +) + +@Serializable +data class A2ATaskStatus( + val message: ServerMessageEnvelope? = null +) + +@Serializable +data class ServerMessageEnvelope( + val parts: List? = null +) + +@Serializable +data class ServerPart( + val data: JsonElement? = null, + val text: String? = null +) + + +// --- JSON-RPC Wrapper Models --- +@Serializable +data class JsonRpcRequest( + val jsonrpc: String = "2.0", + val method: String, + val params: A2AClientMessage, + val id: String +) + +@Serializable +data class JsonRpcResponse( + val jsonrpc: String, + val result: A2AResult? = null, + val error: JsonRpcError? = null, + val id: String +) + +@Serializable +data class JsonRpcError( + val code: Int, + val message: String, + val data: JsonElement? = null +) + + + +class A2AClient( + private val agentUrl: String = "http://10.0.2.2:10003/" // Default to local agent root +) { + private val client = OkHttpClient.Builder() + .connectTimeout(90, TimeUnit.SECONDS) + .readTimeout(90, TimeUnit.SECONDS) + .writeTimeout(90, TimeUnit.SECONDS) + .build() + private val json = Json { + ignoreUnknownKeys = true + classDiscriminator = "kind" // For sealed classes + encodeDefaults = true + } + + private val mediaType = "application/json; charset=utf-8".toMediaType() + + @Throws(IOException::class) + fun sendMessage(text: String): List { + val part = ClientPart.Text(text) + return sendInternal(part) + } + + @Throws(IOException::class) + fun sendEvent(eventData: JsonElement): List { + val part = ClientPart.Data(eventData) + return sendInternal(part) + } + + private fun sendInternal(part: ClientPart): List { + val messageId = UUID.randomUUID().toString() + val envelope = A2AClientMessage( + message = ClientMessageEnvelope( + messageId = messageId, + parts = listOf(part) + ) + ) + + // Wrap in JSON-RPC + val rpcRequest = JsonRpcRequest( + method = "message/send", + params = envelope, + id = messageId + ) + + val requestBody = json.encodeToString(rpcRequest).toRequestBody(mediaType) + + // Log the request body for debugging + // android.util.Log.d("A2AClient", "Request: ${json.encodeToString(rpcRequest)}") + + val request = Request.Builder() + .url(agentUrl) + .addHeader("X-A2A-Extensions", "https://a2ui.org/a2a-extension/a2ui/v0.8") // Crucial! + .post(requestBody) + .build() + + client.newCall(request).execute().use { response -> + if (!response.isSuccessful) throw IOException("Unexpected code $response") + + val responseBody = response.body?.string() ?: throw IOException("Empty response body") + android.util.Log.d("A2AClient", "Raw Response: $responseBody") + + // Decode JSON-RPC response + val rpcResponse = try { + json.decodeFromString(responseBody) + } catch (e: Exception) { + throw IOException("Failed to parse JSON-RPC response: ${e.message}. Body: $responseBody") + } + + if (rpcResponse.error != null) { + throw IOException("JSON-RPC Error ${rpcResponse.error.code}: ${rpcResponse.error.message}") + } + + val a2aResult = rpcResponse.result ?: throw IOException("Empty results in JSON-RPC response") + + if (a2aResult.error != null) { + throw IOException("Agent Error: ${a2aResult.error.message}") + } + + // If the status is "done", there might be no message. Access safely. + val parts = a2aResult.status?.message?.parts ?: emptyList() + + // Extract only the A2UI updates + val uiParts = parts.mapNotNull { part -> + if (part.data != null) { + val jsonElement = part.data + if (jsonElement is JsonObject) { + try { + when { + "beginRendering" in jsonElement -> json.decodeFromJsonElement(ServerMessage.BeginRendering.serializer(), jsonElement["beginRendering"]!!) + "surfaceUpdate" in jsonElement -> json.decodeFromJsonElement(ServerMessage.SurfaceUpdate.serializer(), jsonElement["surfaceUpdate"]!!) + "dataModelUpdate" in jsonElement -> json.decodeFromJsonElement(ServerMessage.DataModelUpdate.serializer(), jsonElement["dataModelUpdate"]!!) + "deleteSurface" in jsonElement -> json.decodeFromJsonElement(ServerMessage.DeleteSurface.serializer(), jsonElement["deleteSurface"]!!) + else -> null + } + } catch (e: Exception) { + android.util.Log.e("A2AClient", "Failed to decode message part: ${e.message}") + null + } + } else null + } else null + } + + android.util.Log.d("A2AClient", "Received ${uiParts.size} UI parts out of ${parts.size} total parts.") + uiParts.forEachIndexed { index, part -> + android.util.Log.d("A2AClient", "UI Part $index: $part") + } + + return uiParts + } + } +} diff --git a/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt b/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/MainActivity.kt similarity index 64% rename from samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt rename to samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/MainActivity.kt index 01d0e942..d5110182 100644 --- a/samples/client/android/app/src/main/java/com/google/a2ui/sample/MainActivity.kt +++ b/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/MainActivity.kt @@ -19,6 +19,7 @@ import com.google.a2ui.compose.A2UISurface import com.google.a2ui.core.model.ServerMessage import com.google.a2ui.core.state.SurfaceState import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import kotlinx.coroutines.withContext class MainActivity : ComponentActivity() { @@ -49,10 +50,14 @@ fun SampleA2UIScreen() { withContext(Dispatchers.IO) { try { // Send an initial query to start the conversation - val messages = a2aClient.sendMessage("Find contact info for Sarah Lee") + val messages = a2aClient.sendMessage("Find contact info for Alex Jordan") withContext(Dispatchers.Main) { - messages.forEach { surfaceState.applyUpdate(it) } + android.util.Log.d("MainActivity", "Applying ${messages.size} updates to surface.") + messages.forEach { + android.util.Log.d("MainActivity", "Applying update: $it") + surfaceState.applyUpdate(it) + } isLoading = false } } catch (e: Exception) { @@ -75,11 +80,27 @@ fun SampleA2UIScreen() { } } else { A2UISurface( - surfaceId = "main", // Ensure this matches what the agent returns in BeginRendering + surfaceId = "contact-card", // Matches server's "contact-card" surface ID state = surfaceState, - onUserAction = { action, src -> - Log.d("A2UI", "Action: ${action.name} from $src") - // TODO: Handle user actions by calling a2aClient.sendEvent(action.parameters) + onUserAction = { action, src, contextMap -> + Log.d("A2UI", "Action: ${action.name} from $src with $contextMap") + Log.d("A2UI", "Action: ${action.name} from $src with $contextMap") + + // Construct the JSON object for the user action context + val actionData = kotlinx.serialization.json.JsonObject(contextMap) + + // Launch a coroutine to send the event to the server + // Note: ideally this should be handled by a ViewModel to avoid leak + kotlinx.coroutines.CoroutineScope(Dispatchers.IO).launch { + try { + val updates = a2aClient.sendEvent(actionData) + withContext(Dispatchers.Main) { + updates.forEach { surfaceState.applyUpdate(it) } + } + } catch (e: Exception) { + e.printStackTrace() + } + } } ) } diff --git a/samples/client/android/projects/orchestrator/build.gradle.kts b/samples/client/android/projects/orchestrator/build.gradle.kts new file mode 100644 index 00000000..034bdef2 --- /dev/null +++ b/samples/client/android/projects/orchestrator/build.gradle.kts @@ -0,0 +1,40 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.jetbrains.kotlin.android) +} + +android { + namespace = "com.google.a2ui.sample.orchestrator" + compileSdk = 34 + + defaultConfig { + applicationId = "com.google.a2ui.sample.orchestrator" + minSdk = 24 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.material3) +} diff --git a/samples/client/android/projects/orchestrator/src/main/AndroidManifest.xml b/samples/client/android/projects/orchestrator/src/main/AndroidManifest.xml new file mode 100644 index 00000000..0ca87b98 --- /dev/null +++ b/samples/client/android/projects/orchestrator/src/main/AndroidManifest.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/samples/client/android/projects/restaurant/build.gradle.kts b/samples/client/android/projects/restaurant/build.gradle.kts new file mode 100644 index 00000000..e0404968 --- /dev/null +++ b/samples/client/android/projects/restaurant/build.gradle.kts @@ -0,0 +1,40 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.jetbrains.kotlin.android) +} + +android { + namespace = "com.google.a2ui.sample.restaurant" + compileSdk = 34 + + defaultConfig { + applicationId = "com.google.a2ui.sample.restaurant" + minSdk = 24 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.material3) +} diff --git a/samples/client/android/projects/restaurant/src/main/AndroidManifest.xml b/samples/client/android/projects/restaurant/src/main/AndroidManifest.xml new file mode 100644 index 00000000..5af87d55 --- /dev/null +++ b/samples/client/android/projects/restaurant/src/main/AndroidManifest.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/samples/client/android/settings.gradle.kts b/samples/client/android/settings.gradle.kts index 3250511a..1c9f203b 100644 --- a/samples/client/android/settings.gradle.kts +++ b/samples/client/android/settings.gradle.kts @@ -17,10 +17,17 @@ dependencyResolutionManagement { google() mavenCentral() } + versionCatalogs { + create("libs") { + from(files("../../../renderers/android/gradle/libs.versions.toml")) + } + } } rootProject.name = "A2UI-Android-Sample" -include(":app") +include(":projects:contact") +include(":projects:orchestrator") +include(":projects:restaurant") includeBuild("../../../renderers/android") { dependencySubstitution { diff --git a/samples/client/android/simple_server.py b/samples/client/android/simple_server.py deleted file mode 100644 index 28b0b0b2..00000000 --- a/samples/client/android/simple_server.py +++ /dev/null @@ -1,121 +0,0 @@ -import uvicorn -from starlette.applications import Starlette -from starlette.responses import JSONResponse -from starlette.routing import Route -from starlette.middleware import Middleware -from starlette.middleware.cors import CORSMiddleware - -# Define the A2UI response logic -async def a2ui_endpoint(request): - # This is the raw JSON structure the Android client expects - # It mimics what a full A2A agent would return in the 'data' part of a message - return JSONResponse([ - { - "surfaceId": "main", - "components": [ - { - "id": "root", - "component": { - "Column": { - "children": { - "explicitList": ["header", "image", "desc_card", "input_row", "button"] - }, - "crossAxisAlignment": "center" - } - } - }, - { - "id": "header", - "component": { - "Text": { - "text": {"literalString": "Hello from Simple Server!"}, - "usageHint": "headlineMedium" - } - } - }, - { - "id": "image", - "component": { - "Image": { - "url": {"literalString": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d7/Android_robot.svg/1745px-Android_robot.svg.png"}, - "height": {"literalString": "120"} - } - } - }, - { - "id": "desc_card", - "component": { - "Container": { - "children": { - "explicitList": ["desc_text"] - }, - "padding": { - "top": 16, "bottom": 16, "left": 16, "right": 16 - } - } - } - }, - { - "id": "desc_text", - "component": { - "Text": { - "text": {"literalString": "This UI is streamed dynamically from a Python server running on your machine. No app rebuilds required!"} - } - } - }, - { - "id": "input_row", - "component": { - "Row": { - "children": { - "explicitList": ["input_field"] - } - } - } - }, - { - "id": "input_field", - "component": { - "TextField": { - "label": {"literalString": "Enter your name"}, - "value": {"literalString": ""} - } - } - }, - { - "id": "button", - "component": { - "Button": { - "label": {"literalString": "Send to Server"}, - "action": { - "actionId": "submit", - "parameters": {} - } - } - } - } - ] - }, - { - "surfaceId": "main", - "root": "root" - } - ]) - -# CORS allows the Android emulator (which is 'technically' external) to hit localhost easily if needed, -# though usually 10.0.2.2 is used. Good practice anyway. -middleware = [ - Middleware(CORSMiddleware, allow_origins=['*'], allow_methods=['*'], allow_headers=['*']) -] - -routes = [ - Route('/a2ui', a2ui_endpoint), -] - -app = Starlette(debug=True, routes=routes, middleware=middleware) - -if __name__ == "__main__": - print("Starting Simple A2UI Server...") - print("Endpoint: http://0.0.0.0:8000/a2ui") - print("For Android Emulator, use: http://10.0.2.2:8000/a2ui") - uvicorn.run(app, host="0.0.0.0", port=8000) From 69591f4fb0a7df1fde3db76a43ac2ebc3656939f Mon Sep 17 00:00:00 2001 From: Divyansh Saraswat Date: Mon, 29 Dec 2025 18:32:30 +0530 Subject: [PATCH 5/5] feat(android): Add interactive input and fix UI rendering --- .../com/google/a2ui/sample/MainActivity.kt | 128 +++++++++++------- 1 file changed, 77 insertions(+), 51 deletions(-) diff --git a/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/MainActivity.kt b/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/MainActivity.kt index d5110182..8a564d92 100644 --- a/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/MainActivity.kt +++ b/samples/client/android/projects/contact/src/main/java/com/google/a2ui/sample/MainActivity.kt @@ -6,12 +6,17 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.ui.unit.dp import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -40,68 +45,89 @@ class MainActivity : ComponentActivity() { @Composable fun SampleA2UIScreen() { val surfaceState = remember { SurfaceState() } - var isLoading by remember { mutableStateOf(true) } + var isLoading by remember { mutableStateOf(false) } var errorMsg by remember { mutableStateOf(null) } + var query by remember { mutableStateOf("Find contact info for Alex Jordan") } // Initialize our native A2A Client val a2aClient = remember { A2AClient() } + val scope = rememberCoroutineScope() - LaunchedEffect(Unit) { - withContext(Dispatchers.IO) { - try { - // Send an initial query to start the conversation - val messages = a2aClient.sendMessage("Find contact info for Alex Jordan") - - withContext(Dispatchers.Main) { - android.util.Log.d("MainActivity", "Applying ${messages.size} updates to surface.") - messages.forEach { - android.util.Log.d("MainActivity", "Applying update: $it") - surfaceState.applyUpdate(it) + androidx.compose.foundation.layout.Column( + modifier = Modifier.fillMaxSize() + ) { + // Input Area + androidx.compose.foundation.layout.Row( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + androidx.compose.material3.TextField( + value = query, + onValueChange = { query = it }, + modifier = Modifier.weight(1f), + label = { Text("Ask Agent") } + ) + androidx.compose.foundation.layout.Spacer(modifier = Modifier.width(8.dp)) + androidx.compose.material3.Button( + onClick = { + isLoading = true + errorMsg = null + scope.launch(Dispatchers.IO) { + try { + val messages = a2aClient.sendMessage(query) + withContext(Dispatchers.Main) { + messages.forEach { surfaceState.applyUpdate(it) } + isLoading = false + } + } catch (e: Exception) { + e.printStackTrace() + withContext(Dispatchers.Main) { + errorMsg = "Error: ${e.message}" + isLoading = false + } + } } - isLoading = false - } - } catch (e: Exception) { - e.printStackTrace() - withContext(Dispatchers.Main) { - errorMsg = "Error: ${e.message}. \nMake sure 'uv run .' is running in 'contact_lookup'!" - isLoading = false - } + }, + enabled = !isLoading + ) { + Text("Send") } } - } - if (isLoading) { - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - CircularProgressIndicator() - } - } else if (errorMsg != null) { - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - Text(text = errorMsg!!) - } - } else { - A2UISurface( - surfaceId = "contact-card", // Matches server's "contact-card" surface ID - state = surfaceState, - onUserAction = { action, src, contextMap -> - Log.d("A2UI", "Action: ${action.name} from $src with $contextMap") - Log.d("A2UI", "Action: ${action.name} from $src with $contextMap") - - // Construct the JSON object for the user action context - val actionData = kotlinx.serialization.json.JsonObject(contextMap) - - // Launch a coroutine to send the event to the server - // Note: ideally this should be handled by a ViewModel to avoid leak - kotlinx.coroutines.CoroutineScope(Dispatchers.IO).launch { - try { - val updates = a2aClient.sendEvent(actionData) - withContext(Dispatchers.Main) { - updates.forEach { surfaceState.applyUpdate(it) } + // Content Area + Box(modifier = Modifier.weight(1f).fillMaxWidth()) { + if (isLoading) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (errorMsg != null) { + Text( + text = errorMsg!!, + color = MaterialTheme.colorScheme.error, + modifier = Modifier.align(Alignment.Center).padding(16.dp) + ) + } else { + A2UISurface( + surfaceId = "contact-card", + state = surfaceState, + onUserAction = { action, src, contextMap -> + Log.d("A2UI", "Action: ${action.name} from $src") + + val actionData = kotlinx.serialization.json.JsonObject(contextMap) + + scope.launch(Dispatchers.IO) { + try { + val updates = a2aClient.sendEvent(actionData) + withContext(Dispatchers.Main) { + updates.forEach { surfaceState.applyUpdate(it) } + } + } catch (e: Exception) { + e.printStackTrace() + } } - } catch (e: Exception) { - e.printStackTrace() } - } + ) } - ) + } } }