ML-170 Show long shutter speeds for all selected aperture values (#172)

* generate exposures > 1"

* fixed unit tests

* added manual shutter speed to equipment profiles

* fixed integration tests

* fixed unit tests

* fixed long exposures overflow

* migrated to resources 1.2.0 and iap 0.10.0

* removed unnecessary loop

* fixed extreme exposure pairs test

* updated master screenshots

* fixed iap stub

iap/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   m3_lightmeter_resources:
     git:
       url: "https://github.com/vodemn/m3_lightmeter_resources"
-      ref: main
+      ref: v1.2.0
   shared_preferences: 2.2.0
 
 dev_dependencies:

integration_test/e2e_test.dart

@@ -44,7 +44,7 @@ void testE2E(String description) {
   testWidgets(
     description,
     (tester) async {
-      await tester.pumpApplication(equipmentProfiles: [], films: []);
+      await tester.pumpApplication(equipmentProfiles: [], filmsInUse: []);
 
       /// Create Praktica + Zenitar profile from scratch
       await tester.openSettings();
@@ -60,7 +60,7 @@ void testE2E(String description) {
       await tester.setZoomValue(0, mockEquipmentProfiles[0].lensZoom);
       expect(find.text('x1.91'), findsOneWidget);
       expect(find.text('f/1.7 - f/16'), findsOneWidget);
-      expect(find.text('1/1000 - 16"'), findsOneWidget);
+      expect(find.text('1/1000 - B'), findsOneWidget);
 
       /// Create Praktica + Jupiter profile from Zenitar profile
       await tester.tap(find.byIcon(Icons.copy).first);
@@ -71,7 +71,7 @@ void testE2E(String description) {
       await tester.setZoomValue(1, mockEquipmentProfiles[1].lensZoom);
       expect(find.text('x5.02'), findsOneWidget);
       expect(find.text('f/3.5 - f/22'), findsOneWidget);
-      expect(find.text('1/1000 - 16"'), findsNWidgets(2));
+      expect(find.text('1/1000 - B'), findsNWidgets(2));
       await tester.navigatorPop();
 
       /// Select some films

integration_test/mocks/paid_features_mock.dart

@@ -10,18 +10,21 @@ class _MockIAPStorageService extends Mock implements IAPStorageService {}
 class MockIAPProviders extends StatefulWidget {
   final List<EquipmentProfile>? equipmentProfiles;
   final String selectedEquipmentProfileId;
-  final List<Film>? films;
+  final List<Film> availableFilms;
+  final List<Film> filmsInUse;
   final Film selectedFilm;
   final Widget child;
 
   const MockIAPProviders({
     this.equipmentProfiles = const [],
     this.selectedEquipmentProfileId = '',
-    this.films = mockFilms,
+    List<Film>? availableFilms,
+    List<Film>? filmsInUse,
     this.selectedFilm = const Film.other(),
     required this.child,
     super.key,
-  });
+  })  : availableFilms = availableFilms ?? mockFilms,
+        filmsInUse = filmsInUse ?? mockFilms;
 
   @override
   State<MockIAPProviders> createState() => _MockIAPProvidersState();
@@ -36,7 +39,7 @@ class _MockIAPProvidersState extends State<MockIAPProviders> {
     mockIAPStorageService = _MockIAPStorageService();
     when(() => mockIAPStorageService.equipmentProfiles).thenReturn(widget.equipmentProfiles ?? mockEquipmentProfiles);
     when(() => mockIAPStorageService.selectedEquipmentProfileId).thenReturn(widget.selectedEquipmentProfileId);
-    when(() => mockIAPStorageService.filmsInUse).thenReturn(widget.films ?? mockFilms);
+    when(() => mockIAPStorageService.filmsInUse).thenReturn(widget.filmsInUse);
     when(() => mockIAPStorageService.selectedFilm).thenReturn(widget.selectedFilm);
   }
 
@@ -46,7 +49,7 @@ class _MockIAPProvidersState extends State<MockIAPProviders> {
       storageService: mockIAPStorageService,
       child: FilmsProvider(
         storageService: mockIAPStorageService,
-        availableFilms: widget.films ?? mockFilms,
+        availableFilms: widget.availableFilms,
         child: widget.child,
       ),
     );
@@ -78,7 +81,7 @@ final mockEquipmentProfiles = [
     ],
     shutterSpeedValues: ShutterSpeedValue.values.sublist(
       ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(1000, true, StopType.full)),
-      ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(16, false, StopType.full)) + 1,
+      ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(1, false, StopType.full)) + 1,
     ),
     isoValues: const [
       IsoValue(50, StopType.full),
@@ -108,7 +111,7 @@ final mockEquipmentProfiles = [
     ],
     shutterSpeedValues: ShutterSpeedValue.values.sublist(
       ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(1000, true, StopType.full)),
-      ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(16, false, StopType.full)) + 1,
+      ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(1, false, StopType.full)) + 1,
     ),
     isoValues: const [
       IsoValue(50, StopType.full),

integration_test/utils/widget_tester_actions.dart

@@ -22,7 +22,8 @@ extension WidgetTesterCommonActions on WidgetTester {
     IAPProductStatus productStatus = IAPProductStatus.purchased,
     List<EquipmentProfile>? equipmentProfiles,
     String selectedEquipmentProfileId = '',
-    List<Film>? films,
+    List<Film>? availableFilms,
+    List<Film>? filmsInUse,
     Film selectedFilm = const Film.other(),
   }) async {
     await pumpWidget(
@@ -33,7 +34,8 @@ extension WidgetTesterCommonActions on WidgetTester {
           child: MockIAPProviders(
             equipmentProfiles: equipmentProfiles,
             selectedEquipmentProfileId: selectedEquipmentProfileId,
-            films: films,
+            availableFilms: availableFilms,
+            filmsInUse: filmsInUse,
             selectedFilm: selectedFilm,
             child: const Application(),
           ),

lib/l10n/intl_en.arb

@@ -58,6 +58,8 @@
     "ndFiltersFilterDescription": "Select the ND filters to display. These may be your most commonly used ND filters or the ones that fit your lens.",
     "shutterSpeedValues": "Shutter speed values",
     "shutterSpeedValuesFilterDescription": "Select the range of shutter speed values to display. This is usually determined by the camera body you are using.",
+    "shutterSpeedManualShort": "B",
+    "shutterSpeedManual": "Manual",
     "isoValues": "ISO values",
     "isoValuesFilterDescription": "Select the ISO values to display. These may be your most commonly used values or those supported by your camera.",
     "lensZoom": "Lens zoom",
@@ -116,4 +118,4 @@
     "tooltipUseLightSensor": "Use lightsensor",
     "tooltipUseCamera": "Use camera",
     "tooltipOpenSettings": "Open settings"
-}
+}

lib/l10n/intl_fr.arb

@@ -58,6 +58,8 @@
     "ndFiltersFilterDescription": "Sélectionnez les filtres ND à afficher. Ce sont peut-être vos filtres ND les plus couramment utilisés ou ceux qui correspondent à votre lentille.",
     "shutterSpeedValues": "Valeurs de la vitesse d'obturation",
     "shutterSpeedValuesFilterDescription": "Sélectionnez la plage de valeurs de vitesse d'obturation à afficher. Cela est généralement déterminé par le corps de l'appareil que vous utilisez.",
+    "shutterSpeedManualShort": "B",
+    "shutterSpeedManual": "Manuelle",
     "isoValues": "Valeurs ISO",
     "isoValuesFilterDescription": "Sélectionnez les valeurs ISO à afficher. Ce sont peut-être vos valeurs les plus couramment utilisées ou celles prises en charge par votre caméra.",
     "lensZoom": "Zoom sur l'objectif",

lib/l10n/intl_ru.arb

@@ -58,6 +58,8 @@
     "ndFiltersFilterDescription": "Выберите ND фильтры для отображения. Это могут быть наиболее часто используемые ND фильтры или фильтры, подходящие под ваш объектив.",
     "shutterSpeedValues": "Значения выдержки",
     "shutterSpeedValuesFilterDescription": "Выберите диапазон значений выдержки. Обычно ограничивается возможностями вашей камеры.",
+    "shutterSpeedManualShort": "B",
+    "shutterSpeedManual": "Ручная",
     "isoValues": "Значения ISO",
     "isoValuesFilterDescription": "Выберите значения ISO для отображения. Это может быть наиболее часто используемые значения или значения, поддерживаемые вашей камерой.",
     "lensZoom": "Зум объектива",

lib/l10n/intl_zh.arb

@@ -58,6 +58,8 @@
     "ndFiltersFilterDescription": "选择要显示的 ND 滤镜系数。可能是您最常用的 ND 滤镜，也可能是适合您镜头的减光镜。",
     "shutterSpeedValues": "快门速度",
     "shutterSpeedValuesFilterDescription": "选择要显示的快门速度范围。这通常由您使用的相机机身决定。",
+    "shutterSpeedManualShort": "B",
+    "shutterSpeedManual": "手册",
     "isoValues": "ISO",
     "isoValuesFilterDescription": "选择要显示的 ISO 。这些可能是您常用的ISO值，也可以是相机支持的ISO范围。",
     "lensZoom": "镜头变焦",

lib/screens/metering/components/shared/exposure_pairs_list/components/exposure_pairs_list_item/widget_item_list_exposure_pairs.dart

@@ -15,9 +15,13 @@ class ExposurePairsListItem<T extends PhotographyStopValue> extends StatelessWid
   @override
   Widget build(BuildContext context) {
     final List<Widget> rowChildren = [
-      Text(
+      Flexible(
-        value.toString(),
+        child: Text(
-        style: labelTextStyle(context).copyWith(color: Theme.of(context).colorScheme.onBackground),
+          value.toString(),
+          style: labelTextStyle(context).copyWith(color: Theme.of(context).colorScheme.onBackground),
+          softWrap: false,
+          overflow: TextOverflow.fade,
+        ),
       ),
       const SizedBox(width: Dimens.grid8),
       ColoredBox(

lib/screens/metering/screen_metering.dart

@@ -158,22 +158,40 @@ class MeteringContainerBuidler extends StatelessWidget {
       shutterSpeedOffset = 0;
     }
 
-    final int itemsCount = min(
+    int itemsCount = min(
           apertureValues.length + shutterSpeedOffset,
           shutterSpeedValues.length + apertureOffset,
         ) -
         max(apertureOffset, shutterSpeedOffset);
 
-    if (itemsCount <= 0) {
+    if (apertureOffset == apertureValues.length) {
       return List.empty();
     }
 
+    final lastPreCalcShutterSpeed =
+        shutterSpeedValues.elementAtOrNull(itemsCount - 1 + shutterSpeedOffset) ?? shutterSpeedValues.last;
+    final preCalculatedItemsCount = itemsCount;
+    if (itemsCount <= 0) {
+      itemsCount = apertureValues.length;
+    } else {
+      itemsCount += (apertureValues.length - 1) - (itemsCount - 1 + apertureOffset);
+    }
+
     final exposurePairs = List.generate(
       itemsCount,
-      (index) => ExposurePair(
+      (index) {
-        apertureValues[index + apertureOffset],
+        final stopDifference = (index - (preCalculatedItemsCount - 1)) / (stopType.index + 1);
-        shutterSpeedValues[index + shutterSpeedOffset],
+        final newShutterSpeed = log2(lastPreCalcShutterSpeed.rawValue) + stopDifference;
-      ),
+        return ExposurePair(
+          apertureValues[index + apertureOffset],
+          shutterSpeedValues.elementAtOrNull(index + shutterSpeedOffset) ??
+              ShutterSpeedValue(
+                calcShutterSpeed(newShutterSpeed),
+                false,
+                stopDifference == stopDifference.roundToDouble() ? StopType.full : stopType,
+              ),
+        );
+      },
       growable: false,
     );
 
@@ -191,7 +209,9 @@ class MeteringContainerBuidler extends StatelessWidget {
     );
     final endCutEV = max(
       equipmentApertureValues.last.difference(exposurePairs.last.aperture),
-      equipmentShutterSpeedValues.last.difference(exposurePairs.last.shutterSpeed),
+      equipmentShutterSpeedValues.last != ShutterSpeedValue.values.last
+          ? equipmentShutterSpeedValues.last.difference(exposurePairs.last.shutterSpeed)
+          : double.negativeInfinity,
     );
 
     final startCut = (startCutEV * (stopType.index + 1)).round().clamp(0, itemsCount);
@@ -203,3 +223,12 @@ class MeteringContainerBuidler extends StatelessWidget {
     return exposurePairs.sublist(startCut, itemsCount - endCut);
   }
 }
+
+double calcShutterSpeed(double stopValue) {
+  final shutterSpeed = pow(2, stopValue);
+  if (stopValue < 1.5) {
+    return (shutterSpeed * 10).round() / 10;
+  } else {
+    return shutterSpeed.roundToDouble();
+  }
+}

lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/range_picker_list_tile/widget_list_tile_range_picker.dart

@@ -8,6 +8,8 @@ class RangePickerListTile<T extends PhotographyValue> extends StatelessWidget {
   final String description;
   final List<T> selectedValues;
   final List<T> values;
+  final String Function(BuildContext context, T value)? trailingAdapter;
+  final String Function(BuildContext context, T value)? dialogValueAdapter;
   final ValueChanged<List<T>> onChanged;
 
   const RangePickerListTile({
@@ -16,6 +18,8 @@ class RangePickerListTile<T extends PhotographyValue> extends StatelessWidget {
     required this.description,
     required this.selectedValues,
     required this.values,
+    this.trailingAdapter,
+    this.dialogValueAdapter,
     required this.onChanged,
     super.key,
   });
@@ -25,7 +29,7 @@ class RangePickerListTile<T extends PhotographyValue> extends StatelessWidget {
     return ListTile(
       leading: Icon(icon),
       title: Text(title),
-      trailing: Text("${selectedValues.first} - ${selectedValues.last}"),
+      trailing: Text(_trailing(context)),
       onTap: () {
         showDialog<List<T>>(
           context: context,
@@ -35,7 +39,7 @@ class RangePickerListTile<T extends PhotographyValue> extends StatelessWidget {
             description: description,
             values: values,
             selectedValues: selectedValues,
-            titleAdapter: (_, value) => value.toString(),
+            valueAdapter: (context, value) => dialogValueAdapter?.call(context, value) ?? value.toString(),
           ),
         ).then((values) {
           if (values != null) {
@@ -45,4 +49,16 @@ class RangePickerListTile<T extends PhotographyValue> extends StatelessWidget {
       },
     );
   }
+
+  String _trailing(BuildContext context) {
+    final buffer = StringBuffer();
+    buffer.write(trailingAdapter?.call(context, selectedValues.first) ?? selectedValues.first);
+    if (selectedValues.first != selectedValues.last) {
+      buffer.writeAll([
+        ' - ',
+        trailingAdapter?.call(context, selectedValues.last) ?? selectedValues.last,
+      ]);
+    }
+    return buffer.toString();
+  }
 }

lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart

@@ -269,6 +269,10 @@ class _AnimatedEquipmentListTiles extends AnimatedWidget {
               values: ShutterSpeedValue.values,
               selectedValues: equipmentData.shutterSpeedValues,
               onChanged: onShutterSpeedValuesSelected,
+              trailingAdapter: (context, value) =>
+                  value.value == 1 ? S.of(context).shutterSpeedManualShort : value.toString(),
+              dialogValueAdapter: (context, value) =>
+                  value.value == 1 ? S.of(context).shutterSpeedManual : value.toString(),
             ),
             SliderPickerListTile(
               icon: Icons.zoom_in,

lib/screens/settings/components/shared/dialog_range_picker/widget_dialog_picker_range.dart

@@ -9,7 +9,7 @@ class DialogRangePicker<T extends PhotographyValue> extends StatefulWidget {
   final String description;
   final List<T> values;
   final List<T> selectedValues;
-  final String Function(BuildContext context, T value) titleAdapter;
+  final String Function(BuildContext context, T value) valueAdapter;
 
   const DialogRangePicker({
     required this.icon,
@@ -17,7 +17,7 @@ class DialogRangePicker<T extends PhotographyValue> extends StatefulWidget {
     required this.description,
     required this.values,
     required this.selectedValues,
-    required this.titleAdapter,
+    required this.valueAdapter,
     super.key,
   });
 
@@ -52,8 +52,8 @@ class _DialogRangePickerState<T extends PhotographyValue> extends State<DialogRa
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    Text(widget.values[_start].toString()),
+                    Text(widget.valueAdapter(context, widget.values[_start])),
-                    Text(widget.values[_end].toString()),
+                    Text(widget.valueAdapter(context, widget.values[_end])),
                   ],
                 ),
               ),

pubspec.yaml

@@ -29,11 +29,11 @@ dependencies:
   m3_lightmeter_iap:
     git:
       url: "https://github.com/vodemn/m3_lightmeter_iap"
-      ref: v0.9.2
+      ref: v0.10.0
   m3_lightmeter_resources:
     git:
       url: "https://github.com/vodemn/m3_lightmeter_resources"
-      ref: main
+      ref: v1.2.0
   material_color_utilities: 0.5.0
   package_info_plus: 4.2.0
   permission_handler: 10.4.3

screenshots/generate_screenshots.dart

@@ -72,7 +72,8 @@ void main() {
   testWidgets('Generate light theme screenshots', (tester) async {
     mockSharedPrefs(ThemeType.light, lightThemeColor);
     await tester.pumpApplication(
-      films: [_mockFilm],
+      availableFilms: [_mockFilm],
+      filmsInUse: [_mockFilm],
       selectedFilm: _mockFilm,
     );
 
@@ -115,7 +116,8 @@ void main() {
     (tester) async {
       mockSharedPrefs(ThemeType.dark, darkThemeColor);
       await tester.pumpApplication(
-        films: [_mockFilm],
+        availableFilms: [_mockFilm],
+        filmsInUse: [_mockFilm],
         selectedFilm: _mockFilm,
       );
 

test/application_mock.dart

@@ -98,7 +98,7 @@ class _GoldenTestApplicationMockState extends State<GoldenTestApplicationMock> {
         child: MockIAPProviders(
           equipmentProfiles: mockEquipmentProfiles,
           selectedEquipmentProfileId: mockEquipmentProfiles.first.id,
-          films: films,
+          selectedFilm: mockFilms.first,
           child: Builder(
             builder: (context) {
               return MaterialApp(

test/screens/metering/components/shared/readings_container/equipment_profile_picker_test.dart

@@ -91,7 +91,7 @@ final _mockEquipmentProfiles = [
     ndValues: NdValue.values.sublist(0, 3),
     shutterSpeedValues: ShutterSpeedValue.values.sublist(
       ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(1000, true, StopType.full)),
-      ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(16, false, StopType.full)) + 1,
+      ShutterSpeedValue.values.indexOf(const ShutterSpeedValue(1, false, StopType.full)) + 1,
     ),
     isoValues: const [
       IsoValue(50, StopType.full),

test/screens/metering/components/shared/readings_container/extreme_exposure_pairs_container_test.dart

@@ -38,7 +38,7 @@ void main() {
       expect(find.descendant(of: pickerFinder, matching: find.text(S.current.fastestExposurePair)), findsOneWidget);
       expect(find.descendant(of: pickerFinder, matching: find.text(S.current.slowestExposurePair)), findsOneWidget);
       expect(find.descendant(of: pickerFinder, matching: find.text('f/1.0 - 1/2000')), findsOneWidget);
-      expect(find.descendant(of: pickerFinder, matching: find.text('f/45 - 16"')), findsOneWidget);
+      expect(find.descendant(of: pickerFinder, matching: find.text('f/45 - 1"')), findsOneWidget);
     },
   );
 }