Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

fixed google lens not launching issue even when search method shows google lens

AKS Labs299a6732e6d2
diff --git a/.gitignore b/.gitignore
index 4e4d488..5075954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
.cxx
local.properties
C:\Users\ashin\AndroidStudioProjects\CircleToSearch\builderors.md
+C:\Users\ashin\AndroidStudioProjects\CircleToSearch\logs.md
# Android build outputs
*.apk
*.aab
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b2c751a..b7b9c5a 100644
Binary files a/.idea/misc.xml and b/.idea/misc.xml differ
diff --git a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt
index 0c37c6b..fdbc71e 100644
--- a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt
@@ -508,17 +508,17 @@ class CircleToSearchAccessibilityService : AccessibilityService() {
}
}
}
+ ActionType.CTS_AUTO -> {
+ // Respect Global Preference
+ performCapture(null)
+ }
ActionType.CTS_LENS -> {
- // Force Lens Mode
- val uiPrefs = com.akslabs.circletosearch.utils.UIPreferences(this)
- uiPrefs.setUseGoogleLensOnly(true)
- performCapture()
+ // Force Lens Mode for this session only
+ performCapture(true)
}
ActionType.CTS_MULTI -> {
- // Force Multi Mode
- val uiPrefs = com.akslabs.circletosearch.utils.UIPreferences(this)
- uiPrefs.setUseGoogleLensOnly(false)
- performCapture()
+ // Force Multi Mode for this session only
+ performCapture(false)
}
ActionType.SPLIT_SCREEN -> {
val success = performGlobalAction(GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN)
@@ -684,7 +684,7 @@ class CircleToSearchAccessibilityService : AccessibilityService() {
}
}
- private fun performCapture() {
+ private fun performCapture(searchModeOverride: Boolean? = null) {
android.util.Log.d("CircleToSearch", "performCapture called. hasWindowManager=${windowManager != null}")
// Clear repository at the source to prevent any "ghost" flash of old data
@@ -718,7 +718,7 @@ class CircleToSearchAccessibilityService : AccessibilityService() {
BitmapRepository.setScreenshot(copy)
// Launch Overlay Immediately
- launchOverlay()
+ launchOverlay(searchModeOverride)
} catch (e: Exception) {
e.printStackTrace()
@@ -733,11 +733,12 @@ class CircleToSearchAccessibilityService : AccessibilityService() {
}
}
- fun launchOverlay() {
+ fun launchOverlay(searchModeOverride: Boolean? = null) {
android.util.Log.d("CircleToSearchAccess", "AccessibilityService launching OverlayActivity")
val intent = Intent(this, OverlayActivity::class.java).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION) // Disable animation for faster feel
+ searchModeOverride?.let { putExtra("EXTRA_SEARCH_MODE_OVERRIDE", it) }
}
startActivity(intent)
}
@@ -1173,7 +1174,7 @@ class CircleToSearchAccessibilityService : AccessibilityService() {
fun triggerCapture() {
android.util.Log.d("CircleToSearch", "triggerCapture static called. instance=${instance != null}")
- instance?.performCapture()
+ instance?.performCapture(null)
}
fun pinArea(bitmap: Bitmap, rect: android.graphics.Rect) {
diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
index 99018bc..1e8c0ac 100644
--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
@@ -57,7 +57,7 @@ import com.akslabs.circletosearch.ui.theme.CircleToSearchTheme
import com.akslabs.circletosearch.utils.PrivacyPreferences
import com.akslabs.circletosearch.ui.components.DonateBottomSheet
import com.akslabs.circletosearch.ui.components.AccessibilityDisclosureDialog
-import com.akslabs.circletosearch.ui.components.SearchMethodSelector
+import com.akslabs.circletosearch.ui.components.UnifiedSearchMethodSelector
import kotlinx.coroutines.launch
class MainActivity : ComponentActivity() {
@@ -352,7 +352,6 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {
BubbleSwitch(context)
val uiPreferences = remember { com.akslabs.circletosearch.utils.UIPreferences(context) }
- var isLensOnly by remember { mutableStateOf(uiPreferences.isUseGoogleLensOnly()) }
Column(
modifier = Modifier
@@ -362,12 +361,8 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {
.background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f))
.padding(16.dp)
) {
- SearchMethodSelector(
- isLensOnly = isLensOnly,
- onMethodChange = {
- isLensOnly = it
- uiPreferences.setUseGoogleLensOnly(it)
- }
+ UnifiedSearchMethodSelector(
+ uiPreferences = uiPreferences
)
Spacer(modifier = Modifier.height(12.dp))
diff --git a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
index 14424bd..afd5d02 100644
--- a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
@@ -38,6 +38,7 @@ class OverlayActivity : ComponentActivity() {
private val screenshotBitmap = androidx.compose.runtime.mutableStateOf<android.graphics.Bitmap?>(null)
private val copyTextManager = androidx.compose.runtime.mutableStateOf<CopyTextOverlayManager?>(null)
+ private val searchModeOverride = androidx.compose.runtime.mutableStateOf<Boolean?>(null)
override fun onCreate(savedInstanceState: Bundle?) {
window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(0))
@@ -50,6 +51,7 @@ class OverlayActivity : ComponentActivity() {
window.addFlags(android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN)
loadScreenshot()
+ updateOverride(intent)
// Initialize manager for Activity-based layout
copyTextManager.value = CopyTextOverlayManager(
@@ -67,6 +69,7 @@ class OverlayActivity : ComponentActivity() {
) {
CircleToSearchScreen(
screenshot = screenshotBitmap.value,
+ searchModeOverride = searchModeOverride.value,
onClose = {
BitmapRepository.clear()
com.akslabs.circletosearch.data.AssistDataRepository.clear()
@@ -92,8 +95,10 @@ class OverlayActivity : ComponentActivity() {
screenshotBitmap.value = null
copyTextManager.value?.dismiss()
copyTextManager.value = null
+ searchModeOverride.value = null
loadScreenshot()
+ updateOverride(intent)
// Recreate manager with new screenshot
copyTextManager.value = CopyTextOverlayManager(
@@ -103,6 +108,14 @@ class OverlayActivity : ComponentActivity() {
CircleToSearchAccessibilityService.setCopyTextManager(copyTextManager.value)
}
+ private fun updateOverride(intent: android.content.Intent) {
+ if (intent.hasExtra("EXTRA_SEARCH_MODE_OVERRIDE")) {
+ searchModeOverride.value = intent.getBooleanExtra("EXTRA_SEARCH_MODE_OVERRIDE", false)
+ } else {
+ searchModeOverride.value = null
+ }
+ }
+
private fun loadScreenshot() {
val bitmap = BitmapRepository.getScreenshot()
if (bitmap != null) {
diff --git a/app/src/main/java/com/akslabs/circletosearch/data/OverlayConfig.kt b/app/src/main/java/com/akslabs/circletosearch/data/OverlayConfig.kt
index 37f63bb..b627e12 100644
--- a/app/src/main/java/com/akslabs/circletosearch/data/OverlayConfig.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/data/OverlayConfig.kt
@@ -22,7 +22,7 @@ data class OverlaySegment(
@SerializedName("height") val height: Int = 60, // Pixels
@SerializedName("xOffset") val xOffset: Int = 0, // Pixels from left
@SerializedName("yOffset") val yOffset: Int = 0, // Pixels from top
- @SerializedName("gestures") val gestures: MutableMap<GestureType, ActionType> = mutableMapOf(GestureType.DOUBLE_TAP to ActionType.CTS_MULTI),
+ @SerializedName("gestures") val gestures: MutableMap<GestureType, ActionType> = mutableMapOf(GestureType.DOUBLE_TAP to ActionType.CTS_AUTO),
@SerializedName("gestureData") val gestureData: MutableMap<GestureType, String> = mutableMapOf() // Stores extra data like package name for OPEN_APP
)
@@ -46,6 +46,7 @@ enum class ActionType {
LOCK_SCREEN,
OPEN_NOTIFICATIONS,
OPEN_QUICK_SETTINGS,
+ CTS_AUTO,
CTS_LENS,
CTS_MULTI,
SPLIT_SCREEN,
@@ -69,8 +70,9 @@ fun ActionType.getFriendlyName(): String = when (this) {
ActionType.LOCK_SCREEN -> "Lock Screen"
ActionType.OPEN_NOTIFICATIONS -> "Open Notifications"
ActionType.OPEN_QUICK_SETTINGS -> "Quick Settings"
- ActionType.CTS_LENS -> "Google Lens Search"
- ActionType.CTS_MULTI -> "Multi-Search (All Search Engines)"
+ ActionType.CTS_AUTO -> "Circle to Search (Follow Settings)"
+ ActionType.CTS_LENS -> "Google Lens Search (Override)"
+ ActionType.CTS_MULTI -> "Multi-Search (Override)"
ActionType.SPLIT_SCREEN -> "Split Screen"
ActionType.OPEN_APP -> "Open Application"
ActionType.SCROLL_TOP -> "Scroll to Top"
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 1abc127..9b023cf 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
@@ -188,6 +188,7 @@ import androidx.compose.material3.Surface
fun CircleToSearchScreen(
screenshot: Bitmap?,
onClose: () -> Unit,
+ searchModeOverride: Boolean? = null,
copyTextManager: com.akslabs.circletosearch.ui.components.CopyTextOverlayManager? = null,
onCopyText: () -> Unit = {},
onExitCopyMode: () -> Unit = {}
@@ -198,6 +199,16 @@ fun CircleToSearchScreen(
// Initialize preferences
val uiPreferences = remember { UIPreferences(context) }
+ // Reactive search method state — observed via flow so it is always in sync
+ // with whatever set it (home screen, settings sheet, or accessibility actions).
+ // Reading from the flow avoids the SharedPreferences in-memory cache lag
+ // that occurs when a write comes from a different activity instance.
+ val isGoogleLensOnly by uiPreferences.observeUseGoogleLensOnly()
+ .collectAsState(initial = uiPreferences.isUseGoogleLensOnly())
+
+ // Effective state: use override if provided by trigger, else use global preference
+ val effectiveLensOnly = searchModeOverride ?: isGoogleLensOnly
+
// New Sheet States
var showMoreAppsSheet by remember { mutableStateOf(false) }
@@ -635,8 +646,12 @@ fun CircleToSearchScreen(
if (selectedBitmap != null) {
isLoading = true
+ val effectiveLensOnly = searchModeOverride ?: isGoogleLensOnly
+
// 1. Google Lens Only Mode Check
- if (uiPreferences.isUseGoogleLensOnly()) {
+ // Use the reactive state (not a direct pref read) so we always
+ // get the value that was last committed, even from another activity.
+ if (effectiveLensOnly) {
// Save to cache and launch Lens
val path = ImageUtils.saveBitmap(context, selectedBitmap!!)
val uri = android.net.Uri.fromFile(java.io.File(path))
@@ -1424,9 +1439,13 @@ fun CircleToSearchScreen(
IconButton(
onClick = {
haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
- uiPreferences.setUseGoogleLensOnly(true)
if (screenshot != null) {
- selectedBitmap = screenshot
+ // Trigger Lens directly as this is the explicit Lens button
+ // but do NOT change the global preference.
+ val path = ImageUtils.saveBitmap(context, screenshot)
+ val uri = android.net.Uri.fromFile(java.io.File(path))
+ searchWithGoogleLens(uri, context)
+ onClose()
}
},
modifier = Modifier.size(44.dp)
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/OverlaySettingsScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/OverlaySettingsScreen.kt
index 0e1554f..f8a708e 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/OverlaySettingsScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/OverlaySettingsScreen.kt
@@ -518,6 +518,7 @@ fun getActionIcon(action: ActionType): ImageVector = when (action) {
ActionType.SCROLL_TOP -> Icons.Default.VerticalAlignTop
ActionType.SCROLL_BOTTOM -> Icons.Default.VerticalAlignBottom
ActionType.SCREEN_OFF -> Icons.Default.PowerSettingsNew
+ ActionType.CTS_AUTO -> Icons.Default.SettingsSuggest
ActionType.TOGGLE_AUTO_ROTATE -> Icons.Default.ScreenRotation
ActionType.MEDIA_PLAY_PAUSE -> Icons.Default.PlayArrow
ActionType.MEDIA_NEXT -> Icons.Default.SkipNext
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt
index 17ebadb..2a0091d 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt
@@ -41,7 +41,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.akslabs.circletosearch.data.SearchEngine
import com.akslabs.circletosearch.utils.UIPreferences
-import com.akslabs.circletosearch.ui.components.SearchMethodSelector
+import com.akslabs.circletosearch.ui.components.UnifiedSearchMethodSelector
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -52,7 +52,6 @@ fun SettingsScreen(
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
var showFriendlyMessages by remember { mutableStateOf(uiPreferences.isShowFriendlyMessages()) }
- var useGoogleLensOnly by remember { mutableStateOf(uiPreferences.isUseGoogleLensOnly()) }
val initialOrderString = uiPreferences.getSearchEngineOrder()
val allEngines = SearchEngine.values()
@@ -77,10 +76,6 @@ fun SettingsScreen(
uiPreferences.setShowFriendlyMessages(showFriendlyMessages)
}
- LaunchedEffect(useGoogleLensOnly) {
- uiPreferences.setUseGoogleLensOnly(useGoogleLensOnly)
- }
-
LaunchedEffect(engineOrder.toList()) {
uiPreferences.setSearchEngineOrder(engineOrder.joinToString(",") { it.name })
}
@@ -122,14 +117,7 @@ fun SettingsScreen(
Spacer(modifier = Modifier.height(16.dp))
- // Search Method Selector
- SearchMethodSelector(
- isLensOnly = useGoogleLensOnly,
- onMethodChange = {
- useGoogleLensOnly = it
- uiPreferences.setUseGoogleLensOnly(it)
- }
- )
+ UnifiedSearchMethodSelector(uiPreferences = uiPreferences)
Spacer(modifier = Modifier.height(24.dp))
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/components/SearchMethodSelector.kt b/app/src/main/java/com/akslabs/circletosearch/ui/components/SearchMethodSelector.kt
index 77ba5eb..178efa3 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/components/SearchMethodSelector.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/components/SearchMethodSelector.kt
@@ -10,11 +10,14 @@ import androidx.compose.material.icons.filled.AutoFixHigh
import androidx.compose.material.icons.filled.ManageSearch
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
+import com.akslabs.circletosearch.utils.UIPreferences
/**
* A unified search method selector component that allows users to switch
@@ -84,3 +87,32 @@ fun SearchMethodSelector(
}
}
}
+
+/**
+ * A reactive wrapper for SearchMethodSelector that observes UIPreferences.
+ * Uses the flow as the single source of truth so that all instances
+ * (Home screen and Settings sheet) are always synchronized.
+ */
+@Composable
+fun UnifiedSearchMethodSelector(
+ uiPreferences: UIPreferences,
+ modifier: Modifier = Modifier
+) {
+ // The flow IS the state — one reactive source drives both Home and Settings.
+ // Writing via setUseGoogleLensOnly() triggers the SharedPreferences listener,
+ // which emits into this flow, which recomposes this composable instantly.
+ val isLensOnly by uiPreferences.observeUseGoogleLensOnly().collectAsState(
+ initial = uiPreferences.isUseGoogleLensOnly()
+ )
+
+ SearchMethodSelector(
+ isLensOnly = isLensOnly,
+ onMethodChange = { newValue ->
+ // commit() ensures the write is synchronous so the accessibility
+ // service and CircleToSearchScreen both read the updated value
+ // before the search is triggered.
+ uiPreferences.setUseGoogleLensOnly(newValue)
+ },
+ modifier = modifier
+ )
+}
diff --git a/app/src/main/java/com/akslabs/circletosearch/utils/UIPreferences.kt b/app/src/main/java/com/akslabs/circletosearch/utils/UIPreferences.kt
index 782c3b5..f06c2e8 100644
--- a/app/src/main/java/com/akslabs/circletosearch/utils/UIPreferences.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/utils/UIPreferences.kt
@@ -21,9 +21,12 @@ package com.akslabs.circletosearch.utils
import android.content.Context
import android.content.SharedPreferences
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.channels.awaitClose
class UIPreferences(context: Context) {
- private val prefs: SharedPreferences = context.getSharedPreferences("ui_prefs", Context.MODE_PRIVATE)
+ private val prefs: SharedPreferences = context.applicationContext.getSharedPreferences("ui_prefs", Context.MODE_PRIVATE)
companion object {
private const val KEY_DESKTOP_MODE = "is_desktop_mode"
@@ -34,12 +37,26 @@ class UIPreferences(context: Context) {
private const val KEY_USE_GOOGLE_LENS_ONLY = "use_google_lens_only"
}
+ fun observeUseGoogleLensOnly(): Flow<Boolean> = callbackFlow {
+ val listener = SharedPreferences.OnSharedPreferenceChangeListener { prefs, key ->
+ if (key == KEY_USE_GOOGLE_LENS_ONLY) {
+ trySend(prefs.getBoolean(KEY_USE_GOOGLE_LENS_ONLY, false))
+ }
+ }
+ prefs.registerOnSharedPreferenceChangeListener(listener)
+ // Keep a strong reference to the listener as long as the flow is active
+ trySend(isUseGoogleLensOnly())
+ awaitClose {
+ prefs.unregisterOnSharedPreferenceChangeListener(listener)
+ }
+ }
+
fun isUseGoogleLensOnly(): Boolean {
return prefs.getBoolean(KEY_USE_GOOGLE_LENS_ONLY, false)
}
fun setUseGoogleLensOnly(isEnabled: Boolean) {
- prefs.edit().putBoolean(KEY_USE_GOOGLE_LENS_ONLY, isEnabled).apply()
+ prefs.edit().putBoolean(KEY_USE_GOOGLE_LENS_ONLY, isEnabled).commit()
}
fun isDesktopMode(): Boolean {
diff --git a/logs.md b/logs.md
new file mode 100644
index 0000000..e69de29