CircleToSearch with multi search engine support for all android
Kotlin
fix:moved Pin button to the floating toolbar buttons
AKS Labsed53a4ca93a1
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.ktindex 6e8b4aa..9d33bea 100644--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt@@ -86,7 +86,6 @@ import androidx.compose.material.icons.filled.MoreVertimport androidx.compose.material.icons.filled.MusicNoteimport androidx.compose.material.icons.filled.OpenInNewimport androidx.compose.material.icons.filled.QrCode-import androidx.compose.material.icons.filled.PushPinimport androidx.compose.material.icons.filled.Refreshimport androidx.compose.material.icons.filled.Searchimport androidx.compose.material.icons.filled.Send@@ -181,6 +180,7 @@ import androidx.compose.material3.dynamicDarkColorSchemeimport androidx.compose.material3.dynamicLightColorSchemeimport android.os.Buildimport androidx.compose.material.icons.filled.Apps+import androidx.compose.material.icons.filled.PushPinimport androidx.compose.material3.Surface@OptIn(ExperimentalMaterial3Api::class)@@ -1551,17 +1551,17 @@ fun CircleToSearchScreen(// }// Pin- val isPinEnabled = selectedBitmap != null- BottomBarButton(- label = "Pin",- icon = { Icon(Icons.Default.PushPin, contentDescription = null, modifier = Modifier.size(22.dp)) },- enabled = isPinEnabled- ) {- selectedBitmap?.let { bmp ->- CircleToSearchAccessibilityService.pinArea(bmp, selectionRect ?: android.graphics.Rect())- (context as? android.app.Activity)?.finish()- }- }+// val isPinEnabled = selectedBitmap != null+// BottomBarButton(+// label = "Pin",+// icon = { Icon(Icons.Default.PushPin, contentDescription = null, modifier = Modifier.size(22.dp)) },+// enabled = isPinEnabled+// ) {+// selectedBitmap?.let { bmp ->+// CircleToSearchAccessibilityService.pinArea(bmp, selectionRect ?: android.graphics.Rect())+// (context as? android.app.Activity)?.finish()+// }+// }// Smart Entity ExtractorBottomBarButton("SmartScan", { Icon(Icons.Default.Search, null, modifier = Modifier.size(22.dp)) }) {@@ -1702,10 +1702,10 @@ fun CircleToSearchScreen(Box(modifier = Modifier.offset(- x = (centerX - 125.dp).coerceIn(0.dp, screenWidth - 250.dp),+ x = (centerX - 160.dp).coerceIn(0.dp, screenWidth - 320.dp),y = if (topPx > 200f) (topDp - 72.dp).coerceAtLeast(16.dp) else (bottomDp + 16.dp).coerceAtMost(screenHeight - 80.dp))- .width(250.dp),+ .width(320.dp),contentAlignment = Alignment.Center) {// Wrapped in Surface to match Bottom Bar tonal environment@@ -1759,6 +1759,8 @@ fun CircleToSearchScreen()}++// Separatorandroidx.compose.material3.VerticalDivider(modifier = Modifier.height(24.dp).padding(horizontal = 2.dp),@@ -1794,6 +1796,37 @@ fun CircleToSearchScreen())}++ // Separator+ androidx.compose.material3.VerticalDivider(+ modifier = Modifier.height(24.dp).padding(horizontal = 2.dp),+ color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f)+ )++ // 3. PIN BUTTON+ androidx.compose.material3.FilledTonalButton(+ onClick = {+ if (selectedBitmap != null && selectionRect != null) {+ CircleToSearchAccessibilityService.pinArea(selectedBitmap!!, selectionRect!!)+ (context as? android.app.Activity)?.finish()+ }+ },+ modifier = Modifier.height(48.dp),+ shape = CircleShape,+ colors = androidx.compose.material3.ButtonDefaults.filledTonalButtonColors(+ containerColor = Color.Transparent,+ contentColor = MaterialTheme.colorScheme.onSurface+ ),+ elevation = null,+ contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 20.dp)+ ) {+ Text(+ "Pin",+ style = MaterialTheme.typography.labelLarge.copy(+ fontWeight = androidx.compose.ui.text.font.FontWeight.Normal+ )+ )+ }}}}