From f5815596db9240da896b3453102222bcff954e32 Mon Sep 17 00:00:00 2001 From: Sarah Sporck Date: Mon, 5 Dec 2022 15:52:03 +0100 Subject: [PATCH] 654: remove verification feature flag and add camera permission --- .../android/app/src/main/AndroidManifest.xml | 3 +++ frontend/build-configs/bayern/index.ts | 4 +--- frontend/build-configs/nuernberg/index.ts | 4 +--- frontend/build-configs/types.ts | 4 +--- frontend/lib/configuration/configuration.dart | 3 --- frontend/lib/entry_widget.dart | 4 +--- frontend/lib/home/home_page.dart | 16 +++++++--------- frontend/lib/main.dart | 1 - 8 files changed, 14 insertions(+), 25 deletions(-) diff --git a/frontend/android/app/src/main/AndroidManifest.xml b/frontend/android/app/src/main/AndroidManifest.xml index 08e9f427b..7cf398102 100644 --- a/frontend/android/app/src/main/AndroidManifest.xml +++ b/frontend/android/app/src/main/AndroidManifest.xml @@ -42,4 +42,7 @@ + + + diff --git a/frontend/build-configs/bayern/index.ts b/frontend/build-configs/bayern/index.ts index fe5f0434d..aed9bffc6 100644 --- a/frontend/build-configs/bayern/index.ts +++ b/frontend/build-configs/bayern/index.ts @@ -23,9 +23,7 @@ export const bayernCommon: CommonBuildConfigType = { showcase: "https://api.entitlementcard.app", local: "http://localhost:8000", }, - featureFlags: { - verification: true, - }, + featureFlags: {}, applicationUrl: "https://bayern.ehrenamtskarte.app/apply-for-eak", }; diff --git a/frontend/build-configs/nuernberg/index.ts b/frontend/build-configs/nuernberg/index.ts index 9d08c875b..cfd0007c1 100644 --- a/frontend/build-configs/nuernberg/index.ts +++ b/frontend/build-configs/nuernberg/index.ts @@ -23,9 +23,7 @@ export const nuernbergCommon: CommonBuildConfigType = { showcase: "https://api.entitlementcard.app", local: "http://localhost:7000", }, - featureFlags: { - verification: true, - }, + featureFlags: {}, applicationUrl: "https://meinkonto.nuernberg.de/intelliform/forms/osg/standard/osg/osg-kette-starten/index?lebenslageIdAuswahl=w_500_sha_d_nuernberg-pass", }; diff --git a/frontend/build-configs/types.ts b/frontend/build-configs/types.ts index 3d93ac496..52d62ba58 100644 --- a/frontend/build-configs/types.ts +++ b/frontend/build-configs/types.ts @@ -4,9 +4,7 @@ type BuildConfigType = { ios: iOSBuildConfigType, } -export type FeatureFlagsType = { - verification: boolean -} +export type FeatureFlagsType = {} export type ThemeType = { primaryColor: string, diff --git a/frontend/lib/configuration/configuration.dart b/frontend/lib/configuration/configuration.dart index 0206b8f71..05a600ef4 100644 --- a/frontend/lib/configuration/configuration.dart +++ b/frontend/lib/configuration/configuration.dart @@ -4,7 +4,6 @@ class Configuration extends InheritedWidget { final String mapStyleUrl; final String graphqlUrl; final String projectId; - final bool showVerification; final bool showDevSettings; const Configuration({ @@ -12,7 +11,6 @@ class Configuration extends InheritedWidget { required this.mapStyleUrl, required this.graphqlUrl, required this.projectId, - required this.showVerification, required this.showDevSettings, required super.child, }); @@ -22,7 +20,6 @@ class Configuration extends InheritedWidget { mapStyleUrl != oldWidget.mapStyleUrl || graphqlUrl != oldWidget.graphqlUrl || projectId != oldWidget.projectId || - showVerification != oldWidget.showVerification || showDevSettings != oldWidget.showDevSettings; static Configuration of(BuildContext context) { diff --git a/frontend/lib/entry_widget.dart b/frontend/lib/entry_widget.dart index d32f2f506..7e8d500a7 100644 --- a/frontend/lib/entry_widget.dart +++ b/frontend/lib/entry_widget.dart @@ -31,9 +31,7 @@ class EntryWidget extends StatelessWidget { introRouteName: (context) => IntroScreen( onFinishedCallback: () => settings.setFirstStart(enabled: false), ), - homeRouteName: (context) => HomePage( - showVerification: configuration.showVerification, - ) + homeRouteName: (context) => const HomePage() }; final String initialRoute = settings.firstStart ? introRouteName : homeRouteName; diff --git a/frontend/lib/home/home_page.dart b/frontend/lib/home/home_page.dart index 126ad0714..6feb000b3 100644 --- a/frontend/lib/home/home_page.dart +++ b/frontend/lib/home/home_page.dart @@ -10,9 +10,8 @@ import 'package:flutter/material.dart'; const mapTabIndex = 0; class HomePage extends StatefulWidget { - final bool showVerification; - const HomePage({super.key, required this.showVerification}); + const HomePage({super.key}); @override _HomePageState createState() => _HomePageState(); @@ -44,13 +43,12 @@ class _HomePageState extends State { "Suche", GlobalKey(debugLabel: "Search tab key"), ), - if (widget.showVerification) - AppFlow( - const IdentificationPage(title: "Ausweisen"), - Icons.remove_red_eye_outlined, - "Ausweisen", - GlobalKey(debugLabel: "Auth tab key"), - ), + AppFlow( + const IdentificationPage(title: "Ausweisen"), + Icons.remove_red_eye_outlined, + "Ausweisen", + GlobalKey(debugLabel: "Auth tab key"), + ), AppFlow(const AboutPage(), Icons.info_outline, "Über", GlobalKey(debugLabel: "About tab key")), ]; } diff --git a/frontend/lib/main.dart b/frontend/lib/main.dart index 1e8abe4fc..6f08e0dce 100644 --- a/frontend/lib/main.dart +++ b/frontend/lib/main.dart @@ -33,7 +33,6 @@ Future main() async { mapStyleUrl: mapStyleUrl, graphqlUrl: graphqlUrl, projectId: projectId, - showVerification: buildConfig.featureFlags.verification, showDevSettings: kDebugMode, child: const App(), ),