Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

changed copy text mode icon to ocr

AKS Labs587d9f58f3e3
diff --git a/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt b/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt
index c157f92..2a81032 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt
@@ -57,6 +57,43 @@ object TesseractEngine {
.sorted()
}
+ fun importModel(context: Context, uri: android.net.Uri, callback: (Boolean, String) -> Unit) {
+ try {
+ val cursor = context.contentResolver.query(uri, null, null, null, null)
+ var fileName = "unknown.traineddata"
+ if (cursor != null && cursor.moveToFirst()) {
+ val nameIndex = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME)
+ if (nameIndex != -1) {
+ fileName = cursor.getString(nameIndex)
+ }
+ cursor.close()
+ }
+
+ if (!fileName.endsWith(".traineddata")) {
+ callback(false, "File must be a .traineddata Tesseract model.")
+ return
+ }
+
+ val tessDir = File(context.filesDir, "tessdata")
+ if (!tessDir.exists()) tessDir.mkdirs()
+
+ val destFile = File(tessDir, fileName)
+
+ context.contentResolver.openInputStream(uri)?.use { input ->
+ FileOutputStream(destFile).use { output ->
+ input.copyTo(output)
+ }
+ }
+
+ Log.d(TAG, "Imported model to ${destFile.absolutePath}")
+ callback(true, "Successfully imported ${fileName.removeSuffix(".traineddata").uppercase()} model!")
+
+ } catch (e: Exception) {
+ Log.e(TAG, "Error importing model: ${e.message}")
+ callback(false, "Failed to import model")
+ }
+ }
+
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.kt
index a5eff02..a23de9e 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
@@ -1436,6 +1436,8 @@ fun CircleToSearchScreen(
IconButton(
onClick = {
haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
+ android.widget.Toast.makeText(context, "Coming soon", android.widget.Toast.LENGTH_SHORT).show()
+ /*
try {
val shazamIntent = context.packageManager.getLaunchIntentForPackage("com.shazam.android")
val soundHoundIntent = context.packageManager.getLaunchIntentForPackage("com.melodis.midomiMusicIdentifier.freemium")
@@ -1443,6 +1445,7 @@ fun CircleToSearchScreen(
if (launchIntent != null) context.startActivity(launchIntent)
else context.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse("https://play.google.com/store/search?q=shazam&c=apps")).apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) })
} catch (e: Exception) {}
+ */
},
modifier = Modifier
.size(60.dp)
@@ -1455,11 +1458,14 @@ fun CircleToSearchScreen(
IconButton(
onClick = {
haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
+ android.widget.Toast.makeText(context, "Coming soon", android.widget.Toast.LENGTH_SHORT).show()
+ /*
try {
val intent = context.packageManager.getLaunchIntentForPackage("com.google.android.apps.translate")?.apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) }
if (intent != null) context.startActivity(intent)
else context.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse("https://translate.google.com")).apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) })
} catch (e: Exception) {}
+ */
},
modifier = Modifier
.size(60.dp)
@@ -1585,7 +1591,7 @@ fun CircleToSearchScreen(
}
// Copy Text
- BottomBarButton("Copy Text", { Icon(Icons.Default.TextFields, null) }) {
+ BottomBarButton("Copy Text", { Icon(painterResource(id = com.akslabs.circletosearch.R.drawable.ocr), null, modifier = Modifier.size(20.dp)) }) {
isCopyMode = true
isCopyTextTriggered = true
}
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt
index 8676ead..6092130 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
+import com.akslabs.circletosearch.ocr.TesseractEngine
import java.io.File
import java.io.FileOutputStream
@@ -32,16 +33,16 @@ fun OcrSettingsScreen(onBack: () -> Unit) {
val prefs = context.getSharedPreferences("OcrSettings", Context.MODE_PRIVATE)
var currentLang by remember { mutableStateOf(prefs.getString("selected_lang", "eng") ?: "eng") }
- var availableModels by remember { mutableStateOf(getAvailableModels(context)) }
+ var availableModels by remember { mutableStateOf(TesseractEngine.getAvailableModels(context)) }
val filePickerLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.GetContent()
) { uri: Uri? ->
if (uri != null) {
- importModel(context, uri) { success, msg ->
+ TesseractEngine.importModel(context, uri) { success, msg ->
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
if (success) {
- availableModels = getAvailableModels(context)
+ availableModels = TesseractEngine.getAvailableModels(context)
}
}
}
@@ -110,53 +111,3 @@ fun OcrSettingsScreen(onBack: () -> Unit) {
}
}
}
-
-private fun getAvailableModels(context: Context): List<String> {
- val dir = File(context.filesDir, "tessdata")
- if (!dir.exists()) {
- // Ensure bundle copied
- com.akslabs.circletosearch.ocr.TesseractEngine.prepareTessData(context)
- }
-
- val files = dir.listFiles() ?: return listOf("eng")
- return files.filter { it.name.endsWith(".traineddata") }
- .map { it.name.removeSuffix(".traineddata") }
- .sorted()
-}
-
-private fun importModel(context: Context, uri: Uri, callback: (Boolean, String) -> Unit) {
- try {
- val cursor = context.contentResolver.query(uri, null, null, null, null)
- var fileName = "unknown.traineddata"
- if (cursor != null && cursor.moveToFirst()) {
- val nameIndex = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME)
- if (nameIndex != -1) {
- fileName = cursor.getString(nameIndex)
- }
- cursor.close()
- }
-
- if (!fileName.endsWith(".traineddata")) {
- callback(false, "File must be a .traineddata Tesseract model.")
- return
- }
-
- val tessDir = File(context.filesDir, "tessdata")
- if (!tessDir.exists()) tessDir.mkdirs()
-
- val destFile = File(tessDir, fileName)
-
- context.contentResolver.openInputStream(uri)?.use { input ->
- FileOutputStream(destFile).use { output ->
- input.copyTo(output)
- }
- }
-
- Log.d("OcrSettings", "Imported model to ${destFile.absolutePath}")
- callback(true, "Successfully imported ${fileName.removeSuffix(".traineddata").uppercase()} model!")
-
- } catch (e: Exception) {
- Log.e("OcrSettings", "Error importing model: ${e.message}")
- callback(false, "Failed to import model")
- }
-}
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.kt
index b830512..f7bb711 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
@@ -112,6 +112,16 @@ class CopyTextOverlayManager(
@Composable
private fun TopBarUI(onClose: () -> Unit) {
+ val filePickerLauncher = androidx.activity.compose.rememberLauncherForActivityResult(
+ contract = androidx.activity.result.contract.ActivityResultContracts.GetContent()
+ ) { uri: android.net.Uri? ->
+ if (uri != null) {
+ TesseractEngine.importModel(context, uri) { success, msg ->
+ android.widget.Toast.makeText(context, msg, android.widget.Toast.LENGTH_SHORT).show()
+ }
+ }
+ }
+
Row(
modifier = Modifier
.fillMaxWidth()
@@ -157,7 +167,7 @@ class CopyTextOverlayManager(
text = { Text("Import Model (.traineddata)") },
onClick = {
showMenu = false
- triggerImport()
+ filePickerLauncher.launch("*/*")
}
)
}
@@ -185,10 +195,6 @@ class CopyTextOverlayManager(
.show()
}
- private fun triggerImport() {
- Toast.makeText(context, "Please place .traineddata files in /sdcard/Android/data/${context.packageName}/files/tessdata/", Toast.LENGTH_LONG).show()
- }
-
fun dismiss() {
scanJob?.cancel()
dimView = null
diff --git a/app/src/main/res/drawable/lens.png b/app/src/main/res/drawable/lens.png
new file mode 100644
index 0000000..5f520e5
Binary files /dev/null and b/app/src/main/res/drawable/lens.png differ
diff --git a/app/src/main/res/drawable/ocr.xml b/app/src/main/res/drawable/ocr.xml
new file mode 100644
index 0000000..7cfd8cf
--- /dev/null
+++ b/app/src/main/res/drawable/ocr.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="22dp"
+ android:height="22dp"
+ android:viewportWidth="22"
+ android:viewportHeight="22">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M18.1,0h-2.8c-0.7,0 -1.1,0.4 -1.1,1.1s0.4,1.1 1.1,1.1h2.8c0.9,0 1.6,0.7 1.6,1.6v2.7c0,0.7 0.4,1.1 1.1,1.1S22,7.3 22,6.6V3.8C22,1.8 20.2,0 18.1,0"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M20.9,14.3c-0.7,0 -1.1,0.4 -1.1,1.1v2.7c0,0.9 -0.7,1.6 -1.6,1.6h-2.8c-0.7,0 -1.1,0.4 -1.1,1.1s0.4,1.1 1.1,1.1h2.8c2.1,0 3.9,-1.7 3.9,-3.9v-2.7C22,14.7 21.6,14.3 20.9,14.3"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M6.6,19.8H3.8c-0.9,0 -1.6,-0.7 -1.6,-1.6v-2.7c0,-0.7 -0.4,-1.1 -1.1,-1.1S0,14.7 0,15.4v2.7C0,20.3 1.7,22 3.8,22h2.8c0.7,0 1.1,-0.4 1.1,-1.1S7.3,19.8 6.6,19.8"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M1.1,7.7c0.7,0 1.1,-0.4 1.1,-1.1V3.8c0,-0.9 0.7,-1.6 1.6,-1.6h2.8c0.7,0 1.1,-0.4 1.1,-1.1S7.3,0 6.6,0H3.8C1.7,0 0,1.7 0,3.8v2.7C0,7.3 0.4,7.7 1.1,7.7"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M17,6.6h-2.2c-0.3,0 -0.6,0.2 -0.6,0.6c0,0.3 0.2,0.5 0.6,0.5H17c0.3,0 0.6,-0.2 0.6,-0.5C17.6,6.8 17.4,6.6 17,6.6"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M17,9.9h-5.5c-0.3,0 -0.6,0.2 -0.6,0.6s0.2,0.6 0.6,0.6H17c0.3,0 0.6,-0.2 0.6,-0.6S17.4,9.9 17,9.9"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M17,13.2h-6.6c-0.3,0 -0.6,0.2 -0.6,0.6s0.2,0.6 0.6,0.6H17c0.3,0 0.6,-0.2 0.6,-0.6S17.4,13.2 17,13.2"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M17,16.5H4.9c-0.3,0 -0.5,0.2 -0.5,0.5c0,0.3 0.2,0.6 0.5,0.6H17c0.3,0 0.6,-0.2 0.6,-0.6C17.6,16.7 17.4,16.5 17,16.5"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M4.4,5.5c0,0.6 0.5,1.1 1.1,1.1H7l-0.8,5.3c-0.1,0.6 0.3,1.2 0.9,1.2c0.6,0.1 1.2,-0.3 1.2,-0.9l0.8,-5.6H11c0.6,0 1.1,-0.5 1.1,-1.1S11.6,4.4 11,4.4H5.5C4.9,4.4 4.4,4.9 4.4,5.5"/>
+</vector>