CircleToSearch with multi search engine support for all android
Kotlin
feat: implemented offline translate
AKS Labs54958105d0a7
diff --git a/.kotlin/errors/errors-1790886525866.log b/.kotlin/errors/errors-1790886525866.lognew file mode 100644index 0000000..1dcac67--- /dev/null+++ b/.kotlin/errors/errors-1790886525866.log@@ -0,0 +1,48 @@+kotlin version: 2.0.21+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:+ 1. Kotlin compile daemon is ready++error message: Failed connecting to the daemon in 4 retries++error message: Daemon compilation failed: Could not connect to Kotlin compile daemon+java.lang.RuntimeException: Could not connect to Kotlin compile daemon+ at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:214)+ at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)+ at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)+ at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:76)+ at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)+ at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)+ at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)+ at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)+ at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)+ at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)+ at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)+ at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:210)+ at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:205)+ at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:67)+ at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:60)+ at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:167)+ at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:60)+ at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:54)+ at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)+ at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)+ at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)+ at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:317)+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:194)+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:127)+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:169)+ at org.gradle.internal.Factories$1.create(Factories.java:31)+ at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:263)+ at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:127)+ at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:132)+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:164)+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:133)+ at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:572)+ at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:317)+ at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)+ at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)+ at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)+ at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)+ at java.base/java.lang.Thread.run(Thread.java:1583)++diff --git a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.ktindex b81767f..a9e6893 100644--- a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt+++ b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt@@ -1179,6 +1179,17 @@ class CircleToSearchAccessibilityService : AccessibilityService() {override fun onInterrupt() {}+ /**+ * Translates the screenshot captured when Circle to Search launched using the+ * translator module's overlay (same path as its floating bubble).+ * Returns false if the overlay bridge is not running.+ */+ fun translateCapturedScreen(screenshot: Bitmap): Boolean {+ val bridge = translatorBridge ?: return false+ bridge.activateWithScreenshot(screenshot)+ return true+ }+companion object {var instance: CircleToSearchAccessibilityService? = nullprivate setdiff --git a/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt b/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.ktindex fe8ab6f..bfef261 100644--- a/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt+++ b/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt@@ -181,17 +181,34 @@ class TranslatorOverlayBridge(override fun activate() {if (active) return+ enterActiveState()+ android.os.Handler(android.os.Looper.getMainLooper()).post {+ if (active) {+ handleFullScreenOcr()+ }+ }+ }++ /**+ * 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.+ */+ fun activateWithScreenshot(screenshot: Bitmap) {+ if (active) {+ if (selectMode) exitSelectMode()+ } else {+ enterActiveState()+ }+ translateProvidedScreen(screenshot)+ }++ private fun enterActiveState() {active = truelangStateManager.refreshLanguageAvailability()ui.removeFloatingButton()ui.removeTranslationOverlays()ui.showBorderWave()ui.showToolbar(forcedSourceLanguage, forcedTargetLanguage, currentReadingOrderFor(forcedSourceLanguage), isAutoSource)- android.os.Handler(android.os.Looper.getMainLooper()).post {- if (active) {- handleFullScreenOcr()- }- }}override fun deactivate() {@@ -320,14 +337,7 @@ class TranslatorOverlayBridge(return}- val content = dev.davidv.translator.overlayChrome.OverlayInsets.contentBounds(windowManager)- val region =- Rect(- content.left,- content.top + ui.dpToPx(48),- content.right,- content.bottom,- )+ val region = currentCaptureRegion()ui.dismissMenu()android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({@@ -335,6 +345,47 @@ class TranslatorOverlayBridge(}, SCREENSHOT_RENDER_DELAY_MS)}+ /** The screen area under the toolbar — capture and overlay region. */+ private fun currentCaptureRegion(): Rect {+ val content = dev.davidv.translator.overlayChrome.OverlayInsets.contentBounds(windowManager)+ return Rect(+ content.left,+ content.top + ui.dpToPx(48),+ content.right,+ content.bottom,+ )+ }++ /** OCR + translate an already-captured screenshot, skipping the accessibility capture. */+ private fun translateProvidedScreen(screenshot: Bitmap) {+ ui.removeTranslationOverlays()++ val sourceLang = ocrSourceLanguage()+ if (!isAutoSource && sourceLang == null) {+ ui.showOverlayMessage("Set source language first")+ return+ }++ val region = currentCaptureRegion()+ ui.dismissMenu()++ val cropped = cropToRegion(screenshot, region) ?: return+ surfaceState.regions.value = null+ ui.showScanOverlay(surfaceState, region)+ serviceScope.launch {+ translateRegionBitmap(cropped, region)+ }+ }++ private fun cropToRegion(full: Bitmap, region: Rect): Bitmap? {+ val cropLeft = region.left.coerceIn(0, full.width - 1)+ val cropTop = region.top.coerceIn(0, full.height - 1)+ val cropWidth = region.width().coerceAtMost(full.width - cropLeft)+ val cropHeight = region.height().coerceAtMost(full.height - cropTop)+ if (cropWidth <= 0 || cropHeight <= 0) return null+ return Bitmap.createBitmap(full, cropLeft, cropTop, cropWidth, cropHeight)+ }+private fun captureFullScreen(region: Rect) {host.takeScreenshot(Display.DEFAULT_DISPLAY,@@ -347,17 +398,9 @@ class TranslatorOverlayBridge(val fullBitmap = hwBitmap.copy(Bitmap.Config.ARGB_8888, false)hwBitmap.recycle()- val cropLeft = region.left.coerceIn(0, fullBitmap.width - 1)- val cropTop = region.top.coerceIn(0, fullBitmap.height - 1)- val cropWidth = region.width().coerceAtMost(fullBitmap.width - cropLeft)- val cropHeight = region.height().coerceAtMost(fullBitmap.height - cropTop)- if (cropWidth <= 0 || cropHeight <= 0) {- fullBitmap.recycle()- return- }-- val croppedBitmap = Bitmap.createBitmap(fullBitmap, cropLeft, cropTop, cropWidth, cropHeight)- fullBitmap.recycle()+ val croppedBitmap = cropToRegion(fullBitmap, region)+ if (croppedBitmap !== fullBitmap) fullBitmap.recycle()+ if (croppedBitmap == null) returnsurfaceState.regions.value = nullui.showScanOverlay(surfaceState, region)diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.ktindex 662e27a..952f56a 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt@@ -185,6 +185,9 @@ import androidx.compose.material.icons.filled.Appsimport androidx.compose.material.icons.filled.PushPinimport androidx.compose.material3.Surface+/** Lets the Circle to Search UI finish closing before the translator overlay draws. */+private const val TRANSLATE_TRIGGER_DELAY_MS = 400L+@OptIn(ExperimentalMaterial3Api::class)@Composablefun CircleToSearchScreen(@@ -1478,14 +1481,16 @@ fun CircleToSearchScreen(IconButton(onClick = {haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)- android.widget.Toast.makeText(context, context.getString(R.string.toast_coming_soon), android.widget.Toast.LENGTH_SHORT).show()- /*- try {- val intent = context.packageManager.getLaunchIntentForPackage("com.google.android.apps.translate")?.apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) }- if (intent != null) context.startActivity(intent)- else context.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse("https://translate.google.com")).apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) })- } catch (e: Exception) {}- */+ val bmp = screenshot+ val translatorService = CircleToSearchAccessibilityService.instance+ if (bmp == null || translatorService == null) {+ android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()+ } else {+ onClose()+ android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({+ translatorService.translateCapturedScreen(bmp)+ }, TRANSLATE_TRIGGER_DELAY_MS)+ }},modifier = Modifier.size(60.dp)diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 971381f..421ff0f 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -124,7 +124,7 @@<string name="menu_import_model">Import Model (.traineddata)</string><!-- Toast Messages -->- <string name="toast_coming_soon">Coming soon</string>+ <string name="toast_translate_unavailable">Translation unavailable. Check accessibility service.</string><string name="toast_saved_to_gallery">Saved to Gallery</string><string name="toast_failed_to_save">Failed to save</string><string name="toast_accessibility_permission_needed">Allow accessibility permission to use this feature</string>