-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revamp permission denied dialog and add link to sign up form (#2492)
* Add icon * Add string messages and signup form link * Introduce a new UiState for MainActivity since the compose dialog can't be launched from a view model or navigator * Create a compose based dialog for permission denied errors * Integrate the dialog with activity and view model using ui state architecture * Remove obsolete dialog fragment and view model * Fix detect warnings * Update unit test * Move the signup form link to BuildConfig --------- Co-authored-by: Gino Miceli <228050+gino-m@users.noreply.github.com>
- Loading branch information
1 parent
c22c06e
commit cdd50f1
Showing
11 changed files
with
223 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
ground/src/main/java/com/google/android/ground/PermissionDeniedDialog.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.android.ground | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.material3.AlertDialog | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.OutlinedButton | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalUriHandler | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.google.android.ground.ui.compose.HyperlinkText | ||
| import com.google.android.ground.ui.theme.AppTheme | ||
| import timber.log.Timber | ||
|
|
||
| @Composable | ||
| fun PermissionDeniedDialog(signupLink: String, onSignOut: () -> Unit, onCloseApp: () -> Unit) { | ||
| AlertDialog( | ||
| onDismissRequest = {}, | ||
| title = { | ||
| Row(verticalAlignment = Alignment.CenterVertically) { | ||
| Icon( | ||
| painter = painterResource(id = R.drawable.baseline_warning_24), | ||
| contentDescription = "Alert Icon", | ||
| tint = MaterialTheme.colorScheme.error, | ||
| ) | ||
|
|
||
| // Add some space between icon and title | ||
| Spacer(modifier = Modifier.width(12.dp)) | ||
|
|
||
| Text( | ||
| stringResource(id = R.string.permission_denied), | ||
| style = MaterialTheme.typography.titleLarge, | ||
| ) | ||
| } | ||
| }, | ||
| text = { | ||
| Column { | ||
| if (signupLink.isNotEmpty()) { | ||
| SignupLink(signupLink) | ||
| } else { | ||
| Text( | ||
| stringResource(R.string.admin_request_access), | ||
| style = MaterialTheme.typography.bodyMedium, | ||
| ) | ||
| } | ||
|
|
||
| // Empty line | ||
| Text(text = "") | ||
|
|
||
| Text( | ||
| stringResource(R.string.signout_warning), | ||
| style = MaterialTheme.typography.bodyMedium, | ||
| color = MaterialTheme.colorScheme.error, | ||
| ) | ||
| } | ||
| }, | ||
| dismissButton = { | ||
| OutlinedButton(onClick = { onSignOut() }) { Text(stringResource(id = R.string.sign_out)) } | ||
| }, | ||
| confirmButton = { | ||
| Button(onClick = { onCloseApp() }) { Text(stringResource(id = R.string.close_app)) } | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| private fun SignupLink(signupLink: String) { | ||
| val uriHandler = LocalUriHandler.current | ||
|
|
||
| HyperlinkText( | ||
| textStyle = MaterialTheme.typography.bodyMedium, | ||
| fullTextResId = R.string.signup_request_access, | ||
| linkTextColor = MaterialTheme.colorScheme.primary, | ||
| hyperLinks = | ||
| mapOf( | ||
| "sign_up_link" to | ||
| { | ||
| runCatching { uriHandler.openUri(signupLink) } | ||
| .onFailure { Timber.e(it, "Failed to open sign-up link") } | ||
| } | ||
| ), | ||
| ) | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun PermissionDeniedDialogWithSignupLinkPreview() { | ||
| AppTheme { | ||
| PermissionDeniedDialog(signupLink = "www.google.com", onSignOut = {}, onCloseApp = {}) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun PermissionDeniedDialogWithoutSignupLinkPreview() { | ||
| AppTheme { PermissionDeniedDialog(signupLink = "", onSignOut = {}, onCloseApp = {}) } | ||
| } |
39 changes: 0 additions & 39 deletions
39
ground/src/main/java/com/google/android/ground/ui/common/PermissionDeniedDialogFragment.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
|
||
| <!-- | ||
| ~ Copyright 2024 Google LLC | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ https://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
|
|
||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:tint="#000000" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
|
|
||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" /> | ||
|
|
||
| </vector> |
Oops, something went wrong.