diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ad77196c36..442c447298 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -323,7 +323,6 @@ dependencies {
implementation(projects.layouteditor)
implementation(projects.idetooltips)
- implementation(projects.cvImageToXml)
implementation(projects.composePreview)
implementation(projects.gitCore)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e1f73811c1..91ca818848 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
+
+
+
+
+
+
+
+ Log.e(TAG, "Failed to instantiate plugin fragment: $fragmentClassName", error)
+ finish()
+ return
+ }
+
+ supportFragmentManager.beginTransaction()
+ .replace(R.id.plugin_screen_container, fragment, TAG_PLUGIN_SCREEN)
+ .commit()
+ }
+
+ override fun onDestroy() {
+ val pluginId = pluginId
+ val fragmentClassName = fragmentClassName
+
+ if (!pluginId.isNullOrBlank() && !fragmentClassName.isNullOrBlank()) {
+ PluginFragmentFactory.unregisterPluginClassLoader(pluginId, listOf(fragmentClassName))
+ }
+
+ super.onDestroy()
+ }
+
+ companion object {
+ private const val TAG = "PluginScreenActivity"
+ private const val TAG_PLUGIN_SCREEN = "plugin_screen"
+ }
+}
diff --git a/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt b/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt
index 3369b0edc3..e2d50f51d3 100755
--- a/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt
+++ b/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt
@@ -46,7 +46,6 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.plus
-import org.appdevforall.codeonthego.computervision.di.computerVisionModule
import org.jetbrains.kotlin.cli.jvm.compiler.setupIdeaStandaloneExecution
import org.koin.android.ext.koin.androidContext
import org.koin.core.context.GlobalContext
@@ -198,7 +197,7 @@ class IDEApplication :
runCatching { GlobalContext.get() }.getOrNull()?.let { return }
startKoin {
androidContext(this@IDEApplication)
- modules(coreModule, pluginModule, computerVisionModule)
+ modules(coreModule, pluginModule)
}
}
diff --git a/app/src/main/java/com/itsaky/androidide/utils/EditorActivityActions.kt b/app/src/main/java/com/itsaky/androidide/utils/EditorActivityActions.kt
index 0a3e898137..0376e3c57c 100644
--- a/app/src/main/java/com/itsaky/androidide/utils/EditorActivityActions.kt
+++ b/app/src/main/java/com/itsaky/androidide/utils/EditorActivityActions.kt
@@ -58,7 +58,6 @@ import com.itsaky.androidide.actions.text.RedoAction
import com.itsaky.androidide.actions.text.UndoAction
import com.itsaky.androidide.actions.PluginActionItem
import com.itsaky.androidide.actions.build.PluginBuildActionItem
-import com.itsaky.androidide.actions.etc.GenerateXMLAction
import com.itsaky.androidide.plugins.extensions.UIExtension
import com.itsaky.androidide.plugins.manager.build.PluginBuildActionManager
import com.itsaky.androidide.plugins.manager.core.PluginManager
@@ -101,9 +100,6 @@ class EditorActivityActions {
registry.registerAction(FindInProjectAction(context, order++))
registry.registerAction(LaunchAppAction(context, order++))
registry.registerAction(DisconnectLogSendersAction(context, order++))
- if (FeatureFlags.isExperimentsEnabled) {
- registry.registerAction(action = GenerateXMLAction(context, order = order++))
- }
// Plugin contributions
order = registerPluginActions(context, registry, order)
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..76a5a4393e
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+
+
+ - ${item.escapeXmlAttr()}
")
- }
- builder.appendLine(" ")
- }
-
- return builder.toString().trimEnd()
- }
-
- private fun appendHeaders(context: XmlContext, needScroll: Boolean) {
- 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""""
- context.appendLine("")
-
- if (needScroll) {
- context.appendLine("")
- context.appendLine(" ")
- } else {
- context.appendLine("")
- }
- context.appendLine()
- }
-
- private fun appendFooters(context: XmlContext, needScroll: Boolean) {
- context.appendLine(if (needScroll) " \n" else "")
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/LayoutRenderer.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/LayoutRenderer.kt
deleted file mode 100644
index 35b558c441..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/LayoutRenderer.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.appdevforall.codeonthego.computervision.domain.xml
-
-import org.appdevforall.codeonthego.computervision.domain.model.LayoutItem
-import org.appdevforall.codeonthego.computervision.domain.model.ScaledBox
-
-class LayoutRenderer(
- private val context: XmlContext,
- annotations: Map,
- selectedImageOverrides: Map = emptyMap()
-) {
- private val widgetFactory = WidgetFactory(context, annotations, selectedImageOverrides)
-
- fun render(item: LayoutItem, indent: String = " ") {
- val widgets = widgetFactory.createWidgets(item)
-
- widgets.forEach { widget ->
- widget.render(context, indent)
- context.appendLine()
- }
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/WidgetFactory.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/WidgetFactory.kt
deleted file mode 100644
index 2fd1210782..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/WidgetFactory.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.appdevforall.codeonthego.computervision.domain.xml
-
-import org.appdevforall.codeonthego.computervision.domain.model.LayoutItem
-import org.appdevforall.codeonthego.computervision.domain.model.ScaledBox
-import org.appdevforall.codeonthego.computervision.domain.parser.AttributeKey
-import org.appdevforall.codeonthego.computervision.domain.parser.FuzzyAttributeParser
-
-class WidgetFactory(
- private val context: XmlContext,
- private val annotations: Map,
- private val selectedImageOverrides: Map = emptyMap()
-) {
- private val checkboxGroupIdPattern = Regex("^cb_group_\\d+$")
- private val radioChildGroupIdPatterns = listOf(
- Regex("^rb_group(?:_\\d+)?(?:_|$).*"),
- Regex("^radio_group(?:_\\d+)?(?:_|$).*")
- )
-
- fun createWidgets(item: LayoutItem): List = when (item) {
- is LayoutItem.SimpleView -> createWidgetsForBox(item.box)
- is LayoutItem.HorizontalRow -> createHorizontalRow(item)
- is LayoutItem.RadioGroup -> createRadioGroup(item)
- is LayoutItem.CheckboxGroup -> createCheckboxGroup(item)
- }
-
- private fun createHorizontalRow(item: LayoutItem.HorizontalRow): List {
- val children = item.row.flatMapIndexed { index, box ->
- val extraAttrs = getMarginEndForHorizontalGap(item.row, index)
- createWidgetsForBox(box, extraAttrs = extraAttrs)
- }
- return listOf(HorizontalRowWidget(children))
- }
-
- private fun createWidgetsForBox(
- box: ScaledBox,
- extraAttrs: Map = emptyMap(),
- idOverride: String? = null,
- parsedAttrsOverride: Map? = null
- ): List {
- val widgets = mutableListOf()
-
- val dropdownTitle = box.text
- .takeIf { box.label == "dropdown" }
- ?.let(::extractDropdownTitle)
-
- if (dropdownTitle != null) {
- val titleBox = box.copy(label = "text", text = dropdownTitle)
-
- val titleAttrs = mapOf(
- AttributeKey.WIDTH.xmlName to AndroidConstants.WRAP_CONTENT,
- AttributeKey.HEIGHT.xmlName to AndroidConstants.WRAP_CONTENT,
- AttributeKey.LAYOUT_MARGIN_BOTTOM.xmlName to "4dp",
- AttributeKey.TEXT.xmlName to dropdownTitle,
- AttributeKey.TEXT_STYLE.xmlName to "bold"
- )
- widgets.add(createSimpleWidget(titleBox, parsedAttrsOverride = titleAttrs))
-
- val baseParsedAttrs = parsedAttrsOverride?.toMutableMap()
- ?: FuzzyAttributeParser.parse(annotations[box], AndroidWidget.getTagFor(box.label)).toMutableMap()
- baseParsedAttrs.remove(AttributeKey.TEXT.xmlName)
-
- val spinnerBox = box.copy(text = "")
- widgets.add(createSimpleWidget(spinnerBox, extraAttrs, idOverride, baseParsedAttrs))
-
- return widgets
- }
-
- widgets.add(createSimpleWidget(box, extraAttrs, idOverride, parsedAttrsOverride))
- return widgets
- }
-
- private fun createRadioGroup(item: LayoutItem.RadioGroup): List {
- val groupAnnotation = item.boxes.firstNotNullOfOrNull { annotations[it] }
- val fullGroupAttrs = FuzzyAttributeParser.parse(groupAnnotation, "RadioGroup")
-
- val groupId = resolveRadioGroupId(fullGroupAttrs["android:id"]?.substringAfterLast('/'))
-
- val groupStructuralAttrs = setOf("android:id", "android:layout_width", "android:layout_height", "android:orientation")
- val sharedAttrs = fullGroupAttrs.filterKeys { it !in groupStructuralAttrs }
-
- var checkedId: String? = null
-
- val children = item.boxes.mapIndexed { index, box ->
- val parsedAttrs = (sharedAttrs + FuzzyAttributeParser.parse(annotations[box], "RadioButton")).toMutableMap()
-
- if (parsedAttrs["android:id"] == fullGroupAttrs["android:id"]) {
- parsedAttrs.remove("android:id")
- }
-
- val requestedId = parsedAttrs["android:id"]?.substringAfterLast('/')
- val childId = if (requestedId != null && radioChildGroupIdPatterns.any { it.matches(requestedId) }) {
- context.nextId("radio_button")
- } else {
- context.resolveId(requestedId, "radio_button")
- }
-
- val isChecked = box.label == "radio_button_checked" || parsedAttrs["android:checked"]?.equals("true", ignoreCase = true) == true
- if (isChecked) {
- checkedId = childId
- parsedAttrs["android:checked"] = "true"
- } else {
- parsedAttrs["android:checked"] = "false"
- }
-
- val extraAttrs = if (item.orientation == "horizontal") {
- getMarginEndForHorizontalGap(item.boxes, index)
- } else emptyMap()
-
- createSimpleWidget(box, parsedAttrsOverride = parsedAttrs, idOverride = childId, extraAttrs = extraAttrs)
- }
-
- val textStyleAttrs = setOf("android:textColor", "android:textSize", "android:textStyle", "android:fontFamily")
- val groupFinalAttrs = fullGroupAttrs.filterKeys { it !in textStyleAttrs }.toMutableMap()
- groupFinalAttrs["android:id"] = groupId
-
- return listOf(RadioGroupWidget(groupFinalAttrs, children, item.orientation, checkedId))
- }
-
- private fun createCheckboxGroup(item: LayoutItem.CheckboxGroup): List {
- val groupAnnotation = item.boxes.firstNotNullOfOrNull { annotations[it] }
- val parsedAttrs = FuzzyAttributeParser.parse(groupAnnotation, "CheckBox")
-
- val requestedId = parsedAttrs["android:id"]?.substringAfterLast('/')
- val baseId = if (requestedId != null && checkboxGroupIdPattern.matches(requestedId)) {
- context.resolveId(requestedId, "cb_group")
- } else {
- context.nextId("cb_group", initialIndex = 1)
- }
-
- return item.boxes.mapIndexed { index, box ->
- val suffix = ('a' + index).toString()
- val childId = "${baseId}_$suffix"
-
- val safeAttrs = parsedAttrs.toMutableMap()
- safeAttrs.remove("android:id")
-
- val extraAttrs = if (item.orientation == "horizontal") {
- getMarginEndForHorizontalGap(item.boxes, index)
- } else emptyMap()
-
- createSimpleWidget(box, parsedAttrsOverride = safeAttrs, idOverride = childId, extraAttrs = extraAttrs)
- }
- }
-
- private fun createSimpleWidget(
- box: ScaledBox,
- extraAttrs: Map = emptyMap(),
- idOverride: String? = null,
- parsedAttrsOverride: Map? = null
- ): AndroidWidget {
- val tag = AndroidWidget.getTagFor(box.label)
- val parsedAttrs = parsedAttrsOverride?.toMutableMap()
- ?: FuzzyAttributeParser.parse(annotations[box], tag).toMutableMap()
-
- selectedImageOverrides[box]?.let { drawableReference ->
- parsedAttrs["android:src"] = drawableReference
- }
-
- return AndroidWidget.create(box, parsedAttrs).apply {
- this.idOverride = idOverride
- this.extraAttrs = extraAttrs
- }
- }
-
- private fun extractDropdownTitle(rawText: String): String? {
- val cleaned = rawText.trim()
- .replace(Regex("\\s*[▼▽▾▿⌄˅∨]$|\\s+[vV]$"), "")
- .replace(Regex("^[vV]\\s+"), "")
- .trim()
-
- return cleaned.takeIf { it.isNotBlank() && !it.equals("dropdown", ignoreCase = true) }
- }
-
- private fun getMarginEndForHorizontalGap(boxes: List, currentIndex: Int): Map {
- if (currentIndex >= boxes.lastIndex) return emptyMap()
- val currentBox = boxes[currentIndex]
- val nextBox = boxes[currentIndex + 1]
- val gap = maxOf(0, nextBox.x - (currentBox.x + currentBox.w))
- return mapOf("android:layout_marginEnd" to "${gap}dp")
- }
-
- private fun resolveRadioGroupId(requestedId: String?): String {
- var cleanId = requestedId
- if (requestedId != null) {
- val normalizedId = requestedId.lowercase()
- when {
- normalizedId.startsWith("radio_grou") -> cleanId = "radio_group"
- normalizedId.startsWith("rb_grou") || normalizedId.startsWith("rb_group") -> cleanId = "rb_group"
- }
- }
- return context.resolveId(cleanId, "radio_group")
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/XmlContext.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/XmlContext.kt
deleted file mode 100644
index 737e60f4a2..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/domain/xml/XmlContext.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.appdevforall.codeonthego.computervision.domain.xml
-
-class XmlContext(
- val builder: StringBuilder = StringBuilder(),
- private val counters: MutableMap = mutableMapOf()
-) {
- private val usedIds = mutableSetOf()
- val stringArrays = mutableMapOf>()
-
- fun nextId(label: String, initialIndex: Int = 0): String {
- val safeLabel = label.replace(Regex("[^a-zA-Z0-9_]"), "_")
-
- var count = counters.getOrDefault(safeLabel, initialIndex - 1)
- var newId: String
-
- do {
- count++
- newId = "${safeLabel}_$count"
- } while (usedIds.contains(newId))
-
- counters[safeLabel] = count
- usedIds.add(newId)
-
- return newId
- }
-
- fun registerId(id: String) {
- usedIds.add(id)
- }
-
- fun resolveId(requestedId: String?, fallbackLabel: String): String {
- return if (requestedId != null) {
- registerId(requestedId)
- requestedId
- } else {
- nextId(fallbackLabel)
- }
- }
-
- fun appendLine(text: String = "") {
- builder.appendLine(text)
- }
-
- fun append(text: String) {
- builder.append(text)
- }
-
- override fun toString(): String = builder.toString()
-}
-
-fun String.escapeXmlAttr(): String = this.trim()
- .replace("&", "&")
- .replace("<", "<")
- .replace(">", ">")
- .replace("\"", """)
- .replace("'", "'")
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionActivity.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionActivity.kt
deleted file mode 100644
index 773682763c..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionActivity.kt
+++ /dev/null
@@ -1,235 +0,0 @@
-package org.appdevforall.codeonthego.computervision.ui
-
-import android.Manifest
-import android.content.ContentValues
-import android.content.Intent
-import android.os.Bundle
-import android.provider.MediaStore
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.itsaky.androidide.FeedbackButtonManager
-import kotlinx.coroutines.launch
-import org.appdevforall.codeonthego.computervision.R
-import org.appdevforall.codeonthego.computervision.databinding.ActivityComputerVisionBinding
-import org.appdevforall.codeonthego.computervision.ui.viewmodel.ComputerVisionViewModel
-import org.appdevforall.codeonthego.computervision.utils.DetectionVisualizer
-import org.appdevforall.codeonthego.computervision.utils.XmlFileManager
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class ComputerVisionActivity : AppCompatActivity() {
-
- private lateinit var binding: ActivityComputerVisionBinding
- private var feedbackButtonManager: FeedbackButtonManager? = null
-
- private val detectionVisualizer by lazy { DetectionVisualizer(this) }
- private val xmlFileManager by lazy { XmlFileManager(this) }
-
- private val viewModel: ComputerVisionViewModel by viewModel {
- parametersOf(
- intent.getStringExtra(EXTRA_LAYOUT_FILE_PATH),
- intent.getStringExtra(EXTRA_LAYOUT_FILE_NAME)
- )
- }
-
- private var currentCameraUri: android.net.Uri? = null
-
- private val pickImageLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
- uri?.let { viewModel.onEvent(ComputerVisionEvent.ImageSelected(it)) }
- ?: Toast.makeText(this, R.string.msg_no_image_selected, Toast.LENGTH_SHORT).show()
- }
-
- private val takePictureLauncher = registerForActivityResult(ActivityResultContracts.TakePicture()) { success ->
- currentCameraUri?.let { uri ->
- viewModel.onEvent(ComputerVisionEvent.ImageCaptured(uri, success))
- }
- }
-
- private val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
- if (granted) launchCamera()
- else Toast.makeText(this, R.string.msg_camera_permission_required, Toast.LENGTH_LONG).show()
- }
-
- private val pickPlaceholderImageLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
- uri?.let { viewModel.onEvent(ComputerVisionEvent.PlaceholderImageSelected(it)) }
- ?: Toast.makeText(this, R.string.msg_no_image_selected, Toast.LENGTH_SHORT).show()
- }
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- binding = ActivityComputerVisionBinding.inflate(layoutInflater)
- setContentView(binding.root)
-
- setupToolbar()
- setupClickListeners()
- observeViewModel()
- setupFeedbackButton()
- setupGuidelines()
- }
-
- private fun setupToolbar() {
- setSupportActionBar(binding.toolbar)
- supportActionBar?.setDisplayHomeAsUpEnabled(true)
- binding.toolbar.setNavigationOnClickListener { finish() }
- }
-
- private fun setupClickListeners() {
- with(binding) {
- imageView.setOnClickListener { viewModel.onEvent(ComputerVisionEvent.OpenImagePicker) }
- detectButton.setOnClickListener { viewModel.onEvent(ComputerVisionEvent.RunDetection) }
- updateButton.setOnClickListener { viewModel.onEvent(ComputerVisionEvent.UpdateLayoutFile) }
- saveButton.setOnClickListener { viewModel.onEvent(ComputerVisionEvent.SaveToDownloads) }
- imageView.onImageTapListener = ::handleImageTap
- }
- }
-
- private fun observeViewModel() {
- lifecycleScope.launch {
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- viewModel.onScreenStarted()
- launch { viewModel.uiState.collect { updateUi(it) } }
- launch { viewModel.uiEffect.collect { handleEffect(it) } }
- }
- }
- }
-
- private fun setupFeedbackButton(){
- feedbackButtonManager = FeedbackButtonManager(activity = this, feedbackFab = binding.fabFeedback)
- feedbackButtonManager?.setupDraggableFab()
- }
-
- private fun setupGuidelines() {
- binding.imageView.onMatrixChangeListener = { matrix ->
- binding.guidelinesView.updateMatrix(matrix)
- }
- binding.guidelinesView.onGuidelinesChanged = { left, right ->
- viewModel.onEvent(ComputerVisionEvent.UpdateGuides(left, right))
- }
- }
-
- private fun updateUi(state: ComputerVisionUiState) {
- val displayBitmap = if (state.hasDetections && state.currentBitmap != null) {
- detectionVisualizer.visualize(
- bitmap = state.currentBitmap,
- detections = state.detections,
- selectedPlaceholderIds = state.selectedImagesByPlaceholderId.keys
- )
- } else {
- detectionVisualizer.clearCache()
- state.currentBitmap
- }
-
- binding.imageView.setImageBitmap(displayBitmap)
- state.currentBitmap?.let {
- binding.guidelinesView.setImageDimensions(it.width, it.height)
- }
- binding.guidelinesView.updateGuidelines(state.leftGuidePct, state.rightGuidePct)
-
- binding.detectButton.isEnabled = state.canRunDetection
- binding.updateButton.isEnabled = state.canGenerateXml
- binding.saveButton.isEnabled = state.canGenerateXml
- }
-
- private fun handleEffect(effect: ComputerVisionEffect) {
- when (effect) {
- ComputerVisionEffect.OpenImagePicker -> pickImageLauncher.launch("image/*")
- ComputerVisionEffect.RequestCameraPermission ->
- requestPermissionLauncher.launch(Manifest.permission.CAMERA)
- is ComputerVisionEffect.LaunchCamera -> {
- currentCameraUri = effect.outputUri
- takePictureLauncher.launch(effect.outputUri)
- }
- is ComputerVisionEffect.ShowToast ->
- Toast.makeText(this, effect.messageResId, Toast.LENGTH_SHORT).show()
- is ComputerVisionEffect.ShowError ->
- Toast.makeText(this, effect.message, Toast.LENGTH_LONG).show()
- is ComputerVisionEffect.ShowConfirmDialog ->
- showUpdateConfirmationDialog(effect.fileName)
- is ComputerVisionEffect.ReturnXmlResult -> returnXmlResult(effect.layoutXml, effect.stringsXml)
- ComputerVisionEffect.NavigateBack -> finish()
- ComputerVisionEffect.OpenPlaceholderImagePicker ->
- pickPlaceholderImageLauncher.launch("image/*")
- is ComputerVisionEffect.FileSaved -> saveXmlFile(effect.fileName)
- }
- }
-
- /**
- * Handles tap events on the image view, determining whether the user tapped
- * a delete action or a general placeholder, and routes the event to the ViewModel.
- *
- * @param imageX The X coordinate of the tap on the original image.
- * @param imageY The Y coordinate of the tap on the original image.
- * @return True if the tap was handled, false otherwise.
- */
- private fun handleImageTap(imageX: Float, imageY: Float): Boolean {
- val tappedDeleteId = detectionVisualizer.getTappedDeleteIconId(imageX, imageY)
- if (tappedDeleteId != null) {
- viewModel.onEvent(ComputerVisionEvent.RemovePlaceholderImage(tappedDeleteId))
- return true
- }
-
- if (!viewModel.isImagePlaceholderAt(imageX, imageY)) return false
-
- viewModel.onEvent(ComputerVisionEvent.ImagePlaceholderTapped(imageX, imageY))
- return true
- }
-
- private fun saveXmlFile(xmlString: String) {
- val result = xmlFileManager.saveXmlToDownloads(xmlString)
- result.onSuccess { fileName ->
- Toast.makeText(this, getString(R.string.msg_saved_to_downloads, fileName), Toast.LENGTH_LONG).show()
- }.onFailure { error ->
- Toast.makeText(this, getString(R.string.msg_error_saving_file, error.message), Toast.LENGTH_SHORT).show()
- }
- }
-
- private fun showUpdateConfirmationDialog(fileName: String) {
- MaterialAlertDialogBuilder(this)
- .setTitle(R.string.title_update_layout)
- .setMessage(getString(R.string.msg_overwrite_layout, fileName))
- .setNegativeButton(R.string.no, null)
- .setPositiveButton(R.string.yes) { dialog, _ ->
- dialog.dismiss()
- viewModel.onEvent(ComputerVisionEvent.ConfirmUpdate)
- }
- .setCancelable(false)
- .show()
- }
-
- private fun returnXmlResult(layoutXml: String, stringsXml: String) {
- setResult(RESULT_OK, Intent().apply {
- putExtra(RESULT_GENERATED_XML, layoutXml)
- putExtra(RESULT_GENERATED_STRINGS, stringsXml)
- putExtra(EXTRA_LAYOUT_FILE_PATH, intent.getStringExtra(EXTRA_LAYOUT_FILE_PATH))
- })
- finish()
- }
-
- private fun launchCamera() {
- val values = ContentValues().apply {
- put(MediaStore.Images.Media.TITLE, getString(R.string.camera_picture_title))
- put(MediaStore.Images.Media.DESCRIPTION, getString(R.string.camera_picture_description))
- }
- contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values)?.let { uri ->
- currentCameraUri = uri
- takePictureLauncher.launch(uri)
- }
- }
-
- override fun onResume() {
- super.onResume()
- feedbackButtonManager?.loadFabPosition()
- }
-
- companion object {
- const val EXTRA_LAYOUT_FILE_PATH = "com.example.images.LAYOUT_FILE_PATH"
- const val EXTRA_LAYOUT_FILE_NAME = "com.example.images.LAYOUT_FILE_NAME"
- const val RESULT_GENERATED_XML = "ide.uidesigner.generatedXml"
- const val RESULT_GENERATED_STRINGS = "ide.uidesigner.generatedStrings"
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionEvent.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionEvent.kt
deleted file mode 100644
index 857a4d5ca2..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionEvent.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.appdevforall.codeonthego.computervision.ui
-
-import android.net.Uri
-
-sealed class ComputerVisionEvent {
- data class ImageSelected(val uri: Uri) : ComputerVisionEvent()
- data class ImageCaptured(val uri: Uri, val success: Boolean) : ComputerVisionEvent()
- object RunDetection : ComputerVisionEvent()
- object UpdateLayoutFile : ComputerVisionEvent()
- object ConfirmUpdate : ComputerVisionEvent()
- object SaveToDownloads : ComputerVisionEvent()
- object OpenImagePicker : ComputerVisionEvent()
- object RequestCameraPermission : ComputerVisionEvent()
- data class UpdateGuides(val leftPct: Float, val rightPct: Float) : ComputerVisionEvent()
- data class ImagePlaceholderTapped(val imageX: Float, val imageY: Float) : ComputerVisionEvent()
- data class PlaceholderImageSelected(val uri: Uri) : ComputerVisionEvent()
- data class RemovePlaceholderImage(val placeholderId: String) : ComputerVisionEvent()
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionUiState.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionUiState.kt
deleted file mode 100644
index 69f010b23d..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ComputerVisionUiState.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.appdevforall.codeonthego.computervision.ui
-
-import android.graphics.Bitmap
-import android.net.Uri
-import org.appdevforall.codeonthego.computervision.domain.model.DetectionResult
-
-data class ComputerVisionUiState(
- val currentBitmap: Bitmap? = null,
- val imageUri: Uri? = null,
- val detections: List = emptyList(),
- val visualizedBitmap: Bitmap? = null,
- val layoutFilePath: String? = null,
- val layoutFileName: String? = null,
- val isModelInitialized: Boolean = false,
- val currentOperation: CvOperation = CvOperation.Idle,
- val leftGuidePct: Float = 0.2f,
- val rightGuidePct: Float = 0.8f,
- val parsedAnnotations: Map = emptyMap(), // Replaced old marginAnnotations
- val pendingImagePlaceholderId: String? = null,
- val selectedImagesByPlaceholderId: Map = emptyMap()
-) {
- val hasImage: Boolean
- get() = currentBitmap != null
-
- val hasDetections: Boolean
- get() = detections.isNotEmpty()
-
- val canRunDetection: Boolean
- get() = hasImage && isModelInitialized && currentOperation == CvOperation.Idle
-
- val canGenerateXml: Boolean
- get() = hasDetections && currentOperation == CvOperation.Idle
-}
-
-sealed class CvOperation {
- object Idle : CvOperation()
- object InitializingModel : CvOperation()
- object RunningYolo : CvOperation()
- object RunningOcr : CvOperation()
- object MergingDetections : CvOperation()
- object GeneratingXml : CvOperation()
- object SavingFile : CvOperation()
-}
-
-sealed class ComputerVisionEffect {
- object OpenImagePicker : ComputerVisionEffect()
- object RequestCameraPermission : ComputerVisionEffect()
- data class LaunchCamera(val outputUri: Uri) : ComputerVisionEffect()
- data class ShowToast(val messageResId: Int) : ComputerVisionEffect()
- data class ShowError(val message: String) : ComputerVisionEffect()
- data class ShowConfirmDialog(val fileName: String) : ComputerVisionEffect()
- data class ReturnXmlResult(val layoutXml: String, val stringsXml: String) : ComputerVisionEffect()
- data class FileSaved(val fileName: String) : ComputerVisionEffect()
- object NavigateBack : ComputerVisionEffect()
- object OpenPlaceholderImagePicker : ComputerVisionEffect()
-}
-
-data class SelectedImportedImage(
- val resourceName: String,
- val drawableReference: String
-)
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/GuidelinesView.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/GuidelinesView.kt
deleted file mode 100644
index d1ea9ffdda..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/GuidelinesView.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.appdevforall.codeonthego.computervision.ui
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Matrix
-import android.graphics.Paint
-import android.graphics.RectF
-import android.util.AttributeSet
-import android.view.MotionEvent
-import android.view.View
-
-class GuidelinesView @JvmOverloads constructor(
- context: Context,
- attrs: AttributeSet? = null,
- defStyleAttr: Int = 0
-) : View(context, attrs, defStyleAttr) {
-
- private val linePaint = Paint().apply {
- color = Color.RED
- strokeWidth = 5f
- alpha = 180
- }
-
- private val textPaint = Paint().apply {
- color = Color.WHITE
- textSize = 40f
- textAlign = Paint.Align.CENTER
- setShadowLayer(5.0f, 0f, 0f, Color.BLACK)
- }
-
- private var leftGuidelinePct = 0.2f
- private var rightGuidelinePct = 0.8f
- private var draggingLine: Int = -1 // -1: none, 0: left, 1: right
- private val minDistancePct = 0.05f
-
- private val viewMatrix = Matrix()
- private val imageRect = RectF()
-
- var onGuidelinesChanged: ((Float, Float) -> Unit)? = null
-
- fun updateMatrix(matrix: Matrix) {
- viewMatrix.set(matrix)
- invalidate()
- }
-
- fun setImageDimensions(width: Int, height: Int) {
- imageRect.set(0f, 0f, width.toFloat(), height.toFloat())
- invalidate()
- }
-
- fun updateGuidelines(leftPct: Float, rightPct: Float) {
- leftGuidelinePct = leftPct
- rightGuidelinePct = rightPct
- invalidate()
- }
-
- override fun onDraw(canvas: Canvas) {
- super.onDraw(canvas)
- if (imageRect.isEmpty) return
-
- // 1. Define line X coordinates in the image's coordinate system
- val leftLineImageX = imageRect.width() * leftGuidelinePct
- val rightLineImageX = imageRect.width() * rightGuidelinePct
-
- // We only need the X coordinates for mapping
- val linePoints = floatArrayOf(leftLineImageX, 0f, rightLineImageX, 0f)
-
- // 2. Map image X coordinates to screen X coordinates
- viewMatrix.mapPoints(linePoints)
- val leftLineScreenX = linePoints[0]
- val rightLineScreenX = linePoints[2]
-
- // 3. Draw the lines across the full height of the view (screen)
- canvas.drawLine(leftLineScreenX, 0f, leftLineScreenX, height.toFloat(), linePaint)
- canvas.drawLine(rightLineScreenX, 0f, rightLineScreenX, height.toFloat(), linePaint)
-
- // 4. Draw the labels at the bottom of the screen
- val labelY = height - 60f
- canvas.drawText("Left Margin", leftLineScreenX, labelY, textPaint)
- canvas.drawText("Right Margin", rightLineScreenX, labelY, textPaint)
- }
-
- override fun onTouchEvent(event: MotionEvent): Boolean {
- if (imageRect.isEmpty) return false
-
- // Map screen touch coordinates to image coordinates for dragging
- val points = floatArrayOf(event.x, event.y)
- val invertedMatrix = Matrix()
- viewMatrix.invert(invertedMatrix)
- invertedMatrix.mapPoints(points)
- val mappedX = points[0]
-
- when (event.action) {
- MotionEvent.ACTION_DOWN -> {
- val leftLineImageX = imageRect.width() * leftGuidelinePct
- val rightLineImageX = imageRect.width() * rightGuidelinePct
-
- val screenPointLeft = mapImageCoordsToScreenCoords(leftLineImageX, imageRect.centerY())
- val screenPointRight = mapImageCoordsToScreenCoords(rightLineImageX, imageRect.centerY())
-
- if (isCloseTo(event.x, screenPointLeft[0])) {
- draggingLine = 0
- return true
- } else if (isCloseTo(event.x, screenPointRight[0])) {
- draggingLine = 1
- return true
- }
- }
- MotionEvent.ACTION_MOVE -> {
- if (draggingLine != -1) {
- val newPct = (mappedX / imageRect.width()).coerceIn(0f, 1f)
- if (draggingLine == 0) {
- if (newPct < rightGuidelinePct - minDistancePct) {
- leftGuidelinePct = newPct
- }
- } else { // draggingLine == 1
- if (newPct > leftGuidelinePct + minDistancePct) {
- rightGuidelinePct = newPct
- }
- }
- onGuidelinesChanged?.invoke(leftGuidelinePct, rightGuidelinePct)
- invalidate()
- return true
- }
- }
- MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
- draggingLine = -1
- }
- }
- return false
- }
-
- private fun mapImageCoordsToScreenCoords(imageX: Float, imageY: Float): FloatArray {
- val point = floatArrayOf(imageX, imageY)
- viewMatrix.mapPoints(point)
- return point
- }
-
- private fun isCloseTo(x: Float, lineX: Float, threshold: Float = 40f): Boolean {
- return Math.abs(x - lineX) < threshold
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ZoomableImageView.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ZoomableImageView.kt
deleted file mode 100644
index 0f1b0aab69..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/ZoomableImageView.kt
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.appdevforall.codeonthego.computervision.ui
-
-import android.content.Context
-import android.graphics.Matrix
-import android.graphics.PointF
-import android.graphics.RectF
-import android.graphics.drawable.Drawable
-import android.util.AttributeSet
-import android.view.MotionEvent
-import android.view.ScaleGestureDetector
-import androidx.appcompat.widget.AppCompatImageView
-import kotlin.math.abs
-
-class ZoomableImageView @JvmOverloads constructor(
- context: Context,
- attrs: AttributeSet? = null,
- defStyleAttr: Int = 0
-) : AppCompatImageView(context, attrs, defStyleAttr) {
-
- private val currentMatrix = Matrix()
- private val matrixValues = FloatArray(9)
- private val scaleGestureDetector: ScaleGestureDetector
- private var last = PointF()
- private var start = PointF()
- private var minScale = 1f
- private var maxScale = 4f
- private var mode = NONE
-
- var onMatrixChangeListener: ((Matrix) -> Unit)? = null
- var onImageTapListener: ((Float, Float) -> Boolean)? = null
-
- init {
- super.setClickable(true)
- scaleGestureDetector = ScaleGestureDetector(context, ScaleListener())
- scaleType = ScaleType.MATRIX
- imageMatrix = currentMatrix
- }
-
- override fun onTouchEvent(event: MotionEvent): Boolean {
- scaleGestureDetector.onTouchEvent(event)
- val curr = PointF(event.x, event.y)
- when (event.action) {
- MotionEvent.ACTION_DOWN -> {
- last.set(curr)
- start.set(last)
- mode = DRAG
- }
- MotionEvent.ACTION_MOVE -> if (mode == DRAG) {
- val deltaX = curr.x - last.x
- val deltaY = curr.y - last.y
- val fixTransX = getFixDragTrans(deltaX, width.toFloat(), origWidth * scale)
- val fixTransY = getFixDragTrans(deltaY, height.toFloat(), origHeight * scale)
- currentMatrix.postTranslate(fixTransX, fixTransY)
- fixTrans()
- last.set(curr.x, curr.y)
- }
- MotionEvent.ACTION_UP -> {
- mode = NONE
- val xDiff = abs(curr.x - start.x).toInt()
- val yDiff = abs(curr.y - start.y).toInt()
- if (xDiff < CLICK && yDiff < CLICK) {
- val mappedPoint = mapViewPointToImage(event.x, event.y)
- val consumed = mappedPoint?.let {
- onImageTapListener?.invoke(it.x, it.y)
- } ?: false
-
- if (!consumed) {
- performClick()
- }
- }
- }
- MotionEvent.ACTION_POINTER_UP -> mode = NONE
- }
- imageMatrix = currentMatrix
- onMatrixChangeListener?.invoke(currentMatrix)
- return true
- }
-
- fun mapViewPointToImage(x: Float, y: Float): PointF? {
- val drawable = drawable ?: return null
- val points = floatArrayOf(x, y)
- val inverseMatrix = Matrix()
-
- if (!currentMatrix.invert(inverseMatrix)) return null
- inverseMatrix.mapPoints(points)
-
- val imageX = points[0]
- val imageY = points[1]
-
- return PointF(imageX, imageY).takeIf {
- it.x in 0f..drawable.intrinsicWidth.toFloat() &&
- it.y in 0f..drawable.intrinsicHeight.toFloat()
- }
- }
-
- override fun performClick(): Boolean {
- super.performClick()
- return true
- }
-
- override fun setImageDrawable(drawable: Drawable?) {
- super.setImageDrawable(drawable)
- fitToScreen()
- }
-
- override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
- super.onSizeChanged(w, h, oldw, oldh)
- fitToScreen()
- }
-
- private fun fitToScreen() {
- if (drawable == null || width == 0 || height == 0) {
- return
- }
-
- val drawableWidth = origWidth
- val drawableHeight = origHeight
-
- val viewRect = RectF(0f, 0f, width.toFloat(), height.toFloat())
- val drawableRect = RectF(0f, 0f, drawableWidth, drawableHeight)
-
- currentMatrix.setRectToRect(drawableRect, viewRect, Matrix.ScaleToFit.CENTER)
- imageMatrix = currentMatrix
- onMatrixChangeListener?.invoke(currentMatrix) // Notify listener of the change
-
- currentMatrix.getValues(matrixValues)
- minScale = matrixValues[Matrix.MSCALE_X]
- maxScale = minScale * 4
- }
-
- private inner class ScaleListener : ScaleGestureDetector.SimpleOnScaleGestureListener() {
- override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
- mode = ZOOM
- return true
- }
-
- override fun onScale(detector: ScaleGestureDetector): Boolean {
- var mScaleFactor = detector.scaleFactor
- val origScale = scale
- var currentScale = origScale * mScaleFactor
- if (currentScale > maxScale) {
- mScaleFactor = maxScale / origScale
- } else if (currentScale < minScale) {
- mScaleFactor = minScale / origScale
- }
- currentScale = origScale * mScaleFactor
- if (origWidth * currentScale <= width || origHeight * currentScale <= height) {
- currentMatrix.postScale(mScaleFactor, mScaleFactor, width / 2f, height / 2f)
- } else {
- currentMatrix.postScale(mScaleFactor, mScaleFactor, detector.focusX, detector.focusY)
- }
- fixTrans()
- return true
- }
- }
-
- private fun fixTrans() {
- currentMatrix.getValues(matrixValues)
- val transX = matrixValues[Matrix.MTRANS_X]
- val transY = matrixValues[Matrix.MTRANS_Y]
- val fixTransX = getFixTrans(transX, width.toFloat(), origWidth * scale)
- val fixTransY = getFixTrans(transY, height.toFloat(), origHeight * scale)
- if (fixTransX != 0f || fixTransY != 0f) {
- currentMatrix.postTranslate(fixTransX, fixTransY)
- }
- }
-
- private fun getFixTrans(trans: Float, viewSize: Float, contentSize: Float): Float {
- val minTrans: Float
- val maxTrans: Float
- if (contentSize <= viewSize) {
- minTrans = 0f
- maxTrans = viewSize - contentSize
- } else {
- minTrans = viewSize - contentSize
- maxTrans = 0f
- }
- if (trans < minTrans) return -trans + minTrans
- return if (trans > maxTrans) -trans + maxTrans else 0f
- }
-
- private fun getFixDragTrans(delta: Float, viewSize: Float, contentSize: Float): Float {
- return if (contentSize <= viewSize) {
- 0f
- } else delta
- }
-
- private val scale: Float
- get() {
- currentMatrix.getValues(matrixValues)
- return matrixValues[Matrix.MSCALE_X]
- }
-
- private val origWidth: Float
- get() = drawable?.intrinsicWidth?.toFloat() ?: 0f
-
- private val origHeight: Float
- get() = drawable?.intrinsicHeight?.toFloat() ?: 0f
-
- companion object {
- private const val NONE = 0
- private const val DRAG = 1
- private const val ZOOM = 2
- private const val CLICK = 3
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/viewmodel/ComputerVisionViewModel.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/viewmodel/ComputerVisionViewModel.kt
deleted file mode 100644
index e581860c61..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/ui/viewmodel/ComputerVisionViewModel.kt
+++ /dev/null
@@ -1,313 +0,0 @@
-package org.appdevforall.codeonthego.computervision.ui.viewmodel
-
-import android.net.Uri
-import android.util.Log
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import org.appdevforall.codeonthego.computervision.R
-import org.appdevforall.codeonthego.computervision.data.repository.DrawableImportHelper
-import org.appdevforall.codeonthego.computervision.data.repository.VisionRepository
-import org.appdevforall.codeonthego.computervision.domain.model.DetectionResult
-import org.appdevforall.codeonthego.computervision.domain.usecase.GenerateXmlUC
-import org.appdevforall.codeonthego.computervision.domain.usecase.ImportPlaceholderImageUC
-import org.appdevforall.codeonthego.computervision.domain.usecase.PrepareImageUC
-import org.appdevforall.codeonthego.computervision.domain.usecase.RemovePlaceholderImageUC
-import org.appdevforall.codeonthego.computervision.domain.usecase.RunVisionUC
-import org.appdevforall.codeonthego.computervision.ui.ComputerVisionEffect
-import org.appdevforall.codeonthego.computervision.ui.ComputerVisionEvent
-import org.appdevforall.codeonthego.computervision.ui.ComputerVisionUiState
-import org.appdevforall.codeonthego.computervision.ui.CvOperation
-import org.appdevforall.codeonthego.computervision.ui.SelectedImportedImage
-import org.appdevforall.codeonthego.computervision.utils.CvAnalyticsUtil
-import org.appdevforall.codeonthego.computervision.utils.getSortedPlaceholders
-
-class ComputerVisionViewModel(
- private val repository: VisionRepository,
- private val prepareImageUC: PrepareImageUC,
- private val runVisionUC: RunVisionUC,
- private val generateXmlUC: GenerateXmlUC,
- private val importPlaceholderImageUC: ImportPlaceholderImageUC,
- private val removePlaceholderImageUC: RemovePlaceholderImageUC,
- layoutFilePath: String?,
- layoutFileName: String?
-) : ViewModel() {
-
- private val _uiState = MutableStateFlow(
- ComputerVisionUiState(
- layoutFilePath = layoutFilePath,
- layoutFileName = layoutFileName
- )
- )
- val uiState: StateFlow = _uiState.asStateFlow()
-
- private val _uiEffect = Channel()
- val uiEffect = _uiEffect.receiveAsFlow()
-
- init {
- initModel()
- }
-
- fun onEvent(event: ComputerVisionEvent) {
- when (event) {
- is ComputerVisionEvent.ImageSelected -> {
- CvAnalyticsUtil.trackImageSelected(fromCamera = false)
- loadImageFromUri(event.uri)
- }
- is ComputerVisionEvent.ImageCaptured -> handleCameraResult(event.uri, event.success)
- ComputerVisionEvent.RunDetection -> runDetection()
- ComputerVisionEvent.UpdateLayoutFile -> showUpdateConfirmation()
- ComputerVisionEvent.ConfirmUpdate -> performLayoutUpdate()
- ComputerVisionEvent.SaveToDownloads -> saveXmlToDownloads()
- ComputerVisionEvent.OpenImagePicker -> viewModelScope.launch { _uiEffect.send(ComputerVisionEffect.OpenImagePicker) }
- ComputerVisionEvent.RequestCameraPermission -> viewModelScope.launch { _uiEffect.send(ComputerVisionEffect.RequestCameraPermission) }
- is ComputerVisionEvent.UpdateGuides -> updateGuides(event.leftPct, event.rightPct)
- is ComputerVisionEvent.ImagePlaceholderTapped -> handleImagePlaceholderTap(event.imageX, event.imageY)
- is ComputerVisionEvent.PlaceholderImageSelected -> handlePlaceholderImageSelected(event.uri)
- is ComputerVisionEvent.RemovePlaceholderImage -> removePlaceholderImage(event.placeholderId)
- }
- }
-
- private fun initModel() {
- viewModelScope.launch {
- _uiState.update { it.copy(currentOperation = CvOperation.InitializingModel) }
- repository.initModel()
- .onSuccess { _uiState.update { it.copy(isModelInitialized = true, currentOperation = CvOperation.Idle) } }
- .onFailure { exception ->
- Log.e(TAG, "Model initialization failed", exception)
- _uiState.update { it.copy(currentOperation = CvOperation.Idle) }
- _uiEffect.send(ComputerVisionEffect.ShowError("Model initialization failed: ${exception.message}"))
- }
- }
- }
-
- fun onScreenStarted() {
- CvAnalyticsUtil.trackScreenOpened()
- }
-
- private fun loadImageFromUri(uri: Uri) {
- viewModelScope.launch {
- prepareImageUC(uri).onSuccess { prepared ->
- _uiState.update {
- it.copy(
- currentBitmap = prepared.bitmap,
- imageUri = uri,
- detections = emptyList(),
- visualizedBitmap = null,
- leftGuidePct = prepared.leftPct,
- rightGuidePct = prepared.rightPct,
- parsedAnnotations = emptyMap(),
- pendingImagePlaceholderId = null,
- selectedImagesByPlaceholderId = emptyMap()
- )
- }
- }.onFailure { e ->
- Log.e(TAG, "Error loading image", e)
- _uiEffect.send(ComputerVisionEffect.ShowError("Failed to load image: ${e.message}"))
- }
- }
- }
-
- private fun handleCameraResult(uri: Uri, success: Boolean) {
- if (success) {
- CvAnalyticsUtil.trackImageSelected(fromCamera = true)
- loadImageFromUri(uri)
- } else {
- viewModelScope.launch { _uiEffect.send(ComputerVisionEffect.ShowToast(R.string.msg_image_capture_cancelled)) }
- }
- }
-
- private fun runDetection() {
- val state = _uiState.value
- val bitmap = state.currentBitmap ?: run {
- viewModelScope.launch { _uiEffect.send(ComputerVisionEffect.ShowToast(R.string.msg_select_image_first)) }
- return
- }
-
- viewModelScope.launch {
- CvAnalyticsUtil.trackDetectionStarted()
- val startTime = System.currentTimeMillis()
-
- runVisionUC(bitmap, state.leftGuidePct, state.rightGuidePct) { operation ->
- _uiState.update { it.copy(currentOperation = operation) }
- }.onSuccess { result ->
- CvAnalyticsUtil.trackDetectionCompleted(true, result.detections.size, System.currentTimeMillis() - startTime)
- _uiState.update {
- it.copy(
- detections = result.detections,
- parsedAnnotations = result.annotations,
- currentOperation = CvOperation.Idle,
- pendingImagePlaceholderId = null,
- selectedImagesByPlaceholderId = emptyMap()
- )
- }
- }.onFailure { exception ->
- Log.e(TAG, "Detection failed", exception)
- CvAnalyticsUtil.trackDetectionCompleted(false, 0, System.currentTimeMillis() - startTime)
- _uiState.update { it.copy(currentOperation = CvOperation.Idle) }
- _uiEffect.send(ComputerVisionEffect.ShowError("Detection failed: ${exception.message}"))
- }
- }
- }
-
- private fun showUpdateConfirmation() {
- val state = _uiState.value
- if (!state.hasDetections || state.currentBitmap == null) {
- viewModelScope.launch { _uiEffect.send(ComputerVisionEffect.ShowToast(R.string.msg_run_detection_first)) }
- return
- }
- viewModelScope.launch { _uiEffect.send(ComputerVisionEffect.ShowConfirmDialog(state.layoutFileName ?: "layout.xml")) }
- }
-
- private fun performLayoutUpdate() {
- val state = _uiState.value
- if (!state.hasDetections || state.currentBitmap == null) return
-
- viewModelScope.launch {
- _uiState.update { it.copy(currentOperation = CvOperation.GeneratingXml) }
-
- generateXml(state)
- .onSuccess { (layoutXml, stringsXml) ->
- CvAnalyticsUtil.trackXmlGenerated(state.detections.size)
- CvAnalyticsUtil.trackXmlExported(toDownloads = false)
- _uiState.update { it.copy(currentOperation = CvOperation.Idle) }
- _uiEffect.send(ComputerVisionEffect.ReturnXmlResult(layoutXml, stringsXml))
- }.onFailure { exception ->
- Log.e(TAG, "XML generation failed", exception)
- _uiState.update { it.copy(currentOperation = CvOperation.Idle) }
- _uiEffect.send(ComputerVisionEffect.ShowError("XML generation failed: ${exception.message}"))
- }
- }
- }
-
- private fun saveXmlToDownloads() {
- val state = _uiState.value
- if (!state.hasDetections || state.currentBitmap == null) {
- viewModelScope.launch { _uiEffect.send(ComputerVisionEffect.ShowToast(R.string.msg_run_detection_first)) }
- return
- }
-
- viewModelScope.launch {
- _uiState.update { it.copy(currentOperation = CvOperation.GeneratingXml) }
-
- generateXml(state).onSuccess { (layoutXml, _) ->
- CvAnalyticsUtil.trackXmlGenerated(state.detections.size)
- CvAnalyticsUtil.trackXmlExported(toDownloads = true)
- _uiState.update { it.copy(currentOperation = CvOperation.SavingFile) }
- _uiState.update { it.copy(currentOperation = CvOperation.Idle) }
-
- _uiEffect.send(ComputerVisionEffect.FileSaved(layoutXml))
- }.onFailure { exception ->
- Log.e(TAG, "XML generation failed", exception)
- _uiState.update { it.copy(currentOperation = CvOperation.Idle) }
- _uiEffect.send(ComputerVisionEffect.ShowError("XML generation failed: ${exception.message}"))
- }
- }
- }
-
- private fun updateGuides(leftPct: Float, rightPct: Float) {
- val clampedLeft = leftPct.coerceIn(0f, 1f)
- val clampedRight = rightPct.coerceIn(0f, 1f)
-
- _uiState.update {
- it.copy(
- leftGuidePct = minOf(clampedLeft, clampedRight),
- rightGuidePct = maxOf(clampedLeft, clampedRight)
- )
- }
- }
-
- private fun generateXml(state: ComputerVisionUiState): Result> {
- val bitmap = state.currentBitmap ?: return Result.failure(IllegalStateException("No bitmap available"))
- return generateXmlUC(
- detections = state.detections,
- annotations = state.parsedAnnotations,
- selectedImagesByPlaceholderId = state.selectedImagesByPlaceholderId.mapValues { it.value.drawableReference },
- sourceImageWidth = bitmap.width,
- sourceImageHeight = bitmap.height,
- targetDpWidth = TARGET_DP_WIDTH,
- targetDpHeight = TARGET_DP_HEIGHT
- )
- }
-
- private fun handleImagePlaceholderTap(imageX: Float, imageY: Float) {
- val placeholder = findImagePlaceholderAt(imageX, imageY) ?: return
- val placeholderId = resolvePlaceholderId(placeholder)
-
- _uiState.update { it.copy(pendingImagePlaceholderId = placeholderId) }
- viewModelScope.launch { _uiEffect.send(ComputerVisionEffect.OpenPlaceholderImagePicker) }
- }
-
- private fun handlePlaceholderImageSelected(uri: Uri) {
- val state = _uiState.value
- val placeholderId = state.pendingImagePlaceholderId ?: return
-
- viewModelScope.launch {
- importPlaceholderImageUC(uri, state.layoutFilePath, placeholderId)
- .onSuccess { importedDrawable ->
- _uiState.update { currentState ->
- currentState.copy(
- pendingImagePlaceholderId = null,
- selectedImagesByPlaceholderId = currentState.selectedImagesByPlaceholderId +
- (placeholderId to SelectedImportedImage(importedDrawable.resourceName, importedDrawable.drawableReference))
- )
- }
- _uiEffect.send(ComputerVisionEffect.ShowToast(R.string.msg_placeholder_image_selected))
- }.onFailure { exception ->
- _uiState.update { it.copy(pendingImagePlaceholderId = null) }
- _uiEffect.send(ComputerVisionEffect.ShowError("Image import failed: ${exception.message}"))
- }
- }
- }
-
- private fun removePlaceholderImage(placeholderId: String) {
- val state = _uiState.value
- val importedImageInfo = state.selectedImagesByPlaceholderId[placeholderId] ?: return
-
- viewModelScope.launch {
- removePlaceholderImageUC(state.layoutFilePath, importedImageInfo.resourceName)
- .onSuccess {
- _uiState.update { currentState ->
- currentState.copy(selectedImagesByPlaceholderId = currentState.selectedImagesByPlaceholderId - placeholderId)
- }
- _uiEffect.send(ComputerVisionEffect.ShowToast(R.string.msg_image_removed))
- }.onFailure { exception ->
- _uiEffect.send(ComputerVisionEffect.ShowError("Failed to clean up image file: ${exception.message}"))
- }
- }
- }
-
- private fun resolvePlaceholderId(detection: DetectionResult): String {
- val index = _uiState.value.detections.getSortedPlaceholders().indexOf(detection)
- return "ph_${index.coerceAtLeast(0)}"
- }
-
- fun isImagePlaceholderAt(imageX: Float, imageY: Float): Boolean {
- return findImagePlaceholderAt(imageX, imageY) != null
- }
-
- private fun findImagePlaceholderAt(imageX: Float, imageY: Float): DetectionResult? {
- return _uiState.value.detections
- .getSortedPlaceholders()
- .firstOrNull { it.boundingBox.contains(imageX, imageY) }
- }
-
- override fun onCleared() {
- super.onCleared()
- repository.release()
- }
-
- companion object {
- private const val TAG = "ComputerVisionViewModel"
-
- /** Standard Android phone viewport in dp used as the XML layout target size. */
- private const val TARGET_DP_WIDTH = 360
- private const val TARGET_DP_HEIGHT = 640
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/BitmapUtils.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/BitmapUtils.kt
deleted file mode 100644
index 2f34757d71..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/BitmapUtils.kt
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-import android.graphics.Bitmap
-import android.graphics.Color
-import android.graphics.RectF
-import kotlin.math.abs
-import kotlin.math.exp
-import kotlin.math.roundToInt
-
-object BitmapUtils {
-
- private const val EDGE_DETECTION_THRESHOLD = 30
-
- fun preprocessForOcr(bitmap: Bitmap, blockSize: Int = 31, c: Int = 15): Bitmap {
- val width = bitmap.width
- val height = bitmap.height
- val pixels = IntArray(width * height)
- bitmap.getPixels(pixels, 0, width, 0, 0, width, height)
-
- val gray = toGrayscale(pixels)
- normalize(gray)
- val blurred = gaussianBlur(gray, width, height, blockSize)
- val binary = adaptiveThreshold(gray, blurred, width, height, c)
- medianFilter(binary, width, height)
-
- val outputPixels = IntArray(width * height)
- for (i in binary.indices) {
- outputPixels[i] = if (binary[i] > 0) Color.WHITE else Color.BLACK
- }
- return Bitmap.createBitmap(outputPixels, width, height, Bitmap.Config.ARGB_8888)
- }
-
- fun cropRegion(bitmap: Bitmap, rect: RectF, padding: Int = 0): Bitmap {
- val left = maxOf(0, (rect.left - padding).toInt())
- val top = maxOf(0, (rect.top - padding).toInt())
- val right = minOf(bitmap.width, (rect.right + padding).toInt())
- val bottom = minOf(bitmap.height, (rect.bottom + padding).toInt())
- val w = right - left
- val h = bottom - top
- if (w <= 0 || h <= 0) return bitmap
- return Bitmap.createBitmap(bitmap, left, top, w, h)
- }
-
- fun calculateVerticalProjection(bitmap: Bitmap): FloatArray {
- val width = bitmap.width
- val height = bitmap.height
- val pixels = IntArray(width * height)
- bitmap.getPixels(pixels, 0, width, 0, 0, width, height)
-
- val projection = FloatArray(width)
- if (width < 3 || height == 0) {
- return projection
- }
-
- for (y in 0 until height) {
- val rowOffset = y * width
- for (x in 1 until width - 1) {
- val leftPixel = pixels[rowOffset + x - 1]
- val rightPixel = pixels[rowOffset + x + 1]
-
- val rLeft = (leftPixel shr 16) and 0xFF
- val rRight = (rightPixel shr 16) and 0xFF
-
- val diff = abs(rLeft - rRight)
- if (diff > EDGE_DETECTION_THRESHOLD) {
- projection[x] += 1f
- }
- }
- }
- return projection
- }
-
- private fun toGrayscale(pixels: IntArray): IntArray {
- val gray = IntArray(pixels.size)
- for (i in pixels.indices) {
- val p = pixels[i]
- val r = (p shr 16) and 0xFF
- val g = (p shr 8) and 0xFF
- val b = p and 0xFF
- gray[i] = (0.299 * r + 0.587 * g + 0.114 * b).toInt()
- }
- return gray
- }
-
- private fun normalize(gray: IntArray) {
- var min = 255
- var max = 0
- for (v in gray) {
- if (v < min) min = v
- if (v > max) max = v
- }
- val range = max - min
- if (range == 0) return
- for (i in gray.indices) {
- gray[i] = ((gray[i] - min) * 255) / range
- }
- }
-
- private fun gaussianBlur(gray: IntArray, width: Int, height: Int, blockSize: Int): IntArray {
- val sigma = 0.3 * ((blockSize - 1) * 0.5 - 1) + 0.8
- val halfKernel = blockSize / 2
- val kernel = FloatArray(blockSize)
- var kernelSum = 0.0f
- for (i in 0 until blockSize) {
- val x = i - halfKernel
- kernel[i] = exp(-(x * x) / (2.0 * sigma * sigma)).toFloat()
- kernelSum += kernel[i]
- }
- for (i in kernel.indices) kernel[i] /= kernelSum
-
- val temp = IntArray(width * height)
- for (y in 0 until height) {
- for (x in 0 until width) {
- var sum = 0.0f
- for (k in 0 until blockSize) {
- val sx = (x + k - halfKernel).coerceIn(0, width - 1)
- sum += gray[y * width + sx] * kernel[k]
- }
- temp[y * width + x] = sum.roundToInt()
- }
- }
-
- val blurred = IntArray(width * height)
- for (x in 0 until width) {
- for (y in 0 until height) {
- var sum = 0.0f
- for (k in 0 until blockSize) {
- val sy = (y + k - halfKernel).coerceIn(0, height - 1)
- sum += temp[sy * width + x] * kernel[k]
- }
- blurred[y * width + x] = sum.roundToInt()
- }
- }
- return blurred
- }
-
- private fun adaptiveThreshold(
- gray: IntArray,
- blurred: IntArray,
- width: Int,
- height: Int,
- c: Int
- ): IntArray {
- val binary = IntArray(width * height)
- for (i in gray.indices) {
- binary[i] = if (gray[i] > blurred[i] - c) 255 else 0
- }
- return binary
- }
-
- private fun medianFilter(pixels: IntArray, width: Int, height: Int) {
- val copy = pixels.copyOf()
- val window = IntArray(9)
- for (y in 1 until height - 1) {
- for (x in 1 until width - 1) {
- var idx = 0
- for (dy in -1..1) {
- for (dx in -1..1) {
- window[idx++] = copy[(y + dy) * width + (x + dx)]
- }
- }
- window.sort()
- pixels[y * width + x] = window[4]
- }
- }
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/CvAnalyticsUtils.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/CvAnalyticsUtils.kt
deleted file mode 100644
index af15034e0e..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/CvAnalyticsUtils.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-import android.os.Bundle
-import android.util.Log
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.ktx.Firebase
-import org.appdevforall.codeonthego.computervision.BuildConfig
-import org.appdevforall.codeonthego.computervision.utils.CvAnalyticsUtil.EventNames.CV_DETECTION_COMPLETED
-import org.appdevforall.codeonthego.computervision.utils.CvAnalyticsUtil.EventNames.CV_DETECTION_STARTED
-import org.appdevforall.codeonthego.computervision.utils.CvAnalyticsUtil.EventNames.CV_IMAGE_SELECTED
-import org.appdevforall.codeonthego.computervision.utils.CvAnalyticsUtil.EventNames.CV_SCREEN_OPENED
-import org.appdevforall.codeonthego.computervision.utils.CvAnalyticsUtil.EventNames.CV_XML_EXPORTED
-import org.appdevforall.codeonthego.computervision.utils.CvAnalyticsUtil.EventNames.CV_XML_GENERATED
-
-object CvAnalyticsUtil {
- private const val TAG = "CvAnalyticsUtil"
-
-
- private val analytics by lazy {
- try {
- Firebase.analytics
- } catch (e: Exception) {
- Log.w(TAG, "Firebase Analytics not available", e)
- null
- }
- }
-
- private fun logEvent(eventName: String, params: Bundle) {
- if (BuildConfig.DEBUG) {
- Log.i(TAG, "skipping analytics event on Debug build")
- return
- }
- try {
- analytics?.logEvent(eventName, params)
- } catch (e: Exception) {
- Log.w(TAG, "Failed to log event: $eventName", e)
- }
- }
-
- fun trackScreenOpened() {
- logEvent(CV_SCREEN_OPENED, Bundle().apply {
- putLong("timestamp", System.currentTimeMillis())
- })
- }
-
- fun trackImageSelected(fromCamera: Boolean) {
- logEvent(CV_IMAGE_SELECTED, Bundle().apply {
- putString("source", if (fromCamera) "camera" else "gallery")
- putLong("timestamp", System.currentTimeMillis())
- })
- }
-
- fun trackDetectionStarted() {
- logEvent(CV_DETECTION_STARTED, Bundle().apply {
- putLong("timestamp", System.currentTimeMillis())
- })
- }
-
- fun trackDetectionCompleted(success: Boolean, detectionCount: Int, durationMs: Long) {
- logEvent(CV_DETECTION_COMPLETED, Bundle().apply {
- putBoolean("success", success)
- putInt("detection_count", detectionCount)
- putLong("duration_ms", durationMs)
- putLong("timestamp", System.currentTimeMillis())
- })
- }
-
- fun trackXmlGenerated(componentCount: Int) {
- logEvent(CV_XML_GENERATED, Bundle().apply {
- putInt("component_count", componentCount)
- putLong("timestamp", System.currentTimeMillis())
- })
- }
-
- fun trackXmlExported(toDownloads: Boolean) {
- logEvent(CV_XML_EXPORTED, Bundle().apply {
- putString("export_method", if (toDownloads) "save_downloads" else "update_layout")
- putLong("timestamp", System.currentTimeMillis())
- })
- }
-
- private object EventNames {
- const val CV_SCREEN_OPENED = "cv_screen_opened"
- const val CV_IMAGE_SELECTED = "cv_image_selected"
- const val CV_DETECTION_STARTED = "cv_detection_started"
- const val CV_DETECTION_COMPLETED = "cv_detection_completed"
- const val CV_XML_GENERATED = "cv_xml_generated"
- const val CV_XML_EXPORTED = "cv_xml_exported"
- }
-}
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/DetectionVisualizer.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/DetectionVisualizer.kt
deleted file mode 100644
index 2ef2ace815..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/DetectionVisualizer.kt
+++ /dev/null
@@ -1,227 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.drawable.Drawable
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.core.graphics.toColorInt
-import org.appdevforall.codeonthego.computervision.R
-import org.appdevforall.codeonthego.computervision.domain.model.DetectionResult
-
-
-/**
- * Utility class responsible for visualizing computer vision detection results.
- * It handles drawing bounding boxes, text labels, and interactive visual hints
- * directly onto image bitmaps.
- *
- * @property context The context used to retrieve resources such as drawables.
- */
-class DetectionVisualizer(private val context: Context) {
-
- private val boundingBoxPaint by lazy {
- Paint().apply {
- color = Color.GREEN
- style = Paint.Style.STROKE
- strokeWidth = 5.0f
- alpha = 200
- }
- }
-
- private val imagePlaceholderPaint by lazy {
- Paint().apply {
- color = "#FF8A00".toColorInt()
- style = Paint.Style.STROKE
- strokeWidth = 7.0f
- alpha = 230
- }
- }
-
- private val imagePlaceholderFillPaint by lazy {
- Paint().apply {
- color = "#FF8A00".toColorInt()
- style = Paint.Style.FILL
- alpha = 40
- }
- }
-
- private val textRecognitionBoxPaint by lazy {
- Paint().apply {
- color = Color.BLUE
- style = Paint.Style.STROKE
- strokeWidth = 3.0f
- alpha = 200
- }
- }
-
- private val textPaint by lazy {
- Paint().apply {
- color = Color.WHITE
- style = Paint.Style.FILL
- textSize = 40.0f
- setShadowLayer(5.0f, 0f, 0f, Color.BLACK)
- }
- }
-
- private val imagePlaceholderUploadDrawable: Drawable? by lazy {
- AppCompatResources.getDrawable(context, R.drawable.ic_placeholder_upload)?.mutate()?.apply {
- setTint(Color.WHITE)
- }
- }
-
- private val imagePlaceholderDeleteDrawable: Drawable? by lazy {
- AppCompatResources.getDrawable(context, R.drawable.ic_placeholder_delete)?.mutate()?.apply {
- setTint(Color.WHITE)
- }
- }
-
- private val imagePlaceholderBadgePaint by lazy {
- Paint(Paint.ANTI_ALIAS_FLAG).apply {
- color = "#CC111111".toColorInt()
- style = Paint.Style.FILL
- }
- }
-
- private val deleteBadgeBackgroundPaint by lazy {
- Paint(Paint.ANTI_ALIAS_FLAG).apply {
- color = "#CCB3261E".toColorInt()
- style = Paint.Style.FILL
- }
- }
-
- private val deleteIconClickableAreas = mutableMapOf()
-
- /**
- * Draws detection bounding boxes, labels, and interactive placeholder hints on a given bitmap.
- *
- * @param bitmap The original image on which detections were performed.
- * @param detections A list of [DetectionResult] objects containing the bounding boxes and labels.
- * @param selectedPlaceholderIds A set of IDs representing image placeholders that have been selected/filled.
- * @return A new [Bitmap] instance with the visualized detections drawn over it.
- */
- fun visualize(
- bitmap: Bitmap,
- detections: List,
- selectedPlaceholderIds: Set
- ): Bitmap {
- val mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true)
- val canvas = Canvas(mutableBitmap)
-
- deleteIconClickableAreas.clear()
-
- val placeholderIdsByDetection = mapPlaceholderDetections(detections)
-
- for (result in detections) {
- if (result.label == IMAGE_PLACEHOLDER_LABEL) {
- val placeholderId = placeholderIdsByDetection[result] ?: continue
- val hasSelectedImage = selectedPlaceholderIds.contains(placeholderId)
-
- drawImagePlaceholderHint(canvas, result.boundingBox, hasSelectedImage, placeholderId)
- } else {
- drawStandardDetection(canvas, result)
- }
- }
-
- return mutableBitmap
- }
-
- /**
- * Checks if the given X, Y coordinates intersect with any drawn delete icon.
- * @return The placeholderId if a delete icon was tapped, null otherwise.
- */
- fun getTappedDeleteIconId(x: Float, y: Float): String? {
- return deleteIconClickableAreas.entries.firstOrNull { it.value.contains(x, y) }?.key
- }
-
- /**
- * Filters and maps image placeholder detections to their corresponding auto-generated IDs.
- * Placeholders are sorted from top to bottom, left to right to ensure consistent ID assignment.
- *
- * @param detections The full list of detections.
- * @return A map linking each placeholder [DetectionResult] to its generated string ID (e.g., "ph_0").
- */
- private fun mapPlaceholderDetections(detections: List): Map {
- return detections
- .filter { it.label == IMAGE_PLACEHOLDER_LABEL }
- .sortedWith(compareBy({ it.boundingBox.top }, { it.boundingBox.left }))
- .mapIndexed { index, detection ->
- detection to "ph_$index"
- }.toMap()
- }
-
- /**
- * Draws a standard detection bounding box and its corresponding text label.
- * It uses different colors depending on whether the detection is from YOLO or Text Recognition.
- *
- * @param canvas The canvas to draw the detection on.
- * @param result The [DetectionResult] containing the coordinates, label, and detection type.
- */
- private fun drawStandardDetection(canvas: Canvas, result: DetectionResult) {
- val paint = if (result.isYolo) boundingBoxPaint else textRecognitionBoxPaint
- canvas.drawRect(result.boundingBox, paint)
-
- val label = result.label.take(15)
- val text = if (result.text.isNotEmpty()) "$label: ${result.text}" else label
- canvas.drawText(text, result.boundingBox.left, result.boundingBox.top - 5, textPaint)
- }
-
- /**
- * Draws a highlighted region and a central badge for an image placeholder detection.
- *
- * @param canvas The canvas to draw the hint on.
- * @param boundingBox The rectangular bounds of the detected image placeholder.
- * @param hasSelectedImage A flag indicating whether the user has already selected an image for this placeholder.
- */
- private fun drawImagePlaceholderHint(
- canvas: Canvas,
- boundingBox: RectF,
- hasSelectedImage: Boolean,
- placeholderId: String
- ) {
- canvas.drawRect(boundingBox, imagePlaceholderFillPaint)
- canvas.drawRect(boundingBox, imagePlaceholderPaint)
-
- val badgeHeight = (boundingBox.height() * 0.24f).coerceIn(44f, 72f)
- val badgeTop = (boundingBox.centerY() - badgeHeight / 2f).coerceAtLeast(boundingBox.top + 8f)
- val badgeBottom = (badgeTop + badgeHeight).coerceAtMost(boundingBox.bottom - 8f)
-
- val badgeRect = RectF(
- boundingBox.left + 12f,
- badgeTop,
- boundingBox.right - 12f,
- badgeBottom
- )
-
- val bgPaint = if (hasSelectedImage) deleteBadgeBackgroundPaint else imagePlaceholderBadgePaint
- canvas.drawRoundRect(badgeRect, 16f, 16f, bgPaint)
-
- drawPlaceholderIcon(canvas, badgeRect, hasSelectedImage)
-
- if (hasSelectedImage) {
- deleteIconClickableAreas[placeholderId] = badgeRect
- }
- }
-
- private fun drawPlaceholderIcon(canvas: Canvas, badgeRect: RectF, hasSelectedImage: Boolean) {
- val iconDrawable = if (hasSelectedImage) imagePlaceholderDeleteDrawable else imagePlaceholderUploadDrawable
- if (iconDrawable == null) return
-
- val iconSize = minOf(badgeRect.width(), badgeRect.height()) * 0.80f
-
- val left = (badgeRect.centerX() - iconSize / 2f).toInt()
- val top = (badgeRect.centerY() - iconSize / 2f).toInt()
- val right = (badgeRect.centerX() + iconSize / 2f).toInt()
- val bottom = (badgeRect.centerY() + iconSize / 2f).toInt()
-
- iconDrawable.alpha = 255
- iconDrawable.setBounds(left, top, right, bottom)
- iconDrawable.draw(canvas)
- }
-
- fun clearCache() {
- deleteIconClickableAreas.clear()
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/MetadataDetector.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/MetadataDetector.kt
deleted file mode 100644
index 68cee4064a..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/MetadataDetector.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-object MetadataDetector {
- private val metadataSnippets = listOf(
- ""
- )
-
- private val metadataKeywords = listOf(
- "layout_width",
- "layout_height",
- "layout_margin",
- "layout_gravity",
- "textstyle",
- "textcolor",
- "textsize",
- "padding",
- "orientation",
- "baselinealigned",
- "match_parent",
- "wrap_content"
- )
-
- private val xmlAttributeRegex = Regex("""\b(?:android|app|tools):[a-zA-Z_]+\b""")
- fun isCanvasMetadata(text: String): Boolean {
- val lowerText = text.lowercase()
- if (lowerText.isBlank()) return false
- if (metadataSnippets.any { snippet -> lowerText.contains(snippet) }) return true
- if (xmlAttributeRegex.containsMatchIn(lowerText)) return true
- if (metadataKeywords.any { keyword -> lowerText.contains(keyword) }) return true
- return false
- }
-
- fun isMetadataLabel(label: String): Boolean {
- val normalized = label.trim().lowercase()
- return normalized == "margin_metadata" || normalized.contains("metadata")
- }
-
- fun isMetadataDetection(label: String, text: String): Boolean {
- return isMetadataLabel(label) || isCanvasMetadata(text)
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/OcrExtensions.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/OcrExtensions.kt
deleted file mode 100644
index b0030dd5fd..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/OcrExtensions.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-private val PUNCTUATION_DELIMITERS = Regex("\\s*[,;|/\\n]+\\s*")
-private val WHITESPACE_DELIMITERS = Regex("\\s+")
-private val OCR_NUMERIC_PATTERN = Regex("^[0-9oOlIzZsSbB]+$")
-
-/**
- * Extracts separated entries from a raw OCR string.
- * Tries to split by punctuation first. If no punctuation is found,
- * it falls back to space-separated tokens, provided they all look like numbers or OCR artifacts.
- */
-internal fun String.extractOcrEntries(): List {
- // Try to split by explicit punctuation or newlines
- val punctuatedTokens = this.split(PUNCTUATION_DELIMITERS).filter { it.isNotBlank() }
-
- // If successfully split into multiple items (or none), return them
- if (punctuatedTokens.size != 1) {
- return punctuatedTokens
- }
-
- // Fallback: check if elements were separated only by spaces
- val whitespaceTokens = this.trim().split(WHITESPACE_DELIMITERS).filter { it.isNotBlank() }
-
- // Only accept space separation if all resulting tokens look like numbers (or OCR artifacts)
- val isSpaceSeparatedOcrNumbers = whitespaceTokens.size > 1 &&
- whitespaceTokens.all { it.matches(OCR_NUMERIC_PATTERN) }
-
- return if (isSpaceSeparatedOcrNumbers) whitespaceTokens else punctuatedTokens
-}
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/OcrTextAssembler.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/OcrTextAssembler.kt
deleted file mode 100644
index 21dec611f8..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/OcrTextAssembler.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-import com.google.mlkit.vision.text.Text
-
-object OcrTextAssembler {
- const val DEFAULT_SPACE_GAP_TOLERANCE_PX = 15f
-
- fun extractTextWithTolerance(
- textBlocks: List,
- maxSpaceGap: Float = DEFAULT_SPACE_GAP_TOLERANCE_PX
- ): String {
- return textBlocks.joinToString(" ") { block ->
- block.lines.joinToString(" ") { line ->
- joinElementsWithTolerance(line, maxSpaceGap)
- }
- }.trim()
- }
-
- fun joinElementsWithTolerance(line: Text.Line, maxSpaceGap: Float = DEFAULT_SPACE_GAP_TOLERANCE_PX): String {
- val elements = line.elements.sortedBy { it.boundingBox?.left ?: 0 }
- if (elements.isEmpty()) return ""
-
- val builder = StringBuilder()
- var prevRight = elements.first().boundingBox?.right ?: 0
- builder.append(elements.first().text)
-
- for (i in 1 until elements.size) {
- val current = elements[i]
- val currentBox = current.boundingBox
-
- if (currentBox != null) {
- val gap = currentBox.left - prevRight
- if (gap > maxSpaceGap) {
- builder.append(" ")
- }
- prevRight = currentBox.right
- } else {
- builder.append(" ")
- }
- builder.append(current.text)
- }
- return builder.toString().trim()
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/PlaceholderUtils.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/PlaceholderUtils.kt
deleted file mode 100644
index 1a2eff8e4d..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/PlaceholderUtils.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-import org.appdevforall.codeonthego.computervision.domain.model.DetectionResult
-import org.appdevforall.codeonthego.computervision.domain.model.ScaledBox
-
-const val IMAGE_PLACEHOLDER_LABEL = "image_placeholder"
-
-fun List.getSortedPlaceholders(): List {
- return this.filter { it.label == IMAGE_PLACEHOLDER_LABEL }
- .sortedWith(compareBy({ it.boundingBox.top }, { it.boundingBox.left }))
-}
-
-fun List.getSortedScaledPlaceholders(): List {
- return this.filter { it.label == IMAGE_PLACEHOLDER_LABEL }
- .sortedWith(compareBy({ it.y }, { it.x }))
-}
-
-/**
- * Associates ordered image placeholders with their selected drawable references.
- * Useful for mapping user-selected gallery images to the physical canvas bounding boxes.
- */
-fun List.buildPlaceholderOverrides(selectedImagesByPlaceholderId: Map): Map {
- val placeholders = this.getSortedScaledPlaceholders()
-
- return placeholders.mapIndexedNotNull { index, box ->
- val drawableReference = selectedImagesByPlaceholderId["ph_$index"]
- ?: return@mapIndexedNotNull null
- box to drawableReference
- }.toMap()
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/SmartBoundaryDetector.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/SmartBoundaryDetector.kt
deleted file mode 100644
index a72ab07e32..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/SmartBoundaryDetector.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-import android.graphics.Bitmap
-import org.appdevforall.codeonthego.computervision.utils.BitmapUtils.calculateVerticalProjection
-
-object SmartBoundaryDetector {
-
- private const val DEFAULT_EDGE_IGNORE_PERCENT = 0.05f
- private const val LEFT_ZONE_END_PERCENT = 0.5f
- private const val RIGHT_ZONE_START_PERCENT = 0.5f
- private const val MIN_GAP_WIDTH_PERCENT = 0.02
- private const val PRIMARY_ACTIVITY_THRESHOLD = 0.05f
- private const val FALLBACK_ACTIVITY_THRESHOLD = 0.01f
- private const val LEFT_FALLBACK_BOUND_PERCENT = 0.15f
- private const val RIGHT_FALLBACK_BOUND_PERCENT = 0.85f
-
- fun detectSmartBoundaries(
- bitmap: Bitmap,
- edgeIgnorePercent: Float = DEFAULT_EDGE_IGNORE_PERCENT
- ): Pair {
- val width = bitmap.width
- val projection = calculateVerticalProjection(bitmap)
- val minimumGapWidth = (width * MIN_GAP_WIDTH_PERCENT).toInt()
-
- val ignoredEdgePixels = (width * edgeIgnorePercent).toInt()
- val leftZoneEnd = (width * LEFT_ZONE_END_PERCENT).toInt()
- val rightZoneStart = (width * RIGHT_ZONE_START_PERCENT).toInt()
- val rightZoneEnd = width - ignoredEdgePixels
-
- if (ignoredEdgePixels >= leftZoneEnd || rightZoneStart >= rightZoneEnd) {
- return Pair(
- (width * LEFT_FALLBACK_BOUND_PERCENT).toInt(),
- (width * RIGHT_FALLBACK_BOUND_PERCENT).toInt()
- )
- }
-
- val leftSignal = projection.copyOfRange(ignoredEdgePixels, leftZoneEnd)
- var (leftBound, leftGapLength) = findBestGapMidpoint(leftSignal, offset = ignoredEdgePixels)
- if (leftBound == null || leftGapLength < minimumGapWidth) {
- leftBound = findBestGapMidpoint(leftSignal, offset = ignoredEdgePixels, normalizeSignal = true).first
- }
-
- val rightSignal = projection.copyOfRange(rightZoneStart, rightZoneEnd)
- var (rightBound, rightGapLength) = findBestGapMidpoint(rightSignal, offset = rightZoneStart)
- if (rightBound == null || rightGapLength < minimumGapWidth) {
- rightBound = findBestGapMidpoint(rightSignal, offset = rightZoneStart, normalizeSignal = true).first
- }
-
- val finalLeftBound = leftBound ?: (width * LEFT_FALLBACK_BOUND_PERCENT).toInt()
- val finalRightBound = rightBound ?: (width * RIGHT_FALLBACK_BOUND_PERCENT).toInt()
- return Pair(finalLeftBound, finalRightBound)
- }
-
- private fun findBestGapMidpoint(
- signalSegment: FloatArray,
- offset: Int = 0,
- normalizeSignal: Boolean = false
- ): Pair {
- if (signalSegment.isEmpty()) {
- return Pair(null, 0)
- }
-
- val signal = if (normalizeSignal) {
- val minValue = signalSegment.minOrNull() ?: 0f
- FloatArray(signalSegment.size) { index -> signalSegment[index] - minValue }
- } else {
- signalSegment
- }
-
- val activityThresholdMultiplier = if (normalizeSignal) {
- FALLBACK_ACTIVITY_THRESHOLD
- } else {
- PRIMARY_ACTIVITY_THRESHOLD
- }
- val threshold = (signal.maxOrNull() ?: 0f) * activityThresholdMultiplier
-
- var maxGapLength = 0
- var maxGapMidpoint: Int? = null
- var currentGapStart = -1
- var previousIsActive = true
-
- signal.forEachIndexed { index, value ->
- val isActive = value > threshold
- if (previousIsActive && !isActive) {
- currentGapStart = index
- }
-
- val isGapClosing = currentGapStart != -1 && (index + 1 == signal.size || (!isActive && signal[index + 1] > threshold))
- if (isGapClosing) {
- val gapLength = index - currentGapStart + 1
- if (gapLength > maxGapLength) {
- maxGapLength = gapLength
- maxGapMidpoint = currentGapStart + (gapLength / 2)
- }
- currentGapStart = -1
- }
-
- previousIsActive = isActive
- }
-
- return Pair(maxGapMidpoint?.plus(offset), maxGapLength)
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/TextCleaner.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/TextCleaner.kt
deleted file mode 100644
index 495744a78c..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/TextCleaner.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-object TextCleaner {
-
- private val nonAlphanumericRegex = Regex("[^a-zA-Z0-9 ]")
- private val leadingMarkerRegex = Regex("^[\\[\\]()●○□☑✓-]+\\s*")
- private val leadingStandaloneCircleRegex = Regex("^[O0o]\\s+")
- private val duplicatedLeadingCircleRegex = Regex("^[O0o](?=[oO][a-z])")
-
- fun cleanText(text: String): String {
- return text.replace("\n", " ")
- .replace(nonAlphanumericRegex, "")
- .trim()
- }
-
- fun cleanTextStrippingLeadingO(text: String): String {
- val cleanedText = text.trim()
- .replace(leadingMarkerRegex, "")
- .replace(leadingStandaloneCircleRegex, "")
- .replace(duplicatedLeadingCircleRegex, "")
-
- return cleanedText.ifEmpty { text }
- }
-
- fun cleanTextPreservingLeadingO(text: String): String {
- var cleanedText = text.trim()
- .replace(Regex("^[\\[\\]()●○□☑✓-]+\\s*"), "")
-
- cleanedText = cleanedText.replace(Regex("^[DT]?opti[oa]n", RegexOption.IGNORE_CASE), "Option")
- cleanedText = cleanedText.replace(Regex("^pti[oa]n", RegexOption.IGNORE_CASE), "Option")
- cleanedText = cleanedText.replace(Regex("^optton", RegexOption.IGNORE_CASE), "Option")
-
- return cleanedText.ifEmpty { text }
- }
-}
diff --git a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/XmlFileManager.kt b/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/XmlFileManager.kt
deleted file mode 100644
index 4cd00c5c24..0000000000
--- a/cv-image-to-xml/src/main/java/org/appdevforall/codeonthego/computervision/utils/XmlFileManager.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.appdevforall.codeonthego.computervision.utils
-
-import android.content.ContentValues
-import android.content.Context
-import android.os.Build
-import android.os.Environment
-import android.provider.MediaStore
-import androidx.annotation.RequiresApi
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-
-/**
- * Utility class responsible for managing file input/output operations.
- * Specifically handles saving XML files to the device's public Downloads directory,
- * adapting to different Android API levels (Scoped Storage vs Legacy).
- *
- * @property context The application or activity context needed to access content resolvers.
- */
-class XmlFileManager(private val context: Context) {
-
- /**
- * Saves an XML string to a file in the device's public Downloads directory.
- * It automatically handles the differences in file storage APIs between
- * Android 10 (API 29+) and older versions.
- *
- * @param xmlString The XML content to be saved.
- * @param fileName The desired name for the output file. Defaults to "layout_result.xml".
- * @return A [Result] containing the file name if successful, or an [IOException] on failure.
- */
- fun saveXmlToDownloads(xmlString: String, fileName: String = "layout_result.xml"): Result {
- return try {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
- saveUsingMediaStore(xmlString, fileName)
- } else {
- saveUsingLegacyFileApi(xmlString, fileName)
- }
- Result.success(fileName)
- } catch (e: IOException) {
- Result.failure(e)
- }
- }
-
- /**
- * Saves the file using the MediaStore API.
- * This is the required approach for Android 10 (API 29) and above due to Scoped Storage restrictions.
- *
- * @param xmlString The XML content to write.
- * @param fileName The name of the file.
- * @throws IOException If the MediaStore record cannot be created or written to.
- */
- @RequiresApi(Build.VERSION_CODES.Q)
- private fun saveUsingMediaStore(xmlString: String, fileName: String) {
- val resolver = context.contentResolver
- val contentValues = ContentValues().apply {
- put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
- put(MediaStore.MediaColumns.MIME_TYPE, "text/xml")
- put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
- }
-
- val uri = resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues)
- ?: throw IOException("Failed to create new MediaStore record for $fileName.")
-
- resolver.openOutputStream(uri)?.use { outputStream ->
- outputStream.write(xmlString.toByteArray())
- } ?: throw IOException("Failed to open output stream for MediaStore URI.")
- }
-
- /**
- * Saves the file using the legacy File API.
- * This approach is used for devices running Android 9 (API 28) or lower.
- *
- * @param xmlString The XML content to write.
- * @param fileName The name of the file.
- * @throws IOException If the Downloads directory or the file cannot be created.
- */
- @Suppress("DEPRECATION")
- private fun saveUsingLegacyFileApi(xmlString: String, fileName: String) {
- val downloadsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-
- if (!downloadsDir.exists() && !downloadsDir.mkdirs()) {
- throw IOException("Failed to create Downloads directory.")
- }
-
- val file = File(downloadsDir, fileName)
- FileOutputStream(file).use { outputStream ->
- outputStream.write(xmlString.toByteArray())
- }
- }
-}
diff --git a/cv-image-to-xml/src/main/res/drawable/ic_launcher_background.xml b/cv-image-to-xml/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9cbf..0000000000
--- a/cv-image-to-xml/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cv-image-to-xml/src/main/res/drawable/ic_placeholder_delete.xml b/cv-image-to-xml/src/main/res/drawable/ic_placeholder_delete.xml
deleted file mode 100644
index 20cebf71cb..0000000000
--- a/cv-image-to-xml/src/main/res/drawable/ic_placeholder_delete.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/cv-image-to-xml/src/main/res/drawable/ic_placeholder_upload.xml b/cv-image-to-xml/src/main/res/drawable/ic_placeholder_upload.xml
deleted file mode 100644
index 203884bda9..0000000000
--- a/cv-image-to-xml/src/main/res/drawable/ic_placeholder_upload.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/cv-image-to-xml/src/main/res/layout/activity_computer_vision.xml b/cv-image-to-xml/src/main/res/layout/activity_computer_vision.xml
deleted file mode 100644
index e2a4499218..0000000000
--- a/cv-image-to-xml/src/main/res/layout/activity_computer_vision.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cv-image-to-xml/src/main/res/layout/testing_result.xml b/cv-image-to-xml/src/main/res/layout/testing_result.xml
deleted file mode 100644
index 4805bc3998..0000000000
--- a/cv-image-to-xml/src/main/res/layout/testing_result.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
diff --git a/cv-image-to-xml/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/cv-image-to-xml/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 6f3b755bf5..0000000000
--- a/cv-image-to-xml/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/cv-image-to-xml/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 6f3b755bf5..0000000000
--- a/cv-image-to-xml/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/res/mipmap-hdpi/ic_launcher.webp b/cv-image-to-xml/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78ecd..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/cv-image-to-xml/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d1ba..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-mdpi/ic_launcher.webp b/cv-image-to-xml/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d64e5..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/cv-image-to-xml/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611da08..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-xhdpi/ic_launcher.webp b/cv-image-to-xml/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a3070fe..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/cv-image-to-xml/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a6956b3..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/cv-image-to-xml/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77f9f..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/cv-image-to-xml/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50836..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/cv-image-to-xml/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d6427e6..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/cv-image-to-xml/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae37cb..0000000000
Binary files a/cv-image-to-xml/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/cv-image-to-xml/src/main/res/values-night/themes.xml b/cv-image-to-xml/src/main/res/values-night/themes.xml
deleted file mode 100644
index 72f672ccad..0000000000
--- a/cv-image-to-xml/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/res/values/colors.xml b/cv-image-to-xml/src/main/res/values/colors.xml
deleted file mode 100644
index c8524cd961..0000000000
--- a/cv-image-to-xml/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- #FF000000
- #FFFFFFFF
-
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/res/values/strings.xml b/cv-image-to-xml/src/main/res/values/strings.xml
deleted file mode 100644
index fd5883c7b6..0000000000
--- a/cv-image-to-xml/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
- images
-
- Generate XML
- Update Layout
-
- Detect
- Update
- Save
-
- Yes
- No
-
- No image selected
- Image capture cancelled
- Camera permission is required.
- Please select an image first
- Please run detection on an image first.
- This will overwrite the contents of \'%s\'. Are you sure you want to continue?
- Model or labels could not be loaded
- Saved to Downloads/%s
- Error saving file: %s
- Share XML Layout
- Image selected for placeholder.
- Image deleted from the project
-
- layout
- Image placeholder for object detection
- New Picture
- From the Camera
-
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/res/values/themes.xml b/cv-image-to-xml/src/main/res/values/themes.xml
deleted file mode 100644
index 2bc538cb64..0000000000
--- a/cv-image-to-xml/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/res/xml/backup_rules.xml b/cv-image-to-xml/src/main/res/xml/backup_rules.xml
deleted file mode 100644
index 4df9255824..0000000000
--- a/cv-image-to-xml/src/main/res/xml/backup_rules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/cv-image-to-xml/src/main/res/xml/data_extraction_rules.xml b/cv-image-to-xml/src/main/res/xml/data_extraction_rules.xml
deleted file mode 100644
index 9ee9997b0b..0000000000
--- a/cv-image-to-xml/src/main/res/xml/data_extraction_rules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cv-image-to-xml/src/test/java/com/example/images/ExampleUnitTest.kt b/cv-image-to-xml/src/test/java/com/example/images/ExampleUnitTest.kt
deleted file mode 100644
index 6f26f3eb77..0000000000
--- a/cv-image-to-xml/src/test/java/com/example/images/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.images
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
- @Test
- fun addition_isCorrect() {
- assertEquals(4, 2 + 2)
- }
-}
\ No newline at end of file
diff --git a/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/FuzzyAttributeParserTest.kt b/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/FuzzyAttributeParserTest.kt
deleted file mode 100644
index 0a2f106c94..0000000000
--- a/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/FuzzyAttributeParserTest.kt
+++ /dev/null
@@ -1,571 +0,0 @@
-package org.appdevforall.codeonthego.computervision.domain
-
-import org.appdevforall.codeonthego.computervision.domain.parser.FuzzyAttributeParser
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class FuzzyAttributeParserTest {
-
- @Test
- fun `parse returns empty map for null annotation`() {
- val result = FuzzyAttributeParser.parse(null, "Button")
- assertTrue(result.isEmpty())
- }
-
- @Test
- fun `parse returns empty map for blank annotation`() {
- val result = FuzzyAttributeParser.parse(" ", "TextView")
- assertTrue(result.isEmpty())
- }
-
- @Test
- fun `delimited happy path parses width height and id`() {
- val annotation = "width: 100dp | height: 80dp | id: my_btn"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("80dp", result["android:layout_height"])
- assertEquals("my_btn", result["android:id"])
- }
-
- @Test
- fun `delimited parses background as backgroundTint for Button`() {
- val annotation = "background: red | width: 100dp"
- val resultButton = FuzzyAttributeParser.parse(annotation, "Button")
- assertEquals("#FF0000", resultButton["app:backgroundTint"])
-
- val resultText = FuzzyAttributeParser.parse(annotation, "TextView")
- assertEquals("#FF0000", resultText["android:background"])
- }
-
- @Test
- fun `delimited parses text and hint attributes`() {
- val annotation = "text: Hello World | hint: Enter name"
- val result = FuzzyAttributeParser.parse(annotation, "EditText")
-
- assertEquals("Hello World", result["android:text"])
- assertEquals("Enter name", result["android:hint"])
- }
-
- @Test
- fun `delimited parses src attribute`() {
- val annotation = "src: my_image.png | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "ImageView")
-
- assertEquals("@drawable/my_image", result["android:src"])
- }
-
- @Test
- fun `OCR garbled drawable name wm to m`() {
- val annotation = "src: iwmages | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "ImageView")
-
- assertEquals("@drawable/images", result["android:src"])
- }
-
- @Test
- fun `OCR garbled drawable name rn to m`() {
- val annotation = "src: irnagebg | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "ImageView")
-
- assertEquals("@drawable/imagebg", result["android:src"])
- }
-
- @Test
- fun `delimited parses textSize with sp suffix`() {
- val annotation = "text_size: 14 | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("14sp", result["android:textSize"])
- }
-
- @Test
- fun `delimited parses textColor with color map lookup`() {
- val annotation = "textcolor: blue | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("#0000FF", result["android:textColor"])
- }
-
- @Test
- fun `OCR garbled keys are fuzzy matched via delimited`() {
- val annotation = "wldth: 100dp | hejght: 80dp"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("80dp", result["android:layout_height"])
- }
-
- @Test
- fun `OCR garbled dimension value with spaces is cleaned`() {
- val annotation = "width: 100 dp | height: 80 dp"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("80dp", result["android:layout_height"])
- }
-
- @Test
- fun `OCR garbled color name is fuzzy matched`() {
- val annotation = "background: bIue | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("#0000FF", result["android:background"])
- }
-
- @Test
- fun `OCR garbled match_parent is fuzzy matched`() {
- val annotation = "width: match parcnt | height: 80dp"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("match_parent", result["android:layout_width"])
- }
-
- @Test
- fun `OCR garbled wrap_content is fuzzy matched`() {
- val annotation = "height: wrap_contnt | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("wrap_content", result["android:layout_height"])
- }
-
- @Test
- fun `OCR dimension with trailing zero before dp is normalized`() {
- val annotation = "height: 1500dp | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "EditText")
-
- assertEquals("150dp", result["android:layout_height"])
- }
-
- @Test
- fun `zero padded dimension values are normalized`() {
- val annotation = "height: 0010dp | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "EditText")
-
- assertEquals("10dp", result["android:layout_height"])
- }
-
- @Test
- fun `all zero padded dimension values normalize to zero`() {
- val annotation = "height: 0000dp | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "EditText")
-
- assertEquals("0dp", result["android:layout_height"])
- }
-
- @Test
- fun `empty chunks between pipes are skipped`() {
- val annotation = "width: 100dp | | height: 80dp"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals(2, result.size)
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("80dp", result["android:layout_height"])
- }
-
- @Test
- fun `chunk without colon infers key-value boundary`() {
- val annotation = "width 100dp | id my_btn"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("my_btn", result["android:id"])
- }
-
- @Test
- fun `garbage key below threshold is dropped`() {
- val annotation = "xyzabc: 100dp | width: 200dp"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("200dp", result["android:layout_width"])
- assertNull(result["xyzabc"])
- }
-
- @Test
- fun `multiple colons preserves value after first colon`() {
- val annotation = "text: Hello: World | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("Hello: World", result["android:text"])
- }
-
- @Test
- fun `id value has special characters cleaned`() {
- val annotation = "id: radius slider | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "ImageView")
-
- assertEquals("radius_slider", result["android:id"])
- }
-
- @Test
- fun `OCR garbled checkbox group id is normalized without changing custom ids`() {
- val checkboxResult = FuzzyAttributeParser.parse("id: cbgraup2 | width: 100dp", "CheckBox")
- val customResult = FuzzyAttributeParser.parse("id: radius_slider | width: 100dp", "ImageView")
-
- assertEquals("cb_group_2", checkboxResult["android:id"])
- assertEquals("radius_slider", customResult["android:id"])
- }
-
- @Test
- fun `hex color values pass through unchanged`() {
- val annotation = "background: #FF5733 | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("#FF5733", result["android:background"])
- }
-
- @Test
- fun `android resource color values pass through unchanged`() {
- val annotation = "background: @android:color/transparent | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("@android:color/transparent", result["android:background"])
- }
-
- @Test
- fun `entries attribute maps to tools namespace`() {
- val annotation = "entries: @array/items | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "Spinner")
-
- assertEquals("@array/items", result["tools:entries"])
- }
-
- @Test
- fun `inputType attribute parses correctly`() {
- val annotation = "input_type: textPassword | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "EditText")
-
- assertEquals("textPassword", result["android:inputType"])
- }
-
- @Test
- fun `gravity attribute parses correctly`() {
- val annotation = "gravity: center | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("center", result["android:gravity"])
- }
-
- @Test
- fun `layout_gravity attribute parses correctly`() {
- val annotation = "layout_gravity: center | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("center", result["android:layout_gravity"])
- }
-
- @Test
- fun `style attribute parses correctly`() {
- val annotation = "style: @style/Widget.MaterialComponents.Button | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("@style/Widget.MaterialComponents.Button", result["style"])
- }
-
- @Test
- fun `negative dimension values are handled`() {
- val annotation = "width: -16dp | height: 80dp"
- val result = FuzzyAttributeParser.parse(annotation, "View")
-
- assertEquals("-16dp", result["android:layout_width"])
- }
-
- @Test
- fun `purple color is fuzzy matched`() {
- val annotation = "textcolor: pruple | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("#800080", result["android:textColor"])
- }
-
- @Test
- fun `layout_weight cleans non-numeric noise`() {
- val annotation = "layout_weight: 1 Layout | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("1", result["android:layout_weight"])
- }
-
- @Test
- fun `multiple attributes with mixed clean and garbled`() {
- val annotation = "width: match_parent | bg: blue | text_size: 20"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("match_parent", result["android:layout_width"])
- assertEquals("#0000FF", result["app:backgroundTint"])
- assertEquals("20sp", result["android:textSize"])
- }
-
- @Test
- fun `non-delimited colon scanning parses multiple attributes`() {
- val annotation = "width: 100dp height: 80dp id: my_btn"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("80dp", result["android:layout_height"])
- assertEquals("my_btn", result["android:id"])
- }
-
- @Test
- fun `non-delimited with OCR garbled layout_height`() {
- val annotation = "width: 100 dp Layout _height: 80 dp id: radius_slider"
- val result = FuzzyAttributeParser.parse(annotation, "ImageView")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("80dp", result["android:layout_height"])
- assertEquals("radius_slider", result["android:id"])
- }
-
- @Test
- fun `non-delimited with OCR garbled id as ld`() {
- val annotation = "height: 80 dp ld: done_button"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("80dp", result["android:layout_height"])
- assertEquals("done_button", result["android:id"])
- }
-
- @Test
- fun `non-delimited real OCR scenario from user report`() {
- val annotation = "width: 100 dp Layout _height: 80 dp ld: radius_slider"
- val result = FuzzyAttributeParser.parse(annotation, "ImageView")
-
- assertNotNull(result["android:layout_width"])
- assertNotNull(result["android:layout_height"])
- }
-
- @Test
- fun `non-delimited background color for button`() {
- val annotation = "width: 100dp background: red"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("#FF0000", result["app:backgroundTint"])
- }
-
- @Test
- fun `margin attributes parse correctly`() {
- val annotation = "margin_top: 8dp | margin_bottom: 16dp | padding: 12dp"
- val result = FuzzyAttributeParser.parse(annotation, "View")
-
- assertEquals("8dp", result["android:layout_marginTop"])
- assertEquals("16dp", result["android:layout_marginBottom"])
- assertEquals("12dp", result["android:padding"])
- }
-
- @Test
- fun `padding attributes parse correctly`() {
- val annotation = "padding_start: 16dp | padding_end: 16dp"
- val result = FuzzyAttributeParser.parse(annotation, "LinearLayout")
-
- assertEquals("16dp", result["android:paddingStart"])
- assertEquals("16dp", result["android:paddingEnd"])
- }
-
- @Test
- fun `visibility attribute parses correctly`() {
- val annotation = "visibility: gone | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "View")
-
- assertEquals("gone", result["android:visibility"])
- }
-
- @Test
- fun `orientation attribute parses correctly`() {
- val annotation = "orientation: horizontal | width: match_parent"
- val result = FuzzyAttributeParser.parse(annotation, "LinearLayout")
-
- assertEquals("horizontal", result["android:orientation"])
- }
-
- @Test
- fun `text style attributes parse correctly`() {
- val annotation = "text_style: bold | text_alignment: center | max_lines: 2"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("bold", result["android:textStyle"])
- assertEquals("center", result["android:textAlignment"])
- assertEquals("2", result["android:maxLines"])
- }
-
- @Test
- fun `elevation attribute parses as dp`() {
- val annotation = "elevation: 4 | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "View")
-
- assertEquals("4dp", result["android:elevation"])
- }
-
- @Test
- fun `card attributes parse correctly`() {
- val annotation = "corner_radius: 8dp | card_elevation: 4dp | card_background_color: white"
- val result = FuzzyAttributeParser.parse(annotation, "CardView")
-
- assertEquals("8dp", result["app:cardCornerRadius"])
- assertEquals("4dp", result["app:cardElevation"])
- assertEquals("#FFFFFF", result["app:cardBackgroundColor"])
- }
-
- @Test
- fun `slider attributes parse correctly`() {
- val annotation = "value_from: 0 | value_to: 100 | step_size: 5"
- val result = FuzzyAttributeParser.parse(annotation, "Slider")
-
- assertEquals("0", result["app:valueFrom"])
- assertEquals("100", result["app:valueTo"])
- assertEquals("5", result["app:stepSize"])
- }
-
- @Test
- fun `min and max attributes parse correctly`() {
- val annotation = "min: 0 | max: 100 | progress: 50"
- val result = FuzzyAttributeParser.parse(annotation, "ProgressBar")
-
- assertEquals("0", result["android:min"])
- assertEquals("100", result["android:max"])
- assertEquals("50", result["android:progress"])
- }
-
- @Test
- fun `scale_type attribute parses correctly`() {
- val annotation = "scale_type: fitCenter | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "ImageView")
-
- assertEquals("fitCenter", result["android:scaleType"])
- }
-
- @Test
- fun `stroke attributes parse correctly`() {
- val annotation = "stroke_color: black | stroke_width: 2dp"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("#000000", result["app:strokeColor"])
- assertEquals("2dp", result["app:strokeWidth"])
- }
-
- @Test
- fun `checked attribute parses correctly`() {
- val annotation = "checked: true | width: wrap_content"
- val result = FuzzyAttributeParser.parse(annotation, "CheckBox")
-
- assertEquals("true", result["android:checked"])
- }
-
- @Test
- fun `max_length and single_line parse correctly`() {
- val annotation = "max_length: 50 | single_line: true"
- val result = FuzzyAttributeParser.parse(annotation, "EditText")
-
- assertEquals("50", result["android:maxLength"])
- assertEquals("true", result["android:singleLine"])
- }
-
- @Test
- fun `font_family attribute parses correctly`() {
- val annotation = "font_family: sans-serif-medium | width: 100dp"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("sans-serif-medium", result["android:fontFamily"])
- }
-
- @Test
- fun `non-delimited full garbled scenario`() {
- val annotation = "wldth: 100 dp Layout _height: 80 dp ld: radius_slider background: blue"
- val result = FuzzyAttributeParser.parse(annotation, "ImageView")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("80dp", result["android:layout_height"])
- assertEquals("radius_slider", result["android:id"])
- assertEquals("#0000FF", result["android:background"])
- }
-
- @Test
- fun `colonless trailing attribute after last colon-scanned key`() {
- val annotation = "width: 100dp background red"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("#FF0000", result["app:backgroundTint"])
- }
-
- @Test
- fun `colonless trailing color for non-button`() {
- val annotation = "text: Next backgrounli red"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("Next", result["android:text"])
- assertEquals("#FF0000", result["android:background"])
- }
-
- @Test
- fun `multiple colonless trailing attributes`() {
- val annotation = "width: 100dp background red gravity center"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("#FF0000", result["android:background"])
- assertEquals("center", result["android:gravity"])
- }
-
- @Test
- fun `standalone trailing color without key is inferred as background`() {
- val annotation = "text: Next red"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("Next", result["android:text"])
- assertEquals("#FF0000", result["app:backgroundTint"])
- }
-
- @Test
- fun `standalone trailing color for non-button`() {
- val annotation = "text: Submit blue"
- val result = FuzzyAttributeParser.parse(annotation, "TextView")
-
- assertEquals("Submit", result["android:text"])
- assertEquals("#0000FF", result["android:background"])
- }
-
- @Test
- fun `standalone trailing fuzzy color is matched`() {
- val annotation = "width: 200dp height: 200dp text: Next pruple"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("200dp", result["android:layout_width"])
- assertEquals("200dp", result["android:layout_height"])
- assertEquals("Next", result["android:text"])
- assertEquals("#800080", result["app:backgroundTint"])
- }
-
- @Test
- fun `semicolons treated as colons`() {
- val annotation = "width; 100dp height; 80dp id; my_btn"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("100dp", result["android:layout_width"])
- assertEquals("80dp", result["android:layout_height"])
- assertEquals("my_btn", result["android:id"])
- }
-
- @Test
- fun `colonless key-value in middle of annotation`() {
- val annotation = "id: btn_end text Start background: red"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("btn_end", result["android:id"])
- assertEquals("Start", result["android:text"])
- assertEquals("#FF0000", result["app:backgroundTint"])
- }
-
- @Test
- fun `real OCR garbled annotation with semicolons and noise`() {
- val annotation = "Ld; btn_start text; Start backgraund: gray"
- val result = FuzzyAttributeParser.parse(annotation, "Button")
-
- assertEquals("btn_start", result["android:id"])
- assertEquals("Start", result["android:text"])
- assertEquals("#808080", result["app:backgroundTint"])
- }
-}
diff --git a/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/parser/sanitizer/OcrSanitizerRulesTest.kt b/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/parser/sanitizer/OcrSanitizerRulesTest.kt
deleted file mode 100644
index 7821e96b98..0000000000
--- a/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/parser/sanitizer/OcrSanitizerRulesTest.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.appdevforall.codeonthego.computervision.domain.parser.sanitizer
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class OcrSanitizerRulesTest {
-
- @Test
- fun `color sanitizer fixes merged background color tokens`() {
- val sanitizer = ColorSanitizer()
-
- assertEquals("background red", sanitizer.sanitize("backgroundired"))
- assertEquals("background red", sanitizer.sanitize("backgroundred"))
- }
-
- @Test
- fun `text attribute sanitizer normalizes OCR variants of text style`() {
- val sanitizer = TextAttributeSanitizer()
-
- assertEquals("text_style", sanitizer.sanitize("text style"))
- assertEquals("text_style", sanitizer.sanitize("text stjle"))
- }
-
- @Test
- fun `dimension sanitizer fixes width and height OCR mistakes`() {
- val sanitizer = DimensionSanitizer()
-
- assertEquals("layout_width: 120dp", sanitizer.sanitize("iayout widh. 120dp"))
- assertEquals("layout_height: 48dp", sanitizer.sanitize("layout heist. 48dp"))
- }
-
- @Test
- fun `dimension sanitizer normalizes match parent OCR variants`() {
- val sanitizer = DimensionSanitizer()
-
- assertEquals("layout_width: match_parent", sanitizer.sanitize("layout_width: match parent"))
- assertEquals("layout_width: match_parent", sanitizer.sanitize("layout_width: match-parrent"))
- }
-
- @Test
- fun `margin and padding sanitizer preserves edge names`() {
- val sanitizer = MarginPaddingSanitizer()
-
- assertEquals("layout_margin_top: 16dp", sanitizer.sanitize("layout_margin top: 16dp"))
- assertEquals("padding_end: 8dp", sanitizer.sanitize("padding end: 8dp"))
- }
-
- @Test
- fun `structure sanitizer rewrites horizontal center layout phrase`() {
- val sanitizer = StructureSanitizer()
-
- assertEquals(
- "layout_gravity: center_horizontal",
- sanitizer.sanitize("horizontal gravity: center layout")
- )
- }
-
- @Test
- fun `default sanitizer applies multiple OCR cleanup rules in sequence`() {
- val sanitizer = OcrSanitizerFactory.createDefaultSanitizer()
- val input = "backgroundired | text stjle: bold | iayout widh. match parrent | padding end: 8dp"
-
- assertEquals(
- "background red | text_style: bold | layout_width: match_parent | padding_end: 8dp",
- sanitizer.sanitize(input)
- )
- }
-}
diff --git a/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/xml/LayoutRendererTest.kt b/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/xml/LayoutRendererTest.kt
deleted file mode 100644
index 0443c730e2..0000000000
--- a/cv-image-to-xml/src/test/java/org/appdevforall/codeonthego/computervision/domain/xml/LayoutRendererTest.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.appdevforall.codeonthego.computervision.domain.xml
-
-import android.graphics.Rect
-import org.appdevforall.codeonthego.computervision.domain.model.LayoutItem
-import org.appdevforall.codeonthego.computervision.domain.model.ScaledBox
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class LayoutRendererTest {
-
- @Test
- fun `checkbox group uses canonical ids when OCR annotation id is noisy`() {
- val first = checkboxBox(y = 0, text = "Option A")
- val second = checkboxBox(y = 20, text = "Option B", checked = true)
- val context = XmlContext()
-
- val renderer = LayoutRenderer(
- context = context,
- annotations = mapOf(
- first to "id: cbgraup2 | textColor: gray"
- )
- )
-
- renderer.render(LayoutItem.CheckboxGroup(listOf(first, second), "vertical"))
-
- val xml = context.toString()
-
- assertTrue(xml.contains("""android:id="@+id/cb_group_2_a""""))
- assertTrue(xml.contains("""android:id="@+id/cb_group_2_b""""))
- assertTrue(!xml.contains("cbgraup2"))
- }
-
- @Test
- fun `radio group ignores group style ids on child radios`() {
- val first = radioBox(y = 0, text = "choice A")
- val second = radioBox(y = 20, text = "choice B", checked = true)
- val context = XmlContext()
-
- val renderer = LayoutRenderer(
- context = context,
- annotations = mapOf(
- first to "id: rb_group_1 | textSize: 16sp"
- )
- )
-
- renderer.render(LayoutItem.RadioGroup(listOf(first, second), "vertical"))
-
- val xml = context.toString()
-
- assertTrue(xml.contains("""android:id="@+id/radio_button_unchecked_0""""))
- assertTrue(xml.contains("""android:id="@+id/radio_button_checked_0""""))
- assertTrue(!xml.contains("""android:id="@+id/rb_group_1""""))
- }
-
- @Test
- fun `radio group ignores group style ids even when parser leaks trailing tokens`() {
- val first = radioBox(y = 0, text = "choice A")
- val second = radioBox(y = 20, text = "choice B", checked = true)
- val context = XmlContext()
-
- val renderer = LayoutRenderer(
- context = context,
- annotations = mapOf(
- first to "id: rb_group_1_text_site_16sp | textColor: black"
- )
- )
-
- renderer.render(LayoutItem.RadioGroup(listOf(first, second), "vertical"))
-
- val xml = context.toString()
-
- assertTrue(xml.contains("""android:id="@+id/radio_button_unchecked_0""""))
- assertTrue(!xml.contains("""android:id="@+id/rb_group_1_text_site_16sp""""))
- }
-
- private fun checkboxBox(y: Int, text: String, checked: Boolean = false): ScaledBox {
- val label = if (checked) "checkbox_checked" else "checkbox_unchecked"
- return ScaledBox(
- label = label,
- text = text,
- x = 0,
- y = y,
- w = 20,
- h = 20,
- centerX = 10,
- centerY = y + 10,
- rect = Rect(0, y, 20, y + 20)
- )
- }
-
- private fun radioBox(y: Int, text: String, checked: Boolean = false): ScaledBox {
- val label = if (checked) "radio_button_checked" else "radio_button_unchecked"
- return ScaledBox(
- label = label,
- text = text,
- x = 0,
- y = y,
- w = 20,
- h = 20,
- centerX = 10,
- centerY = y + 10,
- rect = Rect(0, y, 20, y + 20)
- )
- }
-}
diff --git a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/extensions/UIExtension.kt b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/extensions/UIExtension.kt
index 7d08d52859..65e6e1792e 100644
--- a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/extensions/UIExtension.kt
+++ b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/extensions/UIExtension.kt
@@ -65,8 +65,11 @@ data class MenuItem @JvmOverloads constructor(
* both the sidebar and the toolbar surfaces.
*/
val tooltipTag: String? = null,
- val icon: Int? = null,
-)
+ val icon: Int? = null
+) {
+ var isEnabledProvider: (() -> Boolean)? = null
+ var isVisibleProvider: (() -> Boolean)? = null
+}
data class ContextMenuContext(
val file: java.io.File?,
@@ -139,4 +142,4 @@ data class FabAction(
val isEnabled: Boolean = true,
val isVisible: Boolean = true,
val action: () -> Unit
-)
\ No newline at end of file
+)
diff --git a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/services/IdeServices.kt b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/services/IdeServices.kt
index b614cef6ce..f7c02716c7 100644
--- a/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/services/IdeServices.kt
+++ b/plugin-api/src/main/kotlin/com/itsaky/androidide/plugins/services/IdeServices.kt
@@ -150,6 +150,25 @@ interface IdeUIService {
* @return true if UI operations can be performed, false otherwise
*/
fun isUIAvailable(): Boolean
+
+ /**
+ * Opens a fullscreen host surface for a plugin-owned Fragment.
+ *
+ * The host app owns only the generic container. The plugin owns the Fragment class and all
+ * feature-specific behavior.
+ */
+ fun openPluginScreen(
+ pluginId: String,
+ fragmentClassName: String,
+ title: String? = null
+ ): Boolean = false
+
+ companion object {
+ const val ACTION_OPEN_PLUGIN_SCREEN = "com.itsaky.androidide.plugins.OPEN_PLUGIN_SCREEN"
+ const val EXTRA_PLUGIN_ID = "com.itsaky.androidide.plugins.extra.PLUGIN_ID"
+ const val EXTRA_FRAGMENT_CLASS_NAME = "com.itsaky.androidide.plugins.extra.FRAGMENT_CLASS_NAME"
+ const val EXTRA_TITLE = "com.itsaky.androidide.plugins.extra.TITLE"
+ }
}
/**
diff --git a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/services/IdeUIServiceImpl.kt b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/services/IdeUIServiceImpl.kt
index a9115753bc..f766225fc2 100644
--- a/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/services/IdeUIServiceImpl.kt
+++ b/plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager/services/IdeUIServiceImpl.kt
@@ -3,6 +3,7 @@
package com.itsaky.androidide.plugins.manager.services
import android.app.Activity
+import android.content.Intent
import com.itsaky.androidide.plugins.manager.core.PluginManager
import com.itsaky.androidide.plugins.services.IdeUIService
@@ -25,4 +26,22 @@ class IdeUIServiceImpl(
override fun isUIAvailable(): Boolean {
return getCurrentActivity() != null
}
+
+ override fun openPluginScreen(
+ pluginId: String,
+ fragmentClassName: String,
+ title: String?
+ ): Boolean {
+ val activity = getCurrentActivity() ?: return false
+ val intent = Intent(IdeUIService.ACTION_OPEN_PLUGIN_SCREEN).apply {
+ setPackage(activity.packageName)
+ putExtra(IdeUIService.EXTRA_PLUGIN_ID, pluginId)
+ putExtra(IdeUIService.EXTRA_FRAGMENT_CLASS_NAME, fragmentClassName)
+ putExtra(IdeUIService.EXTRA_TITLE, title)
+ }
+ return runCatching {
+ activity.startActivity(intent)
+ true
+ }.getOrDefault(false)
+ }
}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bf4dd33435..1b75673afd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -189,7 +189,6 @@ include(
":plugin-manager",
":llama-api",
":llama-impl",
- ":cv-image-to-xml",
":llama-api",
":llama-impl",
":compose-preview"