Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

made bottom toolbar dragable

AKS Labs329abe9eaadc
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 ec1e905..4e2da12 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ocr/TesseractEngine.kt
@@ -60,14 +60,7 @@ object TesseractEngine {
return@withContext emptyList()
}
- val scale = 2f
- val scaledBitmap = Bitmap.createScaledBitmap(
- bitmap,
- (bitmap.width * scale).toInt(),
- (bitmap.height * scale).toInt(),
- true
- )
- tess.setImage(scaledBitmap)
+ tess.setImage(bitmap)
// CRITICAL: We MUST call getUTF8Text() (or other recognition trigger) before accessing the iterator.
// Otherwise, resultIterator will be null or empty.
@@ -76,7 +69,6 @@ object TesseractEngine {
val iterator = tess.resultIterator ?: run {
Log.e(TAG, "ResultIterator is null after recognition!")
- scaledBitmap.recycle()
tess.recycle()
return@withContext emptyList()
}
@@ -100,14 +92,7 @@ object TesseractEngine {
if (wRect.isEmpty || wRect.width() < 2) continue
- // Scale bounds back to original size
- val wordBounds = android.graphics.RectF(
- wRect.left / scale,
- wRect.top / scale,
- wRect.right / scale,
- wRect.bottom / scale
- )
-
+ val wordBounds = android.graphics.RectF(wRect)
val wordObj = Word(
text = wordText,
index = allDetectedWords.size,
@@ -121,8 +106,6 @@ object TesseractEngine {
} while (iterator.next(TessBaseAPI.PageIteratorLevel.RIL_WORD))
- scaledBitmap.recycle()
-
// Group words into lines based on Y-overlap for better UI grouping
val sortedWords = allDetectedWords.sortedBy { it.bounds.top }
val lines = mutableListOf<MutableList<Word>>()
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 13cfd59..55ea270 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
@@ -357,6 +357,7 @@ class CopyTextOverlayManager(
private var dragHandleType = 0 // 0=none, 1=start, 2=end
private var toolbarButtons: List<ToolbarButton> = emptyList()
private var toolbarRect = RectF()
+ private var dragHandleRect = RectF()
private var toolbarOffsetX = 0f
private var toolbarOffsetY = 0f
private var isDraggingToolbar = false
@@ -477,7 +478,8 @@ class CopyTextOverlayManager(
toolbarActionPaint.textSize = 30f // Slightly smaller
val labelWidths = buttonLabels.map { toolbarActionPaint.measureText(it) + btnPadding * 2 }
- val totalWidth = labelWidths.sum() + (buttonLabels.size - 1) * btnSpacing + m * 2
+ val dragHandleWidth = 24f * density
+ val totalWidth = labelWidths.sum() + (buttonLabels.size - 1) * btnSpacing + m * 2 + dragHandleWidth + btnSpacing
val tx = ((width - totalWidth) / 2) + toolbarOffsetX
@@ -501,7 +503,28 @@ class CopyTextOverlayManager(
canvas.drawRoundRect(toolbarRect, 22f * density, 22f * density, shadowPaint)
canvas.drawRoundRect(toolbarRect, 22f * density, 22f * density, toolbarBgPaint.apply { color = dynamicSurface })
- var currentX = tx + m
+ // Draw dedicated drag handle (M3 style bar)
+ val dx = tx + m
+ dragHandleRect.set(dx, ty + m, dx + dragHandleWidth, ty + m + btnHeight)
+
+ val handleBarColor = try {
+ context.getColor(android.R.color.system_outline_variant_light)
+ } catch(e: Exception) { Color.LTGRAY }
+
+ val hPaint = Paint(toolbarActionPaint).apply {
+ color = handleBarColor
+ style = Paint.Style.FILL
+ }
+ // Draw a vertical pill for dragging
+ canvas.drawRoundRect(
+ dx + 8f * density,
+ ty + m + 8f * density,
+ dx + 16f * density,
+ ty + m + btnHeight - 8f * density,
+ 4f * density, 4f * density, hPaint
+ )
+
+ var currentX = tx + m + dragHandleWidth + btnSpacing
val newButtons = mutableListOf<ToolbarButton>()
buttonLabels.forEachIndexed { i, label ->
@@ -557,8 +580,8 @@ class CopyTextOverlayManager(
}
}
- // 2. Check toolbar background dragging
- if (toolbarRect.contains(lx, ly)) {
+ // 2. Check dedicated drag handle ONLY
+ if (dragHandleRect.contains(lx, ly)) {
isDraggingToolbar = true
return true
}
diff --git a/build_errors_20.txt b/build_errors_20.txt
new file mode 100644
index 0000000..6f8fc4d
Binary files /dev/null and b/build_errors_20.txt differ
diff --git a/build_errors_21.txt b/build_errors_21.txt
new file mode 100644
index 0000000..e84c8db
Binary files /dev/null and b/build_errors_21.txt differ