CircleToSearch with multi search engine support for all android
Kotlin
Improved OCR screen with proper guide to get OCR Models
AKS Labsa8433be86086
diff --git a/.kotlin/errors/errors-1776326226017.log b/.kotlin/errors/errors-1776326226017.lognew file mode 100644index 0000000..fbbd9d1--- /dev/null+++ b/.kotlin/errors/errors-1776326226017.log@@ -0,0 +1,45 @@+kotlin version: 2.0.21+error message: Daemon compilation failed: Unknown or invalid session 1+java.lang.Exception: Unknown or invalid session 1+ at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)+ at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)+ at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)+ 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(Unknown Source)+ 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(Unknown Source)+ at java.base/java.util.concurrent.FutureTask.run(Unknown Source)+ 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(Unknown Source)+ at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)+ at java.base/java.lang.Thread.run(Unknown Source)++diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.ktindex 18877f8..141220e 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt@@ -10,21 +10,30 @@ import androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.*import androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items+import androidx.compose.foundation.shape.RoundedCornerShape+import androidx.compose.foundation.text.ClickableTextimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ArrowBack-import androidx.compose.material.icons.filled.Add-import androidx.compose.material.icons.filled.Check-import androidx.compose.material.icons.filled.Language+import androidx.compose.material.icons.filled.*import androidx.compose.material3.*import androidx.compose.runtime.*import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier+import androidx.compose.ui.draw.clip+import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.platform.LocalContext+import androidx.compose.ui.platform.LocalUriHandler+import androidx.compose.ui.text.AnnotatedString+import androidx.compose.ui.text.SpanStyle+import androidx.compose.ui.text.buildAnnotatedStringimport androidx.compose.ui.text.font.FontWeight-import androidx.compose.ui.unit.dp+import androidx.compose.ui.text.style.TextDecoration+import androidx.compose.ui.text.withStyle+import androidx.compose.ui.unit.*import com.akslabs.circletosearch.ocr.TesseractEngineimport java.io.Fileimport java.io.FileOutputStream+import java.util.Locale@OptIn(ExperimentalMaterial3Api::class)@Composable@@ -34,6 +43,8 @@ fun OcrSettingsScreen(onBack: () -> Unit) {var currentLang by remember { mutableStateOf(prefs.getString("selected_lang", "eng") ?: "eng") }var availableModels by remember { mutableStateOf(TesseractEngine.getAvailableModels(context)) }+ var isNoteVisible by remember { mutableStateOf(prefs.getBoolean("ocr_note_dismissed", false).not()) }+ val uriHandler = LocalUriHandler.currentval filePickerLauncher = rememberLauncherForActivityResult(contract = ActivityResultContracts.GetContent()@@ -74,39 +85,141 @@ fun OcrSettingsScreen(onBack: () -> Unit) {LazyColumn(modifier = Modifier.fillMaxSize()- .padding(padding)+ .padding(padding),+ contentPadding = PaddingValues(bottom = 80.dp)) {+ item {+ if (isNoteVisible) {+ Card(+ modifier = Modifier+ .fillMaxWidth()+ .padding(16.dp),+ colors = CardDefaults.cardColors(+ containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.7f)+ ),+ shape = RoundedCornerShape(24.dp)+ ) {+ Box(modifier = Modifier.padding(16.dp)) {+ Column(modifier = Modifier.fillMaxWidth().padding(end = 32.dp)) {+ Row(verticalAlignment = Alignment.CenterVertically) {+ Icon(+ imageVector = Icons.Default.Info,+ contentDescription = null,+ tint = MaterialTheme.colorScheme.primary,+ modifier = Modifier.size(20.dp)+ )+ Spacer(modifier = Modifier.width(8.dp))+ Text(+ text = "Language Models Guide",+ style = MaterialTheme.typography.titleSmall,+ fontWeight = FontWeight.Bold,+ color = MaterialTheme.colorScheme.primary+ )+ }++ Spacer(modifier = Modifier.height(8.dp))++ val annotatedString = buildAnnotatedString {+ append("This app uses language models to detect text. By default, it uses a fast English model which may miss some text. To use high-accuracy models or detect other languages, download them from the ")++ pushStringAnnotation(tag = "URL", annotation = "https://t.me/AKSLabs")+ withStyle(style = SpanStyle(+ color = MaterialTheme.colorScheme.primary,+ fontWeight = FontWeight.Bold,+ textDecoration = TextDecoration.Underline+ )) {+ append("developer's Telegram group")+ }+ pop()++ append(" and import them below.")+ }++ ClickableText(+ text = annotatedString,+ style = MaterialTheme.typography.bodyMedium.copy(+ color = MaterialTheme.colorScheme.onSecondaryContainer+ ),+ onClick = { offset ->+ annotatedString.getStringAnnotations(tag = "URL", start = offset, end = offset)+ .firstOrNull()?.let { annotation ->+ uriHandler.openUri(annotation.item)+ }+ }+ )+ }++ IconButton(+ onClick = {+ isNoteVisible = false+ prefs.edit().putBoolean("ocr_note_dismissed", true).apply()+ },+ modifier = Modifier+ .align(Alignment.TopEnd)+ .size(24.dp)+ ) {+ Icon(+ imageVector = Icons.Default.Close,+ contentDescription = "Dismiss",+ modifier = Modifier.size(16.dp)+ )+ }+ }+ }+ }+ }+item {Text(- text = "Tesseract Optical Character Recognition uses .traineddata models to accurately read text from screen captures. English is bundled by default.",- style = MaterialTheme.typography.bodyMedium,- color = MaterialTheme.colorScheme.onSurfaceVariant,- modifier = Modifier.padding(16.dp)+ text = "Installed Models",+ style = MaterialTheme.typography.titleMedium,+ fontWeight = FontWeight.Bold,+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp))}items(availableModels) { lang ->val isSelected = lang == currentLang- ListItem(- headlineContent = { Text(lang.uppercase(), fontWeight = FontWeight.SemiBold) },- supportingContent = { Text("Model file: $lang.traineddata") },- leadingContent = {- Icon(Icons.Default.Language, contentDescription = null)- },- trailingContent = {- if (isSelected) {- Icon(Icons.Default.Check, contentDescription = "Selected", tint = MaterialTheme.colorScheme.primary)- }- },- modifier = Modifier.clickable {- currentLang = lang- prefs.edit().putString("selected_lang", lang).apply()- },- colors = ListItemDefaults.colors(- containerColor = if (isSelected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface+ Card(+ modifier = Modifier+ .fillMaxWidth()+ .padding(horizontal = 16.dp, vertical = 4.dp),+ shape = RoundedCornerShape(16.dp),+ colors = CardDefaults.cardColors(+ containerColor = if (isSelected)+ MaterialTheme.colorScheme.primaryContainer+ else+ MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f))- )- HorizontalDivider(color = MaterialTheme.colorScheme.surfaceVariant)+ ) {+ ListItem(+ headlineContent = { Text(lang.uppercase(), fontWeight = FontWeight.Bold) },+ supportingContent = { Text("$lang.traineddata", style = MaterialTheme.typography.labelSmall) },+ leadingContent = {+ Icon(+ Icons.Default.Translate,+ contentDescription = null,+ tint = if (isSelected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant+ )+ },+ trailingContent = {+ if (isSelected) {+ Icon(+ Icons.Default.CheckCircle,+ contentDescription = "Selected",+ tint = MaterialTheme.colorScheme.primary+ )+ }+ },+ modifier = Modifier.clickable {+ currentLang = lang+ prefs.edit().putString("selected_lang", lang).apply()+ },+ colors = ListItemDefaults.colors(+ containerColor = Color.Transparent+ )+ )+ }}}}diff --git a/logs.md b/logs.mdnew file mode 100644index 0000000..1277afc--- /dev/null+++ b/logs.md@@ -0,0 +1,42 @@+e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:117:55 Argument type mismatch: actual type is 'kotlin.Float', but 'androidx.compose.ui.Modifier' was expected.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:117:64 Cannot access 'fun FloatArray.width(): Float': it is private in file.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:126:51 Argument type mismatch: actual type is 'kotlin.Float', but 'androidx.compose.ui.Modifier' was expected.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:126:60 Cannot access 'fun FloatArray.height(): Float': it is private in file.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:187:19 Argument type mismatch: actual type is 'kotlin.collections.List<kotlin.String>', but 'kotlin.Int' was expected.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:188:34 Operator '==' cannot be applied to 'kotlin.Int' and 'kotlin.String'.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:189:17 @Composable invocations can only happen from the context of a @Composable function+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:194:43 @Composable invocations can only happen from the context of a @Composable function+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:196:43 @Composable invocations can only happen from the context of a @Composable function+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:198:43 @Composable invocations can only happen from the context of a @Composable function+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:202:55 Unresolved reference 'uppercase'.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:220:45 Unresolved reference 'clickable'.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:221:43 Assignment type mismatch: actual type is 'kotlin.Int', but 'kotlin.String' was expected.+Fix with AI++e: file:///C:/Users/ashin/AndroidStudioProjects/CircleToSearch/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt:222:69 Argument type mismatch: actual type is 'kotlin.Int', but 'kotlin.String?' was expected.+Fix with AI+