CircleToSearch with multi search engine support for all android
Kotlin
added translate button to selected text toolbar
AKS Labs5fedd49ddf6d
diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.ktindex 135d3df..7981aab 100644--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt@@ -57,6 +57,7 @@ import com.akslabs.circletosearch.ui.theme.CircleToSearchThemeimport com.akslabs.circletosearch.utils.PrivacyPreferencesimport com.akslabs.circletosearch.ui.components.DonateBottomSheetimport com.akslabs.circletosearch.ui.components.AccessibilityDisclosureDialog+import com.akslabs.circletosearch.ui.components.SearchMethodSelectorimport kotlinx.coroutines.launchclass MainActivity : ComponentActivity() {@@ -349,7 +350,18 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {modifier = Modifier.align(Alignment.Start))BubbleSwitch(context)- LensOnlySwitch(context)++ val uiPreferences = remember { com.akslabs.circletosearch.utils.UIPreferences(context) }+ var isLensOnly by remember { mutableStateOf(uiPreferences.isUseGoogleLensOnly()) }++ SearchMethodSelector(+ isLensOnly = isLensOnly,+ onMethodChange = {+ isLensOnly = it+ uiPreferences.setUseGoogleLensOnly(it)+ },+ modifier = Modifier.padding(top = 16.dp)+ )ListItem(headlineContent = { Text("OCR Language Settings") },@@ -752,71 +764,3 @@ fun BubbleSwitch(context: android.content.Context) {)}-@OptIn(ExperimentalMaterial3Api::class)-@Composable-fun LensOnlySwitch(context: android.content.Context) {- val uiPreferences = remember { com.akslabs.circletosearch.utils.UIPreferences(context) }- var isLensOnlyEnabled by remember { mutableStateOf(uiPreferences.isUseGoogleLensOnly()) }-- Column(- modifier = Modifier- .fillMaxWidth()- .clip(androidx.compose.foundation.shape.RoundedCornerShape(20.dp))- .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f))- .padding(16.dp)- ) {- Text(- text = "Search Method",- style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),- color = MaterialTheme.colorScheme.onSurface,- modifier = Modifier.padding(bottom = 12.dp)- )-- SingleChoiceSegmentedButtonRow(- modifier = Modifier.fillMaxWidth()- ) {- SegmentedButton(- shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2),- onClick = {- isLensOnlyEnabled = false- uiPreferences.setUseGoogleLensOnly(false)- },- selected = !isLensOnlyEnabled,- icon = { SegmentedButtonDefaults.Icon(!isLensOnlyEnabled) }- ) {- Text("Multi-Search Engines", style = MaterialTheme.typography.labelLarge)- }- SegmentedButton(- shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2),- onClick = {- isLensOnlyEnabled = true- uiPreferences.setUseGoogleLensOnly(true)- },- selected = isLensOnlyEnabled,- icon = { SegmentedButtonDefaults.Icon(isLensOnlyEnabled) }- ) {- Text("Google Lens", style = MaterialTheme.typography.labelLarge)- }- }-- Spacer(modifier = Modifier.height(8.dp))-- Row(- verticalAlignment = Alignment.CenterVertically,- modifier = Modifier.padding(top = 8.dp)- ) {- Icon(- imageVector = Icons.Default.Info,- contentDescription = null,- tint = MaterialTheme.colorScheme.secondary,- modifier = Modifier.size(16.dp)- )- Spacer(modifier = Modifier.width(8.dp))- Text(- text = "Lens needs Google App Installed. But Degoogled friends can stick with the versatile Multi-Search Engine mode.",- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onSurfaceVariant- )- }- }-}diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.ktindex 2760010..44348e5 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt@@ -1494,31 +1494,49 @@ fun CircleToSearchScreen(Row(modifier = Modifier.fillMaxWidth()- .padding(horizontal = 4.dp),+ .padding(horizontal = 0.dp), // Maximize space for labelshorizontalArrangement = Arrangement.Center,verticalAlignment = Alignment.Bottom) {@Composable- fun BottomBarButton(label: String, icon: @Composable () -> Unit, onClick: () -> Unit) {+ fun BottomBarButton(+ label: String,+ icon: @Composable () -> Unit,+ enabled: Boolean = true,+ onClick: () -> Unit+ ) {Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.BottomCenter) {- Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) {+ Column(horizontalAlignment = Alignment.CenterHorizontally) {FilledTonalIconButton(- onClick = { haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress); onClick() },+ onClick = {+ haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)+ onClick()+ },+ enabled = enabled,modifier = Modifier.size(48.dp),colors = IconButtonDefaults.filledTonalIconButtonColors(containerColor = MaterialTheme.colorScheme.surfaceContainer,- contentColor = MaterialTheme.colorScheme.onSurface+ contentColor = if (enabled) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f),+ disabledContainerColor = MaterialTheme.colorScheme.surfaceContainer,+ disabledContentColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f))) { icon() }++ Spacer(modifier = Modifier.height(4.dp))+Text(text = label,- style = MaterialTheme.typography.labelSmall.copy(fontSize = 11.sp, lineHeight = 13.sp),- color = MaterialTheme.colorScheme.onSurfaceVariant,+ style = MaterialTheme.typography.labelSmall.copy(+ fontSize = 10.5.sp,+ lineHeight = 12.sp,+ letterSpacing = (-0.4).sp,+ fontWeight = FontWeight.Medium+ ),+ color = if (enabled) MaterialTheme.colorScheme.onSurfaceVariant else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.38f),textAlign = TextAlign.Center,maxLines = 1,- minLines = 1,overflow = TextOverflow.Visible,- modifier = Modifier.padding(bottom = 0.dp)+ modifier = Modifier.padding(horizontal = 0.dp))}}@@ -1531,42 +1549,14 @@ fun CircleToSearchScreen(// Pinval isPinEnabled = selectedBitmap != null- Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.BottomCenter) {- Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) {- FilledTonalIconButton(- onClick = {- if (isPinEnabled) {- haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)- selectedBitmap?.let { bmp ->- CircleToSearchAccessibilityService.pinArea(bmp, selectionRect ?: android.graphics.Rect())- (context as? android.app.Activity)?.finish()- }- }- },- modifier = Modifier.size(48.dp),- colors = IconButtonDefaults.filledTonalIconButtonColors(- containerColor = MaterialTheme.colorScheme.surfaceContainer,- contentColor = if (isPinEnabled) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f),- disabledContainerColor = MaterialTheme.colorScheme.surfaceContainer,- disabledContentColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)- )- ) {- Icon(- Icons.Default.PushPin,- contentDescription = "Pin Selection",- modifier = Modifier.size(22.dp)- )- }- Text(- text = "Pin",- style = MaterialTheme.typography.labelSmall.copy(fontSize = 11.sp, lineHeight = 13.sp),- color = if (isPinEnabled) MaterialTheme.colorScheme.onSurfaceVariant else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.38f),- textAlign = TextAlign.Center,- maxLines = 1,- minLines = 1,- overflow = TextOverflow.Ellipsis,- modifier = Modifier.padding(bottom = 0.dp)- )+ BottomBarButton(+ label = "Pin",+ icon = { Icon(Icons.Default.PushPin, contentDescription = null, modifier = Modifier.size(22.dp)) },+ enabled = isPinEnabled+ ) {+ selectedBitmap?.let { bmp ->+ CircleToSearchAccessibilityService.pinArea(bmp, selectionRect ?: android.graphics.Rect())+ (context as? android.app.Activity)?.finish()}}diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.ktindex a57a8ee..17ebadb 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt@@ -41,6 +41,7 @@ import androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport com.akslabs.circletosearch.data.SearchEngineimport com.akslabs.circletosearch.utils.UIPreferences+import com.akslabs.circletosearch.ui.components.SearchMethodSelector@OptIn(ExperimentalMaterial3Api::class)@Composable@@ -121,13 +122,16 @@ fun SettingsScreen(Spacer(modifier = Modifier.height(16.dp))- // Search Method Section+ // Search Method SelectorSearchMethodSelector(isLensOnly = useGoogleLensOnly,- onMethodChange = { useGoogleLensOnly = it }+ onMethodChange = {+ useGoogleLensOnly = it+ uiPreferences.setUseGoogleLensOnly(it)+ })- Spacer(modifier = Modifier.height(12.dp))+ Spacer(modifier = Modifier.height(24.dp))// Explanatory NoteSurface(@@ -320,58 +324,3 @@ fun EngineOrderItem(}}}-@OptIn(ExperimentalMaterial3Api::class)-@Composable-fun SearchMethodSelector(- isLensOnly: Boolean,- onMethodChange: (Boolean) -> Unit-) {- Column {- Text(- text = "SEARCH METHOD",- style = MaterialTheme.typography.labelLarge.copy(- fontWeight = FontWeight.Bold,- letterSpacing = 1.sp- ),- color = MaterialTheme.colorScheme.primary,- modifier = Modifier.padding(bottom = 12.dp)- )-- SingleChoiceSegmentedButtonRow(- modifier = Modifier.fillMaxWidth()- ) {- SegmentedButton(- shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2),- onClick = { onMethodChange(false) },- selected = !isLensOnly,- icon = { SegmentedButtonDefaults.Icon(!isLensOnly) },- colors = SegmentedButtonDefaults.colors(- activeContainerColor = MaterialTheme.colorScheme.primaryContainer,- activeContentColor = MaterialTheme.colorScheme.onPrimaryContainer- )- ) {- Row(verticalAlignment = Alignment.CenterVertically) {- Icon(Icons.Default.ManageSearch, contentDescription = null, modifier = Modifier.size(18.dp))- Spacer(modifier = Modifier.width(8.dp))- Text("Multi-Search", style = MaterialTheme.typography.labelLarge)- }- }- SegmentedButton(- shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2),- onClick = { onMethodChange(true) },- selected = isLensOnly,- icon = { SegmentedButtonDefaults.Icon(isLensOnly) },- colors = SegmentedButtonDefaults.colors(- activeContainerColor = MaterialTheme.colorScheme.primaryContainer,- activeContentColor = MaterialTheme.colorScheme.onPrimaryContainer- )- ) {- Row(verticalAlignment = Alignment.CenterVertically) {- Icon(Icons.Default.AutoFixHigh, contentDescription = null, modifier = Modifier.size(18.dp))- Spacer(modifier = Modifier.width(8.dp))- Text("Google Lens", style = MaterialTheme.typography.labelLarge)- }- }- }- }-}diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/components/BottomSheets.kt b/app/src/main/java/com/akslabs/circletosearch/ui/components/BottomSheets.ktindex 08d40ab..e669ed9 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/components/BottomSheets.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/components/BottomSheets.kt@@ -183,7 +183,7 @@ fun MoreAppsBottomSheet(Box(modifier = Modifier.fillMaxWidth()- .height(160.dp)+ .wrapContentHeight().background(Brush.verticalGradient(colors = listOf(@@ -191,7 +191,8 @@ fun MoreAppsBottomSheet(MaterialTheme.colorScheme.surface))- ),+ )+ .padding(vertical = 28.dp, horizontal = 16.dp),contentAlignment = Alignment.Center) {Column(@@ -200,10 +201,10 @@ fun MoreAppsBottomSheet(Icon(imageVector = Icons.Default.Apps,contentDescription = null,- modifier = Modifier.size(56.dp),+ modifier = Modifier.size(48.dp),tint = MaterialTheme.colorScheme.primary)- Spacer(modifier = Modifier.height(12.dp))+ Spacer(modifier = Modifier.height(10.dp))Text(text = "More Apps by AKS-Labs",style = MaterialTheme.typography.headlineSmall,@@ -316,7 +317,7 @@ fun DonateBottomSheet(Box(modifier = Modifier.fillMaxWidth()- .height(160.dp)+ .wrapContentHeight().background(Brush.verticalGradient(colors = listOf(@@ -324,7 +325,8 @@ fun DonateBottomSheet(MaterialTheme.colorScheme.surface))- ),+ )+ .padding(vertical = 28.dp, horizontal = 16.dp),contentAlignment = Alignment.Center) {Column(@@ -333,10 +335,10 @@ fun DonateBottomSheet(Icon(painter = painterResource(id = R.drawable.donation),contentDescription = null,- modifier = Modifier.size(56.dp),+ modifier = Modifier.size(48.dp),tint = MaterialTheme.colorScheme.primary)- Spacer(modifier = Modifier.height(12.dp))+ Spacer(modifier = Modifier.height(10.dp))Text(text = "Support Our Work",style = MaterialTheme.typography.headlineSmall,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.ktnew file mode 100644index 0000000..77ba5eb--- /dev/null+++ b/app/src/main/java/com/akslabs/circletosearch/ui/components/SearchMethodSelector.kt@@ -0,0 +1,86 @@+/*+ * Copyright (C) 2025 AKS-Labs+ */++package com.akslabs.circletosearch.ui.components++import androidx.compose.foundation.layout.*+import androidx.compose.material.icons.Icons+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.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++/**+ * A unified search method selector component that allows users to switch+ * between Multi-Search and Google Lens modes.+ */+@OptIn(ExperimentalMaterial3Api::class)+@Composable+fun SearchMethodSelector(+ isLensOnly: Boolean,+ onMethodChange: (Boolean) -> Unit,+ modifier: Modifier = Modifier+) {+ Column(modifier = modifier) {+ Text(+ text = "SEARCH METHOD",+ style = MaterialTheme.typography.labelLarge.copy(+ fontWeight = FontWeight.Bold,+ letterSpacing = 1.sp+ ),+ color = MaterialTheme.colorScheme.primary,+ modifier = Modifier.padding(bottom = 12.dp)+ )++ SingleChoiceSegmentedButtonRow(+ modifier = Modifier.fillMaxWidth()+ ) {+ SegmentedButton(+ shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2),+ onClick = { onMethodChange(false) },+ selected = !isLensOnly,+ icon = { SegmentedButtonDefaults.Icon(!isLensOnly) },+ colors = SegmentedButtonDefaults.colors(+ activeContainerColor = MaterialTheme.colorScheme.primaryContainer,+ activeContentColor = MaterialTheme.colorScheme.onPrimaryContainer+ )+ ) {+ Row(verticalAlignment = Alignment.CenterVertically) {+ Icon(+ imageVector = Icons.Default.ManageSearch,+ contentDescription = null,+ modifier = Modifier.size(18.dp)+ )+ Spacer(modifier = Modifier.width(8.dp))+ Text("Multi-Search", style = MaterialTheme.typography.labelLarge)+ }+ }+ SegmentedButton(+ shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2),+ onClick = { onMethodChange(true) },+ selected = isLensOnly,+ icon = { SegmentedButtonDefaults.Icon(isLensOnly) },+ colors = SegmentedButtonDefaults.colors(+ activeContainerColor = MaterialTheme.colorScheme.primaryContainer,+ activeContentColor = MaterialTheme.colorScheme.onPrimaryContainer+ )+ ) {+ Row(verticalAlignment = Alignment.CenterVertically) {+ Icon(+ imageVector = Icons.Default.AutoFixHigh,+ contentDescription = null,+ modifier = Modifier.size(18.dp)+ )+ Spacer(modifier = Modifier.width(8.dp))+ Text("Google Lens", style = MaterialTheme.typography.labelLarge)+ }+ }+ }+ }+}diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/theme/Theme.kt b/app/src/main/java/com/akslabs/circletosearch/ui/theme/Theme.ktindex 13f9616..cd15f98 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/theme/Theme.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/theme/Theme.kt@@ -28,10 +28,13 @@ import androidx.compose.material3.dynamicDarkColorSchemeimport androidx.compose.material3.dynamicLightColorSchemeimport androidx.compose.material3.lightColorSchemeimport androidx.compose.runtime.Composable+import androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.runtime.SideEffectimport androidx.compose.ui.graphics.toArgbimport androidx.compose.ui.platform.LocalContext+import androidx.compose.ui.platform.LocalDensityimport androidx.compose.ui.platform.LocalView+import androidx.compose.ui.unit.Densityimport androidx.core.view.WindowCompatprivate val DarkColorScheme = darkColorScheme(@@ -56,6 +59,9 @@ private val LightColorScheme = lightColorScheme(*/)+/** Maximum font scale factor the app will honour (1.3 = 130% of normal text size). */+private const val MAX_FONT_SCALE = 1.3f+@Composablefun CircleToSearchTheme(darkTheme: Boolean = isSystemInDarkTheme(),@@ -80,9 +86,23 @@ fun CircleToSearchTheme(}}- MaterialTheme(- colorScheme = colorScheme,- typography = Typography,- content = content- )+ // Cap fontScale so that sp-based text doesn't grow unboundedly on devices+ // where the user has set very large display scale (150-200%).+ val currentDensity = LocalDensity.current+ val cappedDensity = if (currentDensity.fontScale > MAX_FONT_SCALE) {+ Density(+ density = currentDensity.density,+ fontScale = MAX_FONT_SCALE+ )+ } else {+ currentDensity+ }++ CompositionLocalProvider(LocalDensity provides cappedDensity) {+ MaterialTheme(+ colorScheme = colorScheme,+ typography = Typography,+ content = content+ )+ }}\ No newline at end of file