Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

fix: predictive back gesture on translate screen

AKS Labsc4152c1e4c21
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/OverlayUI.kt b/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/OverlayUI.kt
index c548c48..643b1f9 100644
--- a/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/OverlayUI.kt
+++ b/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/OverlayUI.kt
@@ -59,6 +59,8 @@ class OverlayUI(
private var selectDialog: Dialog? = null
private var selectHost: WindowComposeHost? = null
private var scanHost: WindowComposeHost? = null
+ private var messageView: TextView? = null
+ private val menuChildren = mutableListOf<View>()
private val menuManager =
OverlayMenuManager(
@@ -76,6 +78,7 @@ class OverlayUI(
)
params.windowAnimations = 0
windowManager.addView(view, params)
+ menuChildren.add(view)
}
override fun addMenuView(view: View) {
@@ -92,6 +95,7 @@ class OverlayUI(
params.y = dpToPx(48)
params.windowAnimations = 0
windowManager.addView(view, params)
+ menuChildren.add(view)
}
override fun addPickerView(view: View) {
@@ -106,9 +110,11 @@ class OverlayUI(
params.gravity = Gravity.CENTER
params.windowAnimations = 0
windowManager.addView(view, params)
+ menuChildren.add(view)
}
override fun removeMenuChild(view: View) {
+ menuChildren.remove(view)
windowManager.removeView(view)
}
},
@@ -464,7 +470,9 @@ class OverlayUI(
params.y = dpToPx(80)
windowManager.addView(textView, params)
+ messageView = textView
handler.postDelayed({
+ if (messageView === textView) messageView = null
try {
windowManager.removeView(textView)
} catch (_: Exception) {
@@ -472,6 +480,22 @@ class OverlayUI(
}, 3000)
}
+ /**
+ * Sets the alpha of every window this UI owns ([1f] = normal). The system's
+ * back-gesture arrow is drawn *below* accessibility overlays, so during a predictive
+ * back gesture they must become transparent to keep the arrow visible.
+ */
+ fun setOverlayAlpha(alpha: Float) {
+ toolbarView?.alpha = alpha
+ borderView?.alpha = alpha
+ touchWatcher?.alpha = alpha
+ scanHost?.view?.alpha = alpha
+ selectDialog?.window?.decorView?.alpha = alpha
+ messageView?.alpha = alpha
+ translationOverlays.forEach { it.alpha = alpha }
+ menuChildren.forEach { it.alpha = alpha }
+ }
+
fun hasToolbar(): Boolean = toolbarView != null
/** Re-inserts the toolbar so it stacks above windows added after it (result bitmap,
diff --git a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt
index 225dc1b..f72cb7b 100644
--- a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt
@@ -1181,13 +1181,15 @@ class CircleToSearchAccessibilityService : AccessibilityService() {
/**
* Translates the screenshot captured when Circle to Search launched using the
- * translator module's overlay (same path as its floating bubble).
- * [onClosed] is invoked when the overlay is dismissed (toolbar close / back press)
- * so the caller can restore its UI. Returns false if the overlay bridge is not running.
+ * translator module's overlay (same path as its floating bubble). OCR and
+ * translation start immediately; the overlay chrome is drawn after [uiDelayMs],
+ * once the caller's UI has been hidden. [onClosed] is invoked when the overlay is
+ * dismissed (toolbar close / back press) so the caller can restore its UI. Returns
+ * false if the overlay bridge is not running.
*/
- fun translateCapturedScreen(screenshot: Bitmap, onClosed: (() -> Unit)? = null): Boolean {
+ fun translateCapturedScreen(screenshot: Bitmap, uiDelayMs: Long = 0L, onClosed: (() -> Unit)? = null): Boolean {
val bridge = translatorBridge ?: return false
- bridge.activateWithScreenshot(screenshot, onClosed)
+ bridge.startCapturedTranslation(screenshot, uiDelayMs, onClosed)
return true
}
@@ -1196,6 +1198,12 @@ class CircleToSearchAccessibilityService : AccessibilityService() {
translatorBridge?.deactivate()
}
+ /** Fades translator overlay windows during the system back gesture so the
+ * predictive back arrow (drawn below accessibility overlays) stays visible. */
+ fun setTranslatorGestureAlpha(alpha: Float) {
+ translatorBridge?.setGestureAlpha(alpha)
+ }
+
companion object {
var instance: CircleToSearchAccessibilityService? = null
private set
diff --git a/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt b/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt
index 1f06b22..8c59fb7 100644
--- a/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt
@@ -53,6 +53,13 @@ class TranslatorOverlayBridge(
private var forcedTargetLanguage: Language? = null
private var isAutoSource: Boolean = true
private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+ private val mainHandler = android.os.Handler(android.os.Looper.getMainLooper())
+ private var capturedChrome: Runnable? = null
+ private var capturedScanning = false
+ private var capturedRegion: Rect? = null
+
+ /** Bumped on [deactivate] so a result finishing after close is dropped, not drawn. */
+ private var overlaySession = 0
private data class TranslatedScreen(
val original: Bitmap,
@@ -192,20 +199,74 @@ class TranslatorOverlayBridge(
}
/**
- * Same activation as the module's floating bubble ([activate]), but translates the
- * screenshot captured when Circle to Search launched instead of capturing a new one.
- * [returnToCaller] is invoked when the overlay is deactivated (toolbar close, back
- * press) so the caller can restore its UI.
+ * Starts OCR + translation of the screenshot captured when Circle to Search launched
+ * immediately, so compute overlaps the caller's UI-hide delay. The translator chrome
+ * (border wave + toolbar, then the scan overlay if still computing) is drawn only
+ * after [uiDelayMs], once the caller's UI has been hidden. [returnToCaller] is invoked
+ * when the overlay is deactivated (toolbar close, back press) so the caller can
+ * restore its UI.
*/
- fun activateWithScreenshot(screenshot: Bitmap, returnToCaller: (() -> Unit)? = null) {
+ fun startCapturedTranslation(
+ screenshot: Bitmap,
+ uiDelayMs: Long = 0L,
+ returnToCaller: (() -> Unit)? = null,
+ ) {
this.returnToCaller = returnToCaller
providedScreenshot = screenshot
+
if (active) {
if (selectMode) exitSelectMode()
+ beginProvidedTranslation(screenshot)
+ showScanIfScanning()
+ return
+ }
+
+ // Mark active now (gates bubble restore / receivers) but draw the chrome only after
+ // the caller's hide delay, so Circle to Search disappears first.
+ active = true
+ langStateManager.refreshLanguageAvailability()
+ ui.removeFloatingButton()
+ beginProvidedTranslation(screenshot)
+
+ if (uiDelayMs <= 0L) {
+ showCapturedChrome()
} else {
- enterActiveState()
+ val show = Runnable {
+ capturedChrome = null
+ if (providedScreenshot != null) showCapturedChrome()
+ }
+ capturedChrome = show
+ mainHandler.postDelayed(show, uiDelayMs)
}
- translateProvidedScreen(screenshot)
+ }
+
+ private fun showCapturedChrome() {
+ showTranslatorChrome()
+ showScanIfScanning()
+ }
+
+ private fun showScanIfScanning() {
+ if (capturedScanning) capturedRegion?.let { ui.showScanOverlay(surfaceState, it) }
+ }
+
+ private fun cancelCapturedChrome() {
+ capturedChrome?.let { mainHandler.removeCallbacks(it) }
+ capturedChrome = null
+ }
+
+ /**
+ * Fades the overlay windows during the system back gesture ([alpha] 1 = normal,
+ * 0 = hidden) so the predictive back arrow, drawn below accessibility overlays,
+ * stays visible.
+ */
+ fun setGestureAlpha(alpha: Float) {
+ if (!active) return
+ ui.setOverlayAlpha(alpha)
+ }
+
+ private fun showTranslatorChrome() {
+ ui.showBorderWave()
+ ui.showToolbar(forcedSourceLanguage, forcedTargetLanguage, currentReadingOrderFor(forcedSourceLanguage), isAutoSource)
}
private fun enterActiveState() {
@@ -213,11 +274,12 @@ class TranslatorOverlayBridge(
langStateManager.refreshLanguageAvailability()
ui.removeFloatingButton()
ui.removeTranslationOverlays()
- ui.showBorderWave()
- ui.showToolbar(forcedSourceLanguage, forcedTargetLanguage, currentReadingOrderFor(forcedSourceLanguage), isAutoSource)
+ showTranslatorChrome()
}
override fun deactivate() {
+ cancelCapturedChrome()
+ overlaySession++
active = false
selectMode = false
ui.removeSelectSurface()
@@ -372,8 +434,9 @@ class TranslatorOverlayBridge(
private fun fullCaptureRegion(): Rect =
dev.davidv.translator.overlayChrome.OverlayInsets.contentBounds(windowManager)
- /** OCR + translate an already-captured screenshot, skipping the accessibility capture. */
- private fun translateProvidedScreen(screenshot: Bitmap) {
+ /** Crops the provided capture and starts OCR/translate immediately — no UI here;
+ * the caller draws the scan overlay and chrome separately (they may be delayed). */
+ private fun beginProvidedTranslation(screenshot: Bitmap) {
ui.removeTranslationOverlays()
val sourceLang = ocrSourceLanguage()
@@ -387,9 +450,14 @@ class TranslatorOverlayBridge(
val cropped = cropToRegion(screenshot, region) ?: return
surfaceState.regions.value = null
- ui.showScanOverlay(surfaceState, region)
+ capturedRegion = region
+ capturedScanning = true
serviceScope.launch {
- translateRegionBitmap(cropped, region)
+ try {
+ translateRegionBitmap(cropped, region)
+ } finally {
+ capturedScanning = false
+ }
}
}
@@ -447,6 +515,7 @@ class TranslatorOverlayBridge(
bitmap: Bitmap,
region: Rect,
) {
+ val session = overlaySession
val coordinator = translationCoordinator ?: return
val sourceLang = ocrSourceLanguage()
val targetLang = forcedTargetLanguage ?: langStateManager.languageByCode(settingsManager.settings.value.defaultTargetLanguageCode) ?: return
@@ -469,6 +538,8 @@ class TranslatorOverlayBridge(
)
}
+ if (session != overlaySession || !active) return
+
ui.removeTranslationOverlays()
if (result == null) {
if (selectMode) surfaceState.processing.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 eab48f6..9bd35c3 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
@@ -30,6 +30,7 @@ import android.webkit.WebView
import android.webkit.WebViewClient
import android.widget.FrameLayout
import androidx.activity.compose.BackHandler
+import androidx.activity.compose.PredictiveBackHandler
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.animateFloat
import androidx.compose.animation.core.animateFloatAsState
@@ -577,6 +578,24 @@ fun CircleToSearchScreen(
}
}
+ // Predictive back arrow: the system animates the back gesture (edge arrow + progress)
+ // only when a prioritized callback receives it. In translator mode back is consumed
+ // with no window transition, so a predictive handler keeps the arrow visible — and
+ // the overlay windows (drawn above the arrow) fade out while the gesture runs.
+ PredictiveBackHandler(enabled = isTranslatorMode) { progress ->
+ val service = CircleToSearchAccessibilityService.instance
+ try {
+ progress.collect { event ->
+ val fade = (1f - event.progress * 6f).coerceIn(0f, 1f)
+ service?.setTranslatorGestureAlpha(fade)
+ }
+ service?.closeTranslateOverlay()
+ } catch (_: java.util.concurrent.CancellationException) {
+ // Gesture cancelled — restore the overlay windows.
+ service?.setTranslatorGestureAlpha(1f)
+ }
+ }
+
Surface(
color = Color.Transparent,
tonalElevation = 0.dp
@@ -1520,13 +1539,14 @@ fun CircleToSearchScreen(
currentPathPoints.clear()
scope.launch { selectionAnim.snapTo(0f) }
isTranslatorMode = true
- android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
- if (isTranslatorMode) {
- translatorService.translateCapturedScreen(bmp) {
- isTranslatorMode = false
- }
- }
- }, TRANSLATE_HIDE_DELAY_MS)
+ // OCR starts now; only the overlay chrome waits for the hide delay.
+ val started = translatorService.translateCapturedScreen(bmp, TRANSLATE_HIDE_DELAY_MS) {
+ isTranslatorMode = false
+ }
+ if (!started) {
+ isTranslatorMode = false
+ android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
+ }
}
},
onLongClick = {
@@ -1536,10 +1556,8 @@ fun CircleToSearchScreen(
if (bmp == null || translatorService == null) {
android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
} else {
+ translatorService.translateCapturedScreen(bmp, TRANSLATE_TRIGGER_DELAY_MS)
onClose()
- android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
- translatorService.translateCapturedScreen(bmp)
- }, TRANSLATE_TRIGGER_DELAY_MS)
}
}
),