1175: replace identity icon, restructure translations for about

digitalfabrik · Nov 8, 2023 · a0b82b2 · a0b82b2
1 parent 5aa21d3
commit a0b82b2
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 40 deletions.
diff --git a/frontend/assets/l10n/app_de.json b/frontend/assets/l10n/app_de.json
@@ -1,26 +1,29 @@
 {
   "about": {
-    "dependencies": "Software-Bibliotheken",
     "developmentOptions": "Entwickleroptionen",
-    "disclaimer": "Haftung, Haftungsausschluss und Impressum",
-    "licenses": {
-      "one": "Lizenz",
-      "other": "Lizenzen"
+    "info": {
+      "dependencies": "Software-Bibliotheken",
+      "disclaimer": "Haftung, Haftungsausschluss und Impressum",
+      "headline": "Info",
+      "licenses": {
+        "one": "Lizenz",
+        "other": "Lizenzen"
+      },
+      "privacyDeclaration": "Datenschutzerklärung",
+      "sourceCode": "Quellcode der App"
     },
     "moreInformation": "Mehr Informationen",
     "numberLicenses": {
-      "zero": "Keine Lizenzen",
       "one": "1 Lizenz",
-      "other": "$n Lizenzen"
+      "other": "$n Lizenzen",
+      "zero": "Keine Lizenzen"
     },
-    "privacyDeclaration": "Datenschutzerklärung",
     "publisher": "Herausgeber",
     "settings": {
       "headline": "Einstellungen",
       "languageChange": "Sprache wechseln",
-      "languageNotification": "Ihre Sprache wurde erfolgreich geändert!"
+      "languageChangeSuccessful": "Ihre Sprache wurde erfolgreich geändert!"
     },
-    "sourceCode": "Quellcode der App",
     "title": "Über"
   },
   "category": {

diff --git a/frontend/assets/l10n/app_en.json b/frontend/assets/l10n/app_en.json
@@ -1,26 +1,29 @@
 {
   "about": {
-    "dependencies": "Libraries",
     "developmentOptions": "Developer options",
-    "disclaimer": "Liability, disclaimer and imprint",
-    "licenses": {
-      "one": "License",
-      "other": "Licenses"
+    "info": {
+      "dependencies": "Libraries",
+      "disclaimer": "Liability, disclaimer and imprint",
+      "headline": "Info",
+      "licenses": {
+        "one": "License",
+        "other": "Licenses"
+      },
+      "privacyDeclaration": "Privacy policy",
+      "sourceCode": "Source code"
     },
     "moreInformation": "More information",
     "numberLicenses": {
-      "zero": "No licenses",
       "one": "1 license",
-      "other": "$n licenses"
+      "other": "$n licenses",
+      "zero": "No licenses"
     },
-    "privacyDeclaration": "Privacy policy",
     "publisher": "Publisher",
     "settings": {
       "headline": "Settings",
       "languageChange": "Change language",
-      "languageNotification": "Your language was changed successfully!"
+      "languageChangeSuccessful": "Your language was changed successfully!"
     },
-    "sourceCode": "Source code",
     "title": "About"
   },
   "category": {

diff --git a/frontend/build-configs/bayern/index.ts b/frontend/build-configs/bayern/index.ts
@@ -63,7 +63,6 @@ export const bayernCommon: CommonBuildConfigType = {
     ],
     featureFlags: {
         verification: true,
-        settings: false
     },
     applicationUrl: "https://bayern.ehrenamtskarte.app/beantragen",
     dataPrivacyPolicyUrl: "https://bayern.ehrenamtskarte.app/data-privacy-policy",

diff --git a/frontend/build-configs/nuernberg/index.ts b/frontend/build-configs/nuernberg/index.ts
@@ -63,7 +63,6 @@ export const nuernbergCommon: CommonBuildConfigType = {
     ],
     featureFlags: {
         verification: true,
-        settings: true
     },
     applicationUrl: "https://beantragen.nuernberg.sozialpass.app",
     publisherAddress:

diff --git a/frontend/build-configs/types.ts b/frontend/build-configs/types.ts
@@ -6,7 +6,6 @@ type BuildConfigType = {
 
 export type FeatureFlagsType = {
     verification: boolean
-    settings: boolean
 }
 
 export type ThemeType = {

diff --git a/frontend/lib/about/about_page.dart b/frontend/lib/about/about_page.dart
@@ -29,8 +29,6 @@ class AboutPageState extends State<AboutPage> {
   @override
   Widget build(BuildContext context) {
     final config = Configuration.of(context);
-    print('title:${t.about.settings.languageChange}');
-    print('locale:${LocaleSettings.currentLocale.languageCode}');
     return FutureBuilder<PackageInfo>(
       future: PackageInfo.fromPlatform(),
       builder: (context, snapshot) {
@@ -98,7 +96,7 @@ class AboutPageState extends State<AboutPage> {
                 );
               },
             ),
-            if (buildConfig.featureFlags.settings)
+            if (buildConfig.appLocales.length > 1)
               Column(children: [
                 const Divider(
                   height: 1,
@@ -116,21 +114,22 @@ class AboutPageState extends State<AboutPage> {
               height: 1,
               thickness: 1,
             ),
-            Section(headline: t.about.moreInformation, children: [
-              ContentTile(icon: Icons.copyright, title: t.about.licenses(n: 1), children: getCopyrightText(context)),
+            Section(headline: t.about.info.headline, children: [
+              ContentTile(
+                  icon: Icons.copyright, title: t.about.info.licenses(n: 1), children: getCopyrightText(context)),
               ListTile(
                 leading: const Icon(Icons.privacy_tip_outlined),
-                title: Text(t.about.privacyDeclaration),
+                title: Text(t.about.info.privacyDeclaration),
                 onTap: () => launchUrlString(buildConfig.dataPrivacyPolicyUrl, mode: LaunchMode.externalApplication),
               ),
               ContentTile(
                 icon: Icons.info_outline,
-                title: t.about.disclaimer,
+                title: t.about.info.disclaimer,
                 children: getDisclaimerText(context),
               ),
               ListTile(
                 leading: const Icon(Icons.book_outlined),
-                title: Text(t.about.dependencies),
+                title: Text(t.about.info.dependencies),
                 onTap: () {
                   Navigator.push(
                     context,
@@ -142,7 +141,7 @@ class AboutPageState extends State<AboutPage> {
               ),
               ListTile(
                 leading: const Icon(Icons.code_outlined),
-                title: Text(t.about.sourceCode),
+                title: Text(t.about.info.sourceCode),
                 onTap: () {
                   launchUrlString(
                     'https://github.com/digitalfabrik/entitlementcard',

diff --git a/frontend/lib/about/language_change.dart b/frontend/lib/about/language_change.dart
@@ -31,7 +31,7 @@ class LanguageChange extends StatelessWidget {
     messengerState.showSnackBar(
       SnackBar(
         backgroundColor: Theme.of(context).colorScheme.primary,
-        content: Text(t.about.settings.languageNotification,
+        content: Text(t.about.settings.languageChangeSuccessful,
             style: TextStyle(color: Theme.of(context).colorScheme.background)),
       ),
     );

diff --git a/frontend/lib/about/license_page.dart b/frontend/lib/about/license_page.dart
@@ -53,7 +53,7 @@ class CustomLicensePage extends StatelessWidget {
 
           return CustomScrollView(
             slivers: <Widget>[
-              CustomSliverAppBar(title: t.about.licenses(n: licenses.length)),
+              CustomSliverAppBar(title: t.about.info.licenses(n: licenses.length)),
               SliverList(
                 delegate: SliverChildBuilderDelegate(
                   (BuildContext context, int index) {

diff --git a/frontend/lib/about/section.dart b/frontend/lib/about/section.dart
@@ -12,8 +12,12 @@ class Section extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Padding(
-          padding: EdgeInsets.only(top: 20, left: 20, right: 20),
-          child: Text(headline, style: TextStyle(color: Theme.of(context).colorScheme.primary)),
+          padding: EdgeInsets.only(top: 16, left: 16, right: 16),
+          child: Text(headline,
+              style: Theme.of(context)
+                  .textTheme
+                  .bodySmall
+                  ?.merge(TextStyle(color: Theme.of(context).colorScheme.secondary))),
         ),
         Column(children: children),
         const SizedBox(height: 10),

diff --git a/frontend/lib/home/home_page.dart b/frontend/lib/home/home_page.dart
@@ -51,11 +51,11 @@ class HomePageState extends State<HomePage> {
       if (buildConfig.featureFlags.verification)
         AppFlow(
           IdentificationPage(),
-          Icons.remove_red_eye_outlined,
+          Icons.credit_card,
           (BuildContext context) => t.identification.title,
           GlobalKey<NavigatorState>(debugLabel: 'Auth tab key'),
         ),
-      AppFlow(const AboutPage(), buildConfig.featureFlags.settings ? Icons.menu : Icons.info_outline,
+      AppFlow(const AboutPage(), buildConfig.appLocales.length > 1 ? Icons.menu : Icons.info_outline,
           (BuildContext context) => t.about.title, GlobalKey<NavigatorState>(debugLabel: 'About tab key')),
     ];
   }

diff --git a/frontend/lib/themes.dart b/frontend/lib/themes.dart
@@ -16,7 +16,7 @@ ThemeData get lightTheme {
     ),
     textTheme: defaultTypography.copyWith(
       headlineMedium: defaultTypography.headlineMedium?.apply(color: Colors.black87),
-      headlineSmall: defaultTypography.headlineMedium?.apply(color: Colors.black87),
+      headlineSmall: defaultTypography.headlineSmall?.apply(color: Colors.black87),
       titleLarge: const TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold),
       bodyLarge: const TextStyle(fontSize: 15.0, fontWeight: FontWeight.normal),
       bodyMedium: const TextStyle(fontSize: 15.0, color: Color(0xFF505050)),
@@ -59,7 +59,7 @@ ThemeData get darkTheme {
     ),
     textTheme: defaultTypography.copyWith(
       headlineMedium: defaultTypography.headlineMedium?.apply(color: Colors.white),
-      headlineSmall: defaultTypography.headlineMedium?.apply(color: Colors.white),
+      headlineSmall: defaultTypography.headlineSmall?.apply(color: Colors.white),
       titleLarge: const TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold),
       bodyLarge: const TextStyle(fontSize: 15.0, fontWeight: FontWeight.normal),
       bodyMedium: const TextStyle(fontSize: 15.0, color: Color(0xFFC6C4C4)),