From c8de7a46214173f1f38d1892f6ce0f3f3ba14faa Mon Sep 17 00:00:00 2001 From: Vadim <44135514+vodemn@users.noreply.github.com> Date: Mon, 17 Feb 2025 21:39:02 +0100 Subject: [PATCH] added focal length section --- integration_test/e2e_test.dart | 3 +- lib/l10n/intl_en.arb | 2 ++ lib/l10n/intl_fr.arb | 2 ++ lib/l10n/intl_ru.arb | 2 ++ lib/l10n/intl_zh.arb | 4 ++- .../screen_equipment_profile_edit.dart | 2 +- .../zoom_slider/widget_slider_zoom.dart | 2 +- .../widget_list_tile_camera_features.dart | 29 ++++++++++--------- lib/utils/double_to_zoom.dart | 18 +++++++++++- 9 files changed, 45 insertions(+), 19 deletions(-) diff --git a/integration_test/e2e_test.dart b/integration_test/e2e_test.dart index 37f6838..1f0060b 100644 --- a/integration_test/e2e_test.dart +++ b/integration_test/e2e_test.dart @@ -305,7 +305,8 @@ Future _expectMeteringState( await tester.scrollToTheLastExposurePair(equipmentProfile: equipmentProfile); expectExposurePairsListItem(tester, slowest.split(' - ')[0], slowest.split(' - ')[1]); expectMeasureButton(ev); - expect(find.text(equipmentProfile.lensZoom.toZoom()), findsOneWidget); + final BuildContext context = tester.element(find.byType(IsoValuePicker)); + expect(find.text(equipmentProfile.lensZoom.toZoom(context)), findsOneWidget); } Future _expectMeteringStateAndMeasure( diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 28d5242..bcfe627 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -45,6 +45,8 @@ "cameraFeatureSpotMeteringHint": "Long press the camera view to remove metering spot", "cameraFeatureHistogram": "Histogram", "cameraFeatureHistogramHint": "Enabling histogram can encrease battery drain", + "cameraFeaturesShowFocalLength": "Show Focal Length", + "cameraFeaturesShowFocalLengthHint": "Focal length will be determined after the first photo is taken", "film": "Film", "filmPush": "Film (push)", "filmPull": "Film (pull)", diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index f1226fe..2038ab1 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -45,6 +45,8 @@ "cameraFeatureSpotMeteringHint": "Appuyez longuement sur la vue de l'appareil photo pour supprimer le spot de mesure", "cameraFeatureHistogram": "Histogramme", "cameraFeatureHistogramHint": "L'activation de l'histogramme peut augmenter la consommation de la batterie", + "cameraFeaturesShowFocalLength": "Afficher la focale", + "cameraFeaturesShowFocalLengthHint": "La focale sera déterminée après la première photo", "film": "Pellicule", "filmPush": "Pellicule (push)", "filmPull": "Pellicule (pull)", diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb index d9a813b..d5998ab 100644 --- a/lib/l10n/intl_ru.arb +++ b/lib/l10n/intl_ru.arb @@ -45,6 +45,8 @@ "cameraFeatureSpotMeteringHint": "Используйте долгое нажатие, чтобы удалить точку замера", "cameraFeatureHistogram": "Гистограмма", "cameraFeatureHistogramHint": "Использование гистограммы может увеличить расход аккумулятора", + "cameraFeaturesShowFocalLength": "Показать фокусное расстояние", + "cameraFeaturesShowFocalLengthHint": "Фокусное расстояние будет определено после первого снимка", "film": "Пленка", "filmPush": "Пленка (push)", "filmPull": "Пленка (pull)", diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb index d5a96a4..d82b973 100644 --- a/lib/l10n/intl_zh.arb +++ b/lib/l10n/intl_zh.arb @@ -45,6 +45,8 @@ "cameraFeatureSpotMeteringHint": "长按相机视图可移除测光点", "cameraFeatureHistogram": "直方图", "cameraFeatureHistogramHint": "启用直方图会增加电池消耗", + "cameraFeaturesShowFocalLength": "显示焦距", + "cameraFeaturesShowFocalLengthHint": "焦距将在拍摄第一张照片后确定", "film": "胶片", "filmPush": "胶片 (push)", "filmPull": "胶片 (pull)", @@ -150,4 +152,4 @@ "filmFormulaExponentialRfPlaceholder": "1.3", "addEquipmentProfileTitle": "添加设备", "editEquipmentProfileTitle": "编辑设备" -} +} \ No newline at end of file diff --git a/lib/screens/equipment_profile_edit/screen_equipment_profile_edit.dart b/lib/screens/equipment_profile_edit/screen_equipment_profile_edit.dart index 332bee6..db5cbd8 100644 --- a/lib/screens/equipment_profile_edit/screen_equipment_profile_edit.dart +++ b/lib/screens/equipment_profile_edit/screen_equipment_profile_edit.dart @@ -246,7 +246,7 @@ class _LensZoomListTileBuilder extends StatelessWidget { description: S.of(context).lensZoomDescription, value: state.lensZoom, range: const RangeValues(1, 7), - valueAdapter: (_, value) => value.toZoom(), + valueAdapter: (context, value) => value.toZoom(context), onChanged: (value) { context.read().add(EquipmentProfileLensZoomChangedEvent(value)); }, diff --git a/lib/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart b/lib/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart index 316d547..50594fd 100644 --- a/lib/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart +++ b/lib/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart @@ -35,7 +35,7 @@ class _ZoomSliderState extends State { icon: Icons.search_outlined, defaultValue: EquipmentProfiles.selectedOf(context).lensZoom, rulerValueAdapter: (value) => value.toStringAsFixed(0), - valueAdapter: (value) => value.toZoom(), + valueAdapter: (value) => value.toZoom(context), ); } } diff --git a/lib/screens/settings/components/metering/components/camera_features/widget_list_tile_camera_features.dart b/lib/screens/settings/components/metering/components/camera_features/widget_list_tile_camera_features.dart index c779912..00ec9fd 100644 --- a/lib/screens/settings/components/metering/components/camera_features/widget_list_tile_camera_features.dart +++ b/lib/screens/settings/components/metering/components/camera_features/widget_list_tile_camera_features.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/data/models/camera_feature.dart'; import 'package:lightmeter/generated/l10n.dart'; +import 'package:lightmeter/providers/services_provider.dart'; import 'package:lightmeter/providers/user_preferences_provider.dart'; import 'package:lightmeter/screens/settings/components/shared/dialog_switch/widget_dialog_switch.dart'; import 'package:lightmeter/screens/settings/components/shared/iap_list_tile/widget_list_tile_iap.dart'; @@ -20,21 +21,21 @@ class CameraFeaturesListTile extends StatelessWidget { icon: Icons.camera_alt_outlined, title: S.of(context).cameraFeatures, values: UserPreferencesProvider.cameraConfigOf(context), - titleAdapter: (context, feature) { - switch (feature) { - case CameraFeature.spotMetering: - return S.of(context).cameraFeatureSpotMetering; - case CameraFeature.histogram: - return S.of(context).cameraFeatureHistogram; - } + enabledAdapter: (feature) => switch (feature) { + CameraFeature.spotMetering => true, + CameraFeature.histogram => true, + CameraFeature.showFocalLength => + ServicesProvider.of(context).userPreferencesService.cameraFocalLength != null, }, - subtitleAdapter: (context, feature) { - switch (feature) { - case CameraFeature.spotMetering: - return S.of(context).cameraFeatureSpotMeteringHint; - case CameraFeature.histogram: - return S.of(context).cameraFeatureHistogramHint; - } + titleAdapter: (context, feature) => switch (feature) { + CameraFeature.spotMetering => S.of(context).cameraFeatureSpotMetering, + CameraFeature.histogram => S.of(context).cameraFeatureHistogram, + CameraFeature.showFocalLength => S.of(context).cameraFeaturesShowFocalLength, + }, + subtitleAdapter: (context, feature) => switch (feature) { + CameraFeature.spotMetering => S.of(context).cameraFeatureSpotMeteringHint, + CameraFeature.histogram => S.of(context).cameraFeatureHistogramHint, + CameraFeature.showFocalLength => S.of(context).cameraFeaturesShowFocalLengthHint, }, onSave: UserPreferencesProvider.of(context).setCameraFeature, ), diff --git a/lib/utils/double_to_zoom.dart b/lib/utils/double_to_zoom.dart index 6d2b99f..075f42c 100644 --- a/lib/utils/double_to_zoom.dart +++ b/lib/utils/double_to_zoom.dart @@ -1,3 +1,19 @@ +import 'package:flutter/material.dart'; +import 'package:lightmeter/data/models/camera_feature.dart'; +import 'package:lightmeter/providers/services_provider.dart'; +import 'package:lightmeter/providers/user_preferences_provider.dart'; + extension DoubleToZoom on double { - String toZoom() => 'x${toStringAsFixed(2)}'; + String toZoom(BuildContext context) { + final showFocalLength = UserPreferencesProvider.cameraFeatureOf(context, CameraFeature.showFocalLength); + final cameraFocalLength = ServicesProvider.of(context).userPreferencesService.cameraFocalLength; + + if (showFocalLength && cameraFocalLength != null) { + ServicesProvider.of(context).userPreferencesService.cameraFocalLength; + final zoomedFocalLength = (this * cameraFocalLength).round(); + return '${zoomedFocalLength}mm'; + } else { + return 'x${toStringAsFixed(2)}'; + } + } }