CircleToSearch with multi search engine support for all android
Kotlin
fixed OCR button in assistant mode
AKS Labs7d67cb9f0342
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.ktindex 6ceaec2..c2f897d 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt@@ -1442,13 +1442,13 @@ fun CircleToSearchScreen(haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)if (isAssistDataReady) {- // Use high-accuracy AssistStructure data- copyTextManager?.setAssistNodes(assistNodes)+ // Use high-accuracy AssistStructure data + OCR merge+ copyTextManager?.setHybridMode(assistNodes)isCopyMode = trueisCopyTextTriggered = true} else {// Data not ready (likely bubble trigger)- android.widget.Toast.makeText(context, "Deep Scan: Please trigger via Home Long-Press for 100% accuracy.", android.widget.Toast.LENGTH_LONG).show()+ android.widget.Toast.makeText(context, "Comming Soon: launch CTS as assistant to try Hybrid text detection.", android.widget.Toast.LENGTH_LONG).show()}},modifier = Modifier@@ -1596,6 +1596,7 @@ fun CircleToSearchScreen(// Copy TextBottomBarButton("Copy Text", { Icon(painterResource(id = com.akslabs.circletosearch.R.drawable.ocr), null, modifier = Modifier.size(20.dp)) }) {+ copyTextManager?.setOcrOnlyMode()isCopyMode = trueisCopyTextTriggered = true}diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/components/CopyTextOverlayManager.kt b/app/src/main/java/com/akslabs/circletosearch/ui/components/CopyTextOverlayManager.ktindex f6336ef..7dcbd0c 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/components/CopyTextOverlayManager.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/components/CopyTextOverlayManager.kt@@ -63,7 +63,7 @@ class CopyTextOverlayManager(private var nativeNodes: List<TextNode> = emptyList()- fun setAssistNodes(nodes: List<TextNode>) {+ fun setHybridMode(nodes: List<TextNode>) {isAssistMode = truenativeNodes = nodestextNodes.clear()@@ -71,6 +71,14 @@ class CopyTextOverlayManager(updateAllWords()}+ fun setOcrOnlyMode() {+ isAssistMode = false+ nativeNodes = emptyList()+ textNodes.clear()+ allWords = emptyList()+ statusMessage.value = null+ }+private fun updateAllWords() {allWords = textNodes.flatMap { node ->node.words.map { word ->@@ -86,15 +94,10 @@ class CopyTextOverlayManager(fun getOverlayView(onDismiss: () -> Unit): View {onDismissCallback = onDismiss- // Reset state+ // Reset interactive stateglobalSelectionStart = -1globalSelectionEnd = -1- if (!isAssistMode) {- textNodes.clear()- allWords = emptyList()- }-val container = FrameLayout(context)val view = DimPunchOutView(context)