Merge remote-tracking branch 'origin' into feature/ML-95

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

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/data/models/exposure_pair.dart';
@@ -45,34 +47,17 @@ class CameraContainer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final double cameraViewHeight =
+    final double meteringContainerHeight = _meteringContainerHeight(context);
-        ((MediaQuery.of(context).size.width - Dimens.grid8 - 2 * Dimens.paddingM) / 2) /
+    final double cameraPreviewHeight = _cameraPreviewHeight(context);
-            PlatformConfig.cameraPreviewAspectRatio;
+    final double topBarOverflow = meteringContainerHeight - cameraPreviewHeight;
 
-    double topBarOverflow = Dimens.readingContainerSingleValueHeight + // ISO & ND
+    return Stack(
-        -cameraViewHeight;
-    if (FeaturesConfig.equipmentProfilesEnabled) {
-      topBarOverflow += Dimens.readingContainerSingleValueHeight;
-      topBarOverflow += Dimens.paddingS;
-    }
-    if (MeteringScreenLayout.featureOf(
-      context,
-      MeteringScreenLayoutFeature.extremeExposurePairs,
-    )) {
-      topBarOverflow += Dimens.readingContainerDoubleValueHeight;
-      topBarOverflow += Dimens.paddingS;
-    }
-    if (MeteringScreenLayout.featureOf(
-      context,
-      MeteringScreenLayoutFeature.filmPicker,
-    )) {
-      topBarOverflow += Dimens.readingContainerSingleValueHeight;
-      topBarOverflow += Dimens.paddingS;
-    }
-
-    return Column(
       children: [
-        MeteringTopBar(
+        Positioned(
+          left: 0,
+          top: 0,
+          right: 0,
+          child: MeteringTopBar(
             readingsContainer: ReadingsContainer(
               fastest: fastest,
               slowest: slowest,
@@ -86,19 +71,71 @@ class CameraContainer extends StatelessWidget {
             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: _MiddleContentWrapper(
+                  child: Row(
-              topBarOverflow: topBarOverflow,
+                    children: [
-              leftContent: ExposurePairsList(exposurePairs),
+                      Expanded(
-              rightContent: const _CameraControlsBuilder(),
+                        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;
+    if (FeaturesConfig.equipmentProfilesEnabled) {
+      enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight;
+      enabledFeaturesHeight += Dimens.paddingS;
+    }
+    if (MeteringScreenLayout.featureOf(
+      context,
+      MeteringScreenLayoutFeature.extremeExposurePairs,
+    )) {
+      enabledFeaturesHeight += Dimens.readingContainerDoubleValueHeight;
+      enabledFeaturesHeight += Dimens.paddingS;
+    }
+    if (MeteringScreenLayout.featureOf(
+      context,
+      MeteringScreenLayoutFeature.filmPicker,
+    )) {
+      enabledFeaturesHeight += Dimens.readingContainerSingleValueHeight;
+      enabledFeaturesHeight += 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;
+  }
 }
 
 class _CameraViewBuilder extends StatelessWidget {
@@ -165,43 +202,3 @@ 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.12.4+35
+version: 0.13.0+36
 
 environment:
   sdk: ">=3.0.0 <4.0.0"