Added histogram to MeteringScreenLayoutConfig

lib/data/models/metering_screen_layout_config.dart

@@ -1,11 +1,13 @@
-enum MeteringScreenLayoutFeature { extremeExposurePairs, filmPicker }
+enum MeteringScreenLayoutFeature { extremeExposurePairs, filmPicker, histogram }
 
 typedef MeteringScreenLayoutConfig = Map<MeteringScreenLayoutFeature, bool>;
 
 extension MeteringScreenLayoutConfigJson on MeteringScreenLayoutConfig {
-  static MeteringScreenLayoutConfig fromJson(Map<String, dynamic> data) => data.map(
+ static MeteringScreenLayoutConfig fromJson(Map<String, dynamic> data) =>
-        (key, value) => MapEntry(MeteringScreenLayoutFeature.values[int.parse(key)], value as bool),
+      <MeteringScreenLayoutFeature, bool>{
-      );
+        for (final f in MeteringScreenLayoutFeature.values)
+          f: data[f.index.toString()] as bool? ?? true
+      };
 
   Map<String, dynamic> toJson() => map((key, value) => MapEntry(key.index.toString(), value));
 }

lib/data/shared_prefs_service.dart

@@ -97,6 +97,7 @@ class UserPreferencesService {
       return {
         MeteringScreenLayoutFeature.extremeExposurePairs: true,
         MeteringScreenLayoutFeature.filmPicker: true,
+        MeteringScreenLayoutFeature.histogram: true,
       };
     }
   }

lib/l10n/intl_en.arb

@@ -38,6 +38,7 @@
     "meteringScreenLayoutHint": "Hide elements on the metering screen that you don't need so that they don't waste exposure pairs list space.",
     "meteringScreenFeatureExtremeExposurePairs": "Fastest & shortest exposure pairs",
     "meteringScreenFeatureFilmPicker": "Film picker",
+    "meteringScreenFeatureHistogram": "Histogram",
     "film": "Film",
     "equipment": "Equipment",
     "equipmentProfileName": "Equipment profile name",

lib/l10n/intl_fr.arb

@@ -38,6 +38,7 @@
     "meteringScreenLayoutHint": "Masquer les éléments sur l'écran de mesure dont vous n'avez pas besoin pour qu'ils ne gaspillent pas de l'espace dans les paires d'exposition.",
     "meteringScreenFeatureExtremeExposurePairs": "Paires d'exposition les plus rapides et les plus courtes",
     "meteringScreenFeatureFilmPicker": "Sélecteur de film",
+    "meteringScreenFeatureHistogram": "Histogramme",
     "film": "Pellicule",
     "equipment": "Équipement",
     "equipmentProfileName": "Nom du profil de l'équipement",

lib/l10n/intl_ru.arb

@@ -38,6 +38,7 @@
     "meteringScreenLayoutHint": "Здесь вы можете скрыть некоторые ненужные или неиспользуемые элементы с главного экрана.",
     "meteringScreenFeatureExtremeExposurePairs": "Длинная и короткая выдержки",
     "meteringScreenFeatureFilmPicker": "Выбор пленки",
+    "meteringScreenFeatureHistogram": "Гистограмма",
     "film": "Пленка",
     "equipment": "Оборудование",
     "equipmentProfileName": "Название профиля",

lib/l10n/intl_zh.arb

@@ -38,6 +38,7 @@
     "meteringScreenLayoutHint": "隐藏不需要的元素，以免浪费曝光列表空间",
     "meteringScreenFeatureExtremeExposurePairs": "最快 & 最慢曝光组合",
     "meteringScreenFeatureFilmPicker": "胶片选择",
+    "meteringScreenFeatureHistogram": "直方图",
     "film": "胶片",
     "equipment": "设备",
     "equipmentProfileName": "设备配置名称",

lib/screens/metering/components/camera_container/components/camera_preview/widget_camera_preview.dart

@@ -1,6 +1,8 @@
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
+import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/platform_config.dart';
+import 'package:lightmeter/providers/metering_screen_layout_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/components/camera_preview/components/camera_view/widget_camera_view.dart';
 import 'package:lightmeter/screens/metering/components/camera_container/components/camera_preview/components/camera_view_placeholder/widget_placeholder_camera_view.dart';
@@ -31,12 +33,15 @@ class _CameraPreviewState extends State<CameraPreview> {
               child: widget.controller != null
                   ? ValueListenableBuilder<CameraValue>(
                       valueListenable: widget.controller!,
-                      builder: (_, __, ___) => Stack(
+                      builder: (_, __, ___) => widget.controller!.value.isInitialized
+                          ? Stack(
                               alignment: Alignment.bottomCenter,
                               children: [
-                          if (widget.controller!.value.isInitialized)
                                 CameraView(controller: widget.controller!),
-                          if (widget.controller!.value.isInitialized)
+                                if (MeteringScreenLayout.featureOf(
+                                  context,
+                                  MeteringScreenLayoutFeature.histogram,
+                                ))
                                   Positioned(
                                     left: 0,
                                     right: 0,
@@ -44,7 +49,8 @@ class _CameraPreviewState extends State<CameraPreview> {
                                     child: CameraHistogram(controller: widget.controller!),
                                   ),
                               ],
-                      ),
+                            )
+                          : const SizedBox.shrink(),
                     )
                   : CameraViewPlaceholder(error: widget.error),
             ),

lib/screens/settings/components/metering/components/metering_screen_layout/components/meterins_screen_layout_features_dialog/widget_dialog_metering_screen_layout_features.dart

@@ -71,6 +71,8 @@ class _MeteringScreenLayoutFeaturesDialogState extends State<MeteringScreenLayou
         return S.of(context).meteringScreenFeatureExtremeExposurePairs;
       case MeteringScreenLayoutFeature.filmPicker:
         return S.of(context).meteringScreenFeatureFilmPicker;
+      case MeteringScreenLayoutFeature.histogram:
+        return S.of(context).meteringScreenFeatureHistogram;
     }
   }
 }

test/data/models/metering_screen_layout_config_test.dart

@@ -2,30 +2,56 @@ import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:test/test.dart';
 
 void main() {
-  test('fromJson', () {
+  group(
+    'fromJson()',
+    () {
+      test('All keys', () {
         expect(
-      MeteringScreenLayoutConfigJson.fromJson({'0': true, '1': true}),
+          MeteringScreenLayoutConfigJson.fromJson(
+            {
+              '0': true,
+              '1': true,
+              '2': true,
+            },
+          ),
           {
             MeteringScreenLayoutFeature.extremeExposurePairs: true,
             MeteringScreenLayoutFeature.filmPicker: true,
-      },
+            MeteringScreenLayoutFeature.histogram: true,
-    );
-    expect(
-      MeteringScreenLayoutConfigJson.fromJson({'0': false, '1': false}),
-      {
-        MeteringScreenLayoutFeature.extremeExposurePairs: false,
-        MeteringScreenLayoutFeature.filmPicker: false,
           },
         );
       });
 
+      test('Legacy (no equipment profiles)', () {
+        expect(
+          MeteringScreenLayoutConfigJson.fromJson(
+            {
+              '0': true,
+              '1': true,
+            },
+          ),
+          {
+            MeteringScreenLayoutFeature.extremeExposurePairs: true,
+            MeteringScreenLayoutFeature.filmPicker: true,
+            MeteringScreenLayoutFeature.histogram: true,
+          },
+        );
+      });
+    },
+  );
+
   test('toJson', () {
     expect(
       {
         MeteringScreenLayoutFeature.extremeExposurePairs: true,
         MeteringScreenLayoutFeature.filmPicker: true,
+        MeteringScreenLayoutFeature.histogram: true,
       }.toJson(),
-      {'0': true, '1': true},
+      {
+        '0': true,
+        '1': true,
+        '2': true,
+      },
     );
   });
 }

test/data/shared_prefs_service_test.dart

@@ -193,6 +193,7 @@ void main() {
         {
           MeteringScreenLayoutFeature.extremeExposurePairs: true,
           MeteringScreenLayoutFeature.filmPicker: true,
+          MeteringScreenLayoutFeature.histogram: true,
         },
       );
     });
@@ -206,6 +207,7 @@ void main() {
         {
           MeteringScreenLayoutFeature.extremeExposurePairs: false,
           MeteringScreenLayoutFeature.filmPicker: true,
+          MeteringScreenLayoutFeature.histogram: true,
         },
       );
     });
@@ -214,17 +216,18 @@ void main() {
       when(
         () => sharedPreferences.setString(
           UserPreferencesService.meteringScreenLayoutKey,
-          """{"0":false,"1":true}""",
+          """{"0":false,"1":true,"2":true}""",
         ),
       ).thenAnswer((_) => Future.value(true));
       service.meteringScreenLayout = {
         MeteringScreenLayoutFeature.extremeExposurePairs: false,
         MeteringScreenLayoutFeature.filmPicker: true,
+        MeteringScreenLayoutFeature.histogram: true,
       };
       verify(
         () => sharedPreferences.setString(
           UserPreferencesService.meteringScreenLayoutKey,
-          """{"0":false,"1":true}""",
+          """{"0":false,"1":true,"2":true}""",
         ),
       ).called(1);
     });