Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

redesigned UI

AKS Labsae3d13353987
diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
index f1d9450..4c917d6 100644
--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
@@ -7,38 +7,12 @@ import android.provider.Settings
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Favorite
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Switch
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
@@ -81,47 +55,123 @@ fun SetupScreen() {
val sheetState = rememberModalBottomSheetState()
val scope = rememberCoroutineScope()
- Column(
- modifier = Modifier
- .fillMaxSize()
- .padding(24.dp),
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.Center
- ) {
- Text(
- text = "Circle to Search Setup",
- style = MaterialTheme.typography.headlineMedium
- )
- Spacer(modifier = Modifier.height(24.dp))
- Text(
- text = "To use this app, enable the Accessibility Service.\n\nThis allows the app to:\n• Detect double-tap on status bar\n• Take screenshots\n• Show floating bubble\n\nNo other permissions needed!",
- textAlign = TextAlign.Center
- )
- Spacer(modifier = Modifier.height(32.dp))
- Button(onClick = {
- val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
- context.startActivity(intent)
- }) {
- Text("Enable Accessibility Service")
- }
- Spacer(modifier = Modifier.height(32.dp))
-
- Spacer(modifier = Modifier.height(32.dp))
-
- BubbleSwitch(context)
+ Scaffold(
+ containerColor = MaterialTheme.colorScheme.background
+ ) { padding ->
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(padding)
+ .padding(horizontal = 24.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Spacer(modifier = Modifier.height(48.dp))
+
+ // 1. Header
+ Text(
+ text = "Circle to Search",
+ style = MaterialTheme.typography.displaySmall.copy(fontWeight = FontWeight.Bold),
+ color = MaterialTheme.colorScheme.primary
+ )
+ Spacer(modifier = Modifier.height(16.dp))
+ Text(
+ text = "Search anything on your screen instantly.",
+ style = MaterialTheme.typography.bodyLarge,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ textAlign = TextAlign.Center
+ )
+
+ Spacer(modifier = Modifier.height(48.dp))
+ // 2. Main Action: Set as Default
+ Card(
+ onClick = {
+ val intent = Intent(Settings.ACTION_VOICE_INPUT_SETTINGS)
+ context.startActivity(intent)
+ },
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.primaryContainer
+ ),
+ shape = androidx.compose.foundation.shape.RoundedCornerShape(24.dp),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Row(
+ modifier = Modifier.padding(24.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ imageVector = Icons.Default.TouchApp,
+ contentDescription = null,
+ modifier = Modifier.size(32.dp),
+ tint = MaterialTheme.colorScheme.onPrimaryContainer
+ )
+ Spacer(modifier = Modifier.width(16.dp))
+ Column {
+ Text(
+ text = "Set as Default Assistant",
+ style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),
+ color = MaterialTheme.colorScheme.onPrimaryContainer
+ )
+ Text(
+ text = "Required to trigger search",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)
+ )
+ }
+ }
+ }
+
+ Spacer(modifier = Modifier.height(16.dp))
- Spacer(modifier = Modifier.height(32.dp))
-
- AssistantSwitch(context)
+ // 3. Secondary Action: Accessibility
+ OutlinedCard(
+ onClick = {
+ val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
+ context.startActivity(intent)
+ },
+ shape = androidx.compose.foundation.shape.RoundedCornerShape(24.dp),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Row(
+ modifier = Modifier.padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ imageVector = Icons.Default.Accessibility,
+ contentDescription = null,
+ modifier = Modifier.size(24.dp),
+ tint = MaterialTheme.colorScheme.primary
+ )
+ Spacer(modifier = Modifier.width(16.dp))
+ Text(
+ text = "Enable Accessibility Service",
+ style = MaterialTheme.typography.titleMedium,
+ color = MaterialTheme.colorScheme.onSurface
+ )
+ }
+ }
+ Spacer(modifier = Modifier.height(32.dp))
- // Support Icons Row
- Spacer(modifier = Modifier.height(48.dp))
- SocialLinksRow(
- context = context,
- onDonateClick = { showSupportSheet = true }
- )
+ // 4. Settings (Bubble)
+ Text(
+ text = "Settings",
+ style = MaterialTheme.typography.labelLarge,
+ color = MaterialTheme.colorScheme.primary,
+ modifier = Modifier.align(Alignment.Start)
+ )
+ Spacer(modifier = Modifier.height(8.dp))
+ BubbleSwitch(context)
+
+ Spacer(modifier = Modifier.weight(1f))
+
+ // 5. Footer
+ SocialLinksRow(
+ context = context,
+ onDonateClick = { showSupportSheet = true }
+ )
+ Spacer(modifier = Modifier.height(32.dp))
+ }
}
// Support Dialog
@@ -166,53 +216,54 @@ fun SocialLinksRow(
context: android.content.Context,
onDonateClick: () -> Unit
) {
- Column(
+ Row(
modifier = Modifier.fillMaxWidth(),
- horizontalAlignment = Alignment.CenterHorizontally
+ horizontalArrangement = Arrangement.Center,
+ verticalAlignment = Alignment.CenterVertically
) {
- Text(
- text = "Support & Connect",
- style = MaterialTheme.typography.labelMedium,
- color = Color.Gray,
- modifier = Modifier.padding(bottom = 12.dp)
- )
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.Center,
- verticalAlignment = Alignment.CenterVertically
- ) {
- IconButton(onClick = {
+ IconButton(
+ onClick = {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/aks-labs"))
context.startActivity(intent)
- }, modifier = Modifier.padding(horizontal = 8.dp)) {
- Icon(
- painter = painterResource(id = com.akslabs.circletosearch.R.drawable.github),
- contentDescription = "Github",
- tint = MaterialTheme.colorScheme.primary,
- modifier = Modifier.padding(8.dp)
- )
- }
-
- IconButton(onClick = onDonateClick, modifier = Modifier.padding(horizontal = 8.dp)) {
- Icon(
- painter = painterResource(id = com.akslabs.circletosearch.R.drawable.donation),
- contentDescription = "Donate",
- tint = MaterialTheme.colorScheme.primary,
- modifier = Modifier.padding(8.dp)
- )
- }
-
- IconButton(onClick = {
+ },
+ colors = IconButtonDefaults.filledTonalIconButtonColors(),
+ modifier = Modifier.padding(horizontal = 8.dp)
+ ) {
+ Icon(
+ painter = painterResource(id = com.akslabs.circletosearch.R.drawable.github),
+ contentDescription = "Github",
+ tint = MaterialTheme.colorScheme.onSecondaryContainer,
+ modifier = Modifier.padding(8.dp)
+ )
+ }
+
+ IconButton(
+ onClick = onDonateClick,
+ colors = IconButtonDefaults.filledTonalIconButtonColors(),
+ modifier = Modifier.padding(horizontal = 8.dp)
+ ) {
+ Icon(
+ painter = painterResource(id = com.akslabs.circletosearch.R.drawable.donation),
+ contentDescription = "Donate",
+ tint = MaterialTheme.colorScheme.onSecondaryContainer,
+ modifier = Modifier.padding(8.dp)
+ )
+ }
+
+ IconButton(
+ onClick = {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/akslabs"))
context.startActivity(intent)
- }, modifier = Modifier.padding(horizontal = 8.dp)) {
- Icon(
- painter = painterResource(id = com.akslabs.circletosearch.R.drawable.telegram),
- contentDescription = "Telegram",
- tint = MaterialTheme.colorScheme.primary,
- modifier = Modifier.padding(8.dp).size(23.dp)
- )
- }
+ },
+ colors = IconButtonDefaults.filledTonalIconButtonColors(),
+ modifier = Modifier.padding(horizontal = 8.dp)
+ ) {
+ Icon(
+ painter = painterResource(id = com.akslabs.circletosearch.R.drawable.telegram),
+ contentDescription = "Telegram",
+ tint = MaterialTheme.colorScheme.onSecondaryContainer,
+ modifier = Modifier.padding(8.dp).size(23.dp)
+ )
}
}
}
@@ -249,11 +300,10 @@ fun SupportDialog(
"\n" +
"Your support helps me keep improving these apps\n" +
"and stay motivated,\n" +
-
+
"\n" +
"Thank you for supporting independent developers.",
style = MaterialTheme.typography.bodyMedium,
-// fontWeight = FontWeight.Black,
lineHeight = 20.sp
)
@@ -262,7 +312,7 @@ fun SupportDialog(
// Don't show again checkbox
Row(
verticalAlignment = Alignment.CenterVertically,
- modifier = Modifier.fillMaxWidth()
+ modifier = Modifier.fillMaxWidth().clickable { dontShowAgain.value = !dontShowAgain.value }
) {
Checkbox(
checked = dontShowAgain.value,
@@ -277,8 +327,8 @@ fun SupportDialog(
}
},
confirmButton = {
- TextButton(onClick = onDonate) {
- Text("Donate", color = MaterialTheme.colorScheme.primary)
+ Button(onClick = onDonate) {
+ Text("Donate")
}
},
dismissButton = {
@@ -294,66 +344,20 @@ fun BubbleSwitch(context: android.content.Context) {
val prefs = context.getSharedPreferences("app_prefs", android.content.Context.MODE_PRIVATE)
val isBubbleEnabled = remember { mutableStateOf(prefs.getBoolean("bubble_enabled", false)) }
- Row(
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.SpaceBetween,
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 32.dp)
- ) {
- Text("Enable Floating Bubble")
- Switch(
- checked = isBubbleEnabled.value,
- onCheckedChange = { enabled ->
- isBubbleEnabled.value = enabled
- prefs.edit().putBoolean("bubble_enabled", enabled).apply()
- }
- )
- }
-}
-
-@Composable
-fun AssistantSwitch(context: android.content.Context) {
- val prefs = context.getSharedPreferences("app_prefs", android.content.Context.MODE_PRIVATE)
- val isAssistantEnabled = remember { mutableStateOf(prefs.getBoolean("assistant_enabled", false)) }
-
- Column(
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 32.dp)
- ) {
- Row(
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.SpaceBetween,
- modifier = Modifier.fillMaxWidth()
- ) {
- Text("Enable Assistant Integration")
+ ListItem(
+ headlineContent = { Text("Floating Bubble") },
+ supportingContent = { Text("Show a floating button triggers search") },
+ trailingContent = {
Switch(
- checked = isAssistantEnabled.value,
+ checked = isBubbleEnabled.value,
onCheckedChange = { enabled ->
- isAssistantEnabled.value = enabled
- prefs.edit().putBoolean("assistant_enabled", enabled).apply()
+ isBubbleEnabled.value = enabled
+ prefs.edit().putBoolean("bubble_enabled", enabled).apply()
}
)
- }
-
- if (isAssistantEnabled.value) {
- Spacer(modifier = Modifier.height(8.dp))
- Text(
- text = "Long-press home button to launch Circle to Search",
- style = MaterialTheme.typography.bodySmall,
- color = Color.Gray
- )
- Spacer(modifier = Modifier.height(8.dp))
- Button(
- onClick = {
- val intent = Intent(Settings.ACTION_VOICE_INPUT_SETTINGS)
- context.startActivity(intent)
- },
- modifier = Modifier.fillMaxWidth()
- ) {
- Text("Set as Default Assistant")
- }
- }
- }
+ },
+ colors = ListItemDefaults.colors(
+ containerColor = Color.Transparent
+ )
+ )
}