Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

new icons/buttons

AKS Labs21a899c3acd9
diff --git a/.kotlin/errors/errors-1792167489424.log b/.kotlin/errors/errors-1792167489424.log
new file mode 100644
index 0000000..f53a362
--- /dev/null
+++ b/.kotlin/errors/errors-1792167489424.log
@@ -0,0 +1,45 @@
+kotlin version: 2.0.21
+error message: java.rmi.NoSuchObjectException: no such object in table
+
+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/OCR-translation/src/main/java/dev/davidv/translator/MainActivity.kt b/OCR-translation/src/main/java/dev/davidv/translator/MainActivity.kt
index 4db86b5..2a988c8 100644
--- a/OCR-translation/src/main/java/dev/davidv/translator/MainActivity.kt
+++ b/OCR-translation/src/main/java/dev/davidv/translator/MainActivity.kt
@@ -43,6 +43,7 @@ import kotlinx.coroutines.flow.asStateFlow
class MainActivity : ComponentActivity() {
companion object {
const val EXTRA_OPEN_LANGUAGE_MANAGER = "dev.davidv.translator.OPEN_LANGUAGE_MANAGER"
+ const val EXTRA_OPEN_LIVE_CAMERA = "dev.davidv.translator.OPEN_LIVE_CAMERA"
}
// Identity in production; only the UI-export test flips UiExportRecorder.active to record which
@@ -56,6 +57,7 @@ class MainActivity : ComponentActivity() {
private var sharedImageUri: Uri? = null
private var sharedDocumentUri: Uri? = null
private var openLanguageManager: Boolean = false
+ private var openLiveCamera: Boolean = false
private lateinit var viewModel: TranslatorViewModel
private var downloadService: DownloadService? = null
private lateinit var serviceConnection: ServiceConnection
@@ -91,11 +93,19 @@ class MainActivity : ComponentActivity() {
viewModel.requestLanguageManager()
openLanguageManager = false
}
+ // Captured before it is consumed so MigrationGate can skip its blocking
+ // screen: the camera deep link must show the camera on the first frame.
+ val openedForLiveCamera = openLiveCamera
+ if (openLiveCamera) {
+ viewModel.requestLiveCamera()
+ openLiveCamera = false
+ }
setContent {
TranslatorTheme {
MigrationGate(
filePathManager = app.filePathManager,
+ showContentImmediately = openedForLiveCamera,
onMigrated = {
TranslatorTtsEngine.notifyVoiceDataChanged(applicationContext)
// The Application holds its own catalog instance (used by e.g. the
@@ -160,12 +170,20 @@ class MainActivity : ComponentActivity() {
viewModel.requestLanguageManager()
openLanguageManager = false
}
+ if (openLiveCamera) {
+ viewModel.requestLiveCamera()
+ openLiveCamera = false
+ }
}
}
private fun handleIntent(intent: Intent?) {
Log.d("MainActivity", "Got intent $intent")
openLanguageManager = intent?.getBooleanExtra(EXTRA_OPEN_LANGUAGE_MANAGER, false) == true
+ // Consume the camera extra immediately so a configuration-changed
+ // recreation doesn't yank the user back into the camera screen.
+ openLiveCamera = intent?.getBooleanExtra(EXTRA_OPEN_LIVE_CAMERA, false) == true
+ intent?.removeExtra(EXTRA_OPEN_LIVE_CAMERA)
when (intent?.action) {
Intent.ACTION_SEND -> {
val text = intent.getStringExtra(Intent.EXTRA_TEXT)
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/MigrationGate.kt b/OCR-translation/src/main/java/dev/davidv/translator/MigrationGate.kt
index a23c4f3..78215d1 100644
--- a/OCR-translation/src/main/java/dev/davidv/translator/MigrationGate.kt
+++ b/OCR-translation/src/main/java/dev/davidv/translator/MigrationGate.kt
@@ -109,9 +109,18 @@ private fun convertGroup(
fun MigrationGate(
filePathManager: FilePathManager,
onMigrated: () -> Unit,
+ showContentImmediately: Boolean = false,
content: @Composable () -> Unit,
) {
- var state by remember { mutableStateOf<MigrationUiState>(MigrationUiState.Working) }
+ // Camera deep link (showContentImmediately): compose the app right away instead
+ // of flashing the blocking screen for the plan check's IO roundtrip. The check
+ // still runs; if something actually needs migrating the blocking screen takes
+ // over then (first launch only).
+ var state by remember {
+ mutableStateOf<MigrationUiState>(
+ if (showContentImmediately) MigrationUiState.Passed else MigrationUiState.Working
+ )
+ }
var ttsJobs by remember { mutableStateOf<List<MigrationJobRecord>>(emptyList()) }
// Guards against the Accept/Delete tap registering more than once: without it a
// second invocation re-runs convertGroup over already-migrated jobs (whose
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 bc9d7b2..373eb41 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
@@ -68,6 +68,8 @@ class OverlayUI(
private var launcherBubble: FloatingBubble? = null
private var toolbarView: View? = null
private var toolbarParams: WindowManager.LayoutParams? = null
+ /** Mode the current toolbar was built for (select-text button vs flip-only). */
+ private var toolbarShowSelectButton: Boolean? = null
private var hasSelectButton = false
private var sourceLabelView: TextView? = null
private var targetLabelView: TextView? = null
@@ -196,7 +198,17 @@ class OverlayUI(
isAutoSource: Boolean,
showSelectButton: Boolean = false,
) {
- if (toolbarView != null) return
+ if (toolbarView != null) {
+ // The toolbar is mode-dependent: live-screen modes get the select-text
+ // button, frozen captured modes get flip. Re-triggering with a different
+ // mode used to keep the stale chrome (captured toolbar shown for a
+ // long-press/screen translate, select hidden). Same mode → just sync labels.
+ if (toolbarShowSelectButton == showSelectButton) {
+ updateToolbarState(forcedSourceLanguage, forcedTargetLanguage, readingOrder, isAutoSource)
+ return
+ }
+ removeToolbar()
+ }
val toolbarViews =
OverlayChromeFactory.createLanguageToolbar(
@@ -252,7 +264,9 @@ class OverlayUI(
WindowManager.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.WRAP_CONTENT,
windowType(),
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+ WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+ WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
PixelFormat.TRANSLUCENT,
).apply {
gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL
@@ -265,6 +279,7 @@ class OverlayUI(
addChromeView(toolbar, lp)
toolbarView = toolbar
toolbarParams = lp as? WindowManager.LayoutParams
+ toolbarShowSelectButton = showSelectButton
makeToolbarDraggable(toolbar)
}
@@ -334,6 +349,7 @@ class OverlayUI(
removeChromeView(it)
toolbarView = null
toolbarParams = null
+ toolbarShowSelectButton = null
sourceLabelView = null
targetLabelView = null
readingOrderButtonView = null
@@ -345,12 +361,14 @@ class OverlayUI(
}
}
- /** Swap the mode-dependent toolbar slot: refresh drives the live screen, flip the frozen one. */
+ /** Select-mode toolbar slot: flip joins in select mode; refresh stays put —
+ * hiding it when select mode engaged (by tapping the translated text) made
+ * the refresh control vanish mid-read, which users hit as a bug. */
fun setSelectModeUi(active: Boolean) {
val onSurface = OverlayChromeFactory.palette(serviceContext).onSurface
val activeTint = OverlayChromeFactory.activeIconTint(serviceContext)
selectIconView?.setColorFilter(if (active) activeTint else onSurface)
- refreshButtonView?.visibility = if (active) View.GONE else View.VISIBLE
+ refreshButtonView?.visibility = View.VISIBLE
// Without a select button, flip is a permanent control — only hide it when
// leaving select mode if select mode is what made it visible.
flipButtonView?.visibility =
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/overlayChrome/ActivityLanguagePicker.kt b/OCR-translation/src/main/java/dev/davidv/translator/overlayChrome/ActivityLanguagePicker.kt
new file mode 100644
index 0000000..522369c
--- /dev/null
+++ b/OCR-translation/src/main/java/dev/davidv/translator/overlayChrome/ActivityLanguagePicker.kt
@@ -0,0 +1,137 @@
+package dev.davidv.translator.overlayChrome
+
+import android.app.Activity
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import dev.davidv.translator.Language
+import dev.davidv.translator.LanguageMetadataManager
+import dev.davidv.translator.LanguageStateManager
+import dev.davidv.translator.OverlayTextTranslationHelper
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+
+/**
+ * The translate toolbar's language picker dialog (same [OverlayMenuManager] +
+ * [OverlayChromeFactory.createLanguagePicker] views, same scrim, same download
+ * rows) hosted in the running activity instead of an accessibility overlay
+ * window — for screens inside the app, e.g. the live camera's language pills.
+ *
+ * The dialog views are added to a full-screen FrameLayout overlaying the
+ * activity's content ONLY while the picker is up: [OverlayMenuHost.removeMenuChild]
+ * detaches the container the moment the last child (scrim or dialog) is
+ * removed, so a lingering full-screen view can never swallow camera-screen taps.
+ */
+class ActivityLanguagePicker(
+ private val activity: Activity,
+ private val languageStateManager: LanguageStateManager,
+ languageMetadataManager: LanguageMetadataManager,
+) {
+ private val container = FrameLayout(activity)
+ private val helper = OverlayTextTranslationHelper(languageStateManager, languageMetadataManager)
+ private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+ private val dpToPx: (Int) -> Int = { dp ->
+ (dp * activity.resources.displayMetrics.density).toInt()
+ }
+
+ private val menuManager =
+ OverlayMenuManager(
+ activity,
+ dpToPx,
+ object : OverlayMenuHost {
+ override fun addDismissLayer(view: View) {
+ attach()
+ container.addView(
+ view,
+ FrameLayout.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ),
+ )
+ }
+
+ override fun addMenuView(view: View) {
+ attach()
+ container.addView(
+ view,
+ FrameLayout.LayoutParams(dpToPx(180), ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+ gravity = Gravity.BOTTOM or Gravity.END
+ bottomMargin = dpToPx(84)
+ marginEnd = dpToPx(8)
+ },
+ )
+ }
+
+ override fun addPickerView(view: View) {
+ attach()
+ val (pickerW, pickerH) = OverlayChromeFactory.pickerWindowSize(activity)
+ container.addView(
+ view,
+ FrameLayout.LayoutParams(pickerW, pickerH).apply {
+ gravity = Gravity.CENTER
+ },
+ )
+ }
+
+ override fun removeMenuChild(view: View) {
+ container.removeView(view)
+ // The picker session is over once its last child is gone — drop the
+ // full-screen container so touches reach the screen underneath again.
+ if (container.childCount == 0) detach()
+ }
+ },
+ )
+
+ private fun attach() {
+ if (container.parent == null) {
+ activity.addContentView(
+ container,
+ ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ),
+ )
+ }
+ }
+
+ private fun detach() {
+ (container.parent as? ViewGroup)?.removeView(container)
+ }
+
+ /**
+ * Shows the picker dialog. [allowAuto] adds the ✨ Auto-detect row (source
+ * side); [onPick] receives the chosen language, or null when Auto was picked.
+ */
+ fun show(
+ isSource: Boolean,
+ allowAuto: Boolean,
+ onPick: (Language?) -> Unit,
+ ) {
+ languageStateManager.refreshLanguageAvailability()
+ scope.launch {
+ helper.awaitPickerRows()
+ menuManager.showLanguagePicker(
+ isSource = isSource,
+ rowsProvider = { helper.pickerRows() },
+ allowAuto = allowAuto,
+ onToggleFavorite = { language, favorite -> helper.setFavorite(language, favorite) },
+ onDelete = { language -> languageStateManager.deleteLanguage(language) },
+ onPick = onPick,
+ )
+ }
+ }
+
+ fun dismiss() {
+ menuManager.dismiss()
+ detach()
+ }
+
+ fun destroy() {
+ dismiss()
+ scope.cancel()
+ }
+}
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/ui/TranslatorViewModel.kt b/OCR-translation/src/main/java/dev/davidv/translator/ui/TranslatorViewModel.kt
index e7dca7c..81a24e9 100644
--- a/OCR-translation/src/main/java/dev/davidv/translator/ui/TranslatorViewModel.kt
+++ b/OCR-translation/src/main/java/dev/davidv/translator/ui/TranslatorViewModel.kt
@@ -230,6 +230,13 @@ class TranslatorViewModel(
private val _languageManagerRequests = Channel<Unit>(Channel.CONFLATED)
val languageManagerRequests: Flow<Unit> = _languageManagerRequests.receiveAsFlow()
+ // Deep link from another in-app surface (Circle to Search bottom bar) straight
+ // into the live camera screen. A state flag (not a channel) so navigation can
+ // be folded into the single loading→main→camera transition without ever
+ // rendering the home screen in between.
+ private val _openLiveCameraRequest = MutableStateFlow(false)
+ val openLiveCameraRequest: StateFlow<Boolean> = _openLiveCameraRequest.asStateFlow()
+
val navigationState: StateFlow<NavigationState> =
combine(languageStateManager.languageState, _from, to) { langState, fromLang, toLang ->
when {
@@ -589,6 +596,14 @@ class TranslatorViewModel(
_languageManagerRequests.trySend(Unit)
}
+ fun requestLiveCamera() {
+ _openLiveCameraRequest.value = true
+ }
+
+ fun clearLiveCameraRequest() {
+ _openLiveCameraRequest.value = false
+ }
+
// A shared document (pdf/odt/txt/epub) reaches the same drawer as a picked one:
// copy the content URI into cache off the main thread, then drive the pending
// document state the file picker also feeds.
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/LiveCameraScreen.kt b/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/LiveCameraScreen.kt
index ba91cf5..8017829 100644
--- a/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/LiveCameraScreen.kt
+++ b/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/LiveCameraScreen.kt
@@ -56,6 +56,7 @@ import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -74,6 +75,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
@@ -98,6 +100,8 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
@@ -106,10 +110,14 @@ import androidx.core.content.FileProvider
import dev.davidv.translator.Language
import dev.davidv.translator.LanguageAvailabilityState
import dev.davidv.translator.LanguageMetadata
+import dev.davidv.translator.LanguageMetadataManager
+import dev.davidv.translator.LanguageStateManager
import dev.davidv.translator.LivePlanarOcrEngine
import dev.davidv.translator.R
+import dev.davidv.translator.TranslatorApplication
import dev.davidv.translator.TranslatorMessage
-import dev.davidv.translator.ui.components.LanguageSelector
+import dev.davidv.translator.localizedName
+import dev.davidv.translator.overlayChrome.ActivityLanguagePicker
import dev.davidv.translator.ui.components.LiveGlSurfaceView
import java.io.File
import java.util.concurrent.Executor
@@ -163,6 +171,7 @@ fun LiveCameraScreen(
canSwap: Boolean,
languageState: LanguageAvailabilityState,
languageMetadata: Map<Language, LanguageMetadata>,
+ languageStateManager: LanguageStateManager,
onMessage: (TranslatorMessage) -> Unit,
showAutoOption: Boolean,
liveOverlayDefaultEnabled: Boolean,
@@ -215,6 +224,7 @@ fun LiveCameraScreen(
canSwap = canSwap,
languageState = languageState,
languageMetadata = languageMetadata,
+ languageStateManager = languageStateManager,
onMessage = onMessage,
showAutoOption = showAutoOption,
liveOverlayDefaultEnabled = liveOverlayDefaultEnabled,
@@ -283,6 +293,7 @@ private fun CameraSurface(
canSwap: Boolean,
languageState: LanguageAvailabilityState,
languageMetadata: Map<Language, LanguageMetadata>,
+ languageStateManager: LanguageStateManager,
onMessage: (TranslatorMessage) -> Unit,
showAutoOption: Boolean,
liveOverlayDefaultEnabled: Boolean,
@@ -291,6 +302,37 @@ private fun CameraSurface(
onImageCaptured: (Uri) -> Unit,
) {
val context = LocalContext.current
+ // The same language picker dialog the translate toolbar uses, hosted in this
+ // activity (the camera screen has no overlay window of its own). Added to a
+ // full-screen container only while the dialog is up, torn down on dismiss.
+ val activity = context as? Activity
+ val languagePicker =
+ remember(languageStateManager, activity) {
+ activity?.let {
+ val app = it.application as? TranslatorApplication
+ if (app == null) {
+ null
+ } else {
+ ActivityLanguagePicker(it, languageStateManager, LanguageMetadataManager(it, app.languagesFlow))
+ }
+ }
+ }
+ DisposableEffect(languagePicker) {
+ onDispose { languagePicker?.destroy() }
+ }
+ val openLanguagePicker: (Boolean) -> Unit = { isSource ->
+ languagePicker?.show(
+ isSource = isSource,
+ allowAuto = isSource && showAutoOption,
+ ) { lang ->
+ when {
+ lang != null && isSource -> onMessage(TranslatorMessage.FromLang(lang))
+ lang != null -> onMessage(TranslatorMessage.ToLang(lang))
+ isSource -> onMessage(TranslatorMessage.EnableAutoSource)
+ else -> Unit
+ }
+ }
+ }
val lifecycleOwner = LocalLifecycleOwner.current
val mainExecutor: Executor = remember { ContextCompat.getMainExecutor(context) }
@@ -771,10 +813,8 @@ private fun CameraSurface(
to = to,
isAutoSource = isAutoSource,
canSwap = canSwap,
- languageState = languageState,
- languageMetadata = languageMetadata,
onMessage = onMessage,
- showAutoOption = showAutoOption,
+ onOpenLanguagePicker = openLanguagePicker,
modifier =
Modifier
.fillMaxWidth()
@@ -846,24 +886,42 @@ private fun TopLanguagePills(
to: Language,
isAutoSource: Boolean,
canSwap: Boolean,
- languageState: LanguageAvailabilityState,
- languageMetadata: Map<Language, LanguageMetadata>,
onMessage: (TranslatorMessage) -> Unit,
- showAutoOption: Boolean,
+ onOpenLanguagePicker: (isSource: Boolean) -> Unit,
modifier: Modifier = Modifier,
) {
- val fromLanguages =
- languageState.allLanguages().filter { x ->
- (isAutoSource || x != from) && (languageState.availabilityFor(x)?.hasToEnglish == true || x.isEnglish)
- }
- val toLanguages =
- languageState.allLanguages().filter { x ->
- (isAutoSource || x != from) && x != to && (languageState.availabilityFor(x)?.hasFromEnglish == true || x.isEnglish)
- }
val pillShape = RoundedCornerShape(50)
val pillBackground = Color.Black.copy(alpha = 0.5f)
val pillWidth = 110.dp
+
+ // Pill label with the same typography/hit shape LanguageSelector used, but a
+ // tap opens the toolbar's language picker dialog instead of an inline menu.
+ @Composable
+ fun PillLabel(
+ text: String,
+ onClick: () -> Unit,
+ ) {
+ Text(
+ modifier =
+ Modifier
+ .fillMaxWidth()
+ .clip(RoundedCornerShape(10.dp))
+ .clickable(
+ interactionSource = remember { MutableInteractionSource() },
+ indication = null,
+ onClick = onClick,
+ )
+ .padding(vertical = 8.dp, horizontal = 4.dp),
+ text = text,
+ textAlign = TextAlign.Center,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ style = MaterialTheme.typography.bodyMedium,
+ color = Color.White,
+ )
+ }
+
Row(
modifier = modifier,
horizontalArrangement = Arrangement.spacedBy(6.dp, Alignment.CenterHorizontally),
@@ -876,16 +934,14 @@ private fun TopLanguagePills(
.clip(pillShape)
.background(pillBackground),
) {
- LanguageSelector(
- selectedLanguage = from,
- availableLanguages = fromLanguages,
- languageMetadata = languageMetadata,
- onLanguageSelected = { onMessage(TranslatorMessage.FromLang(it)) },
- isAutoSource = isAutoSource,
- showAutoOption = showAutoOption,
- onAutoSelected = { onMessage(TranslatorMessage.EnableAutoSource) },
- textColor = Color.White,
- marquee = false,
+ PillLabel(
+ text =
+ if (isAutoSource) {
+ stringResource(R.string.langsel_auto)
+ } else {
+ from.localizedName()
+ },
+ onClick = { onOpenLanguagePicker(true) },
)
}
CompositionLocalProvider(LocalContentColor provides Color.White) {
@@ -907,13 +963,9 @@ private fun TopLanguagePills(
.clip(pillShape)
.background(pillBackground),
) {
- LanguageSelector(
- selectedLanguage = to,
- availableLanguages = toLanguages,
- languageMetadata = languageMetadata,
- onLanguageSelected = { onMessage(TranslatorMessage.ToLang(it)) },
- textColor = Color.White,
- marquee = false,
+ PillLabel(
+ text = to.localizedName(),
+ onClick = { onOpenLanguagePicker(false) },
)
}
}
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/TranslatorApp.kt b/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/TranslatorApp.kt
index 7095fc5..c8f150e 100644
--- a/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/TranslatorApp.kt
+++ b/OCR-translation/src/main/java/dev/davidv/translator/ui/screens/TranslatorApp.kt
@@ -33,6 +33,7 @@ import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
@@ -68,6 +69,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
@@ -558,13 +560,22 @@ fun TranslatorApp(
val navigationState by viewModel.navigationState.collectAsState()
- // Map navigation state to route
+ val openLiveCameraRequest by viewModel.openLiveCameraRequest.collectAsState()
+
+ // Map navigation state to route. A pending camera deep link (set by MainActivity
+ // before the first frame) becomes the start destination so the home screen is
+ // never composed — navigating main → live_camera would flash it first. Even
+ // while the language check is still LOADING go straight to the camera: it
+ // renders a black placeholder until the languages arrive, which beats the
+ // loading spinner screen for a launch that never wanted the home screen.
val startDestination =
remember {
when (navigationState) {
- TranslatorViewModel.NavigationState.LOADING -> "loading"
TranslatorViewModel.NavigationState.NO_LANGUAGES -> "no_languages"
- TranslatorViewModel.NavigationState.READY -> "main"
+ TranslatorViewModel.NavigationState.LOADING ->
+ if (openLiveCameraRequest) "live_camera" else "loading"
+ TranslatorViewModel.NavigationState.READY ->
+ if (openLiveCameraRequest) "live_camera" else "main"
}
}
@@ -573,8 +584,55 @@ fun TranslatorApp(
// current entry re-runs these once the host is actually there.
val currentBackStackEntry by navController.currentBackStackEntryAsState()
- LaunchedEffect(navigationState, currentBackStackEntry) {
+ LaunchedEffect(navigationState, currentBackStackEntry, openLiveCameraRequest) {
val currentRoute = currentBackStackEntry?.destination?.route
+ if (openLiveCameraRequest) {
+ if (navigationState == TranslatorViewModel.NavigationState.READY) {
+ // Same as the home screen's camera entry: tear down any lingering
+ // overlay session (floating bubble / screen-translate chrome) — its
+ // touchable result or selection window would sit over the camera and
+ // swallow taps (including the language pills').
+ (dev.davidv.translator.OverlayWindowHosts.primary as? dev.davidv.translator.accessibilityOverlay.TranslatorOverlayHost)
+ ?.deactivate()
+ }
+ // Fold the camera deep link into this one transition so the home screen
+ // is never composed. While the NavHost has no back stack yet
+ // (currentRoute == null) the request must be KEPT — clearing it here
+ // dropped the deep link and left the user on the home screen; this
+ // effect re-runs when the first entry appears.
+ when {
+ currentRoute == null -> Unit
+ // Already on the camera (e.g. a repeated deep link) — just consume it.
+ currentRoute == "live_camera" -> viewModel.clearLiveCameraRequest()
+ navigationState == TranslatorViewModel.NavigationState.READY -> {
+ // From the loading gate go straight to the camera so the home screen
+ // is never composed; from anywhere else stack the camera on top.
+ if (currentRoute == "loading") {
+ navController.navigate("live_camera") {
+ popUpTo("loading") { inclusive = true }
+ }
+ } else {
+ navController.navigate("live_camera")
+ }
+ viewModel.clearLiveCameraRequest()
+ }
+ navigationState != TranslatorViewModel.NavigationState.LOADING -> {
+ // no_languages (or another terminal state): packs must be downloaded
+ // before the live camera works — drop the request. If the camera
+ // route was the start destination (deep link while still LOADING),
+ // leave it for the download screen.
+ viewModel.clearLiveCameraRequest()
+ if (currentRoute == "live_camera") {
+ navController.navigate("no_languages") {
+ popUpTo("live_camera") { inclusive = true }
+ }
+ }
+ }
+ // else: still loading — keep the request; this effect re-runs when the
+ // navigation state or back stack changes.
+ }
+ return@LaunchedEffect
+ }
val targetRoute =
when (navigationState) {
TranslatorViewModel.NavigationState.LOADING -> null
@@ -754,7 +812,14 @@ fun TranslatorApp(
val targetTtsPlaybackSpeed = ttsPlaybackSpeedFor(settings, currentTo, selectedTtsVoiceName)
MainScreen(
onSettings = { navController.navigate("settings") },
- onLiveCamera = { navController.navigate("live_camera") },
+ onLiveCamera = {
+ // Tear down any lingering overlay session (floating bubble /
+ // screen-translate chrome) first — its touchable result or
+ // selection window would sit over the camera and swallow taps.
+ (dev.davidv.translator.OverlayWindowHosts.primary as? dev.davidv.translator.accessibilityOverlay.TranslatorOverlayHost)
+ ?.deactivate()
+ navController.navigate("live_camera")
+ },
input = input,
inputTransliteration = inputTransliterated,
output = output,
@@ -950,15 +1015,33 @@ fun TranslatorApp(
canSwap = viewModel.languageStateManager.canSwapLanguages(currentFrom, currentTo),
languageState = languageState,
languageMetadata = languageMetadata,
+ languageStateManager = viewModel.languageStateManager,
onMessage = viewModel::handleMessage,
showAutoOption = !settings.disableCLD,
liveOverlayDefaultEnabled = settings.liveCameraOverlayEnabled,
catalog = liveCatalog,
onClose = {
- navController.popBackStack("main", inclusive = false)
+ // Deep-linked straight onto the camera (start destination or
+ // loading → live_camera): no home entry sits under it, so
+ // popBackStack("main") fails — close the activity instead so
+ // Back/close returns to the caller (Circle to Search) rather
+ // than dropping the user on the module's home screen.
+ if (!navController.popBackStack("main", inclusive = false)) {
+ (context as? android.app.Activity)?.finish()
+ }
},
onImageCaptured = viewModel::setSharedImageUri,
)
+ } else {
+ // Deep-linked in while the language check is still running: the
+ // camera screen needs from/to, so hold a black frame (the camera
+ // screen's own background) until they arrive instead of flashing
+ // the loading spinner or an empty white frame.
+ Box(
+ modifier = Modifier
+ .fillMaxSize()
+ .background(Color.Black)
+ )
}
}
}
diff --git a/OCR-translation/src/main/res/values/themes.xml b/OCR-translation/src/main/res/values/themes.xml
index e7e725e..a300737 100644
--- a/OCR-translation/src/main/res/values/themes.xml
+++ b/OCR-translation/src/main/res/values/themes.xml
@@ -6,6 +6,10 @@
<item name="android:windowAnimationStyle">@null</item>
<!-- Set window background to match Material3 surface color -->
<item name="android:windowBackground">?attr/colorSurface</item>
+ <!-- No system starting-window/splash preview: it is light-surface colored
+ and flashes white over the screen for the camera deep link (and delays
+ every launch since the app's own first frame already covers startup). -->
+ <item name="android:windowDisablePreview">true</item>
<!-- Ensure no window enter/exit transitions -->
<item name="android:windowEnterTransition">@null</item>
<item name="android:windowExitTransition">@null</item>
diff --git a/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlay.kt b/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlay.kt
index b7f3914..40f23f7 100644
--- a/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlay.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlay.kt
@@ -23,10 +23,18 @@ object AssistantTranslateOverlay {
/**
* Starts OCR + translation of an already-captured screenshot using the
* activity-hosted overlay. Returns false if no bridge is attached.
+ * [tapToCopy] — false for live-screen modes: the overlay window stops
+ * consuming taps (FLAG_NOT_TOUCHABLE on the hosting activity) so the app
+ * underneath stays interactive, mirroring the accessibility path.
*/
- fun start(screenshot: Bitmap, uiDelayMs: Long = 0L, onClosed: (() -> Unit)? = null): Boolean {
+ fun start(
+ screenshot: Bitmap,
+ uiDelayMs: Long = 0L,
+ tapToCopy: Boolean = true,
+ onClosed: (() -> Unit)? = null,
+ ): Boolean {
val b = bridge ?: return false
- b.startCapturedTranslation(screenshot, uiDelayMs, onClosed)
+ b.startCapturedTranslation(screenshot, uiDelayMs, onClosed, tapToCopy)
return true
}
diff --git a/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlayBridge.kt b/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlayBridge.kt
index f0c4cdd..be56967 100644
--- a/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlayBridge.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlayBridge.kt
@@ -59,6 +59,13 @@ class AssistantTranslateOverlayBridge(
private var capturedScanning = false
private var capturedRegion: Rect? = null
private var overlaySession = 0
+ /** Whether the translated result consumes taps (word selection / copy).
+ * False for live-screen mode (long-press translate, Screen button): the
+ * hosting activity window is made FLAG_NOT_TOUCHABLE so taps reach the app
+ * underneath instead of being swallowed by the full-screen container. */
+ private var resultTapToCopy = true
+ /** 1×1 outside-touch watcher used in live-screen mode (see ensureOutsideWatcher). */
+ private var outsideWatcher: android.widget.PopupWindow? = null
private data class TranslatedScreen(
val original: Bitmap,
@@ -113,8 +120,11 @@ class AssistantTranslateOverlayBridge(
screenshot: Bitmap,
uiDelayMs: Long = 0L,
onClosed: (() -> Unit)? = null,
+ tapToCopy: Boolean = true,
) {
this.returnToCaller = onClosed
+ this.resultTapToCopy = tapToCopy
+ applyResultTouchMode(tapToCopy)
providedScreenshot = screenshot
if (active) {
@@ -161,13 +171,74 @@ class AssistantTranslateOverlayBridge(
capturedChrome = null
}
+ /**
+ * Pass-through for live-screen mode: the container is a full-screen window,
+ * so taps reach the app underneath only if the hosting activity window is
+ * FLAG_NOT_TOUCHABLE (chrome in it stops receiving taps; key events still do —
+ * Back goes to the focused window, so the overlay can still be dismissed).
+ * Tap-to-copy sessions restore touchability.
+ */
+ private fun applyResultTouchMode(tapToCopy: Boolean) {
+ val w = activity.window ?: return
+ if (tapToCopy) {
+ w.clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
+ dismissOutsideWatcher()
+ } else {
+ w.addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
+ ensureOutsideWatcher()
+ }
+ }
+
+ /**
+ * Live-screen mode: the window is FLAG_NOT_TOUCHABLE so taps reach the app
+ * underneath — which also means no view in it ever sees a touch, so the
+ * drawn translations would sit on screen forever. A 1×1 outside-touchable
+ * popup (a sub-window, unaffected by the activity window's FLAG_NOT_TOUCHABLE)
+ * watches for any touch elsewhere and clears the overlays the same way the
+ * accessibility path does on click/scroll; the touch itself still lands on
+ * the app below.
+ */
+ private fun ensureOutsideWatcher() {
+ if (outsideWatcher != null) return
+ val anchor = activity.window?.decorView ?: return
+ val popup = android.widget.PopupWindow(android.view.View(activity), 1, 1, false)
+ popup.isOutsideTouchable = true
+ popup.isFocusable = false
+ popup.contentView.setOnTouchListener { _, event ->
+ if (event.actionMasked == android.view.MotionEvent.ACTION_OUTSIDE) {
+ ui.removeTranslationOverlays()
+ }
+ true
+ }
+ popup.setOnDismissListener { outsideWatcher = null }
+ anchor.post {
+ if (outsideWatcher != null || !active || resultTapToCopy) {
+ runCatching { popup.dismiss() }
+ return@post
+ }
+ runCatching {
+ popup.showAtLocation(anchor, android.view.Gravity.TOP, 0, 0)
+ outsideWatcher = popup
+ }
+ }
+ }
+
+ private fun dismissOutsideWatcher() {
+ outsideWatcher?.let { w ->
+ outsideWatcher = null
+ runCatching { w.dismiss() }
+ }
+ }
+
private fun showTranslatorChrome() {
ui.showToolbar(
forcedSourceLanguage,
forcedTargetLanguage,
currentReadingOrderFor(forcedSourceLanguage),
isAutoSource,
- showSelectButton = false,
+ // Parity with the accessibility path: live-screen modes expose select-text
+ // (taps pass through the result there), frozen modes get flip instead.
+ showSelectButton = !resultTapToCopy,
)
}
@@ -189,6 +260,8 @@ class AssistantTranslateOverlayBridge(
overlaySession++
active = false
selectMode = false
+ resultTapToCopy = true
+ applyResultTouchMode(true)
showingOriginal = false
ui.removeSelectSurface()
surfaceState.clear()
@@ -224,7 +297,7 @@ class AssistantTranslateOverlayBridge(
selectMode = false
showingOriginal = false
ui.setFlipActive(false)
- lastResult?.let { ui.showBitmapOverlay(it.translated, it.region) }
+ lastResult?.let { ui.showBitmapOverlay(it.translated, it.region, tapToCopy = resultTapToCopy) }
ui.removeSelectSurface()
surfaceState.clear()
ui.setSelectModeUi(false)
@@ -245,7 +318,11 @@ class AssistantTranslateOverlayBridge(
showingOriginal = !showingOriginal
ui.setFlipActive(showingOriginal)
ui.removeTranslationOverlays()
- ui.showBitmapOverlay(if (showingOriginal) res.original else res.translated, res.region)
+ ui.showBitmapOverlay(
+ if (showingOriginal) res.original else res.translated,
+ res.region,
+ tapToCopy = resultTapToCopy,
+ )
}
override fun swapLanguages() {
@@ -327,19 +404,26 @@ class AssistantTranslateOverlayBridge(
return
}
- val region = fullCaptureRegion()
ui.dismissMenu()
+ // No a11y permission means no on-demand screen capture: the assist pipeline
+ // only ever hands us the screenshot captured at invocation time, so refresh
+ // re-translates that capture (language/reading-order changes) — the same
+ // stored-capture behavior the accessibility path uses in select mode.
val provided = providedScreenshot
if (provided != null) {
- val cropped = cropToRegion(provided, region) ?: return
- surfaceState.regions.value = null
- ui.showScanOverlay(surfaceState, region)
- serviceScope.launch { translateRegionBitmap(cropped, region) }
- return
+ startRegionTranslation(provided, fullCaptureRegion())
}
}
+ /** Crops [screenshot] to [region], shows the scan overlay and translates it. */
+ private fun startRegionTranslation(screenshot: Bitmap, region: Rect) {
+ val cropped = cropToRegion(screenshot, region) ?: return
+ surfaceState.regions.value = null
+ ui.showScanOverlay(surfaceState, region)
+ serviceScope.launch { translateRegionBitmap(cropped, region) }
+ }
+
private fun fullCaptureRegion(): Rect =
dev.davidv.translator.overlayChrome.OverlayInsets.contentBounds(windowManager)
@@ -428,7 +512,7 @@ class AssistantTranslateOverlayBridge(
ui.showSelectSurface(surfaceState, region) { onSelectSurfaceDismissed() }
}
} else {
- ui.showBitmapOverlay(result.correctedBitmap, region)
+ ui.showBitmapOverlay(result.correctedBitmap, region, tapToCopy = resultTapToCopy)
}
}
diff --git a/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt b/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt
index cbf267c..a948e7f 100644
--- a/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/TranslatorOverlayBridge.kt
@@ -201,7 +201,10 @@ class TranslatorOverlayBridge(
if (active) {
if (selectMode) exitSelectMode()
beginProvidedTranslation(screenshot)
- showScanIfScanning()
+ // Re-sync the chrome for this trigger instead of leaving whatever the
+ // previous session drew: showToolbar rebuilds when the mode (select
+ // button vs flip-only) changed, otherwise just updates the labels.
+ showCapturedChrome()
return
}
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 029fa00..5d1432e 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
@@ -96,7 +96,6 @@ import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.Fullscreen
import androidx.compose.material.icons.filled.Image
import androidx.compose.material.icons.filled.LightMode
-import androidx.compose.material.icons.filled.Mic
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material.icons.filled.OpenInNew
import androidx.compose.material.icons.filled.QrCode
@@ -107,7 +106,6 @@ import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.Smartphone
import androidx.compose.material.icons.filled.TextFields
import androidx.compose.material.icons.filled.Translate
-import androidx.compose.material.icons.filled.Upload
import androidx.compose.material.icons.filled.Person
import androidx.compose.material.icons.filled.Link
import androidx.compose.material.icons.filled.Phone
@@ -1890,6 +1888,45 @@ fun CircleToSearchScreen(
}
}
}
+ // Translate the live screen underneath Circle to Search: close CTS and
+ // run the overlay on the frozen capture over the interactive screen
+ // (tap-through, no tap-to-copy). Shared by the translate button's
+ // long-press and the bottom-bar "Screen" button.
+ val translateLiveScreen: () -> Unit = {
+ haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
+ val bmp = screenshot
+ if (bmp != null) {
+ selectionRect = null
+ selectedBitmap = null
+ isSearching = false
+ currentPathPoints.clear()
+ scope.launch { selectionAnim.snapTo(0f) }
+
+ val translatorService = CircleToSearchAccessibilityService.instance
+ // The live screen stays interactive underneath, so the result
+ // overlay must pass taps through (no tap-to-copy).
+ val started = translatorService?.translateCapturedScreen(bmp, TRANSLATE_TRIGGER_DELAY_MS, tapToCopy = false) ?: false
+ if (started) {
+ onClose()
+ } else {
+ // No accessibility service: assistant permission can't run the
+ // live screen (no current-screen capture, no touch-to-clear),
+ // so fall back to the regular captured translate — what a
+ // short press does — instead of a degraded live mode.
+ isTranslatorMode = true
+ val startedTranslate = com.akslabs.circletosearch.AssistantTranslateOverlay.start(bmp, TRANSLATE_HIDE_DELAY_MS) {
+ isTranslatorMode = false
+ }
+ if (!startedTranslate) {
+ isTranslatorMode = false
+ android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
+ }
+ }
+ } else {
+ android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
+ }
+ }
+
// 5. Bottom Bar — Material 3 Expressive two-row card
androidx.compose.animation.AnimatedVisibility(
visible = isUIVisible && !isEntityExtractMode && !isTranslatorMode && !wordSelected,
@@ -1956,25 +1993,6 @@ fun CircleToSearchScreen(
Spacer(modifier = Modifier.weight(1f))
- // Mic Button
- IconButton(
- onClick = {
- haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
- try {
- val intent = android.content.Intent(android.speech.RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
- putExtra(android.speech.RecognizerIntent.EXTRA_LANGUAGE_MODEL, android.speech.RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
- addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
- }
- context.startActivity(intent)
- } catch (e: Exception) {}
- },
- modifier = Modifier.size(44.dp)
- ) {
- Icon(Icons.Default.Mic, contentDescription = stringResource(R.string.cd_voice_search))
- }
-
- Spacer(modifier = Modifier.width(4.dp))
-
// Lens Button
IconButton(
onClick = {
@@ -2041,43 +2059,16 @@ fun CircleToSearchScreen(
}
},
onLongClick = {
- haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
- val bmp = screenshot
- if (bmp == null) {
- android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
- return@combinedClickable
- }
- selectionRect = null
- selectedBitmap = null
- isSearching = false
- currentPathPoints.clear()
- scope.launch { selectionAnim.snapTo(0f) }
-
- val translatorService = CircleToSearchAccessibilityService.instance
- if (translatorService != null) {
- // Long-press closes Circle to Search: the live screen
- // stays interactive underneath, so the result overlay
- // must pass taps through (no tap-to-copy).
- translatorService.translateCapturedScreen(bmp, TRANSLATE_TRIGGER_DELAY_MS, tapToCopy = false)
- onClose()
- } else {
- // No accessibility service: long-press behaves like a
- // short press — show the module's translate overlay
- // hosted in our own activity.
- isTranslatorMode = true
- val startedTranslate = com.akslabs.circletosearch.AssistantTranslateOverlay.start(bmp, TRANSLATE_TRIGGER_DELAY_MS) {
- isTranslatorMode = false
- }
- if (!startedTranslate) {
- isTranslatorMode = false
- android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
- }
- }
+ translateLiveScreen()
}
),
contentAlignment = Alignment.Center
) {
- Icon(Icons.Default.Translate, contentDescription = stringResource(R.string.cd_translate))
+ Icon(
+ painterResource(id = com.akslabs.circletosearch.R.drawable.translate_indic_24px),
+ contentDescription = stringResource(R.string.cd_translate),
+ tint = MaterialTheme.colorScheme.onSurface
+ )
}
}
@@ -2133,6 +2124,26 @@ fun CircleToSearchScreen(
}
}
+ // Camera — open the translator module's live camera directly.
+ // CLEAR_TASK so backing out of the camera returns here instead
+ // of any module screen left over from a previous session.
+ BottomBarButton(stringResource(R.string.label_camera), {
+ Icon(painterResource(id = dev.davidv.translator.R.drawable.camera), null, modifier = Modifier.size(22.dp))
+ }) {
+ // Clear any lingering translator overlay windows so a
+ // stale touchable result/select window can't intercept
+ // taps inside the camera screen.
+ CircleToSearchAccessibilityService.instance?.closeTranslateOverlay()
+ val cameraIntent = android.content.Intent(context, dev.davidv.translator.MainActivity::class.java)
+ .putExtra(dev.davidv.translator.MainActivity.EXTRA_OPEN_LIVE_CAMERA, true)
+ .addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK or android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK)
+ runCatching {
+ context.startActivity(cameraIntent)
+ }.onFailure {
+ android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
+ }
+ }
+
// More Apps
// BottomBarButton("More Apps", { Icon(Icons.Default.Apps, null) }) {
// showMoreAppsSheet = true
@@ -2257,12 +2268,27 @@ fun CircleToSearchScreen(
}
}
- // Upload — pick a gallery image and run Circle to Search on it
- BottomBarButton(stringResource(R.string.label_upload), { Icon(Icons.Default.Upload, null) }) {
+ // Gallery — pick an image and run Circle to Search on it
+ BottomBarButton(stringResource(R.string.label_gallery), { Icon(painterResource(id = com.akslabs.circletosearch.R.drawable.ic_gallery), null, modifier = Modifier.size(22.dp)) }) {
pickImageLauncher.launch(
PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
)
}
+
+ // Screen — translate the current live screen (same as long-pressing
+ // Translate). Only with accessibility: assistant permission can't
+ // offer the live screen behavior, so the button is hidden.
+ if (CircleToSearchAccessibilityService.instance != null) {
+ BottomBarButton(stringResource(R.string.label_translate_screen), {
+ Icon(
+ painterResource(id = com.akslabs.circletosearch.R.drawable.translate_screen),
+ contentDescription = null,
+ tint = MaterialTheme.colorScheme.onSurface
+ )
+ }) {
+ translateLiveScreen()
+ }
+ }
}
}
}
diff --git a/app/src/main/res/drawable/ic_gallery.xml b/app/src/main/res/drawable/ic_gallery.xml
new file mode 100644
index 0000000..7dd85f0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_gallery.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M4.5,4.5 h15 a2,2 0 0 1 2,2 v11 a2,2 0 0 1 -2,2 h-15 a2,2 0 0 1 -2,-2 v-11 a2,2 0 0 1 2,-2 z"
+ android:fillColor="#00000000"
+ android:strokeColor="#FF000000"
+ android:strokeWidth="1.7"/>
+ <path
+ android:pathData="M8.4,8 a1.5,1.5 0 1 1 0,3 a1.5,1.5 0 1 1 0,-3"
+ android:fillColor="#00000000"
+ android:strokeColor="#FF000000"
+ android:strokeWidth="1.7"/>
+ <path
+ android:pathData="M3.4,17 L9,11.4 L12.8,15.2 L15.2,12.8 L20.6,18.2"
+ android:fillColor="#00000000"
+ android:strokeColor="#FF000000"
+ android:strokeWidth="1.7"
+ android:strokeLineCap="round"
+ android:strokeLineJoin="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/translate_indic_24px.xml b/app/src/main/res/drawable/translate_indic_24px.xml
new file mode 100644
index 0000000..3071783
--- /dev/null
+++ b/app/src/main/res/drawable/translate_indic_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M476,880L658,400L742,400L924,880L840,880L797,758L603,758L560,880L476,880ZM628,688L772,688L700,484L628,688ZM254,640Q188,640 130.5,601.5Q73,563 44,498L116,462Q137,504 174,532Q211,560 253,560Q291,560 315.5,536.5Q340,513 340,480Q340,447 316.5,423.5Q293,400 260,400L200,400L200,320L260,320Q285,320 302.5,302.5Q320,285 320,260Q320,235 303,217.5Q286,200 261,200Q238,200 220,215Q202,230 188,248L125,199Q151,167 185,143.5Q219,120 262,120Q319,120 359.5,160.5Q400,201 400,259Q400,286 390,311.5Q380,337 361,357Q371,367 379.5,377.5Q388,388 396,400L520,400L520,200L440,200L440,120L680,120L680,200L600,200L600,316L539,480L420,480Q420,481 420,482Q420,483 420,484Q420,547 374,593.5Q328,640 254,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translate_screen.xml b/app/src/main/res/drawable/translate_screen.xml
new file mode 100644
index 0000000..da258a2
--- /dev/null
+++ b/app/src/main/res/drawable/translate_screen.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+ <!-- Screen / device frame -->
+ <path
+ android:pathData="M172,140 H788 Q872,140 872,224 V736 Q872,820 788,820 H172 Q88,820 88,736 V224 Q88,140 172,140 Z"
+ android:fillColor="#00000000"
+ android:strokeColor="#FF000000"
+ android:strokeWidth="56"
+ android:strokeLineJoin="round"
+ android:strokeLineCap="round" />
+ <!-- Translate glyph (A + foreign character), scaled to fit the screen -->
+ <group
+ android:pivotX="480"
+ android:pivotY="480"
+ android:scaleX="0.56"
+ android:scaleY="0.56">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880zM160,760l-56,-56 202,-202q-35,-35 -63.5,-80T190,320h84q20,39 40,68t48,58q33,-33 68.5,-92.5T484,240L40,240v-80h280v-80h80v80h280v80L564,240q-21,72 -63,148t-83,116l96,98 -30,82 -122,-125zM628,688h144l-72,-204z" />
+ </group>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b57dbe..d37024a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,7 +99,9 @@
<string name="label_smartscan">SmartScan</string>
<string name="label_scan_qr">Scan QR</string>
<string name="label_fullscreen">Fullscreen</string>
- <string name="label_upload">Upload</string>
+ <string name="label_gallery">Gallery</string>
+ <string name="label_camera">Camera</string>
+ <string name="label_translate_screen">Screen</string>
<string name="toast_image_load_failed">Unable to load that image</string>
<string name="label_share">Share</string>
<string name="label_extracting_entities">Extracting links &amp; info\u2026</string>