Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

redesigned circled area frame

AKS Labsbb688ac807e4
diff --git a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
index 0dbf423..1b87577 100644
--- a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
@@ -37,7 +37,7 @@ import com.akslabs.circletosearch.ui.theme.CircleToSearchTheme
class OverlayActivity : ComponentActivity() {
private val screenshotBitmap = androidx.compose.runtime.mutableStateOf<android.graphics.Bitmap?>(null)
- private var copyTextManager: CopyTextOverlayManager? = null
+ private val copyTextManager = androidx.compose.runtime.mutableStateOf<CopyTextOverlayManager?>(null)
override fun onCreate(savedInstanceState: Bundle?) {
window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(0))
@@ -48,11 +48,11 @@ class OverlayActivity : ComponentActivity() {
loadScreenshot()
// Initialize manager for Activity-based layout
- copyTextManager = CopyTextOverlayManager(
+ copyTextManager.value = CopyTextOverlayManager(
context = this,
screenshotBitmap = screenshotBitmap.value
)
- CircleToSearchAccessibilityService.setCopyTextManager(copyTextManager)
+ CircleToSearchAccessibilityService.setCopyTextManager(copyTextManager.value)
setContent {
CircleToSearchTheme {
@@ -67,7 +67,7 @@ class OverlayActivity : ComponentActivity() {
BitmapRepository.clear()
finish()
},
- copyTextManager = copyTextManager,
+ copyTextManager = copyTextManager.value,
onExitCopyMode = {
// Copy Mode exited
}
@@ -82,8 +82,15 @@ class OverlayActivity : ComponentActivity() {
super.onNewIntent(intent)
android.util.Log.d("CircleToSearch", "OverlayActivity onNewIntent - Resetting state")
setIntent(intent)
- copyTextManager?.dismiss()
+ copyTextManager.value?.dismiss()
loadScreenshot()
+
+ // Recreate manager with new screenshot
+ copyTextManager.value = CopyTextOverlayManager(
+ context = this,
+ screenshotBitmap = screenshotBitmap.value
+ )
+ CircleToSearchAccessibilityService.setCopyTextManager(copyTextManager.value)
}
private fun loadScreenshot() {
@@ -98,8 +105,8 @@ class OverlayActivity : ComponentActivity() {
override fun onDestroy() {
super.onDestroy()
- copyTextManager?.dismiss()
- copyTextManager = null
+ copyTextManager.value?.dismiss()
+ copyTextManager.value = null
if (isFinishing) {
BitmapRepository.clear()
}
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 3854386..971e01e 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
@@ -855,7 +855,7 @@ fun CircleToSearchScreen(
color = Color.Transparent,
topLeft = holeRect.topLeft,
size = holeRect.size,
- cornerRadius = CornerRadius(32f),
+ cornerRadius = CornerRadius(48f),
blendMode = androidx.compose.ui.graphics.BlendMode.Clear
)
}
@@ -978,8 +978,8 @@ fun CircleToSearchScreen(
val width = right - left
val height = bottom - top
- val cornerRadius = 64f // Increased radius for rounder look
- val armLength = min(width, height) * 0.2f // Length of the straight part
+ val cornerRadius = 48f // Slightly smaller radius
+ val armLength = min(width, height) * 0.15f // Slightly shorter arms
// Top Left
val tlPath = Path().apply {
@@ -1033,10 +1033,9 @@ fun CircleToSearchScreen(
val bracketAlpha = progress
val bracketStroke = Stroke(width = 12f, cap = StrokeCap.Round, join = StrokeJoin.Round)
- // Draw Brackets with Glow
+ // Draw Brackets (Solid White)
listOf(tlPath, trPath, brPath, blPath).forEach { p ->
drawPath(p, Color.White, style = bracketStroke, alpha = bracketAlpha)
- drawPath(p, Brush.linearGradient(OverlayGradientColors), style = Stroke(width = 20f, cap = StrokeCap.Round), alpha = bracketAlpha * 0.5f)
}
// Optional: Flash effect inside
@@ -1044,7 +1043,7 @@ fun CircleToSearchScreen(
color = Color.White,
topLeft = Offset(left, top),
size = Size(width, height),
- cornerRadius = CornerRadius(32f),
+ cornerRadius = CornerRadius(48f),
style = Stroke(width = 4f),
alpha = (1f - progress) * 0.5f
)
@@ -1078,18 +1077,21 @@ fun CircleToSearchScreen(
onClick = {
if (selectedBitmap != null) {
scope.launch {
- try {
- val path = ImageUtils.saveBitmap(context, selectedBitmap!!)
- val uri = androidx.core.content.FileProvider.getUriForFile(context, "com.akslabs.circletosearch.fileprovider", java.io.File(path))
+ try { val fileName = "selection_${java.util.UUID.randomUUID()}.png"
+ val path = ImageUtils.saveBitmap(context, selectedBitmap!!, fileName)
+ val file = java.io.File(path)
+ val uri = androidx.core.content.FileProvider.getUriForFile(context, "com.akslabs.circletosearch.fileprovider", file)
val shareIntent = android.content.Intent(android.content.Intent.ACTION_SEND).apply {
- type = "image/*"
+ type = "image/png"
putExtra(android.content.Intent.EXTRA_STREAM, uri)
+ clipData = android.content.ClipData.newRawUri("Selection", uri)
addFlags(android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION)
addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(android.content.Intent.createChooser(shareIntent, "Share Selection").apply {
addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
})
+
} catch (e: Exception) {
android.util.Log.e("CircleToSearch", "Failed to share selection", e)
}
@@ -1462,9 +1464,17 @@ fun CircleToSearchScreen(
if (screenshot != null) {
scope.launch {
try {
- val path = ImageUtils.saveBitmap(context, selectedBitmap ?: screenshot)
- val uri = androidx.core.content.FileProvider.getUriForFile(context, "com.akslabs.circletosearch.fileprovider", java.io.File(path))
- val shareIntent = android.content.Intent(android.content.Intent.ACTION_SEND).apply { type = "image/*"; putExtra(android.content.Intent.EXTRA_STREAM, uri); addFlags(android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION); addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) }
+ val fileName = "share_${java.util.UUID.randomUUID()}.png"
+ val path = ImageUtils.saveBitmap(context, selectedBitmap ?: screenshot, fileName)
+ val file = java.io.File(path)
+ val uri = androidx.core.content.FileProvider.getUriForFile(context, "com.akslabs.circletosearch.fileprovider", file)
+ val shareIntent = android.content.Intent(android.content.Intent.ACTION_SEND).apply {
+ type = "image/png"
+ putExtra(android.content.Intent.EXTRA_STREAM, uri)
+ clipData = android.content.ClipData.newRawUri("Selection", uri)
+ addFlags(android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
+ }
context.startActivity(android.content.Intent.createChooser(shareIntent, "Share Image").apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) })
} catch (e: Exception) {}
}
diff --git a/app/src/main/java/com/akslabs/circletosearch/utils/ImageUtils.kt b/app/src/main/java/com/akslabs/circletosearch/utils/ImageUtils.kt
index 198af5b..8950f0d 100644
--- a/app/src/main/java/com/akslabs/circletosearch/utils/ImageUtils.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/utils/ImageUtils.kt
@@ -29,8 +29,8 @@ import java.io.FileOutputStream
object ImageUtils {
private const val SCREENSHOT_FILENAME = "screenshot.png"
- fun saveBitmap(context: Context, bitmap: Bitmap): String {
- val file = File(context.cacheDir, SCREENSHOT_FILENAME)
+ fun saveBitmap(context: Context, bitmap: Bitmap, fileName: String = SCREENSHOT_FILENAME): String {
+ val file = File(context.cacheDir, fileName)
FileOutputStream(file).use { out ->
bitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
}
diff --git a/build_errors_24.txt b/build_errors_24.txt
new file mode 100644
index 0000000..9e5fa2a
Binary files /dev/null and b/build_errors_24.txt differ