From bd423972373c676350fe9cde474de2813278b814 Mon Sep 17 00:00:00 2001 From: andrekir Date: Fri, 19 Nov 2021 23:35:10 -0300 Subject: [PATCH] add dialog / strings (camera_required & why_camera_required) --- .../java/com/geeksville/mesh/ui/ChannelFragment.kt | 11 ++++++++++- app/src/main/res/values-pt-rBR/strings.xml | 2 ++ app/src/main/res/values-pt/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt index c6cfbcd3e..b2ca3fb80 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt @@ -218,7 +218,16 @@ class ChannelFragment : ScreenFragment("Channel"), Logging { zxingScan.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE) zxingScan.initiateScan() } else { - (requireActivity() as MainActivity).requestCameraPermission() + MaterialAlertDialogBuilder(requireContext()) + .setTitle(R.string.camera_required) + .setMessage(R.string.why_camera_required) + .setNeutralButton(R.string.cancel) { _, _ -> + debug("Camera permission denied") + } + .setPositiveButton(getString(R.string.accept)) { _, _ -> + (requireActivity() as MainActivity).requestCameraPermission() + } + .show() } } diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f2df3816e..149e16e27 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -112,4 +112,6 @@ Cancelar (sem acesso ao rádio) Permitir (exibe diálogo) Fornecer localização para mesh + Permissão da câmera + Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d6b331a91..61a6895a8 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -112,4 +112,6 @@ Cancelar (sem acesso ao rádio) Permitir (exibe diálogo) Fornecer localização para mesh + Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados. + Permissão da câmera diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 206bc2adf..a40f0de64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,4 +116,6 @@ Cancel (no radio access) Allow (will show dialog) Provide location to mesh + Camera permission + We must be granted access to the camera to read QR codes. No pictures or videos will be saved. \ No newline at end of file