Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

added alert confirmation dialog for accessibility permission

AKS Labsaf2b295d1eec
diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
index f9d307b..55dce31 100644
--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
@@ -30,6 +30,8 @@ import androidx.activity.compose.setContent
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.*
import androidx.compose.material3.*
@@ -53,6 +55,7 @@ import com.akslabs.circletosearch.ui.components.PrivacyDialog
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 kotlinx.coroutines.launch
class MainActivity : ComponentActivity() {
@@ -96,6 +99,7 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {
// Permission States
var isAccessibilityEnabled by remember { mutableStateOf(isAccessibilityServiceEnabled(context)) }
var isDefaultAssistant by remember { mutableStateOf(isDefaultAssistant(context)) }
+ var showAccessibilityDisclosure by remember { mutableStateOf(false) }
// Check permissions on Resume
DisposableEffect(lifecycleOwner) {
@@ -142,6 +146,7 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {
modifier = Modifier
.fillMaxSize()
.padding(padding)
+ .verticalScroll(rememberScrollState())
.padding(horizontal = 24.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
@@ -176,7 +181,7 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {
// 2. REQUIRED: Accessibility Service
Text(
- text = "REQUIRED",
+ text = "REQUIRED:",
style = MaterialTheme.typography.labelSmall,
color = if (isAccessibilityEnabled) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
modifier = Modifier.align(Alignment.Start).padding(bottom = 8.dp)
@@ -220,8 +225,7 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {
// Action Needed State
Card(
onClick = {
- val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
- context.startActivity(intent)
+ showAccessibilityDisclosure = true
},
colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.errorContainer
@@ -363,7 +367,7 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {
textAlign = TextAlign.Center
)
- Spacer(modifier = Modifier.weight(1f))
+ Spacer(modifier = Modifier.height(32.dp))
// 5. Footer
@@ -429,6 +433,23 @@ fun SetupScreen(onSettingsClick: () -> Unit, onOcrSettingsClick: () -> Unit) {
}
)
}
+
+ if (showAccessibilityDisclosure) {
+ AccessibilityDisclosureDialog(
+ onAccept = {
+ showAccessibilityDisclosure = false
+ try {
+ val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
+ context.startActivity(intent)
+ } catch (e: Exception) {
+ android.widget.Toast.makeText(context, "Could not open Accessibility Settings", android.widget.Toast.LENGTH_LONG).show()
+ }
+ },
+ onDismiss = {
+ showAccessibilityDisclosure = false
+ }
+ )
+ }
}
// Helper Functions
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 ee5b48c..bae13da 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
@@ -1495,10 +1495,10 @@ fun CircleToSearchScreen(
@Composable
fun BottomBarButton(label: String, icon: @Composable () -> Unit, onClick: () -> Unit) {
Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.BottomCenter) {
- Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(1.dp)) {
+ Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) {
FilledTonalIconButton(
onClick = { haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress); onClick() },
- modifier = Modifier.size(46.dp),
+ modifier = Modifier.size(48.dp),
colors = IconButtonDefaults.filledTonalIconButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceContainer,
contentColor = MaterialTheme.colorScheme.onSurface
@@ -1506,11 +1506,13 @@ fun CircleToSearchScreen(
) { icon() }
Text(
text = label,
- style = MaterialTheme.typography.labelSmall.copy(fontSize = 8.sp),
+ style = MaterialTheme.typography.labelSmall.copy(fontSize = 11.sp, lineHeight = 13.sp),
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
- maxLines = 1,
- softWrap = false
+ maxLines = 1,
+ minLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.padding(bottom = 0.dp)
)
}
}
@@ -1524,7 +1526,7 @@ fun CircleToSearchScreen(
// Pin
val isPinEnabled = selectedBitmap != null
Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.BottomCenter) {
- Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(1.dp)) {
+ Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) {
FilledTonalIconButton(
onClick = {
if (isPinEnabled) {
@@ -1535,7 +1537,7 @@ fun CircleToSearchScreen(
}
}
},
- modifier = Modifier.size(46.dp),
+ 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),
@@ -1546,22 +1548,24 @@ fun CircleToSearchScreen(
Icon(
Icons.Default.PushPin,
contentDescription = "Pin Selection",
- modifier = Modifier.size(20.dp)
+ modifier = Modifier.size(22.dp)
)
}
Text(
text = "Pin",
- style = MaterialTheme.typography.labelSmall.copy(fontSize = 8.sp),
+ 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,
- softWrap = false
+ maxLines = 1,
+ minLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.padding(bottom = 0.dp)
)
}
}
// Smart Entity Extractor
- BottomBarButton("Smart Extract", { Icon(Icons.Default.Search, null, modifier = Modifier.size(22.dp)) }) {
+ BottomBarButton("ScanInfo", { Icon(Icons.Default.Search, null, modifier = Modifier.size(22.dp)) }) {
isEntityExtractMode = true
if (detectedEntities.isEmpty() && !isExtractingEntities) {
isExtractingEntities = 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 6092130..18877f8 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/OcrSettingsScreen.kt
@@ -71,42 +71,42 @@ fun OcrSettingsScreen(onBack: () -> Unit) {
)
}
) { padding ->
- Column(
+ LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(padding)
) {
- Text(
- text = "Tesseract Optical Character Recognition uses .traineddata models to accurately read text from screen captures. English is bundled by default.",
- style = MaterialTheme.typography.bodyMedium,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- modifier = Modifier.padding(16.dp)
- )
+ item {
+ Text(
+ text = "Tesseract Optical Character Recognition uses .traineddata models to accurately read text from screen captures. English is bundled by default.",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ modifier = Modifier.padding(16.dp)
+ )
+ }
- LazyColumn(modifier = Modifier.fillMaxWidth()) {
- items(availableModels) { lang ->
- val isSelected = lang == currentLang
- ListItem(
- headlineContent = { Text(lang.uppercase(), fontWeight = FontWeight.SemiBold) },
- supportingContent = { Text("Model file: $lang.traineddata") },
- leadingContent = {
- Icon(Icons.Default.Language, contentDescription = null)
- },
- trailingContent = {
- if (isSelected) {
- Icon(Icons.Default.Check, contentDescription = "Selected", tint = MaterialTheme.colorScheme.primary)
- }
- },
- modifier = Modifier.clickable {
- currentLang = lang
- prefs.edit().putString("selected_lang", lang).apply()
- },
- colors = ListItemDefaults.colors(
- containerColor = if (isSelected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface
- )
+ items(availableModels) { lang ->
+ val isSelected = lang == currentLang
+ ListItem(
+ headlineContent = { Text(lang.uppercase(), fontWeight = FontWeight.SemiBold) },
+ supportingContent = { Text("Model file: $lang.traineddata") },
+ leadingContent = {
+ Icon(Icons.Default.Language, contentDescription = null)
+ },
+ trailingContent = {
+ if (isSelected) {
+ Icon(Icons.Default.Check, contentDescription = "Selected", tint = MaterialTheme.colorScheme.primary)
+ }
+ },
+ modifier = Modifier.clickable {
+ currentLang = lang
+ prefs.edit().putString("selected_lang", lang).apply()
+ },
+ colors = ListItemDefaults.colors(
+ containerColor = if (isSelected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface
)
- HorizontalDivider(color = MaterialTheme.colorScheme.surfaceVariant)
- }
+ )
+ HorizontalDivider(color = MaterialTheme.colorScheme.surfaceVariant)
}
}
}
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 3d15c4a..a57a8ee 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/SettingsScreen.kt
@@ -22,6 +22,8 @@ package com.akslabs.circletosearch.ui
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -91,6 +93,7 @@ fun SettingsScreen(
Column(
modifier = Modifier
.fillMaxWidth()
+ .verticalScroll(rememberScrollState())
.padding(horizontal = 24.dp)
.padding(bottom = 32.dp)
) {
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/components/AccessibilityDisclosureDialog.kt b/app/src/main/java/com/akslabs/circletosearch/ui/components/AccessibilityDisclosureDialog.kt
new file mode 100644
index 0000000..d2880cc
--- /dev/null
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/components/AccessibilityDisclosureDialog.kt
@@ -0,0 +1,76 @@
+package com.akslabs.circletosearch.ui.components
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.DialogProperties
+
+@Composable
+fun AccessibilityDisclosureDialog(
+ onAccept: () -> Unit,
+ onDismiss: () -> Unit
+) {
+ var hasAgreed by remember { mutableStateOf(false) }
+
+ AlertDialog(
+ onDismissRequest = onDismiss,
+ properties = DialogProperties(
+ dismissOnBackPress = true,
+ dismissOnClickOutside = false
+ ),
+ title = {
+ Text(
+ text = "Accessibility Service Usage",
+ style = MaterialTheme.typography.titleLarge,
+ fontWeight = FontWeight.Bold
+ )
+ },
+ text = {
+ Column {
+ Text(
+ text = "This permission is needed to capture the screen and detect the double tap gesture to trigger Circle to Search or other actions. If the app is used as your default assistant, this permission is optional.",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+
+ Spacer(modifier = Modifier.height(16.dp))
+
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Checkbox(
+ checked = hasAgreed,
+ onCheckedChange = { hasAgreed = it }
+ )
+ Text(
+ text = "I understand and wish to proceed",
+ style = MaterialTheme.typography.labelSmall,
+ modifier = Modifier.padding(start = 4.dp),
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ }
+ },
+ confirmButton = {
+ TextButton(
+ onClick = onAccept,
+ enabled = hasAgreed
+ ) {
+ Text("Accept and Enable", fontWeight = FontWeight.Bold)
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = onDismiss) {
+ Text("Cancel")
+ }
+ }
+ )
+}