Skip to content

ADFA-3615 | Group radio buttons together in XML generation #1219

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.

Sign up for GitHub

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 5 commits into from
Apr 21, 2026
Merged

ADFA-3615 | Group radio buttons together in XML generation #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34ab321
feat: group adjacent radio buttons into RadioGroup layout
jatezzz Apr 20, 2026
da52384
fix: add validation against detected IDs, removed card widget detecti…
jatezzz Apr 21, 2026
a181957
refactor: use android default slider for full compatibility
jatezzz Apr 21, 2026
dd45403
fix: removed unnecessary `scaleType` and `background` attributes to m…
jatezzz Apr 21, 2026
0b28785
fix: resolve manual/auto ID collisions, fix 0-index counter, and merg…
jatezzz Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
217 changes: 0 additions & 217 deletions ...l/src/main/java/org/appdevforall/codeonthego/computervision/domain/AndroidXmlGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,217 +0,0 @@
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)
xml.appendLine()
}

xml.append(" </LinearLayout>")
}

private fun escapeXmlAttr(value: String): String =
value.trim()
.replace("&", "&amp;")
.replace("<", "&lt;")
.replace(">", "&gt;")
.replace("\"", "&quot;")
.replace("'", "&apos;")

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")
}
}
64 changes: 64 additions & 0 deletions ...c/main/java/org/appdevforall/codeonthego/computervision/domain/LayoutGeometryProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ 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.LayoutItem
import org.appdevforall.codeonthego.computervision.domain.model.ScaledBox
import kotlin.math.max
import kotlin.math.roundToInt
Expand All @@ -14,6 +15,9 @@ class LayoutGeometryProcessor {
private const val VERTICAL_ALIGN_THRESHOLD = 20
}

private fun isRadioButton(box: ScaledBox): Boolean =
box.label == "radio_button_unchecked" || box.label == "radio_button_checked"

private class LayoutRow(initialBox: ScaledBox) {
private val _boxes = mutableListOf(initialBox)
val boxes: List<ScaledBox> get() = _boxes
Expand Down Expand Up @@ -116,4 +120,64 @@ class LayoutGeometryProcessor {
Rect(x, y, x + w, y + h)
)
}

private fun mergeRadioLabels(row: List<ScaledBox>): List<ScaledBox> {
val merged = mutableListOf<ScaledBox>()
var i = 0

while (i < row.size) {
val current = row[i]

if (isRadioButton(current) && i + 1 < row.size && row[i + 1].label == "text") {
val nextText = row[i + 1]
merged.add(current.copy(text = nextText.text))
i += 2
}
else if (current.label == "text" && i + 1 < row.size && isRadioButton(row[i + 1])) {
val nextRadio = row[i + 1]
merged.add(nextRadio.copy(text = current.text))
i += 2
}
else {
merged.add(current)
i++
}
}
return merged
}

internal fun buildLayoutTree(boxes: List<ScaledBox>): List<LayoutItem> {
val rows = groupIntoRows(boxes)
val items = mutableListOf<LayoutItem>()
val verticalRadioRun = mutableListOf<ScaledBox>()

fun flushVerticalRadioRun() {
if (verticalRadioRun.isNotEmpty()) {
items.add(LayoutItem.RadioGroup(verticalRadioRun.toList(), "vertical"))
verticalRadioRun.clear()
}
}

rows.forEach { rawRow ->
val row = mergeRadioLabels(rawRow)
when {
row.all { isRadioButton(it) } && row.size == 1 -> verticalRadioRun.add(row.first())
row.all { isRadioButton(it) } -> {
flushVerticalRadioRun()
items.add(LayoutItem.RadioGroup(row, "horizontal"))
}
else -> {
flushVerticalRadioRun()
if (row.size == 1) {
items.add(LayoutItem.SimpleView(row.first()))
} else {
items.add(LayoutItem.HorizontalRow(row))
}
}
}
}
flushVerticalRadioRun()

return items
}
Comment thread
jatezzz marked this conversation as resolved.
}
1 change: 1 addition & 0 deletions ...ml/src/main/java/org/appdevforall/codeonthego/computervision/domain/YoloToXmlConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.appdevforall.codeonthego.computervision.domain

import org.appdevforall.codeonthego.computervision.domain.model.DetectionResult
import org.appdevforall.codeonthego.computervision.domain.xml.AndroidXmlGenerator
import kotlin.comparisons.compareBy

class YoloToXmlConverter(
Expand Down
7 changes: 7 additions & 0 deletions ...-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/model/LayoutItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.appdevforall.codeonthego.computervision.domain.model

sealed interface LayoutItem {
data class SimpleView(val box: ScaledBox) : LayoutItem
data class HorizontalRow(val row: List<ScaledBox>) : LayoutItem
data class RadioGroup(val boxes: List<ScaledBox>, val orientation: String) : LayoutItem
}
Loading
Loading