CircleToSearch with multi search engine support for all android
Kotlin
chores: removes extra code
AKS Labs8a1a134b7ca9
diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.ktindex a4a9abf..7254bc6 100644--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt@@ -27,7 +27,6 @@ import android.os.Bundleimport android.provider.Settingsimport android.widget.Toastimport androidx.activity.ComponentActivity-import androidx.activity.compose.BackHandlerimport androidx.activity.compose.rememberLauncherForActivityResultimport androidx.activity.compose.setContentimport androidx.activity.enableEdgeToEdge@@ -42,46 +41,28 @@ import androidx.compose.foundation.layout.*import androidx.compose.foundation.layout.WindowInsetsimport androidx.compose.foundation.layout.asPaddingValuesimport androidx.compose.foundation.layout.systemBars-import androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.verticalScroll-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.automirrored.filled.ArrowBack-import androidx.compose.material.icons.filled.*import androidx.compose.material3.*import androidx.compose.runtime.*-import androidx.compose.runtime.DisposableEffectimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clipimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.graphics.asImageBitmapimport androidx.compose.ui.platform.LocalContext-import androidx.compose.ui.platform.testTagimport androidx.compose.ui.res.painterResourceimport androidx.compose.ui.res.stringResource-import androidx.compose.ui.text.SpanStyle-import androidx.compose.ui.text.buildAnnotatedStringimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlign-import androidx.compose.ui.text.withStyleimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp-import androidx.compose.ui.window.DialogPropertiesimport com.akslabs.circletosearch.onboarding.PixelCircleSearchOnboardingScreen-import com.akslabs.circletosearch.ui.components.PrivacyDialogimport com.akslabs.circletosearch.ui.theme.CircleToSearchTheme-import com.akslabs.circletosearch.ui.theme.M3ExpressiveShapes-import com.akslabs.circletosearch.ui.theme.m3ExpressivePressimport com.akslabs.circletosearch.ui.wobblepulldown.WobbleDeviceInfoActivityimport com.akslabs.circletosearch.ui.wobblepulldown.WobbleHomeScreenimport com.akslabs.circletosearch.ui.wobblepulldown.isA11yGrantedimport com.akslabs.circletosearch.ui.wobblepulldown.isAssistantGranted-import com.akslabs.circletosearch.utils.PrivacyPreferences-import dev.davidv.translator.MainActivity as TranslatorMainActivityimport com.akslabs.circletosearch.ui.components.DonateBottomSheet-import com.akslabs.circletosearch.ui.components.AccessibilityDisclosureDialog-import com.akslabs.circletosearch.ui.components.UnifiedSearchMethodSelectorimport kotlinx.coroutines.delayimport kotlinx.coroutines.launch@@ -139,13 +120,6 @@ class MainActivity : ComponentActivity() {initialPage = pendingSettingsPage,)}- "setup" -> SetupScreen(- onSettingsClick = {- pendingSettingsPage = null- currentScreen = "settings"- },- onBack = { currentScreen = "home" },- )else -> {var wobbleTick by remember { mutableStateOf(0) }var wizardBackdrop by remember { mutableStateOf(false) }@@ -186,7 +160,6 @@ class MainActivity : ComponentActivity() {)context.startActivity(intent, options.toBundle())},- onOpenSetup = { currentScreen = "setup" },onOpenSettings = {pendingSettingsPage = nullcurrentScreen = "settings"@@ -209,9 +182,6 @@ class MainActivity : ComponentActivity() {}}}- BackHandler(enabled = currentScreen == "setup") {- currentScreen = "home"- }}}}@@ -232,481 +202,6 @@ class MainActivity : ComponentActivity() {}}-@OptIn(ExperimentalMaterial3Api::class)-@Composable-fun SetupScreen(onSettingsClick: () -> Unit, onBack: (() -> Unit)? = null) {- val context = LocalContext.current- val lifecycleOwner = androidx.lifecycle.compose.LocalLifecycleOwner.current- val prefs = context.getSharedPreferences("app_prefs", android.content.Context.MODE_PRIVATE)-- // Privacy Dialog State- val privacyPreferences = remember { PrivacyPreferences(context) }- var showPrivacyDialog by remember { mutableStateOf(!privacyPreferences.hasAcceptedPrivacyPolicy()) }-- // Permission States- var isAccessibilityEnabled by remember { mutableStateOf(isAccessibilityServiceEnabled(context)) }- var isDefaultAssistant by remember { mutableStateOf(isDefaultAssistant(context)) }- var showAccessibilityDisclosure by remember { mutableStateOf(false) }-- // Summary of enabled triggers for the home card (refreshed on resume)- var triggerSummary by remember { mutableStateOf("") }- fun refreshTriggerSummary() {- val names = mutableListOf<String>()- val overlayConfig = runCatching {- com.akslabs.circletosearch.data.OverlayConfigurationManager(context).getConfig()- }.getOrNull()- if (overlayConfig?.isEnabled == true) names.add(context.getString(R.string.trigger_name_statusbar))- if (prefs.getBoolean("bubble_enabled", false)) names.add(context.getString(R.string.trigger_name_bubble))- if (prefs.getBoolean("trigger_double_vol_up", false)) names.add(context.getString(R.string.trigger_double_vol_up_title))- if (prefs.getBoolean("trigger_double_vol_down", false)) names.add(context.getString(R.string.trigger_double_vol_down_title))- if (prefs.getBoolean("trigger_double_power", false)) names.add(context.getString(R.string.trigger_double_power_title))- if (prefs.getBoolean("trigger_power_vol_up", false)) names.add(context.getString(R.string.trigger_power_vol_up_title))- if (prefs.getBoolean("trigger_power_vol_down", false)) names.add(context.getString(R.string.trigger_power_vol_down_title))- if (prefs.getBoolean("trigger_vol_up_down", false)) names.add(context.getString(R.string.trigger_vol_up_down_title))- if (isDefaultAssistant(context)) names.add(context.getString(R.string.trigger_name_assistant))- val shown = names.take(3)- val hidden = names.size - shown.size- triggerSummary = when {- names.isEmpty() -> context.getString(R.string.triggers_card_subtitle_none)- hidden > 0 -> shown.joinToString(" \u00B7 ") + " \u00B7 " + context.getString(R.string.triggers_more, hidden)- else -> shown.joinToString(" \u00B7 ")- }- }- LaunchedEffect(Unit) { refreshTriggerSummary() }-- // Check permissions on Resume- DisposableEffect(lifecycleOwner) {- val observer = androidx.lifecycle.LifecycleEventObserver { _, event ->- if (event == androidx.lifecycle.Lifecycle.Event.ON_RESUME) {- isAccessibilityEnabled = isAccessibilityServiceEnabled(context)- isDefaultAssistant = isDefaultAssistant(context)- refreshTriggerSummary()- }- }- lifecycleOwner.lifecycle.addObserver(observer)- onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }- }-- val showDonateSheet = remember { mutableStateOf(false) }- val sheetState = rememberModalBottomSheetState()- val scope = rememberCoroutineScope()-- // Show Privacy Dialog First - User must accept before seeing main UI- if (showPrivacyDialog) {- PrivacyDialog(- onAccept = {- privacyPreferences.setPrivacyAccepted()- showPrivacyDialog = false- }- )- return // Don't show main UI until accepted- }-- Scaffold(- containerColor = MaterialTheme.colorScheme.background,- topBar = {- // App icon + title on the left, settings gear on the right- TopAppBar(- navigationIcon = {- if (onBack != null) {- IconButton(onClick = onBack) {- Icon(- imageVector = Icons.AutoMirrored.Filled.ArrowBack,- contentDescription = stringResource(R.string.cd_back),- tint = MaterialTheme.colorScheme.onSurfaceVariant- )- }- }- },- title = {- Row(verticalAlignment = Alignment.CenterVertically) {- val launcherIcon = remember {- val drawable = context.getDrawable(R.mipmap.ic_launcher)- requireNotNull(drawable) { "ic_launcher drawable missing" }- val w = drawable.intrinsicWidth.coerceAtLeast(1)- val h = drawable.intrinsicHeight.coerceAtLeast(1)- val bitmap = android.graphics.Bitmap.createBitmap(- w, h, android.graphics.Bitmap.Config.ARGB_8888- )- drawable.setBounds(0, 0, w, h)- drawable.draw(android.graphics.Canvas(bitmap))- bitmap.asImageBitmap()- }- Icon(- bitmap = launcherIcon,- contentDescription = stringResource(R.string.cd_app_icon),- tint = Color.Unspecified,- modifier = Modifier- .size(34.dp)- .clip(androidx.compose.foundation.shape.RoundedCornerShape(9.dp))- )- Spacer(modifier = Modifier.width(12.dp))- Text(- text = stringResource(R.string.header_title),- style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),- color = MaterialTheme.colorScheme.onBackground- )- }- },- actions = {- IconButton(onClick = onSettingsClick) {- Icon(- imageVector = Icons.Default.Settings,- contentDescription = stringResource(R.string.cd_overlay_settings),- tint = MaterialTheme.colorScheme.onSurfaceVariant- )- }- },- colors = TopAppBarDefaults.topAppBarColors(- containerColor = MaterialTheme.colorScheme.background,- titleContentColor = MaterialTheme.colorScheme.onBackground,- actionIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant- )- )- }- ) { padding ->- Column(- modifier = Modifier- .fillMaxSize()- .padding(padding)- .verticalScroll(rememberScrollState())- .padding(horizontal = 24.dp),- horizontalAlignment = Alignment.CenterHorizontally- ) {- Spacer(modifier = Modifier.height(8.dp))-- Spacer(modifier = Modifier.height(16.dp))-- Surface(- shape = M3ExpressiveShapes.SlantedPill,- color = (if (isAccessibilityEnabled) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error).copy(alpha = 0.12f),- modifier = Modifier.align(Alignment.Start)- ) {- Text(- text = stringResource(R.string.label_required),- style = MaterialTheme.typography.labelMedium.copy(fontWeight = FontWeight.SemiBold),- color = if (isAccessibilityEnabled) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,- modifier = Modifier.padding(horizontal = 14.dp, vertical = 7.dp)- )- }- Spacer(modifier = Modifier.height(10.dp))-- if (isAccessibilityEnabled) {- Card(- colors = CardDefaults.cardColors(- containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.6f)- ),- shape = M3ExpressiveShapes.AsymmetricCard,- modifier = Modifier.fillMaxWidth()- ) {- Row(- modifier = Modifier.padding(16.dp),- verticalAlignment = Alignment.CenterVertically- ) {- Surface(- shape = M3ExpressiveShapes.Clover4,- color = MaterialTheme.colorScheme.primary,- modifier = Modifier.size(48.dp)- ) {- Box(contentAlignment = Alignment.Center) {- Icon(- imageVector = Icons.Default.CheckCircle,- contentDescription = stringResource(R.string.cd_granted),- tint = MaterialTheme.colorScheme.onPrimary,- modifier = Modifier.size(24.dp)- )- }- }- Spacer(modifier = Modifier.width(16.dp))- Column {- Text(- text = stringResource(R.string.label_accessibility_active),- style = MaterialTheme.typography.titleMedium,- color = MaterialTheme.colorScheme.onPrimaryContainer- )- Text(- text = stringResource(R.string.label_accessibility_active_subtitle),- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)- )- }- }- }- } else {- Card(- onClick = {- showAccessibilityDisclosure = true- },- colors = CardDefaults.cardColors(- containerColor = MaterialTheme.colorScheme.errorContainer- ),- shape = M3ExpressiveShapes.AsymmetricCard,- modifier = Modifier- .fillMaxWidth()- .m3ExpressivePress()- ) {- Row(- modifier = Modifier.padding(16.dp),- verticalAlignment = Alignment.CenterVertically- ) {- Surface(- shape = M3ExpressiveShapes.Clover4,- color = MaterialTheme.colorScheme.error,- modifier = Modifier.size(48.dp)- ) {- Box(contentAlignment = Alignment.Center) {- Icon(- imageVector = Icons.Default.Accessibility,- contentDescription = null,- modifier = Modifier.size(24.dp),- tint = MaterialTheme.colorScheme.onError- )- }- }- Spacer(modifier = Modifier.width(16.dp))- Column {- Text(- text = stringResource(R.string.label_enable_accessibility),- style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),- color = MaterialTheme.colorScheme.onErrorContainer- )- Text(- text = stringResource(R.string.label_enable_accessibility_subtitle),- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onErrorContainer.copy(alpha = 0.8f)- )- }- }- }- }-- Spacer(modifier = Modifier.height(24.dp))-- Surface(- shape = M3ExpressiveShapes.SlantedPill,- color = MaterialTheme.colorScheme.secondary.copy(alpha = 0.12f),- modifier = Modifier.align(Alignment.Start)- ) {- Text(- text = stringResource(R.string.label_optional_assistant),- style = MaterialTheme.typography.labelMedium.copy(fontWeight = FontWeight.SemiBold),- color = MaterialTheme.colorScheme.secondary,- modifier = Modifier.padding(horizontal = 14.dp, vertical = 7.dp)- )- }- Spacer(modifier = Modifier.height(10.dp))-- if (isDefaultAssistant) {- Card(- colors = CardDefaults.cardColors(- containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.6f)- ),- shape = M3ExpressiveShapes.AsymmetricCard,- modifier = Modifier.fillMaxWidth()- ) {- Row(- modifier = Modifier.padding(16.dp),- verticalAlignment = Alignment.CenterVertically- ) {- Surface(- shape = M3ExpressiveShapes.Clover4,- color = MaterialTheme.colorScheme.secondary,- modifier = Modifier.size(48.dp)- ) {- Box(contentAlignment = Alignment.Center) {- Icon(- imageVector = Icons.Default.CheckCircle,- contentDescription = stringResource(R.string.cd_active),- tint = MaterialTheme.colorScheme.onSecondary,- modifier = Modifier.size(24.dp)- )- }- }- Spacer(modifier = Modifier.width(16.dp))- Text(- text = stringResource(R.string.label_default_assistant_set),- style = MaterialTheme.typography.titleMedium,- color = MaterialTheme.colorScheme.onSecondaryContainer- )- }- }- } else {- Card(- onClick = {- val intent = Intent(Settings.ACTION_VOICE_INPUT_SETTINGS)- context.startActivity(intent)- },- colors = CardDefaults.cardColors(- containerColor = MaterialTheme.colorScheme.primaryContainer- ),- shape = M3ExpressiveShapes.AsymmetricCard,- modifier = Modifier- .fillMaxWidth()- .m3ExpressivePress()- ) {- Row(- modifier = Modifier.padding(16.dp),- verticalAlignment = Alignment.CenterVertically- ) {- Surface(- shape = M3ExpressiveShapes.Clover4,- color = MaterialTheme.colorScheme.primary,- modifier = Modifier.size(48.dp)- ) {- Box(contentAlignment = Alignment.Center) {- Icon(- imageVector = Icons.Default.TouchApp,- contentDescription = null,- modifier = Modifier.size(24.dp),- tint = MaterialTheme.colorScheme.onPrimary- )- }- }- Spacer(modifier = Modifier.width(16.dp))- Column(modifier = Modifier.weight(1f)) {- Text(- text = stringResource(R.string.label_set_default_assistant),- style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),- color = MaterialTheme.colorScheme.onPrimaryContainer- )- Text(- text = stringResource(R.string.label_set_default_assistant_subtitle),- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.8f)- )- }- }- }- }-- Spacer(modifier = Modifier.height(24.dp))-- Surface(- shape = M3ExpressiveShapes.SlantedPill,- color = MaterialTheme.colorScheme.secondary.copy(alpha = 0.12f),- modifier = Modifier.align(Alignment.Start)- ) {- Text(- text = stringResource(R.string.label_triggers),- style = MaterialTheme.typography.labelMedium.copy(fontWeight = FontWeight.SemiBold),- color = MaterialTheme.colorScheme.secondary,- modifier = Modifier.padding(horizontal = 14.dp, vertical = 7.dp)- )- }- Spacer(modifier = Modifier.height(10.dp))-- // Quick glance at what's configured — tap to manage all triggers- Card(- onClick = onSettingsClick,- shape = M3ExpressiveShapes.AsymmetricCard,- colors = CardDefaults.cardColors(- containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.55f)- ),- modifier = Modifier- .fillMaxWidth()- .m3ExpressivePress()- ) {- Row(- modifier = Modifier.padding(16.dp),- verticalAlignment = Alignment.CenterVertically- ) {- Surface(- shape = M3ExpressiveShapes.Clover4,- color = MaterialTheme.colorScheme.tertiaryContainer,- modifier = Modifier.size(48.dp)- ) {- Box(contentAlignment = Alignment.Center) {- Icon(- imageVector = Icons.Default.SettingsSuggest,- contentDescription = null,- tint = MaterialTheme.colorScheme.onTertiaryContainer,- modifier = Modifier.size(24.dp)- )- }- }- Spacer(modifier = Modifier.width(16.dp))- Column(modifier = Modifier.weight(1f)) {- Text(- text = stringResource(R.string.triggers_card_title),- style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Bold),- color = MaterialTheme.colorScheme.onSurface- )- Text(- text = triggerSummary,- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onSurfaceVariant,- maxLines = 2,- overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis- )- }- Icon(- Icons.Default.KeyboardArrowRight,- contentDescription = null,- tint = MaterialTheme.colorScheme.onSurfaceVariant- )- }- }-// Spacer(modifier = Modifier.height(25.dp))-//-// // Privacy Note-// Text(-// text = "That’s it. No more permissions.\n We’re not trying to adopt your phone.",-// style = MaterialTheme.typography.bodySmall,-// color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f),-// textAlign = TextAlign.Center-// )-- Spacer(modifier = Modifier.height(22.dp))--- // 5. Footer- SocialLinksRow(- context = context,- onDonateClick = { showDonateSheet.value = true }- )- Spacer(modifier = Modifier.height(20.dp))- Surface(- shape = M3ExpressiveShapes.SlantedPill,- color = MaterialTheme.colorScheme.primary.copy(alpha = 0.12f),- modifier = Modifier.m3ExpressivePress(onClick = {- val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/aks-labs"))- context.startActivity(intent)- })- ) {- Text(- text = stringResource(R.string.label_from_akslabs),- style = MaterialTheme.typography.labelMedium,- color = MaterialTheme.colorScheme.primary.copy(alpha = 0.8f),- textAlign = TextAlign.Center,- fontWeight = FontWeight.Bold,- modifier = Modifier.padding(horizontal = 18.dp, vertical = 10.dp)- )- }- Spacer(modifier = Modifier.height(2.dp))- }- }-- // Support Dialog & Sheet- SupportDialogHost(showDonateSheet = showDonateSheet)-- 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, context.getString(R.string.toast_accessibility_settings_error), android.widget.Toast.LENGTH_LONG).show()- }- },- onDismiss = {- showAccessibilityDisclosure = false- }- )- }-}-// Helper Functionsfun isAccessibilityServiceEnabled(context: android.content.Context): Boolean {val expectedComponentName = android.content.ComponentName(context, CircleToSearchAccessibilityService::class.java)@@ -742,64 +237,6 @@ fun isDefaultAssistant(context: android.content.Context): Boolean {return assistant == myComponentString}-// ... SocialLinksRow, SupportDialog, BubbleSwitch same as before ...-@Composable-fun SocialLinksRow(- context: android.content.Context,- onDonateClick: () -> Unit-) {- Row(- modifier = Modifier.fillMaxWidth(),- horizontalArrangement = Arrangement.Center,- verticalAlignment = Alignment.CenterVertically- ) {- IconButton(- onClick = {- val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/aks-labs"))- context.startActivity(intent)- },- colors = IconButtonDefaults.filledTonalIconButtonColors(),- modifier = Modifier.padding(horizontal = 8.dp)- ) {- Icon(- painter = painterResource(id = com.akslabs.circletosearch.R.drawable.github),- contentDescription = stringResource(R.string.cd_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 = stringResource(R.string.cd_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)- },- colors = IconButtonDefaults.filledTonalIconButtonColors(),- modifier = Modifier.padding(horizontal = 8.dp)- ) {- Icon(- painter = painterResource(id = com.akslabs.circletosearch.R.drawable.telegram),- contentDescription = stringResource(R.string.cd_telegram),- tint = MaterialTheme.colorScheme.onSecondaryContainer,- modifier = Modifier.padding(8.dp).size(23.dp)- )- }- }-}-@Composablefun SupportDialog(showCount: Int,@@ -972,57 +409,3 @@ fun SupportDialogHost(showDonateSheet: MutableState<Boolean>) {}}-@Composable-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)) }-- Card(- shape = M3ExpressiveShapes.AsymmetricCard,- colors = CardDefaults.cardColors(- containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.55f)- ),- modifier = Modifier.fillMaxWidth()- ) {- Row(- modifier = Modifier.padding(16.dp),- verticalAlignment = Alignment.CenterVertically- ) {- Surface(- shape = M3ExpressiveShapes.Clover4,- color = MaterialTheme.colorScheme.tertiaryContainer,- modifier = Modifier.size(48.dp)- ) {- Box(contentAlignment = Alignment.Center) {- Icon(- imageVector = Icons.Default.TouchApp,- contentDescription = null,- tint = MaterialTheme.colorScheme.onTertiaryContainer,- modifier = Modifier.size(24.dp)- )- }- }- Spacer(modifier = Modifier.width(16.dp))- Column(modifier = Modifier.weight(1f)) {- Text(- text = stringResource(R.string.label_floating_bubble),- style = MaterialTheme.typography.titleMedium,- color = MaterialTheme.colorScheme.onSurface- )- Text(- text = stringResource(R.string.label_floating_bubble_subtitle),- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onSurfaceVariant- )- }- Switch(- checked = isBubbleEnabled.value,- onCheckedChange = { enabled ->- isBubbleEnabled.value = enabled- prefs.edit().putBoolean("bubble_enabled", enabled).apply()- }- )- }- }-}-diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/components/PrivacyDialog.kt b/app/src/main/java/com/akslabs/circletosearch/ui/components/PrivacyDialog.ktdeleted file mode 100644index f7dc8f5..0000000--- a/app/src/main/java/com/akslabs/circletosearch/ui/components/PrivacyDialog.kt+++ /dev/null@@ -1,250 +0,0 @@-/*- *- * * Copyright (C) 2025 AKS-Labs (original author)- * *- * * This program is free software: you can redistribute it and/or modify- * * it under the terms of the GNU General Public License as published by- * * the Free Software Foundation, either version 3 of the License, or- * * (at your option) any later version.- * *- * * This program is distributed in the hope that it will be useful,- * * but WITHOUT ANY WARRANTY; without even the implied warranty of- * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * * GNU General Public License for more details.- * *- * * You should have received a copy of the GNU General Public License- * * along with this program. If not, see <https://www.gnu.org/licenses/>.- *- */--package com.akslabs.circletosearch.ui.components--import androidx.compose.foundation.background-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.layout.width-import androidx.compose.foundation.rememberScrollState-import androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.foundation.verticalScroll-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.CheckCircle-import androidx.compose.material.icons.filled.Info-import androidx.compose.material.icons.filled.Security-import androidx.compose.material.icons.filled.Warning-import androidx.compose.material3.AlertDialog-import androidx.compose.material3.Button-import androidx.compose.material3.Card-import androidx.compose.material3.CardDefaults-import androidx.compose.material3.Icon-import androidx.compose.material3.MaterialTheme-import androidx.compose.material3.Text-import androidx.compose.runtime.Composable-import androidx.compose.ui.Alignment-import androidx.compose.ui.Modifier-import androidx.compose.ui.graphics.vector.ImageVector-import androidx.compose.ui.text.font.FontWeight-import androidx.compose.ui.text.style.TextAlign-import androidx.compose.ui.res.stringResource-import androidx.compose.ui.unit.dp-import androidx.compose.ui.window.Dialog-import androidx.compose.ui.window.DialogProperties-import com.akslabs.circletosearch.R--@Composable-fun PrivacyDialog(- onAccept: () -> Unit-) {- AlertDialog(- onDismissRequest = { /* Cannot dismiss without accepting */ },- modifier = Modifier- .fillMaxSize()- .padding(20.dp),- properties = DialogProperties(- usePlatformDefaultWidth = false,- dismissOnBackPress = false,- dismissOnClickOutside = false- ),- icon = {- Icon(- imageVector = Icons.Filled.Security,- contentDescription = stringResource(R.string.cd_privacy),- tint = MaterialTheme.colorScheme.primary,- modifier = Modifier.size(48.dp)- )- },- title = {- Text(- text = stringResource(R.string.title_privacy),- style = MaterialTheme.typography.headlineSmall,- fontWeight = FontWeight.Bold,- textAlign = TextAlign.Center- )- },- text = {- Column(- modifier = Modifier- .fillMaxWidth()- .verticalScroll(rememberScrollState())- ) {-- // Where It Goes Section- PrivacySection(- icon = Icons.Filled.Info,- question = stringResource(R.string.privacy_q_upload),- answer = stringResource(R.string.privacy_a_upload)- )-- Spacer(modifier = Modifier.height(16.dp))- // Why Upload Section- PrivacySection(- icon = Icons.Filled.Info,- question = stringResource(R.string.privacy_q_why_upload),- answer = stringResource(R.string.privacy_a_why_upload)- )-- Spacer(modifier = Modifier.height(16.dp))--- PrivacySection(- icon = Icons.Filled.Warning,- question = stringResource(R.string.privacy_q_safe),- answer = stringResource(R.string.privacy_a_safe),- isWarning = true- )- Spacer(modifier = Modifier.height(16.dp))- // Warning Section- PrivacySection(- icon = Icons.Filled.Warning,- question = stringResource(R.string.privacy_q_personal),- answer = stringResource(R.string.privacy_a_personal),- isWarning = true- )-- Spacer(modifier = Modifier.height(16.dp))-- // App Storage Section- PrivacySection(- icon = Icons.Filled.CheckCircle,- question = stringResource(R.string.privacy_q_store),- answer = stringResource(R.string.privacy_a_store),- isPositive = true- )-- Spacer(modifier = Modifier.height(16.dp))-- // Developer Access Section- PrivacySection(- icon = Icons.Filled.CheckCircle,- question = stringResource(R.string.privacy_q_developer),- answer = stringResource(R.string.privacy_a_developer),- isPositive = true- )-- Spacer(modifier = Modifier.height(16.dp))-- // Important Reminder- Card(- modifier = Modifier.fillMaxWidth(),- colors = CardDefaults.cardColors(- containerColor = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.3f)- ),- shape = RoundedCornerShape(12.dp)- ) {- Column(- modifier = Modifier.padding(12.dp)- ) {- Text(- text = stringResource(R.string.privacy_reminder_title),- style = MaterialTheme.typography.titleSmall,- fontWeight = FontWeight.Bold,- color = MaterialTheme.colorScheme.error- )- Spacer(modifier = Modifier.height(8.dp))- Text(- text = stringResource(R.string.privacy_reminder_body),- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onSurface- )- }- }- }- },- confirmButton = {- Button(- onClick = onAccept,- modifier = Modifier.fillMaxWidth(),- shape = RoundedCornerShape(12.dp)- ) {- Text(- text = stringResource(R.string.btn_privacy_accept),- style = MaterialTheme.typography.titleMedium,- fontWeight = FontWeight.Bold,- modifier = Modifier.padding(8.dp)- )- }- }- )-}--@Composable-private fun PrivacySection(- icon: ImageVector,- question: String,- answer: String,- isWarning: Boolean = false,- isPositive: Boolean = false-) {- Card(- modifier = Modifier.fillMaxWidth(),- colors = CardDefaults.cardColors(- containerColor = when {- isWarning -> MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.2f)- isPositive -> MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.2f)- else -> MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)- }- ),- shape = RoundedCornerShape(12.dp)- ) {- Column(- modifier = Modifier.padding(12.dp)- ) {- Row(- verticalAlignment = Alignment.Top,- horizontalArrangement = Arrangement.Start- ) {- Icon(- imageVector = icon,- contentDescription = null,- tint = when {- isWarning -> MaterialTheme.colorScheme.error- isPositive -> MaterialTheme.colorScheme.primary- else -> MaterialTheme.colorScheme.onSurfaceVariant- },- modifier = Modifier.size(20.dp)- )- Spacer(modifier = Modifier.width(8.dp))- Column {- Text(- text = question,- style = MaterialTheme.typography.titleSmall,- fontWeight = FontWeight.Bold,- color = MaterialTheme.colorScheme.onSurface- )- Spacer(modifier = Modifier.height(4.dp))- Text(- text = answer,- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onSurfaceVariant- )- }- }- }- }-}diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleHomeScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleHomeScreen.ktindex ac8c234..c4010e8 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleHomeScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleHomeScreen.kt@@ -45,9 +45,7 @@ import androidx.compose.material.icons.filled.Addimport androidx.compose.material.icons.filled.Assistantimport androidx.compose.material.icons.filled.Layersimport androidx.compose.material.icons.filled.PowerSettingsNew-import androidx.compose.material.icons.filled.Securityimport androidx.compose.material.icons.filled.TouchApp-import androidx.compose.material.icons.filled.Translateimport androidx.compose.material.icons.filled.Tuneimport androidx.compose.material.icons.filled.Widgetsimport androidx.compose.material.icons.rounded.KeyboardArrowDown@@ -125,7 +123,6 @@ import com.akslabs.circletosearch.data.OverlaySegmentimport com.akslabs.circletosearch.ui.SettingsSectionHeaderimport com.akslabs.circletosearch.ui.components.UnifiedSearchMethodSelectorimport com.akslabs.circletosearch.utils.UIPreferences-import dev.davidv.translator.MainActivity as TranslatorMainActivityimport kotlinx.coroutines.delayprivate const val BOTTOM_EDGE_MARKER = "cts_bottom_edge"@@ -165,7 +162,6 @@ fun WobbleHomeScreen(modifier: Modifier = Modifier,wobbleEvent: Int = 0,contentPadding: PaddingValues = PaddingValues(0.dp),- onOpenSetup: () -> Unit = {},onOpenSettings: ((String) -> Unit)? = null,) {val context = LocalContext.current@@ -642,30 +638,6 @@ fun WobbleHomeScreen(modifier = Modifier.fillMaxWidth(),) {Column {- HomeLinkRow(- icon = Icons.Default.Security,- title = stringResource(R.string.home_setup_title),- subtitle = stringResource(R.string.home_setup_subtitle),- onClick = {- WobbleHaptics.performUIHaptic(view)- onOpenSetup()- },- )- HomeRowDivider()- HomeLinkRow(- icon = Icons.Default.Translate,- title = stringResource(R.string.label_translator_title),- subtitle = stringResource(R.string.label_translator_subtitle),- onClick = {- WobbleHaptics.performUIHaptic(view)- runCatching {- context.startActivity(- Intent(context, TranslatorMainActivity::class.java),- )- }- },- )- HomeRowDivider()HomeLinkRow(icon = Icons.Default.Tune,title = stringResource(R.string.title_settings),diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex fb13302..5f5d75f 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -63,11 +63,9 @@<string name="label_set_default_assistant_subtitle">Tap to set it up and see how your device launches assistants.</string><string name="section_customization">CUSTOMIZATION</string><string name="info_lens_needs_google">Lens needs Google App Installed. But Degoogled friends can stick with the versatile Multi-Search Engine mode.</string>- <string name="label_from_akslabs">From AKS-Labs With \u2764\uFE0F</string><string name="toast_could_not_open_link">Could not open link</string><string name="toast_accessibility_settings_error">Could not open Accessibility Settings</string><string name="label_floating_bubble">Floating Bubble</string>- <string name="label_floating_bubble_subtitle">Show a floating button triggers search</string><string name="label_dont_show_again">Don\'t show this again</string><string name="btn_donate">Donate</string>@@ -358,9 +356,6 @@<string name="section_search">SEARCH</string><string name="section_app">APP</string><string name="triggers_card_title">Triggers</string>- <string name="triggers_card_subtitle_none">No triggers configured yet — tap to choose how to launch</string>- <string name="triggers_card_subtitle_list">%1$s</string>- <string name="triggers_more">+%1$d more</string><!-- Settings hierarchy --><string name="settings_cat_triggers_subtitle">Status bar, bubble & hardware buttons</string>@@ -377,8 +372,6 @@<string name="about_source_code">Source code</string><string name="about_source_subtitle">github.com/aks-labs</string><string name="about_donate_subtitle">Support ongoing development</string>- <string name="home_setup_title">Setup & permissions</string>- <string name="home_setup_subtitle">Review permissions and launch triggers</string><string name="wizard_title">Grant permissions to get started</string><string name="wizard_hint">Grant any one to continue</string><string name="wizard_a11y_title">Accessibility</string>