From 3e623eac3b8797ec3b6839ca9e1763372a3ea15f Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Tue, 31 May 2022 03:15:45 +0200 Subject: [PATCH] Add: A message when no relevant permissions are detected --- .../looker/droidify/ui/fragments/AppSheetX.kt | 29 ++++++++++++++----- src/main/res/values/strings.xml | 1 + 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt index 1c3a1bf1..d2fa9329 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt @@ -15,6 +15,8 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -602,13 +604,26 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks { item { product.displayRelease?.generatePermissionGroups(requireContext()) ?.let { list -> - Text( - text = stringResource(id = R.string.permissions), - color = MaterialTheme.colorScheme.primary - ) - list.forEach { p -> - PermissionsItem(permissionsType = p) { group, permissions -> - onPermissionsClick(group, permissions) + ExpandableBlock( + heading = stringResource(id = R.string.permissions), + positive = true, + preExpanded = false + ) { + if (list.isNotEmpty()) { + list.forEach { p -> + PermissionsItem(permissionsType = p) { group, permissions -> + onPermissionsClick(group, permissions) + } + } + } else { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp), + horizontalArrangement = Arrangement.Center + ) { + Text(text = stringResource(id = R.string.no_permissions_identified)) + } } } } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a96f394c..83c0c705 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -106,6 +106,7 @@ Password Password missing Permissions + No requested permissions identified +%d more Settings Processing %1$s…