CircleToSearch with multi search engine support for all android
Kotlin
fix: live translation
AKS Labse8856cfc2daa
diff --git a/OCR-translation/build.gradle.kts b/OCR-translation/build.gradle.ktsindex 86d0afc..2c982ee 100644--- a/OCR-translation/build.gradle.kts+++ b/OCR-translation/build.gradle.kts@@ -314,6 +314,7 @@ dependencies {implementation(libs.androidx.appcompat)implementation(libs.androidx.lifecycle.runtime.ktx)implementation(libs.androidx.lifecycle.viewmodel.compose)+ implementation(libs.androidx.lifecycle.runtime.compose)implementation(libs.androidx.activity.compose)implementation(platform(libs.androidx.compose.bom))implementation(libs.androidx.compose.ui)diff --git a/OCR-translation/src/main/AndroidManifest.xml b/OCR-translation/src/main/AndroidManifest.xmlindex a5ba1be..c400e4f 100644--- a/OCR-translation/src/main/AndroidManifest.xml+++ b/OCR-translation/src/main/AndroidManifest.xml@@ -24,7 +24,6 @@<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /><uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" /><uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /><uses-permission android:name="android.permission.POST_NOTIFICATIONS" /><uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /><uses-permission android:name="android.permission.CAMERA" />@@ -35,10 +34,7 @@android:allowBackup="true"android:dataExtractionRules="@xml/data_extraction_rules"android:fullBackupContent="@xml/backup_rules"- android:icon="@mipmap/ic_launcher"- android:label="@string/app_name"android:requestLegacyExternalStorage="true"- android:roundIcon="@mipmap/ic_launcher_round"android:supportsRtl="true"android:theme="@style/Theme.Translator"tools:targetApi="31">@@ -62,7 +58,7 @@android:theme="@style/WideDialogTheme"><!-- via popup 'translate' button --><intent-filter- android:icon="@mipmap/ic_launcher"+ android:icon="@drawable/ic_translate_button"android:label="@string/translate_text"><action android:name="android.intent.action.PROCESS_TEXT" /><action android:name="android.intent.action.PROCESS_TEXT_READONLY" />diff --git a/OCR-translation/src/main/java/dev/davidv/translator/HostAccessibility.kt b/OCR-translation/src/main/java/dev/davidv/translator/HostAccessibility.ktnew file mode 100644index 0000000..70577a9--- /dev/null+++ b/OCR-translation/src/main/java/dev/davidv/translator/HostAccessibility.kt@@ -0,0 +1,14 @@+package dev.davidv.translator++import android.content.Context+import android.provider.Settings++fun isHostAccessibilityGranted(context: Context): Boolean {+ val pkg = context.packageName+ val enabled =+ Settings.Secure.getString(+ context.contentResolver,+ Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,+ ) ?: return false+ return enabled.split(':').any { it.startsWith("$pkg/") }+}diff --git a/OCR-translation/src/main/java/dev/davidv/translator/OverlayWindowHosts.kt b/OCR-translation/src/main/java/dev/davidv/translator/OverlayWindowHosts.ktnew file mode 100644index 0000000..c3e34de--- /dev/null+++ b/OCR-translation/src/main/java/dev/davidv/translator/OverlayWindowHosts.kt@@ -0,0 +1,63 @@+package dev.davidv.translator++import android.view.View+import android.view.ViewGroup+import android.view.WindowManager++interface OverlayWindowHost {+ fun addOverlayView(+ view: View,+ params: WindowManager.LayoutParams,+ )++ fun removeOverlayView(view: View)++ fun updateOverlayView(+ view: View,+ params: WindowManager.LayoutParams,+ )+}++object OverlayWindowHosts {+ @Volatile+ var primary: OverlayWindowHost? = null+}++class RoutedWindowManager(+ private val direct: WindowManager,+) : WindowManager by direct {+ override fun addView(+ view: View?,+ params: ViewGroup.LayoutParams?,+ ) {+ val host = OverlayWindowHosts.primary+ if (view != null && params is WindowManager.LayoutParams && host != null) {+ params.type = WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY+ host.addOverlayView(view, params)+ } else {+ direct.addView(view, params)+ }+ }++ override fun removeView(view: View?) {+ val host = OverlayWindowHosts.primary+ if (view != null && host != null) {+ runCatching { host.removeOverlayView(view) }.onFailure { runCatching { direct.removeView(view) } }+ } else {+ direct.removeView(view)+ }+ }++ override fun updateViewLayout(+ view: View?,+ params: ViewGroup.LayoutParams?,+ ) {+ val host = OverlayWindowHosts.primary+ if (view != null && params is WindowManager.LayoutParams && host != null) {+ params.type = WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY+ host.updateOverlayView(view, params)+ } else {+ direct.updateViewLayout(view, params)+ }+ }+}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.ktindex 718858c..0cf5adf 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@@ -1,6 +1,7 @@package dev.davidv.translator.accessibilityOverlayimport android.app.Dialog+import android.content.Contextimport android.content.Intentimport android.graphics.Bitmapimport android.graphics.Color@@ -35,7 +36,8 @@ import dev.davidv.translator.ui.components.SelectionSurfaceStateimport dev.davidv.translator.ui.components.WindowComposeHostclass OverlayUI(- private val service: TranslatorAccessibilityService,+ private val service: TranslatorOverlayHost,+ private val serviceContext: Context,private val windowManager: WindowManager,private val settingsManager: SettingsManager,) {@@ -59,7 +61,7 @@ class OverlayUI(private val menuManager =OverlayMenuManager(- service,+ serviceContext,::dpToPx,object : OverlayMenuHost {override fun addDismissLayer(view: View) {@@ -115,7 +117,7 @@ class OverlayUI(val bubble = launcherBubbleif (bubble == null) {launcherBubble =- FloatingBubble(service, windowManager, WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY, ::dpToPx) {+ FloatingBubble(serviceContext, windowManager, WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY, ::dpToPx) {service.activate()}.also { it.show() }} else {@@ -141,7 +143,7 @@ class OverlayUI(val toolbarViews =OverlayChromeFactory.createLanguageToolbar(- context = service,+ context = serviceContext,dpToPx = ::dpToPx,forcedSourceLanguage = forcedSourceLanguage,forcedTargetLanguage = forcedTargetLanguage,@@ -236,13 +238,13 @@ class OverlayUI(listOf("Open App" to {service.deactivate()- val intent = Intent(service, MainActivity::class.java)+ val intent = Intent(serviceContext, MainActivity::class.java)intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)- service.startActivity(intent)+ serviceContext.startActivity(intent)},"Disable Service" to {service.deactivate()- service.disableSelf()+ service.disableService()},),)@@ -266,7 +268,7 @@ class OverlayUI(bitmap: Bitmap,bounds: Rect,) {- val imageView = ImageView(service)+ val imageView = ImageView(serviceContext)imageView.setImageBitmap(bitmap)imageView.scaleType = ImageView.ScaleType.FIT_XY@@ -305,8 +307,8 @@ class OverlayUI(onDismiss: () -> Unit,) {if (selectDialog != null) return- val dialog = Dialog(service, android.R.style.Theme_Material_NoActionBar)- val host = WindowComposeHost(service)+ val dialog = Dialog(serviceContext, android.R.style.Theme_Material_NoActionBar)+ val host = WindowComposeHost(serviceContext)host.setContent { SelectionSurface(state) }dialog.setContentView(host.view)dialog.setCanceledOnTouchOutside(false)@@ -353,7 +355,7 @@ class OverlayUI(@android.annotation.SuppressLint("ClickableViewAccessibility")private fun ensureTouchWatcher() {if (touchWatcher != null) return- val watcher = View(service)+ val watcher = View(serviceContext)watcher.setOnTouchListener { _, event ->// The system zeroes ACTION_OUTSIDE coordinates unless the touched window belongs to our// own UID: real coordinates mean the touch landed on our chrome (toolbar, menus, their@@ -397,7 +399,7 @@ class OverlayUI(region: Rect,) {if (scanHost != null) return- val host = WindowComposeHost(service)+ val host = WindowComposeHost(serviceContext)host.setContent {state.regions.value?.let {ScanAnimationOverlay(regions = it, modifier = Modifier.fillMaxSize())@@ -434,7 +436,7 @@ class OverlayUI(}fun showOverlayMessage(message: String) {- val textView = TextView(service)+ val textView = TextView(serviceContext)textView.text = messagetextView.setTextColor(Color.WHITE)textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)@@ -479,11 +481,11 @@ class OverlayUI(removeTouchWatcher()}- fun getStatusBarHeight(): Int = OverlayInsets.topInset(windowManager, service.resources)+ fun getStatusBarHeight(): Int = OverlayInsets.topInset(windowManager, serviceContext.resources)fun showBorderWave() {if (borderView != null) return- val view = BorderWaveView.create(service)+ val view = BorderWaveView.create(serviceContext)val params =WindowManager.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT,@@ -517,5 +519,5 @@ class OverlayUI(launcherBubble = null}- internal fun dpToPx(dp: Int): Int = (dp * service.resources.displayMetrics.density).toInt()+ fun dpToPx(dp: Int): Int = (dp * serviceContext.resources.displayMetrics.density).toInt()}diff --git a/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/TranslatorAccessibilityService.kt b/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/TranslatorAccessibilityService.ktindex 3f0db0e..eeb0c7c 100644--- a/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/TranslatorAccessibilityService.kt+++ b/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/TranslatorAccessibilityService.kt@@ -37,7 +37,9 @@ import kotlinx.coroutines.cancelimport kotlinx.coroutines.launchimport kotlinx.coroutines.withContext-class TranslatorAccessibilityService : AccessibilityService() {+class TranslatorAccessibilityService : AccessibilityService(), TranslatorOverlayHost {+ override val hostContext: Context+ get() = thisprivate val tag = "TranslatorA11y"private lateinit var windowManager: WindowManagerprivate var active = false@@ -62,7 +64,7 @@ class TranslatorAccessibilityService : AccessibilityService() {private lateinit var translationCoordinator: TranslationCoordinatorprivate var ocrReadingOrder: ReadingOrder? = nullprivate lateinit var overlayTextTranslationHelper: OverlayTextTranslationHelper- lateinit var langStateManager: LanguageStateManager+ override lateinit var langStateManager: LanguageStateManagerprivate setlateinit var ui: OverlayUI@@ -127,7 +129,7 @@ class TranslatorAccessibilityService : AccessibilityService() {}}- ui = OverlayUI(this, windowManager, settingsManager)+ ui = OverlayUI(this, this, windowManager, settingsManager)androidx.core.content.ContextCompat.registerReceiver(this,@@ -183,7 +185,7 @@ class TranslatorAccessibilityService : AccessibilityService() {super.onDestroy()}- fun activate() {+ override fun activate() {if (active) returnactive = trueserviceInfo = serviceInfo.apply { eventTypes = liveEventTypes() }@@ -199,7 +201,7 @@ class TranslatorAccessibilityService : AccessibilityService() {}}- fun deactivate() {+ override fun deactivate() {active = falseselectMode = falseserviceInfo = serviceInfo.apply { eventTypes = 0 }@@ -213,7 +215,7 @@ class TranslatorAccessibilityService : AccessibilityService() {ui.restoreFloatingButton()}- fun toggleSelectMode() {+ override fun toggleSelectMode() {if (selectMode) {exitSelectMode()return@@ -250,12 +252,12 @@ class TranslatorAccessibilityService : AccessibilityService() {if (selectMode) exitSelectMode()}- fun toggleFlipOriginal() {+ override fun toggleFlipOriginal() {if (!selectMode) returnui.setFlipActive(surfaceState.toggleShowOriginal())}- fun swapLanguages() {+ override fun swapLanguages() {val oldSource = forcedSourceLanguage ?: returnval oldTarget = forcedTargetLanguage ?: langStateManager.languageByCode(settingsManager.settings.value.defaultTargetLanguageCode) ?: returnif (!langStateManager.canSwapLanguages(oldSource, oldTarget)) return@@ -269,7 +271,7 @@ class TranslatorAccessibilityService : AccessibilityService() {}}- fun showLanguagePicker(isSource: Boolean) {+ override fun showLanguagePicker(isSource: Boolean) {serviceScope.launch {langStateManager.refreshLanguageAvailability()val availableLangs = overlayTextTranslationHelper.awaitAvailableLanguages(isSource)@@ -293,7 +295,7 @@ class TranslatorAccessibilityService : AccessibilityService() {}}- fun toggleJapaneseOcrMode() {+ override fun toggleJapaneseOcrMode() {if (forcedSourceLanguage?.code != "ja") returnocrReadingOrder =when (ocrReadingOrder) {@@ -307,11 +309,16 @@ class TranslatorAccessibilityService : AccessibilityService() {}}- fun showDotsMenu() {+ override fun showDotsMenu() {ui.showDotsMenu()}- fun handleFullScreenOcr() {+ override fun disableService() {+ deactivate()+ disableSelf()+ }++ override fun handleFullScreenOcr() {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return// In select mode the frozen surface covers the screen, so a fresh screenshot would capturediff --git a/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/TranslatorOverlayHost.kt b/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/TranslatorOverlayHost.ktnew file mode 100644index 0000000..00ecf15--- /dev/null+++ b/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/TranslatorOverlayHost.kt@@ -0,0 +1,29 @@+package dev.davidv.translator.accessibilityOverlay++import android.content.Context+import dev.davidv.translator.LanguageStateManager++interface TranslatorOverlayHost {+ val hostContext: Context+ val langStateManager: LanguageStateManager++ fun activate()++ fun deactivate()++ fun toggleSelectMode()++ fun toggleFlipOriginal()++ fun swapLanguages()++ fun showLanguagePicker(isSource: Boolean)++ fun toggleJapaneseOcrMode()++ fun showDotsMenu()++ fun handleFullScreenOcr()++ fun disableService()+}diff --git a/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/LiveScreenTileService.kt b/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/LiveScreenTileService.ktindex e269c8a..c9c295d 100644--- a/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/LiveScreenTileService.kt+++ b/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/LiveScreenTileService.kt@@ -27,8 +27,9 @@ import dev.davidv.translator.SettingsManager/*** Quick Settings tile that starts live screen translation with the user's- * default languages — needs only the overlay grant + MediaProjection consent- * (handled by [ScreenCaptureRequestActivity]), no accessibility or assistant.+ * default languages — needs the shared host accessibility permission (which+ * covers overlay drawing) + MediaProjection consent (handled by+ * [ScreenCaptureRequestActivity]).* Live can't run the per-frame script classifier, so a default source language* must be set.*/diff --git a/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/ScreenCaptureRequestActivity.kt b/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/ScreenCaptureRequestActivity.ktindex 59f0aef..460e21c 100644--- a/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/ScreenCaptureRequestActivity.kt+++ b/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/ScreenCaptureRequestActivity.kt@@ -21,41 +21,35 @@ import android.app.Activityimport android.content.Contextimport android.content.Intentimport android.media.projection.MediaProjectionManager-import android.net.Uriimport android.os.Buildimport android.os.Bundleimport android.provider.Settingsimport android.util.Logimport androidx.core.content.ContextCompat+import dev.davidv.translator.isHostAccessibilityGranted/*** Transient, invisible activity that turns the screen-translate button into a* running [ScreenTranslateService]. A `VoiceInteractionSession` can't itself- * ask for the SYSTEM_ALERT_WINDOW grant or the MediaProjection consent (both- * need an Activity result), so the button launches this; once both are- * granted it hands the projection token to the service and finishes.+ * ask for the MediaProjection consent (needs an Activity result), so the+ * button launches this; overlay drawing is covered by the shared host+ * accessibility permission, then it hands the projection token to the service+ * and finishes.*/class ScreenCaptureRequestActivity : Activity() {private val tag = "ScreenCaptureRequest"override fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)- if (!canDrawOverlays()) {- requestOverlayPermission()+ if (!isHostAccessibilityGranted(this)) {+ requestAccessibilityPermission()return}requestProjection()}- private fun canDrawOverlays(): Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.M || Settings.canDrawOverlays(this)-- private fun requestOverlayPermission() {- val intent =- Intent(- Settings.ACTION_MANAGE_OVERLAY_PERMISSION,- Uri.parse("package:$packageName"),- )- startActivityForResult(intent, REQ_OVERLAY)+ private fun requestAccessibilityPermission() {+ startActivityForResult(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS), REQ_OVERLAY)}private fun requestProjection() {@@ -81,10 +75,10 @@ class ScreenCaptureRequestActivity : Activity() {super.onActivityResult(requestCode, resultCode, data)when (requestCode) {REQ_OVERLAY -> {- if (canDrawOverlays()) {+ if (isHostAccessibilityGranted(this)) {requestProjection()} else {- Log.i(tag, "Overlay permission denied")+ Log.i(tag, "Accessibility permission denied")finishAndRemoveTask()}}diff --git a/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/ScreenTranslateService.kt b/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/ScreenTranslateService.ktindex b28c832..5da7577 100644--- a/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/ScreenTranslateService.kt+++ b/OCR-translation/src/main/java/dev/davidv/translator/screenTranslate/ScreenTranslateService.kt@@ -157,6 +157,19 @@ class ScreenTranslateService : Service() {return START_NOT_STICKY}+ // Order matters under targetSdk 35+ enforcement: a running foreground+ // service is required before getMediaProjection, but the typed+ // mediaProjection foreground call requires the projection to exist.+ startForegroundUntyped()++ val pm = getSystemService(Context.MEDIA_PROJECTION_SERVICE) as MediaProjectionManager+ val proj = pm.getMediaProjection(resultCode, data)+ if (proj == null) {+ Log.e(TAG, "getMediaProjection returned null; stopping")+ stopEverything()+ return START_NOT_STICKY+ }+startForegroundNotification()val app = applicationContext as TranslatorApplication@@ -175,13 +188,6 @@ class ScreenTranslateService : Service() {return START_NOT_STICKY}- val pm = getSystemService(Context.MEDIA_PROJECTION_SERVICE) as MediaProjectionManager- val proj = pm.getMediaProjection(resultCode, data)- if (proj == null) {- Log.e(TAG, "getMediaProjection returned null; stopping")- stopEverything()- return START_NOT_STICKY- }proj.registerCallback(projectionCallback, null)projection = proj@@ -239,12 +245,7 @@ class ScreenTranslateService : Service() {}private fun overlayWindowType(): Int =- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {- WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY- } else {- @Suppress("DEPRECATION")- WindowManager.LayoutParams.TYPE_PHONE- }+ WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAYprivate fun dpToPx(dp: Int): Int = (dp * resources.displayMetrics.density).toInt()@@ -252,7 +253,7 @@ class ScreenTranslateService : Service() {tracker: uniffi.bindings.LiveScreenTracker,proj: MediaProjection,) {- val wm = getSystemService(Context.WINDOW_SERVICE) as WindowManager+ val wm = dev.davidv.translator.RoutedWindowManager(getSystemService(Context.WINDOW_SERVICE) as WindowManager)windowManager = wmval metrics = DisplayMetrics()@@ -588,7 +589,7 @@ class ScreenTranslateService : Service() {removeRegionEditor()}- private fun startForegroundNotification() {+ private fun buildNotification(): Notification {val channelId = "screen_translate"if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {val nm = getSystemService(NotificationManager::class.java)@@ -611,14 +612,21 @@ class ScreenTranslateService : Service() {stopIntent,android.app.PendingIntent.FLAG_IMMUTABLE or android.app.PendingIntent.FLAG_UPDATE_CURRENT,)- val notification: Notification =- androidx.core.app.NotificationCompat.Builder(this, channelId)- .setContentTitle(getString(R.string.app_name))- .setContentText(getString(R.string.screen_translating_notification))- .setSmallIcon(R.drawable.ic_translate_button)- .setOngoing(true)- .addAction(R.drawable.cancel, "Stop", stopPending)- .build()+ return androidx.core.app.NotificationCompat.Builder(this, channelId)+ .setContentTitle(getString(R.string.app_name))+ .setContentText(getString(R.string.screen_translating_notification))+ .setSmallIcon(R.drawable.ic_translate_button)+ .setOngoing(true)+ .addAction(R.drawable.cancel, "Stop", stopPending)+ .build()+ }++ private fun startForegroundUntyped() {+ startForeground(NOTIFICATION_ID, buildNotification())+ }++ private fun startForegroundNotification() {+ val notification = buildNotification()if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {startForeground(NOTIFICATION_ID,diff --git a/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/SettingsScreen.kt b/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/SettingsScreen.ktindex 30c3437..8d96a07 100644--- a/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/SettingsScreen.kt+++ b/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/SettingsScreen.kt@@ -73,6 +73,7 @@ import androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.input.KeyboardTypeimport androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.dp+import androidx.lifecycle.compose.LifecycleResumeEffectimport dev.davidv.translator.AppSettingsimport dev.davidv.translator.BackgroundModeimport dev.davidv.translator.DownloadService@@ -83,6 +84,7 @@ import dev.davidv.translator.LanguageCatalogimport dev.davidv.translator.LanguageMetadataManagerimport dev.davidv.translator.PermissionHelperimport dev.davidv.translator.R+import dev.davidv.translator.isHostAccessibilityGrantedimport dev.davidv.translator.ReadonlyModalOutputAlignmentimport dev.davidv.translator.Scriptimport dev.davidv.translator.TapToTranslateNotification@@ -249,6 +251,11 @@ fun SettingsScreen() {val context = LocalContext.currentvar showPermissionDialog by remember { mutableStateOf(false) }+ var hostAccessibilityGranted by remember { mutableStateOf(isHostAccessibilityGranted(context)) }+ LifecycleResumeEffect(Unit) {+ hostAccessibilityGranted = isHostAccessibilityGranted(context)+ onPauseOrDispose {}+ }val permissionLauncher =rememberLauncherForActivityResult(@@ -679,6 +686,13 @@ fun SettingsScreen(style = MaterialTheme.typography.bodySmall,color = MaterialTheme.colorScheme.onSurfaceVariant,)+ Text(+ text = stringResource(+ if (hostAccessibilityGranted) R.string.common_enabled else R.string.common_disabled,+ ),+ style = MaterialTheme.typography.bodySmall,+ color = if (hostAccessibilityGranted) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,+ )}TextButton(diff --git a/OCR-translation/src/main/res/values/strings.xml b/OCR-translation/src/main/res/values/strings.xmlindex e9b05bc..5a5f541 100644--- a/OCR-translation/src/main/res/values/strings.xml+++ b/OCR-translation/src/main/res/values/strings.xml@@ -21,6 +21,8 @@<string name="common_done">Done</string><string name="common_grant">Grant</string><string name="common_manage">Manage</string>+ <string name="common_enabled">Enabled</string>+ <string name="common_disabled">Disabled</string><!-- settings --><string name="settings_title">Settings</string>diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 30e43c4..48b8d48 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -132,6 +132,11 @@<!-- WebViewActivity removed - not implemented -->+ <!-- Translator module service: hidden so only this app appears in system settings -->+ <service+ android:name="dev.davidv.translator.accessibilityOverlay.TranslatorAccessibilityService"+ tools:node="remove" />+</application></manifest>\ No newline at end of filediff --git a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.ktindex 3b4618f..b81767f 100644--- a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt+++ b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt@@ -75,6 +75,8 @@ class CircleToSearchAccessibilityService : AccessibilityService() {/** Kept by companion so scroll events can re-scan copy-text nodes. */internal var copyTextManager: CopyTextOverlayManager? = null++ private var translatorBridge: TranslatorOverlayBridge? = null// Bubble related - Keeping existing logic but refactoring slightly if needed// For now, keeping bubble separate as requested in prompt "statusbar overlay customization... but it should work normally like now"@@ -111,7 +113,20 @@ class CircleToSearchAccessibilityService : AccessibilityService() {prefs.registerOnSharedPreferenceChangeListener(prefsListener)overlayPrefs.registerOnSharedPreferenceChangeListener(overlayPrefsListener)-++ val wm = windowManager+ if (wm != null) {+ runCatching {+ TranslatorOverlayBridge(this, wm).also {+ translatorBridge = it+ it.start()+ }+ }.onFailure {+ android.util.Log.e("CircleToSearch", "Translator overlay bridge failed to start", it)+ translatorBridge = null+ }+ }+updateBubbleState()updateOverlay()}@@ -1159,6 +1174,7 @@ class CircleToSearchAccessibilityService : AccessibilityService() {if (event?.eventType == AccessibilityEvent.TYPE_VIEW_SCROLLED) {copyTextManager?.rescanNodes()}+ translatorBridge?.onHostAccessibilityEvent(event)}override fun onInterrupt() {}@@ -1196,6 +1212,8 @@ class CircleToSearchAccessibilityService : AccessibilityService() {override fun onDestroy() {super.onDestroy()instance = null+ runCatching { translatorBridge?.destroy() }+ translatorBridge = nullprefs.unregisterOnSharedPreferenceChangeListener(prefsListener)overlayPrefs.unregisterOnSharedPreferenceChangeListener(overlayPrefsListener)diff --git a/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt b/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.ktnew file mode 100644index 0000000..fe8ab6f--- /dev/null+++ b/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt@@ -0,0 +1,450 @@+package com.akslabs.circletosearch++import android.accessibilityservice.AccessibilityService+import android.content.BroadcastReceiver+import android.content.Context+import android.content.Intent+import android.content.IntentFilter+import android.graphics.Bitmap+import android.graphics.Rect+import android.os.Build+import android.util.Log+import android.view.Display+import android.view.View+import android.view.WindowManager+import android.view.accessibility.AccessibilityEvent+import androidx.core.content.ContextCompat+import dev.davidv.translator.Language+import dev.davidv.translator.LanguageMetadataManager+import dev.davidv.translator.LanguageStateManager+import dev.davidv.translator.OverlayTextTranslationHelper+import dev.davidv.translator.OverlayWindowHost+import dev.davidv.translator.OverlayWindowHosts+import dev.davidv.translator.ReadingOrder+import dev.davidv.translator.TranslatorApplication+import dev.davidv.translator.accessibilityOverlay.OverlayUI+import dev.davidv.translator.accessibilityOverlay.TranslatorAccessibilityService+import dev.davidv.translator.screenTranslate.ScreenTranslateService+import dev.davidv.translator.ui.components.DetectedRegions+import dev.davidv.translator.ui.components.ImageWordSelection as WordSelection+import dev.davidv.translator.ui.components.SelectionSurfaceState+import dev.davidv.translator.R as TranslatorR+import kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.Dispatchers+import kotlinx.coroutines.SupervisorJob+import kotlinx.coroutines.cancel+import kotlinx.coroutines.launch+import kotlinx.coroutines.withContext++class TranslatorOverlayBridge(+ private val host: CircleToSearchAccessibilityService,+ private val windowManager: WindowManager,+) : dev.davidv.translator.accessibilityOverlay.TranslatorOverlayHost,+ OverlayWindowHost {+ override val hostContext: Context+ get() = host++ private val tag = "TranslatorBridge"+ private var active = false+ private var selectMode = false+ private var forcedSourceLanguage: Language? = null+ private var forcedTargetLanguage: Language? = null+ private var isAutoSource: Boolean = true+ private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)++ private data class TranslatedScreen(+ val original: Bitmap,+ val translated: Bitmap,+ val words: WordSelection,+ val region: Rect,+ )++ private var lastResult: TranslatedScreen? = null+ private val surfaceState = SelectionSurfaceState()+ private var ocrReadingOrder: ReadingOrder? = null++ private val app = host.application as TranslatorApplication+ private val settingsManager = app.settingsManager+ private val translationCoordinator+ get() = runCatching { app.translationCoordinator }.getOrNull()++ override lateinit var langStateManager: LanguageStateManager+ private set++ private lateinit var overlayTextTranslationHelper: OverlayTextTranslationHelper+ private lateinit var ui: OverlayUI++ private val disableReceiver =+ object : BroadcastReceiver() {+ override fun onReceive(+ context: Context?,+ intent: Intent?,+ ) {+ deactivate()+ }+ }++ private val liveStateReceiver =+ object : BroadcastReceiver() {+ override fun onReceive(+ context: Context?,+ intent: Intent?,+ ) {+ if (!::ui.isInitialized) return+ val live = intent?.getBooleanExtra(ScreenTranslateService.EXTRA_LIVE_ACTIVE, false) ?: false+ if (live) {+ ui.removeFloatingButton()+ } else if (!active) {+ ui.restoreFloatingButton()+ }+ }+ }++ fun start() {+ langStateManager = LanguageStateManager(serviceScope, app.filePathManager, null)+ overlayTextTranslationHelper =+ OverlayTextTranslationHelper(+ langStateManager,+ LanguageMetadataManager(host, app.languagesFlow),+ )+ ui = OverlayUI(this, host, windowManager, settingsManager)+ OverlayWindowHosts.primary = this++ ContextCompat.registerReceiver(+ host,+ disableReceiver,+ IntentFilter(TranslatorAccessibilityService.ACTION_DISABLE),+ ContextCompat.RECEIVER_NOT_EXPORTED,+ )+ ContextCompat.registerReceiver(+ host,+ liveStateReceiver,+ IntentFilter(ScreenTranslateService.ACTION_LIVE_STATE),+ ContextCompat.RECEIVER_NOT_EXPORTED,+ )++ ui.showFloatingButton()+ }++ override fun addOverlayView(+ view: View,+ params: WindowManager.LayoutParams,+ ) {+ params.type = WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY+ windowManager.addView(view, params)+ }++ override fun removeOverlayView(view: View) {+ windowManager.removeView(view)+ }++ override fun updateOverlayView(+ view: View,+ params: WindowManager.LayoutParams,+ ) {+ params.type = WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY+ windowManager.updateViewLayout(view, params)+ }++ fun destroy() {+ if (OverlayWindowHosts.primary === this) {+ OverlayWindowHosts.primary = null+ }+ try {+ host.unregisterReceiver(disableReceiver)+ } catch (_: Exception) {+ }+ try {+ host.unregisterReceiver(liveStateReceiver)+ } catch (_: Exception) {+ }+ if (::ui.isInitialized) {+ deactivate()+ ui.removeFloatingButton()+ ui.dismissMenu()+ ui.cleanup()+ }+ serviceScope.cancel()+ }++ fun onHostAccessibilityEvent(event: AccessibilityEvent?) {+ if (event == null || event.packageName == host.packageName) return+ when (event.eventType) {+ AccessibilityEvent.TYPE_VIEW_SCROLLED,+ AccessibilityEvent.TYPE_VIEW_CLICKED,+ -> {+ lastResult = null+ if (::ui.isInitialized) ui.removeTranslationOverlays()+ }+ }+ }++ override fun activate() {+ if (active) return+ active = true+ langStateManager.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() {+ active = false+ selectMode = false+ ui.removeSelectSurface()+ surfaceState.clear()+ lastResult = null+ ui.removeBorderWave()+ ui.removeToolbar()+ ui.removeTranslationOverlays()+ ui.dismissMenu()+ ui.restoreFloatingButton()+ }++ override fun toggleSelectMode() {+ if (selectMode) {+ exitSelectMode()+ return+ }+ selectMode = true+ ui.setSelectModeUi(true)+ val res = lastResult+ if (res != null) {+ ui.removeTranslationOverlays()+ surfaceState.showResult(res.translated, res.original, res.words)+ ui.showSelectSurface(surfaceState, res.region) { onSelectSurfaceDismissed() }+ } else {+ handleFullScreenOcr()+ }+ }++ private fun exitSelectMode() {+ selectMode = false+ lastResult?.let { ui.showBitmapOverlay(it.translated, it.region) }+ ui.removeSelectSurface()+ surfaceState.clear()+ ui.setSelectModeUi(false)+ }++ private fun onSelectSurfaceDismissed() {+ if (selectMode) exitSelectMode()+ }++ override fun toggleFlipOriginal() {+ if (!selectMode) return+ ui.setFlipActive(surfaceState.toggleShowOriginal())+ }++ override fun swapLanguages() {+ val oldSource = forcedSourceLanguage ?: return+ val oldTarget = forcedTargetLanguage ?: langStateManager.languageByCode(settingsManager.settings.value.defaultTargetLanguageCode) ?: return+ if (!langStateManager.canSwapLanguages(oldSource, oldTarget)) return+ isAutoSource = false+ forcedSourceLanguage = oldTarget+ forcedTargetLanguage = oldSource+ syncReadingOrderForSource()+ ui.updateToolbarState(forcedSourceLanguage, forcedTargetLanguage, currentReadingOrderFor(forcedSourceLanguage), isAutoSource)+ if (active) {+ handleFullScreenOcr()+ }+ }++ override fun showLanguagePicker(isSource: Boolean) {+ serviceScope.launch {+ langStateManager.refreshLanguageAvailability()+ val availableLangs = overlayTextTranslationHelper.awaitAvailableLanguages(isSource)+ ui.showLanguagePicker(isSource, availableLangs) { lang ->+ if (isSource) {+ if (lang == null) {+ isAutoSource = true+ } else {+ isAutoSource = false+ forcedSourceLanguage = lang+ }+ syncReadingOrderForSource()+ } else {+ forcedTargetLanguage = lang+ }+ ui.updateToolbarState(forcedSourceLanguage, forcedTargetLanguage, currentReadingOrderFor(forcedSourceLanguage), isAutoSource)+ if (active) {+ handleFullScreenOcr()+ }+ }+ }+ }++ override fun toggleJapaneseOcrMode() {+ if (forcedSourceLanguage?.code != "ja") return+ ocrReadingOrder =+ when (ocrReadingOrder) {+ null -> ReadingOrder.TOP_TO_BOTTOM_RIGHT_TO_LEFT+ ReadingOrder.TOP_TO_BOTTOM_RIGHT_TO_LEFT -> ReadingOrder.LEFT_TO_RIGHT+ ReadingOrder.LEFT_TO_RIGHT -> null+ }+ ui.updateToolbarState(forcedSourceLanguage, forcedTargetLanguage, ocrReadingOrder, isAutoSource)+ if (active) {+ handleFullScreenOcr()+ }+ }++ override fun showDotsMenu() {+ ui.showDotsMenu()+ }++ override fun disableService() {+ deactivate()+ }++ override fun handleFullScreenOcr() {+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return++ val res = lastResult+ if (selectMode && ui.hasSelectSurface() && res != null) {+ surfaceState.showProcessing(res.original)+ serviceScope.launch {+ translateRegionBitmap(res.original, res.region)+ }+ return+ }+ ui.removeTranslationOverlays()++ val sourceLang = ocrSourceLanguage()+ if (!isAutoSource && sourceLang == null) {+ ui.showOverlayMessage("Set source language first")+ return+ }++ val content = dev.davidv.translator.overlayChrome.OverlayInsets.contentBounds(windowManager)+ val region =+ Rect(+ content.left,+ content.top + ui.dpToPx(48),+ content.right,+ content.bottom,+ )++ ui.dismissMenu()+ android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({+ captureFullScreen(region)+ }, SCREENSHOT_RENDER_DELAY_MS)+ }++ private fun captureFullScreen(region: Rect) {+ host.takeScreenshot(+ Display.DEFAULT_DISPLAY,+ host.mainExecutor,+ object : AccessibilityService.TakeScreenshotCallback {+ override fun onSuccess(screenshot: AccessibilityService.ScreenshotResult) {+ val hwBitmap = Bitmap.wrapHardwareBuffer(screenshot.hardwareBuffer, screenshot.colorSpace)+ screenshot.hardwareBuffer.close()+ if (hwBitmap == null) return+ 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()++ surfaceState.regions.value = null+ ui.showScanOverlay(surfaceState, region)+ serviceScope.launch {+ translateRegionBitmap(croppedBitmap, region)+ }+ }++ override fun onFailure(errorCode: Int) {+ Log.w(tag, "Screenshot failed: $errorCode")+ }+ },+ )+ }++ private suspend fun translateRegionBitmap(+ bitmap: Bitmap,+ region: Rect,+ ) {+ val coordinator = translationCoordinator ?: return+ val sourceLang = ocrSourceLanguage()+ val targetLang = forcedTargetLanguage ?: langStateManager.languageByCode(settingsManager.settings.value.defaultTargetLanguageCode) ?: return+ val ocrSourceLang = sourceLang ?: targetLang++ var ocrUnavailable = false+ val result =+ withContext(Dispatchers.IO) {+ coordinator.translateImageWithOverlay(+ ocrSourceLang,+ targetLang,+ bitmap,+ onMessage = {},+ readingOrder = currentReadingOrderFor(sourceLang),+ isAutoSource = isAutoSource,+ onOcrUnavailable = { ocrUnavailable = true },+ onDetectedRegions = { boxes, w, h ->+ surfaceState.regions.value = DetectedRegions(w, h, boxes)+ },+ )+ }++ ui.removeTranslationOverlays()+ if (result == null) {+ if (selectMode) surfaceState.processing.value = false+ if (ocrUnavailable) {+ ui.showOverlayMessage(host.getString(TranslatorR.string.ocr_models_missing))+ }+ return+ }++ val words =+ WordSelection(+ imageWidth = result.metadata.width.toInt(),+ imageHeight = result.metadata.height.toInt(),+ sourceWords = result.metadata.sourceWords,+ translatedWords = result.translatedWords,+ )+ lastResult = TranslatedScreen(original = bitmap, translated = result.correctedBitmap, words = words, region = region)+ if (selectMode) {+ surfaceState.showResult(result.correctedBitmap, bitmap, words)+ if (!ui.hasSelectSurface()) {+ ui.showSelectSurface(surfaceState, region) { onSelectSurfaceDismissed() }+ }+ } else {+ ui.showBitmapOverlay(result.correctedBitmap, region)+ }+ }++ private fun ocrSourceLanguage(): Language? =+ forcedSourceLanguage ?: settingsManager.settings.value.defaultSourceLanguageCode?.let {+ langStateManager.languageByCode(it)+ }++ private fun currentReadingOrderFor(language: Language?): ReadingOrder? =+ if (language?.code == "ja") {+ ocrReadingOrder+ } else {+ null+ }++ private fun syncReadingOrderForSource() {+ if (forcedSourceLanguage?.code != "ja") {+ ocrReadingOrder = null+ }+ }++ companion object {+ private const val SCREENSHOT_RENDER_DELAY_MS = 120L+ }+}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 7725abd..af47143 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -42,6 +42,7 @@ androidx-compose-material3 = { group = "androidx.compose.material3", name = "matandroidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }material = { group = "com.google.android.material", name = "material", version.ref = "material" }androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }+androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleViewmodelCompose" }androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version.ref = "exifinterface" }androidx-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }diff --git a/logs.md b/logs.mdindex 57ddad2..0dfec3b 100644--- a/logs.md+++ b/logs.md@@ -1 +1,25 @@-\+time: 1789069896381+device fp:realme/RMX1851/RMX1851:11/RKQ1.201217.002/1623376276806:user/release-keys+product board:sdm710+everest vers:+msg: android.view.WindowManager$BadTokenException: Unable to add window -- token null is not valid; is your activity running?+stacktrace: java.lang.RuntimeException: Unable to start service dev.davidv.translator.screenTranslate.ScreenTranslateService@50bed5e with Intent { xflg=0x4 cmp=com.akslabs.circletosearch/dev.davidv.translator.screenTranslate.ScreenTranslateService (has extras) }+at android.app.ActivityThread.handleServiceArgs(ActivityThread.java:5740)+at android.app.ActivityThread.-$$Nest$mhandleServiceArgs(Unknown Source:0)+at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2788)+at android.os.Handler.dispatchMessage(Handler.java:132)+at android.os.Looper.dispatchMessage(Looper.java:333)+at android.os.Looper.loopOnce(Looper.java:263)+at android.os.Looper.loop(Looper.java:367)+at android.app.ActivityThread.main(ActivityThread.java:9317)+at java.lang.reflect.Method.invoke(Native Method)+at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:569)+at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:966)+Caused by: android.view.WindowManager$BadTokenException: Unable to add window -- token null is not valid; is your activity running?+at android.view.ViewRootImpl.setView(ViewRootImpl.java:1695)+at android.view.WindowManagerGlobal.addView(WindowManagerGlobal.java:500)+at android.view.WindowManagerImpl.addView(WindowManagerImpl.java:167)+at dev.davidv.translator.screenTranslate.ScreenTranslateService.setupOverlayAndCapture(ScreenTranslateService.kt:298)+at dev.davidv.translator.screenTranslate.ScreenTranslateService.onStartCommand(ScreenTranslateService.kt:204)+at android.app.ActivityThread.handleServiceArgs(ActivityThread.java:5724)+... 10 more\ No newline at end of file