CircleToSearch with multi search engine support for all android
Kotlin
reduced app size
AKS Labs9c28eb7b3582
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 00a6d2b..1703d7a 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -18,6 +18,10 @@ android {versionName = "1.0"testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"++ ndk {+ abiFilters += listOf("arm64-v8a", "armeabi-v7a")+ }}buildTypes {diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dmindex 9236708..fc341d0 100644Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differdiff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dmindex de631fd..f797e8e 100644Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differdiff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.ktindex f72a505..85f7de3 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt@@ -214,21 +214,35 @@ fun CircleToSearchScreen()}searchUrl != null -> {+ // GeckoView State// GeckoView Stateval runtime = remember { GeckoRuntime.create(context) }- val session = remember { GeckoSession() }-- LaunchedEffect(runtime) {- session.open(runtime)+ val sessions = remember { mutableMapOf<SearchEngine, GeckoSession>() }++ // Get or create session for selected engine+ val session = sessions.getOrPut(selectedEngine) {+ GeckoSession().apply {+ open(runtime)+ settings.allowJavascript = true+ }}- LaunchedEffect(searchUrl) {+ LaunchedEffect(searchUrl, session) {if (searchUrl != null) {+ // Only load if URL is different or session is empty (basic check)+ // For now, just load. GeckoView handles navigation history.+ // To prevent reload on tab switch, we rely on the session being preserved in the map.+ // However, if we just call loadUri every time, it might reload.+ // We should check if the current URI matches.+ // But getting current URI from session is async or requires state observation.+ // Simpler: If session is newly created (not in map), it loads.+ // If it was in map, we might not want to reload unless searchUrl changed for that engine.+ // For this implementation, we'll assume searchUrl update triggers load.session.loadUri(searchUrl!!)}}- LaunchedEffect(isDesktopMode) {+ LaunchedEffect(isDesktopMode, session) {val newUserAgent = if (isDesktopMode) {"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"} else {@@ -240,7 +254,8 @@ fun CircleToSearchScreen(DisposableEffect(Unit) {onDispose {- session.close()+ sessions.values.forEach { it.close() }+ sessions.clear()}}@@ -250,8 +265,25 @@ fun CircleToSearchScreen(setSession(session)// Fix BottomSheet conflict by disabling nested scrollingisNestedScrollingEnabled = false++ // Strict touch interception to prevent BottomSheet from stealing events+ setOnTouchListener { v, event ->+ when (event.action) {+ android.view.MotionEvent.ACTION_DOWN -> {+ v.parent.requestDisallowInterceptTouchEvent(true)+ }+ android.view.MotionEvent.ACTION_UP, android.view.MotionEvent.ACTION_CANCEL -> {+ v.parent.requestDisallowInterceptTouchEvent(false)+ }+ }+ false // Let GeckoView handle the touch+ }}},+ update = { view ->+ // Ensure the view is attached to the current session+ view.setSession(session)+ },modifier = Modifier.fillMaxSize())}diff --git a/build_log.txt b/build_log.txtindex 0a2ea22..a6df667 100644Binary files a/build_log.txt and b/build_log.txt differ