-
Notifications
You must be signed in to change notification settings - Fork 20
ADFA-3617 | Support horizontal widgets in XML generation #1204
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
jatezzz
merged 4 commits into
stage
from
feat/ADFA-3617-horizontal-widgets-xml-experimental
Apr 20, 2026
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
be0d8fe
feat: support horizontal widgets in XML generation
jatezzz 669a512
fix: layout geometry, mutability issues and annotation matching
jatezzz 23ecdab
refactor: text widget attribute generation
jatezzz bd4eecd
fix: remove `|` value from `escapeXmlAttr` function, use floats to ca…
jatezzz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
225 changes: 225 additions & 0 deletions
225
...l/src/main/java/org/appdevforall/codeonthego/computervision/domain/AndroidXmlGenerator.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,225 @@ | ||
| package org.appdevforall.codeonthego.computervision.domain | ||
|
|
||
| import org.appdevforall.codeonthego.computervision.domain.model.ScaledBox | ||
| import kotlin.text.substringAfterLast | ||
|
|
||
| class AndroidXmlGenerator( | ||
| private val geometryProcessor: LayoutGeometryProcessor | ||
| ) { | ||
| companion object { | ||
| private val WIDGET_TAGS = setOf("Switch", "CheckBox", "RadioButton") | ||
| } | ||
|
|
||
| internal fun buildXml( | ||
| boxes: List<ScaledBox>, | ||
| annotations: Map<ScaledBox, String>, | ||
| targetDpHeight: Int, | ||
| wrapInScroll: Boolean | ||
| ): String { | ||
| val xml = StringBuilder() | ||
| val maxBottom = boxes.maxOfOrNull { it.y + it.h } ?: 0 | ||
| val needScroll = wrapInScroll && maxBottom > targetDpHeight | ||
| val namespaces = | ||
| """xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"""" | ||
|
|
||
| xml.appendLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>") | ||
| if (needScroll) { | ||
| xml.appendLine("<ScrollView $namespaces android:layout_width=\"match_parent\" android:layout_height=\"match_parent\" android:fillViewport=\"true\">") | ||
| xml.appendLine(" <LinearLayout android:layout_width=\"match_parent\" android:layout_height=\"wrap_content\" android:orientation=\"vertical\" android:padding=\"16dp\">") | ||
| } else { | ||
| xml.appendLine("<LinearLayout $namespaces android:layout_width=\"match_parent\" android:layout_height=\"match_parent\" android:orientation=\"vertical\" android:padding=\"16dp\">") | ||
| } | ||
| xml.appendLine() | ||
|
|
||
| val rows = geometryProcessor.groupIntoRows(boxes) | ||
| val counters = mutableMapOf<String, Int>() | ||
| rows.forEach { row -> | ||
| if (row.size == 1) { | ||
| appendSimpleView(xml, row.first(), counters, " ", annotations) | ||
| } else { | ||
| appendHorizontalRow(xml, row, counters, annotations) | ||
| } | ||
| xml.appendLine() | ||
| } | ||
|
|
||
| xml.appendLine(if (needScroll) " </LinearLayout>\n</ScrollView>" else "</LinearLayout>") | ||
| return xml.toString() | ||
| } | ||
|
|
||
| private fun appendHorizontalRow( | ||
| xml: StringBuilder, | ||
| row: List<ScaledBox>, | ||
| counters: MutableMap<String, Int>, | ||
| annotations: Map<ScaledBox, String> | ||
| ) { | ||
| xml.appendLine( | ||
| """ | ||
| | <LinearLayout | ||
| | android:layout_width="match_parent" | ||
| | android:layout_height="wrap_content" | ||
| | android:orientation="horizontal" | ||
| | android:baselineAligned="false"> | ||
| """.trimMargin() | ||
| ) | ||
|
|
||
| row.forEachIndexed { index, box -> | ||
| val extraAttrs = if (index < row.lastIndex) { | ||
| val nextBox = row[index + 1] | ||
| val gap = (nextBox.x - (box.x + box.w)) | ||
| val marginEnd = maxOf(0, gap) | ||
|
|
||
| mapOf("android:layout_marginEnd" to "${marginEnd}dp") | ||
| } else { | ||
| emptyMap() | ||
| } | ||
| appendSimpleView(xml, box, counters, " ", annotations, extraAttrs) | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| xml.appendLine() | ||
| } | ||
|
|
||
| xml.append(" </LinearLayout>") | ||
| } | ||
|
|
||
| private fun escapeXmlAttr(value: String): String = | ||
| value.trim() | ||
| .replace("&", "&") | ||
| .replace("<", "<") | ||
| .replace(">", ">") | ||
| .replace("\"", """) | ||
| .replace("'", "'") | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| private fun viewTagFor(label: String): String = when (label) { | ||
| "text" -> "TextView" | ||
| "button" -> "Button" | ||
| "image_placeholder", "icon" -> "ImageView" | ||
| "checkbox_unchecked", "checkbox_checked" -> "CheckBox" | ||
| "radio_button_unchecked", "radio_button_checked" -> "RadioButton" | ||
| "switch_off", "switch_on" -> "Switch" | ||
| "text_entry_box" -> "EditText" | ||
| "dropdown" -> "Spinner" | ||
| "card" -> "androidx.cardview.widget.CardView" | ||
| "slider" -> "com.google.android.material.slider.Slider" | ||
| else -> "View" | ||
| } | ||
|
|
||
| private fun parseMarginAnnotations(annotation: String?, tag: String): Map<String, String> { | ||
| return FuzzyAttributeParser.parse(annotation, tag) | ||
| } | ||
|
|
||
| private fun appendSimpleView( | ||
| xml: StringBuilder, | ||
| box: ScaledBox, | ||
| counters: MutableMap<String, Int>, | ||
| indent: String, | ||
| annotations: Map<ScaledBox, String>, | ||
| extraAttrs: Map<String, String> = emptyMap() | ||
| ) { | ||
| val label = box.label | ||
| val tag = viewTagFor(label) | ||
| val count = counters.getOrPut(label) { 0 }.let { counters[label] = it + 1; it } | ||
| val defaultId = "${label.replace(Regex("[^a-zA-Z0-9_]"), "_")}_$count" | ||
|
|
||
| val parsedAttrs = parseMarginAnnotations(annotations[box], tag) | ||
| val attrs = extraAttrs + parsedAttrs | ||
|
|
||
| val width = attrs["android:layout_width"] ?: "wrap_content" | ||
| val height = attrs["android:layout_height"] ?: "wrap_content" | ||
| val id = attrs["android:id"]?.substringAfterLast('/') ?: defaultId | ||
|
|
||
| val writtenAttrs = mutableSetOf( | ||
| "android:id", "android:layout_width", "android:layout_height" | ||
| ) | ||
|
|
||
| xml.append("$indent<$tag\n") | ||
| xml.append("$indent android:id=\"@+id/${escapeXmlAttr(id)}\"\n") | ||
| xml.append("$indent android:layout_width=\"${escapeXmlAttr(width)}\"\n") | ||
| xml.append("$indent android:layout_height=\"${escapeXmlAttr(height)}\"\n") | ||
|
|
||
| when (tag) { | ||
| "TextView", "Button", "CheckBox", "RadioButton", "Switch" -> | ||
| appendTextWidgetAttributes(xml, indent, parsedAttrs, box, label, tag, writtenAttrs) | ||
|
|
||
| "EditText" -> | ||
| appendEditTextAttributes(xml, indent, parsedAttrs, box, writtenAttrs) | ||
|
|
||
| "ImageView" -> | ||
| appendImageViewAttributes(xml, indent, parsedAttrs, label, writtenAttrs) | ||
| } | ||
|
|
||
| attrs.forEach { (key, value) -> | ||
| if (key !in writtenAttrs) { | ||
| xml.append("$indent $key=\"${escapeXmlAttr(value)}\"\n") | ||
| writtenAttrs.add(key) | ||
| } | ||
| } | ||
| xml.append("$indent/>") | ||
| } | ||
|
|
||
| private fun appendTextWidgetAttributes( | ||
| xml: StringBuilder, | ||
| indent: String, | ||
| parsedAttrs: Map<String, String>, | ||
| box: ScaledBox, | ||
| label: String, | ||
| tag: String, | ||
| writtenAttrs: MutableSet<String> | ||
| ) { | ||
| val rawViewText = parsedAttrs["android:text"] | ||
| ?: box.text.takeIf { it.isNotEmpty() && it != box.label } | ||
| ?: if (tag in WIDGET_TAGS) tag else box.label | ||
|
|
||
| xml.append("$indent android:text=\"${escapeXmlAttr(rawViewText)}\"\n") | ||
| writtenAttrs.add("android:text") | ||
| if (tag == "TextView") { | ||
| val textSize = parsedAttrs["android:textSize"] ?: "16sp" | ||
| xml.append("$indent android:textSize=\"${escapeXmlAttr(textSize)}\"\n") | ||
| writtenAttrs.add("android:textSize") | ||
| } | ||
| if (label.contains("_checked") || label.contains("_on")) { | ||
| val checked = parsedAttrs["android:checked"] ?: "true" | ||
| xml.append("$indent android:checked=\"${escapeXmlAttr(checked)}\"\n") | ||
| writtenAttrs.add("android:checked") | ||
| } | ||
| xml.append("$indent tools:ignore=\"HardcodedText\"\n") | ||
| writtenAttrs.add("tools:ignore") | ||
| } | ||
|
|
||
| private fun appendEditTextAttributes( | ||
| xml: StringBuilder, | ||
| indent: String, | ||
| parsedAttrs: Map<String, String>, | ||
| box: ScaledBox, | ||
| writtenAttrs: MutableSet<String> | ||
| ) { | ||
| val rawHint = parsedAttrs["android:hint"] ?: box.text.ifEmpty { "Enter text..." } | ||
|
|
||
| xml.append("$indent android:hint=\"${escapeXmlAttr(rawHint)}\"\n") | ||
| writtenAttrs.add("android:hint") | ||
|
|
||
| val inputType = parsedAttrs["android:inputType"] ?: "text" | ||
| xml.append("$indent android:inputType=\"${escapeXmlAttr(inputType)}\"\n") | ||
| writtenAttrs.add("android:inputType") | ||
|
|
||
| xml.append("$indent tools:ignore=\"HardcodedText\"\n") | ||
| writtenAttrs.add("tools:ignore") | ||
| } | ||
|
|
||
| private fun appendImageViewAttributes( | ||
| xml: StringBuilder, | ||
| indent: String, | ||
| parsedAttrs: Map<String, String>, | ||
| label: String, | ||
| writtenAttrs: MutableSet<String> | ||
| ) { | ||
| val contentDescription = parsedAttrs["android:contentDescription"] ?: label | ||
| xml.append("$indent android:contentDescription=\"${escapeXmlAttr(contentDescription)}\"\n") | ||
| writtenAttrs.add("android:contentDescription") | ||
|
|
||
| val scaleType = parsedAttrs["android:scaleType"] ?: "centerCrop" | ||
| xml.append("$indent android:scaleType=\"${escapeXmlAttr(scaleType)}\"\n") | ||
| writtenAttrs.add("android:scaleType") | ||
|
|
||
| val bg = parsedAttrs["android:background"] ?: "#E0E0E0" | ||
| xml.append("$indent android:background=\"${escapeXmlAttr(bg)}\"\n") | ||
| writtenAttrs.add("android:background") | ||
| } | ||
| } | ||
119 changes: 119 additions & 0 deletions
119
...c/main/java/org/appdevforall/codeonthego/computervision/domain/LayoutGeometryProcessor.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package org.appdevforall.codeonthego.computervision.domain | ||
|
|
||
| import android.graphics.Rect | ||
| import org.appdevforall.codeonthego.computervision.domain.model.DetectionResult | ||
| import org.appdevforall.codeonthego.computervision.domain.model.ScaledBox | ||
| import kotlin.math.max | ||
| import kotlin.math.roundToInt | ||
|
|
||
| class LayoutGeometryProcessor { | ||
| companion object { | ||
| private const val MIN_W_ANY = 8 | ||
| private const val MIN_H_ANY = 8 | ||
| private const val OVERLAP_THRESHOLD = 0.6 | ||
| private const val VERTICAL_ALIGN_THRESHOLD = 20 | ||
| } | ||
|
|
||
| private class LayoutRow(initialBox: ScaledBox) { | ||
| private val _boxes = mutableListOf(initialBox) | ||
| val boxes: List<ScaledBox> get() = _boxes | ||
|
|
||
| var top: Int = initialBox.y | ||
| private set | ||
| var bottom: Int = initialBox.y + initialBox.h | ||
| private set | ||
|
|
||
| val height: Int get() = bottom - top | ||
| val centerY: Int get() = top + height / 2 | ||
|
|
||
| fun add(box: ScaledBox) { | ||
| _boxes.add(box) | ||
| top = minOf(top, box.y) | ||
| bottom = maxOf(bottom, box.y + box.h) | ||
| } | ||
|
|
||
| fun accepts(box: ScaledBox): Boolean { | ||
| val verticalOverlap = minOf(box.y + box.h, bottom) - maxOf(box.y, top) | ||
| val minHeight = minOf(box.h, height).coerceAtLeast(1) | ||
| val overlapRatio = verticalOverlap.toFloat() / minHeight.toFloat() | ||
| val centerDelta = kotlin.math.abs(box.centerY - centerY) | ||
| val centerThreshold = max(VERTICAL_ALIGN_THRESHOLD, minHeight / 2) | ||
|
|
||
| return overlapRatio >= OVERLAP_THRESHOLD || centerDelta <= centerThreshold | ||
| } | ||
| } | ||
|
|
||
| internal fun assignTextToParents(parents: List<ScaledBox>, texts: List<ScaledBox>, allBoxes: List<ScaledBox>): List<ScaledBox> { | ||
| val consumedTexts = mutableSetOf<ScaledBox>() | ||
| val updatedParents = mutableMapOf<ScaledBox, ScaledBox>() | ||
|
|
||
| for (parent in parents) { | ||
| texts.firstOrNull { text -> | ||
| !consumedTexts.contains(text) && | ||
| Rect(parent.rect).let { intersection -> | ||
| intersection.intersect(text.rect) && | ||
| (intersection.width() * intersection.height()).let { intersectionArea -> | ||
| val textArea = text.w * text.h | ||
| textArea > 0 && (intersectionArea.toFloat() / textArea.toFloat()) > OVERLAP_THRESHOLD | ||
| } | ||
| } | ||
| }?.let { | ||
| updatedParents[parent] = parent.copy(text = it.text) | ||
| consumedTexts.add(it) | ||
| } | ||
| } | ||
|
|
||
| return allBoxes.mapNotNull { box -> | ||
| when { | ||
| consumedTexts.contains(box) -> null | ||
| updatedParents.containsKey(box) -> updatedParents[box] | ||
| else -> box | ||
| } | ||
| } | ||
| } | ||
|
|
||
| internal fun groupIntoRows(boxes: List<ScaledBox>): List<List<ScaledBox>> { | ||
| val rows = mutableListOf<LayoutRow>() | ||
|
|
||
| boxes.sortedWith(compareBy({ it.y }, { it.x })).forEach { box -> | ||
| val row = rows.firstOrNull { it.accepts(box) } | ||
| if (row == null) { | ||
| rows.add(LayoutRow(box)) | ||
| } else { | ||
| row.add(box) | ||
| } | ||
| } | ||
|
|
||
| return rows | ||
| .sortedBy { it.top } | ||
| .map { it.boxes.sortedBy(ScaledBox::x) } | ||
| } | ||
|
|
||
| internal fun scaleDetection( | ||
| detection: DetectionResult, sourceWidth: Int, sourceHeight: Int, targetW: Int, targetH: Int | ||
| ): ScaledBox { | ||
| if (sourceWidth == 0 || sourceHeight == 0) { | ||
| return ScaledBox(detection.label, detection.text, 0, 0, MIN_W_ANY, MIN_H_ANY, MIN_W_ANY / 2, MIN_H_ANY / 2, Rect(0, 0, MIN_W_ANY, MIN_H_ANY)) | ||
| } | ||
| val rect = detection.boundingBox | ||
| val normCx = ((rect.left + rect.right) / 2f) / sourceWidth.toFloat() | ||
| val normCy = ((rect.top + rect.bottom) / 2f) / sourceHeight.toFloat() | ||
| val normW = (rect.right - rect.left) / sourceWidth | ||
| val normH = (rect.bottom - rect.top) / sourceHeight | ||
| val x = max(0, ((normCx - normW / 2.0) * targetW).roundToInt()) | ||
| val y = max(0, ((normCy - normH / 2.0) * targetH).roundToInt()) | ||
| val w = max(MIN_W_ANY, (normW * targetW).roundToInt()) | ||
| val h = max(MIN_H_ANY, (normH * targetH).roundToInt()) | ||
| return ScaledBox( | ||
| detection.label, | ||
| detection.text, | ||
| x, | ||
| y, | ||
| w, | ||
| h, | ||
| x + w / 2, | ||
| y + h / 2, | ||
| Rect(x, y, x + w, y + h) | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.