From a183a5433eb576d30f2d0c510f0c88a751addcd2 Mon Sep 17 00:00:00 2001 From: Vadim <44135514+vodemn@users.noreply.github.com> Date: Sat, 11 Feb 2023 00:49:51 +0300 Subject: [PATCH] ML-25 Revise permission handling (#26) * fixed permission handling * translations cleanup * [Android] removed unused permissions --- .vscode/launch.json | 1 + android/app/src/main/AndroidManifest.xml | 20 ++++-- lib/interactors/metering_interactor.dart | 21 ++++++ lib/l10n/intl_en.arb | 6 +- .../bloc_container_camera.dart | 37 +++++++++- .../widget_placeholder_camera_controls.dart | 37 ++++++++++ .../widget_placeholder_camera_view.dart | 9 ++- .../event_container_camera.dart | 12 ++++ .../models/camera_error_type.dart | 17 +++++ .../provider_container_camera.dart | 1 + .../state_container_camera.dart | 5 +- .../widget_container_camera.dart | 68 +++++++++++++------ lib/screens/metering/flow_metering.dart | 2 + .../bloc_permissions_check.dart | 46 ------------- .../event_permissions_check.dart | 11 --- .../flow_permissions_check.dart | 18 ----- .../screen_permissions_check.dart | 64 ----------------- .../state_permissions_check.dart | 15 ---- pubspec.yaml | 1 + 19 files changed, 200 insertions(+), 191 deletions(-) create mode 100644 lib/screens/metering/components/camera_container/components/camera_controls_placeholder/widget_placeholder_camera_controls.dart create mode 100644 lib/screens/metering/components/camera_container/models/camera_error_type.dart delete mode 100644 lib/screens/permissions_check/bloc_permissions_check.dart delete mode 100644 lib/screens/permissions_check/event_permissions_check.dart delete mode 100644 lib/screens/permissions_check/flow_permissions_check.dart delete mode 100644 lib/screens/permissions_check/screen_permissions_check.dart delete mode 100644 lib/screens/permissions_check/state_permissions_check.dart diff --git a/.vscode/launch.json b/.vscode/launch.json index fb960be..a9059b5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,6 +8,7 @@ "name": "dev (android)", "request": "launch", "type": "dart", + //"flutterMode": "profile", "args": [ "--flavor", "dev", diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 6ff2d5f..32685a6 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ - @@ -18,12 +20,12 @@ while the Flutter UI initializes. After that, this theme continues to determine the Window background behind the Flutter UI. --> + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> - - + +