From ae1344d2ec9332bed538ebf85ea3b75eac095cf4 Mon Sep 17 00:00:00 2001 From: kalarina Date: Wed, 14 Oct 2026 13:39:50 +0000 Subject: [PATCH] Show "Action needed" in Settings while permissions are missing --- .../matewave/ui/screens/SettingsScreen.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt b/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt index 64a24ca..1f33c60 100644 --- a/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/cc/skysparkle/matewave/ui/screens/SettingsScreen.kt @@ -82,6 +82,11 @@ fun SettingsScreen( val status = remember(statusTick) { cc.skysparkle.matewave.network.NetworkRequirements.check(context) } + // Wi-Fi alone used to count as "All set" even with the nearby permission denied + val permissionsMissing = remember(statusTick) { + !status.permissionsGranted || + (cc.skysparkle.matewave.presence.PresenceSettings(context).backgroundEnabled && !status.notificationsGranted) + } LaunchedEffect(Unit) { while (true) { kotlinx.coroutines.delay(3_000); statusTick++ } } @@ -149,10 +154,10 @@ fun SettingsScreen( ListGroup { ListRow( title = stringResource(R.string.permissions_card_title), - icon = if (status.onlineBlocked) R.drawable.ic_permissions else R.drawable.ic_check_permission, - iconTint = if (status.onlineBlocked) Color(0xFFFF6B6B) else ChessGreen, - value = stringResource(if (status.onlineBlocked) R.string.permissions_card_blocked_short else R.string.permissions_card_ok_short), - valueColor = if (status.onlineBlocked) Color(0xFFFF6B6B) else ink.copy(alpha = 0.55f), + icon = if (permissionsMissing) R.drawable.ic_permissions else R.drawable.ic_check_permission, + iconTint = if (permissionsMissing) Color(0xFFFF6B6B) else ChessGreen, + value = stringResource(if (permissionsMissing) R.string.permissions_card_blocked_short else R.string.permissions_card_ok_short), + valueColor = if (permissionsMissing) Color(0xFFFF6B6B) else ink.copy(alpha = 0.55f), chevron = true, onClick = onOpenPermissions )