.gitignore

@@ -57,6 +57,6 @@ keystore.properties
 android/app/google-services.json
 ios/firebase_app_id_file.json
 ios/Runner/GoogleService-Info.plist
-/lib/firebase_options.dart
+lib/firebase_options.dart
 
 coverage/

.vscode/launch.json

@@ -5,10 +5,9 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "dev-debug (android)",
+            "name": "dev (android)",
             "request": "launch",
             "type": "dart",
-            "flutterMode": "debug",
             "args": [
                 "--flavor",
                 "dev",
@@ -18,49 +17,9 @@
             "program": "${workspaceFolder}/lib/main_dev.dart",
         },
         {
-            "name": "dev-profile (android)",
+            "name": "dev (ios)",
             "request": "launch",
             "type": "dart",
-            "flutterMode": "profile",
-            "args": [
-                "--flavor",
-                "dev",
-                "--dart-define",
-                "cameraPreviewAspectRatio=240/320",
-            ],
-            "program": "${workspaceFolder}/lib/main_dev.dart",
-        },
-        {
-            "name": "prod-debug (android)",
-            "request": "launch",
-            "type": "dart",
-            "flutterMode": "debug",
-            "args": [
-                "--flavor",
-                "prod",
-                "--dart-define",
-                "cameraPreviewAspectRatio=240/320",
-            ],
-            "program": "${workspaceFolder}/lib/main_release.dart",
-        },
-        {
-            "name": "prod-profile (android)",
-            "request": "launch",
-            "type": "dart",
-            "flutterMode": "profile",
-            "args": [
-                "--flavor",
-                "prod",
-                "--dart-define",
-                "cameraPreviewAspectRatio=240/320",
-            ],
-            "program": "${workspaceFolder}/lib/main_release.dart",
-        },
-        {
-            "name": "dev-debug (ios)",
-            "request": "launch",
-            "type": "dart",
-            "flutterMode": "debug",
             "args": [
                 "--flavor",
                 "dev",
@@ -70,17 +29,30 @@
             "program": "${workspaceFolder}/lib/main_dev.dart",
         },
         {
-            "name": "dev-profile (ios)",
+            "name": "prod (android)",
             "request": "launch",
-            "flutterMode": "profile",
+            //"flutterMode": "release",
             "type": "dart",
             "args": [
                 "--flavor",
-                "dev",
+                "prod",
+                "--dart-define",
+                "cameraPreviewAspectRatio=240/320",
+            ],
+            "program": "${workspaceFolder}/lib/main_prod.dart",
+        },
+        {
+            "name": "prod (ios)",
+            "request": "launch",
+            //"flutterMode": "release",
+            "type": "dart",
+            "args": [
+                "--flavor",
+                "prod",
                 "--dart-define",
                 "cameraPreviewAspectRatio=3/4",
             ],
-            "program": "${workspaceFolder}/lib/main_dev.dart",
+            "program": "${workspaceFolder}/lib/main_prod.dart",
         },
     ],
 }

README.md

@@ -60,18 +60,13 @@ flutter pub get
 flutter pub run intl_utils:generate
 ```
 
-### 4. Build
+### 4. Build (Android)
-
-#### Android
 
 You can build an apk by running the following command from the root of the repository:
 ```console
-flutter build apk --release --flavor dev --dart-define cameraPreviewAspectRatio=240/320 -t lib/main_dev.dart
+flutter build apk --release --flavor $FLAVOR --dart-define cameraPreviewAspectRatio=240/320 -t lib/main_$FLAVOR.dart
 ```
-
+Just replace `$FLAVOR` with `dev` or `prod`.
-### iOS
-
-TBD
 
 # Contribution
 

lib/firebase.dart

@@ -1,22 +1,14 @@
-import 'dart:developer';
-
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter/foundation.dart';
 
 import 'package:lightmeter/firebase_options.dart';
 
-Future<void> initializeFirebase({required bool handleErrors}) async {
+Future<void> initializeFirebase() async {
-  try {
+  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
-    await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+  FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError;
-    if (handleErrors) {
+  PlatformDispatcher.instance.onError = (error, stack) {
-      FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError;
+    FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
-      PlatformDispatcher.instance.onError = (error, stack) {
+    return true;
-        FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
+  };
-        return true;
-      };
-    }
-  } catch (e) {
-    log(e.toString());
-  }
 }

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/main_prod.dart

@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:lightmeter/application.dart';
 import 'package:lightmeter/environment.dart';
@@ -5,6 +7,10 @@ import 'package:lightmeter/firebase.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  await initializeFirebase(handleErrors: true);
+  try {
+    await initializeFirebase();
+  } catch (e) {
+    log(e.toString());
+  }
   runApp(const Application(Environment.prod()));
 }

lib/main_release.dart

@@ -1,10 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lightmeter/application.dart';
-import 'package:lightmeter/environment.dart';
-import 'package:lightmeter/firebase.dart';
-
-Future<void> main() async {
-  WidgetsFlutterBinding.ensureInitialized();
-  await initializeFirebase(handleErrors: false);
-  runApp(const Application(Environment.prod()));
-}

lib/screens/metering/screen_metering.dart

@@ -84,7 +84,15 @@ class _InheritedListeners extends StatelessWidget {
             context.read<MeteringBloc>().add(const FilmChangedEvent(Film.other()));
           }
         },
-        child: child,
+        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,23 +25,18 @@ class _MeteringScreenLayoutFeaturesDialogState extends State<MeteringScreenLayou
       contentPadding: EdgeInsets.zero,
       content: SizedBox(
         width: double.maxFinite,
-        child: Column(
+        child: ListView(
-          mainAxisSize: MainAxisSize.min,
+          shrinkWrap: true,
           children: [
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: Dimens.paddingL),
               child: Text(S.of(context).meteringScreenLayoutHint),
             ),
             const SizedBox(height: Dimens.grid16),
-            ListView(
+            _featureListTile(MeteringScreenLayoutFeature.equipmentProfiles),
-              shrinkWrap: true,
+            _featureListTile(MeteringScreenLayoutFeature.extremeExposurePairs),
-              children: [
+            _featureListTile(MeteringScreenLayoutFeature.filmPicker),
-                _featureListTile(MeteringScreenLayoutFeature.equipmentProfiles),
+            _featureListTile(MeteringScreenLayoutFeature.histogram),
-                _featureListTile(MeteringScreenLayoutFeature.extremeExposurePairs),
-                _featureListTile(MeteringScreenLayoutFeature.filmPicker),
-                _featureListTile(MeteringScreenLayoutFeature.histogram),
-              ],
-            ),
           ],
         ),
       ),
@@ -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.0+39
+version: 0.13.2+38
 
 environment:
   sdk: ">=3.0.0 <4.0.0"