Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

feature: added copy text using assistant permission

AKS Labs0a5455285b0d
diff --git a/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt b/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
index 389bf96..5f8695d 100644
--- a/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
@@ -48,6 +48,14 @@ class AssistSessionService : VoiceInteractionSessionService() {
override fun onShow(args: Bundle?, showFlags: Int) {
super.onShow(args, showFlags)
android.util.Log.d("AssistSessionService", "onShow called with flags: $showFlags")
+
+ // Clear data at the absolute start of the session to prevent race conditions
+ // with onHandleAssist/onHandleScreenshot delivery order.
+ com.akslabs.circletosearch.data.AssistDataRepository.clear()
+
+ // Ensure our session window doesn't intercept target app touches
+ window?.window?.addFlags(android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
+ window?.window?.addFlags(android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
// Haptic feedback to acknowledge the trigger
val vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
@@ -62,22 +70,100 @@ class AssistSessionService : VoiceInteractionSessionService() {
override fun onHandleAssist(data: Bundle?, structure: AssistStructure?, content: AssistContent?) {
super.onHandleAssist(data, structure, content)
android.util.Log.d("AssistSessionService", "onHandleAssist called")
- // This is called for text/structure. We mainly care about the screenshot,
- // but this is a good place to ensure the overlay starts if onHandleScreenshot is delayed.
+
+ if (structure == null) {
+ android.util.Log.w("AssistSessionService", "AssistStructure is null")
+ return
+ }
+
+ val allNodes = mutableListOf<com.akslabs.circletosearch.ui.components.TextNode>()
+ android.util.Log.d("AssistSessionService", "Capturing AssistStructure - Window count: ${structure.windowNodeCount}")
+
+ for (i in 0 until structure.windowNodeCount) {
+ val windowNode = structure.getWindowNodeAt(i)
+ val windowTitle = windowNode.title?.toString() ?: "No Title"
+
+ android.util.Log.d("AssistSessionService", "Processing Window [$i]: \"$windowTitle\"")
+
+ val windowOffsetX = windowNode.left
+ val windowOffsetY = windowNode.top
+
+ // Collect all text from this window
+ collectTextNodes(windowNode.rootViewNode, windowOffsetX, windowOffsetY, allNodes)
+ }
+
+ if (allNodes.isEmpty()) {
+ android.util.Log.w("AssistSessionService", "No text nodes found in assist data")
+ } else {
+ android.util.Log.d("AssistSessionService", "Extracted total of ${allNodes.size} text nodes from all windows")
+ }
+
+ com.akslabs.circletosearch.data.AssistDataRepository.setNodes(allNodes)
+ }
+
+ private fun collectTextNodes(
+ node: AssistStructure.ViewNode,
+ parentX: Int,
+ parentY: Int,
+ list: MutableList<com.akslabs.circletosearch.ui.components.TextNode>
+ ) {
+ val nodeX = parentX + node.left
+ val nodeY = parentY + node.top
+
+ val text = node.text?.toString()
+ if (!text.isNullOrBlank() && node.visibility == android.view.View.VISIBLE) {
+ val nodeRect = android.graphics.Rect(nodeX, nodeY, nodeX + node.width, nodeY + node.height)
+
+ // Split text into words and estimate their positions
+ val wordStrings = text.split(Regex("\\s+")).filter { it.isNotBlank() }
+ var currentStartIndex = 0
+ val words = mutableListOf<com.akslabs.circletosearch.ui.components.Word>()
+
+ wordStrings.forEachIndexed { wordIndex, wordText ->
+ val startIndex = text.indexOf(wordText, currentStartIndex)
+ val endIndex = startIndex + wordText.length
+ currentStartIndex = endIndex
+
+ // Estimate word bounds proportionally within the node's rectangle
+ val wordBounds = android.graphics.RectF(nodeRect)
+
+ words.add(
+ com.akslabs.circletosearch.ui.components.Word(
+ text = wordText,
+ index = wordIndex,
+ startIndex = startIndex,
+ endIndex = endIndex,
+ bounds = wordBounds
+ )
+ )
+ }
+
+ list.add(
+ com.akslabs.circletosearch.ui.components.TextNode(
+ id = java.util.UUID.randomUUID().toString(),
+ fullText = text,
+ bounds = nodeRect,
+ words = words
+ )
+ )
+ }
+
+ for (i in 0 until node.childCount) {
+ collectTextNodes(node.getChildAt(i), nodeX, nodeY, list)
+ }
}
override fun onHandleScreenshot(screenshot: android.graphics.Bitmap?) {
super.onHandleScreenshot(screenshot)
android.util.Log.d("AssistSessionService", "onHandleScreenshot received, bitmap null? ${screenshot == null}")
- // 1. Save screenshot to repository for the overlay to use
+ // 1. Save screenshot to repository
BitmapRepository.setScreenshot(screenshot)
- // 2. Launch the search overlay activity independently of Accessibility permission
+ // 2. Launch the search overlay
launchOverlayDirectly()
- // 3. We can finish the session now as the overlay takes over
- finish()
+ // 3. Keep session alive for a moment to receive onHandleAssist data
}
private fun launchOverlayDirectly() {
diff --git a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
index aa32e94..14424bd 100644
--- a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
@@ -45,6 +45,10 @@ class OverlayActivity : ComponentActivity() {
super.onCreate(savedInstanceState)
android.util.Log.d("CircleToSearch", "OverlayActivity onCreate")
+ // Ensure the activity can receive touches and focus properly
+ window.addFlags(android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL)
+ window.addFlags(android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN)
+
loadScreenshot()
// Initialize manager for Activity-based layout
@@ -65,6 +69,7 @@ class OverlayActivity : ComponentActivity() {
screenshot = screenshotBitmap.value,
onClose = {
BitmapRepository.clear()
+ com.akslabs.circletosearch.data.AssistDataRepository.clear()
finish()
},
copyTextManager = copyTextManager.value,
@@ -114,6 +119,7 @@ class OverlayActivity : ComponentActivity() {
copyTextManager.value = null
if (isFinishing) {
com.akslabs.circletosearch.data.BitmapRepository.clear()
+ com.akslabs.circletosearch.data.AssistDataRepository.clear()
com.akslabs.circletosearch.utils.StorageUtils.clearAppCache(this)
}
}
diff --git a/app/src/main/java/com/akslabs/circletosearch/data/AssistDataRepository.kt b/app/src/main/java/com/akslabs/circletosearch/data/AssistDataRepository.kt
new file mode 100644
index 0000000..55867eb
--- /dev/null
+++ b/app/src/main/java/com/akslabs/circletosearch/data/AssistDataRepository.kt
@@ -0,0 +1,28 @@
+package com.akslabs.circletosearch.data
+
+import com.akslabs.circletosearch.ui.components.TextNode
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+object AssistDataRepository {
+ private val _assistNodes = MutableStateFlow<List<TextNode>>(emptyList())
+ val assistNodes: StateFlow<List<TextNode>> = _assistNodes.asStateFlow()
+
+ private val _isDataReady = MutableStateFlow(false)
+ val isDataReady: StateFlow<Boolean> = _isDataReady.asStateFlow()
+
+ fun setNodes(nodes: List<TextNode>) {
+ _assistNodes.value = nodes
+ _isDataReady.value = true
+ }
+
+ fun getNodes(): List<TextNode> {
+ return _assistNodes.value
+ }
+
+ fun clear() {
+ _assistNodes.value = emptyList()
+ _isDataReady.value = false
+ }
+}
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
index a23de9e..6ceaec2 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
@@ -119,6 +119,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -1432,26 +1433,29 @@ fun CircleToSearchScreen(
}
}
- // Circular Button: Song
+ // Circular Button: Assist Copy (Music Icon)
+ val assistNodes by com.akslabs.circletosearch.data.AssistDataRepository.assistNodes.collectAsState()
+ val isAssistDataReady by com.akslabs.circletosearch.data.AssistDataRepository.isDataReady.collectAsState()
+
IconButton(
onClick = {
haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
- android.widget.Toast.makeText(context, "Coming soon", android.widget.Toast.LENGTH_SHORT).show()
- /*
- try {
- val shazamIntent = context.packageManager.getLaunchIntentForPackage("com.shazam.android")
- val soundHoundIntent = context.packageManager.getLaunchIntentForPackage("com.melodis.midomiMusicIdentifier.freemium")
- val launchIntent = (shazamIntent ?: soundHoundIntent)?.apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) }
- if (launchIntent != null) context.startActivity(launchIntent)
- else context.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse("https://play.google.com/store/search?q=shazam&c=apps")).apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) })
- } catch (e: Exception) {}
- */
+
+ if (isAssistDataReady) {
+ // Use high-accuracy AssistStructure data
+ copyTextManager?.setAssistNodes(assistNodes)
+ isCopyMode = true
+ isCopyTextTriggered = 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()
+ }
},
modifier = Modifier
.size(60.dp)
.background(MaterialTheme.colorScheme.surfaceContainer, CircleShape),
) {
- Icon(Icons.Default.MusicNote, contentDescription = "Song Search")
+ Icon(Icons.Default.MusicNote, contentDescription = "Assist Copy", tint = if (isAssistDataReady) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface)
}
// Circular Button: Translate
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.kt
index f7bb711..6fcee03 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
@@ -54,6 +54,21 @@ class CopyTextOverlayManager(
private val textNodes = mutableStateListOf<TextNode>()
private var allWords: List<Word> = emptyList()
+ // Assistant Data support
+ var isAssistMode: Boolean = false
+ private set
+
+ fun setAssistNodes(nodes: List<TextNode>) {
+ isAssistMode = true
+ textNodes.clear()
+ textNodes.addAll(nodes)
+ allWords = nodes.flatMap { node ->
+ node.words.map { word ->
+ word
+ }
+ }
+ }
+
// Selection state
private var globalSelectionStart: Int = -1
private var globalSelectionEnd: Int = -1
@@ -64,8 +79,11 @@ class CopyTextOverlayManager(
// Reset state
globalSelectionStart = -1
globalSelectionEnd = -1
- textNodes.clear()
- allWords = emptyList()
+
+ if (!isAssistMode) {
+ textNodes.clear()
+ allWords = emptyList()
+ }
val container = FrameLayout(context)
@@ -91,7 +109,7 @@ class CopyTextOverlayManager(
)
Spacer(Modifier.height(16.dp))
Text(
- "Scanning text...",
+ if (isAssistMode) "Applying Assist Data..." else "Scanning text...",
style = MaterialTheme.typography.titleMedium,
color = ComposeColor.White,
modifier = Modifier
@@ -106,7 +124,9 @@ class CopyTextOverlayManager(
}
container.addView(topBar)
- scanNodes(view)
+ if (!isAssistMode) {
+ scanNodes(view)
+ }
return container
}