Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

fix: support dialog

AKS Labs9ce245a9fb7e
diff --git a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
index 224de51..a4a9abf 100644
--- a/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/MainActivity.kt
@@ -34,7 +34,6 @@ 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
@@ -288,18 +287,7 @@ fun SetupScreen(onSettingsClick: () -> Unit, onBack: (() -> Unit)? = null) {
onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
}
- val showSupportDialog = remember { mutableStateOf(!prefs.getBoolean("support_dialog_dismissed", false)) }
- val dontShowAgain = remember { mutableStateOf(false) }
-
- // Manage Support Dialog Show Count
- val showCount = remember { prefs.getInt("support_dialog_show_count", 0) }
- LaunchedEffect(showSupportDialog.value) {
- if (showSupportDialog.value) {
- prefs.edit().putInt("support_dialog_show_count", showCount + 1).apply()
- }
- }
-
- var showDonateSheet by remember { mutableStateOf(false) }
+ val showDonateSheet = remember { mutableStateOf(false) }
val sheetState = rememberModalBottomSheetState()
val scope = rememberCoroutineScope()
@@ -674,7 +662,7 @@ fun SetupScreen(onSettingsClick: () -> Unit, onBack: (() -> Unit)? = null) {
// 5. Footer
SocialLinksRow(
context = context,
- onDonateClick = { showDonateSheet = true }
+ onDonateClick = { showDonateSheet.value = true }
)
Spacer(modifier = Modifier.height(20.dp))
Surface(
@@ -699,40 +687,7 @@ fun SetupScreen(onSettingsClick: () -> Unit, onBack: (() -> Unit)? = null) {
}
// Support Dialog & Sheet
- if (showSupportDialog.value) {
- SupportDialog(
- showCount = showCount + 1,
- onDismiss = {
- showSupportDialog.value = false
- if (dontShowAgain.value) {
- prefs.edit().putBoolean("support_dialog_dismissed", true).apply()
- }
- },
- onDonate = {
- showDonateSheet = true
- showSupportDialog.value = false
- if (dontShowAgain.value) {
- prefs.edit().putBoolean("support_dialog_dismissed", true).apply()
- }
- },
- dontShowAgain = dontShowAgain
- )
- }
-
- if (showDonateSheet) {
- DonateBottomSheet(
- onDismiss = { showDonateSheet = false },
- onDonateOptionSelected = { url ->
- try {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
- context.startActivity(intent)
- } catch (e: Exception) {
- android.widget.Toast.makeText(context, context.getString(R.string.toast_could_not_open_link), android.widget.Toast.LENGTH_SHORT).show()
- }
- showDonateSheet = false
- }
- )
- }
+ SupportDialogHost(showDonateSheet = showDonateSheet)
if (showAccessibilityDisclosure) {
AccessibilityDisclosureDialog(
@@ -894,13 +849,14 @@ fun SupportDialog(
text = stringResource(R.string.support_title),
style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.ExtraBold,
- textAlign = TextAlign.Center
+ textAlign = TextAlign.Center,
+ lineHeight = 28.sp,
+ modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(16.dp))
}
// ── Scrollable body ────────────────────────────────────────
- var isExpanded by remember { mutableStateOf(false) }
Column(
modifier = Modifier
.weight(1f, fill = false)
@@ -911,74 +867,12 @@ fun SupportDialog(
Text(
text = stringResource(R.string.support_body),
style = MaterialTheme.typography.bodyLarge,
- lineHeight = 22.sp,
+ lineHeight = 24.sp,
textAlign = TextAlign.Center,
- fontWeight = FontWeight.Medium
+ fontWeight = FontWeight.Medium,
+ modifier = Modifier.fillMaxWidth()
)
- Column(
- modifier = Modifier
- .fillMaxWidth()
- .clip(androidx.compose.foundation.shape.RoundedCornerShape(16.dp))
- .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f))
- .padding(16.dp)
- .animateContentSize()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().clickable { isExpanded = !isExpanded },
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.SpaceBetween
- ) {
- Text(
- text = stringResource(R.string.support_planned_features),
- style = MaterialTheme.typography.titleSmall,
- fontWeight = FontWeight.Bold,
- color = MaterialTheme.colorScheme.primary
- )
- TextButton(onClick = { isExpanded = !isExpanded }, contentPadding = PaddingValues(0.dp)) {
- Icon(
- imageVector = if (isExpanded) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown,
- contentDescription = stringResource(if (isExpanded) R.string.cd_collapse else R.string.cd_expand),
- tint = MaterialTheme.colorScheme.primary
- )
- }
- }
-
- val allFeatures = listOf(
- stringResource(R.string.feature_1),
- stringResource(R.string.feature_2),
- stringResource(R.string.feature_3),
- stringResource(R.string.feature_4),
- stringResource(R.string.feature_5),
- stringResource(R.string.feature_6),
- stringResource(R.string.feature_7),
- stringResource(R.string.feature_8),
- stringResource(R.string.feature_9),
- stringResource(R.string.feature_10),
- stringResource(R.string.feature_11),
- stringResource(R.string.feature_12),
- stringResource(R.string.feature_13),
- )
-
- val features = if (isExpanded) allFeatures else allFeatures.take(5)
-
- Spacer(modifier = Modifier.height(12.dp))
- features.forEach { feature ->
- Row(
- verticalAlignment = Alignment.CenterVertically,
- modifier = Modifier.padding(vertical = 4.dp)
- ) {
- Icon(
- Icons.Default.Check, null,
- modifier = Modifier.size(16.dp),
- tint = MaterialTheme.colorScheme.primary
- )
- Spacer(modifier = Modifier.width(12.dp))
- Text(text = feature, style = MaterialTheme.typography.bodyMedium)
- }
- }
- }
-
if (showCount >= 7) {
Row(
verticalAlignment = Alignment.CenterVertically,
@@ -1028,6 +922,56 @@ fun SupportDialog(
}
}
+@Composable
+fun SupportDialogHost(showDonateSheet: MutableState<Boolean>) {
+ val context = LocalContext.current
+ val prefs = context.getSharedPreferences("app_prefs", android.content.Context.MODE_PRIVATE)
+ val showSupportDialog = remember { mutableStateOf(!prefs.getBoolean("support_dialog_dismissed", false)) }
+ val dontShowAgain = remember { mutableStateOf(false) }
+ val showCount = remember { prefs.getInt("support_dialog_show_count", 0) }
+
+ LaunchedEffect(showSupportDialog.value) {
+ if (showSupportDialog.value) {
+ prefs.edit().putInt("support_dialog_show_count", showCount + 1).apply()
+ }
+ }
+
+ if (showSupportDialog.value) {
+ SupportDialog(
+ showCount = showCount + 1,
+ onDismiss = {
+ showSupportDialog.value = false
+ if (dontShowAgain.value) {
+ prefs.edit().putBoolean("support_dialog_dismissed", true).apply()
+ }
+ },
+ onDonate = {
+ showDonateSheet.value = true
+ showSupportDialog.value = false
+ if (dontShowAgain.value) {
+ prefs.edit().putBoolean("support_dialog_dismissed", true).apply()
+ }
+ },
+ dontShowAgain = dontShowAgain
+ )
+ }
+
+ if (showDonateSheet.value) {
+ DonateBottomSheet(
+ onDismiss = { showDonateSheet.value = false },
+ onDonateOptionSelected = { url ->
+ try {
+ val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+ context.startActivity(intent)
+ } catch (e: Exception) {
+ android.widget.Toast.makeText(context, context.getString(R.string.toast_could_not_open_link), android.widget.Toast.LENGTH_SHORT).show()
+ }
+ showDonateSheet.value = false
+ }
+ )
+ }
+}
+
@Composable
fun BubbleSwitch(context: android.content.Context) {
val prefs = context.getSharedPreferences("app_prefs", android.content.Context.MODE_PRIVATE)
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/components/BottomSheets.kt b/app/src/main/java/com/akslabs/circletosearch/ui/components/BottomSheets.kt
index 2feb77a..4f3a60f 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/components/BottomSheets.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/components/BottomSheets.kt
@@ -344,14 +344,18 @@ fun DonateBottomSheet(
text = stringResource(R.string.title_support_our_work),
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.Bold,
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ textAlign = TextAlign.Center,
+ modifier = Modifier.fillMaxWidth()
)
Text(
text = stringResource(R.string.subtitle_support),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center,
- modifier = Modifier.padding(top = 4.dp)
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(top = 4.dp)
)
}
}
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.kt
index 88d53f4..ac8c234 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
@@ -115,6 +115,7 @@ import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.compose.LocalLifecycleOwner
import com.akslabs.circletosearch.MainActivity
import com.akslabs.circletosearch.R
+import com.akslabs.circletosearch.SupportDialogHost
import com.akslabs.circletosearch.data.ActionType
import com.akslabs.circletosearch.data.BottomEdgeConfig
import com.akslabs.circletosearch.data.GestureType
@@ -688,6 +689,12 @@ fun WobbleHomeScreen(
onDismiss = { showHwSheet = false },
)
}
+
+ val grantedOnEntry = remember { a11yGranted || assistantGranted }
+ if (grantedOnEntry) {
+ val showDonateSheet = remember { mutableStateOf(false) }
+ SupportDialogHost(showDonateSheet = showDonateSheet)
+ }
}
@Composable
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b00088b..fb13302 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,8 +74,6 @@
<!-- Content Descriptions -->
<string name="cd_granted">Granted</string>
<string name="cd_active">Active</string>
- <string name="cd_collapse">Collapse</string>
- <string name="cd_expand">Expand</string>
<string name="cd_overlay_settings">Overlay Settings</string>
<string name="cd_screenshot">Screenshot</string>
<string name="cd_close">Close</string>
@@ -280,22 +278,8 @@
<string name="tile_label">Circle to Search</string>
<!-- Support / Donate Dialog -->
- <string name="support_title">Help Keep this Project \n Alive! \u2764\uFE0F</string>
- <string name="support_body">Please consider donating to this project Your\n support helps keep this project alive and \n enable us to add amazing \nnew features.</string>
- <string name="support_planned_features">Planned Features:</string>
- <string name="feature_1">Self-hosted image upload (remove catbox/litterbox dependency)</string>
- <string name="feature_2">More triggers: volume button, power button, shake gesture etc.</string>
- <string name="feature_3">Add more actions to trigger with overlay</string>
- <string name="feature_4">Offline on-device translation</string>
- <string name="feature_5">Improved text detection accuracy</string>
- <string name="feature_6">More Search engines support SearXNG, DuckDuckGo, Brave Search</string>
- <string name="feature_7">Add more QS tiles to directly launch copy text, QR code, SmartScan etc.</string>
- <string name="feature_8">Multi-language support</string>
- <string name="feature_9">More Overlay actions</string>
- <string name="feature_10">Long-press image to download or share</string>
- <string name="feature_11">Image result context menu (reverse search, save, open etc.)</string>
- <string name="feature_12">Material You dynamic theming improvements</string>
- <string name="feature_13">Floating bubble customization (size, opacity, position)</string>
+ <string name="support_title">Help Keep This Project Alive! \u2764\uFE0F</string>
+ <string name="support_body">If you like CircleToSearch and want to support its development, please consider donating. Your support will help me dedicate more time and resources to this project and help make it even better. Thank you for your support!</string>
<!-- Friendly Messages -->
<string name="friendly_msg_1">Ready when you are, boss. What\'s the mission today? &#x1F575;&#xFE0F;&#x200D;&#x2642;&#xFE0F;&#x1F602;</string>