lib/screens/metering/components/camera_container/components/camera_preview/components/histogram/widget_histogram.dart

@@ -28,9 +28,7 @@ class _CameraHistogramState extends State<CameraHistogram> {
 
   @override
   void dispose() {
-    /// There is no need to stop image stream here,
-    /// because this widget will be disposed when CameraController is disposed
-    /// widget.controller.stopImageStream();
+    widget.controller.stopImageStream();
     super.dispose();
   }
 

lib/screens/metering/components/camera_container/widget_container_camera.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/data/models/exposure_pair.dart';
@@ -47,94 +45,59 @@ class CameraContainer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double meteringContainerHeight = _meteringContainerHeight(context);
-    final double cameraPreviewHeight = _cameraPreviewHeight(context);
-    final double topBarOverflow = meteringContainerHeight - cameraPreviewHeight;
+    final double cameraViewHeight =
+        ((MediaQuery.of(context).size.width - Dimens.grid8 - 2 * Dimens.paddingM) / 2) /
+            PlatformConfig.cameraPreviewAspectRatio;
 
-    return Stack(
-      children: [
-        Positioned(
-          left: 0,
-          top: 0,
-          right: 0,
-          child: MeteringTopBar(
-            readingsContainer: ReadingsContainer(
-              fastest: fastest,
-              slowest: slowest,
-              film: film,
-              iso: iso,
-              nd: nd,
-              onFilmChanged: onFilmChanged,
-              onIsoChanged: onIsoChanged,
-              onNdChanged: onNdChanged,
-            ),
-            appendixHeight: topBarOverflow,
-            preview: const _CameraViewBuilder(),
-          ),
-        ),
-        SafeArea(
-          bottom: false,
-          child: Column(
-            children: [
-              SizedBox(
-                height: min(meteringContainerHeight, cameraPreviewHeight) + Dimens.paddingM * 2,
-              ),
-              Expanded(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: Dimens.paddingM),
-                  child: Row(
-                    children: [
-                      Expanded(
-                        child: Padding(
-                          padding: EdgeInsets.only(top: topBarOverflow >= 0 ? topBarOverflow : 0),
-                          child: ExposurePairsList(exposurePairs),
-                        ),
-                      ),
-                      const SizedBox(width: Dimens.grid8),
-                      Expanded(
-                        child: Padding(
-                          padding: EdgeInsets.only(top: topBarOverflow <= 0 ? -topBarOverflow : 0),
-                          child: const _CameraControlsBuilder(),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-        )
-      ],
-    );
-  }
-
-  double _meteringContainerHeight(BuildContext context) {
-    double enabledFeaturesHeight = 0;
+    double topBarOverflow = Dimens.readingContainerSingleValueHeight + // ISO & ND
+        -cameraViewHeight;
     if (FeaturesConfig.equipmentProfilesEnabled) {
-      enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight;
-      enabledFeaturesHeight += Dimens.paddingS;
+      topBarOverflow += Dimens.readingContainerSingleValueHeight;
+      topBarOverflow += Dimens.paddingS;
     }
     if (MeteringScreenLayout.featureOf(
       context,
       MeteringScreenLayoutFeature.extremeExposurePairs,
     )) {
-      enabledFeaturesHeight += Dimens.readingContainerDoubleValueHeight;
-      enabledFeaturesHeight += Dimens.paddingS;
+      topBarOverflow += Dimens.readingContainerDoubleValueHeight;
+      topBarOverflow += Dimens.paddingS;
     }
     if (MeteringScreenLayout.featureOf(
       context,
       MeteringScreenLayoutFeature.filmPicker,
     )) {
-      enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight;
-      enabledFeaturesHeight += Dimens.paddingS;
+      topBarOverflow += Dimens.readingContainerSingleValueHeight;
+      topBarOverflow += Dimens.paddingS;
     }
 
-    return enabledFeaturesHeight + Dimens.readingContainerSingleValueHeight; // ISO & ND
-  }
-
-  double _cameraPreviewHeight(BuildContext context) {
-    return ((MediaQuery.of(context).size.width - Dimens.grid8 - 2 * Dimens.paddingM) / 2) /
-        PlatformConfig.cameraPreviewAspectRatio;
+    return Column(
+      children: [
+        MeteringTopBar(
+          readingsContainer: ReadingsContainer(
+            fastest: fastest,
+            slowest: slowest,
+            film: film,
+            iso: iso,
+            nd: nd,
+            onFilmChanged: onFilmChanged,
+            onIsoChanged: onIsoChanged,
+            onNdChanged: onNdChanged,
+          ),
+          appendixHeight: topBarOverflow,
+          preview: const _CameraViewBuilder(),
+        ),
+        Expanded(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: Dimens.paddingM),
+            child: _MiddleContentWrapper(
+              topBarOverflow: topBarOverflow,
+              leftContent: ExposurePairsList(exposurePairs),
+              rightContent: const _CameraControlsBuilder(),
+            ),
+          ),
+        ),
+      ],
+    );
   }
 }
 
@@ -202,3 +165,43 @@ class _CameraControlsBuilder extends StatelessWidget {
     );
   }
 }
+
+class _MiddleContentWrapper extends StatelessWidget {
+  final double topBarOverflow;
+  final Widget leftContent;
+  final Widget rightContent;
+
+  const _MiddleContentWrapper({
+    required this.topBarOverflow,
+    required this.leftContent,
+    required this.rightContent,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) => OverflowBox(
+        alignment: Alignment.bottomCenter,
+        maxHeight: constraints.maxHeight + topBarOverflow.abs(),
+        maxWidth: constraints.maxWidth,
+        child: Row(
+          children: [
+            Expanded(
+              child: Padding(
+                padding: EdgeInsets.only(top: topBarOverflow >= 0 ? topBarOverflow : 0),
+                child: leftContent,
+              ),
+            ),
+            const SizedBox(width: Dimens.grid8),
+            Expanded(
+              child: Padding(
+                padding: EdgeInsets.only(top: topBarOverflow <= 0 ? -topBarOverflow : 0),
+                child: rightContent,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

pubspec.yaml

@@ -1,7 +1,7 @@
 name: lightmeter
 description: A new Flutter project.
 publish_to: "none"
-version: 0.13.0+36
+version: 0.12.4+35
 
 environment:
   sdk: ">=3.0.0 <4.0.0"