CircleToSearch with multi search engine support for all android
Kotlin
new UI/UX
AKS Labsddb21ccaaae5
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xmlindex 040e4af..29beff4 100644--- a/.idea/deploymentTargetSelector.xml+++ b/.idea/deploymentTargetSelector.xml@@ -4,10 +4,10 @@<selectionStates><SelectionState runConfigName="app"><option name="selectionMode" value="DROPDOWN" />- <DropdownSelection timestamp="2026-03-10T09:36:20.254133900Z">+ <DropdownSelection timestamp="2026-10-09T10:41:10.963894600Z"><Target type="DEFAULT_BOOT"><handle>- <DeviceId pluginId="PhysicalDevice" identifier="serial=42281JEHN12134" />+ <DeviceId pluginId="Wireless" identifier="serviceName=adb-9c872922-KLor6Z" /></handle></Target></DropdownSelection>diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.ktindex 68f647d..708189b 100644--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt@@ -69,8 +69,13 @@ import com.akslabs.circletosearch.ui.components.UnifiedSearchMethodSelectorimport kotlinx.coroutines.launchclass MainActivity : ComponentActivity() {++ private var pendingSettingsPage by mutableStateOf<String?>(null)+ private var navTick by mutableStateOf(0)+override fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)+ pendingSettingsPage = intent.getStringExtra(EXTRA_SETTINGS_PAGE)Toast.makeText(this, getString(R.string.toast_getting_started), Toast.LENGTH_LONG).show()setContent {CircleToSearchTheme {@@ -93,12 +98,30 @@ class MainActivity : ComponentActivity() {})} else {- var currentScreen by remember { mutableStateOf("home") }+ var currentScreen by remember {+ mutableStateOf(if (pendingSettingsPage != null) "settings" else "home")+ }+ LaunchedEffect(navTick) {+ if (navTick > 0 && pendingSettingsPage != null) {+ currentScreen = "settings"+ }+ }androidx.compose.animation.Crossfade(targetState = currentScreen) { screen ->when (screen) {- "settings" -> com.akslabs.circletosearch.ui.OverlaySettingsScreen(onBack = { currentScreen = "home" })+ "settings" -> key(navTick) {+ com.akslabs.circletosearch.ui.OverlaySettingsScreen(+ onBack = {+ pendingSettingsPage = null+ currentScreen = "home"+ },+ initialPage = pendingSettingsPage,+ )+ }else -> SetupScreen(- onSettingsClick = { currentScreen = "settings" }+ onSettingsClick = {+ pendingSettingsPage = null+ currentScreen = "settings"+ })}}@@ -107,6 +130,17 @@ class MainActivity : ComponentActivity() {}}}++ override fun onNewIntent(intent: Intent) {+ super.onNewIntent(intent)+ setIntent(intent)+ pendingSettingsPage = intent.getStringExtra(EXTRA_SETTINGS_PAGE)+ navTick = navTick + 1+ }++ companion object {+ const val EXTRA_SETTINGS_PAGE = "settings_page"+ }}@OptIn(ExperimentalMaterial3Api::class)diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/OverlaySettingsScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/OverlaySettingsScreen.ktindex ec2726e..2c551e0 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/OverlaySettingsScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/OverlaySettingsScreen.kt@@ -71,6 +71,15 @@ private fun SettingsPage.order(): Int = when (this) {SettingsPage.About -> 5}+private fun settingsPageFromName(name: String?): SettingsPage? = when (name) {+ "triggers" -> SettingsPage.Triggers+ "zones" -> SettingsPage.Zones+ "search" -> SettingsPage.Search+ "general" -> SettingsPage.General+ "about" -> SettingsPage.About+ else -> null+}+@Stableprivate class OverlaySettingsState(context: Context) {private val configManager = OverlayConfigurationManager(context)@@ -116,11 +125,19 @@ private class OverlaySettingsState(context: Context) {@Composablefun OverlaySettingsScreen(- onBack: () -> Unit+ onBack: () -> Unit,+ initialPage: String? = null) {val context = LocalContext.currentval state = remember { OverlaySettingsState(context) }- val backStack = remember { mutableStateListOf<SettingsPage>(SettingsPage.Root) }+ val backStack = remember {+ val startPage = settingsPageFromName(initialPage)+ if (startPage != null) {+ mutableStateListOf<SettingsPage>(SettingsPage.Root, startPage)+ } else {+ mutableStateListOf<SettingsPage>(SettingsPage.Root)+ }+ }val pop: () -> Unit = { backStack.removeAt(backStack.lastIndex) }androidx.activity.compose.BackHandler {diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleAppInfoScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleAppInfoScreen.ktindex 53da2c4..57e23a8 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleAppInfoScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleAppInfoScreen.kt@@ -6,6 +6,8 @@ import android.content.pm.ApplicationInfoimport android.net.Uriimport android.provider.Settingsimport android.widget.Toast+import androidx.activity.compose.rememberLauncherForActivityResult+import androidx.activity.result.contract.ActivityResultContractsimport androidx.annotation.StringResimport androidx.compose.animation.core.Animatableimport androidx.compose.animation.core.EaseOut@@ -203,12 +205,16 @@ fun WobbleAppInfoScreen(launchMethods = loadLaunchMethods(context)}+ val settingsLauncher = rememberLauncherForActivityResult(+ ActivityResultContracts.StartActivityForResult(),+ ) {+ refreshPermissions()+ }+val lifecycleOwner = LocalLifecycleOwner.currentDisposableEffect(lifecycleOwner) {- val observer = LifecycleEventObserver { _, event ->- if (event == Lifecycle.Event.ON_RESUME) {- refreshPermissions()- }+ val observer = LifecycleEventObserver { _, _ ->+ refreshPermissions()}lifecycleOwner.lifecycle.addObserver(observer)onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }@@ -226,7 +232,7 @@ fun WobbleAppInfoScreen(onAccept = {showDisclosure = falserunCatching {- context.startActivity(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS))+ settingsLauncher.launch(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS))}.onFailure {Toast.makeText(context,@@ -426,7 +432,7 @@ fun WobbleAppInfoScreen(onClick = {WobbleHaptics.performUIHaptic(view)runCatching {- context.startActivity(Intent(Settings.ACTION_VOICE_INPUT_SETTINGS))+ settingsLauncher.launch(Intent(Settings.ACTION_VOICE_INPUT_SETTINGS))}},)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 c530f3b..a877533 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@@ -1,5 +1,8 @@package com.akslabs.circletosearch.ui.wobblepulldown+import android.content.Context+import android.content.Intent+import android.provider.Settingsimport androidx.compose.animation.animateColorAsStateimport androidx.compose.animation.core.Springimport androidx.compose.animation.core.animateDpAsState@@ -9,6 +12,7 @@ import androidx.compose.animation.core.springimport androidx.compose.animation.core.tweenimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.background+import androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column@@ -24,12 +28,25 @@ import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Icons-import androidx.compose.material.icons.rounded.ChevronRight+import androidx.compose.material.icons.automirrored.filled.VolumeDown+import androidx.compose.material.icons.automirrored.filled.VolumeUp+import androidx.compose.material.icons.filled.Add+import androidx.compose.material.icons.filled.Assistant+import androidx.compose.material.icons.filled.KeyboardArrowRight+import androidx.compose.material.icons.filled.Layers+import androidx.compose.material.icons.filled.PowerSettingsNew+import androidx.compose.material.icons.filled.TouchApp+import androidx.compose.material.icons.filled.Translate+import androidx.compose.material.icons.filled.Tune+import androidx.compose.material.icons.filled.Widgetsimport androidx.compose.material.icons.rounded.KeyboardArrowDownimport androidx.compose.material3.CardDefaultsimport androidx.compose.material3.ExperimentalMaterial3Api+import androidx.compose.material3.FilledTonalButton+import androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme+import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.OutlinedCardimport androidx.compose.material3.Surfaceimport androidx.compose.material3.Text@@ -38,6 +55,7 @@ import androidx.compose.material3.pulltorefresh.rememberPullToRefreshStateimport androidx.compose.runtime.Composableimport androidx.compose.runtime.DisposableEffectimport androidx.compose.runtime.LaunchedEffect+import androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableIntStateOfimport androidx.compose.runtime.mutableStateOf@@ -48,6 +66,7 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.geometry.Offsetimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.graphicsLayer+import androidx.compose.ui.graphics.vector.ImageVectorimport androidx.compose.ui.layout.onGloballyPositionedimport androidx.compose.ui.layout.positionInRootimport androidx.compose.ui.platform.LocalContext@@ -59,13 +78,54 @@ import androidx.compose.ui.text.font.Fontimport androidx.compose.ui.text.font.FontFamilyimport androidx.compose.ui.text.font.FontVariationimport androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dp-import androidx.lifecycle.Lifecycle+import androidx.core.app.ActivityOptionsCompatimport androidx.lifecycle.LifecycleEventObserverimport androidx.lifecycle.compose.LocalLifecycleOwner+import com.akslabs.circletosearch.MainActivityimport com.akslabs.circletosearch.R+import com.akslabs.circletosearch.data.ActionType+import com.akslabs.circletosearch.data.GestureType+import com.akslabs.circletosearch.data.OverlayConfigurationManager+import com.akslabs.circletosearch.data.OverlaySegment+import com.akslabs.circletosearch.ui.SettingsSectionHeader+import com.akslabs.circletosearch.ui.SettingsToggleItem+import com.akslabs.circletosearch.ui.components.UnifiedSearchMethodSelector+import com.akslabs.circletosearch.utils.UIPreferences+import dev.davidv.translator.MainActivity as TranslatorMainActivityimport kotlinx.coroutines.delay+private const val BOTTOM_EDGE_MARKER = "cts_bottom_edge"++private val HW_TRIGGER_KEYS = listOf(+ "trigger_double_vol_up",+ "trigger_double_vol_down",+ "trigger_double_power",+ "trigger_power_vol_up",+ "trigger_power_vol_down",+ "trigger_vol_up_down",+)++private val HW_TRIGGER_TITLES = listOf(+ R.string.trigger_double_vol_up_title,+ R.string.trigger_double_vol_down_title,+ R.string.trigger_double_power_title,+ R.string.trigger_power_vol_up_title,+ R.string.trigger_power_vol_down_title,+ R.string.trigger_vol_up_down_title,+)++private val HW_TRIGGER_ICONS: List<ImageVector>+ get() = listOf(+ Icons.AutoMirrored.Filled.VolumeUp,+ Icons.AutoMirrored.Filled.VolumeDown,+ Icons.Default.PowerSettingsNew,+ Icons.Default.Add,+ Icons.Default.Add,+ Icons.Default.Add,+ )+@OptIn(ExperimentalMaterial3Api::class, ExperimentalTextApi::class)@Composablefun WobbleHomeScreen(@@ -76,6 +136,7 @@ fun WobbleHomeScreen() {val context = LocalContext.currentval view = LocalView.current+ val density = LocalDensity.currentval pullRefreshState = rememberPullToRefreshState()var isRefreshing by remember { mutableStateOf(false) }@@ -111,27 +172,104 @@ fun WobbleHomeScreen(}}- var permissionGranted by remember {- mutableStateOf(isA11yGranted(context) || isAssistantGranted(context))+ val appPrefs = remember {+ context.getSharedPreferences("app_prefs", Context.MODE_PRIVATE)+ }+ val configManager = remember { OverlayConfigurationManager(context) }+ val uiPreferences = remember { UIPreferences(context) }+ var a11yGranted by remember { mutableStateOf(isA11yGranted(context)) }+ var assistantGranted by remember { mutableStateOf(isAssistantGranted(context)) }+ var overlayEnabled by remember { mutableStateOf(configManager.getConfig().isEnabled) }+ var bubbleEnabled by remember { mutableStateOf(appPrefs.getBoolean("bubble_enabled", false)) }+ var hwTriggers by remember {+ mutableStateOf(HW_TRIGGER_KEYS.associateWith { appPrefs.getBoolean(it, false) })+ }+ var showHwSheet by remember { mutableStateOf(false) }+ var bottomEdgeOn by remember {+ mutableStateOf(+ configManager.getConfig().segments+ .any { it.gestureData[GestureType.LONG_PRESS] == BOTTOM_EDGE_MARKER },+ )+ }+ val hwEnabledCount = hwTriggers.values.count { it }+ val running = assistantGranted ||+ (a11yGranted && (overlayEnabled || bubbleEnabled || bottomEdgeOn || hwEnabledCount > 0))++ val refreshHomeState = {+ a11yGranted = isA11yGranted(context)+ assistantGranted = isAssistantGranted(context)+ overlayEnabled = configManager.getConfig().isEnabled+ bubbleEnabled = appPrefs.getBoolean("bubble_enabled", false)+ hwTriggers = HW_TRIGGER_KEYS.associateWith { appPrefs.getBoolean(it, false) }+ bottomEdgeOn = configManager.getConfig().segments+ .any { it.gestureData[GestureType.LONG_PRESS] == BOTTOM_EDGE_MARKER }}+val lifecycleOwner = LocalLifecycleOwner.currentDisposableEffect(lifecycleOwner) {- val observer = LifecycleEventObserver { _, event ->- if (event == Lifecycle.Event.ON_RESUME) {- permissionGranted = isA11yGranted(context) || isAssistantGranted(context)- }- }+ val observer = LifecycleEventObserver { _, _ -> refreshHomeState() }lifecycleOwner.lifecycle.addObserver(observer)onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }}LaunchedEffect(Unit) {while (true) {- permissionGranted = isA11yGranted(context) || isAssistantGranted(context)+ refreshHomeState()delay(500)}}+ val openSettingsPage: (String) -> Unit = { page ->+ val intent = Intent(context, MainActivity::class.java)+ .putExtra(MainActivity.EXTRA_SETTINGS_PAGE, page)+ val options = ActivityOptionsCompat.makeCustomAnimation(+ context,+ R.anim.anim_slide_in_top,+ R.anim.anim_stay,+ )+ context.startActivity(intent, options.toBundle())+ }++ val setOverlayEnabled: (Boolean) -> Unit = { on ->+ configManager.saveConfig(configManager.getConfig().copy(isEnabled = on))+ overlayEnabled = on+ }++ val setBubbleEnabled: (Boolean) -> Unit = { on ->+ appPrefs.edit().putBoolean("bubble_enabled", on).apply()+ bubbleEnabled = on+ }++ val onHwToggle: (String, Boolean) -> Unit = { key, checked ->+ appPrefs.edit().putBoolean(key, checked).apply()+ hwTriggers = hwTriggers + (key to checked)+ }++ val setBottomEdge: (Boolean) -> Unit = { on ->+ val cfg = configManager.getConfig()+ val segments = cfg.segments.toMutableList()+ if (on) {+ if (segments.none { it.gestureData[GestureType.LONG_PRESS] == BOTTOM_EDGE_MARKER }) {+ val dm = context.resources.displayMetrics+ val stripPx = with(density) { 48.dp.roundToPx() }+ segments.add(+ OverlaySegment(+ width = dm.widthPixels,+ height = stripPx,+ xOffset = 0,+ yOffset = (dm.heightPixels - stripPx).coerceAtLeast(0),+ gestures = mutableMapOf(GestureType.LONG_PRESS to ActionType.CTS_AUTO),+ gestureData = mutableMapOf(GestureType.LONG_PRESS to BOTTOM_EDGE_MARKER),+ ),+ )+ }+ } else {+ segments.removeAll { it.gestureData[GestureType.LONG_PRESS] == BOTTOM_EDGE_MARKER }+ }+ configManager.saveConfig(cfg.copy(segments = segments))+ bottomEdgeOn = on+ }+LaunchedEffect(wobbleEvent) {if (wobbleEvent > 0) {WobbleHaptics.performUIHaptic(view)@@ -139,7 +277,6 @@ fun WobbleHomeScreen(}}- val density = LocalDensity.currentval topBlurHeightPx = with(density) { contentPadding.calculateTopPadding().toPx() * 1.5f }val bottomBlurHeightPx = with(density) { 120.dp.toPx() }@@ -181,7 +318,7 @@ fun WobbleHomeScreen(val containerColor by animateColorAsState(targetValue = when {thresholdPassed -> MaterialTheme.colorScheme.primary- permissionGranted -> MaterialTheme.colorScheme.primaryContainer+ running -> MaterialTheme.colorScheme.primaryContainerelse -> MaterialTheme.colorScheme.surfaceContainerLow},animationSpec = tween(durationMillis = 300),@@ -191,7 +328,7 @@ fun WobbleHomeScreen(val contentColor by animateColorAsState(targetValue = when {thresholdPassed -> MaterialTheme.colorScheme.onPrimary- permissionGranted -> MaterialTheme.colorScheme.onPrimaryContainer+ running -> MaterialTheme.colorScheme.onPrimaryContainerelse -> MaterialTheme.colorScheme.primary},animationSpec = tween(durationMillis = 300),@@ -199,7 +336,7 @@ fun WobbleHomeScreen()val borderColor by animateColorAsState(- targetValue = if (thresholdPassed || permissionGranted) {+ targetValue = if (thresholdPassed || running) {Color.Transparent} else {MaterialTheme.colorScheme.outlineVariant@@ -257,7 +394,7 @@ fun WobbleHomeScreen(val heroColor by animateColorAsState(targetValue = when {thresholdPassed -> MaterialTheme.colorScheme.onPrimary- permissionGranted -> MaterialTheme.colorScheme.onPrimaryContainer+ running -> MaterialTheme.colorScheme.onPrimaryContainerelse -> MaterialTheme.colorScheme.onSurface},animationSpec = tween(durationMillis = 300),@@ -342,7 +479,7 @@ fun WobbleHomeScreen(scaleY = textScale},) {- if (permissionGranted) {+ if (running) {Text(text = stringResource(R.string.home_running_title),style = heroStyle,@@ -367,65 +504,280 @@ fun WobbleHomeScreen(}}- val categories = listOf(- "Display & Ambient",- "Sound & Vibration",- "Notifications & Lighting",- "Battery & Power",- "System & Security",- )+ item {+ Column {+ SettingsSectionHeader(title = stringResource(R.string.section_launch_methods))+ if (!a11yGranted) {+ Text(+ text = stringResource(R.string.trigger_hw_notice),+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.error,+ modifier = Modifier.padding(bottom = 8.dp),+ )+ }+ Surface(+ shape = RoundedCornerShape(28.dp),+ color = MaterialTheme.colorScheme.surfaceContainerLow,+ modifier = Modifier.fillMaxWidth(),+ ) {+ Column {+ SettingsToggleItem(+ title = stringResource(R.string.trigger_statusbar_title),+ subtitle = stringResource(R.string.trigger_statusbar_subtitle),+ icon = Icons.Default.Layers,+ checked = overlayEnabled,+ onCheckedChange = { setOverlayEnabled(it) },+ )+ HomeRowDivider()+ SettingsToggleItem(+ title = stringResource(R.string.label_floating_bubble),+ subtitle = stringResource(R.string.trigger_bubble_subtitle),+ icon = Icons.Default.TouchApp,+ checked = bubbleEnabled,+ onCheckedChange = { setBubbleEnabled(it) },+ )+ HomeRowDivider()+ SettingsToggleItem(+ title = stringResource(R.string.home_bottom_edge_title),+ subtitle = stringResource(R.string.home_bottom_edge_subtitle),+ icon = Icons.Rounded.KeyboardArrowDown,+ checked = bottomEdgeOn,+ onCheckedChange = { setBottomEdge(it) },+ )+ HomeRowDivider()+ HomeAssistantRow(+ assistantGranted = assistantGranted,+ onSetUp = {+ WobbleHaptics.performUIHaptic(view)+ runCatching {+ context.startActivity(Intent(Settings.ACTION_VOICE_INPUT_SETTINGS))+ }+ },+ )+ HomeRowDivider()+ HomeLinkRow(+ icon = Icons.AutoMirrored.Filled.VolumeUp,+ title = stringResource(R.string.home_hw_title),+ subtitle = stringResource(+ if (hwEnabledCount > 0) R.string.home_hw_count else R.string.home_hw_none,+ hwEnabledCount,+ ),+ onClick = { showHwSheet = true },+ )+ HomeRowDivider()+ HomeLinkRow(+ icon = Icons.Default.Widgets,+ title = stringResource(R.string.trigger_qs_title),+ subtitle = stringResource(R.string.trigger_qs_subtitle),+ )+ }+ }+ }+ }- items(categories.size) { index ->- val category = categories[index]- Column(+ item {+ Surface(+ shape = RoundedCornerShape(28.dp),+ color = MaterialTheme.colorScheme.surfaceContainerLow,modifier = Modifier.fillMaxWidth(),- verticalArrangement = Arrangement.spacedBy(8.dp),) {- Text(- text = category,- style = MaterialTheme.typography.titleMedium,- color = MaterialTheme.colorScheme.primary,+ UnifiedSearchMethodSelector(+ uiPreferences = uiPreferences,+ modifier = Modifier.padding(16.dp),)+ }+ }++ item {+ Column {+ SettingsSectionHeader(title = stringResource(R.string.home_section_more))Surface(- shape = RoundedCornerShape(24.dp),+ shape = RoundedCornerShape(28.dp),color = MaterialTheme.colorScheme.surfaceContainerLow,modifier = Modifier.fillMaxWidth(),) {- Column(- modifier = Modifier.padding(16.dp),- verticalArrangement = Arrangement.spacedBy(12.dp),- ) {- repeat(3) { itemIdx ->- Row(- modifier = Modifier- .fillMaxWidth()- .padding(vertical = 4.dp),- verticalAlignment = Alignment.CenterVertically,- horizontalArrangement = Arrangement.SpaceBetween,- ) {- Column {- Text(- text = "Sample Setting ${index * 3 + itemIdx + 1}",- style = MaterialTheme.typography.bodyLarge,- fontWeight = FontWeight.Medium,- )- Text(- text = "Configuration options for $category",- style = MaterialTheme.typography.bodySmall,- color = MaterialTheme.colorScheme.onSurfaceVariant,+ Column {+ 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),)}- Icon(- imageVector = Icons.Rounded.ChevronRight,- contentDescription = null,- tint = MaterialTheme.colorScheme.onSurfaceVariant,- )- }- }+ },+ )+ HomeRowDivider()+ HomeLinkRow(+ icon = Icons.Default.Tune,+ title = stringResource(R.string.title_settings),+ subtitle = null,+ onClick = { openSettingsPage("") },+ )}}}}}}++ if (showHwSheet) {+ HomeHwSheet(+ hwTriggers = hwTriggers,+ a11yGranted = a11yGranted,+ onToggle = onHwToggle,+ onDismiss = { showHwSheet = false },+ )+ }+}++@Composable+private fun HomeRowDivider() {+ HorizontalDivider(+ modifier = Modifier.padding(horizontal = 16.dp),+ thickness = 0.5.dp,+ color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.1f),+ )+}++@Composable+private fun HomeLinkRow(+ icon: ImageVector,+ title: String,+ subtitle: String?,+ modifier: Modifier = Modifier,+ onClick: (() -> Unit)? = null,+) {+ Row(+ modifier = modifier+ .fillMaxWidth()+ .let { if (onClick != null) it.clickable { onClick() } else it }+ .padding(horizontal = 16.dp, vertical = 12.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ Icon(+ imageVector = icon,+ contentDescription = null,+ modifier = Modifier.size(24.dp),+ tint = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ Spacer(modifier = Modifier.width(16.dp))+ Column(modifier = Modifier.weight(1f)) {+ Text(text = title, style = MaterialTheme.typography.bodyLarge)+ if (subtitle != null) {+ Text(+ text = subtitle,+ style = MaterialTheme.typography.bodyMedium,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ maxLines = 1,+ overflow = TextOverflow.Ellipsis,+ )+ }+ }+ if (onClick != null) {+ Icon(+ imageVector = Icons.Default.KeyboardArrowRight,+ contentDescription = null,+ tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),+ )+ }+ }+}++@Composable+private fun HomeAssistantRow(+ assistantGranted: Boolean,+ onSetUp: () -> Unit,+ modifier: Modifier = Modifier,+) {+ Row(+ modifier = modifier+ .fillMaxWidth()+ .padding(horizontal = 16.dp, vertical = 12.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ Icon(+ imageVector = Icons.Default.Assistant,+ contentDescription = null,+ modifier = Modifier.size(24.dp),+ tint = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ Spacer(modifier = Modifier.width(16.dp))+ Column(modifier = Modifier.weight(1f)) {+ Text(+ text = stringResource(R.string.trigger_name_assistant),+ style = MaterialTheme.typography.bodyLarge,+ )+ Text(+ text = stringResource(+ if (assistantGranted) R.string.home_assistant_ready_subtitle+ else R.string.home_assistant_setup_subtitle,+ ),+ style = MaterialTheme.typography.bodyMedium,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ }+ Spacer(modifier = Modifier.width(8.dp))+ if (assistantGranted) {+ Surface(+ shape = RoundedCornerShape(50),+ color = MaterialTheme.colorScheme.secondaryContainer,+ ) {+ Text(+ text = stringResource(R.string.home_ready),+ style = MaterialTheme.typography.labelMedium,+ fontWeight = FontWeight.SemiBold,+ color = MaterialTheme.colorScheme.onSecondaryContainer,+ modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp),+ )+ }+ } else {+ FilledTonalButton(onClick = onSetUp) {+ Text(stringResource(R.string.home_set_up))+ }+ }+ }}++@OptIn(ExperimentalMaterial3Api::class)+@Composable+private fun HomeHwSheet(+ hwTriggers: Map<String, Boolean>,+ a11yGranted: Boolean,+ onToggle: (String, Boolean) -> Unit,+ onDismiss: () -> Unit,+) {+ ModalBottomSheet(onDismissRequest = onDismiss) {+ Column(modifier = Modifier.padding(bottom = 32.dp)) {+ Text(+ text = stringResource(R.string.home_hw_title),+ style = MaterialTheme.typography.titleMedium,+ fontWeight = FontWeight.SemiBold,+ modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),+ )+ if (!a11yGranted) {+ Text(+ text = stringResource(R.string.trigger_hw_notice),+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.error,+ modifier = Modifier.padding(horizontal = 24.dp, vertical = 4.dp),+ )+ }+ HW_TRIGGER_KEYS.forEachIndexed { index, key ->+ if (index > 0) HomeRowDivider()+ SettingsToggleItem(+ title = stringResource(HW_TRIGGER_TITLES[index]),+ subtitle = stringResource(R.string.trigger_hw_subtitle),+ icon = HW_TRIGGER_ICONS[index],+ checked = hwTriggers[key] ?: false,+ onCheckedChange = { onToggle(key, it) },+ )+ }+ }+ }+}++diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobblePermissions.kt b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobblePermissions.ktindex 93edb82..ec3d129 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobblePermissions.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobblePermissions.kt@@ -1,14 +1,25 @@package com.akslabs.circletosearch.ui.wobblepulldown+import android.accessibilityservice.AccessibilityServiceInfoimport android.app.role.RoleManagerimport android.content.Contextimport android.os.Buildimport android.provider.Settings+import android.view.accessibility.AccessibilityManager+import com.akslabs.circletosearch.CircleToSearchAccessibilityServiceimport com.akslabs.circletosearch.isAccessibilityServiceEnabledimport com.akslabs.circletosearch.isDefaultAssistant-internal fun isA11yGranted(context: Context): Boolean =- isAccessibilityServiceEnabled(context)+internal fun isA11yGranted(context: Context): Boolean {+ if (isAccessibilityServiceEnabled(context)) return true+ if (CircleToSearchAccessibilityService.instance != null) return true+ return runCatching {+ val manager = context.getSystemService(Context.ACCESSIBILITY_SERVICE)+ as? AccessibilityManager ?: return false+ manager.getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_ALL_MASK)+ .any { it.resolveInfo?.serviceInfo?.packageName == context.packageName }+ }.getOrDefault(false)+}internal fun isAssistantGranted(context: Context): Boolean {if (isDefaultAssistant(context)) return truediff --git a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleSetupWizard.kt b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleSetupWizard.ktindex 02562d3..5bdd16f 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleSetupWizard.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleSetupWizard.kt@@ -2,6 +2,8 @@ package com.akslabs.circletosearch.ui.wobblepulldownimport android.content.Intentimport android.provider.Settings+import androidx.activity.compose.rememberLauncherForActivityResult+import androidx.activity.result.contract.ActivityResultContractsimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column@@ -41,7 +43,6 @@ import androidx.compose.ui.platform.LocalViewimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.unit.dp-import androidx.lifecycle.Lifecycleimport androidx.lifecycle.LifecycleEventObserverimport androidx.lifecycle.compose.LocalLifecycleOwnerimport com.akslabs.circletosearch.R@@ -61,12 +62,16 @@ fun WobbleSetupWizard(modifier: Modifier = Modifier) {assistantGranted = isAssistantGranted(context)}+ val settingsLauncher = rememberLauncherForActivityResult(+ ActivityResultContracts.StartActivityForResult(),+ ) {+ refreshPermissions()+ }+val lifecycleOwner = LocalLifecycleOwner.currentDisposableEffect(lifecycleOwner) {- val observer = LifecycleEventObserver { _, event ->- if (event == Lifecycle.Event.ON_RESUME) {- refreshPermissions()- }+ val observer = LifecycleEventObserver { _, _ ->+ refreshPermissions()}lifecycleOwner.lifecycle.addObserver(observer)onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }@@ -84,7 +89,7 @@ fun WobbleSetupWizard(modifier: Modifier = Modifier) {onAccept = {showDisclosure = falserunCatching {- context.startActivity(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS))+ settingsLauncher.launch(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS))}},onDismiss = { showDisclosure = false },@@ -140,7 +145,7 @@ fun WobbleSetupWizard(modifier: Modifier = Modifier) {onClick = {WobbleHaptics.performUIHaptic(view)runCatching {- context.startActivity(Intent(Settings.ACTION_VOICE_INPUT_SETTINGS))+ settingsLauncher.launch(Intent(Settings.ACTION_VOICE_INPUT_SETTINGS))}},)diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex b1d6eac..b7eb157 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -398,6 +398,16 @@<string name="wizard_granted">Granted</string><string name="home_running_title">Circle to search</string><string name="home_running_state">running</string>+ <string name="home_section_more">More</string>+ <string name="home_bottom_edge_title">Bottom edge long-press</string>+ <string name="home_bottom_edge_subtitle">Press and hold near the bottom edge of any screen</string>+ <string name="home_assistant_setup_subtitle">Set as default assistant to use the home button and swipes</string>+ <string name="home_assistant_ready_subtitle">Home button and bottom-edge gestures work automatically</string>+ <string name="home_ready">Ready</string>+ <string name="home_set_up">Set up</string>+ <string name="home_hw_title">Hardware buttons</string>+ <string name="home_hw_count">%1$d on</string>+ <string name="home_hw_none">None on</string><string name="info_screen_title">App Info</string><string name="section_permissions">PERMISSIONS</string><string name="info_section_about">ABOUT</string>