CircleToSearch with multi search engine support for all android
Kotlin
redesigned share button
AKS Labseccbdeb0457b
diff --git a/.kotlin/errors/errors-1774092633219.log b/.kotlin/errors/errors-1774092633219.lognew file mode 100644index 0000000..1219b50--- /dev/null+++ b/.kotlin/errors/errors-1774092633219.log@@ -0,0 +1,4 @@+kotlin version: 2.0.21+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:+ 1. Kotlin compile daemon is ready+diff --git a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.ktindex 28d325f..9e13ecb 100644--- a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt+++ b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt@@ -675,6 +675,10 @@ class CircleToSearchAccessibilityService : AccessibilityService() {private fun performCapture() {android.util.Log.d("CircleToSearch", "performCapture called. hasWindowManager=${windowManager != null}")++ // Clear repository at the source to prevent any "ghost" flash of old data+ BitmapRepository.clear()+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {takeScreenshot(Display.DEFAULT_DISPLAY,diff --git a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.ktindex 1b87577..0955a36 100644--- a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt+++ b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt@@ -82,7 +82,12 @@ class OverlayActivity : ComponentActivity() {super.onNewIntent(intent)android.util.Log.d("CircleToSearch", "OverlayActivity onNewIntent - Resetting state")setIntent(intent)++ // IMMEDIATE NULLING to prevent flash of previous screen+ screenshotBitmap.value = nullcopyTextManager.value?.dismiss()+ copyTextManager.value = null+loadScreenshot()// Recreate manager with new screenshotdiff --git a/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt b/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.ktindex 4e2da12..c157f92 100644--- a/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt@@ -45,6 +45,18 @@ object TesseractEngine {return filesDir}+ fun getAvailableModels(context: Context): List<String> {+ val dir = File(context.filesDir, "tessdata")+ if (!dir.exists()) {+ prepareTessData(context)+ }++ val files = dir.listFiles() ?: return listOf("eng")+ return files.filter { it.name.endsWith(".traineddata") }+ .map { it.name.removeSuffix(".traineddata") }+ .sorted()+ }+suspend fun extractText(context: Context, bitmap: Bitmap): List<TextNode> = withContext(Dispatchers.Default) {val result = mutableListOf<TextNode>()try {diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.ktindex 971e01e..f4b0612 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt@@ -776,22 +776,6 @@ fun CircleToSearchScreen(.background(Color.Transparent) // Changed from Black to Transparent) {// Close button for Copy Mode (Top Left)- if (isCopyMode) {- IconButton(- onClick = {- isCopyMode = false- onExitCopyMode()- },- modifier = Modifier- .statusBarsPadding()- .padding(16.dp)- .align(Alignment.TopStart)- .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.7f), CircleShape)- .zIndex(200f)- ) {- Icon(Icons.Default.Close, contentDescription = "Exit Copy Mode")- }- }// Friendly Message Overlay (Top Center)if (!isCopyMode) {@@ -1107,15 +1091,17 @@ fun CircleToSearchScreen(.height(48.dp),shape = CircleShape,colors = androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(- containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.95f),- contentColor = MaterialTheme.colorScheme.onSecondaryContainer+ containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,+ contentColor = MaterialTheme.colorScheme.onSurface),- elevation = androidx.compose.material3.ButtonDefaults.buttonElevation(defaultElevation = 6.dp),- contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 16.dp)+ elevation = androidx.compose.material3.ButtonDefaults.buttonElevation(defaultElevation = 6.dp), contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 20.dp)) {- Icon(Icons.Default.Send, contentDescription = null, modifier = Modifier.size(20.dp))- Spacer(Modifier.width(8.dp))- Text("Share Selection", fontWeight = FontWeight.Bold)+ Text(+ "Share",+ style = MaterialTheme.typography.labelLarge.copy(+ fontWeight = androidx.compose.ui.text.font.FontWeight.Normal+ )+ )}}}diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/components/CopyTextOverlayManager.kt b/app/src/main/java/com/akslabs/circletosearch/ui/components/CopyTextOverlayManager.ktindex 55ea270..ed82541 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/components/CopyTextOverlayManager.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/components/CopyTextOverlayManager.kt@@ -99,8 +99,7 @@ class CopyTextOverlayManager(MaterialTheme {Box(modifier = Modifier.fillMaxSize()) {TopBarUI(- onClose = { dismiss() },- onMenu = { showSettingsMenu() }+ onClose = { dismiss() })}}@@ -114,7 +113,7 @@ class CopyTextOverlayManager(}@Composable- private fun TopBarUI(onClose: () -> Unit, onMenu: () -> Unit) {+ private fun TopBarUI(onClose: () -> Unit) {Row(modifier = Modifier.fillMaxWidth()@@ -134,51 +133,57 @@ class CopyTextOverlayManager(}// Menu Button (Exact match from main UI)- IconButton(- onClick = onMenu,- modifier = Modifier- .background(android.graphics.Color.GRAY.toComposeColor().copy(alpha = 0.5f), CircleShape)- .size(40.dp)- ) {- Icon(Icons.Default.MoreVert, contentDescription = "Menu", tint = ComposeColor.White)+ Box {+ var showMenu by remember { mutableStateOf(false) }+ IconButton(+ onClick = { showMenu = true },+ modifier = Modifier+ .background(android.graphics.Color.GRAY.toComposeColor().copy(alpha = 0.5f), CircleShape)+ .size(40.dp)+ ) {+ Icon(Icons.Default.MoreVert, contentDescription = "Menu", tint = ComposeColor.White)+ }++ DropdownMenu(+ expanded = showMenu,+ onDismissRequest = { showMenu = false }+ ) {+ DropdownMenuItem(+ text = { Text("Select Language / Model") },+ onClick = {+ showMenu = false+ showLanguageModelSelector()+ }+ )+ DropdownMenuItem(+ text = { Text("Import Model (.traineddata)") },+ onClick = {+ showMenu = false+ triggerImport()+ }+ )+ }}}}private fun Int.toComposeColor(): ComposeColor = ComposeColor(this)- private fun showSettingsMenu() {- val anchor = dimView ?: return- val popup = PopupMenu(context, anchor, Gravity.END)- popup.menu.add("Select Language")- popup.menu.add("Import traineddata")-- popup.setOnMenuItemClickListener { item ->- when (item.title) {- "Select Language" -> showLanguageSelector()- "Import traineddata" -> triggerImport()- }- true- }- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {- popup.setForceShowIcon(true)- }- popup.show()- }-- private fun showLanguageSelector() {- val languages = listOf("English", "Hindi", "French", "Spanish", "German", "Chinese", "Japanese")- val codes = listOf("eng", "hin", "fra", "spa", "deu", "chi_sim", "jpn")+ private fun showLanguageModelSelector() {+ val models = com.akslabs.circletosearch.ocr.TesseractEngine.getAvailableModels(context)+ val prefs = context.getSharedPreferences("OcrSettings", Context.MODE_PRIVATE)+ val current = prefs.getString("selected_lang", "eng") ?: "eng"android.app.AlertDialog.Builder(context)- .setTitle("Select OCR Language")- .setItems(languages.toTypedArray()) { _, which ->- val code = codes[which]- context.getSharedPreferences("OcrSettings", Context.MODE_PRIVATE)- .edit().putString("selected_lang", code).apply()- Toast.makeText(context, "Language changed to ${languages[which]}. Restarting scan...", Toast.LENGTH_SHORT).show()+ .setTitle("Select OCR Model")+ .setSingleChoiceItems(models.toTypedArray(), models.indexOf(current)) { dialog, which ->+ val selected = models[which]+ prefs.edit().putString("selected_lang", selected).apply()+ Toast.makeText(context, "Selected: ${selected.uppercase()}. Restarting scan...", Toast.LENGTH_SHORT).show()+ dialog.dismiss()rescanNodes()}+ .setNegativeButton("Cancel", null).show()}diff --git a/build_errors_25.txt b/build_errors_25.txtnew file mode 100644index 0000000..dddeeb2Binary files /dev/null and b/build_errors_25.txt differdiff --git a/build_errors_26.txt b/build_errors_26.txtnew file mode 100644index 0000000..7cdb01dBinary files /dev/null and b/build_errors_26.txt differ