From 56ab8aa85a1ecf9b27c7cb2d6028baaf17fe6715 Mon Sep 17 00:00:00 2001 From: Vadim <44135514+vodemn@users.noreply.github.com> Date: Mon, 8 Sep 2025 17:09:26 +0200 Subject: [PATCH] allow to hide pinhole shutter speed --- .../widget_container_camera.dart | 12 ++++--- .../widget_list_exposure_pairs.dart | 33 ++++++++++--------- .../widget_container_readings.dart | 16 ++++----- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/lib/screens/metering/components/camera_container/widget_container_camera.dart b/lib/screens/metering/components/camera_container/widget_container_camera.dart index 871a41c..a42827e 100644 --- a/lib/screens/metering/components/camera_container/widget_container_camera.dart +++ b/lib/screens/metering/components/camera_container/widget_container_camera.dart @@ -126,11 +126,13 @@ class CameraContainer extends StatelessWidget { enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight; enabledFeaturesHeight += Dimens.paddingS; } - if (EquipmentProfiles.selectedOf(context) is PinholeEquipmentProfile) { - enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight; - enabledFeaturesHeight += Dimens.paddingS; - } else if (context.meteringFeature(MeteringScreenLayoutFeature.extremeExposurePairs)) { - enabledFeaturesHeight += Dimens.readingContainerDoubleValueHeight; + if (context.meteringFeature(MeteringScreenLayoutFeature.extremeExposurePairs)) { + if (EquipmentProfiles.selectedOf(context) is PinholeEquipmentProfile) { + enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight; + } else { + enabledFeaturesHeight += Dimens.readingContainerDoubleValueHeight; + } + enabledFeaturesHeight += Dimens.paddingS; } diff --git a/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart b/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart index f5ec902..a666b43 100644 --- a/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart +++ b/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart @@ -65,26 +65,27 @@ class ExposurePairsList extends StatelessWidget { ], ), ), - Positioned( - top: 0, - bottom: 0, - child: LayoutBuilder( - builder: (context, constraints) => Align( - alignment: index == 0 - ? Alignment.bottomCenter - : (index == exposurePairs.length - 1 ? Alignment.topCenter : Alignment.center), - child: SizedBox( - height: index == 0 || index == exposurePairs.length - 1 - ? constraints.maxHeight / 2 - : constraints.maxHeight, - child: ColoredBox( - color: Theme.of(context).colorScheme.onSurface, - child: const SizedBox(width: 1), + if (exposurePairs.length > 1) + Positioned( + top: 0, + bottom: 0, + child: LayoutBuilder( + builder: (context, constraints) => Align( + alignment: index == 0 + ? Alignment.bottomCenter + : (index == exposurePairs.length - 1 ? Alignment.topCenter : Alignment.center), + child: SizedBox( + height: index == 0 || index == exposurePairs.length - 1 + ? constraints.maxHeight / 2 + : constraints.maxHeight, + child: ColoredBox( + color: Theme.of(context).colorScheme.onSurface, + child: const SizedBox(width: 1), + ), ), ), ), ), - ), ], ); }, diff --git a/lib/screens/metering/components/shared/readings_container/widget_container_readings.dart b/lib/screens/metering/components/shared/readings_container/widget_container_readings.dart index 034ece1..0c61e68 100644 --- a/lib/screens/metering/components/shared/readings_container/widget_container_readings.dart +++ b/lib/screens/metering/components/shared/readings_container/widget_container_readings.dart @@ -46,14 +46,14 @@ class ReadingsContainer extends StatelessWidget { const EquipmentProfilePicker(), const _InnerPadding(), ], - if (EquipmentProfiles.selectedOf(context) is PinholeEquipmentProfile) ...[ - ShutterSpeedContainer(shutterSpeedValue: fastest?.shutterSpeed), - const _InnerPadding(), - ] else if (context.meteringFeature(MeteringScreenLayoutFeature.extremeExposurePairs)) ...[ - ExtremeExposurePairsContainer( - fastest: fastest, - slowest: slowest, - ), + if (context.meteringFeature(MeteringScreenLayoutFeature.extremeExposurePairs)) ...[ + if (EquipmentProfiles.selectedOf(context) is PinholeEquipmentProfile) + ShutterSpeedContainer(shutterSpeedValue: fastest?.shutterSpeed) + else + ExtremeExposurePairsContainer( + fastest: fastest, + slowest: slowest, + ), const _InnerPadding(), ], if (context.meteringFeature(MeteringScreenLayoutFeature.filmPicker)) ...[