Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

permission wizard

AKS Labs98ada0268a0e
diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
index 10f9662..224de51 100644
--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
@@ -20,6 +20,7 @@
package com.akslabs.circletosearch
+import android.app.Activity
import android.content.Intent
import android.net.Uri
import android.os.Bundle
@@ -27,9 +28,15 @@ import android.provider.Settings
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
import androidx.compose.animation.animateContentSize
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeOut
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
@@ -69,11 +76,14 @@ import com.akslabs.circletosearch.ui.theme.M3ExpressiveShapes
import com.akslabs.circletosearch.ui.theme.m3ExpressivePress
import com.akslabs.circletosearch.ui.wobblepulldown.WobbleDeviceInfoActivity
import com.akslabs.circletosearch.ui.wobblepulldown.WobbleHomeScreen
+import com.akslabs.circletosearch.ui.wobblepulldown.isA11yGranted
+import com.akslabs.circletosearch.ui.wobblepulldown.isAssistantGranted
import com.akslabs.circletosearch.utils.PrivacyPreferences
import dev.davidv.translator.MainActivity as TranslatorMainActivity
import com.akslabs.circletosearch.ui.components.DonateBottomSheet
import com.akslabs.circletosearch.ui.components.AccessibilityDisclosureDialog
import com.akslabs.circletosearch.ui.components.UnifiedSearchMethodSelector
+import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
class MainActivity : ComponentActivity() {
@@ -137,23 +147,67 @@ class MainActivity : ComponentActivity() {
},
onBack = { currentScreen = "home" },
)
- else -> WobbleHomeScreen(
- onOpenDeviceInfo = {
- val intent = Intent(context, WobbleDeviceInfoActivity::class.java)
- val options = androidx.core.app.ActivityOptionsCompat.makeCustomAnimation(
- context,
- R.anim.anim_slide_in_top,
- R.anim.anim_stay,
+ else -> {
+ var wobbleTick by remember { mutableStateOf(0) }
+ var wizardBackdrop by remember { mutableStateOf(false) }
+ val wizardScope = rememberCoroutineScope()
+ val wizardLauncher = rememberLauncherForActivityResult(
+ ActivityResultContracts.StartActivityForResult()
+ ) { result ->
+ if (result.resultCode == Activity.RESULT_OK) {
+ wobbleTick++
+ }
+ wizardScope.launch {
+ delay(400)
+ wizardBackdrop = false
+ }
+ }
+ LaunchedEffect(Unit) {
+ val granted = isA11yGranted(context) || isAssistantGranted(context)
+ if (!granted) {
+ wizardBackdrop = true
+ val intent = Intent(context, WobbleDeviceInfoActivity::class.java)
+ .putExtra(WobbleDeviceInfoActivity.EXTRA_SETUP_WIZARD, true)
+ val options = androidx.core.app.ActivityOptionsCompat.makeCustomAnimation(
+ context,
+ R.anim.anim_slide_in_top,
+ R.anim.anim_stay,
+ )
+ wizardLauncher.launch(intent, options)
+ }
+ }
+ Box(modifier = Modifier.fillMaxSize()) {
+ WobbleHomeScreen(
+ onOpenDeviceInfo = {
+ val intent = Intent(context, WobbleDeviceInfoActivity::class.java)
+ val options = androidx.core.app.ActivityOptionsCompat.makeCustomAnimation(
+ context,
+ R.anim.anim_slide_in_top,
+ R.anim.anim_stay,
+ )
+ context.startActivity(intent, options.toBundle())
+ },
+ onOpenSetup = { currentScreen = "setup" },
+ onOpenSettings = {
+ pendingSettingsPage = null
+ currentScreen = "settings"
+ },
+ wobbleEvent = wobbleTick,
+ contentPadding = WindowInsets.systemBars.asPaddingValues(),
)
- context.startActivity(intent, options.toBundle())
- },
- onOpenSetup = { currentScreen = "setup" },
- onOpenSettings = {
- pendingSettingsPage = null
- currentScreen = "settings"
- },
- contentPadding = WindowInsets.systemBars.asPaddingValues(),
- )
+ AnimatedVisibility(
+ visible = wizardBackdrop,
+ enter = EnterTransition.None,
+ exit = fadeOut(animationSpec = tween(durationMillis = 300)),
+ ) {
+ Box(
+ modifier = Modifier
+ .fillMaxSize()
+ .background(Color.Black.copy(alpha = 0.10f)),
+ )
+ }
+ }
+ }
}
}
BackHandler(enabled = currentScreen == "setup") {
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.kt
index e63f0cf..e967801 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
@@ -5,7 +5,6 @@ import android.os.Build
import android.provider.Settings
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -44,12 +43,12 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.compose.LocalLifecycleOwner
@@ -113,12 +112,6 @@ fun WobbleSetupWizard(modifier: Modifier = Modifier) {
}
Box(modifier = modifier.fillMaxSize()) {
- // Dim everything outside the wizard card, same weight as the accessibility dialog.
- Box(
- modifier = Modifier
- .fillMaxSize()
- .background(Color.Black.copy(alpha = 0.10f)),
- )
Surface(
shape = RoundedCornerShape(bottomStart = 28.dp, bottomEnd = 28.dp),
color = MaterialTheme.colorScheme.surfaceContainer,
@@ -143,6 +136,8 @@ fun WobbleSetupWizard(modifier: Modifier = Modifier) {
style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.onSurface,
+ textAlign = TextAlign.Center,
+ modifier = Modifier.fillMaxWidth(),
)
Text(
text = stringResource(R.string.wizard_hint),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96d02d0..b00088b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -249,7 +249,7 @@
<!-- Accessibility Disclosure Dialog -->
<string name="title_accessibility_permission">Grant Accessibility Permission</string>
- <string name="body_accessibility_permission">This permission is needed to capture the screen and detect the double tap gesture to trigger Circle to Search or other actions. If the app is used as your default assistant, this permission is optional.</string>
+ <string name="body_accessibility_permission">This permission is required to capture the screen and detect the double tap gesture to trigger Circle to Search or other actions. If the app is used as your default assistant, this permission is optional.</string>
<string name="label_accessibility_agree">I understand how this permission will be used and agree to proceed</string>
<!-- Copy Text Overlay -->
@@ -395,7 +395,7 @@
<string name="about_donate_subtitle">Support ongoing development</string>
<string name="home_setup_title">Setup &amp; permissions</string>
<string name="home_setup_subtitle">Review permissions and launch triggers</string>
- <string name="wizard_title">Accessibility &amp; assistant permission</string>
+ <string name="wizard_title">Grant permissions to get started</string>
<string name="wizard_hint">Grant any one to continue</string>
<string name="wizard_a11y_title">Accessibility</string>
<string name="wizard_assistant_title">Assistant</string>