lib/l10n/intl_en.arb

@@ -36,7 +36,6 @@
     "lightSensor": "Light sensor",
     "meteringScreenLayout": "Metering screen layout",
     "meteringScreenLayoutHint": "Hide elements on the metering screen that you don't need so that they don't waste exposure pairs list space.",
-    "meteringScreenLayoutHintEquipmentProfiles": "Equipment profile picker",
     "meteringScreenFeatureExtremeExposurePairs": "Fastest & shortest exposure pairs",
     "meteringScreenFeatureFilmPicker": "Film picker",
     "meteringScreenFeatureHistogram": "Histogram",

lib/l10n/intl_fr.arb

@@ -36,7 +36,6 @@
     "lightSensor": "Capteur de lumière",
     "meteringScreenLayout": "Disposition de l'écran de mesure",
     "meteringScreenLayoutHint": "Masquer les éléments sur l'écran de mesure dont vous n'avez pas besoin pour qu'ils ne gaspillent pas de l'espace dans les paires d'exposition.",
-    "meteringScreenLayoutHintEquipmentProfiles": "Sélecteur de profil de l'équipement",
     "meteringScreenFeatureExtremeExposurePairs": "Paires d'exposition les plus rapides et les plus courtes",
     "meteringScreenFeatureFilmPicker": "Sélecteur de film",
     "meteringScreenFeatureHistogram": "Histogramme",

lib/l10n/intl_ru.arb

@@ -36,7 +36,6 @@
     "lightSensor": "Датчик освещённости",
     "meteringScreenLayout": "Элементы главного экрана",
     "meteringScreenLayoutHint": "Здесь вы можете скрыть некоторые ненужные или неиспользуемые элементы с главного экрана.",
-    "meteringScreenLayoutHintEquipmentProfiles": "Выбор профиля оборудования",
     "meteringScreenFeatureExtremeExposurePairs": "Длинная и короткая выдержки",
     "meteringScreenFeatureFilmPicker": "Выбор пленки",
     "meteringScreenFeatureHistogram": "Гистограмма",

lib/l10n/intl_zh.arb

@@ -36,7 +36,6 @@
     "lightSensor": "光传感器",
     "meteringScreenLayout": "布局",
     "meteringScreenLayoutHint": "隐藏不需要的元素，以免浪费曝光列表空间",
-    "meteringScreenLayoutHintEquipmentProfiles": "设备配置选择",
     "meteringScreenFeatureExtremeExposurePairs": "最快 & 最慢曝光组合",
     "meteringScreenFeatureFilmPicker": "胶片选择",
     "meteringScreenFeatureHistogram": "直方图",

lib/screens/metering/components/shared/metering_top_bar/shape_top_bar_metering.dart

@@ -31,23 +31,10 @@ class MeteringTopBarShape extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
     final paint = Paint()..color = color;
-    late final Path path;
+    final path = Path();
+    const circularRadius = Radius.circular(Dimens.borderRadiusL);
     if (appendixHeight == 0 || appendixWidth == 0) {
-      path = _drawNoAppendix(size, Dimens.borderRadiusL);
-    } else if (appendixHeight < 0) {
-      path = _drawAppendixOnLeft(size, Dimens.borderRadiusL);
-      canvas.scale(-1, 1);
-      canvas.translate(-size.width, 0);
-    } else {
-      path = _drawAppendixOnLeft(size, Dimens.borderRadiusL);
-    }
-    canvas.drawPath(path, paint);
-  }
-
-  Path _drawNoAppendix(Size size, double bottomRadius) {
-    final circularRadius = Radius.circular(bottomRadius);
-    return Path()
-      ..addRRect(
+      path.addRRect(
         RRect.fromLTRBAndCorners(
           0,
           0,
@@ -56,51 +43,73 @@ class MeteringTopBarShape extends CustomPainter {
           bottomLeft: circularRadius,
           bottomRight: circularRadius,
         ),
-      )
-      ..close();
-  }
-
-  Path _drawAppendixOnLeft(Size size, double bottomRadius) {
-    final path = Path();
-    final circularRadius = Radius.circular(bottomRadius);
-    final appendixHeight = this.appendixHeight.abs();
-
+      );
+    } else if (appendixHeight < 0) {
       // Left side with bottom corner
-    path.lineTo(0, size.height - bottomRadius);
+      path.lineTo(0, size.height + appendixHeight - Dimens.borderRadiusL);
       path.arcToPoint(
-      Offset(bottomRadius, size.height),
+        Offset(Dimens.borderRadiusL, size.height + appendixHeight),
         radius: circularRadius,
         clockwise: false,
       );
 
       // Bottom side with step
-    final allowedRadius = min(appendixHeight.abs() / 2, bottomRadius);
-    path.lineTo(appendixWidth - allowedRadius, size.height);
+      final allowedRadius = min(appendixHeight.abs() / 2, Dimens.borderRadiusL);
+      path.lineTo(appendixWidth - allowedRadius, size.height + appendixHeight);
       path.arcToPoint(
-      Offset(appendixWidth, size.height - allowedRadius),
+        Offset(appendixWidth, size.height + appendixHeight + allowedRadius),
+        radius: circularRadius,
+      );
+      path.lineTo(appendixWidth, size.height - allowedRadius);
+      path.arcToPoint(
+        Offset(appendixWidth + allowedRadius, size.height),
+        radius: circularRadius,
+        clockwise: false,
+      );
+
+      // Right side with bottom corner
+      path.lineTo(size.width - Dimens.borderRadiusL, size.height);
+      path.arcToPoint(
+        Offset(size.width, size.height - Dimens.borderRadiusL),
+        radius: circularRadius,
+        clockwise: false,
+      );
+    } else {
+      // Left side with bottom corner
+      path.lineTo(0, size.height - Dimens.borderRadiusL);
+      path.arcToPoint(
+        Offset(Dimens.borderRadiusL, size.height),
+        radius: circularRadius,
+        clockwise: false,
+      );
+
+      // Bottom side with step
+      final allowedRadius = min(appendixHeight.abs() / 2, Dimens.borderRadiusL);
+      path.relativeLineTo(appendixWidth - allowedRadius * 2, 0);
+      path.relativeArcToPoint(
+        Offset(allowedRadius, -allowedRadius),
         radius: Radius.circular(allowedRadius),
         rotation: 90,
         clockwise: false,
       );
-    path.lineTo(appendixWidth, size.height - appendixHeight + allowedRadius);
-    path.arcToPoint(
-      Offset(appendixWidth + allowedRadius, size.height - appendixHeight),
+      path.relativeLineTo(0, -appendixHeight + allowedRadius * 2);
+      path.relativeArcToPoint(
+        Offset(allowedRadius, -allowedRadius),
         radius: Radius.circular(allowedRadius),
         rotation: 90,
       );
 
       // Right side with bottom corner
-    path.lineTo(size.width - bottomRadius, size.height - appendixHeight);
+      path.lineTo(size.width - Dimens.borderRadiusL, size.height - appendixHeight);
       path.arcToPoint(
-      Offset(size.width, size.height - appendixHeight - bottomRadius),
+        Offset(size.width, size.height - appendixHeight - Dimens.borderRadiusL),
         radius: circularRadius,
         clockwise: false,
       );
-
+    }
     path.lineTo(size.width, 0);
     path.close();
-
-    return path;
+    canvas.drawPath(path, paint);
   }
 
   @override

lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart

@@ -20,7 +20,9 @@ class MeteringTopBar extends StatelessWidget {
     return CustomPaint(
       painter: MeteringTopBarShape(
         color: Theme.of(context).colorScheme.surface,
-        appendixWidth: MediaQuery.of(context).size.width / 2 - Dimens.grid8 / 2 + Dimens.paddingM,
+        appendixWidth: appendixHeight > 0
+            ? MediaQuery.of(context).size.width / 2 - Dimens.grid8 + Dimens.paddingM
+            : MediaQuery.of(context).size.width / 2 + Dimens.grid8 - Dimens.paddingM,
         appendixHeight: appendixHeight,
       ),
       child: Padding(

lib/screens/metering/components/shared/readings_container/components/animated_dialog_picker/components/animated_dialog/widget_dialog_animated.dart

@@ -22,15 +22,15 @@ class AnimatedDialog extends StatefulWidget {
 class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProviderStateMixin {
   final GlobalKey _key = GlobalKey();
 
-  late Size _closedSize;
-  late Offset _closedOffset;
+  late final Size _closedSize;
+  late final Offset _closedOffset;
 
   late final AnimationController _animationController;
   late final CurvedAnimation _defaultCurvedAnimation;
   late final Animation<Color?> _barrierColorAnimation;
-  late SizeTween _sizeTween;
-  late Animation<Size?> _sizeAnimation;
-  late Animation<Size?> _offsetAnimation;
+  late final SizeTween _sizeTween;
+  late final Animation<Size?> _sizeAnimation;
+  late final Animation<Size?> _offsetAnimation;
   late final Animation<double> _borderRadiusAnimation;
   late final Animation<double> _closedOpacityAnimation;
   late final Animation<double> _openedOpacityAnimation;
@@ -88,7 +88,35 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
       ),
     );
 
-    _setClosedOffset();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final mediaQuery = MediaQuery.of(context);
+
+      _closedSize = _key.currentContext!.size!;
+      _sizeTween = SizeTween(
+        begin: _closedSize,
+        end: widget.openedSize ??
+            Size(
+              mediaQuery.size.width -
+                  mediaQuery.padding.horizontal -
+                  Dimens.dialogMargin.horizontal,
+              mediaQuery.size.height - mediaQuery.padding.vertical - Dimens.dialogMargin.vertical,
+            ),
+      );
+      _sizeAnimation = _sizeTween.animate(_defaultCurvedAnimation);
+
+      final renderBox = _key.currentContext!.findRenderObject()! as RenderBox;
+      _closedOffset = renderBox.localToGlobal(Offset.zero);
+      _offsetAnimation = SizeTween(
+        begin: Size(
+          _closedOffset.dx + _closedSize.width / 2,
+          _closedOffset.dy + _closedSize.height / 2,
+        ),
+        end: Size(
+          mediaQuery.size.width / 2,
+          mediaQuery.size.height / 2 + mediaQuery.padding.top / 2 - mediaQuery.padding.bottom / 2,
+        ),
+      ).animate(_defaultCurvedAnimation);
+    });
   }
 
   @override
@@ -105,12 +133,6 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
     ).animate(_defaultCurvedAnimation);
   }
 
-  @override
-  void didUpdateWidget(covariant AnimatedDialog oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    _setClosedOffset();
-  }
-
   @override
   void dispose() {
     _animationController.dispose();
@@ -129,38 +151,6 @@ class AnimatedDialogState extends State<AnimatedDialog> with SingleTickerProvide
     );
   }
 
-  void _setClosedOffset() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final renderBox = _key.currentContext?.findRenderObject()! as RenderBox?;
-      if (renderBox != null) {
-        final size = MediaQuery.sizeOf(context);
-        final padding = MediaQuery.paddingOf(context);
-        _closedSize = _key.currentContext!.size!;
-        _sizeTween = SizeTween(
-          begin: _closedSize,
-          end: widget.openedSize ??
-              Size(
-                size.width - padding.horizontal - Dimens.dialogMargin.horizontal,
-                size.height - padding.vertical - Dimens.dialogMargin.vertical,
-              ),
-        );
-        _sizeAnimation = _sizeTween.animate(_defaultCurvedAnimation);
-
-        _closedOffset = renderBox.localToGlobal(Offset.zero);
-        _offsetAnimation = SizeTween(
-          begin: Size(
-            _closedOffset.dx + _closedSize.width / 2,
-            _closedOffset.dy + _closedSize.height / 2,
-          ),
-          end: Size(
-            size.width / 2,
-            size.height / 2 + padding.top / 2 - padding.bottom / 2,
-          ),
-        ).animate(_defaultCurvedAnimation);
-      }
-    });
-  }
-
   void _openDialog() {
     Navigator.of(context).push(
       PageRouteBuilder(

lib/screens/metering/screen_metering.dart

@@ -84,8 +84,16 @@ class _InheritedListeners extends StatelessWidget {
             context.read<MeteringBloc>().add(const FilmChangedEvent(Film.other()));
           }
         },
+        child: MeteringScreenLayoutFeatureListener(
+          feature: MeteringScreenLayoutFeature.equipmentProfiles,
+          onDidChangeDependencies: (value) {
+            if (!value) {
+              EquipmentProfileProvider.of(context).setProfile(EquipmentProfiles.of(context).first);
+            }
+          },
           child: child,
         ),
+      ),
     );
   }
 }

lib/screens/settings/components/metering/components/metering_screen_layout/components/meterins_screen_layout_features_dialog/widget_dialog_metering_screen_layout_features.dart

@@ -3,7 +3,6 @@ import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/user_preferences_provider.dart';
 import 'package:lightmeter/res/dimens.dart';
-import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 
 class MeteringScreenLayoutFeaturesDialog extends StatefulWidget {
   const MeteringScreenLayoutFeaturesDialog({super.key});
@@ -26,25 +25,20 @@ class _MeteringScreenLayoutFeaturesDialogState extends State<MeteringScreenLayou
       contentPadding: EdgeInsets.zero,
       content: SizedBox(
         width: double.maxFinite,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
+        child: ListView(
+          shrinkWrap: true,
           children: [
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: Dimens.paddingL),
               child: Text(S.of(context).meteringScreenLayoutHint),
             ),
             const SizedBox(height: Dimens.grid16),
-            ListView(
-              shrinkWrap: true,
-              children: [
             _featureListTile(MeteringScreenLayoutFeature.equipmentProfiles),
             _featureListTile(MeteringScreenLayoutFeature.extremeExposurePairs),
             _featureListTile(MeteringScreenLayoutFeature.filmPicker),
             _featureListTile(MeteringScreenLayoutFeature.histogram),
           ],
         ),
-          ],
-        ),
       ),
       actionsPadding: Dimens.dialogActionsPadding,
       actions: [
@@ -54,9 +48,6 @@ class _MeteringScreenLayoutFeaturesDialogState extends State<MeteringScreenLayou
         ),
         TextButton(
           onPressed: () {
-            if (!_features[MeteringScreenLayoutFeature.equipmentProfiles]!) {
-              EquipmentProfileProvider.of(context).setProfile(EquipmentProfiles.of(context).first);
-            }
             UserPreferencesProvider.of(context).setMeteringScreenLayout(_features);
             Navigator.of(context).pop();
           },
@@ -82,7 +73,7 @@ class _MeteringScreenLayoutFeaturesDialogState extends State<MeteringScreenLayou
   String _toStringLocalized(BuildContext context, MeteringScreenLayoutFeature feature) {
     switch (feature) {
       case MeteringScreenLayoutFeature.equipmentProfiles:
-        return S.of(context).meteringScreenLayoutHintEquipmentProfiles;
+        return S.of(context).equipmentProfiles;
       case MeteringScreenLayoutFeature.extremeExposurePairs:
         return S.of(context).meteringScreenFeatureExtremeExposurePairs;
       case MeteringScreenLayoutFeature.filmPicker:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: lightmeter
 description: Lightmeter app inspired by Material 3 design system.
 publish_to: "none"
-version: 0.14.1+40
+version: 0.14.0+39
 
 environment:
   sdk: ">=3.0.0 <4.0.0"