CircleToSearch with multi search engine support for all android
Kotlin
fix: floating bubble enhancement
AKS Labs4b8a6fea84c9
diff --git a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.ktindex 037621b..b81aa9f 100644--- a/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt+++ b/app/src/main/java/com/akslabs/circletosearch/CircleToSearchAccessibilityService.kt@@ -22,6 +22,7 @@ package com.akslabs.circletosearchimport android.accessibilityservice.AccessibilityServiceimport android.annotation.SuppressLintimport android.content.Context+import android.animation.ValueAnimatorimport android.content.Intentimport android.content.SharedPreferencesimport android.content.pm.ActivityInfo@@ -55,6 +56,7 @@ import android.view.ViewOutlineProviderimport android.view.WindowManagerimport android.view.accessibility.AccessibilityEventimport android.view.accessibility.AccessibilityNodeInfo+import android.view.animation.DecelerateInterpolatorimport com.akslabs.circletosearch.Rimport com.akslabs.circletosearch.data.ActionTypeimport com.akslabs.circletosearch.data.BitmapRepository@@ -87,6 +89,9 @@ private fun stickerCornerRadius(width: Int, height: Int, density: Float): Float// --- Hardware button trigger prefs (all in app_prefs, default off) ---private const val KEY_TRIGGER_DOUBLE_VOL_UP = "trigger_double_vol_up"++/** Opacity of the floating bubble while it is docked (half hidden behind a screen edge). */+private const val DOCKED_BUBBLE_ALPHA = 0.45fprivate const val KEY_TRIGGER_DOUBLE_VOL_DOWN = "trigger_double_vol_down"private const val KEY_TRIGGER_DOUBLE_POWER = "trigger_double_power"private const val KEY_TRIGGER_POWER_VOL_UP = "trigger_power_vol_up"@@ -194,38 +199,105 @@ class CircleToSearchAccessibilityService : AccessibilityService() {PixelFormat.TRANSLUCENT)params.gravity = Gravity.TOP or Gravity.START- params.x = 0+ // Start docked at the left edge: half the bubble hidden, dimmed — it only+ // takes half its footprint of visible screen space while at rest.+ params.x = -(params.width / 2)params.y = 200bubbleView = View(this).apply {setBackgroundResource(R.mipmap.ic_launcher)elevation = 10f-+ alpha = DOCKED_BUBBLE_ALPHA+var initialX = 0var initialY = 0var initialTouchX = 0fvar initialTouchY = 0f-+ var dragged = false+ var screenW = 0+ var screenH = 0+ var dockAnimator: ValueAnimator? = null++ fun screenBounds(): Pair<Int, Int> {+ val dm = resources.displayMetrics+ val bounds = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {+ windowManager?.maximumWindowMetrics?.bounds+ } else {+ null+ }+ return (bounds?.width() ?: dm.widthPixels) to (bounds?.height() ?: dm.heightPixels)+ }++ fun updateLayout() {+ runCatching { windowManager?.updateViewLayout(this, params) }+ }++ // Slide to the nearest side edge, half hidden behind it, dimmed.+ fun dockToNearestEdge(animate: Boolean) {+ if (screenW <= 0) {+ val (w, h) = screenBounds()+ screenW = w+ screenH = h+ }+ val half = params.width / 2+ val targetX = if (params.x + params.width / 2 < screenW / 2) -half else screenW - half+ val targetY = params.y.coerceIn(0, (screenH - params.height).coerceAtLeast(0))+ alpha = DOCKED_BUBBLE_ALPHA+ dockAnimator?.cancel()+ if (!animate || (params.x == targetX && params.y == targetY)) {+ params.x = targetX+ params.y = targetY+ updateLayout()+ return+ }+ val startX = params.x+ val startY = params.y+ dockAnimator = ValueAnimator.ofFloat(0f, 1f).apply {+ duration = 180+ interpolator = DecelerateInterpolator()+ addUpdateListener {+ params.x = (startX + (targetX - startX) * it.animatedFraction).toInt()+ params.y = (startY + (targetY - startY) * it.animatedFraction).toInt()+ updateLayout()+ }+ start()+ }+ }+@SuppressLint("ClickableViewAccessibility")setOnTouchListener { _, event ->when (event.action) {MotionEvent.ACTION_DOWN -> {+ dockAnimator?.cancel()initialX = params.xinitialY = params.yinitialTouchX = event.rawXinitialTouchY = event.rawY+ dragged = false+ val (w, h) = screenBounds()+ screenW = w+ screenH = h+ alpha = 1ftrue}MotionEvent.ACTION_MOVE -> {- params.x = initialX + (event.rawX - initialTouchX).toInt()- params.y = initialY + (event.rawY - initialTouchY).toInt()- windowManager?.updateViewLayout(this, params)+ val dx = event.rawX - initialTouchX+ val dy = event.rawY - initialTouchY+ if (!dragged && (Math.abs(dx) >= 10 || Math.abs(dy) >= 10)) dragged = true+ val half = params.width / 2+ params.x = (initialX + dx.toInt()).coerceIn(-half, screenW - half)+ params.y = (initialY + dy.toInt())+ .coerceIn(0, (screenH - params.height).coerceAtLeast(0))+ updateLayout()true}MotionEvent.ACTION_UP -> {- if (Math.abs(event.rawX - initialTouchX) < 10 && Math.abs(event.rawY - initialTouchY) < 10) {+ if (!dragged) {performCapture()}+ // Never leave it floating mid-screen: after every release it+ // ends up docked at the nearest side edge (half hidden, dimmed).+ dockToNearestEdge(animate = true)true}else -> falsediff --git a/app/src/main/java/com/akslabs/circletosearch/data/OverlayConfig.kt b/app/src/main/java/com/akslabs/circletosearch/data/OverlayConfig.ktindex ecb1c40..7f14935 100644--- a/app/src/main/java/com/akslabs/circletosearch/data/OverlayConfig.kt+++ b/app/src/main/java/com/akslabs/circletosearch/data/OverlayConfig.kt@@ -6,6 +6,7 @@ package com.akslabs.circletosearch.dataimport android.content.Contextimport android.content.SharedPreferences+import android.provider.Settingsimport com.akslabs.circletosearch.Rimport com.google.gson.Gsonimport com.google.gson.annotations.SerializedName@@ -110,7 +111,33 @@ fun GestureType.getFriendlyName(context: Context): String = when (this) {GestureType.SWIPE_RIGHT -> context.getString(R.string.gesture_swipe_right)}+/**+ * True when the device uses full-screen gesture navigation.+ * `Settings.Secure.NAVIGATION_MODE` (raw key "navigation_mode", hidden from the SDK):+ * 0 = 3-button, 1 = 2-button, 2 = gesture. Pre-Q devices have no gesture navigation,+ * and the key is simply absent there → defaults to button nav.+ */+fun isGestureNavigation(context: Context): Boolean = try {+ Settings.Secure.getInt(context.contentResolver, "navigation_mode", 0) == 2+} catch (_: Exception) {+ false+}++/**+ * Fresh (never-saved) bottom-edge config. On devices with a button navigation bar+ * the bottom edge of the screen belongs to the system nav bar, so the long-press+ * triggers there default to OFF to avoid fighting it (gesture nav keeps the+ * original left/right defaults).+ */+fun defaultBottomEdgeConfig(context: Context): BottomEdgeConfig =+ if (isGestureNavigation(context)) {+ BottomEdgeConfig()+ } else {+ BottomEdgeConfig(leftEnabled = false, rightEnabled = false, midEnabled = false)+ }+class OverlayConfigurationManager(context: Context) {+ private val appContext: Context = context.applicationContextprivate val prefs: SharedPreferences = context.getSharedPreferences("overlay_prefs", Context.MODE_PRIVATE)private val gson = Gson()@@ -150,11 +177,13 @@ private const val KEY_BOTTOM_EDGE_MID_MIGRATED = "bottom_edge_mid_migrated_v1"}fun getBottomEdgeConfig(): BottomEdgeConfig {- val json = prefs.getString(KEY_BOTTOM_EDGE, null) ?: return BottomEdgeConfig()+ val json = prefs.getString(KEY_BOTTOM_EDGE, null)+ ?: return defaultBottomEdgeConfig(appContext)val cfg = try {- gson.fromJson(json, BottomEdgeConfig::class.java) ?: BottomEdgeConfig()+ gson.fromJson(json, BottomEdgeConfig::class.java)+ ?: defaultBottomEdgeConfig(appContext)} catch (e: Exception) {- return BottomEdgeConfig()+ return defaultBottomEdgeConfig(appContext)}// One-time migration: the old mid-overlay defaults (96dp, later 64dp) were too// large for the actual on-screen semicircle — shrink them to the new 48dp default.