CircleToSearch with multi search engine support for all android
Kotlin
fix: Bottom bar hides on text selection
AKS Labs1b4dd3c8c63b
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/ui/components/WordSelectionOverlay.kt b/OCR-translation/src/main/java/dev/davidv/translator/ui/components/WordSelectionOverlay.ktindex 04285fd..dc45eba 100644--- a/OCR-translation/src/main/java/dev/davidv/translator/ui/components/WordSelectionOverlay.kt+++ b/OCR-translation/src/main/java/dev/davidv/translator/ui/components/WordSelectionOverlay.kt@@ -180,6 +180,7 @@ fun WordSelectionOverlay(imageHeight: Int,scale: Float = 1f,modifier: Modifier = Modifier,+ onSelectionChanged: (Boolean) -> Unit = {},) {val context = LocalContext.currentval view = LocalView.current@@ -201,6 +202,11 @@ fun WordSelectionOverlay(val scaleState = rememberUpdatedState(scale)val hasSelection = selStart != null && selEnd != null+ // Tell the host when a selection starts or is cleared — e.g. Circle to Search hides its+ // bottom bar while text is selected. Keyed on `words` too: they reset the selection.+ LaunchedEffect(hasSelection, words) {+ onSelectionChanged(hasSelection)+ }// Pills, handles, bounds and copy text all come from translator-rs in one call, so this overlay// and the Qt one cannot disagree about what a drag selected.val selection =diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.ktindex f02eafa..6646c08 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt@@ -467,6 +467,9 @@ fun CircleToSearchScreen(// recognized source words — tap a word to select and copy (original text, no translation).var instantWords by remember { mutableStateOf<ImageWordSelection?>(null) }var instantRegions by remember { mutableStateOf<DetectedRegions?>(null) }+ // A word selection in the instant-OCR overlay hides the bottom bar; tapping outside the+ // text clears the selection and the bar comes back.+ var wordSelected by remember { mutableStateOf(false) }// Circle-draw gesture handlers, shared by the drag-detector wrapper above the drawing// layer (see "Circle-draw gestures" below). Plain drags draw; handle grabs and taps are@@ -605,10 +608,17 @@ fun CircleToSearchScreen(LaunchedEffect(screenshot) {instantWords = nullinstantRegions = null+ wordSelected = falseval bmp = screenshot ?: return@LaunchedEffectinstantWords = runInstantScreenshotOcr(context, bmp) { instantRegions = it }}+ // The word overlay unmounts in these modes (dropping its selection) - drop ours too so+ // the bottom bar doesn't stay hidden after leaving them.+ LaunchedEffect(isEntityExtractMode, isTranslatorMode) {+ if (isEntityExtractMode || isTranslatorMode) wordSelected = false+ }+// Helper to create and configure WebViewfun createWebView(ctx: android.content.Context, engine: SearchEngine): WebView {return WebView(ctx).apply {@@ -1280,6 +1290,7 @@ fun CircleToSearchScreen(imageWidth = words.imageWidth,imageHeight = words.imageHeight,modifier = Modifier.fillMaxSize(),+ onSelectionChanged = { wordSelected = it },)} else {instantRegions?.let { regions ->@@ -1306,7 +1317,7 @@ fun CircleToSearchScreen(modifier = Modifier.fillMaxWidth().statusBarsPadding()- .padding(top = 16.dp, start = 16.dp, end = 16.dp)+ .padding(top = 4.dp, start = 16.dp, end = 16.dp).align(Alignment.TopCenter),verticalAlignment = Alignment.CenterVertically) {@@ -1480,7 +1491,7 @@ fun CircleToSearchScreen(}// 5. Bottom Bar — Material 3 Expressive two-row cardandroidx.compose.animation.AnimatedVisibility(- visible = isUIVisible && !isEntityExtractMode && !isTranslatorMode,+ visible = isUIVisible && !isEntityExtractMode && !isTranslatorMode && !wordSelected,enter = slideInVertically(initialOffsetY = { it }, // slides up from belowanimationSpec = tween(300, easing = androidx.compose.animation.core.CubicBezierEasing(0f, 0f, 0.2f, 1f))