CircleToSearch with multi search engine support for all android
Kotlin
fix: container colors
AKS Labsb64a1787704c
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 61da5f1..53da2c4 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@@ -97,12 +97,13 @@ import androidx.lifecycle.LifecycleEventObserverimport androidx.lifecycle.compose.LocalLifecycleOwnerimport com.akslabs.circletosearch.Rimport com.akslabs.circletosearch.data.OverlayConfigurationManager-import com.akslabs.circletosearch.isAccessibilityServiceEnabled-import com.akslabs.circletosearch.isDefaultAssistantimport com.akslabs.circletosearch.ui.components.AccessibilityDisclosureDialog+import kotlinx.coroutines.delayimport kotlinx.coroutines.launchprivate const val GITHUB_URL = "https://github.com/aks-labs"+private const val MAX_PULL_PX = 160f+private const val PULL_HAPTIC_PX = 120fprivate enum class TriggerStatus { ACTIVE, NEEDS_A11Y, OFF }@@ -140,12 +141,12 @@ private fun loadAppInfo(context: Context): AppInfoData {}private fun loadLaunchMethods(context: Context): List<LaunchMethod> {- val a11y = isAccessibilityServiceEnabled(context)+ val a11y = isA11yGranted(context)val overlayOn = OverlayConfigurationManager(context).getConfig().isEnabledval appPrefs = context.getSharedPreferences("app_prefs", Context.MODE_PRIVATE)val bubbleOn = appPrefs.getBoolean("bubble_enabled", false)val hwCount = HW_TRIGGER_KEYS.count { appPrefs.getBoolean(it, false) }- val assistant = isDefaultAssistant(context)+ val assistant = isAssistantGranted(context)fun status(configured: Boolean): TriggerStatus = when {!configured -> TriggerStatus.OFF@@ -191,24 +192,35 @@ fun WobbleAppInfoScreen(val scrollState = rememberScrollState()val overscrollOffset = remember { Animatable(0f) }- var a11yGranted by remember { mutableStateOf(isAccessibilityServiceEnabled(context)) }- var assistantGranted by remember { mutableStateOf(isDefaultAssistant(context)) }+ var a11yGranted by remember { mutableStateOf(isA11yGranted(context)) }+ var assistantGranted by remember { mutableStateOf(isAssistantGranted(context)) }var launchMethods by remember { mutableStateOf(loadLaunchMethods(context)) }var showDisclosure by remember { mutableStateOf(false) }+ val refreshPermissions = {+ a11yGranted = isA11yGranted(context)+ assistantGranted = isAssistantGranted(context)+ launchMethods = loadLaunchMethods(context)+ }+val lifecycleOwner = LocalLifecycleOwner.currentDisposableEffect(lifecycleOwner) {val observer = LifecycleEventObserver { _, event ->if (event == Lifecycle.Event.ON_RESUME) {- a11yGranted = isAccessibilityServiceEnabled(context)- assistantGranted = isDefaultAssistant(context)- launchMethods = loadLaunchMethods(context)+ refreshPermissions()}}lifecycleOwner.lifecycle.addObserver(observer)onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }}+ LaunchedEffect(Unit) {+ while (true) {+ refreshPermissions()+ delay(500)+ }+ }+if (showDisclosure) {AccessibilityDisclosureDialog(onAccept = {@@ -244,12 +256,12 @@ fun WobbleAppInfoScreen(override fun onPostScroll(consumed: Offset, available: Offset, source: NestedScrollSource): Offset {if (available.y > 0 && scrollState.value == 0) {val prevValue = overscrollOffset.value- if (prevValue >= 350f) return Offset.Zero+ if (prevValue >= MAX_PULL_PX) return Offset.Zero- val newValue = (prevValue + available.y * 0.5f).coerceAtMost(350f)+ val newValue = (prevValue + available.y * 0.5f).coerceAtMost(MAX_PULL_PX)scope.launch { overscrollOffset.snapTo(newValue) }- if (prevValue < 300f && newValue >= 300f) {+ if (prevValue < PULL_HAPTIC_PX && newValue >= PULL_HAPTIC_PX) {WobbleHaptics.performUIHaptic(view)}@@ -343,6 +355,7 @@ fun WobbleAppInfoScreen(val naturalIconY = with(density) { (heroTop + 12.dp).toPx() }val naturalNameX = (maxWpx - nameSize.width) / 2fval naturalNameY = with(density) { (heroTop + 12.dp + iconExpanded + 24.dp).toPx() }+ val iconExpandedPx = with(density) { iconExpanded.toPx() }val iconCollapsedPx = with(density) { iconCollapsed.toPx() }val collapsedNameX = slotPos.value.x + iconCollapsedPx + with(density) { nameGap.toPx() }val iconScale = (with(density) { iconCollapsed.toPx() }) / (with(density) { iconExpanded.toPx() })@@ -581,8 +594,10 @@ fun WobbleAppInfoScreen(transformOrigin = TransformOrigin(0f, 0f)scaleX = s * pullScalescaleY = s * pullScale- translationX = (slotPos.value.x - naturalIconX) * p- translationY = (slotPos.value.y - naturalIconY) * p + contentOffsetState.toPx()+ translationX = (slotPos.value.x - naturalIconX) * p -+ iconExpandedPx * (pullScale - 1f) / 2f+ translationY = (slotPos.value.y - naturalIconY) * p + contentOffsetState.toPx() -+ iconExpandedPx * (pullScale - 1f) / 2falpha = contentAlphaState}@@ -624,8 +639,10 @@ fun WobbleAppInfoScreen(transformOrigin = TransformOrigin(0f, 0f)scaleX = s * pullScalescaleY = s * pullScale- translationX = (collapsedNameX - naturalNameX) * p- translationY = (collapsedNameY - naturalNameY) * p + contentOffsetState.toPx()+ translationX = (collapsedNameX - naturalNameX) * p -+ nameSize.width * (pullScale - 1f) / 2f+ translationY = (collapsedNameY - naturalNameY) * p + contentOffsetState.toPx() -+ nameSize.height * (pullScale - 1f) / 2falpha = contentAlphaState},)diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleDeviceInfoActivity.kt b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleDeviceInfoActivity.ktindex 9413ead..7c22ff0 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleDeviceInfoActivity.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleDeviceInfoActivity.kt@@ -7,10 +7,11 @@ import androidx.activity.compose.setContentimport androidx.activity.enableEdgeToEdgeimport androidx.lifecycle.DefaultLifecycleObserverimport androidx.lifecycle.LifecycleOwner+import androidx.lifecycle.lifecycleScopeimport com.akslabs.circletosearch.R-import com.akslabs.circletosearch.isAccessibilityServiceEnabled-import com.akslabs.circletosearch.isDefaultAssistantimport com.akslabs.circletosearch.ui.theme.CircleToSearchTheme+import kotlinx.coroutines.delay+import kotlinx.coroutines.launchclass WobbleDeviceInfoActivity : ComponentActivity() {@@ -37,18 +38,19 @@ class WobbleDeviceInfoActivity : ComponentActivity() {lifecycle.addObserver(object : DefaultLifecycleObserver {override fun onResume(owner: LifecycleOwner) {- if (wizardMode &&- (isAccessibilityServiceEnabled(applicationContext) ||- isDefaultAssistant(applicationContext))- ) {- setResult(RESULT_OK)- finish()- @Suppress("DEPRECATION")- overridePendingTransition(R.anim.anim_stay, R.anim.anim_slide_out_top)- }+ maybeAutoDismiss()}})+ if (wizardMode) {+ lifecycleScope.launch {+ while (true) {+ delay(500)+ maybeAutoDismiss()+ }+ }+ }+setContent {CircleToSearchTheme {if (wizardMode) {@@ -66,6 +68,22 @@ class WobbleDeviceInfoActivity : ComponentActivity() {}}+ override fun onWindowFocusChanged(hasFocus: Boolean) {+ super.onWindowFocusChanged(hasFocus)+ if (hasFocus) maybeAutoDismiss()+ }++ private fun maybeAutoDismiss() {+ if (wizardMode &&+ (isA11yGranted(applicationContext) || isAssistantGranted(applicationContext))+ ) {+ setResult(RESULT_OK)+ finish()+ @Suppress("DEPRECATION")+ overridePendingTransition(R.anim.anim_stay, R.anim.anim_slide_out_top)+ }+ }+companion object {const val EXTRA_SETUP_WIZARD = "setup_wizard"}diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleHomeDemoActivity.kt b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleHomeDemoActivity.ktindex 7262c44..882b0c2 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleHomeDemoActivity.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobbleHomeDemoActivity.kt@@ -20,8 +20,6 @@ import androidx.compose.runtime.setValueimport androidx.compose.ui.platform.LocalContextimport androidx.core.app.ActivityOptionsCompatimport com.akslabs.circletosearch.R-import com.akslabs.circletosearch.isAccessibilityServiceEnabled-import com.akslabs.circletosearch.isDefaultAssistantimport com.akslabs.circletosearch.ui.theme.CircleToSearchThemeclass WobbleHomeDemoActivity : ComponentActivity() {@@ -52,7 +50,7 @@ private fun WobbleDemoContent(onExit: () -> Unit) {}LaunchedEffect(Unit) {- val granted = isAccessibilityServiceEnabled(context) || isDefaultAssistant(context)+ val granted = isA11yGranted(context) || isAssistantGranted(context)if (!granted) {val intent = Intent(context, WobbleDeviceInfoActivity::class.java).putExtra(WobbleDeviceInfoActivity.EXTRA_SETUP_WIZARD, true)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 a13859e..c530f3b 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@@ -64,8 +64,7 @@ import androidx.lifecycle.Lifecycleimport androidx.lifecycle.LifecycleEventObserverimport androidx.lifecycle.compose.LocalLifecycleOwnerimport com.akslabs.circletosearch.R-import com.akslabs.circletosearch.isAccessibilityServiceEnabled-import com.akslabs.circletosearch.isDefaultAssistant+import kotlinx.coroutines.delay@OptIn(ExperimentalMaterial3Api::class, ExperimentalTextApi::class)@Composable@@ -113,20 +112,26 @@ fun WobbleHomeScreen(}var permissionGranted by remember {- mutableStateOf(isAccessibilityServiceEnabled(context) || isDefaultAssistant(context))+ mutableStateOf(isA11yGranted(context) || isAssistantGranted(context))}val lifecycleOwner = LocalLifecycleOwner.currentDisposableEffect(lifecycleOwner) {val observer = LifecycleEventObserver { _, event ->if (event == Lifecycle.Event.ON_RESUME) {- permissionGranted = isAccessibilityServiceEnabled(context) ||- isDefaultAssistant(context)+ permissionGranted = isA11yGranted(context) || isAssistantGranted(context)}}lifecycleOwner.lifecycle.addObserver(observer)onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }}+ LaunchedEffect(Unit) {+ while (true) {+ permissionGranted = isA11yGranted(context) || isAssistantGranted(context)+ delay(500)+ }+ }+LaunchedEffect(wobbleEvent) {if (wobbleEvent > 0) {WobbleHaptics.performUIHaptic(view)@@ -174,19 +179,31 @@ fun WobbleHomeScreen()val containerColor by animateColorAsState(- targetValue = if (thresholdPassed) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.surfaceContainerLow,+ targetValue = when {+ thresholdPassed -> MaterialTheme.colorScheme.primary+ permissionGranted -> MaterialTheme.colorScheme.primaryContainer+ else -> MaterialTheme.colorScheme.surfaceContainerLow+ },animationSpec = tween(durationMillis = 300),label = "containerColor",)val contentColor by animateColorAsState(- targetValue = if (thresholdPassed) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.primary,+ targetValue = when {+ thresholdPassed -> MaterialTheme.colorScheme.onPrimary+ permissionGranted -> MaterialTheme.colorScheme.onPrimaryContainer+ else -> MaterialTheme.colorScheme.primary+ },animationSpec = tween(durationMillis = 300),label = "contentColor",)val borderColor by animateColorAsState(- targetValue = if (thresholdPassed) Color.Transparent else MaterialTheme.colorScheme.outlineVariant,+ targetValue = if (thresholdPassed || permissionGranted) {+ Color.Transparent+ } else {+ MaterialTheme.colorScheme.outlineVariant+ },animationSpec = tween(durationMillis = 300),label = "borderColor",)@@ -236,6 +253,17 @@ fun WobbleHomeScreen(}}+ val heroStyle = MaterialTheme.typography.titleMedium.copy(fontFamily = fontFamily)+ val heroColor by animateColorAsState(+ targetValue = when {+ thresholdPassed -> MaterialTheme.colorScheme.onPrimary+ permissionGranted -> MaterialTheme.colorScheme.onPrimaryContainer+ else -> MaterialTheme.colorScheme.onSurface+ },+ animationSpec = tween(durationMillis = 300),+ label = "heroColor",+ )+LazyColumn(modifier = Modifier.fillMaxSize()@@ -268,7 +296,7 @@ fun WobbleHomeScreen(),colors = CardDefaults.outlinedCardColors(containerColor = containerColor,- contentColor = if (thresholdPassed) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onSurface,+ contentColor = heroColor,),border = BorderStroke(1.dp, borderColor),) {@@ -298,15 +326,8 @@ fun WobbleHomeScreen(Spacer(modifier = Modifier.width(8.dp))}}- Text(- text = if (permissionGranted) {- stringResource(R.string.home_running)- } else {- deviceInfo.deviceName- },- style = MaterialTheme.typography.titleMedium.copy(- fontFamily = fontFamily,- ),+ Column(+ horizontalAlignment = Alignment.CenterHorizontally,modifier = Modifier.onGloballyPositioned { coords ->val pos = coords.positionInRoot()@@ -320,8 +341,26 @@ fun WobbleHomeScreen(scaleX = textScalescaleY = textScale},- color = if (thresholdPassed) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onSurface,- )+ ) {+ if (permissionGranted) {+ Text(+ text = stringResource(R.string.home_running_title),+ style = heroStyle,+ color = heroColor,+ )+ Text(+ text = stringResource(R.string.home_running_state),+ style = heroStyle,+ color = heroColor,+ )+ } else {+ Text(+ text = deviceInfo.deviceName,+ style = heroStyle,+ color = heroColor,+ )+ }+ }}}}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.ktnew file mode 100644index 0000000..93edb82--- /dev/null+++ b/app/src/main/java/com/akslabs/circletosearch/ui/wobblepulldown/WobblePermissions.kt@@ -0,0 +1,30 @@+package com.akslabs.circletosearch.ui.wobblepulldown++import android.app.role.RoleManager+import android.content.Context+import android.os.Build+import android.provider.Settings+import com.akslabs.circletosearch.isAccessibilityServiceEnabled+import com.akslabs.circletosearch.isDefaultAssistant++internal fun isA11yGranted(context: Context): Boolean =+ isAccessibilityServiceEnabled(context)++internal fun isAssistantGranted(context: Context): Boolean {+ if (isDefaultAssistant(context)) return true+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {+ runCatching {+ val roleManager = context.getSystemService(RoleManager::class.java)+ if (roleManager != null && roleManager.isRoleHeld(RoleManager.ROLE_ASSISTANT)) {+ return true+ }+ }+ }+ return runCatching {+ val voiceInteraction = Settings.Secure.getString(+ context.contentResolver,+ "voice_interaction_service",+ )+ voiceInteraction != null && voiceInteraction.substringBefore('/') == context.packageName+ }.getOrDefault(false)+}diff --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 419bbd9..02562d3 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@@ -28,6 +28,7 @@ import androidx.compose.material3.Surfaceimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.DisposableEffect+import androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.remember@@ -44,30 +45,40 @@ import androidx.lifecycle.Lifecycleimport androidx.lifecycle.LifecycleEventObserverimport androidx.lifecycle.compose.LocalLifecycleOwnerimport com.akslabs.circletosearch.R-import com.akslabs.circletosearch.isAccessibilityServiceEnabled-import com.akslabs.circletosearch.isDefaultAssistantimport com.akslabs.circletosearch.ui.components.AccessibilityDisclosureDialog+import kotlinx.coroutines.delay@Composablefun WobbleSetupWizard(modifier: Modifier = Modifier) {val context = LocalContext.currentval view = LocalView.current- var a11yGranted by remember { mutableStateOf(isAccessibilityServiceEnabled(context)) }- var assistantGranted by remember { mutableStateOf(isDefaultAssistant(context)) }+ var a11yGranted by remember { mutableStateOf(isA11yGranted(context)) }+ var assistantGranted by remember { mutableStateOf(isAssistantGranted(context)) }var showDisclosure by remember { mutableStateOf(false) }+ val refreshPermissions = {+ a11yGranted = isA11yGranted(context)+ assistantGranted = isAssistantGranted(context)+ }+val lifecycleOwner = LocalLifecycleOwner.currentDisposableEffect(lifecycleOwner) {val observer = LifecycleEventObserver { _, event ->if (event == Lifecycle.Event.ON_RESUME) {- a11yGranted = isAccessibilityServiceEnabled(context)- assistantGranted = isDefaultAssistant(context)+ refreshPermissions()}}lifecycleOwner.lifecycle.addObserver(observer)onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }}+ LaunchedEffect(Unit) {+ while (true) {+ refreshPermissions()+ delay(500)+ }+ }+if (showDisclosure) {AccessibilityDisclosureDialog(onAccept = {diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 5e77b64..b1d6eac 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -396,7 +396,8 @@<string name="wizard_assistant_title">Assistant</string><string name="wizard_grant">Grant</string><string name="wizard_granted">Granted</string>- <string name="home_running">Circle to search running</string>+ <string name="home_running_title">Circle to search</string>+ <string name="home_running_state">running</string><string name="info_screen_title">App Info</string><string name="section_permissions">PERMISSIONS</string><string name="info_section_about">ABOUT</string>